IDEMPIERE-3687:active alpn
by change from 9.4.8, alpn need a ALPNProcessors use Conscrypt so faster and don't need maintain alpn-boot.jar on classpath section ALPN Support: https://webtide.com/getting-started-with-jetty-and-jdk-9/
This commit is contained in:
parent
88cf4f7a3f
commit
33def47039
|
@ -511,7 +511,14 @@
|
||||||
fragment="true"/>
|
fragment="true"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.eclipse.jetty.alpn.openjdk8.server"
|
id="org.eclipse.jetty.alpn.conscrypt.server"
|
||||||
|
download-size="0"
|
||||||
|
install-size="0"
|
||||||
|
version="0.0.0"
|
||||||
|
unpack="false"/>
|
||||||
|
|
||||||
|
<plugin
|
||||||
|
id="org.idempiere.org.conscrypt.openjdk-uber"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="0.0.0"
|
||||||
|
|
|
@ -20,9 +20,7 @@ goto START
|
||||||
|
|
||||||
FOR %%c in (plugins\org.eclipse.equinox.launcher_1.*.jar) DO set JARFILE=%%c
|
FOR %%c in (plugins\org.eclipse.equinox.launcher_1.*.jar) DO set JARFILE=%%c
|
||||||
|
|
||||||
@Set VMOPTS=-Xbootclasspath/p:alpn-boot.jar
|
@Set VMOPTS=%VMOPTS% -Dorg.osgi.framework.bootdelegation=sun.security.ssl
|
||||||
@Set VMOPTS=%VMOPTS% -Xbootclasspath/p:alpn-boot.jar
|
|
||||||
@Set VMOPTS=%VMOPTS% -Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.eclipse.jetty.alpn
|
|
||||||
@Set VMOPTS=%VMOPTS% -Dosgi.compatibility.bootdelegation=true
|
@Set VMOPTS=%VMOPTS% -Dosgi.compatibility.bootdelegation=true
|
||||||
@Set VMOPTS=%VMOPTS% -Djetty.home=jettyhome
|
@Set VMOPTS=%VMOPTS% -Djetty.home=jettyhome
|
||||||
@Set VMOPTS=%VMOPTS% -Djetty.base=jettyhome
|
@Set VMOPTS=%VMOPTS% -Djetty.base=jettyhome
|
||||||
|
|
|
@ -21,8 +21,7 @@ echo Starting iDempiere Server
|
||||||
echo ===================================
|
echo ===================================
|
||||||
|
|
||||||
|
|
||||||
VMOPTS="-Xbootclasspath/p:alpn-boot.jar
|
VMOPTS="-Dorg.osgi.framework.bootdelegation=sun.security.ssl
|
||||||
-Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.eclipse.jetty.alpn
|
|
||||||
-Dosgi.compatibility.bootdelegation=true
|
-Dosgi.compatibility.bootdelegation=true
|
||||||
-Djetty.home=$BASE/jettyhome
|
-Djetty.home=$BASE/jettyhome
|
||||||
-Djetty.base=$BASE/jettyhome
|
-Djetty.base=$BASE/jettyhome
|
||||||
|
|
|
@ -25,7 +25,4 @@
|
||||||
</Arg>
|
</Arg>
|
||||||
</Call>
|
</Call>
|
||||||
|
|
||||||
<!-- ALPN debugging on System.err -->
|
|
||||||
<Set class="org.eclipse.jetty.alpn.ALPN" name="debug" type="boolean"><Property name="jetty.alpn.debug" default="true" /></Set>
|
|
||||||
|
|
||||||
</Configure>
|
</Configure>
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
<!-- SSL ContextFactory configuration -->
|
<!-- SSL ContextFactory configuration -->
|
||||||
<!-- ============================================================= -->
|
<!-- ============================================================= -->
|
||||||
<Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
|
<Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
|
||||||
|
<Set name="Provider">Conscrypt</Set>
|
||||||
<Set name="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.keyStorePath" deprecated="jetty.keystore" default="etc/keystore"/></Set>
|
<Set name="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.keyStorePath" deprecated="jetty.keystore" default="etc/keystore"/></Set>
|
||||||
<Set name="KeyStorePassword"><Property name="jetty.sslContext.keyStorePassword" deprecated="jetty.keystore.password" default="@ADEMPIERE_KEYSTOREPASS@"/></Set>
|
<Set name="KeyStorePassword"><Property name="jetty.sslContext.keyStorePassword" deprecated="jetty.keystore.password" default="@ADEMPIERE_KEYSTOREPASS@"/></Set>
|
||||||
<Set name="KeyStoreType"><Property name="jetty.sslContext.keyStoreType" default="JKS"/></Set>
|
<Set name="KeyStoreType"><Property name="jetty.sslContext.keyStoreType" default="JKS"/></Set>
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<launcherArgs>
|
<launcherArgs>
|
||||||
<programArgs>-console
|
<programArgs>-console
|
||||||
</programArgs>
|
</programArgs>
|
||||||
<vmArgs>-Xbootclasspath/p:alpn-boot.jar -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.eclipse.jetty.alpn -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-alpn.xml,etc/jetty-http2.xml,etc/jetty-https.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.zkoss.zk.config.path=file://${workspace_loc}/zk.xml
|
<vmArgs>-Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-alpn.xml,etc/jetty-http2.xml,etc/jetty-https.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.zkoss.zk.config.path=file://${workspace_loc}/zk.xml
|
||||||
</vmArgs>
|
</vmArgs>
|
||||||
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
|
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
|
||||||
</vmArgsMac>
|
</vmArgsMac>
|
||||||
|
@ -51,7 +51,7 @@
|
||||||
<plugin id="org.eclipse.equinox.http.registry" autoStart="true" startLevel="0" />
|
<plugin id="org.eclipse.equinox.http.registry" autoStart="true" startLevel="0" />
|
||||||
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
|
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
|
||||||
<plugin id="org.eclipse.jetty.alpn.api" autoStart="true" startLevel="0" />
|
<plugin id="org.eclipse.jetty.alpn.api" autoStart="true" startLevel="0" />
|
||||||
<plugin id="org.eclipse.jetty.alpn.openjdk8.server" autoStart="true" startLevel="0" />
|
<plugin id="org.eclipse.jetty.alpn.conscrypt.server" autoStart="true" startLevel="0" />
|
||||||
<plugin id="org.eclipse.jetty.alpn.server" autoStart="true" startLevel="0" />
|
<plugin id="org.eclipse.jetty.alpn.server" autoStart="true" startLevel="0" />
|
||||||
<plugin id="org.eclipse.jetty.apache-jsp" autoStart="true" startLevel="0" />
|
<plugin id="org.eclipse.jetty.apache-jsp" autoStart="true" startLevel="0" />
|
||||||
<plugin id="org.eclipse.jetty.http" autoStart="true" startLevel="0" />
|
<plugin id="org.eclipse.jetty.http" autoStart="true" startLevel="0" />
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -9,7 +9,7 @@
|
||||||
<launcherArgs>
|
<launcherArgs>
|
||||||
<programArgs>-console
|
<programArgs>-console
|
||||||
</programArgs>
|
</programArgs>
|
||||||
<vmArgs>-Xbootclasspath/p:alpn-boot.jar -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.eclipse.jetty.alpn -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-alpn.xml,etc/jetty-http2.xml,etc/jetty-https.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.zkoss.zk.config.path=file://${workspace_loc}/zk.xml
|
<vmArgs>-Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-alpn.xml,etc/jetty-http2.xml,etc/jetty-https.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.zkoss.zk.config.path=file://${workspace_loc}/zk.xml
|
||||||
</vmArgs>
|
</vmArgs>
|
||||||
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
|
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
|
||||||
</vmArgsMac>
|
</vmArgsMac>
|
||||||
|
@ -51,7 +51,7 @@
|
||||||
<plugin id="org.eclipse.equinox.http.registry" autoStart="true" startLevel="0" />
|
<plugin id="org.eclipse.equinox.http.registry" autoStart="true" startLevel="0" />
|
||||||
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
|
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
|
||||||
<plugin id="org.eclipse.jetty.alpn.api" autoStart="true" startLevel="0" />
|
<plugin id="org.eclipse.jetty.alpn.api" autoStart="true" startLevel="0" />
|
||||||
<plugin id="org.eclipse.jetty.alpn.openjdk8.server" autoStart="true" startLevel="0" />
|
<plugin id="org.eclipse.jetty.alpn.conscrypt.server" autoStart="true" startLevel="0" />
|
||||||
<plugin id="org.eclipse.jetty.alpn.server" autoStart="true" startLevel="0" />
|
<plugin id="org.eclipse.jetty.alpn.server" autoStart="true" startLevel="0" />
|
||||||
<plugin id="org.eclipse.jetty.apache-jsp" autoStart="true" startLevel="0" />
|
<plugin id="org.eclipse.jetty.apache-jsp" autoStart="true" startLevel="0" />
|
||||||
<plugin id="org.eclipse.jetty.http" autoStart="true" startLevel="0" />
|
<plugin id="org.eclipse.jetty.http" autoStart="true" startLevel="0" />
|
||||||
|
|
Loading…
Reference in New Issue