IDEMPIERE-3136:all stuff relate library of idempiere

1. org.mortbay.jetty.alpn.boot depend to version of jdk http://www.eclipse.org/jetty/documentation/9.4.x/alpn-chapter.html#alpn-versions
2. sometime it materialize to org.mortbay.jetty.alpn.boot.source folder
3. update new version is hard
so just download it as separate jar file
This commit is contained in:
hieplq 2017-02-18 09:48:08 +07:00
parent 98d73702f3
commit 54a9b658dd
9 changed files with 11 additions and 13 deletions

View File

@ -3,6 +3,7 @@ build
External Plug-in Libraries
org.eclipse.jetty.http/bin
alpn-boot.jar
syntax: regexp
^adempiere$
^org\.adempiere\.install/lib$

View File

@ -162,7 +162,6 @@
<maven:entry groupId="org.cryptacular" artifactId="cryptacular" name="org.cryptacular" />
<maven:entry groupId="net.sf.supercsv" artifactId="super-csv" name="net.sf.supercsv.super-csv" />
<maven:entry groupId="org.atmosphere" artifactId="atmosphere-runtime" name="org.atmosphere.runtime" />
<maven:entry artifactId="alpn-boot" groupId="org.mortbay.jetty.alpn" name="org.mortbay.jetty.alpn.boot"/>
<maven:entry artifactId="jetty-alpn-server" groupId="org.eclipse.jetty" name="org.eclipse.jetty.alpn.server"/>
<maven:entry artifactId="alpn-api" groupId="org.eclipse.jetty.alpn" name="org.eclipse.jetty.alpn.api"/>
<maven:entry groupId="org.codehaus.groovy" artifactId="groovy-all" name="groovy-all" />

View File

@ -31,6 +31,8 @@ url.modify.bundle=http://downloads.sourceforge.net/project/idempiere/binary.file
url.file.jp.lib=http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/jp-6.3.0
url.alpn.boot=http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.11.v20170118/alpn-boot-8.1.11.v20170118.jar
extend.bundle.folder.1
extend.bundle.folder.2
extend.bundle.folder.3

View File

@ -1,5 +1,5 @@
bin.includes = feature.xml
root=file:build.xml,file:setup.ini,file:extensions-priorty.properties,file:hazelcast-template.xml
root=file:build.xml,file:setup.ini,file:extensions-priorty.properties,file:hazelcast-template.xml,file:../alpn-boot.jar
root.folder.data=data
root.folder.setup=setup
root.folder.jettyhome=jettyhome

View File

@ -36,5 +36,8 @@
<mkdir dir="../ztl" />
<get src="${url.maven.zkoss.lib}/maven2/org/zkoss/ztl/ztl/2.0.0-SNAPSHOT/ztl-2.0.0-SNAPSHOT.jar" dest="../ztl/ztl-2.0.0-SNAPSHOT.jar" usetimestamp="true" verbose="true" retries="5" />
<get src="${url.alpn.boot}" dest="../alpn-boot.jar" usetimestamp="true" verbose="true" retries="5" />
</target>
</project>

View File

@ -467,13 +467,6 @@
version="0.0.0"
unpack="false"/>
<plugin
id="org.mortbay.jetty.alpn.boot"
download-size="0"
install-size="0"
version="8.1.7.v20160121"
unpack="false"/>
<plugin
id="org.eclipse.jetty.alpn.server"
download-size="0"

View File

@ -19,4 +19,4 @@ echo ===================================
unset DISPLAY
BASE=`dirname $( readlink -f idempiere-server.sh )`
$JAVA ${DEBUG} -Xbootclasspath/p:plugins/org.mortbay.jetty.alpn.boot_8.1.7.v20160121.jar -Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.eclipse.jetty.alpn -Dosgi.compatibility.bootdelegation=true -Djetty.home=$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-alpn.xml,etc/jetty-http2.xml,etc/jetty-https.xml -Dosgi.console=localhost:12612 -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -jar $BASE/plugins/org.eclipse.equinox.launcher_1.*.jar -application org.adempiere.server.application
$JAVA ${DEBUG} -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.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 -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -jar $BASE/plugins/org.eclipse.equinox.launcher_1.*.jar -application org.adempiere.server.application

View File

@ -10,7 +10,7 @@
<programArgs>
<argsX86>-console 12612 --launcher.XXMaxPermSize 192m</argsX86>
</programArgs>
<vmArgs>-Xbootclasspath/p:plugins/org.mortbay.jetty.alpn.boot_8.1.7.v20160121.jar -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 -Dosgi.console=localhost:12612 -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true
<vmArgs>-Xbootclasspath/p:alpn-boot.jar -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 -Dosgi.console=localhost:12612 -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true
<argsX86>-Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dosgi.compatibility.bootdelegation=true -Djetty.home=${workspace_loc}/jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-selector.xml,etc/jetty-ssl.xml,etc/jetty-https.xml,etc/jetty-deployer.xml</argsX86>
</vmArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts

File diff suppressed because one or more lines are too long