IDEMPIERE-3687:active alpn
by change from 9.4.8, alpn need a ALPNProcessors, this patch use a default Processor so need alpn-boot.jar on classpath -Xbootclasspath/p:alpn-boot.jar https://github.com/eclipse/jetty.project/issues/1894
This commit is contained in:
hieplq
parent
6bdede763b
commit
88cf4f7a3f
|
|
@ -510,4 +510,11 @@
|
|||
version="0.0.0"
|
||||
fragment="true"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.jetty.alpn.openjdk8.server"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
</feature>
|
||||
|
|
|
|||
|
|
@ -20,12 +20,13 @@ goto START
|
|||
|
||||
FOR %%c in (plugins\org.eclipse.equinox.launcher_1.*.jar) DO set JARFILE=%%c
|
||||
|
||||
@Set VMOPTS=
|
||||
@Set VMOPTS=%VMOPTS% -Dorg.osgi.framework.bootdelegation=sun.security.ssl
|
||||
@Set VMOPTS=-Xbootclasspath/p:alpn-boot.jar
|
||||
@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% -Djetty.home=jettyhome
|
||||
@Set VMOPTS=%VMOPTS% -Djetty.base=jettyhome
|
||||
@Set VMOPTS=%VMOPTS% -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-https.xml
|
||||
@Set VMOPTS=%VMOPTS% -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
|
||||
@Set VMOPTS=%VMOPTS% -Dosgi.console=localhost:12612
|
||||
@Set VMOPTS=%VMOPTS% -Dmail.mime.encodefilename=true
|
||||
@Set VMOPTS=%VMOPTS% -Dmail.mime.decodefilename=true
|
||||
|
|
|
|||
|
|
@ -21,11 +21,12 @@ echo Starting iDempiere Server
|
|||
echo ===================================
|
||||
|
||||
|
||||
VMOPTS="-Dorg.osgi.framework.bootdelegation=sun.security.ssl
|
||||
VMOPTS="-Xbootclasspath/p:alpn-boot.jar
|
||||
-Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.eclipse.jetty.alpn
|
||||
-Dosgi.compatibility.bootdelegation=true
|
||||
-Djetty.home=$BASE/jettyhome
|
||||
-Djetty.base=$BASE/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-https.xml
|
||||
-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
|
||||
-Dosgi.console=localhost:12612
|
||||
-Dmail.mime.encodefilename=true
|
||||
-Dmail.mime.decodefilename=true
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
<launcherArgs>
|
||||
<programArgs>-console
|
||||
</programArgs>
|
||||
<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-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>-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>
|
||||
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
|
||||
</vmArgsMac>
|
||||
|
|
@ -51,6 +51,7 @@
|
|||
<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.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.server" 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" />
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -9,7 +9,7 @@
|
|||
<launcherArgs>
|
||||
<programArgs>-console
|
||||
</programArgs>
|
||||
<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-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>-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>
|
||||
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
|
||||
</vmArgsMac>
|
||||
|
|
@ -17,7 +17,6 @@
|
|||
|
||||
<windowImages/>
|
||||
|
||||
|
||||
<launcher name="idempiere">
|
||||
<win useIco="false">
|
||||
<bmp/>
|
||||
|
|
@ -52,6 +51,7 @@
|
|||
<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.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.server" 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" />
|
||||
|
|
|
|||
Loading…
Reference in New Issue