{"type":"doc","content":[{"type":"extension","attrs":{"layout":"default","extensionType":"com.atlassian.confluence.macro.core","extensionKey":"toc","parameters":{"macroParams":{},"macroMetadata":{"macroId":{"value":"7e7d9fc4-4b14-4c34-b17d-5aaf7c27116f"},"schemaVersion":{"value":"1"},"title":"Table of Contents"}},"localId":"c990add5-4d07-4357-a145-b9e5afd85825"}},{"type":"paragraph","content":[{"text":"The embedded Jetty that is installed by with Windows IdP installer requires a forked version of the standard 9.4 jetty-base. This differs from the standard by the addition of four files and the modification of one. Since the branch is not used in regular testing, part of the preparation for building the Windows installer is due diligence on this branch.","type":"text"}]},{"type":"paragraph","content":[{"text":"It is easiest to do this if you have the ","type":"text"},{"text":"git repository","type":"text","marks":[{"type":"link","attrs":{"href":"https://github.com/eclipse/jetty.project"}}]},{"text":" cloned and updated","type":"text"}]},{"type":"heading","attrs":{"level":1},"content":[{"text":"Check Changes","type":"text","marks":[{"type":"textColor","attrs":{"color":"#000000"}}]}]},{"type":"paragraph","content":[{"text":"We need to track any changes to the 9.4 branch ","type":"text"},{"text":"and","type":"text","marks":[{"type":"strong"}]},{"text":" and breaking changes in jetty itself.","type":"text"}]},{"type":"panel","attrs":{"panelType":"warning"},"content":[{"type":"paragraph","content":[{"text":"A potential quick cut is to difference the jetty sources between the two tags","type":"text"}]},{"type":"paragraph","content":[{"text":"git diff jetty-9.4.30.v20200611 jetty-9.4.28.v20200408 jetty-deploy/src/main/config/etc/jetty-deploy.xml","type":"text"}]},{"type":"paragraph","content":[{"text":"and so forth.","type":"text"}]}]},{"type":"heading","attrs":{"level":3},"content":[{"text":"modules/logging-logback.mod","type":"text","marks":[{"type":"code"}]}]},{"type":"paragraph","content":[{"text":"This should differ from the one in the distribution/git (in directory ","type":"text"},{"text":"jetty-util\\src\\main\\config\\modules","type":"text","marks":[{"type":"code"}]},{"text":") purely by the removal of the lines to do with forked operation","type":"text"}]},{"type":"codeBlock","attrs":{"language":"shell"},"content":[{"text":"@@ -14,5 +14,3 @@ logback-impl\n [provides]\n logging\n\n-[exec]\n--Dorg.eclipse.jetty.util.log.class?=org.eclipse.jetty.util.log.Slf4jLog","type":"text"}]},{"type":"paragraph","content":[{"text":"The setting of this system variable is done inside the configuration of procrun.","type":"text"}]},{"type":"heading","attrs":{"level":3},"content":[{"text":"etc/jetty-deploy.xml","type":"text","marks":[{"type":"code"}]}]},{"type":"paragraph","content":[{"text":"This should differ from the one in the distribution/git (in directory ","type":"text"},{"text":"jetty-deploy\\src\\main\\config\\etc","type":"text","marks":[{"type":"code"}]},{"text":") only in that the commented out section on how to include a property file is commented in and points to idp.ini","type":"text"}]},{"type":"codeBlock","content":[{"text":"--- a/etty-deploy/src/main/config/etc/jetty-deploy.xml\n+++ b/./jetty-deploy.xml\n@@ -59,9 +59,8 @@\n \n \n \n- \n+ \n+ /start.d/idp.ini\n ","type":"text"}]},{"type":"heading","attrs":{"level":3},"content":[{"text":"start.d/idp.ini","type":"text","marks":[{"type":"code"}]}]},{"type":"paragraph","content":[{"text":"Any changes to this file may need to be reflected in changes to the file ","type":"text"},{"text":"idp.ini.rewrite.property.names ","type":"text","marks":[{"type":"code"}]},{"text":"and/or","type":"text"},{"text":" idp.ini.windows","type":"text","marks":[{"type":"code"}]},{"text":" and/or","type":"text"},{"text":" idp-system.windows","type":"text","marks":[{"type":"code"}]}]},{"type":"bulletList","content":[{"type":"listItem","content":[{"type":"paragraph","content":[{"text":"Properties new to ","type":"text"},{"text":"idp.ini","type":"text","marks":[{"type":"code"}]},{"text":" that are occur in ","type":"text"},{"text":"idp.ini.rewrite.property.names","type":"text","marks":[{"type":"code"}]},{"text":" should be added to ","type":"text"},{"text":"idp-system.ini","type":"text","marks":[{"type":"code"}]},{"text":" if they are required","type":"text"}]}]},{"type":"listItem","content":[{"type":"paragraph","content":[{"text":"Properties name changes must be added to","type":"text"},{"text":" idp.ini.rewrite.property.names","type":"text","marks":[{"type":"code"}]},{"text":". Note that the name changes are cumulative","type":"text"}]}]},{"type":"listItem","content":[{"type":"paragraph","content":[{"text":"Properties new to ","type":"text"},{"text":"idp.ini","type":"text","marks":[{"type":"code"}]},{"text":" that do not occur in ","type":"text"},{"text":"idp.ini.rewrite.property.names","type":"text","marks":[{"type":"code"}]},{"text":" should be added to ","type":"text"},{"text":"idp.ini.windows","type":"text","marks":[{"type":"code"}]},{"text":" if they are required. Add them below the \"don't change these values\" lines.","type":"text"}]}]}]},{"type":"heading","attrs":{"level":3},"content":[{"text":"start.d/idp.ini.rewrite.property.names","type":"text","marks":[{"type":"code"}]}]},{"type":"paragraph","content":[{"text":"The target property names (values) starting with ","type":"text"},{"text":"jetty.","type":"text","marks":[{"type":"code"}]},{"text":" should be checked against the distribution xml files to ensure that they are still valid. ","type":"text"}]},{"type":"heading","attrs":{"level":3},"content":[{"text":"etc/jetty-ssl-context.xml ","type":"text","marks":[{"type":"code"}]}]},{"type":"paragraph","content":[{"text":"The is the most complex change and potentially the most fragile. In general if this file has not changed since the last release (folder ","type":"text"},{"text":"jetty-server\\src\\main\\config\\etc","type":"text","marks":[{"type":"code"}]},{"text":" and the file ","type":"text"},{"text":"jetty-util\\src\\main\\java\\org\\eclipse\\jetty\\util\\ssl\\SslContextFactory.java ","type":"text","marks":[{"type":"code"}]},{"text":" has not changed either then no changes are needed. ","type":"text"}]},{"type":"paragraph","content":[{"text":"The explicit changes are:","type":"text"}]},{"type":"codeBlock","content":[{"text":"--- a/./jetty-ssl-context.xml\n+++ b/etty-server/src/main/config/etc/jetty-ssl-context.xml\n@@ -12,10 +12,15 @@\n\n\n- /\n+ \n\n\n\n- \n- /\n- \n- \n- \n\n\n","type":"text"}]},{"type":"paragraph","content":[{"type":"hardBreak"},{"text":"Deconstructed this change is","type":"text"}]},{"type":"bulletList","content":[{"type":"listItem","content":[{"type":"paragraph","content":[{"text":"Remove the prefixing of ","type":"text"},{"text":"KeyStorePath","type":"text","marks":[{"type":"code"}]},{"text":" with ","type":"text"},{"text":"${Jetty.base}","type":"text","marks":[{"type":"code"}]},{"text":",this allows absolute paths to be used. Procrun is setup to allow relative paths to use this shortcut.","type":"text"}]}]},{"type":"listItem","content":[{"type":"paragraph","content":[{"text":"Remove the explicit setting of 5 bean properties, allowing the Java defaults to take over.. These can be checked in ","type":"text"},{"text":"jetty-util\\src\\main\\java\\org\\eclipse\\jetty\\util\\ssl\\SslContextFactory.java","type":"text","marks":[{"type":"code"}]}]},{"type":"bulletList","content":[{"type":"listItem","content":[{"type":"paragraph","content":[{"text":"KeyManagerPassword","type":"text","marks":[{"type":"code"}]},{"text":" This is used in ","type":"text"},{"text":"getKeyManagers().","type":"text","marks":[{"type":"code"}]},{"text":" Having it not set means it defaults to the KeyStorePassword","type":"text"}]}]},{"type":"listItem","content":[{"type":"paragraph","content":[{"text":"TrustStore reading the ","type":"text"},{"text":"loadTrustStore","type":"text","marks":[{"type":"code"}]},{"text":" will show that if these three properties are not set then the keystore is used.","type":"text"}]}]}]}]}]},{"type":"heading","attrs":{"level":3},"content":[{"text":"Logging versions","type":"text"}]},{"type":"paragraph","content":[{"text":"The versions of logback and slf4j need to match the version that jetty ships with. Check the version in the pom file for jetty base with the version at the top level if jetty.project","type":"text"}]},{"type":"heading","attrs":{"level":1},"content":[{"text":"Build","type":"text","marks":[{"type":"textColor","attrs":{"color":"#000000"}}]}]},{"type":"paragraph","content":[{"text":"Having completed the review the artefact used to build the installer can be created. You should change version in the pom file to reflect the Jetty version.","type":"text"}]},{"type":"codeBlock","content":[{"text":"cd java-idp-jetty-base\nmvn install","type":"text"}]},{"type":"paragraph","content":[{"text":"The build artefact can now be used in the build of the installer","type":"text"}]},{"type":"heading","attrs":{"level":1},"content":[{"text":"Tag and push","type":"text"}]},{"type":"paragraph","content":[{"text":"Once the installer has been created the branch should be tagged. The tag is associated with the ","type":"text"},{"text":"Jetty version","type":"text","marks":[{"type":"strong"}]}]},{"type":"codeBlock","content":[{"text":"git tag -s -m \"Tag Windows jetty-base 3.4.0.0\" 9.4.30.v20200611-jetty-distribution-windows\ngit push [-n] origin 9.4.30.v20200611-jetty-distribution-windows","type":"text"}]},{"type":"paragraph","content":[{"text":"Revise the version back into pom and push the branch.","type":"text"}]}],"version":1}

Browser not supported