From 98730ce2d6ec559eab5d772a76acc6329486d818 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Thu, 7 Jul 2016 14:55:12 +0700
Subject: [PATCH 01/34] IDEMPIERE-2968:make all url as properties let idempiere
 can total material with offline repository use parameter for link to
 repository, so can use offline repository, so help increase test speed

---
 org.adempiere.base/copyjars.xml               | 50 ++++++++---------
 org.adempiere.extend/copyjars.xml             |  4 +-
 org.adempiere.install/copyjars.xml            |  2 +-
 org.adempiere.payment.processor/copyjars.xml  |  6 +--
 .../copyjars.xml                              | 16 +++---
 org.adempiere.sdk-feature/adempiere.cquery    |  2 +-
 org.adempiere.sdk-feature/adempiere.rmap      | 13 ++---
 .../materialize.properties                    | 25 +++++++++
 org.adempiere.server-feature/copyjars.xml     | 54 +++++++++----------
 org.adempiere.server/copyjars.xml             |  4 +-
 org.adempiere.ui.swing/copyjars.xml           |  8 +--
 org.adempiere.ui.zk/copyjars.xml              | 10 ++--
 org.adempiere.ui/copyjars.xml                 |  8 +--
 org.compiere.db.oracle.provider/copyjars.xml  |  8 +--
 .../copyjars.xml                              |  6 +--
 org.idempiere.fitnesse.server/copyjars.xml    | 12 ++---
 org.idempiere.hazelcast.service/copyjars.xml  |  4 +-
 org.idempiere.webservices/copyjars.xml        | 40 +++++++-------
 org.slf4j.jdk14/copyjars.xml                  |  2 +-
 org.w3c.dom.fragment/copyjars.xml             |  2 +-
 20 files changed, 151 insertions(+), 125 deletions(-)
 create mode 100644 org.adempiere.sdk-feature/materialize.properties

diff --git a/org.adempiere.base/copyjars.xml b/org.adempiere.base/copyjars.xml
index 7a56316f22..17f762d934 100644
--- a/org.adempiere.base/copyjars.xml
+++ b/org.adempiere.base/copyjars.xml
@@ -1,25 +1,25 @@
-<project name="zklibrary" basedir="." default="copy">
-	<target name="copy">
-		<get src="http://central.maven.org/maven2/org/apache-extras/beanshell/bsh/2.0b6/bsh-2.0b6.jar" dest="bsh-2.0b6.jar" usetimestamp="true" verbose="true" retries="5" />
-		<!-- bsf-all-3.0-beta3.jar replace for grovy-engine, jyyhon-enjine, bsh-engine
-	      http://mvnrepository.com/artifact/org.apache.bsf/bsf-all/3.0-beta3
-		  <get src="http://central.maven.org/maven2/org/apache/bsf/bsf-all/3.0-beta3/bsf-all-3.0-beta3.jar" dest="bsf-all-3.0-beta3.jar" usetimestamp="true" verbose="true" retries="5"/>
-		  -->
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/jython-engine.jar" dest="jython-engine.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/groovy-engine.jar" dest="groovy-engine.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/bsh-engine.jar" dest="bsh-engine.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/org/python/jython/2.2.1/jython-2.2.1.jar" dest="jython.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/it/sauronsoftware/cron4j/cron4j/2.2.5/cron4j-2.2.5.jar" dest="cron4j-2.2.5.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/net/sourceforge/barbecue/barbecue/1.5-beta1/barbecue-1.5-beta1.jar" dest="barbecue-1.5-beta1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/com/lowagie/itext/2.1.7/itext-2.1.7.jar" dest="iText-2.1.7.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/org/jfree/jcommon/1.0.23/jcommon-1.0.23.jar" dest="jcommon-1.0.23.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/org/jfree/jfreechart/1.0.19/jfreechart-1.0.19.jar" dest="jfreechart-1.0.19.jar" usetimestamp="true" verbose="true" retries="5" />
-		<!-- jnlp is not used in idempiere? -->
-		<get src="http://central.maven.org/maven2/org/codehaus/groovy/groovy-all/1.7.5/groovy-all-1.7.5.jar" dest="groovy-all-1.7.5.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/net/sf/supercsv/super-csv/2.2.0/super-csv-2.2.0.jar" dest="super-csv-2.2.0.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/net/sf/barcode4j/barcode4j/2.1/barcode4j-2.1.jar" dest="barcode4j-2.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/1.46/bcprov-jdk15on-1.46.jar" dest="bcprov-jdk15on-1.46.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/org/passay/passay/1.0/passay-1.0.jar" dest="passay-1.0.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/jnlp.jar" dest="jnlp.jar" usetimestamp="true" verbose="true" retries="5" />
-	</target>
-</project>
+ <project name="zklibrary" basedir="." default="copy">
+ 	<target name="copy">
+		<get src="${url.maven2.lib}/maven2/org/apache-extras/beanshell/bsh/2.0b6/bsh-2.0b6.jar" dest="bsh-2.0b6.jar" usetimestamp="true" verbose="true" retries="5" />
+ 		<!-- bsf-all-3.0-beta3.jar replace for grovy-engine, jyyhon-enjine, bsh-engine
+ 	      http://mvnrepository.com/artifact/org.apache.bsf/bsf-all/3.0-beta3
+                <get src="${url.maven2.lib}/maven2/org/apache/bsf/bsf-all/3.0-beta3/bsf-all-3.0-beta3.jar" dest="bsf-all-3.0-beta3.jar" usetimestamp="true" verbose="true" retries="5"/>
+ 		  -->
+		<get src="${url.file.srv}/jarfile/3.1/jython-engine.jar" dest="jython-engine.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/groovy-engine.jar" dest="groovy-engine.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/bsh-engine.jar" dest="bsh-engine.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/python/jython/2.2.1/jython-2.2.1.jar" dest="jython.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/it/sauronsoftware/cron4j/cron4j/2.2.5/cron4j-2.2.5.jar" dest="cron4j-2.2.5.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/net/sourceforge/barbecue/barbecue/1.5-beta1/barbecue-1.5-beta1.jar" dest="barbecue-1.5-beta1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/com/lowagie/itext/2.1.7/itext-2.1.7.jar" dest="iText-2.1.7.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/jfree/jcommon/1.0.23/jcommon-1.0.23.jar" dest="jcommon-1.0.23.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/jfree/jfreechart/1.0.19/jfreechart-1.0.19.jar" dest="jfreechart-1.0.19.jar" usetimestamp="true" verbose="true" retries="5" />
+ 		<!-- jnlp is not used in idempiere? -->
+		<get src="${url.maven2.lib}/maven2/org/codehaus/groovy/groovy-all/1.7.5/groovy-all-1.7.5.jar" dest="groovy-all-1.7.5.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/net/sf/supercsv/super-csv/2.2.0/super-csv-2.2.0.jar" dest="super-csv-2.2.0.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/net/sf/barcode4j/barcode4j/2.1/barcode4j-2.1.jar" dest="barcode4j-2.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/bouncycastle/bcprov-jdk15on/1.46/bcprov-jdk15on-1.46.jar" dest="bcprov-jdk15on-1.46.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/passay/passay/1.0/passay-1.0.jar" dest="passay-1.0.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/jnlp.jar" dest="jnlp.jar" usetimestamp="true" verbose="true" retries="5" />
+ 	</target>
+ </project>
diff --git a/org.adempiere.extend/copyjars.xml b/org.adempiere.extend/copyjars.xml
index e3120a779d..2f07beeb95 100644
--- a/org.adempiere.extend/copyjars.xml
+++ b/org.adempiere.extend/copyjars.xml
@@ -1,6 +1,6 @@
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/spiffy-with_source-all-0.05.jar" dest="spiffy-with_source-all-0.05.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/extend.jar" dest="extend.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/spiffy-with_source-all-0.05.jar" dest="spiffy-with_source-all-0.05.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/extend.jar" dest="extend.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
diff --git a/org.adempiere.install/copyjars.xml b/org.adempiere.install/copyjars.xml
index bfa48b8e22..e81e182ef5 100644
--- a/org.adempiere.install/copyjars.xml
+++ b/org.adempiere.install/copyjars.xml
@@ -1,5 +1,5 @@
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
-		<get src="http://central.maven.org/maven2/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3.jar" dest="ant-contrib-1.0b3.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3.jar" dest="ant-contrib-1.0b3.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
diff --git a/org.adempiere.payment.processor/copyjars.xml b/org.adempiere.payment.processor/copyjars.xml
index 2395a105f0..eec9bc4366 100644
--- a/org.adempiere.payment.processor/copyjars.xml
+++ b/org.adempiere.payment.processor/copyjars.xml
@@ -2,8 +2,8 @@
 	<target name="copy">
 		<!-- seem payment sdk is change without use verisign.jar, i can find out this lib. maybe have to update this plug-in 
 		  http://paypal.github.io/sdk/#ppo-payflow-->
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/jpayment.jar" dest="jpayment.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/Verisign.jar" dest="Verisign.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/payflow.jar" dest="payflow.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/jpayment.jar" dest="jpayment.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/Verisign.jar" dest="Verisign.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/payflow.jar" dest="payflow.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
diff --git a/org.adempiere.report.jasper.library/copyjars.xml b/org.adempiere.report.jasper.library/copyjars.xml
index c71107db67..093b6028e8 100644
--- a/org.adempiere.report.jasper.library/copyjars.xml
+++ b/org.adempiere.report.jasper.library/copyjars.xml
@@ -1,13 +1,13 @@
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
 		<mkdir dir="lib" />
-		<get src="http://central.maven.org/maven2/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar" dest="lib/commons-beanutils-1.8.0.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/commons-digester/commons-digester/2.1/commons-digester-2.1.jar" dest="lib/commons-digester-2.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/net/sf/jasperreports/jasperreports/5.6.1/jasperreports-5.6.1.jar" dest="lib/jasperreports-5.6.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/net/sf/jasperreports/jasperreports-fonts/5.6.1/jasperreports-fonts-5.6.1.jar" dest="lib/jasperreports-fonts-5.6.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.1.4/jackson-core-2.1.4.jar" dest="lib/jackson-core-2.1.4.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/xalan/xalan/2.7.1/xalan-2.7.1.jar" dest="lib/xalan-2.7.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/jasperreports-functions-5.6.1.jar" dest="lib/jasperreports-functions-5.6.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/joda-time/joda-time/2.1/joda-time-2.1.jar" dest="lib/joda-time-2.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar" dest="lib/commons-beanutils-1.8.0.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/commons-digester/commons-digester/2.1/commons-digester-2.1.jar" dest="lib/commons-digester-2.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/net/sf/jasperreports/jasperreports/5.6.1/jasperreports-5.6.1.jar" dest="lib/jasperreports-5.6.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/net/sf/jasperreports/jasperreports-fonts/5.6.1/jasperreports-fonts-5.6.1.jar" dest="lib/jasperreports-fonts-5.6.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/com/fasterxml/jackson/core/jackson-core/2.1.4/jackson-core-2.1.4.jar" dest="lib/jackson-core-2.1.4.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/xalan/xalan/2.7.1/xalan-2.7.1.jar" dest="lib/xalan-2.7.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/jasperreports-functions-5.6.1.jar" dest="lib/jasperreports-functions-5.6.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/joda-time/joda-time/2.1/joda-time-2.1.jar" dest="lib/joda-time-2.1.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
diff --git a/org.adempiere.sdk-feature/adempiere.cquery b/org.adempiere.sdk-feature/adempiere.cquery
index 66a8149ad9..83fb2c90db 100644
--- a/org.adempiere.sdk-feature/adempiere.cquery
+++ b/org.adempiere.sdk-feature/adempiere.cquery
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="adempiere.rmap">
+<?xml version="1.0" encoding="UTF-8"?><cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="adempiere.rmap" properties="materialize.properties">
     <cq:rootRequest name="org.adempiere.sdk" componentType="eclipse.feature"/>
     <cq:property key="buckminster.download.source" value="true"/>
     <cq:property key="osgi.configuration.area.default" value="configuration"/>
diff --git a/org.adempiere.sdk-feature/adempiere.rmap b/org.adempiere.sdk-feature/adempiere.rmap
index a8fa93e7f4..d065d8f567 100644
--- a/org.adempiere.sdk-feature/adempiere.rmap
+++ b/org.adempiere.sdk-feature/adempiere.rmap
@@ -40,11 +40,12 @@
   <rm:locator searchPathRef="orbit" failOnError="false"/>
   <rm:locator searchPathRef="workspace.project" failOnError="false"/>
   <rm:locator searchPathRef="workspace.feature"/>
+  
   <rm:searchPath name="equinox">
     <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="p2" source="false" mutable="false">
       <rm:property key="buckminster.source" value="false"/>
       <rm:property key="buckminster.mutable" value="false"/>
-      <rm:uri format="http://download.eclipse.org/eclipse/updates/4.4/"/>
+      <rm:uri format="${url.equinox}"/>
     </rm:provider>
   </rm:searchPath>
   <rm:searchPath name="workspace.project">
@@ -77,21 +78,21 @@
   </rm:searchPath>
   <rm:searchPath name="jetty">
     <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="p2">
-      <rm:uri format="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x"/>
+      <rm:uri format="${url.jetty}"/>
     </rm:provider>
   </rm:searchPath>
   <rm:searchPath name="orbit">
     <rm:provider componentTypes="osgi.bundle" readerType="p2" source="false" mutable="false">
       <rm:property key="buckminster.source" value="false"/>
       <rm:property key="buckminster.mutable" value="false"/>
-      <rm:uri format="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
+      <rm:uri format="${url.orbit}"/>
     </rm:provider>
   </rm:searchPath>
   <rm:searchPath name="restlet.maven">
     <rm:provider xsi:type="maven:MavenProvider" componentTypes="osgi.bundle" readerType="maven2" source="false" mutable="false">
       <rm:property key="buckminster.source" value="false"/>
       <rm:property key="buckminster.mutable" value="false"/>
-      <rm:uri format="http://maven.restlet.org"/>
+      <rm:uri format="${url.maven.restlet}"/>
       <maven:mappings>
         <maven:entry artifactId="org.restlet" groupId="org.restlet.osgi" name="org.restlet"/>
         <maven:entry artifactId="org.restlet.ext.net" groupId="org.restlet.osgi" name="org.restlet.ext.net"/>
@@ -104,7 +105,7 @@
     <rm:provider xsi:type="maven:MavenProvider" componentTypes="osgi.bundle" readerType="maven2" source="false" mutable="false">
       <rm:property key="buckminster.source" value="false"/>
       <rm:property key="buckminster.mutable" value="false"/>
-      <rm:uri format="http://central.maven.org/maven2"/>
+      <rm:uri format="${url.maven2}/maven2"/>
       <maven:mappings>
         <maven:entry artifactId="apache-jsp" groupId="org.mortbay.jasper" name="org.mortbay.jasper.apache-jsp"/>
         <maven:entry artifactId="apache-el" groupId="org.mortbay.jasper" name="org.mortbay.jasper.apache-el"/>
@@ -139,7 +140,7 @@
     <rm:provider componentTypes="osgi.bundle" readerType="p2" source="false" mutable="false">
       <rm:property key="buckminster.source" value="false"/>
       <rm:property key="buckminster.mutable" value="false"/>
-      <rm:uri format="https://sourceforge.net/projects/idempiere/files/binary.file/jarfile/zk-p2/zk-8.0.1.1/"/>
+      <rm:uri format="${url.zkoss.osgi}"/>
     </rm:provider>
   </rm:searchPath>
 </rm:rmap>
diff --git a/org.adempiere.sdk-feature/materialize.properties b/org.adempiere.sdk-feature/materialize.properties
new file mode 100644
index 0000000000..9deea9000d
--- /dev/null
+++ b/org.adempiere.sdk-feature/materialize.properties
@@ -0,0 +1,25 @@
+buckminster.download.source=true
+osgi.configuration.area.default=configuration
+osgi.user.area=${user.home}
+osgi.user.area.default=${user.home}
+target.os=*
+target.ws=*
+target.arch=*
+
+#local.repository.root=file:///mnt/data/dev/project/me/repository/stuff/setup.idempiere/localRepository
+local.repository.root.maven=http://central.maven.org/maven2
+
+url.maven2=http://central.maven.org
+url.maven2.lib=http://central.maven.org
+
+url.maven.zkoss=http://mavensync.zkoss.org
+url.maven.zkoss.lib=http://mavensync.zkoss.org
+url.zkoss.osgi=https://sourceforge.net/projects/idempiere/files/binary.file/jarfile/zk-p2/zk-8.0.1.1/
+
+url.maven.restlet=http://maven.restlet.org
+
+url.equinox=http://download.eclipse.org/eclipse/updates/4.4
+url.jetty=http://download.eclipse.org/jetty/updates/jetty-bundles-9.x
+url.orbit=http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository
+
+url.file.srv=http://downloads.sourceforge.net/project/idempiere/binary.file
diff --git a/org.adempiere.server-feature/copyjars.xml b/org.adempiere.server-feature/copyjars.xml
index 1f65c23d7e..3618581f55 100644
--- a/org.adempiere.server-feature/copyjars.xml
+++ b/org.adempiere.server-feature/copyjars.xml
@@ -1,40 +1,40 @@
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
 		<mkdir dir="data/seed" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/database/3.1/Adempiere_pg84.jar" dest="data/seed/Adempiere_pg84.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/database/3.1/Adempiere_pg.jar" dest="data/seed/Adempiere_pg.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/database/3.1/Adempiere.jar" dest="data/seed/Adempiere.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/database/3.1/Adempiere_pg84.jar" dest="data/seed/Adempiere_pg84.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/database/3.1/Adempiere_pg.jar" dest="data/seed/Adempiere_pg.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/database/3.1/Adempiere.jar" dest="data/seed/Adempiere.jar" usetimestamp="true" verbose="true" retries="5" />
 
 		<mkdir dir="../db/ddlutils/lib" />
-		<get src="http://central.maven.org/maven2/ant-contrib/ant-contrib/1.0b2/ant-contrib-1.0b2.jar" dest="../db/ddlutils/lib/ant-contrib-1.0b1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" dest="../db/ddlutils/lib/commons-beanutils-1.7.0.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/commons-betwixt/commons-betwixt/0.8/commons-betwixt-0.8.jar" dest="../db/ddlutils/lib/commons-betwixt-0.8-RC1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/commons-codec/commons-codec/1.3/commons-codec-1.3.jar" dest="../db/ddlutils/lib/commons-codec-1.3.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" dest="../db/ddlutils/lib/commons-collections-3.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/commons-dbcp/commons-dbcp/1.2.1/commons-dbcp-1.2.1.jar" dest="../db/ddlutils/lib/commons-dbcp-1.2.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/commons-digester/commons-digester/1.7/commons-digester-1.7.jar" dest="../db/ddlutils/lib/commons-digester-1.7.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/commons-lang/commons-lang/2.1/commons-lang-2.1.jar" dest="../db/ddlutils/lib/commons-lang-2.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" dest="../db/ddlutils/lib/commons-logging-1.0.4.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/commons-pool/commons-pool/1.2/commons-pool-1.2.jar" dest="../db/ddlutils/lib/commons-pool-1.2.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/org/apache/ddlutils/ddlutils/1.0/ddlutils-1.0.jar" dest="../db/ddlutils/lib/DdlUtils-1.0-RC1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/dom4j/dom4j/1.4/dom4j-1.4.jar" dest="../db/ddlutils/lib/dom4j-1.4.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/fyracle.jar" dest="../db/ddlutils/lib/fyracle.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/oro/oro/2.0.8/oro-2.0.8.jar" dest="../db/ddlutils/lib/jakarta-oro-2.0.8.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/oracle.jar" dest="../db/ddlutils/lib/oracle.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/postgresql.jar" dest="../db/ddlutils/lib/postgresql.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/stax/stax-api/1.0.1/stax-api-1.0.1.jar" dest="../db/ddlutils/lib/stax-api-1.0.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/woodstox/wstx-asl/3.0.2/wstx-asl-3.0.2.jar" dest="../db/ddlutils/lib/wstx-asl-3.0.2.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/ant-contrib/ant-contrib/1.0b2/ant-contrib-1.0b2.jar" dest="../db/ddlutils/lib/ant-contrib-1.0b1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" dest="../db/ddlutils/lib/commons-beanutils-1.7.0.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/commons-betwixt/commons-betwixt/0.8/commons-betwixt-0.8.jar" dest="../db/ddlutils/lib/commons-betwixt-0.8-RC1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/commons-codec/commons-codec/1.3/commons-codec-1.3.jar" dest="../db/ddlutils/lib/commons-codec-1.3.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" dest="../db/ddlutils/lib/commons-collections-3.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/commons-dbcp/commons-dbcp/1.2.1/commons-dbcp-1.2.1.jar" dest="../db/ddlutils/lib/commons-dbcp-1.2.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/commons-digester/commons-digester/1.7/commons-digester-1.7.jar" dest="../db/ddlutils/lib/commons-digester-1.7.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/commons-lang/commons-lang/2.1/commons-lang-2.1.jar" dest="../db/ddlutils/lib/commons-lang-2.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" dest="../db/ddlutils/lib/commons-logging-1.0.4.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/commons-pool/commons-pool/1.2/commons-pool-1.2.jar" dest="../db/ddlutils/lib/commons-pool-1.2.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/apache/ddlutils/ddlutils/1.0/ddlutils-1.0.jar" dest="../db/ddlutils/lib/DdlUtils-1.0-RC1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/dom4j/dom4j/1.4/dom4j-1.4.jar" dest="../db/ddlutils/lib/dom4j-1.4.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/fyracle.jar" dest="../db/ddlutils/lib/fyracle.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/oro/oro/2.0.8/oro-2.0.8.jar" dest="../db/ddlutils/lib/jakarta-oro-2.0.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/oracle.jar" dest="../db/ddlutils/lib/oracle.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/postgresql.jar" dest="../db/ddlutils/lib/postgresql.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/stax/stax-api/1.0.1/stax-api-1.0.1.jar" dest="../db/ddlutils/lib/stax-api-1.0.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/woodstox/wstx-asl/3.0.2/wstx-asl-3.0.2.jar" dest="../db/ddlutils/lib/wstx-asl-3.0.2.jar" usetimestamp="true" verbose="true" retries="5" />
 		<mkdir dir="../db/ddlutils/postgresql/pljava" />
-		<get src="http://central.maven.org/maven2/woodstox/wstx-asl/3.0.2/wstx-asl-3.0.2.jar" dest="../db/ddlutils/lib/wstx-asl-3.0.2.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/woodstox/wstx-asl/3.0.2/wstx-asl-3.0.2.jar" dest="../db/ddlutils/lib/wstx-asl-3.0.2.jar" usetimestamp="true" verbose="true" retries="5" />
 
 		<mkdir dir="../fitnesse/FitNesseRoot/FitLibraryWeb" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/101-20121212164242.zip" dest="../fitnesse/FitNesseRoot/FitLibraryWeb/101-20121212164242.zip" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/21-20121212154702.zip" dest="../fitnesse/FitNesseRoot/FitLibraryWeb/21-20121212154702.zip" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/6-20121212124109.zip" dest="../fitnesse/FitNesseRoot/FitLibraryWeb/6-20121212124109.zip" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/101-20121212164242.zip" dest="../fitnesse/FitNesseRoot/FitLibraryWeb/101-20121212164242.zip" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/21-20121212154702.zip" dest="../fitnesse/FitNesseRoot/FitLibraryWeb/21-20121212154702.zip" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/6-20121212124109.zip" dest="../fitnesse/FitNesseRoot/FitLibraryWeb/6-20121212124109.zip" usetimestamp="true" verbose="true" retries="5" />
 		<!-- maybe it's same file in org.idempiere.fitnesse.server, just diference version-->
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/fitnesse2.jar" dest="../fitnesse/fitnesse.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/fitnesse2.jar" dest="../fitnesse/fitnesse.jar" usetimestamp="true" verbose="true" retries="5" />
 
 		<mkdir dir="../ztl" />
-		<get src="http://mavensync.zkoss.org/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.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" />
 	</target>
 </project>
diff --git a/org.adempiere.server/copyjars.xml b/org.adempiere.server/copyjars.xml
index 6c571ab2c8..d189476b62 100644
--- a/org.adempiere.server/copyjars.xml
+++ b/org.adempiere.server/copyjars.xml
@@ -1,7 +1,7 @@
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
 		<mkdir dir="WEB-INF/lib" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/jardiff.jar" dest="WEB-INF/lib/jardiff.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/jnlp-servlet.jar" dest="WEB-INF/lib/jnlp-servlet.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/jardiff.jar" dest="WEB-INF/lib/jardiff.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/jnlp-servlet.jar" dest="WEB-INF/lib/jnlp-servlet.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
diff --git a/org.adempiere.ui.swing/copyjars.xml b/org.adempiere.ui.swing/copyjars.xml
index 9e1e200986..d70adbdc06 100644
--- a/org.adempiere.ui.swing/copyjars.xml
+++ b/org.adempiere.ui.swing/copyjars.xml
@@ -1,9 +1,9 @@
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
-		<get src="http://central.maven.org/maven2/org/swinglabs/swingx/1.6/swingx-1.6.jar" dest="swingx-1.6.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/com/jgoodies/looks/2.0.4/looks-2.0.4.jar" dest="looks-2.0.4.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/swinglabs/swingx/1.6/swingx-1.6.jar" dest="swingx-1.6.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/com/jgoodies/looks/2.0.4/looks-2.0.4.jar" dest="looks-2.0.4.jar" usetimestamp="true" verbose="true" retries="5" />
 		<!-- old version is only for swing, but can't find out old version, so use jar for Swing, SWT and JavaFX to keep same version -->
-		<get src="http://central.maven.org/maven2/com/miglayout/miglayout/3.7.1/miglayout-3.7.1.jar" dest="miglayout-3.7.1-swing.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/jpedal.jar" dest="jpedal.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/com/miglayout/miglayout/3.7.1/miglayout-3.7.1.jar" dest="miglayout-3.7.1-swing.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/jpedal.jar" dest="jpedal.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
diff --git a/org.adempiere.ui.zk/copyjars.xml b/org.adempiere.ui.zk/copyjars.xml
index 611171cf52..5ff30c5b5a 100644
--- a/org.adempiere.ui.zk/copyjars.xml
+++ b/org.adempiere.ui.zk/copyjars.xml
@@ -1,11 +1,11 @@
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
 		<mkdir dir="WEB-INF/lib" />
-		<get src="http://central.maven.org/maven2/org/atmosphere/atmosphere-compat-jbossweb/1.0.4/atmosphere-compat-jbossweb-1.0.4.jar" dest="WEB-INF/lib/atmosphere-compat-jbossweb-1.0.4.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/org/atmosphere/atmosphere-compat-tomcat/1.0.4/atmosphere-compat-tomcat-1.0.4.jar" dest="WEB-INF/lib/atmosphere-compat-tomcat-1.0.4.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/org/atmosphere/atmosphere-compat-tomcat7/1.0.4/atmosphere-compat-tomcat7-1.0.4.jar" dest="WEB-INF/lib/atmosphere-compat-tomcat7-1.0.4.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/org/atmosphere/atmosphere-runtime/1.0.4/atmosphere-runtime-1.0.4.jar" dest="WEB-INF/lib/atmosphere-runtime-1.0.4.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/labelapplet.jar" dest="labelapplet.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/atmosphere/atmosphere-compat-jbossweb/1.0.4/atmosphere-compat-jbossweb-1.0.4.jar" dest="WEB-INF/lib/atmosphere-compat-jbossweb-1.0.4.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/atmosphere/atmosphere-compat-tomcat/1.0.4/atmosphere-compat-tomcat-1.0.4.jar" dest="WEB-INF/lib/atmosphere-compat-tomcat-1.0.4.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/atmosphere/atmosphere-compat-tomcat7/1.0.4/atmosphere-compat-tomcat7-1.0.4.jar" dest="WEB-INF/lib/atmosphere-compat-tomcat7-1.0.4.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/atmosphere/atmosphere-runtime/1.0.4/atmosphere-runtime-1.0.4.jar" dest="WEB-INF/lib/atmosphere-runtime-1.0.4.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/labelapplet.jar" dest="labelapplet.jar" usetimestamp="true" verbose="true" retries="5" />
 
 	</target>
 </project>
diff --git a/org.adempiere.ui/copyjars.xml b/org.adempiere.ui/copyjars.xml
index 64e0f1064b..413280cc05 100644
--- a/org.adempiere.ui/copyjars.xml
+++ b/org.adempiere.ui/copyjars.xml
@@ -1,10 +1,10 @@
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
 		<!--in maven has newer version, but now keep old version
-		http://central.maven.org/maven2/org/codeartisans/thirdparties/swing/org-netbeans-api-visual/2.23.1/org-netbeans-api-visual-2.23.1.jar
-		http://central.maven.org/maven2/org/codeartisans/thirdparties/swing/org-openide-util/8.6.2/org-openide-util-8.6.2.jar
+		${url.maven2.lib}/maven2/org/codeartisans/thirdparties/swing/org-netbeans-api-visual/2.23.1/org-netbeans-api-visual-2.23.1.jar
+		${url.maven2.lib}/maven2/org/codeartisans/thirdparties/swing/org-openide-util/8.6.2/org-openide-util-8.6.2.jar
 		-->
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/org-netbeans-api-visual.jar" dest="org-netbeans-api-visual.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/org-openide-util.jar" dest="org-openide-util.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/org-netbeans-api-visual.jar" dest="org-netbeans-api-visual.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/org-openide-util.jar" dest="org-openide-util.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
diff --git a/org.compiere.db.oracle.provider/copyjars.xml b/org.compiere.db.oracle.provider/copyjars.xml
index 77cf8bbbb6..6845e944e5 100644
--- a/org.compiere.db.oracle.provider/copyjars.xml
+++ b/org.compiere.db.oracle.provider/copyjars.xml
@@ -1,8 +1,8 @@
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
-		<get src="http://central.maven.org/maven2/com/mchange/c3p0/0.9.5/c3p0-0.9.5.jar" dest="c3p0-0.9.5.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/com/mchange/mchange-commons-java/0.2.9/mchange-commons-java-0.2.9.jar" dest="mchange-commons-java-0.2.9.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/c3p0-oracle-thin-extras-0.9.5.jar" dest="c3p0-oracle-thin-extras-0.9.5.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/ojdbc7.jar" dest="ojdbc7.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/com/mchange/c3p0/0.9.5/c3p0-0.9.5.jar" dest="c3p0-0.9.5.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/com/mchange/mchange-commons-java/0.2.9/mchange-commons-java-0.2.9.jar" dest="mchange-commons-java-0.2.9.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/c3p0-oracle-thin-extras-0.9.5.jar" dest="c3p0-oracle-thin-extras-0.9.5.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/ojdbc7.jar" dest="ojdbc7.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
diff --git a/org.compiere.db.postgresql.provider/copyjars.xml b/org.compiere.db.postgresql.provider/copyjars.xml
index d95d6b8b4c..bff1f0e785 100644
--- a/org.compiere.db.postgresql.provider/copyjars.xml
+++ b/org.compiere.db.postgresql.provider/copyjars.xml
@@ -1,7 +1,7 @@
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
-		<get src="http://central.maven.org/maven2/org/postgresql/postgresql/9.4-1206-jdbc41/postgresql-9.4-1206-jdbc41.jar" dest="postgresql-9.4-1206.jdbc41.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/com/mchange/c3p0/0.9.5/c3p0-0.9.5.jar" dest="c3p0-0.9.5.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/com/mchange/mchange-commons-java/0.2.9/mchange-commons-java-0.2.9.jar" dest="mchange-commons-java-0.2.9.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/postgresql/postgresql/9.4-1206-jdbc41/postgresql-9.4-1206-jdbc41.jar" dest="postgresql-9.4-1206.jdbc41.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/com/mchange/c3p0/0.9.5/c3p0-0.9.5.jar" dest="c3p0-0.9.5.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/com/mchange/mchange-commons-java/0.2.9/mchange-commons-java-0.2.9.jar" dest="mchange-commons-java-0.2.9.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
diff --git a/org.idempiere.fitnesse.server/copyjars.xml b/org.idempiere.fitnesse.server/copyjars.xml
index f7c22ea584..394d7efa81 100644
--- a/org.idempiere.fitnesse.server/copyjars.xml
+++ b/org.idempiere.fitnesse.server/copyjars.xml
@@ -1,16 +1,16 @@
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
 		<mkdir dir="lib" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/fitlibrary-2.0.jar" dest="lib/fitlibrary-2.0.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/fitnesse.jar" dest="lib/fitnesse.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/fitlibraryweb-2.0.jar" dest="lib/fitlibraryweb-2.0.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/fitlibrary-2.0.jar" dest="lib/fitlibrary-2.0.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/fitnesse.jar" dest="lib/fitnesse.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/fitlibraryweb-2.0.jar" dest="lib/fitlibraryweb-2.0.jar" usetimestamp="true" verbose="true" retries="5" />
 		<!--old version is 2.35, can't find out in maven also homepage.
 		when host old version (2.35) to bitbucket.org can't donwload by ant, maybe big file (even it's download normal with browse). 
 		
 		not sure why use a standalone (full) version.
-		in case use lib version, we can download at maven, it's small http://central.maven.org/maven2/org/seleniumhq/selenium/selenium-server/2.35.0/selenium-server-2.35.0.jar-->
+		in case use lib version, we can download at maven, it's small ${url.maven2.lib}/maven2/org/seleniumhq/selenium/selenium-server/2.35.0/selenium-server-2.35.0.jar-->
 		<get src="http://selenium-release.storage.googleapis.com/2.39/selenium-server-standalone-2.39.0.jar" dest="lib/selenium-server-standalone-2.35.0.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/log4j/log4j/1.2.16/log4j-1.2.16.jar" dest="lib/log4j-1.2.16.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/com/github/detro/ghostdriver/phantomjsdriver/1.0.3/phantomjsdriver-1.0.3.jar" dest="lib/phantomjsdriver-1.0.3.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/log4j/log4j/1.2.16/log4j-1.2.16.jar" dest="lib/log4j-1.2.16.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/com/github/detro/ghostdriver/phantomjsdriver/1.0.3/phantomjsdriver-1.0.3.jar" dest="lib/phantomjsdriver-1.0.3.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
diff --git a/org.idempiere.hazelcast.service/copyjars.xml b/org.idempiere.hazelcast.service/copyjars.xml
index bf042c63b1..7a8e1e61c2 100644
--- a/org.idempiere.hazelcast.service/copyjars.xml
+++ b/org.idempiere.hazelcast.service/copyjars.xml
@@ -1,6 +1,6 @@
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
-		<get src="http://central.maven.org/maven2/com/hazelcast/hazelcast/3.5.3/hazelcast-3.5.3.jar" dest="hazelcast-3.5.3.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/com/hazelcast/hazelcast-cloud/3.5.3/hazelcast-cloud-3.5.3.jar" dest="hazelcast-cloud-3.5.3.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/com/hazelcast/hazelcast/3.5.3/hazelcast-3.5.3.jar" dest="hazelcast-3.5.3.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/com/hazelcast/hazelcast-cloud/3.5.3/hazelcast-cloud-3.5.3.jar" dest="hazelcast-cloud-3.5.3.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
diff --git a/org.idempiere.webservices/copyjars.xml b/org.idempiere.webservices/copyjars.xml
index 9e6feb544f..07c9c9d47b 100644
--- a/org.idempiere.webservices/copyjars.xml
+++ b/org.idempiere.webservices/copyjars.xml
@@ -1,26 +1,26 @@
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
 		<mkdir dir="WEB-INF/lib" />
-		<get src="http://central.maven.org/maven2/org/springframework/osgi/spring-osgi-extender/1.2.1/spring-osgi-extender-1.2.1.jar" dest="WEB-INF/lib/spring-osgi-extender-1.2.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/org/springframework/spring-aop/3.0.7.RELEASE/spring-aop-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-aop-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/org/codehaus/woodstox/stax2-api/3.1.1/stax2-api-3.1.1.jar" dest="WEB-INF/lib/stax2-api-3.1.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/org/springframework/spring-web/3.0.7.RELEASE/spring-web-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-web-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/org/springframework/spring-context/3.0.7.RELEASE/spring-context-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-context-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/org/springframework/spring-beans/3.0.7.RELEASE/spring-beans-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-beans-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/org/springframework/spring-core/3.0.7.RELEASE/spring-core-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-core-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/org/springframework/spring-asm/3.0.7.RELEASE/spring-asm-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-asm-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/org/springframework/spring-expression/3.0.7.RELEASE/spring-expression-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-expression-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar" dest="WEB-INF/lib/wsdl4j-1.6.2.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/org/apache/cxf/cxf-bundle/2.6.2/cxf-bundle-2.6.2.jar" dest="WEB-INF/lib/cxf-2.6.2.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/org/apache/neethi/neethi/3.0.2/neethi-3.0.2.jar" dest="WEB-INF/lib/neethi-3.0.2.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/org/apache/ws/xmlschema/xmlschema-core/2.0.3/xmlschema-core-2.0.3.jar" dest="WEB-INF/lib/xmlschema-core-2.0.3.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/org/apache/cxf/cxf-rt-frontend-jaxws/2.6.1/cxf-rt-frontend-jaxws-2.6.1.jar" dest="WEB-INF/lib/cxf-rt-frontend-jaxws-2.6.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/xmlbeans-2.5.0.jar" dest="WEB-INF/lib/xmlbeans-2.5.0.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" dest="WEB-INF/lib/aopalliance-1.0.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/3.1/idempiere-xmlbeans-1.0.jar" dest="WEB-INF/lib/idempiere-xmlbeans-1.0.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/org/apache/axis/axis/1.4/axis-1.4.jar" dest="WEB-INF/lib/axis.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/commons-discovery/commons-discovery/0.5/commons-discovery-0.5.jar" dest="WEB-INF/lib/commons-discovery-0.5.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://central.maven.org/maven2/javax/ws/rs/jsr311-api/1.1/jsr311-api-1.1.jar" dest="WEB-INF/lib/jsr311-api-1.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/springframework/osgi/spring-osgi-extender/1.2.1/spring-osgi-extender-1.2.1.jar" dest="WEB-INF/lib/spring-osgi-extender-1.2.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/springframework/spring-aop/3.0.7.RELEASE/spring-aop-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-aop-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/codehaus/woodstox/stax2-api/3.1.1/stax2-api-3.1.1.jar" dest="WEB-INF/lib/stax2-api-3.1.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/springframework/spring-web/3.0.7.RELEASE/spring-web-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-web-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/springframework/spring-context/3.0.7.RELEASE/spring-context-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-context-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/springframework/spring-beans/3.0.7.RELEASE/spring-beans-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-beans-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/springframework/spring-core/3.0.7.RELEASE/spring-core-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-core-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/springframework/spring-asm/3.0.7.RELEASE/spring-asm-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-asm-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/springframework/spring-expression/3.0.7.RELEASE/spring-expression-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-expression-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar" dest="WEB-INF/lib/wsdl4j-1.6.2.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/apache/cxf/cxf-bundle/2.6.2/cxf-bundle-2.6.2.jar" dest="WEB-INF/lib/cxf-2.6.2.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/apache/neethi/neethi/3.0.2/neethi-3.0.2.jar" dest="WEB-INF/lib/neethi-3.0.2.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/apache/ws/xmlschema/xmlschema-core/2.0.3/xmlschema-core-2.0.3.jar" dest="WEB-INF/lib/xmlschema-core-2.0.3.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/apache/cxf/cxf-rt-frontend-jaxws/2.6.1/cxf-rt-frontend-jaxws-2.6.1.jar" dest="WEB-INF/lib/cxf-rt-frontend-jaxws-2.6.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/xmlbeans-2.5.0.jar" dest="WEB-INF/lib/xmlbeans-2.5.0.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" dest="WEB-INF/lib/aopalliance-1.0.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/idempiere-xmlbeans-1.0.jar" dest="WEB-INF/lib/idempiere-xmlbeans-1.0.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/apache/axis/axis/1.4/axis-1.4.jar" dest="WEB-INF/lib/axis.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/commons-discovery/commons-discovery/0.5/commons-discovery-0.5.jar" dest="WEB-INF/lib/commons-discovery-0.5.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/javax/ws/rs/jsr311-api/1.1/jsr311-api-1.1.jar" dest="WEB-INF/lib/jsr311-api-1.1.jar" usetimestamp="true" verbose="true" retries="5" />
 
 	</target>
 </project>
diff --git a/org.slf4j.jdk14/copyjars.xml b/org.slf4j.jdk14/copyjars.xml
index ecc90a359f..2bceb023f2 100644
--- a/org.slf4j.jdk14/copyjars.xml
+++ b/org.slf4j.jdk14/copyjars.xml
@@ -1,5 +1,5 @@
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
-		<get src="http://central.maven.org/maven2/org/slf4j/slf4j-jdk14/1.7.2/slf4j-jdk14-1.7.2.jar" dest="slf4j-jdk14-1.7.2.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/slf4j/slf4j-jdk14/1.7.2/slf4j-jdk14-1.7.2.jar" dest="slf4j-jdk14-1.7.2.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
diff --git a/org.w3c.dom.fragment/copyjars.xml b/org.w3c.dom.fragment/copyjars.xml
index 81fd55a561..5f3ec9b3ea 100644
--- a/org.w3c.dom.fragment/copyjars.xml
+++ b/org.w3c.dom.fragment/copyjars.xml
@@ -1,5 +1,5 @@
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
-		<get src="http://central.maven.org/maven2/org/apache/xmlgraphics/batik-ext/1.7/batik-ext-1.7.jar" dest="batik-ext.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/apache/xmlgraphics/batik-ext/1.7/batik-ext-1.7.jar" dest="batik-ext.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>

From 2787e6272ee80ade526373914631c96913f938c3 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Thu, 7 Jul 2016 13:51:09 +0700
Subject: [PATCH 02/34] IDEMPIERE-2968:make all url as properties let idempiere
 can total material with offline repository temp commit for use local
 repository to speed up test materialize

---
 org.adempiere.sdk-feature/adempiere.cquery | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/org.adempiere.sdk-feature/adempiere.cquery b/org.adempiere.sdk-feature/adempiere.cquery
index 83fb2c90db..18b2fc7b83 100644
--- a/org.adempiere.sdk-feature/adempiere.cquery
+++ b/org.adempiere.sdk-feature/adempiere.cquery
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="adempiere.rmap" properties="materialize.properties">
+<?xml version="1.0" encoding="UTF-8"?><cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="adempiere.rmap" properties="file:/mnt/data/dev/project/me/repository/stuff/setup.idempiere/materialize.local.properties">
     <cq:rootRequest name="org.adempiere.sdk" componentType="eclipse.feature"/>
     <cq:property key="buckminster.download.source" value="true"/>
     <cq:property key="osgi.configuration.area.default" value="configuration"/>
@@ -29,7 +29,7 @@
     <cq:advisorNode namePattern="^javax\.el$" componentType="osgi.bundle" versionOverride="[3.0.0,3.1.0)"/>
     <cq:advisorNode namePattern="^org\.apache\.servicemix\.bundles\.cglib$" componentType="osgi.bundle" versionOverride="raw:[3.1.0.'1',3.1.0.'1']/format(n[.n=0;[.n=0;]][d?S=M;]):3.1_1,3.1_1"/>
     <cq:advisorNode namePattern="^org\.eclipse\.jetty\.osgi-servlet-api$" versionOverride="[3.1.0.M0,3.1.0.M0]"/>
-    <cq:advisorNode namePattern="^org\.eclipse\.jetty(\..+)?" versionOverride="[9.2.0,9.3.0)"/>
+    <cq:advisorNode namePattern="^org\.eclipse\.jetty(\..+)?" versionOverride="[9.2.0,9.4.0)"/>
     <cq:advisorNode namePattern="^javax\.annotation-api$" versionOverride="[1.2.0,1.2.0]"/>
     <cq:advisorNode namePattern="^org\.apache\.felix\.webconsole\.plugins\.packageadmin$" versionOverride="[1.0.0,1.0.0]"/>
     <cq:advisorNode namePattern="org.apache.commons.io" componentType="osgi.bundle" versionOverride="[1.4.0,2.0.0)"/>

From fb64d75f34b15b5d2b7eb9fba53375418afcae5a Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Thu, 7 Jul 2016 13:51:26 +0700
Subject: [PATCH 03/34] IDEMPIERE-3136:all stuff relate library of idempiere
 plug-in warning about miss file

---
 org.adempiere.ui.zk/build.properties | 3 +--
 org.adempiere.ui/build.properties    | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/org.adempiere.ui.zk/build.properties b/org.adempiere.ui.zk/build.properties
index 5dd41b4241..b0771035e9 100644
--- a/org.adempiere.ui.zk/build.properties
+++ b/org.adempiere.ui.zk/build.properties
@@ -52,5 +52,4 @@ src.includes = WEB-INF/tld/,\
                theme/default/zul/calendar/divarrow.zul,\
                theme/default/zul/calendar/divtab.zul
 source.. = WEB-INF/src/
-bin.excludes = WEB-INF/src/,\
-               WEB-INF/web-2.5.xml
+bin.excludes = WEB-INF/src/
diff --git a/org.adempiere.ui/build.properties b/org.adempiere.ui/build.properties
index 03b6e34ea0..972223bfbc 100644
--- a/org.adempiere.ui/build.properties
+++ b/org.adempiere.ui/build.properties
@@ -2,6 +2,5 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                org-netbeans-api-visual.jar,\
-               org-openide-util.jar,\
-               plugin.xml
+               org-openide-util.jar
 source.. = src/

From 4ae72bb0503ac289cc1dd3a1b9abaeb31cb2f66d Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Thu, 7 Jul 2016 10:14:33 +0700
Subject: [PATCH 04/34] IDEMPIERE-3136:all stuff relate library of idempiere
 because each project don't have partical build setting, so let control from
 workspace

---
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 org.adempiere.base/.classpath                   | 17 +++++++----------
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 ...rg.eclipse.wst.common.project.facet.core.xml |  4 ++--
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 org.adempiere.report.jasper.library/.classpath  |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 ...rg.eclipse.wst.common.project.facet.core.xml |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 org.adempiere.report.jasper/.classpath          |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 ...rg.eclipse.wst.common.project.facet.core.xml |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 org.adempiere.ui.swing/.classpath               |  5 +----
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 ...rg.eclipse.wst.common.project.facet.core.xml |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs        | 11 -----------
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 org.idempiere.ui.zk.selenium/.classpath         |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs        | 11 -----------
 ...rg.eclipse.wst.common.project.facet.core.xml |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 .../.settings/org.eclipse.jdt.core.prefs        |  7 -------
 46 files changed, 17 insertions(+), 283 deletions(-)
 delete mode 100644 org.adempiere.base.callout/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.adempiere.base/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.adempiere.eclipse.equinox.http.servlet/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.adempiere.eclipse.equinox.http.servletbridge/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.adempiere.extend/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.adempiere.install/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.adempiere.payment.processor/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.adempiere.pipo.handlers/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.adempiere.pipo/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.adempiere.replication.server/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.adempiere.report.jasper.webapp/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.adempiere.server/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.adempiere.ui.swing/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.adempiere.ui/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.apache.ecs/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.idempiere.fitnesse.server/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.idempiere.fitrecorder/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.idempiere.hazelcast.service.config/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.idempiere.hazelcast.service/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.idempiere.ui.zk.selenium/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.idempiere.webservices/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.w3c.dom.fragment/.settings/org.eclipse.jdt.core.prefs

diff --git a/org.adempiere.base.callout/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.base.callout/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.adempiere.base.callout/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.base/.classpath b/org.adempiere.base/.classpath
index 21a8494ee6..1259840649 100644
--- a/org.adempiere.base/.classpath
+++ b/org.adempiere.base/.classpath
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="bsh-2.0b6.jar"/>
 	<classpathentry exported="true" kind="lib" path="passay-1.0.jar"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="bsh-engine.jar"/>
 	<classpathentry exported="true" kind="lib" path="groovy-engine.jar"/>
 	<classpathentry exported="true" kind="lib" path="jython-engine.jar"/>
@@ -18,13 +22,6 @@
 	<classpathentry exported="true" kind="lib" path="super-csv-2.2.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="barcode4j-2.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="bcprov-jdk15on-1.46.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-		<accessrules>
-			<accessrule kind="accessible" pattern="com/sun/rowset/**"/>
-		</accessrules>
-	</classpathentry>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.base/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.adempiere.base/.settings/org.eclipse.wst.common.project.facet.core.xml
index 81c1656497..e189c6ca7f 100644
--- a/org.adempiere.base/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.adempiere.base/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <fixed facet="jst.java"/>
   <fixed facet="jst.utility"/>
+  <fixed facet="jst.java"/>
   <installed facet="jst.utility" version="1.0"/>
-  <installed facet="jst.java" version="1.7"/>
+  <installed facet="jst.java" version="1.8"/>
 </faceted-project>
diff --git a/org.adempiere.eclipse.equinox.http.servlet/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.eclipse.equinox.http.servlet/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.adempiere.eclipse.equinox.http.servlet/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.eclipse.equinox.http.servletbridge/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.eclipse.equinox.http.servletbridge/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.adempiere.eclipse.equinox.http.servletbridge/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.extend/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.extend/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.adempiere.extend/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.install/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.install/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.adempiere.install/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.payment.processor/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.payment.processor/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.adempiere.payment.processor/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.pipo.handlers/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.pipo.handlers/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.adempiere.pipo.handlers/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.pipo/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.pipo/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.adempiere.pipo/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.replication.server/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.replication.server/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.adempiere.replication.server/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.report.jasper.library/.classpath b/org.adempiere.report.jasper.library/.classpath
index 43f6eff121..8cb7f125a5 100644
--- a/org.adempiere.report.jasper.library/.classpath
+++ b/org.adempiere.report.jasper.library/.classpath
@@ -9,7 +9,7 @@
 	<classpathentry exported="true" kind="lib" path="lib/jasperreports-fonts-5.6.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jackson-core-2.1.4.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xalan-2.7.1.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
diff --git a/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.project.facet.core.xml
index 81c1656497..b84ac01796 100644
--- a/org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -3,5 +3,5 @@
   <fixed facet="jst.java"/>
   <fixed facet="jst.utility"/>
   <installed facet="jst.utility" version="1.0"/>
-  <installed facet="jst.java" version="1.7"/>
+  <installed facet="jst.java" version="1.8"/>
 </faceted-project>
diff --git a/org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.report.jasper.webapp/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper.webapp/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.adempiere.report.jasper.webapp/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.report.jasper/.classpath b/org.adempiere.report.jasper/.classpath
index c0c50b3955..8ef9ba4ba1 100644
--- a/org.adempiere.report.jasper/.classpath
+++ b/org.adempiere.report.jasper/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry excluding="org/compiere/report/ReportExporter.java" kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
diff --git a/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.report.jasper/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.adempiere.report.jasper/.settings/org.eclipse.wst.common.project.facet.core.xml
index 81c1656497..b84ac01796 100644
--- a/org.adempiere.report.jasper/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.adempiere.report.jasper/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -3,5 +3,5 @@
   <fixed facet="jst.java"/>
   <fixed facet="jst.utility"/>
   <installed facet="jst.utility" version="1.0"/>
-  <installed facet="jst.java" version="1.7"/>
+  <installed facet="jst.java" version="1.8"/>
 </faceted-project>
diff --git a/org.adempiere.server/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.server/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.adempiere.server/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.ui.swing/.classpath b/org.adempiere.ui.swing/.classpath
index 92009dc82c..b8bdcb106a 100644
--- a/org.adempiere.ui.swing/.classpath
+++ b/org.adempiere.ui.swing/.classpath
@@ -6,13 +6,10 @@
 	<classpathentry exported="true" kind="lib" path="looks-2.0.4.jar"/>
 	<classpathentry exported="true" kind="lib" path="miglayout-3.7.1-swing.jar"/>
 	<classpathentry exported="true" kind="lib" path="jpedal.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
-		<accessrules>
-			<accessrule kind="accessible" pattern="sun/awt/**"/>
-		</accessrules>
 	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.adempiere.ui.swing/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.ui.swing/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.adempiere.ui.swing/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.ui.swing/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.adempiere.ui.swing/.settings/org.eclipse.wst.common.project.facet.core.xml
index 81c1656497..b84ac01796 100644
--- a/org.adempiere.ui.swing/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.adempiere.ui.swing/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -3,5 +3,5 @@
   <fixed facet="jst.java"/>
   <fixed facet="jst.utility"/>
   <installed facet="jst.utility" version="1.0"/>
-  <installed facet="jst.java" version="1.7"/>
+  <installed facet="jst.java" version="1.8"/>
 </faceted-project>
diff --git a/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7341ab1683..0000000000
--- a/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.ui/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.adempiere.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs b/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs b/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs b/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.idempiere.fitnesse.server/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.fitnesse.server/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.idempiere.fitnesse.server/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.idempiere.fitrecorder/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.fitrecorder/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.idempiere.fitrecorder/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.idempiere.hazelcast.service.config/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.hazelcast.service.config/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.idempiere.hazelcast.service.config/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.idempiere.hazelcast.service/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.hazelcast.service/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.idempiere.hazelcast.service/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.idempiere.ui.zk.selenium/.classpath b/org.idempiere.ui.zk.selenium/.classpath
index fc99fa8cfa..b86e2264a8 100644
--- a/org.idempiere.ui.zk.selenium/.classpath
+++ b/org.idempiere.ui.zk.selenium/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
diff --git a/org.idempiere.ui.zk.selenium/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.ui.zk.selenium/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7341ab1683..0000000000
--- a/org.idempiere.ui.zk.selenium/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.idempiere.ui.zk.selenium/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.idempiere.ui.zk.selenium/.settings/org.eclipse.wst.common.project.facet.core.xml
index bc0009a455..f4ef8aa0a5 100644
--- a/org.idempiere.ui.zk.selenium/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.idempiere.ui.zk.selenium/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <installed facet="java" version="1.7"/>
+  <installed facet="java" version="1.8"/>
 </faceted-project>
diff --git a/org.idempiere.webservices/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.webservices/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 11f6e462df..0000000000
--- a/org.idempiere.webservices/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.w3c.dom.fragment/.settings/org.eclipse.jdt.core.prefs b/org.w3c.dom.fragment/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.w3c.dom.fragment/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7

From 234df35c24b20bbce450fff904b615b1b26183f8 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Thu, 7 Jul 2016 10:14:50 +0700
Subject: [PATCH 05/34] IDEMPIERE-3136:all stuff relate library of idempiere
 because each project don't have partical build setting, so let control from
 workspace

---
 .../.settings/org.eclipse.jdt.core.prefs                   | 7 +++++++
 .../.settings/org.eclipse.jdt.core.prefs                   | 7 +++++++
 .../.settings/org.eclipse.jdt.core.prefs                   | 7 +++++++
 .../.settings/org.eclipse.jdt.core.prefs                   | 7 +++++++
 4 files changed, 28 insertions(+)
 create mode 100644 org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 org.adempiere.ui.swing/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 org.idempiere.ui.zk.selenium/.settings/org.eclipse.jdt.core.prefs

diff --git a/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..0c68a61dca
--- /dev/null
+++ b/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..0c68a61dca
--- /dev/null
+++ b/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.adempiere.ui.swing/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.ui.swing/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..0c68a61dca
--- /dev/null
+++ b/org.adempiere.ui.swing/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.idempiere.ui.zk.selenium/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.ui.zk.selenium/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..0c68a61dca
--- /dev/null
+++ b/org.idempiere.ui.zk.selenium/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8

From d4512dc40d202974963ea68c7b98fc2bee95e712 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Thu, 7 Jul 2016 10:47:36 +0700
Subject: [PATCH 06/34] IDEMPIERE-3136:all stuff relate library of idempiere
 setting classpath of jre to workspace default jre. other some time we
 encounter bellow error with project have faceted like org.adempiere.base
 Access restriction: The constructor 'Some class' is not API (restriction on
 required library '/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/rt.jar')	Some
 class.java

---
 org.adempiere.base/.classpath                  | 2 +-
 org.adempiere.report.jasper.library/.classpath | 2 +-
 org.adempiere.report.jasper/.classpath         | 2 +-
 org.adempiere.ui.swing/.classpath              | 2 +-
 org.idempiere.ui.zk.selenium/.classpath        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/org.adempiere.base/.classpath b/org.adempiere.base/.classpath
index 1259840649..53f016ef63 100644
--- a/org.adempiere.base/.classpath
+++ b/org.adempiere.base/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
diff --git a/org.adempiere.report.jasper.library/.classpath b/org.adempiere.report.jasper.library/.classpath
index 8cb7f125a5..43f6eff121 100644
--- a/org.adempiere.report.jasper.library/.classpath
+++ b/org.adempiere.report.jasper.library/.classpath
@@ -9,7 +9,7 @@
 	<classpathentry exported="true" kind="lib" path="lib/jasperreports-fonts-5.6.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jackson-core-2.1.4.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xalan-2.7.1.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
diff --git a/org.adempiere.report.jasper/.classpath b/org.adempiere.report.jasper/.classpath
index 8ef9ba4ba1..c0c50b3955 100644
--- a/org.adempiere.report.jasper/.classpath
+++ b/org.adempiere.report.jasper/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry excluding="org/compiere/report/ReportExporter.java" kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
diff --git a/org.adempiere.ui.swing/.classpath b/org.adempiere.ui.swing/.classpath
index b8bdcb106a..280a2c35b9 100644
--- a/org.adempiere.ui.swing/.classpath
+++ b/org.adempiere.ui.swing/.classpath
@@ -6,7 +6,7 @@
 	<classpathentry exported="true" kind="lib" path="looks-2.0.4.jar"/>
 	<classpathentry exported="true" kind="lib" path="miglayout-3.7.1-swing.jar"/>
 	<classpathentry exported="true" kind="lib" path="jpedal.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
diff --git a/org.idempiere.ui.zk.selenium/.classpath b/org.idempiere.ui.zk.selenium/.classpath
index b86e2264a8..fc99fa8cfa 100644
--- a/org.idempiere.ui.zk.selenium/.classpath
+++ b/org.idempiere.ui.zk.selenium/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>

From 116cde1e969ed0d33b6691f80dbddf45979fc7e0 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Thu, 7 Jul 2016 10:59:31 +0700
Subject: [PATCH 07/34] IDEMPIERE-3136:all stuff relate library of idempiere
 set runtime of all project to 1.8

---
 org.adempiere.base.callout/META-INF/MANIFEST.MF                 | 2 +-
 org.adempiere.base.process/META-INF/MANIFEST.MF                 | 2 +-
 org.adempiere.base/META-INF/MANIFEST.MF                         | 2 +-
 org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF | 2 +-
 .../META-INF/MANIFEST.MF                                        | 2 +-
 .../META-INF/MANIFEST.MF                                        | 2 +-
 org.adempiere.extend/META-INF/MANIFEST.MF                       | 2 +-
 org.adempiere.install/META-INF/MANIFEST.MF                      | 2 +-
 org.adempiere.payment.processor/META-INF/MANIFEST.MF            | 2 +-
 org.adempiere.pipo.handlers/META-INF/MANIFEST.MF                | 2 +-
 org.adempiere.pipo/META-INF/MANIFEST.MF                         | 2 +-
 org.adempiere.plugin.utils/META-INF/MANIFEST.MF                 | 2 +-
 org.adempiere.replication.server/META-INF/MANIFEST.MF           | 2 +-
 org.adempiere.replication/META-INF/MANIFEST.MF                  | 2 +-
 org.adempiere.report.jasper.library/META-INF/MANIFEST.MF        | 2 +-
 org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF          | 2 +-
 org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF         | 2 +-
 org.adempiere.report.jasper/META-INF/MANIFEST.MF                | 2 +-
 org.adempiere.server/META-INF/MANIFEST.MF                       | 2 +-
 org.adempiere.ui.swing/META-INF/MANIFEST.MF                     | 2 +-
 org.adempiere.ui.zk/META-INF/MANIFEST.MF                        | 2 +-
 org.adempiere.ui/META-INF/MANIFEST.MF                           | 2 +-
 org.adempiere.webstore.resource/META-INF/MANIFEST.MF            | 2 +-
 org.adempiere.webstore.servlet/META-INF/MANIFEST.MF             | 2 +-
 org.adempiere.webstore/META-INF/MANIFEST.MF                     | 2 +-
 org.apache.ecs/META-INF/MANIFEST.MF                             | 2 +-
 org.compiere.db.oracle.provider/META-INF/MANIFEST.MF            | 2 +-
 org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF        | 2 +-
 org.idempiere.felix.webconsole/META-INF/MANIFEST.MF             | 2 +-
 org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF             | 2 +-
 org.idempiere.fitnesse.server/META-INF/MANIFEST.MF              | 2 +-
 org.idempiere.fitrecorder/META-INF/MANIFEST.MF                  | 2 +-
 org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF     | 2 +-
 org.idempiere.hazelcast.service/META-INF/MANIFEST.MF            | 2 +-
 org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF               | 2 +-
 org.idempiere.webservices/META-INF/MANIFEST.MF                  | 2 +-
 org.idempiere.zk.extra/META-INF/MANIFEST.MF                     | 2 +-
 org.slf4j.jdk14/META-INF/MANIFEST.MF                            | 2 +-
 org.w3c.dom.fragment/META-INF/MANIFEST.MF                       | 2 +-
 39 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/org.adempiere.base.callout/META-INF/MANIFEST.MF b/org.adempiere.base.callout/META-INF/MANIFEST.MF
index 62932c63e4..88dea99148 100644
--- a/org.adempiere.base.callout/META-INF/MANIFEST.MF
+++ b/org.adempiere.base.callout/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Callout
 Bundle-SymbolicName: org.adempiere.base.callout
 Bundle-Version: 3.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.adempiere.base;bundle-version="3.1.0"
 Eclipse-RegisterBuddy: org.adempiere.base
 Service-Component: OSGI-INF/costadjustmentcalloutfactory.xml
diff --git a/org.adempiere.base.process/META-INF/MANIFEST.MF b/org.adempiere.base.process/META-INF/MANIFEST.MF
index f7b4c35162..fa96ba0190 100644
--- a/org.adempiere.base.process/META-INF/MANIFEST.MF
+++ b/org.adempiere.base.process/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Processes
 Bundle-SymbolicName: org.adempiere.base.process
 Bundle-Version: 3.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.adempiere.base;bundle-version="3.1.0"
 Export-Package: org.adempiere.process,
  org.compiere.process,
diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
index 46edd7d5b2..f00494bafd 100644
--- a/org.adempiere.base/META-INF/MANIFEST.MF
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@@ -353,7 +353,7 @@ Export-Package: bsh,
  org.supercsv.io,
  org.supercsv.prefs,
  org.supercsv.util
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.sun.mail.smtp;version="1.5",
  javax.activation,
  javax.jms;version="1.1.0",
diff --git a/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF b/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
index 894493c659..acdbacae0f 100644
--- a/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
+++ b/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.adempiere.eclipse.equinox.http.servlet
 Eclipse-LazyStart: true
 Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt:
diff --git a/org.adempiere.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF b/org.adempiere.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF
index 9ffeaf1f54..ee3d7828f1 100644
--- a/org.adempiere.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF
+++ b/org.adempiere.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: %bundleName
 Bundle-SymbolicName: org.adempiere.eclipse.equinox.http.servletbridge;singleton:=true
 Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt:
diff --git a/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF b/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF
index ee48be2020..a7e2c88d7f 100644
--- a/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF
+++ b/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: %bundleName
 Bundle-SymbolicName: org.adempiere.eclipse.equinox.servletbridge;singleton:=true
 Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt:
diff --git a/org.adempiere.extend/META-INF/MANIFEST.MF b/org.adempiere.extend/META-INF/MANIFEST.MF
index 1a4fabdb1d..1820cc9a32 100644
--- a/org.adempiere.extend/META-INF/MANIFEST.MF
+++ b/org.adempiere.extend/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 3.1.0.qualifier
 Bundle-ClassPath: extend.jar,
  spiffy-with_source-all-0.05.jar
 Eclipse-RegisterBuddy: org.adempiere.tools
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: compiere.model,
  test
 Fragment-Host: org.adempiere.base;bundle-version="3.1.0"
diff --git a/org.adempiere.install/META-INF/MANIFEST.MF b/org.adempiere.install/META-INF/MANIFEST.MF
index d001507d51..65cea0a524 100644
--- a/org.adempiere.install/META-INF/MANIFEST.MF
+++ b/org.adempiere.install/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-ClassPath: install.jar,
 Export-Package: org.adempiere.install,
  org.compiere.install
 Require-Bundle: org.adempiere.base;bundle-version="3.1.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: javax.mail;version="1.5",
  javax.mail.internet;version="1.5",
  org.apache.tools.ant,
diff --git a/org.adempiere.payment.processor/META-INF/MANIFEST.MF b/org.adempiere.payment.processor/META-INF/MANIFEST.MF
index 47f31b8d4b..c01ae1ca09 100644
--- a/org.adempiere.payment.processor/META-INF/MANIFEST.MF
+++ b/org.adempiere.payment.processor/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Payment Processor
 Bundle-SymbolicName: org.adempiere.payment.processor;singleton:=true
 Bundle-Version: 3.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.adempiere.base;bundle-version="3.1.0"
 Bundle-ClassPath: jpayment.jar,
  payflow.jar,
diff --git a/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF
index 9d4a204e2b..601f85be26 100644
--- a/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF
+++ b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF
@@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere 2Pack Handlers
 Bundle-SymbolicName: org.adempiere.pipo.handlers;singleton:=true
 Bundle-Version: 3.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.adempiere.pipo;bundle-version="3.1.0",
  org.adempiere.base;bundle-version="3.1.0"
diff --git a/org.adempiere.pipo/META-INF/MANIFEST.MF b/org.adempiere.pipo/META-INF/MANIFEST.MF
index 2d47196793..64ea3f64f1 100644
--- a/org.adempiere.pipo/META-INF/MANIFEST.MF
+++ b/org.adempiere.pipo/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere 2Pack Core
 Bundle-SymbolicName: org.adempiere.pipo;singleton:=true
 Bundle-Version: 3.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.commons.codec,
  org.apache.commons.codec.binary,
  org.apache.tools.ant,
diff --git a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF
index c3b832b96a..0a21eb5316 100644
--- a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF
+++ b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Plugin Utils
 Bundle-SymbolicName: org.adempiere.plugin.utils
 Bundle-Version: 3.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.adempiere.base,
  org.adempiere.util,
  org.apache.xerces.dom;version="2.9.0",
diff --git a/org.adempiere.replication.server/META-INF/MANIFEST.MF b/org.adempiere.replication.server/META-INF/MANIFEST.MF
index 6f1b1235db..75bdfb750e 100644
--- a/org.adempiere.replication.server/META-INF/MANIFEST.MF
+++ b/org.adempiere.replication.server/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Replication Server
 Bundle-SymbolicName: org.adempiere.replication.server;singleton:=true
 Bundle-Version: 3.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.adempiere.server;bundle-version="3.1.0",
  org.adempiere.replication;bundle-version="3.1.0",
  org.adempiere.base;bundle-version="3.1.0"
diff --git a/org.adempiere.replication/META-INF/MANIFEST.MF b/org.adempiere.replication/META-INF/MANIFEST.MF
index 8f20d07f56..c05dc1e481 100644
--- a/org.adempiere.replication/META-INF/MANIFEST.MF
+++ b/org.adempiere.replication/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Replication
 Bundle-SymbolicName: org.adempiere.replication;singleton:=true
 Bundle-Version: 3.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.adempiere.base;bundle-version="3.1.0"
 Export-Package: org.adempiere.process.rpl,
  org.adempiere.process.rpl.exp,
diff --git a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
index a19d85c31d..263b095be6 100644
--- a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
@@ -237,7 +237,7 @@ Export-Package: .,
  org.joda.time.format,
  org.joda.time.tz,
  org.w3c.tools.codec
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.commons.collections,
  org.w3c.tools.codec
 DynamicImport-Package: *
diff --git a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
index 8ff9f21505..417d972385 100644
--- a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: JasperReports Swing Client
 Bundle-SymbolicName: org.adempiere.report.jasper.swing;singleton:=true
 Bundle-Version: 3.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.adempiere.base;bundle-version="3.1.0",
  org.adempiere.ui.swing;bundle-version="3.1.0",
  org.adempiere.report.jasper;bundle-version="3.1.0",
diff --git a/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF
index 5e9a74ccdf..147c496202 100644
--- a/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: iDempiere JasperReport Web App
 Bundle-SymbolicName: org.adempiere.report.jasper.webapp;singleton:=true
 Bundle-Version: 3.1.0.qualifier
 Require-Bundle: org.adempiere.base;bundle-version="3.1.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Web-ContextPath: JasperReportFiles
 Bundle-ClassPath: .
 Import-Package: javax.servlet;version="2.5.0",
diff --git a/org.adempiere.report.jasper/META-INF/MANIFEST.MF b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
index 65305a521a..064d9b823b 100644
--- a/org.adempiere.report.jasper/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: iDempiere JasperReport integration
 Bundle-SymbolicName: org.adempiere.report.jasper;singleton:=true
 Bundle-Version: 3.1.0.qualifier
 Bundle-ClassPath: JasperReports.jar
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.commons.codec,
  org.apache.commons.codec.binary,
  org.apache.commons.logging;version="1.1.1",
diff --git a/org.adempiere.server/META-INF/MANIFEST.MF b/org.adempiere.server/META-INF/MANIFEST.MF
index e779b0bdb3..e6172ab5a9 100644
--- a/org.adempiere.server/META-INF/MANIFEST.MF
+++ b/org.adempiere.server/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 3.1.0.qualifier
 Require-Bundle: org.adempiere.base;bundle-version="3.1.0",
  org.eclipse.equinox.app;bundle-version="1.3.200",
  org.eclipse.jetty.apache-jsp;bundle-version="9.2.3.v20140905"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Web-ContextPath: /
 Bundle-ClassPath: WEB-INF/lib/jardiff.jar,
  WEB-INF/lib/jnlp-servlet.jar,
diff --git a/org.adempiere.ui.swing/META-INF/MANIFEST.MF b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
index 3dadc845a1..c3ed737d9c 100644
--- a/org.adempiere.ui.swing/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
@@ -76,7 +76,7 @@ Require-Bundle: org.adempiere.base;bundle-version="3.1.0",
  org.restlet.ext.ssl;bundle-version="2.1.0"
 Eclipse-ExtensibleAPI: true
 Eclipse-RegisterBuddy: org.adempiere.base
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: javax.net.ssl,
  net.sf.jasperreports.engine,
  org.apache.ecs,
diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
index fe7338a887..b01f98e46f 100644
--- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Web Client
 Bundle-SymbolicName: org.adempiere.ui.zk;singleton:=true
 Bundle-Version: 3.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: javax.activation,
  javax.annotation;version="1.2.0",
  javax.annotation.processing,
diff --git a/org.adempiere.ui/META-INF/MANIFEST.MF b/org.adempiere.ui/META-INF/MANIFEST.MF
index 34608aafcb..6cc2939805 100644
--- a/org.adempiere.ui/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere UI base
 Bundle-SymbolicName: org.adempiere.ui;singleton:=true
 Bundle-Version: 3.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.adempiere.base;bundle-version="3.1.0",
  org.apache.xerces;bundle-version="2.9.0",
  org.eclipse.equinox.app;bundle-version="1.3.200"
diff --git a/org.adempiere.webstore.resource/META-INF/MANIFEST.MF b/org.adempiere.webstore.resource/META-INF/MANIFEST.MF
index cdfa3cb089..af09f062c2 100644
--- a/org.adempiere.webstore.resource/META-INF/MANIFEST.MF
+++ b/org.adempiere.webstore.resource/META-INF/MANIFEST.MF
@@ -5,6 +5,6 @@ Bundle-SymbolicName: org.adempiere.webstore.resource
 Bundle-Version: 3.1.0.qualifier
 Bundle-Vendor: Adempiere.org
 Fragment-Host: org.adempiere.webstore;bundle-version="3.1.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.compiere.wstore
 Jetty-WarPatchFragmentFolderPath: /
diff --git a/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF b/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF
index 879c6892bd..927d96dcb3 100644
--- a/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF
+++ b/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: iDempiere Web Store Servlets
 Bundle-SymbolicName: org.adempiere.webstore.servlet
 Bundle-Version: 3.1.0.qualifier
 Bundle-Vendor: Adempiere.org
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.compiere.wstore
 Require-Bundle: org.adempiere.base;bundle-version="3.1.0"
 Import-Package: javax.servlet,
diff --git a/org.adempiere.webstore/META-INF/MANIFEST.MF b/org.adempiere.webstore/META-INF/MANIFEST.MF
index 0e55f44387..51f5f0277e 100644
--- a/org.adempiere.webstore/META-INF/MANIFEST.MF
+++ b/org.adempiere.webstore/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 3.1.0.qualifier
 Require-Bundle: org.adempiere.base;bundle-version="3.1.0",
  org.adempiere.report.jasper.webapp;bundle-version="3.1.0",
  org.eclipse.jdt.core.compiler.batch;bundle-version="3.8.2"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Web-ContextPath: wstore
 Import-Package: javax.servlet;version="3.0.0",
  javax.servlet.http;version="3.0.0",
diff --git a/org.apache.ecs/META-INF/MANIFEST.MF b/org.apache.ecs/META-INF/MANIFEST.MF
index 941b90d119..e867821541 100644
--- a/org.apache.ecs/META-INF/MANIFEST.MF
+++ b/org.apache.ecs/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.apache.ecs
 Bundle-Version: 3.1.0.qualifier
 Bundle-Activator: org.apache.ecs.Activator
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.osgi.framework;version="1.3.0"
 Export-Package: org.apache.ecs;uses:="org.apache.ecs.xhtml",
  org.apache.ecs.filter;uses:="org.apache.ecs",
diff --git a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
index 602d8d2fdc..aeccc0a75f 100644
--- a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
+++ b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Oracle Provider
 Bundle-SymbolicName: org.compiere.db.oracle.provider;singleton:=true
 Bundle-Version: 3.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.adempiere.base;bundle-version="3.1.0",
  org.adempiere.install;bundle-version="3.1.0"
 Bundle-ClassPath: .,
diff --git a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
index bac232b755..dd2fb21b1c 100644
--- a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
+++ b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Postgresql Provider
 Bundle-SymbolicName: org.compiere.db.postgresql.provider;singleton:=true
 Bundle-Version: 3.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: .,
  postgresql-9.4-1206.jdbc41.jar,
  c3p0-0.9.5.jar,
diff --git a/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF b/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF
index 5e25ba6063..1f31ad589c 100644
--- a/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF
+++ b/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.idempiere.felix.webconsole
 Bundle-Version: 3.1.0.qualifier
 Bundle-Activator: org.idempiere.felix.webconsole.Activator
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: javax.servlet;version="2.5.0",
  javax.servlet.http;version="2.5.0",
  javax.servlet.jsp;version="2.1.0",
diff --git a/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF b/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF
index e9aa6ef0d2..3b2fc660c9 100644
--- a/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF
+++ b/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.idempiere.fitnesse.fixture
 Bundle-Version: 3.1.0.qualifier
 Bundle-Activator: org.idempiere.fitnesse.fixture.Activator
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: fit,
  fit.decorator,
  fit.decorator.exceptions,
diff --git a/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF b/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF
index 75413dce0b..7c52785e81 100644
--- a/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF
+++ b/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.idempiere.fitnesse.server
 Bundle-Version: 3.1.0.qualifier
 Bundle-Activator: org.idempiere.fitnesse.server.Activator
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: javax.servlet;version="3.0.0",
  javax.servlet.http;version="3.0.0",
  org.adempiere.base,
diff --git a/org.idempiere.fitrecorder/META-INF/MANIFEST.MF b/org.idempiere.fitrecorder/META-INF/MANIFEST.MF
index cf8d4c8cbe..9120f4f0c3 100644
--- a/org.idempiere.fitrecorder/META-INF/MANIFEST.MF
+++ b/org.idempiere.fitrecorder/META-INF/MANIFEST.MF
@@ -8,6 +8,6 @@ Import-Package: org.adempiere.base,
  org.adempiere.plugin.utils,
  org.compiere.model,
  org.osgi.framework;version="1.3.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: plugin.xml
 Require-Bundle: org.adempiere.base;bundle-version="3.1.0"
diff --git a/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF b/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF
index e419f6535e..7be4cdd64d 100644
--- a/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF
+++ b/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF
@@ -4,4 +4,4 @@ Bundle-Name: iDempiere Hazelcast Service Configuration
 Bundle-SymbolicName: org.idempiere.hazelcast.service.config
 Bundle-Version: 3.1.0
 Fragment-Host: org.idempiere.hazelcast.service;bundle-version="3.1.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
index 7a9443306b..0c6e40d346 100644
--- a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
+++ b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
@@ -29,4 +29,4 @@ Bundle-ClassPath: .,
  hazelcast-3.5.3.jar,
  hazelcast-cloud-3.5.3.jar
 Service-Component: OSGI-INF/clusterservice.xml, OSGI-INF/cacheservice.xml, OSGI-INF/messageservice.xml
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF b/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF
index 2dca3f845e..b5efaafb88 100644
--- a/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF
+++ b/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.idempiere.ui.zk.selenium
 Bundle-Version: 3.1.0.qualifier
 Bundle-Activator: org.idempiere.ui.zk.selenium.fitnesse.Activator
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: fit,
  fit.decorator,
  fit.decorator.exceptions,
diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF
index 3936337876..9f79e9a942 100644
--- a/org.idempiere.webservices/META-INF/MANIFEST.MF
+++ b/org.idempiere.webservices/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: iDempiere Webservices
 Bundle-SymbolicName: org.idempiere.webservices;singleton:=true
 Bundle-Version: 3.1.0.qualifier
 Bundle-Activator: org.idempiere.webservices.Activator
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/ws_modelfactory.xml
 Import-Package: javax.activation,
  javax.mail.internet;version="1.5",
diff --git a/org.idempiere.zk.extra/META-INF/MANIFEST.MF b/org.idempiere.zk.extra/META-INF/MANIFEST.MF
index 7e0191d751..d887767ad4 100644
--- a/org.idempiere.zk.extra/META-INF/MANIFEST.MF
+++ b/org.idempiere.zk.extra/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: extra zk library
 Bundle-SymbolicName: org.idempiere.zk.extra
 Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: lib/calendar.jar,
  lib/ckez.jar,
  lib/gmapsz.jar,
diff --git a/org.slf4j.jdk14/META-INF/MANIFEST.MF b/org.slf4j.jdk14/META-INF/MANIFEST.MF
index 0f115b1331..ee3650e8c1 100644
--- a/org.slf4j.jdk14/META-INF/MANIFEST.MF
+++ b/org.slf4j.jdk14/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: SLF4J with JDK logger
 Bundle-SymbolicName: org.slf4j.jdk14
 Bundle-Version: 1.7.2.qualifier
 Fragment-Host: org.slf4j.api;bundle-version="1.7.2"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.slf4j.impl;version=1.7.2
 Import-Package: org.slf4j;version=1.7.2,
  org.slf4j.spi;version=1.7.2,org.slf4j.helpers;version=1.7.2
diff --git a/org.w3c.dom.fragment/META-INF/MANIFEST.MF b/org.w3c.dom.fragment/META-INF/MANIFEST.MF
index d3fb8ee3e9..7a8c4bdef3 100644
--- a/org.w3c.dom.fragment/META-INF/MANIFEST.MF
+++ b/org.w3c.dom.fragment/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: W3c DOM Fragment
 Bundle-SymbolicName: org.w3c.dom.fragment
 Bundle-Version: 3.0.0.qualifier
 Fragment-Host: system.bundle; extension:=framework
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: batik-ext.jar,
  .
 Export-Package: org.w3c.dom,

From 84d5b6c7346e68fd7536f91ffb4f041ae4290b25 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Thu, 7 Jul 2016 11:00:02 +0700
Subject: [PATCH 08/34] IDEMPIERE-3136:all stuff relate library of idempiere
 because each project don't have partical build setting, so let control from
 workspace

---
 .../.settings/org.eclipse.jdt.core.prefs                   | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 org.idempiere.fitnesse.fixture/.settings/org.eclipse.jdt.core.prefs

diff --git a/org.idempiere.fitnesse.fixture/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.fitnesse.fixture/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363af..0000000000
--- a/org.idempiere.fitnesse.fixture/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7

From 0eec78bba0f11d1be29046897739980ea76fd9f5 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Thu, 7 Jul 2016 11:10:56 +0700
Subject: [PATCH 09/34] IDEMPIERE-3136:all stuff relate library of idempiere
 remove unuse import and varial

---
 .../WEB-INF/src/org/adempiere/webui/FedexLabelWindow.java      | 1 -
 .../src/org/adempiere/webui/adwindow/CompositeADTabbox.java    | 3 ---
 .../org/adempiere/webui/apps/form/WPaymentFormCreditCard.java  | 1 -
 .../src/org/adempiere/webui/dashboard/CalendarWindow.java      | 1 -
 .../src/org/adempiere/webui/panel/InfoPaymentPanel.java        | 1 -
 .../WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java   | 1 -
 6 files changed, 8 deletions(-)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/FedexLabelWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/FedexLabelWindow.java
index feee381617..2827dc541f 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/FedexLabelWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/FedexLabelWindow.java
@@ -23,7 +23,6 @@ import org.adempiere.webui.component.ListboxFactory;
 import org.adempiere.webui.component.VerticalBox;
 import org.adempiere.webui.component.Window;
 import org.adempiere.webui.util.ZKUpdateUtil;
-import org.apache.ecs.xhtml.center;
 import org.compiere.model.MAttachmentEntry;
 import org.compiere.util.CLogger;
 import org.zkoss.util.media.AMedia;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java
index a5f49159bb..2a63e7ede3 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java
@@ -22,7 +22,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.logging.Level;
 
 import org.adempiere.util.Callback;
 import org.adempiere.webui.component.ADTabListModel;
@@ -69,8 +68,6 @@ public class CompositeADTabbox extends AbstractADTabbox
 
 	public static final String ON_SELECTION_CHANGED_EVENT = "onSelectionChanged";
 	
-	/** Logger                  */
-	private static CLogger  log = CLogger.getCLogger (CompositeADTabbox.class);
 
     private List<ADTabListModel.ADTabLabel> tabLabelList = new ArrayList<ADTabListModel.ADTabLabel>();
     
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormCreditCard.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormCreditCard.java
index e19b47deee..2c6c074f5d 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormCreditCard.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormCreditCard.java
@@ -32,7 +32,6 @@ import org.adempiere.webui.editor.WNumberEditor;
 import org.adempiere.webui.factory.ButtonFactory;
 import org.adempiere.webui.util.ZKUpdateUtil;
 import org.adempiere.webui.window.FDialog;
-import org.apache.ecs.xhtml.col;
 import org.compiere.grid.PaymentFormCreditCard;
 import org.compiere.model.GridTab;
 import org.compiere.model.MBankAccountProcessor;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java
index db785b43da..34dfb4cbf5 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java
@@ -28,7 +28,6 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.TimeZone;
 
-import javax.swing.text.StyledEditorKit.BoldAction;
 
 import org.adempiere.webui.component.Tabpanel;
 import org.adempiere.webui.component.Window;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java
index d04f3a1eb2..7347500add 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java
@@ -59,7 +59,6 @@ import org.zkoss.zul.Separator;
 import org.zkoss.zul.South;
 import org.zkoss.zul.Vbox;
 
-import com.sun.corba.se.impl.oa.poa.AOMEntry;
 
 /**
 * Based on InfoPayment written by Jorg Janke
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java
index c5aef32a1b..85c97b0379 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java
@@ -45,7 +45,6 @@ import org.zkoss.zul.Filedownload;
 import org.zkoss.zul.Hbox;
 import org.zkoss.zul.Iframe;
 
-import com.sun.corba.se.impl.oa.poa.AOMEntry;
 
 /**
  * 

From 54bca5100721655cce5cbe50adea02bf17a0a42b Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Thu, 7 Jul 2016 12:51:24 +0700
Subject: [PATCH 10/34] IDEMPIERE-3136:all stuff relate library of idempiere
 remove version of dependency bundle

---
 org.adempiere.base-feature/feature.xml        | 24 ++++++++---------
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 org.adempiere.base/META-INF/MANIFEST.MF       |  2 +-
 org.adempiere.extend/META-INF/MANIFEST.MF     |  2 +-
 org.adempiere.install/META-INF/MANIFEST.MF    |  2 +-
 .../feature.xml                               |  4 +--
 .../META-INF/MANIFEST.MF                      |  2 +-
 org.adempiere.pipo-feature/feature.xml        |  8 +++---
 .../META-INF/MANIFEST.MF                      |  4 +--
 org.adempiere.pipo/META-INF/MANIFEST.MF       |  2 +-
 org.adempiere.replication-feature/feature.xml |  4 +--
 .../feature.xml                               |  8 +++---
 .../META-INF/MANIFEST.MF                      |  6 ++---
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../feature.xml                               |  4 +--
 .../META-INF/MANIFEST.MF                      |  8 +++---
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../META-INF/MANIFEST.MF                      |  4 +--
 org.adempiere.server-feature/feature.xml      | 16 ++++++------
 org.adempiere.server/META-INF/MANIFEST.MF     |  6 ++---
 .../feature.xml                               |  2 +-
 org.adempiere.ui.swing-feature/feature.xml    |  6 ++---
 org.adempiere.ui.swing/META-INF/MANIFEST.MF   | 12 ++++-----
 org.adempiere.ui.zk-feature/feature.xml       |  2 +-
 org.adempiere.ui.zk/META-INF/MANIFEST.MF      | 26 +++++++++----------
 org.adempiere.ui/META-INF/MANIFEST.MF         |  6 ++---
 org.adempiere.webstore-feature/feature.xml    | 10 +++----
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../META-INF/MANIFEST.MF                      |  4 +--
 org.adempiere.webstore/META-INF/MANIFEST.MF   |  6 ++---
 .../META-INF/MANIFEST.MF                      |  4 +--
 .../META-INF/MANIFEST.MF                      |  4 +--
 org.compiere.db.provider-feature/feature.xml  |  6 ++---
 org.idempiere.fitnesse-feature/feature.xml    |  8 +++---
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../feature.xml                               |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../META-INF/MANIFEST.MF                      |  6 ++---
 org.slf4j.jdk14/META-INF/MANIFEST.MF          |  2 +-
 40 files changed, 113 insertions(+), 113 deletions(-)

diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml
index cc856c2ef3..727e5bacd8 100644
--- a/org.adempiere.base-feature/feature.xml
+++ b/org.adempiere.base-feature/feature.xml
@@ -18,50 +18,50 @@
 
    <includes
          id="org.compiere.db.provider"
-         version="3.1.0.qualifier"/>
+         version="0.0.0"/>
 
    <includes
          id="org.adempiere.payment.processor"
-         version="3.1.0.qualifier"/>
+         version="0.0.0"/>
 
    <includes
          id="org.adempiere.pipo"
-         version="3.1.0.qualifier"/>
+         version="0.0.0"/>
 
    <includes
          id="org.adempiere.replication"
-         version="3.1.0.qualifier"/>
+         version="0.0.0"/>
 
    <includes
          id="org.adempiere.report.jasper"
-         version="3.1.0.qualifier"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.adempiere.base"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.base.callout"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.base.process"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.extend"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"
+         version="0.0.0"
          fragment="true"
          unpack="false"/>
 
@@ -69,14 +69,14 @@
          id="org.adempiere.ui"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.apache.ecs"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
@@ -250,7 +250,7 @@
          id="org.adempiere.install"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.osgi.services"
diff --git a/org.adempiere.base.callout/META-INF/MANIFEST.MF b/org.adempiere.base.callout/META-INF/MANIFEST.MF
index 88dea99148..9fafb36a0c 100644
--- a/org.adempiere.base.callout/META-INF/MANIFEST.MF
+++ b/org.adempiere.base.callout/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: iDempiere Callout
 Bundle-SymbolicName: org.adempiere.base.callout
 Bundle-Version: 3.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.adempiere.base;bundle-version="3.1.0"
+Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
 Eclipse-RegisterBuddy: org.adempiere.base
 Service-Component: OSGI-INF/costadjustmentcalloutfactory.xml
 Bundle-ActivationPolicy: lazy
diff --git a/org.adempiere.base.process/META-INF/MANIFEST.MF b/org.adempiere.base.process/META-INF/MANIFEST.MF
index fa96ba0190..268280f42a 100644
--- a/org.adempiere.base.process/META-INF/MANIFEST.MF
+++ b/org.adempiere.base.process/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: iDempiere Processes
 Bundle-SymbolicName: org.adempiere.base.process
 Bundle-Version: 3.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.adempiere.base;bundle-version="3.1.0"
+Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
 Export-Package: org.adempiere.process,
  org.compiere.process,
  org.idempiere.process
diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
index f00494bafd..4d08fb727e 100644
--- a/org.adempiere.base/META-INF/MANIFEST.MF
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@@ -393,4 +393,4 @@ Eclipse-ExtensibleAPI: true
 Bundle-Activator: org.adempiere.base.BaseActivator
 Service-Component: OSGI-INF/*.xml
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.equinox.app;bundle-version="1.3.200"
+Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0"
diff --git a/org.adempiere.extend/META-INF/MANIFEST.MF b/org.adempiere.extend/META-INF/MANIFEST.MF
index 1820cc9a32..34352f4e52 100644
--- a/org.adempiere.extend/META-INF/MANIFEST.MF
+++ b/org.adempiere.extend/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Eclipse-RegisterBuddy: org.adempiere.tools
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: compiere.model,
  test
-Fragment-Host: org.adempiere.base;bundle-version="3.1.0"
+Fragment-Host: org.adempiere.base;bundle-version="0.0.0"
 Eclipse-PatchFragment: true
 Import-Package: junit.framework;version="3.8.2",
  org.junit;version="4.8.2",
diff --git a/org.adempiere.install/META-INF/MANIFEST.MF b/org.adempiere.install/META-INF/MANIFEST.MF
index 65cea0a524..8028073414 100644
--- a/org.adempiere.install/META-INF/MANIFEST.MF
+++ b/org.adempiere.install/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: install.jar,
  ant-contrib-1.0b3.jar
 Export-Package: org.adempiere.install,
  org.compiere.install
-Require-Bundle: org.adempiere.base;bundle-version="3.1.0"
+Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: javax.mail;version="1.5",
  javax.mail.internet;version="1.5",
diff --git a/org.adempiere.payment.processor-feature/feature.xml b/org.adempiere.payment.processor-feature/feature.xml
index 9709dbd5ad..9ab5979b44 100644
--- a/org.adempiere.payment.processor-feature/feature.xml
+++ b/org.adempiere.payment.processor-feature/feature.xml
@@ -17,14 +17,14 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="3.1.0.qualifier"/>
+      <import feature="org.adempiere.base" version="0.0.0"/>
    </requires>
 
    <plugin
          id="org.adempiere.payment.processor"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
 </feature>
diff --git a/org.adempiere.payment.processor/META-INF/MANIFEST.MF b/org.adempiere.payment.processor/META-INF/MANIFEST.MF
index c01ae1ca09..db34c63965 100644
--- a/org.adempiere.payment.processor/META-INF/MANIFEST.MF
+++ b/org.adempiere.payment.processor/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: iDempiere Payment Processor
 Bundle-SymbolicName: org.adempiere.payment.processor;singleton:=true
 Bundle-Version: 3.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.adempiere.base;bundle-version="3.1.0"
+Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
 Bundle-ClassPath: jpayment.jar,
  payflow.jar,
  Verisign.jar,
diff --git a/org.adempiere.pipo-feature/feature.xml b/org.adempiere.pipo-feature/feature.xml
index e8e41880fc..1799ae3902 100644
--- a/org.adempiere.pipo-feature/feature.xml
+++ b/org.adempiere.pipo-feature/feature.xml
@@ -17,28 +17,28 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="3.1.0.qualifier"/>
+      <import feature="org.adempiere.base" version="0.0.0"/>
    </requires>
 
    <plugin
          id="org.adempiere.pipo"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.pipo.handlers"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.plugin.utils"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
 </feature>
diff --git a/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF
index 601f85be26..891daa4811 100644
--- a/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF
+++ b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF
@@ -4,5 +4,5 @@ Bundle-Name: iDempiere 2Pack Handlers
 Bundle-SymbolicName: org.adempiere.pipo.handlers;singleton:=true
 Bundle-Version: 3.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.adempiere.pipo;bundle-version="3.1.0",
- org.adempiere.base;bundle-version="3.1.0"
+Require-Bundle: org.adempiere.pipo;bundle-version="0.0.0",
+ org.adempiere.base;bundle-version="0.0.0"
diff --git a/org.adempiere.pipo/META-INF/MANIFEST.MF b/org.adempiere.pipo/META-INF/MANIFEST.MF
index 64ea3f64f1..9a75d4ac99 100644
--- a/org.adempiere.pipo/META-INF/MANIFEST.MF
+++ b/org.adempiere.pipo/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@ Import-Package: org.apache.commons.codec,
 Export-Package: org.adempiere.pipo.srv,
  org.adempiere.pipo2,
  org.adempiere.pipo2.exception
-Require-Bundle: org.adempiere.base;bundle-version="3.1.0"
+Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
 Service-Component: OSGI-INF/dictionaryservice.xml
diff --git a/org.adempiere.replication-feature/feature.xml b/org.adempiere.replication-feature/feature.xml
index 61ad39010f..3c040bcf84 100644
--- a/org.adempiere.replication-feature/feature.xml
+++ b/org.adempiere.replication-feature/feature.xml
@@ -17,14 +17,14 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="3.1.0.qualifier"/>
+      <import feature="org.adempiere.base" version="0.0.0"/>
    </requires>
 
    <plugin
          id="org.adempiere.replication"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
 </feature>
diff --git a/org.adempiere.replication.server-feature/feature.xml b/org.adempiere.replication.server-feature/feature.xml
index e7fa9748f8..6ad3a110eb 100644
--- a/org.adempiere.replication.server-feature/feature.xml
+++ b/org.adempiere.replication.server-feature/feature.xml
@@ -17,16 +17,16 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="3.1.0.qualifier"/>
-      <import feature="org.adempiere.replication" version="3.1.0.qualifier"/>
-      <import plugin="org.adempiere.server" version="3.1.0.qualifier"/>
+      <import feature="org.adempiere.base" version="0.0.0"/>
+      <import feature="org.adempiere.replication" version="0.0.0"/>
+      <import plugin="org.adempiere.server" version="0.0.0"/>
    </requires>
 
    <plugin
          id="org.adempiere.replication.server"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
 </feature>
diff --git a/org.adempiere.replication.server/META-INF/MANIFEST.MF b/org.adempiere.replication.server/META-INF/MANIFEST.MF
index 75bdfb750e..0a667a3af7 100644
--- a/org.adempiere.replication.server/META-INF/MANIFEST.MF
+++ b/org.adempiere.replication.server/META-INF/MANIFEST.MF
@@ -4,9 +4,9 @@ Bundle-Name: iDempiere Replication Server
 Bundle-SymbolicName: org.adempiere.replication.server;singleton:=true
 Bundle-Version: 3.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.adempiere.server;bundle-version="3.1.0",
- org.adempiere.replication;bundle-version="3.1.0",
- org.adempiere.base;bundle-version="3.1.0"
+Require-Bundle: org.adempiere.server;bundle-version="0.0.0",
+ org.adempiere.replication;bundle-version="0.0.0",
+ org.adempiere.base;bundle-version="0.0.0"
 Import-Package: javax.jms;version="1.1.0",
  org.apache.activemq
 Service-Component: OSGI-INF/serverfactory.xml
diff --git a/org.adempiere.replication/META-INF/MANIFEST.MF b/org.adempiere.replication/META-INF/MANIFEST.MF
index c05dc1e481..7d665a1b76 100644
--- a/org.adempiere.replication/META-INF/MANIFEST.MF
+++ b/org.adempiere.replication/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: iDempiere Replication
 Bundle-SymbolicName: org.adempiere.replication;singleton:=true
 Bundle-Version: 3.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.adempiere.base;bundle-version="3.1.0"
+Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
 Export-Package: org.adempiere.process.rpl,
  org.adempiere.process.rpl.exp,
  org.adempiere.process.rpl.imp
diff --git a/org.adempiere.report.jasper-feature/feature.xml b/org.adempiere.report.jasper-feature/feature.xml
index e790793b48..09ad431af4 100644
--- a/org.adempiere.report.jasper-feature/feature.xml
+++ b/org.adempiere.report.jasper-feature/feature.xml
@@ -17,7 +17,7 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="3.1.0.qualifier"/>
+      <import feature="org.adempiere.base" version="0.0.0"/>
    </requires>
 
    <plugin
@@ -30,7 +30,7 @@
          id="org.adempiere.report.jasper.library"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.apache.batik.bridge"
diff --git a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
index 417d972385..6855335590 100644
--- a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
@@ -4,10 +4,10 @@ Bundle-Name: JasperReports Swing Client
 Bundle-SymbolicName: org.adempiere.report.jasper.swing;singleton:=true
 Bundle-Version: 3.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.adempiere.base;bundle-version="3.1.0",
- org.adempiere.ui.swing;bundle-version="3.1.0",
- org.adempiere.report.jasper;bundle-version="3.1.0",
- org.adempiere.report.jasper.library;bundle-version="3.1.0"
+Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
+ org.adempiere.ui.swing;bundle-version="0.0.0",
+ org.adempiere.report.jasper;bundle-version="0.0.0",
+ org.adempiere.report.jasper.library;bundle-version="0.0.0"
 Import-Package: net.sf.jasperreports.engine,
  net.sf.jasperreports.engine.export,
  net.sf.jasperreports.view,
diff --git a/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF
index 147c496202..5d6a21e6fa 100644
--- a/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere JasperReport Web App
 Bundle-SymbolicName: org.adempiere.report.jasper.webapp;singleton:=true
 Bundle-Version: 3.1.0.qualifier
-Require-Bundle: org.adempiere.base;bundle-version="3.1.0"
+Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Web-ContextPath: JasperReportFiles
 Bundle-ClassPath: .
diff --git a/org.adempiere.report.jasper/META-INF/MANIFEST.MF b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
index 064d9b823b..81ff353241 100644
--- a/org.adempiere.report.jasper/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
@@ -9,8 +9,8 @@ Import-Package: org.apache.commons.codec,
  org.apache.commons.codec.binary,
  org.apache.commons.logging;version="1.1.1",
  org.apache.commons.logging.impl;version="1.1.1"
-Require-Bundle: org.adempiere.base;bundle-version="3.1.0",
- org.adempiere.report.jasper.library;bundle-version="3.1.0"
+Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
+ org.adempiere.report.jasper.library;bundle-version="0.0.0"
 Service-Component: OSGI-INF/processfactory.xml
 Export-Package: org.adempiere.report.jasper
 Bundle-ActivationPolicy: lazy
diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml
index 72733a90c3..04aa68fdfa 100644
--- a/org.adempiere.server-feature/feature.xml
+++ b/org.adempiere.server-feature/feature.xml
@@ -18,21 +18,21 @@
 
    <includes
          id="org.adempiere.replication.server"
-         version="3.1.0.qualifier"
+         version="0.0.0"
          optional="true"/>
 
    <includes
          id="org.adempiere.ui.zk"
-         version="3.1.0.qualifier"/>
+         version="0.0.0"/>
 
    <includes
          id="org.adempiere.webstore"
-         version="3.1.0.qualifier"
+         version="0.0.0"
          optional="true"/>
 
    <includes
          id="org.idempiere.felix.webconsole"
-         version="3.1.0.qualifier"/>
+         version="0.0.0"/>
 
    <includes
          id="org.adempiere.report.jasper"
@@ -100,14 +100,14 @@
          id="org.adempiere.report.jasper.webapp"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.server"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
@@ -142,7 +142,7 @@
          id="org.adempiere.install"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.adempiere.eclipse.equinox.http.servlet"
@@ -176,7 +176,7 @@
          id="org.idempiere.webservices"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
diff --git a/org.adempiere.server/META-INF/MANIFEST.MF b/org.adempiere.server/META-INF/MANIFEST.MF
index e6172ab5a9..2c1e695282 100644
--- a/org.adempiere.server/META-INF/MANIFEST.MF
+++ b/org.adempiere.server/META-INF/MANIFEST.MF
@@ -3,9 +3,9 @@ Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Server
 Bundle-SymbolicName: org.adempiere.server;singleton:=true
 Bundle-Version: 3.1.0.qualifier
-Require-Bundle: org.adempiere.base;bundle-version="3.1.0",
- org.eclipse.equinox.app;bundle-version="1.3.200",
- org.eclipse.jetty.apache-jsp;bundle-version="9.2.3.v20140905"
+Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
+ org.eclipse.equinox.app;bundle-version="0.0.0",
+ org.eclipse.jetty.apache-jsp;bundle-version="0.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Web-ContextPath: /
 Bundle-ClassPath: WEB-INF/lib/jardiff.jar,
diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml
index fd4da2f42c..f1e7c69905 100644
--- a/org.adempiere.target.platform-feature/feature.xml
+++ b/org.adempiere.target.platform-feature/feature.xml
@@ -34,7 +34,7 @@
 
    <includes
          id="org.adempiere.bundles.external"
-         version="3.1.0.qualifier"/>
+         version="0.0.0"/>
 
    <includes
          id="org.eclipse.ecf.core.feature"
diff --git a/org.adempiere.ui.swing-feature/feature.xml b/org.adempiere.ui.swing-feature/feature.xml
index c7f73f4a76..6aee3ada64 100644
--- a/org.adempiere.ui.swing-feature/feature.xml
+++ b/org.adempiere.ui.swing-feature/feature.xml
@@ -17,21 +17,21 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="3.1.0.qualifier"/>
+      <import feature="org.adempiere.base" version="0.0.0"/>
    </requires>
 
    <plugin
          id="org.adempiere.report.jasper.swing"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.ui.swing"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.restlet.ext.net"
diff --git a/org.adempiere.ui.swing/META-INF/MANIFEST.MF b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
index c3ed737d9c..aef69966cb 100644
--- a/org.adempiere.ui.swing/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
@@ -68,12 +68,12 @@ Export-Package: com.jgoodies.looks,
  org.jdesktop.swingx.tree,
  org.jdesktop.swingx.treetable,
  org.jdesktop.swingx.util
-Require-Bundle: org.adempiere.base;bundle-version="3.1.0",
- org.adempiere.ui;bundle-version="3.1.0",
- org.restlet;bundle-version="2.1.0",
- org.restlet.ext.net;bundle-version="2.1.0",
- org.restlet.ext.servlet;bundle-version="2.1.0",
- org.restlet.ext.ssl;bundle-version="2.1.0"
+Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
+ org.adempiere.ui;bundle-version="0.0.0",
+ org.restlet;bundle-version="0.0.0",
+ org.restlet.ext.net;bundle-version="0.0.0",
+ org.restlet.ext.servlet;bundle-version="0.0.0",
+ org.restlet.ext.ssl;bundle-version="0.0.0"
 Eclipse-ExtensibleAPI: true
 Eclipse-RegisterBuddy: org.adempiere.base
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/org.adempiere.ui.zk-feature/feature.xml b/org.adempiere.ui.zk-feature/feature.xml
index 174dcf204e..a2ddecbaf2 100644
--- a/org.adempiere.ui.zk-feature/feature.xml
+++ b/org.adempiere.ui.zk-feature/feature.xml
@@ -17,7 +17,7 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="3.1.0.qualifier"/>
+      <import feature="org.adempiere.base" version="0.0.0"/>
    </requires>
 
    <plugin
diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
index b01f98e46f..92d99b27a6 100644
--- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
@@ -89,19 +89,19 @@ Export-Package: fi.jawsy.jawwa.zk.atmosphere,
  web.js.jawwa.atmosphere,
  web.js.zkforge,
  web.js.zkforge.mold
-Require-Bundle: org.adempiere.base;bundle-version="3.1.0",
- org.adempiere.ui;bundle-version="3.1.0",
- org.idempiere.zk.extra;bundle-version="1.0.0",
- zcommon;bundle-version="8.0.0",
- zel;bundle-version="8.0.0",
- zhtml;bundle-version="8.0.0",
- zk;bundle-version="8.0.0",
- zkbind;bundle-version="8.0.0",
- zkplus;bundle-version="8.0.0",
- zul;bundle-version="8.0.0",
- zweb;bundle-version="8.0.0",
- org.junit;bundle-version="4.11.0",
- org.apache.commons.io;bundle-version="1.4.0"
+Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
+ org.adempiere.ui;bundle-version="0.0.0",
+ org.idempiere.zk.extra;bundle-version="0.0.0",
+ zcommon;bundle-version="0.0.0",
+ zel;bundle-version="0.0.0",
+ zhtml;bundle-version="0.0.0",
+ zk;bundle-version="0.0.0",
+ zkbind;bundle-version="0.0.0",
+ zkplus;bundle-version="0.0.0",
+ zul;bundle-version="0.0.0",
+ zweb;bundle-version="0.0.0",
+ org.junit;bundle-version="0.0.0",
+ org.apache.commons.io;bundle-version="0.0.0"
 Bundle-Activator: org.adempiere.webui.WebUIActivator
 Eclipse-ExtensibleAPI: true
 Web-ContextPath: webui
diff --git a/org.adempiere.ui/META-INF/MANIFEST.MF b/org.adempiere.ui/META-INF/MANIFEST.MF
index 6cc2939805..b2a5230799 100644
--- a/org.adempiere.ui/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui/META-INF/MANIFEST.MF
@@ -4,9 +4,9 @@ Bundle-Name: iDempiere UI base
 Bundle-SymbolicName: org.adempiere.ui;singleton:=true
 Bundle-Version: 3.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.adempiere.base;bundle-version="3.1.0",
- org.apache.xerces;bundle-version="2.9.0",
- org.eclipse.equinox.app;bundle-version="1.3.200"
+Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
+ org.apache.xerces;bundle-version="0.0.0",
+ org.eclipse.equinox.app;bundle-version="0.0.0"
 Export-Package: org.compiere.apps,
  org.compiere.apps.form,
  org.compiere.apps.wf,
diff --git a/org.adempiere.webstore-feature/feature.xml b/org.adempiere.webstore-feature/feature.xml
index d5818477df..226422c96f 100644
--- a/org.adempiere.webstore-feature/feature.xml
+++ b/org.adempiere.webstore-feature/feature.xml
@@ -17,8 +17,8 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="3.1.0.qualifier"/>
-      <import plugin="org.adempiere.report.jasper.webapp" version="3.1.0.qualifer"/>
+      <import feature="org.adempiere.base" version="0.0.0"/>
+      <import plugin="org.adempiere.report.jasper.webapp" version="0.0.0"/>
       <import plugin="org.mortbay.jasper.apache-jsp"/>
       <import plugin="org.apache.taglibs.taglibs-standard-spec"/>
    </requires>
@@ -27,20 +27,20 @@
          id="org.adempiere.webstore"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.adempiere.webstore.resource"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"
+         version="0.0.0"
          fragment="true"/>
 
    <plugin
          id="org.adempiere.webstore.servlet"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"
+         version="0.0.0"
          fragment="true"/>
 
 </feature>
diff --git a/org.adempiere.webstore.resource/META-INF/MANIFEST.MF b/org.adempiere.webstore.resource/META-INF/MANIFEST.MF
index af09f062c2..5ecf9c62fa 100644
--- a/org.adempiere.webstore.resource/META-INF/MANIFEST.MF
+++ b/org.adempiere.webstore.resource/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: iDempiere Web Store Resources
 Bundle-SymbolicName: org.adempiere.webstore.resource
 Bundle-Version: 3.1.0.qualifier
 Bundle-Vendor: Adempiere.org
-Fragment-Host: org.adempiere.webstore;bundle-version="3.1.0"
+Fragment-Host: org.adempiere.webstore;bundle-version="0.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.compiere.wstore
 Jetty-WarPatchFragmentFolderPath: /
diff --git a/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF b/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF
index 927d96dcb3..51fb7151c6 100644
--- a/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF
+++ b/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 3.1.0.qualifier
 Bundle-Vendor: Adempiere.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.compiere.wstore
-Require-Bundle: org.adempiere.base;bundle-version="3.1.0"
+Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
 Import-Package: javax.servlet,
  javax.servlet.annotation;version="3.1.0",
  javax.servlet.http,
@@ -16,4 +16,4 @@ Import-Package: javax.servlet,
  org.apache.ecs,
  org.apache.ecs.xhtml,
  org.apache.taglibs.standard.tag.el.core
-Fragment-Host: org.adempiere.webstore;bundle-version="3.1.0"
+Fragment-Host: org.adempiere.webstore;bundle-version="0.0.0"
diff --git a/org.adempiere.webstore/META-INF/MANIFEST.MF b/org.adempiere.webstore/META-INF/MANIFEST.MF
index 51f5f0277e..21e41093c5 100644
--- a/org.adempiere.webstore/META-INF/MANIFEST.MF
+++ b/org.adempiere.webstore/META-INF/MANIFEST.MF
@@ -3,9 +3,9 @@ Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Web Store
 Bundle-SymbolicName: org.adempiere.webstore;singleton:=true
 Bundle-Version: 3.1.0.qualifier
-Require-Bundle: org.adempiere.base;bundle-version="3.1.0",
- org.adempiere.report.jasper.webapp;bundle-version="3.1.0",
- org.eclipse.jdt.core.compiler.batch;bundle-version="3.8.2"
+Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
+ org.adempiere.report.jasper.webapp;bundle-version="0.0.0",
+ org.eclipse.jdt.core.compiler.batch;bundle-version="0.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Web-ContextPath: wstore
 Import-Package: javax.servlet;version="3.0.0",
diff --git a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
index aeccc0a75f..07c92a7646 100644
--- a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
+++ b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
@@ -4,8 +4,8 @@ Bundle-Name: iDempiere Oracle Provider
 Bundle-SymbolicName: org.compiere.db.oracle.provider;singleton:=true
 Bundle-Version: 3.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.adempiere.base;bundle-version="3.1.0",
- org.adempiere.install;bundle-version="3.1.0"
+Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
+ org.adempiere.install;bundle-version="0.0.0"
 Bundle-ClassPath: .,
  ojdbc7.jar,
  c3p0-0.9.5.jar,
diff --git a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
index dd2fb21b1c..981860b2b9 100644
--- a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
+++ b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@ Bundle-ClassPath: .,
  postgresql-9.4-1206.jdbc41.jar,
  c3p0-0.9.5.jar,
  mchange-commons-java-0.2.9.jar
-Require-Bundle: org.adempiere.base;bundle-version="3.1.0",
- org.adempiere.install;bundle-version="3.1.0"
+Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
+ org.adempiere.install;bundle-version="0.0.0"
 Import-Package: junit.framework;version="3.8.2",
  org.junit;version="4.8.1",
  org.osgi.framework,
diff --git a/org.compiere.db.provider-feature/feature.xml b/org.compiere.db.provider-feature/feature.xml
index 941a1e15b7..bc50ed3919 100644
--- a/org.compiere.db.provider-feature/feature.xml
+++ b/org.compiere.db.provider-feature/feature.xml
@@ -17,21 +17,21 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="3.1.0.qualifier"/>
+      <import feature="org.adempiere.base" version="0.0.0"/>
    </requires>
 
    <plugin
          id="org.compiere.db.oracle.provider"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.compiere.db.postgresql.provider"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
 </feature>
diff --git a/org.idempiere.fitnesse-feature/feature.xml b/org.idempiere.fitnesse-feature/feature.xml
index e0993141c6..0d65830bc0 100644
--- a/org.idempiere.fitnesse-feature/feature.xml
+++ b/org.idempiere.fitnesse-feature/feature.xml
@@ -20,28 +20,28 @@
          id="org.idempiere.fitnesse.fixture"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.idempiere.fitnesse.server"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.idempiere.ui.zk.selenium"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.idempiere.fitrecorder"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
 </feature>
diff --git a/org.idempiere.fitrecorder/META-INF/MANIFEST.MF b/org.idempiere.fitrecorder/META-INF/MANIFEST.MF
index 9120f4f0c3..ebff57bc5c 100644
--- a/org.idempiere.fitrecorder/META-INF/MANIFEST.MF
+++ b/org.idempiere.fitrecorder/META-INF/MANIFEST.MF
@@ -10,4 +10,4 @@ Import-Package: org.adempiere.base,
  org.osgi.framework;version="1.3.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: plugin.xml
-Require-Bundle: org.adempiere.base;bundle-version="3.1.0"
+Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
diff --git a/org.idempiere.hazelcast.service-feature/feature.xml b/org.idempiere.hazelcast.service-feature/feature.xml
index 911794f6e4..3d65c1b985 100644
--- a/org.idempiere.hazelcast.service-feature/feature.xml
+++ b/org.idempiere.hazelcast.service-feature/feature.xml
@@ -20,7 +20,7 @@
          id="org.idempiere.hazelcast.service"
          download-size="0"
          install-size="0"
-         version="3.1.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
diff --git a/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF b/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF
index 7be4cdd64d..f4b8a35888 100644
--- a/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF
+++ b/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Hazelcast Service Configuration
 Bundle-SymbolicName: org.idempiere.hazelcast.service.config
 Bundle-Version: 3.1.0
-Fragment-Host: org.idempiere.hazelcast.service;bundle-version="3.1.0"
+Fragment-Host: org.idempiere.hazelcast.service;bundle-version="0.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF
index 9f79e9a942..0c12f71f6c 100644
--- a/org.idempiere.webservices/META-INF/MANIFEST.MF
+++ b/org.idempiere.webservices/META-INF/MANIFEST.MF
@@ -59,9 +59,9 @@ Import-Package: javax.activation,
  org.apache.xerces.xs.datatypes;version="2.9.0",
  org.apache.xml.serialize;version="2.9.0",
  org.osgi.framework;version="1.6.0"
-Require-Bundle: org.adempiere.base;bundle-version="3.1.0",
- org.adempiere.ui;bundle-version="3.1.0",
- org.apache.ecs;bundle-version="3.1.0"
+Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
+ org.adempiere.ui;bundle-version="0.0.0",
+ org.apache.ecs;bundle-version="0.0.0"
 Bundle-ClassPath: .,
  WEB-INF/lib/spring-osgi-extender-1.2.1.jar,
  WEB-INF/lib/spring-aop-3.0.7.RELEASE.jar,
diff --git a/org.slf4j.jdk14/META-INF/MANIFEST.MF b/org.slf4j.jdk14/META-INF/MANIFEST.MF
index ee3650e8c1..f7b870fdda 100644
--- a/org.slf4j.jdk14/META-INF/MANIFEST.MF
+++ b/org.slf4j.jdk14/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: SLF4J with JDK logger
 Bundle-SymbolicName: org.slf4j.jdk14
 Bundle-Version: 1.7.2.qualifier
-Fragment-Host: org.slf4j.api;bundle-version="1.7.2"
+Fragment-Host: org.slf4j.api;bundle-version="0.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.slf4j.impl;version=1.7.2
 Import-Package: org.slf4j;version=1.7.2,

From b91df9f899ff590387a6edfe6a7485b48956aa46 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Fri, 8 Jul 2016 23:06:25 +0700
Subject: [PATCH 11/34] IDEMPIERE-3136:all stuff relate library of idempiere
 remove version of dependency bundle. will add version limit when see any
 necessary (newest version isn't compatible, beta version,...)

---
 org.adempiere.sdk-feature/adempiere.cquery | 33 ++++++----------------
 1 file changed, 8 insertions(+), 25 deletions(-)

diff --git a/org.adempiere.sdk-feature/adempiere.cquery b/org.adempiere.sdk-feature/adempiere.cquery
index 18b2fc7b83..019ddc2055 100644
--- a/org.adempiere.sdk-feature/adempiere.cquery
+++ b/org.adempiere.sdk-feature/adempiere.cquery
@@ -7,30 +7,13 @@
     <cq:property key="target.arch" value="*"/>
     <cq:property key="target.os" value="*"/>
     <cq:property key="target.ws" value="*"/>
-    <cq:advisorNode namePattern="^com\.sun\.mail\.javax\.mail$" componentType="osgi.bundle" versionOverride="[1.5.1,1.5.2)"/>
+
+    <cq:advisorNode namePattern="^org\.objectweb\.asm(\..+)?" componentType="osgi.bundle" versionOverride="[5.0.1,6.0.0)"/>
     <cq:advisorNode namePattern="^org\.restlet(\..+)?" componentType="osgi.bundle" versionOverride="[2.1.0,2.2.0)"/>
-    <cq:advisorNode namePattern="^org\.junit$" componentType="osgi.bundle" versionOverride="[4.10.0,4.12.0)"/>
-    <cq:advisorNode namePattern="^org\.hamcrest\.core$" componentType="osgi.bundle" versionOverride="[1.3.0,1.4.0)"/>
-    <cq:advisorNode namePattern="^org\.apache\.poi$" componentType="osgi.bundle" versionOverride="[3.9.0,4.0.0)"/>
-    <cq:advisorNode namePattern="^org\.apache\.commons\.collections$" componentType="osgi.bundle" versionOverride="[3.2.0,3.3.0)"/>
-    <cq:advisorNode namePattern="^org\.apache\.commons\.net$" componentType="osgi.bundle" versionOverride="[3.2.0,3.3.0)"/>
-    <cq:advisorNode namePattern="^org\.apache\.commons\.logging$" componentType="osgi.bundle" versionOverride="[1.1.1,1.1.2)"/>
-    <cq:advisorNode namePattern="^org\.apache\.commons\.codec$" componentType="osgi.bundle" versionOverride="[1.6.0.v201305230611,1.6.0.v201305230611]"/>
-    <cq:advisorNode namePattern="^org\.apache\.xml\.resolver$" componentType="osgi.bundle" versionOverride="[1.2.0,1.3.0)"/>
-    <cq:advisorNode namePattern="^org\.apache\.xerces$" componentType="osgi.bundle" versionOverride="[2.9.0,2.9.1)"/>
-    <cq:advisorNode namePattern="^org\.apache\.xml\.serializer$" componentType="osgi.bundle" versionOverride="[2.7.1,2.7.2)"/>
-    <cq:advisorNode namePattern="^org\.apache\.felix\.webconsole$" versionOverride="[4.2.2,4.3.0)"/>
-    <cq:advisorNode namePattern="^org\.objectweb(\..+)?" componentType="osgi.bundle" versionOverride="[5.0.1,5.0.1]"/>
-    <cq:advisorNode namePattern="^javax\.jms$" componentType="osgi.bundle" versionOverride="[1.1.0,1.1.1)"/>
-    <cq:advisorNode namePattern="^javax\.ejb$" componentType="osgi.bundle" versionOverride="[3.1.1,3.1.2)"/>
-    <cq:advisorNode namePattern="^javax\.xml\.rpc$" componentType="osgi.bundle" versionOverride="[1.1.0,1.2.0)"/>
-    <cq:advisorNode namePattern="^javax\.xml\.soap$" componentType="osgi.bundle" versionOverride="[1.3.0,1.4.0)"/>
-    <cq:advisorNode namePattern="^javax\.xml$" componentType="osgi.bundle" versionOverride="[1.3.4,1.3.5)"/>
-    <cq:advisorNode namePattern="^javax\.el$" componentType="osgi.bundle" versionOverride="[3.0.0,3.1.0)"/>
-    <cq:advisorNode namePattern="^org\.apache\.servicemix\.bundles\.cglib$" componentType="osgi.bundle" versionOverride="raw:[3.1.0.'1',3.1.0.'1']/format(n[.n=0;[.n=0;]][d?S=M;]):3.1_1,3.1_1"/>
-    <cq:advisorNode namePattern="^org\.eclipse\.jetty\.osgi-servlet-api$" versionOverride="[3.1.0.M0,3.1.0.M0]"/>
-    <cq:advisorNode namePattern="^org\.eclipse\.jetty(\..+)?" versionOverride="[9.2.0,9.4.0)"/>
-    <cq:advisorNode namePattern="^javax\.annotation-api$" versionOverride="[1.2.0,1.2.0]"/>
-    <cq:advisorNode namePattern="^org\.apache\.felix\.webconsole\.plugins\.packageadmin$" versionOverride="[1.0.0,1.0.0]"/>
-    <cq:advisorNode namePattern="org.apache.commons.io" componentType="osgi.bundle" versionOverride="[1.4.0,2.0.0)"/>
+    <cq:advisorNode namePattern="^org\.apache\.felix\.webconsole$" useTargetPlatform="false" useWorkspace="false" versionOverride="[4.2.2,4.3.0)"/>
+    <cq:advisorNode namePattern="^org\.apache\.felix\.webconsole\.plugins\.packageadmin$" useTargetPlatform="false" useWorkspace="false" versionOverride="[1.0.0,1.0.0]"/>
+    <cq:advisorNode namePattern="^org\.eclipse\.jetty\.osgi-servlet-api$" useTargetPlatform="false" useWorkspace="false" versionOverride="[0.0.0,9.3.0]"/>
+    <cq:advisorNode namePattern="^org\.eclipse\.jetty\.alpn\.api$" versionOverride="[0.0.0,9.3.0)"/>
+    <cq:advisorNode namePattern="^org\.eclipse\.jetty(\..+)?" useTargetPlatform="false" useWorkspace="false" versionOverride="[9.2.0,9.3.0)"/>
+    <cq:advisorNode namePattern="^.*$" useTargetPlatform="false" useWorkspace="false"/>
 </cq:componentQuery>

From ed63c3fb408c2628546c0d647a5c0558bcef4afe Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Fri, 8 Jul 2016 23:09:35 +0700
Subject: [PATCH 12/34] IDEMPIERE-3136:all stuff relate library of idempiere
 update restlet to 2.3 and replace p2 repository for maven repository

---
 .../feature.xml                                |  7 -------
 org.adempiere.sdk-feature/adempiere.cquery     |  1 -
 org.adempiere.sdk-feature/adempiere.rmap       | 14 ++++----------
 .../materialize.properties                     |  2 ++
 org.adempiere.ui.swing-feature/feature.xml     | 14 --------------
 org.adempiere.ui.swing/META-INF/MANIFEST.MF    | 18 ++----------------
 .../src/org/adempiere/client/Application.java  |  3 +--
 .../client/ClientSSLContextFactory.java        |  3 ++-
 8 files changed, 11 insertions(+), 51 deletions(-)

diff --git a/org.adempiere.bundles.external-feature/feature.xml b/org.adempiere.bundles.external-feature/feature.xml
index 2ce363d71e..94ab1c1702 100644
--- a/org.adempiere.bundles.external-feature/feature.xml
+++ b/org.adempiere.bundles.external-feature/feature.xml
@@ -101,13 +101,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.restlet.ext.net"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.restlet.ext.servlet"
          download-size="0"
diff --git a/org.adempiere.sdk-feature/adempiere.cquery b/org.adempiere.sdk-feature/adempiere.cquery
index 019ddc2055..6e381a868b 100644
--- a/org.adempiere.sdk-feature/adempiere.cquery
+++ b/org.adempiere.sdk-feature/adempiere.cquery
@@ -9,7 +9,6 @@
     <cq:property key="target.ws" value="*"/>
 
     <cq:advisorNode namePattern="^org\.objectweb\.asm(\..+)?" componentType="osgi.bundle" versionOverride="[5.0.1,6.0.0)"/>
-    <cq:advisorNode namePattern="^org\.restlet(\..+)?" componentType="osgi.bundle" versionOverride="[2.1.0,2.2.0)"/>
     <cq:advisorNode namePattern="^org\.apache\.felix\.webconsole$" useTargetPlatform="false" useWorkspace="false" versionOverride="[4.2.2,4.3.0)"/>
     <cq:advisorNode namePattern="^org\.apache\.felix\.webconsole\.plugins\.packageadmin$" useTargetPlatform="false" useWorkspace="false" versionOverride="[1.0.0,1.0.0]"/>
     <cq:advisorNode namePattern="^org\.eclipse\.jetty\.osgi-servlet-api$" useTargetPlatform="false" useWorkspace="false" versionOverride="[0.0.0,9.3.0]"/>
diff --git a/org.adempiere.sdk-feature/adempiere.rmap b/org.adempiere.sdk-feature/adempiere.rmap
index d065d8f567..6925d5530b 100644
--- a/org.adempiere.sdk-feature/adempiere.rmap
+++ b/org.adempiere.sdk-feature/adempiere.rmap
@@ -27,7 +27,7 @@
   <rm:locator pattern="^org\.slf4j(\..+)?" searchPathRef="orbit"/>
   <rm:locator pattern="^org\.apache\.ant(\..+)?" searchPathRef="orbit"/>
   <rm:locator pattern="^org\.apache\.commons(\..+)?" searchPathRef="orbit"/>
-  <rm:locator pattern="^org\.restlet(\..+)?" searchPathRef="restlet.maven"/>
+  <rm:locator pattern="^org\.restlet(\..+)?" searchPathRef="restlet.p2"/>
   <rm:locator pattern="^zcommon$" searchPathRef="zkoss.osgi"/>
   <rm:locator pattern="^zel$" searchPathRef="zkoss.osgi"/>
   <rm:locator pattern="^zhtml$" searchPathRef="zkoss.osgi"/>
@@ -88,17 +88,11 @@
       <rm:uri format="${url.orbit}"/>
     </rm:provider>
   </rm:searchPath>
-  <rm:searchPath name="restlet.maven">
-    <rm:provider xsi:type="maven:MavenProvider" componentTypes="osgi.bundle" readerType="maven2" source="false" mutable="false">
+  <rm:searchPath name="restlet.p2">
+    <rm:provider componentTypes="osgi.bundle" readerType="p2" source="false" mutable="false">
       <rm:property key="buckminster.source" value="false"/>
       <rm:property key="buckminster.mutable" value="false"/>
-      <rm:uri format="${url.maven.restlet}"/>
-      <maven:mappings>
-        <maven:entry artifactId="org.restlet" groupId="org.restlet.osgi" name="org.restlet"/>
-        <maven:entry artifactId="org.restlet.ext.net" groupId="org.restlet.osgi" name="org.restlet.ext.net"/>
-        <maven:entry artifactId="org.restlet.ext.servlet" groupId="org.restlet.osgi" name="org.restlet.ext.servlet"/>
-        <maven:entry artifactId="org.restlet.ext.ssl" groupId="org.restlet.osgi" name="org.restlet.ext.ssl"/>
-      </maven:mappings>
+      <rm:uri format="${url.restlet.p2}"/>
     </rm:provider>
   </rm:searchPath>
   <rm:searchPath name="bundles.maven">
diff --git a/org.adempiere.sdk-feature/materialize.properties b/org.adempiere.sdk-feature/materialize.properties
index 9deea9000d..07695a5190 100644
--- a/org.adempiere.sdk-feature/materialize.properties
+++ b/org.adempiere.sdk-feature/materialize.properties
@@ -23,3 +23,5 @@ url.jetty=http://download.eclipse.org/jetty/updates/jetty-bundles-9.x
 url.orbit=http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository
 
 url.file.srv=http://downloads.sourceforge.net/project/idempiere/binary.file
+
+url.restlet.p2=http://p2.restlet.com/2.3
diff --git a/org.adempiere.ui.swing-feature/feature.xml b/org.adempiere.ui.swing-feature/feature.xml
index 6aee3ada64..19d4af5d65 100644
--- a/org.adempiere.ui.swing-feature/feature.xml
+++ b/org.adempiere.ui.swing-feature/feature.xml
@@ -33,20 +33,6 @@
          install-size="0"
          version="0.0.0"/>
 
-   <plugin
-         id="org.restlet.ext.net"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.restlet.ext.ssl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.restlet.ext.servlet"
          download-size="0"
diff --git a/org.adempiere.ui.swing/META-INF/MANIFEST.MF b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
index aef69966cb..cc955f6fad 100644
--- a/org.adempiere.ui.swing/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
@@ -71,9 +71,7 @@ Export-Package: com.jgoodies.looks,
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.adempiere.ui;bundle-version="0.0.0",
  org.restlet;bundle-version="0.0.0",
- org.restlet.ext.net;bundle-version="0.0.0",
- org.restlet.ext.servlet;bundle-version="0.0.0",
- org.restlet.ext.ssl;bundle-version="0.0.0"
+ org.restlet.ext.servlet;bundle-version="0.0.0"
 Eclipse-ExtensibleAPI: true
 Eclipse-RegisterBuddy: org.adempiere.base
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -85,18 +83,6 @@ Import-Package: javax.net.ssl,
  org.compiere.css,
  org.eclipse.core.runtime;version="3.4.0",
  org.eclipse.equinox.app,
- org.osgi.framework;version="1.5.0",
- org.restlet,
- org.restlet.data,
- org.restlet.engine,
- org.restlet.engine.connector,
- org.restlet.engine.security,
- org.restlet.ext.net,
- org.restlet.ext.ssl,
- org.restlet.representation,
- org.restlet.resource,
- org.restlet.security,
- org.restlet.service,
- org.restlet.util
+ org.osgi.framework;version="1.5.0"
 Service-Component: OSGI-INF/*.xml
 Bundle-ActivationPolicy: lazy
diff --git a/org.adempiere.ui.swing/src/org/adempiere/client/Application.java b/org.adempiere.ui.swing/src/org/adempiere/client/Application.java
index beaf8560cf..9cc3b5f1b0 100644
--- a/org.adempiere.ui.swing/src/org/adempiere/client/Application.java
+++ b/org.adempiere.ui.swing/src/org/adempiere/client/Application.java
@@ -8,13 +8,12 @@ import javax.net.ssl.SSLSession;
 
 import org.compiere.Adempiere;
 import org.compiere.util.CLogger;
-
 import org.eclipse.equinox.app.IApplication;
 import org.eclipse.equinox.app.IApplicationContext;
 import org.restlet.Client;
 import org.restlet.Context;
 import org.restlet.data.Protocol;
-import org.restlet.ext.net.HttpClientHelper;
+import org.restlet.engine.connector.HttpClientHelper;
 
 public class Application implements IApplication {
 	private static CLogger log = CLogger.getCLogger(Application.class);
diff --git a/org.adempiere.ui.swing/src/org/adempiere/client/ClientSSLContextFactory.java b/org.adempiere.ui.swing/src/org/adempiere/client/ClientSSLContextFactory.java
index d804e382c4..078299a515 100644
--- a/org.adempiere.ui.swing/src/org/adempiere/client/ClientSSLContextFactory.java
+++ b/org.adempiere.ui.swing/src/org/adempiere/client/ClientSSLContextFactory.java
@@ -22,7 +22,8 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
 
-import org.restlet.ext.ssl.DefaultSslContextFactory;
+import org.restlet.engine.ssl.DefaultSslContextFactory;
+
 
 /**
  * Temporary workaround to support ssl connection to server with self signed certificate.

From d4be017105ce687b9636c9f09ca26350150e6ccf Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Thu, 7 Jul 2016 14:53:17 +0700
Subject: [PATCH 13/34] IDEMPIERE-3136:all stuff relate library of idempiere
 ignore External Plug-in Libraries from commit

---
 .hgignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgignore b/.hgignore
index dc37f15ef1..0b340a0611 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,6 +1,7 @@
 syntax: glob
 build
 
+External Plug-in Libraries
 syntax: regexp
 ^adempiere$
 ^org\.adempiere\.install/lib$

From 1ca5d9835dc01cba93ab600f3cdeb666cfc9c570 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Thu, 7 Jul 2016 19:05:05 +0700
Subject: [PATCH 14/34] IDEMPIERE-3136:all stuff relate library of idempiere
 update and use osgi version of library (passay, itextpdf, bcprov, super-csv)

---
 org.adempiere.base-feature/feature.xml        |  33 +++++
 org.adempiere.base/.classpath                 |   4 -
 org.adempiere.base/META-INF/MANIFEST.MF       | 124 +-----------------
 org.adempiere.base/build.properties           |   4 -
 org.adempiere.base/copyjars.xml               |   4 -
 .../src/org/adempiere/pdf/Document.java       |  16 +--
 .../src/org/compiere/model/MPasswordRule.java |  38 +++---
 .../.classpath                                |   2 +
 .../META-INF/MANIFEST.MF                      |   5 +-
 .../build.properties                          |   4 +-
 .../copyjars.xml                              |   2 +
 org.adempiere.sdk-feature/adempiere.rmap      |  14 ++
 .../src/main/home/org/bmlaurus/home/Prop.java |   8 +-
 .../src/org/compiere/grid/VPanel.java         |   4 +-
 org.adempiere.ui.zk-feature/feature.xml       |   8 +-
 org.adempiere.ui.zk/.classpath                |   4 -
 org.adempiere.ui.zk/META-INF/MANIFEST.MF      |  28 +---
 .../zk/atmosphere/AtmosphereServerPush.java   |   2 +-
 .../src/org/adempiere/webui/apps/AEnv.java    |  12 +-
 .../adempiere/webui/apps/ProcessDialog.java   |  10 +-
 .../adempiere/webui/apps/form/WPayPrint.java  |   2 +-
 org.adempiere.ui.zk/WEB-INF/web.xml           |   6 +-
 org.adempiere.ui.zk/build.properties          |   4 -
 org.adempiere.ui.zk/copyjars.xml              |   4 -
 24 files changed, 125 insertions(+), 217 deletions(-)

diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml
index 727e5bacd8..6d8c0db261 100644
--- a/org.adempiere.base-feature/feature.xml
+++ b/org.adempiere.base-feature/feature.xml
@@ -265,5 +265,38 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+   <plugin
+         id="org.passay"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
+   <plugin
+         id="com.itextpdf"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="bcprov"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.cryptacular"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="net.sf.supercsv.super-csv"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 </feature>
diff --git a/org.adempiere.base/.classpath b/org.adempiere.base/.classpath
index 53f016ef63..9d1123c354 100644
--- a/org.adempiere.base/.classpath
+++ b/org.adempiere.base/.classpath
@@ -7,21 +7,17 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="bsh-2.0b6.jar"/>
-	<classpathentry exported="true" kind="lib" path="passay-1.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="bsh-engine.jar"/>
 	<classpathentry exported="true" kind="lib" path="groovy-engine.jar"/>
 	<classpathentry exported="true" kind="lib" path="jython-engine.jar"/>
 	<classpathentry exported="true" kind="lib" path="jython.jar"/>
 	<classpathentry exported="true" kind="lib" path="cron4j-2.2.5.jar"/>
 	<classpathentry exported="true" kind="lib" path="barbecue-1.5-beta1.jar"/>
-	<classpathentry exported="true" kind="lib" path="iText-2.1.7.jar"/>
 	<classpathentry exported="true" kind="lib" path="jcommon-1.0.23.jar"/>
 	<classpathentry exported="true" kind="lib" path="jfreechart-1.0.19.jar"/>
 	<classpathentry exported="true" kind="lib" path="jnlp.jar"/>
 	<classpathentry exported="true" kind="lib" path="groovy-all-1.7.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="super-csv-2.2.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="barcode4j-2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="bcprov-jdk15on-1.46.jar"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
index 4d08fb727e..8eb35eb5e1 100644
--- a/org.adempiere.base/META-INF/MANIFEST.MF
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@@ -10,15 +10,11 @@ Bundle-ClassPath: base.jar,
  jython.jar,
  cron4j-2.2.5.jar,
  barbecue-1.5-beta1.jar,
- iText-2.1.7.jar,
  jcommon-1.0.23.jar,
  jfreechart-1.0.19.jar,
  jnlp.jar,
  groovy-all-1.7.5.jar,
- super-csv-2.2.0.jar,
  barcode4j-2.1.jar,
- bcprov-jdk15on-1.46.jar,
- passay-1.0.jar,
  bsh-2.0b6.jar
 Export-Package: bsh,
  bsh.classpath,
@@ -30,28 +26,6 @@ Export-Package: bsh,
  bsh.servlet,
  bsh.util,
  com.akunagroup.uk.postcode,
- com.lowagie.text,
- com.lowagie.text.exceptions,
- com.lowagie.text.factories,
- com.lowagie.text.html,
- com.lowagie.text.html.simpleparser,
- com.lowagie.text.pdf,
- com.lowagie.text.pdf.codec,
- com.lowagie.text.pdf.codec.wmf,
- com.lowagie.text.pdf.collection,
- com.lowagie.text.pdf.crypto,
- com.lowagie.text.pdf.draw,
- com.lowagie.text.pdf.events,
- com.lowagie.text.pdf.fonts,
- com.lowagie.text.pdf.fonts.cmaps,
- com.lowagie.text.pdf.hyphenation,
- com.lowagie.text.pdf.interfaces,
- com.lowagie.text.pdf.internal,
- com.lowagie.text.pdf.parser,
- com.lowagie.text.xml,
- com.lowagie.text.xml.simpleparser,
- com.lowagie.text.xml.xmp,
- com.lowagie.tools,
  groovy.beans,
  groovy.grape,
  groovy.inspect,
@@ -122,88 +96,6 @@ Export-Package: bsh,
  org.adempiere.print.export,
  org.adempiere.process,
  org.adempiere.util,
- org.bouncycastle,
- org.bouncycastle.asn1,
- org.bouncycastle.asn1.bc,
- org.bouncycastle.asn1.cmp,
- org.bouncycastle.asn1.cms,
- org.bouncycastle.asn1.cms.ecc,
- org.bouncycastle.asn1.crmf,
- org.bouncycastle.asn1.cryptopro,
- org.bouncycastle.asn1.eac,
- org.bouncycastle.asn1.esf,
- org.bouncycastle.asn1.ess,
- org.bouncycastle.asn1.gnu,
- org.bouncycastle.asn1.iana,
- org.bouncycastle.asn1.icao,
- org.bouncycastle.asn1.isismtt,
- org.bouncycastle.asn1.isismtt.ocsp,
- org.bouncycastle.asn1.isismtt.x509,
- org.bouncycastle.asn1.kisa,
- org.bouncycastle.asn1.microsoft,
- org.bouncycastle.asn1.misc,
- org.bouncycastle.asn1.mozilla,
- org.bouncycastle.asn1.nist,
- org.bouncycastle.asn1.ntt,
- org.bouncycastle.asn1.ocsp,
- org.bouncycastle.asn1.oiw,
- org.bouncycastle.asn1.pkcs,
- org.bouncycastle.asn1.sec,
- org.bouncycastle.asn1.smime,
- org.bouncycastle.asn1.teletrust,
- org.bouncycastle.asn1.tsp,
- org.bouncycastle.asn1.util,
- org.bouncycastle.asn1.x500,
- org.bouncycastle.asn1.x500.style,
- org.bouncycastle.asn1.x509,
- org.bouncycastle.asn1.x509.qualified,
- org.bouncycastle.asn1.x509.sigi,
- org.bouncycastle.asn1.x9,
- org.bouncycastle.crypto,
- org.bouncycastle.crypto.agreement,
- org.bouncycastle.crypto.agreement.kdf,
- org.bouncycastle.crypto.agreement.srp,
- org.bouncycastle.crypto.digests,
- org.bouncycastle.crypto.encodings,
- org.bouncycastle.crypto.engines,
- org.bouncycastle.crypto.examples,
- org.bouncycastle.crypto.generators,
- org.bouncycastle.crypto.io,
- org.bouncycastle.crypto.macs,
- org.bouncycastle.crypto.modes,
- org.bouncycastle.crypto.modes.gcm,
- org.bouncycastle.crypto.paddings,
- org.bouncycastle.crypto.params,
- org.bouncycastle.crypto.prng,
- org.bouncycastle.crypto.signers,
- org.bouncycastle.crypto.tls,
- org.bouncycastle.crypto.util,
- org.bouncycastle.i18n,
- org.bouncycastle.i18n.filter,
- org.bouncycastle.jce,
- org.bouncycastle.jce.examples,
- org.bouncycastle.jce.exception,
- org.bouncycastle.jce.interfaces,
- org.bouncycastle.jce.netscape,
- org.bouncycastle.jce.provider,
- org.bouncycastle.jce.provider.asymmetric,
- org.bouncycastle.jce.provider.asymmetric.ec,
- org.bouncycastle.jce.provider.symmetric,
- org.bouncycastle.jce.spec,
- org.bouncycastle.math.ec,
- org.bouncycastle.mozilla,
- org.bouncycastle.ocsp,
- org.bouncycastle.openssl,
- org.bouncycastle.util,
- org.bouncycastle.util.encoders,
- org.bouncycastle.util.io,
- org.bouncycastle.util.io.pem,
- org.bouncycastle.util.test,
- org.bouncycastle.voms,
- org.bouncycastle.x509,
- org.bouncycastle.x509.examples,
- org.bouncycastle.x509.extension,
- org.bouncycastle.x509.util,
  org.codehaus.groovy,
  org.codehaus.groovy.ant,
  org.codehaus.groovy.antlr,
@@ -345,14 +237,7 @@ Export-Package: bsh,
  org.krysalis.barcode4j.output.svg,
  org.krysalis.barcode4j.servlet,
  org.krysalis.barcode4j.tools,
- org.krysalis.barcode4j.xalan,
- org.supercsv.cellprocessor,
- org.supercsv.cellprocessor.constraint,
- org.supercsv.cellprocessor.ift,
- org.supercsv.exception,
- org.supercsv.io,
- org.supercsv.prefs,
- org.supercsv.util
+ org.krysalis.barcode4j.xalan
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.sun.mail.smtp;version="1.5",
  javax.activation,
@@ -393,4 +278,9 @@ Eclipse-ExtensibleAPI: true
 Bundle-Activator: org.adempiere.base.BaseActivator
 Service-Component: OSGI-INF/*.xml
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0"
+Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0",
+ org.passay;bundle-version="0.0.0",
+ org.cryptacular,
+ com.itextpdf;bundle-version="0.0.0",
+ net.sf.supercsv.super-csv;bundle-version="0.0.0",
+ bcprov;bundle-version="1.54.0"
diff --git a/org.adempiere.base/build.properties b/org.adempiere.base/build.properties
index df32192598..3c019641d8 100644
--- a/org.adempiere.base/build.properties
+++ b/org.adempiere.base/build.properties
@@ -7,13 +7,11 @@ bin.includes = META-INF/,\
                jython.jar,\
                cron4j-2.2.5.jar,\
                barbecue-1.5-beta1.jar,\
-               iText-2.1.7.jar,\
                jcommon-1.0.23.jar,\
                jfreechart-1.0.19.jar,\
                jnlp.jar,\
                OSGI-INF/,\
                groovy-all-1.7.5.jar,\
-               super-csv-2.2.0.jar,\
                OSGI-INF/dslocator.xml,\
                OSGI-INF/serverbean.xml,\
                OSGI-INF/statusbean.xml,\
@@ -32,8 +30,6 @@ bin.includes = META-INF/,\
                OSGI-INF/addressvalidationeventhandler.xml,\
                schema/,\
                barcode4j-2.1.jar,\
-               bcprov-jdk15on-1.46.jar,\
-               passay-1.0.jar,\
                bsh-2.0b6.jar
 output.base.jar = bin/
 src.includes = schema/
diff --git a/org.adempiere.base/copyjars.xml b/org.adempiere.base/copyjars.xml
index 17f762d934..7e41f38344 100644
--- a/org.adempiere.base/copyjars.xml
+++ b/org.adempiere.base/copyjars.xml
@@ -11,15 +11,11 @@
 		<get src="${url.maven2.lib}/maven2/org/python/jython/2.2.1/jython-2.2.1.jar" dest="jython.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven2.lib}/maven2/it/sauronsoftware/cron4j/cron4j/2.2.5/cron4j-2.2.5.jar" dest="cron4j-2.2.5.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven2.lib}/maven2/net/sourceforge/barbecue/barbecue/1.5-beta1/barbecue-1.5-beta1.jar" dest="barbecue-1.5-beta1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/com/lowagie/itext/2.1.7/itext-2.1.7.jar" dest="iText-2.1.7.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven2.lib}/maven2/org/jfree/jcommon/1.0.23/jcommon-1.0.23.jar" dest="jcommon-1.0.23.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven2.lib}/maven2/org/jfree/jfreechart/1.0.19/jfreechart-1.0.19.jar" dest="jfreechart-1.0.19.jar" usetimestamp="true" verbose="true" retries="5" />
  		<!-- jnlp is not used in idempiere? -->
 		<get src="${url.maven2.lib}/maven2/org/codehaus/groovy/groovy-all/1.7.5/groovy-all-1.7.5.jar" dest="groovy-all-1.7.5.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/net/sf/supercsv/super-csv/2.2.0/super-csv-2.2.0.jar" dest="super-csv-2.2.0.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven2.lib}/maven2/net/sf/barcode4j/barcode4j/2.1/barcode4j-2.1.jar" dest="barcode4j-2.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/org/bouncycastle/bcprov-jdk15on/1.46/bcprov-jdk15on-1.46.jar" dest="bcprov-jdk15on-1.46.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/org/passay/passay/1.0/passay-1.0.jar" dest="passay-1.0.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.srv}/jarfile/3.1/jnlp.jar" dest="jnlp.jar" usetimestamp="true" verbose="true" retries="5" />
  	</target>
  </project>
diff --git a/org.adempiere.base/src/org/adempiere/pdf/Document.java b/org.adempiere.base/src/org/adempiere/pdf/Document.java
index 3900ca4883..a3e53819d3 100644
--- a/org.adempiere.base/src/org/adempiere/pdf/Document.java
+++ b/org.adempiere.base/src/org/adempiere/pdf/Document.java
@@ -23,12 +23,12 @@ import java.io.OutputStream;
 
 import org.compiere.model.MSysConfig;
 
-import com.lowagie.text.FontFactory;
-import com.lowagie.text.Rectangle;
-import com.lowagie.text.pdf.DefaultFontMapper;
-import com.lowagie.text.pdf.PdfContentByte;
-import com.lowagie.text.pdf.PdfTemplate;
-import com.lowagie.text.pdf.PdfWriter;
+import com.itextpdf.text.FontFactory;
+import com.itextpdf.text.Rectangle;
+import com.itextpdf.awt.DefaultFontMapper;
+import com.itextpdf.text.pdf.PdfContentByte;
+import com.itextpdf.text.pdf.PdfTemplate;
+import com.itextpdf.text.pdf.PdfWriter;
 
 /**
  * Generate PDF document using iText
@@ -46,8 +46,8 @@ public class Document {
 		try {
             final PageFormat pf = pageable.getPageFormat(0);
             
-            final com.lowagie.text.Document document =
-            	new com.lowagie.text.Document(new Rectangle(
+            final com.itextpdf.text.Document document =
+            	new com.itextpdf.text.Document(new Rectangle(
             			(int) pf.getWidth(), (int) pf.getHeight()));
             final PdfWriter writer = PdfWriter.getInstance(
                     document, output);
diff --git a/org.adempiere.base/src/org/compiere/model/MPasswordRule.java b/org.adempiere.base/src/org/compiere/model/MPasswordRule.java
index 585d5a9ab6..52831c7470 100644
--- a/org.adempiere.base/src/org/compiere/model/MPasswordRule.java
+++ b/org.adempiere.base/src/org/compiere/model/MPasswordRule.java
@@ -32,25 +32,21 @@ import org.compiere.util.Env;
 import org.compiere.util.Msg;
 import org.compiere.util.Util;
 import org.idempiere.util.HistoryRuleSupportHash;
-import org.passay.AlphabeticalCharacterRule;
-import org.passay.AlphabeticalSequenceRule;
 import org.passay.CharacterCharacteristicsRule;
+import org.passay.CharacterRule;
 import org.passay.DictionarySubstringRule;
-import org.passay.DigitCharacterRule;
+import org.passay.EnglishCharacterData;
+import org.passay.EnglishSequenceData;
+import org.passay.IllegalSequenceRule;
 import org.passay.LengthRule;
-import org.passay.LowercaseCharacterRule;
 import org.passay.MessageResolver;
-import org.passay.NumericalSequenceRule;
 import org.passay.PasswordData;
 import org.passay.PasswordGenerator;
 import org.passay.PasswordValidator;
 import org.passay.PropertiesMessageResolver;
-import org.passay.QwertySequenceRule;
 import org.passay.RepeatCharacterRegexRule;
 import org.passay.Rule;
 import org.passay.RuleResult;
-import org.passay.SpecialCharacterRule;
-import org.passay.UppercaseCharacterRule;
 import org.passay.UsernameRule;
 import org.passay.WhitespaceRule;
 import org.passay.dictionary.ArrayWordList;
@@ -136,24 +132,24 @@ public class MPasswordRule extends X_AD_PasswordRule {
 		if (getDigitCharacter() > 0) {
 			// require at least n digit in passwords
 			numValidations++;
-			charRule.getRules().add(new DigitCharacterRule(getDigitCharacter()));
+			charRule.getRules().add(new CharacterRule(EnglishCharacterData.Digit, getDigitCharacter()));
 		}
 		if (getNonAlphaNumericCharacter() > 0) {
 			// require at least n non-alphanumeric char
 			numValidations++;
-			charRule.getRules().add(new SpecialCharacterRule(getNonAlphaNumericCharacter()));
+			charRule.getRules().add(new CharacterRule(EnglishCharacterData.Special, getNonAlphaNumericCharacter()));
 		}
 		if (getUppercaseCharacter() > 0) {
 			numValidations++;
-			charRule.getRules().add(new UppercaseCharacterRule(getUppercaseCharacter()));	
+			charRule.getRules().add(new CharacterRule(EnglishCharacterData.UpperCase, getUppercaseCharacter()));	
 		}
 		if (getLowercaseCharacter() > 0) {
 			numValidations++;
-			charRule.getRules().add(new LowercaseCharacterRule(getLowercaseCharacter()));
+			charRule.getRules().add(new CharacterRule(EnglishCharacterData.LowerCase, getLowercaseCharacter()));
 		}
 		if (getAlphabeticalCharacter() > 0){
 			numValidations++;
-			charRule.getRules().add(new AlphabeticalCharacterRule(getAlphabeticalCharacter()));
+			charRule.getRules().add(new CharacterRule (EnglishCharacterData.Alphabetical, getAlphabeticalCharacter()));
 		}
 		if (! charRule.getRules().isEmpty()) {
 			charRule.setNumberOfCharacteristics(numValidations);
@@ -161,14 +157,14 @@ public class MPasswordRule extends X_AD_PasswordRule {
 		}
 
 		if (getAlphabeticalSequence() > 0) {
-			ruleList.add(new AlphabeticalSequenceRule(getAlphabeticalSequence(), true));
+			ruleList.add(new IllegalSequenceRule (EnglishSequenceData.Alphabetical, getAlphabeticalSequence(), true));
 		}
 
 		if (getNumericalSequence() > 0) {
-			ruleList.add(new NumericalSequenceRule(getNumericalSequence(), true));
+			ruleList.add(new IllegalSequenceRule(EnglishSequenceData.Numerical, getNumericalSequence(), true));
 		}
 		if (getQWERTYSequence() > 0) {
-			ruleList.add(new QwertySequenceRule(getQWERTYSequence(), true));
+			ruleList.add(new IllegalSequenceRule(EnglishSequenceData.USQwerty, getQWERTYSequence(), true));
 		}
 
 		if (getRepeatCharacterRegex() > 0) {
@@ -269,24 +265,24 @@ public class MPasswordRule extends X_AD_PasswordRule {
 		if (getDigitCharacter() > 0) {
 			// require at least n digit in passwords
 			numValidations++;
-			charRule.getRules().add(new DigitCharacterRule(getDigitCharacter()));
+			charRule.getRules().add(new CharacterRule(EnglishCharacterData.Digit, getDigitCharacter()));
 		}
 		if (getNonAlphaNumericCharacter() > 0) {
 			// require at least n non-alphanumeric char
 			numValidations++;
-			charRule.getRules().add(new SpecialCharacterRule(getNonAlphaNumericCharacter()));
+			charRule.getRules().add(new CharacterRule(EnglishCharacterData.Special, getNonAlphaNumericCharacter()));
 		}
 		if (getUppercaseCharacter() > 0) {
 			numValidations++;
-			charRule.getRules().add(new UppercaseCharacterRule(getUppercaseCharacter()));	
+			charRule.getRules().add(new CharacterRule(EnglishCharacterData.UpperCase, getUppercaseCharacter()));	
 		}
 		if (getLowercaseCharacter() > 0) {
 			numValidations++;
-			charRule.getRules().add(new LowercaseCharacterRule(getLowercaseCharacter()));
+			charRule.getRules().add(new CharacterRule(EnglishCharacterData.LowerCase, getLowercaseCharacter()));
 		}
 		if (getAlphabeticalCharacter() > 0){
 			numValidations++;
-			charRule.getRules().add(new AlphabeticalCharacterRule(getAlphabeticalCharacter()));
+			charRule.getRules().add(new CharacterRule(EnglishCharacterData.Alphabetical, getAlphabeticalCharacter()));
 		}
 		if (! charRule.getRules().isEmpty()) {
 			charRule.setNumberOfCharacteristics(numValidations);
diff --git a/org.adempiere.report.jasper.library/.classpath b/org.adempiere.report.jasper.library/.classpath
index 43f6eff121..4e864b50be 100644
--- a/org.adempiere.report.jasper.library/.classpath
+++ b/org.adempiere.report.jasper.library/.classpath
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="lib/bcprov-jdk14-140.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/itext-2.1.7.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/joda-time-2.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jasperreports-functions-5.6.1.jar"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
diff --git a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
index 263b095be6..4c88f6dfb8 100644
--- a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
@@ -10,7 +10,9 @@ Bundle-ClassPath: lib/commons-beanutils-1.8.0.jar,
  lib/jackson-core-2.1.4.jar,
  lib/xalan-2.7.1.jar,
  lib/jasperreports-functions-5.6.1.jar,
- lib/joda-time-2.1.jar
+ lib/joda-time-2.1.jar,
+ lib/itext-2.1.7.jar,
+ lib/bcprov-jdk14-140.jar
 Export-Package: .,
  com.fasterxml.jackson.core,
  com.fasterxml.jackson.core.base,
@@ -242,4 +244,5 @@ Import-Package: org.apache.commons.collections,
  org.w3c.tools.codec
 DynamicImport-Package: *
 Eclipse-BuddyPolicy: registered
+Require-Bundle: bcprov;bundle-version="1.53.0"
 
diff --git a/org.adempiere.report.jasper.library/build.properties b/org.adempiere.report.jasper.library/build.properties
index df3c10112c..dc4d13af94 100644
--- a/org.adempiere.report.jasper.library/build.properties
+++ b/org.adempiere.report.jasper.library/build.properties
@@ -6,4 +6,6 @@ bin.includes = META-INF/,\
                lib/jackson-core-2.1.4.jar,\
                lib/xalan-2.7.1.jar,\
                lib/jasperreports-functions-5.6.1.jar,\
-               lib/joda-time-2.1.jar
+               lib/joda-time-2.1.jar,\
+               lib/itext-2.1.7.jar,\
+               lib/bcprov-jdk14-140.jar
diff --git a/org.adempiere.report.jasper.library/copyjars.xml b/org.adempiere.report.jasper.library/copyjars.xml
index 093b6028e8..56058ecfef 100644
--- a/org.adempiere.report.jasper.library/copyjars.xml
+++ b/org.adempiere.report.jasper.library/copyjars.xml
@@ -9,5 +9,7 @@
 		<get src="${url.maven2.lib}/maven2/xalan/xalan/2.7.1/xalan-2.7.1.jar" dest="lib/xalan-2.7.1.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.srv}/jarfile/3.1/jasperreports-functions-5.6.1.jar" dest="lib/jasperreports-functions-5.6.1.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven2.lib}/maven2/joda-time/joda-time/2.1/joda-time-2.1.jar" dest="lib/joda-time-2.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/com/lowagie/itext/2.1.7/itext-2.1.7.jar" dest="lib/itext-2.1.7.jar" usetimestamp="true" verbose="true" retries="5" />
+    <get src="${url.maven2.lib}/maven2/bouncycastle/bcprov-jdk14/140/bcprov-jdk14-140.jar" dest="lib/bcprov-jdk14-140.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
diff --git a/org.adempiere.sdk-feature/adempiere.rmap b/org.adempiere.sdk-feature/adempiere.rmap
index 6925d5530b..064b10c54e 100644
--- a/org.adempiere.sdk-feature/adempiere.rmap
+++ b/org.adempiere.sdk-feature/adempiere.rmap
@@ -10,6 +10,13 @@
   <rm:locator pattern="^org\.eclipse\.jetty\.osgi\-servlet\-api$" searchPathRef="bundles.maven"/>
   <rm:locator pattern="^org\.apache\.felix\.webconsole(\..+)?" searchPathRef="bundles.maven"/>
   <rm:locator pattern="^org\.apache\.felix\.inventory" searchPathRef="bundles.maven"/>
+  <rm:locator pattern="^org\.passay$" searchPathRef="bundles.maven" />
+  <rm:locator pattern="^com\.itextpdf$" searchPathRef="bundles.maven" />
+  <rm:locator pattern="^bcpkix$" searchPathRef="bundles.maven" />
+  <rm:locator pattern="^bcprov$" searchPathRef="bundles.maven" />
+  <rm:locator pattern="^org\.cryptacular$" searchPathRef="bundles.maven" />
+  <rm:locator pattern="^net\.sf\.supercsv\.super-csv$" searchPathRef="bundles.maven" />
+  <rm:locator pattern="^org\.atmosphere\.runtime$" searchPathRef="bundles.maven" />
   <rm:locator pattern="^javax\.websocket\-api$" searchPathRef="bundles.maven"/>
   <rm:locator pattern="^javax\.annotation\-api$" searchPathRef="bundles.maven"/>
   <rm:locator pattern="^javax\.management\.j2ee\-api$" searchPathRef="bundles.maven"/>
@@ -127,6 +134,13 @@
         <maven:entry artifactId="org.apache.felix.inventory" groupId="org.apache.felix" name="org.apache.felix.inventory"/>
         <maven:entry artifactId="org.apache.felix.webconsole.plugins.packageadmin" groupId="org.apache.felix" name="org.apache.felix.webconsole.plugins.packageadmin"/>
         <maven:entry artifactId="javassist" groupId="org.javassist" name="javassist"/>
+        <maven:entry groupId="org.passay" artifactId="passay" name="org.passay" />
+        <maven:entry groupId="com.itextpdf" artifactId="itextpdf" name="com.itextpdf" />
+        <maven:entry groupId="org.bouncycastle" artifactId="bcpkix-jdk15on" name="bcpkix" />
+        <maven:entry groupId="org.bouncycastle" artifactId="bcprov-jdk15on" name="bcprov" />
+        <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:mappings>
     </rm:provider>
   </rm:searchPath>
diff --git a/org.adempiere.server/src/main/home/org/bmlaurus/home/Prop.java b/org.adempiere.server/src/main/home/org/bmlaurus/home/Prop.java
index 78be9f0fed..b0229162d8 100644
--- a/org.adempiere.server/src/main/home/org/bmlaurus/home/Prop.java
+++ b/org.adempiere.server/src/main/home/org/bmlaurus/home/Prop.java
@@ -9,15 +9,15 @@ import java.io.InputStream;
 import java.io.Serializable;
 import java.net.URL;
 import java.text.SimpleDateFormat;
+import java.util.Base64;
 import java.util.Date;
 import java.util.Properties;
 import java.util.logging.Level;
+
 import org.compiere.util.CLogger;
 import org.compiere.util.Ini;
 import org.compiere.util.SecureEngine;
 
-import com.lowagie.text.pdf.codec.Base64;
-
 public final class Prop implements Serializable {
 
 	/**
@@ -208,7 +208,7 @@ public final class Prop implements Serializable {
 			try {
 				fis = new URL(getProperty(TEMPLATE_PATH)+getProperty(TEMPLATE_NAME)+"/styles/template.css");
 				byte data[]=read(fis);
-				ret+=Base64.encodeBytes(data);
+				ret+=Base64.getEncoder().encode (data);
 			} catch (FileNotFoundException e) {
 				e.printStackTrace();
 			} catch (IOException e) {
@@ -288,7 +288,7 @@ public final class Prop implements Serializable {
 			byte data[]=read(fis);
 			if(data==null||data.length<=0)
 				return null;
-			ret+=Base64.encodeBytes(data);
+			ret+=Base64.getEncoder().encode (data);
 		} catch (FileNotFoundException e) {
 			e.printStackTrace();
 		} catch (IOException e) {
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VPanel.java b/org.adempiere.ui.swing/src/org/compiere/grid/VPanel.java
index 637db33338..fc12ae08e5 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/VPanel.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/VPanel.java
@@ -20,6 +20,7 @@ package org.compiere.grid;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.FocusTraversalPolicy;
+import java.awt.Font;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -56,7 +57,6 @@ import org.compiere.util.Util;
 import org.jdesktop.swingx.JXCollapsiblePane;
 import org.jdesktop.swingx.border.DropShadowBorder;
 
-import com.lowagie.text.Font;
 
 /**
  *  Single Row Panel.
@@ -453,7 +453,7 @@ public final class VPanel extends CTabbedPane
 		else // Label or null
 		{
 			CLabel label = new CLabel(fieldGroup, CLabel.LEADING);
-			label.setFont(AdempierePLAF.getFont_Label().deriveFont(Font.BOLDITALIC, AdempierePLAF.getFont_Label().getSize2D()));
+			label.setFont(AdempierePLAF.getFont_Label().deriveFont(Font.BOLD | Font.ITALIC, AdempierePLAF.getFont_Label().getSize2D()));
 			m_main.add(label, "newline, spanx, growx");
 			m_main.add(new JSeparator(), "newline, spanx, growx");
 			//	reset
diff --git a/org.adempiere.ui.zk-feature/feature.xml b/org.adempiere.ui.zk-feature/feature.xml
index a2ddecbaf2..3ff157a612 100644
--- a/org.adempiere.ui.zk-feature/feature.xml
+++ b/org.adempiere.ui.zk-feature/feature.xml
@@ -25,5 +25,11 @@
          download-size="0"
          install-size="0"
          version="3.1.0.qualifier"/>
-
+         
+   <plugin
+         id="org.atmosphere.runtime"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 </feature>
diff --git a/org.adempiere.ui.zk/.classpath b/org.adempiere.ui.zk/.classpath
index e4eb7a7d31..a8d48ff9d4 100644
--- a/org.adempiere.ui.zk/.classpath
+++ b/org.adempiere.ui.zk/.classpath
@@ -3,9 +3,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="WEB-INF/src"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/atmosphere-compat-jbossweb-1.0.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/atmosphere-compat-tomcat-1.0.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/atmosphere-compat-tomcat7-1.0.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/atmosphere-runtime-1.0.4.jar" sourcepath="WEB-INF/lib/src/atmosphere-runtime-1.0.4-sources.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
index 92d99b27a6..0cbb990284 100644
--- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
@@ -31,11 +31,7 @@ Import-Package: javax.activation,
  org.slf4j.helpers;version="1.7.2",
  org.slf4j.spi;version="1.7.2"
 DynamicImport-Package: action.images
-Bundle-ClassPath: .,
- WEB-INF/lib/atmosphere-compat-jbossweb-1.0.4.jar,
- WEB-INF/lib/atmosphere-compat-tomcat-1.0.4.jar,
- WEB-INF/lib/atmosphere-compat-tomcat7-1.0.4.jar,
- WEB-INF/lib/atmosphere-runtime-1.0.4.jar
+Bundle-ClassPath: .
 Export-Package: fi.jawsy.jawwa.zk.atmosphere,
  metainfo.zk,
  org.adempiere.webui,
@@ -68,25 +64,7 @@ Export-Package: fi.jawsy.jawwa.zk.atmosphere,
  org.adempiere.webui.theme,
  org.adempiere.webui.util,
  org.adempiere.webui.window,
- org.apache.catalina,
- org.apache.catalina.comet,
- org.atmosphere.cache,
- org.atmosphere.client,
- org.atmosphere.config,
- org.atmosphere.config.service,
- org.atmosphere.container,
- org.atmosphere.container.version,
- org.atmosphere.cpr,
- org.atmosphere.di,
- org.atmosphere.handler,
- org.atmosphere.interceptor,
- org.atmosphere.util,
- org.atmosphere.util.uri,
- org.atmosphere.websocket,
- org.atmosphere.websocket.protocol,
- org.jboss.servlet.http,
  org.zkforge.keylistener,
- web.js.jawwa.atmosphere,
  web.js.zkforge,
  web.js.zkforge.mold
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
@@ -101,7 +79,9 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  zul;bundle-version="0.0.0",
  zweb;bundle-version="0.0.0",
  org.junit;bundle-version="0.0.0",
- org.apache.commons.io;bundle-version="0.0.0"
+ org.apache.commons.io;bundle-version="0.0.0",
+ com.itextpdf;bundle-version="0.0.0",
+ org.atmosphere.runtime;bundle-version="0.0.0"
 Bundle-Activator: org.adempiere.webui.WebUIActivator
 Eclipse-ExtensibleAPI: true
 Web-ContextPath: webui
diff --git a/org.adempiere.ui.zk/WEB-INF/src/fi/jawsy/jawwa/zk/atmosphere/AtmosphereServerPush.java b/org.adempiere.ui.zk/WEB-INF/src/fi/jawsy/jawwa/zk/atmosphere/AtmosphereServerPush.java
index b3ef369db2..6c518c079e 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/fi/jawsy/jawwa/zk/atmosphere/AtmosphereServerPush.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/fi/jawsy/jawwa/zk/atmosphere/AtmosphereServerPush.java
@@ -217,7 +217,7 @@ public class AtmosphereServerPush implements ServerPush {
         }
 
 	  	if (!resource.isSuspended()) {
-	  		resource.suspend(-1, false);
+	  		resource.suspend(-1); 
 	  	}
 	  	this.resource.set(resource);
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AEnv.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AEnv.java
index cd7eab8467..fd9f7f3fce 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AEnv.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AEnv.java
@@ -73,12 +73,12 @@ import org.zkoss.zk.ui.Desktop;
 import org.zkoss.zk.ui.Execution;
 import org.zkoss.zk.ui.Executions;
 
-import com.lowagie.text.Document;
-import com.lowagie.text.DocumentException;
-import com.lowagie.text.pdf.PdfContentByte;
-import com.lowagie.text.pdf.PdfImportedPage;
-import com.lowagie.text.pdf.PdfReader;
-import com.lowagie.text.pdf.PdfWriter;
+import com.itextpdf.text.Document;
+import com.itextpdf.text.DocumentException;
+import com.itextpdf.text.pdf.PdfContentByte;
+import com.itextpdf.text.pdf.PdfImportedPage;
+import com.itextpdf.text.pdf.PdfReader;
+import com.itextpdf.text.pdf.PdfWriter;
 
 /**
  *  ZK Application Environment and utilities
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
index 859d90ec7e..c92169b069 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
@@ -71,11 +71,11 @@ import org.zkoss.zul.Html;
 import org.zkoss.zul.Label;
 import org.zkoss.zul.Vlayout;
 
-import com.lowagie.text.Document;
-import com.lowagie.text.pdf.PdfContentByte;
-import com.lowagie.text.pdf.PdfImportedPage;
-import com.lowagie.text.pdf.PdfReader;
-import com.lowagie.text.pdf.PdfWriter;
+import com.itextpdf.text.Document;
+import com.itextpdf.text.pdf.PdfContentByte;
+import com.itextpdf.text.pdf.PdfImportedPage;
+import com.itextpdf.text.pdf.PdfReader;
+import com.itextpdf.text.pdf.PdfWriter;
 
 /**
  *	Dialog to Start process or report.
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java
index 173616f7d7..cca67597f0 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java
@@ -70,7 +70,7 @@ import org.zkoss.zul.Center;
 import org.zkoss.zul.Filedownload;
 import org.zkoss.zul.South;
 
-import com.lowagie.text.pdf.PdfReader;
+import com.itextpdf.text.pdf.PdfReader;
 
 /**
  *  Payment Print & Export
diff --git a/org.adempiere.ui.zk/WEB-INF/web.xml b/org.adempiere.ui.zk/WEB-INF/web.xml
index 610cc58220..956e8af021 100644
--- a/org.adempiere.ui.zk/WEB-INF/web.xml
+++ b/org.adempiere.ui.zk/WEB-INF/web.xml
@@ -17,12 +17,16 @@
       </init-param>
       <init-param>
     	<param-name>org.atmosphere.cpr.broadcasterCacheClass</param-name>
-    	<param-value>org.atmosphere.cache.HeaderBroadcasterCache</param-value>
+    	<param-value>org.atmosphere.cache.SessionBroadcasterCache</param-value>
 	  </init-param>
 	  <init-param>
     	<param-name>org.atmosphere.cpr.AtmosphereInterceptor</param-name>
     	<param-value>org.atmosphere.client.TrackMessageSizeInterceptor</param-value>
  	  </init-param>
+ 	  <init-param>
+    	<param-name>org.atmosphere.websocket.suppressJSR356</param-name>
+    	<param-value>true</param-value>
+ 	  </init-param>
       <load-on-startup>0</load-on-startup>
       <!-- Remove async-supported if you are not using Servlet 3.0 -->
       <async-supported>true</async-supported>
diff --git a/org.adempiere.ui.zk/build.properties b/org.adempiere.ui.zk/build.properties
index b0771035e9..6d8752a10d 100644
--- a/org.adempiere.ui.zk/build.properties
+++ b/org.adempiere.ui.zk/build.properties
@@ -24,10 +24,6 @@ bin.includes = META-INF/,\
                OSGI-INF/defaultpaymentformfactory.xml,\
                OSGI-INF/processfactory.xml,\
                OSGI-INF/defaultprintshippinglabel.xml,\
-               WEB-INF/lib/atmosphere-compat-jbossweb-1.0.4.jar,\
-               WEB-INF/lib/atmosphere-compat-tomcat-1.0.4.jar,\
-               WEB-INF/lib/atmosphere-compat-tomcat7-1.0.4.jar,\
-               WEB-INF/lib/atmosphere-runtime-1.0.4.jar,\
                OSGI-INF/defaultcreatefromfactory.xml,\
                OSGI-INF/defaultformfactory.xml,\
                OSGI-INF/feedbackservice.xml,\
diff --git a/org.adempiere.ui.zk/copyjars.xml b/org.adempiere.ui.zk/copyjars.xml
index 5ff30c5b5a..e5f8327b03 100644
--- a/org.adempiere.ui.zk/copyjars.xml
+++ b/org.adempiere.ui.zk/copyjars.xml
@@ -1,10 +1,6 @@
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
 		<mkdir dir="WEB-INF/lib" />
-		<get src="${url.maven2.lib}/maven2/org/atmosphere/atmosphere-compat-jbossweb/1.0.4/atmosphere-compat-jbossweb-1.0.4.jar" dest="WEB-INF/lib/atmosphere-compat-jbossweb-1.0.4.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/org/atmosphere/atmosphere-compat-tomcat/1.0.4/atmosphere-compat-tomcat-1.0.4.jar" dest="WEB-INF/lib/atmosphere-compat-tomcat-1.0.4.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/org/atmosphere/atmosphere-compat-tomcat7/1.0.4/atmosphere-compat-tomcat7-1.0.4.jar" dest="WEB-INF/lib/atmosphere-compat-tomcat7-1.0.4.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/org/atmosphere/atmosphere-runtime/1.0.4/atmosphere-runtime-1.0.4.jar" dest="WEB-INF/lib/atmosphere-runtime-1.0.4.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.srv}/jarfile/3.1/labelapplet.jar" dest="labelapplet.jar" usetimestamp="true" verbose="true" retries="5" />
 
 	</target>

From baff1951be55e1bb7247a34c420e2e81c30a23c0 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Fri, 8 Jul 2016 10:20:19 +0700
Subject: [PATCH 15/34] IDEMPIERE-3136:all stuff relate library of idempiere
 remove duplicate jar (bsh-engine, groovy-engine) update, move groovy to osgi
 add common bundle (now focus to support jasper report)

---
 org.adempiere.base-feature/feature.xml        | 64 +++++++++++++
 org.adempiere.base/.classpath                 |  3 -
 org.adempiere.base/META-INF/MANIFEST.MF       | 95 +------------------
 org.adempiere.base/build.properties           |  3 -
 org.adempiere.base/copyjars.xml               |  3 -
 org.adempiere.sdk-feature/adempiere.rmap      | 11 +++
 .../materialize.properties                    |  1 +
 org.adempiere.ui.swing/META-INF/MANIFEST.MF   |  3 +-
 8 files changed, 80 insertions(+), 103 deletions(-)

diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml
index 6d8c0db261..f7e22681ad 100644
--- a/org.adempiere.base-feature/feature.xml
+++ b/org.adempiere.base-feature/feature.xml
@@ -299,4 +299,68 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+         
+   <plugin
+         id="org.apache.commons.beanutils"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="org.apache.commons.lang"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="org.apache.commons.logging"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="groovy-all"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="com.ibm.icu"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="com.fasterxml.jackson.core.jackson-annotations"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="com.fasterxml.jackson.core.jackson-core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="com.fasterxml.jackson.core.jackson-databind"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="joda-time"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
 </feature>
diff --git a/org.adempiere.base/.classpath b/org.adempiere.base/.classpath
index 9d1123c354..8fea4bc2c7 100644
--- a/org.adempiere.base/.classpath
+++ b/org.adempiere.base/.classpath
@@ -7,8 +7,6 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="bsh-2.0b6.jar"/>
-	<classpathentry exported="true" kind="lib" path="bsh-engine.jar"/>
-	<classpathentry exported="true" kind="lib" path="groovy-engine.jar"/>
 	<classpathentry exported="true" kind="lib" path="jython-engine.jar"/>
 	<classpathentry exported="true" kind="lib" path="jython.jar"/>
 	<classpathentry exported="true" kind="lib" path="cron4j-2.2.5.jar"/>
@@ -16,7 +14,6 @@
 	<classpathentry exported="true" kind="lib" path="jcommon-1.0.23.jar"/>
 	<classpathentry exported="true" kind="lib" path="jfreechart-1.0.19.jar"/>
 	<classpathentry exported="true" kind="lib" path="jnlp.jar"/>
-	<classpathentry exported="true" kind="lib" path="groovy-all-1.7.5.jar"/>
 	<classpathentry exported="true" kind="lib" path="barcode4j-2.1.jar"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
index 8eb35eb5e1..bdfe9cba8f 100644
--- a/org.adempiere.base/META-INF/MANIFEST.MF
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@@ -4,8 +4,6 @@ Bundle-Name: iDempiere Core
 Bundle-SymbolicName: org.adempiere.base;singleton:=true
 Bundle-Version: 3.1.0.qualifier
 Bundle-ClassPath: base.jar,
- bsh-engine.jar,
- groovy-engine.jar,
  jython-engine.jar,
  jython.jar,
  cron4j-2.2.5.jar,
@@ -13,7 +11,6 @@ Bundle-ClassPath: base.jar,
  jcommon-1.0.23.jar,
  jfreechart-1.0.19.jar,
  jnlp.jar,
- groovy-all-1.7.5.jar,
  barcode4j-2.1.jar,
  bsh-2.0b6.jar
 Export-Package: bsh,
@@ -26,50 +23,6 @@ Export-Package: bsh,
  bsh.servlet,
  bsh.util,
  com.akunagroup.uk.postcode,
- groovy.beans,
- groovy.grape,
- groovy.inspect,
- groovy.inspect.swingui,
- groovy.io,
- groovy.jmx.builder,
- groovy.lang,
- groovy.mock.interceptor,
- groovy.model,
- groovy.security,
- groovy.servlet,
- groovy.sql,
- groovy.swing,
- groovy.swing.binding,
- groovy.swing.factory,
- groovy.swing.impl,
- groovy.text,
- groovy.time,
- groovy.transform,
- groovy.ui,
- groovy.ui.text,
- groovy.ui.view,
- groovy.util,
- groovy.util.slurpersupport,
- groovy.xml,
- groovy.xml.dom,
- groovy.xml.streamingmarkupsupport,
- groovyjarjarantlr,
- groovyjarjarantlr.ASdebug,
- groovyjarjarantlr.actions.cpp,
- groovyjarjarantlr.actions.csharp,
- groovyjarjarantlr.actions.java,
- groovyjarjarantlr.actions.python,
- groovyjarjarantlr.build,
- groovyjarjarantlr.collections,
- groovyjarjarantlr.collections.impl,
- groovyjarjarantlr.debug,
- groovyjarjarantlr.debug.misc,
- groovyjarjarantlr.preprocessor,
- groovyjarjarasm.asm,
- groovyjarjarasm.asm.commons,
- groovyjarjarasm.asm.signature,
- groovyjarjarasm.asm.tree,
- groovyjarjarcommonscli,
  it.sauronsoftware.cron4j,
  javax.jnlp,
  net.sourceforge.barbecue,
@@ -96,51 +49,6 @@ Export-Package: bsh,
  org.adempiere.print.export,
  org.adempiere.process,
  org.adempiere.util,
- org.codehaus.groovy,
- org.codehaus.groovy.ant,
- org.codehaus.groovy.antlr,
- org.codehaus.groovy.antlr.java,
- org.codehaus.groovy.antlr.parser,
- org.codehaus.groovy.antlr.treewalker,
- org.codehaus.groovy.ast,
- org.codehaus.groovy.ast.builder,
- org.codehaus.groovy.ast.expr,
- org.codehaus.groovy.ast.stmt,
- org.codehaus.groovy.binding,
- org.codehaus.groovy.bsf,
- org.codehaus.groovy.classgen,
- org.codehaus.groovy.control,
- org.codehaus.groovy.control.io,
- org.codehaus.groovy.control.messages,
- org.codehaus.groovy.groovydoc,
- org.codehaus.groovy.jsr223,
- org.codehaus.groovy.reflection,
- org.codehaus.groovy.reflection.stdclasses,
- org.codehaus.groovy.runtime,
- org.codehaus.groovy.runtime.callsite,
- org.codehaus.groovy.runtime.dgmimpl,
- org.codehaus.groovy.runtime.dgmimpl.arrays,
- org.codehaus.groovy.runtime.metaclass,
- org.codehaus.groovy.runtime.typehandling,
- org.codehaus.groovy.runtime.wrappers,
- org.codehaus.groovy.syntax,
- org.codehaus.groovy.tools,
- org.codehaus.groovy.tools.ast,
- org.codehaus.groovy.tools.groovydoc,
- org.codehaus.groovy.tools.groovydoc.gstringTemplates,
- org.codehaus.groovy.tools.gse,
- org.codehaus.groovy.tools.javac,
- org.codehaus.groovy.tools.shell,
- org.codehaus.groovy.tools.shell.commands,
- org.codehaus.groovy.tools.shell.util,
- org.codehaus.groovy.tools.xml,
- org.codehaus.groovy.transform,
- org.codehaus.groovy.transform.powerassert,
- org.codehaus.groovy.util,
- org.codehaus.groovy.vmplugin,
- org.codehaus.groovy.vmplugin.v4,
- org.codehaus.groovy.vmplugin.v5,
- org.codehaus.groovy.vmplugin.v6,
  org.compiere,
  org.compiere.acct,
  org.compiere.cm,
@@ -283,4 +191,5 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0",
  org.cryptacular,
  com.itextpdf;bundle-version="0.0.0",
  net.sf.supercsv.super-csv;bundle-version="0.0.0",
- bcprov;bundle-version="1.54.0"
+ bcprov;bundle-version="1.54.0",
+ groovy-all;bundle-version="2.4.7"
diff --git a/org.adempiere.base/build.properties b/org.adempiere.base/build.properties
index 3c019641d8..cfe1fab328 100644
--- a/org.adempiere.base/build.properties
+++ b/org.adempiere.base/build.properties
@@ -1,8 +1,6 @@
 bin.includes = META-INF/,\
                base.jar,\
                plugin.xml,\
-               bsh-engine.jar,\
-               groovy-engine.jar,\
                jython-engine.jar,\
                jython.jar,\
                cron4j-2.2.5.jar,\
@@ -11,7 +9,6 @@ bin.includes = META-INF/,\
                jfreechart-1.0.19.jar,\
                jnlp.jar,\
                OSGI-INF/,\
-               groovy-all-1.7.5.jar,\
                OSGI-INF/dslocator.xml,\
                OSGI-INF/serverbean.xml,\
                OSGI-INF/statusbean.xml,\
diff --git a/org.adempiere.base/copyjars.xml b/org.adempiere.base/copyjars.xml
index 7e41f38344..c4e0102188 100644
--- a/org.adempiere.base/copyjars.xml
+++ b/org.adempiere.base/copyjars.xml
@@ -6,15 +6,12 @@
                 <get src="${url.maven2.lib}/maven2/org/apache/bsf/bsf-all/3.0-beta3/bsf-all-3.0-beta3.jar" dest="bsf-all-3.0-beta3.jar" usetimestamp="true" verbose="true" retries="5"/>
  		  -->
 		<get src="${url.file.srv}/jarfile/3.1/jython-engine.jar" dest="jython-engine.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.srv}/jarfile/3.1/groovy-engine.jar" dest="groovy-engine.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.srv}/jarfile/3.1/bsh-engine.jar" dest="bsh-engine.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven2.lib}/maven2/org/python/jython/2.2.1/jython-2.2.1.jar" dest="jython.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven2.lib}/maven2/it/sauronsoftware/cron4j/cron4j/2.2.5/cron4j-2.2.5.jar" dest="cron4j-2.2.5.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven2.lib}/maven2/net/sourceforge/barbecue/barbecue/1.5-beta1/barbecue-1.5-beta1.jar" dest="barbecue-1.5-beta1.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven2.lib}/maven2/org/jfree/jcommon/1.0.23/jcommon-1.0.23.jar" dest="jcommon-1.0.23.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven2.lib}/maven2/org/jfree/jfreechart/1.0.19/jfreechart-1.0.19.jar" dest="jfreechart-1.0.19.jar" usetimestamp="true" verbose="true" retries="5" />
  		<!-- jnlp is not used in idempiere? -->
-		<get src="${url.maven2.lib}/maven2/org/codehaus/groovy/groovy-all/1.7.5/groovy-all-1.7.5.jar" dest="groovy-all-1.7.5.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven2.lib}/maven2/net/sf/barcode4j/barcode4j/2.1/barcode4j-2.1.jar" dest="barcode4j-2.1.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.srv}/jarfile/3.1/jnlp.jar" dest="jnlp.jar" usetimestamp="true" verbose="true" retries="5" />
  	</target>
diff --git a/org.adempiere.sdk-feature/adempiere.rmap b/org.adempiere.sdk-feature/adempiere.rmap
index 064b10c54e..962bad1c93 100644
--- a/org.adempiere.sdk-feature/adempiere.rmap
+++ b/org.adempiere.sdk-feature/adempiere.rmap
@@ -14,6 +14,9 @@
   <rm:locator pattern="^com\.itextpdf$" searchPathRef="bundles.maven" />
   <rm:locator pattern="^bcpkix$" searchPathRef="bundles.maven" />
   <rm:locator pattern="^bcprov$" searchPathRef="bundles.maven" />
+  <rm:locator pattern="^com\.ibm\.icu$" searchPathRef="bundles.maven" />
+  <rm:locator pattern="^groovy-all$" searchPathRef="bundles.maven" />
+  <rm:locator pattern="^joda-time$" searchPathRef="bundles.maven" />
   <rm:locator pattern="^org\.cryptacular$" searchPathRef="bundles.maven" />
   <rm:locator pattern="^net\.sf\.supercsv\.super-csv$" searchPathRef="bundles.maven" />
   <rm:locator pattern="^org\.atmosphere\.runtime$" searchPathRef="bundles.maven" />
@@ -94,6 +97,11 @@
       <rm:property key="buckminster.mutable" value="false"/>
       <rm:uri format="${url.orbit}"/>
     </rm:provider>
+    <rm:provider componentTypes="osgi.bundle" readerType="p2" source="false" mutable="false">
+      <rm:property key="buckminster.source" value="false"/>
+      <rm:property key="buckminster.mutable" value="false"/>
+      <rm:uri format="${url.orbit.neon}"/>
+    </rm:provider>
   </rm:searchPath>
   <rm:searchPath name="restlet.p2">
     <rm:provider componentTypes="osgi.bundle" readerType="p2" source="false" mutable="false">
@@ -141,6 +149,9 @@
         <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 groupId="org.codehaus.groovy" artifactId="groovy-all" name="groovy-all" />
+        <maven:entry groupId="com.ibm.icu" artifactId="icu4j" name="com.ibm.icu" />
+        <maven:entry groupId="joda-time" artifactId="joda-time" name="joda-time" />
       </maven:mappings>
     </rm:provider>
   </rm:searchPath>
diff --git a/org.adempiere.sdk-feature/materialize.properties b/org.adempiere.sdk-feature/materialize.properties
index 07695a5190..f8742f20b0 100644
--- a/org.adempiere.sdk-feature/materialize.properties
+++ b/org.adempiere.sdk-feature/materialize.properties
@@ -21,6 +21,7 @@ url.maven.restlet=http://maven.restlet.org
 url.equinox=http://download.eclipse.org/eclipse/updates/4.4
 url.jetty=http://download.eclipse.org/jetty/updates/jetty-bundles-9.x
 url.orbit=http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository
+url.orbit.neon=http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/
 
 url.file.srv=http://downloads.sourceforge.net/project/idempiere/binary.file
 
diff --git a/org.adempiere.ui.swing/META-INF/MANIFEST.MF b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
index cc955f6fad..6cef900449 100644
--- a/org.adempiere.ui.swing/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
@@ -71,7 +71,8 @@ Export-Package: com.jgoodies.looks,
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.adempiere.ui;bundle-version="0.0.0",
  org.restlet;bundle-version="0.0.0",
- org.restlet.ext.servlet;bundle-version="0.0.0"
+ org.restlet.ext.servlet;bundle-version="0.0.0",
+ groovy-all;bundle-version="0.0.0"
 Eclipse-ExtensibleAPI: true
 Eclipse-RegisterBuddy: org.adempiere.base
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

From c501d1099a1ec8600bfecade657f87be95303612 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Fri, 8 Jul 2016 00:12:25 +0700
Subject: [PATCH 16/34] IDEMPIERE-3136:all stuff relate library of idempiere
 javax.transaction use other place not only swing, so move to
 org.adempiere.base-feature

---
 org.adempiere.base-feature/feature.xml     | 10 +++++++++-
 org.adempiere.ui.swing-feature/feature.xml |  8 --------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml
index f7e22681ad..cfec87d152 100644
--- a/org.adempiere.base-feature/feature.xml
+++ b/org.adempiere.base-feature/feature.xml
@@ -362,5 +362,13 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
+
+   <plugin
+         id="javax.transaction"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
 </feature>
diff --git a/org.adempiere.ui.swing-feature/feature.xml b/org.adempiere.ui.swing-feature/feature.xml
index 19d4af5d65..1ba7f8d909 100644
--- a/org.adempiere.ui.swing-feature/feature.xml
+++ b/org.adempiere.ui.swing-feature/feature.xml
@@ -40,14 +40,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="javax.transaction"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.jdt.core.compiler.batch"
          download-size="0"

From 07ada503939d63a5df08cd4701506a570efed37f Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Fri, 8 Jul 2016 10:47:30 +0700
Subject: [PATCH 17/34] IDEMPIERE-3136:all stuff relate library of idempiere
 replace bundle dependency by use import package for jasper report

---
 .../model.generator.launch                    |   2 +-
 .../sign.database.build.launch                |   2 +-
 .../synchronize-terminology.app.launch        |   2 +-
 .../translation.app.launch                    |   2 +-
 org.adempiere.install/install.app.launch      |   2 +-
 .../install.console.app.launch                |   2 +-
 .../feature.xml                               |  90 --
 .../.classpath                                |  68 +-
 org.adempiere.report.jasper.library/.project  |  10 +-
 .../.settings/org.eclipse.jdt.core.prefs      |   7 -
 .../.settings/org.eclipse.pde.core.prefs      |   3 +
 .../org.eclipse.wst.common.component          |   4 -
 ....eclipse.wst.common.project.facet.core.xml |   7 -
 .../JasperReportsTools.jardesc                |  17 -
 .../META-INF/MANIFEST.MF                      | 309 ++++---
 .../bin/.cvsignore                            |   1 -
 .../build.properties                          |  61 +-
 .../copyjars.xml                              |  63 +-
 .../note_for_update_jr_library.readme         |  25 +
 .../resource/test/OrderFormat.jrxml           | 133 ---
 .../resource/test/PurchaseOrder.jrxml         | 800 ------------------
 .../resource/test/Requisition.jrxml           | 431 ----------
 .../resource/test/VoidedDN.jrxml              | 245 ------
 .../report/jasper/ReportStarter.java          |   3 +-
 .../server.product.eventtest.launch           |   2 +-
 .../server.product.functionaltest.launch      |   2 +-
 .../server.product.launch                     |   2 +-
 .../swingclient.product.launch                |   2 +-
 28 files changed, 402 insertions(+), 1895 deletions(-)
 delete mode 100644 org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 org.adempiere.report.jasper.library/.settings/org.eclipse.pde.core.prefs
 delete mode 100644 org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.component
 delete mode 100644 org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.project.facet.core.xml
 delete mode 100644 org.adempiere.report.jasper.library/JasperReportsTools.jardesc
 delete mode 100644 org.adempiere.report.jasper.library/bin/.cvsignore
 create mode 100644 org.adempiere.report.jasper.library/note_for_update_jr_library.readme
 delete mode 100644 org.adempiere.report.jasper.library/resource/test/OrderFormat.jrxml
 delete mode 100644 org.adempiere.report.jasper.library/resource/test/PurchaseOrder.jrxml
 delete mode 100644 org.adempiere.report.jasper.library/resource/test/Requisition.jrxml
 delete mode 100644 org.adempiere.report.jasper.library/resource/test/VoidedDN.jrxml

diff --git a/org.adempiere.base-feature/model.generator.launch b/org.adempiere.base-feature/model.generator.launch
index 73e58eaab0..183fc2327d 100644
--- a/org.adempiere.base-feature/model.generator.launch
+++ b/org.adempiere.base-feature/model.generator.launch
@@ -21,7 +21,7 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
 <stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.annotation@default:default,javax.ejb@default:default,javax.inject@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.extension@default:default,org.apache.batik.parser@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.batik.xml@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.restlet.ext.net@default:default,org.restlet.ext.ssl@default:default,org.restlet@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.eclipse.equinox.http.servlet@default:default,org.adempiere.eclipse.equinox.http.servletbridge@default:default,org.adempiere.eclipse.equinox.servletbridge@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.fitrecorder@default:default,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:false,org.w3c.dom.fragment@default:false"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.eclipse.equinox.http.servlet@default:default,org.adempiere.eclipse.equinox.http.servletbridge@default:default,org.adempiere.eclipse.equinox.servletbridge@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.fitrecorder@default:default,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
 <booleanAttribute key="tracing" value="false"/>
diff --git a/org.adempiere.base-feature/sign.database.build.launch b/org.adempiere.base-feature/sign.database.build.launch
index f5c2e48811..1c4ea275cb 100644
--- a/org.adempiere.base-feature/sign.database.build.launch
+++ b/org.adempiere.base-feature/sign.database.build.launch
@@ -21,7 +21,7 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
 <stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.annotation@default:default,javax.ejb@default:default,javax.inject@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.extension@default:default,org.apache.batik.parser@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.batik.xml@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:default,org.eclipse.osgi.compatibility.state@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.restlet.ext.net@default:default,org.restlet.ext.ssl@default:default,org.restlet@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.eclipse.equinox.http.servlet@default:default,org.adempiere.eclipse.equinox.http.servletbridge@default:default,org.adempiere.eclipse.equinox.servletbridge@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.fitrecorder@default:default,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:default,org.w3c.dom.fragment@default:false"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.eclipse.equinox.http.servlet@default:default,org.adempiere.eclipse.equinox.http.servletbridge@default:default,org.adempiere.eclipse.equinox.servletbridge@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.fitrecorder@default:default,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
 <booleanAttribute key="tracing" value="false"/>
diff --git a/org.adempiere.base-feature/synchronize-terminology.app.launch b/org.adempiere.base-feature/synchronize-terminology.app.launch
index fa79f2f81a..69c11a275c 100644
--- a/org.adempiere.base-feature/synchronize-terminology.app.launch
+++ b/org.adempiere.base-feature/synchronize-terminology.app.launch
@@ -21,7 +21,7 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
 <stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.restlet@default:default,org.slf4j.api@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.process@default:default,org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.slf4j.jdk14@default:false,org.w3c.dom.fragment@default:false"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.process@default:default,org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.slf4j.jdk14@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
 <booleanAttribute key="tracing" value="false"/>
diff --git a/org.adempiere.base-feature/translation.app.launch b/org.adempiere.base-feature/translation.app.launch
index b05648936f..507f5f1cb8 100644
--- a/org.adempiere.base-feature/translation.app.launch
+++ b/org.adempiere.base-feature/translation.app.launch
@@ -21,7 +21,7 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
 <stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.restlet@default:default,org.slf4j.api@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.slf4j.jdk14@default:false,org.w3c.dom.fragment@default:false"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.slf4j.jdk14@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
 <booleanAttribute key="tracing" value="false"/>
diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch
index fe488cb30c..bdd21ce681 100644
--- a/org.adempiere.install/install.app.launch
+++ b/org.adempiere.install/install.app.launch
@@ -22,7 +22,7 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
 <stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:false,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.restlet@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.slf4j.jdk14@default:false,org.w3c.dom.fragment@default:false"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.slf4j.jdk14@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
 <booleanAttribute key="tracing" value="false"/>
diff --git a/org.adempiere.install/install.console.app.launch b/org.adempiere.install/install.console.app.launch
index 2c1863dc01..98d3e83a05 100644
--- a/org.adempiere.install/install.console.app.launch
+++ b/org.adempiere.install/install.console.app.launch
@@ -21,7 +21,7 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
 <stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.restlet@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.slf4j.jdk14@default:false,org.w3c.dom.fragment@default:false"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.slf4j.jdk14@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
 <booleanAttribute key="tracing" value="false"/>
diff --git a/org.adempiere.report.jasper-feature/feature.xml b/org.adempiere.report.jasper-feature/feature.xml
index 09ad431af4..102d89e1fc 100644
--- a/org.adempiere.report.jasper-feature/feature.xml
+++ b/org.adempiere.report.jasper-feature/feature.xml
@@ -16,10 +16,6 @@
       [Enter License Description here.]
    </license>
 
-   <requires>
-      <import feature="org.adempiere.base" version="0.0.0"/>
-   </requires>
-
    <plugin
          id="org.adempiere.report.jasper"
          download-size="0"
@@ -32,91 +28,5 @@
          install-size="0"
          version="0.0.0"/>
 
-   <plugin
-         id="org.apache.batik.bridge"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.apache.batik.css"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.apache.batik.dom"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.apache.batik.dom.svg"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.apache.batik.ext.awt"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.apache.batik.extension"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.apache.batik.parser"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.apache.batik.util"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.apache.batik.xml"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.w3c.css.sac"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.w3c.dom.smil"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.w3c.dom.svg"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.w3c.dom.fragment"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.batik.util.gui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
 
 </feature>
diff --git a/org.adempiere.report.jasper.library/.classpath b/org.adempiere.report.jasper.library/.classpath
index 4e864b50be..1b7ecbc1b8 100644
--- a/org.adempiere.report.jasper.library/.classpath
+++ b/org.adempiere.report.jasper.library/.classpath
@@ -1,20 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/bcprov-jdk14-140.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/itext-2.1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/joda-time-2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jasperreports-functions-5.6.1.jar"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.8.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/antlr-2.7.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-anim-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-awt-util-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-bridge-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-codec-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-css-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-dom-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-ext-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-extension-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-gui-util-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-gui-util-1.8batik-parser-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-gvt-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-parser-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-script-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-svg-dom-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-svggen-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-swing-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-transcoder-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-util-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/batik-xml-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/castor-core-1.3.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/castor-xml-1.3.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-digester-2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jasperreports-5.6.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jasperreports-fonts-5.6.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jackson-core-2.1.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xalan-2.7.1.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/commons-javaflow-20160505.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/core-2.3.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/fop-transcoder-allinone-1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/hibernate-core-3.3.2.GA.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/itext-2.1.7.js5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jasperreports-6.3.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jasperreports-fonts-6.3.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jasperreports-functions-6.3.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jcommon-1.0.23.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jfreechart-1.0.19.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/js.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jxl-2.6.10.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/lucene-analyzers-common-4.5.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/lucene-core-4.5.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/lucene-queryparser-4.5.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/mondrian-3.1.1.12687.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/olap4j-0.9.7.309-JS-3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/persistence-api-1.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/poi-3.10.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.10.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/rhino-1.7.6.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/spring-beans-2.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/spring-core-2.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/velocity-1.7.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/xalan-2.7.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-1.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/xmpcore-5.1.1.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.adempiere.report.jasper.library/.project b/org.adempiere.report.jasper.library/.project
index f318b073b7..d03a643160 100644
--- a/org.adempiere.report.jasper.library/.project
+++ b/org.adempiere.report.jasper.library/.project
@@ -5,11 +5,6 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -27,10 +22,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61dca..0000000000
--- a/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.adempiere.report.jasper.library/.settings/org.eclipse.pde.core.prefs b/org.adempiere.report.jasper.library/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000000..f29e940a00
--- /dev/null
+++ b/org.adempiere.report.jasper.library/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.component b/org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index d0fc9a58ad..0000000000
--- a/org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="org.adempiere.report.jasper.library"/>
-</project-modules>
diff --git a/org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index b84ac01796..0000000000
--- a/org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <fixed facet="jst.java"/>
-  <fixed facet="jst.utility"/>
-  <installed facet="jst.utility" version="1.0"/>
-  <installed facet="jst.java" version="1.8"/>
-</faceted-project>
diff --git a/org.adempiere.report.jasper.library/JasperReportsTools.jardesc b/org.adempiere.report.jasper.library/JasperReportsTools.jardesc
deleted file mode 100644
index 4bb366d3c9..0000000000
--- a/org.adempiere.report.jasper.library/JasperReportsTools.jardesc
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jardesc>
-    <jar path="./JasperReportsTools/JasperReportsTools.jar"/>
-    <options overwrite="true" compress="true" exportErrors="true" exportWarnings="true" saveDescription="true" descriptionLocation="/JasperReportsTools/JasperReportsTools.jardesc" useSourceFolders="false" buildIfNeeded="true" includeDirectoryEntries="false"/>
-    <manifest manifestVersion="1.0" usesManifest="true" reuseManifest="false" saveManifest="false" generateManifest="true" manifestLocation="">
-        <sealing sealJar="false">
-            <packagesToSeal/>
-            <packagesToUnSeal/>
-        </sealing>
-    </manifest>
-    <selectedElements exportClassFiles="true" exportOutputFolder="false" exportJavaFiles="true">
-        <file path="/JasperReportsTools/.classpath"/>
-        <folder path="/JasperReportsTools/lib"/>
-        <file path="/JasperReportsTools/JasperReportsTools.jardesc"/>
-        <file path="/JasperReportsTools/.project"/>
-    </selectedElements>
-</jardesc>
diff --git a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
index 4c88f6dfb8..dd0df1aeab 100644
--- a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
@@ -1,28 +1,63 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: iDempiere JasperReports Dependency
-Bundle-SymbolicName: org.adempiere.report.jasper.library
-Bundle-Version: 3.1.0.qualifier
-Bundle-ClassPath: lib/commons-beanutils-1.8.0.jar,
+Bundle-Name: Library
+Bundle-SymbolicName: org.adempiere.report.jasper.library;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ClassPath: lib/antlr-2.7.5.jar,
+ lib/batik-anim-1.8.jar,
+ lib/batik-awt-util-1.8.jar,
+ lib/batik-bridge-1.8.jar,
+ lib/batik-codec-1.8.jar,
+ lib/batik-css-1.8.jar,
+ lib/batik-dom-1.8.jar,
+ lib/batik-ext-1.8.jar,
+ lib/batik-extension-1.8.jar,
+ lib/batik-gui-util-1.8.jar,
+ lib/batik-gui-util-1.8batik-parser-1.8.jar,
+ lib/batik-gvt-1.8.jar,
+ lib/batik-parser-1.8.jar,
+ lib/batik-script-1.8.jar,
+ lib/batik-svg-dom-1.8.jar,
+ lib/batik-svggen-1.8.jar,
+ lib/batik-swing-1.8.jar,
+ lib/batik-transcoder-1.8.jar,
+ lib/batik-util-1.8.jar,
+ lib/batik-xml-1.8.jar,
+ lib/castor-core-1.3.3.jar,
+ lib/castor-xml-1.3.3.jar,
  lib/commons-digester-2.1.jar,
- lib/jasperreports-5.6.1.jar,
- lib/jasperreports-fonts-5.6.1.jar,
- lib/jackson-core-2.1.4.jar,
- lib/xalan-2.7.1.jar,
- lib/jasperreports-functions-5.6.1.jar,
- lib/joda-time-2.1.jar,
- lib/itext-2.1.7.jar,
- lib/bcprov-jdk14-140.jar
-Export-Package: .,
- com.fasterxml.jackson.core,
- com.fasterxml.jackson.core.base,
- com.fasterxml.jackson.core.format,
- com.fasterxml.jackson.core.io,
- com.fasterxml.jackson.core.json,
- com.fasterxml.jackson.core.sym,
- com.fasterxml.jackson.core.type,
- com.fasterxml.jackson.core.util,
- net.sf.jasperreports.ant,
+ lib/commons-javaflow-20160505.jar,
+ lib/core-2.3.0.jar,
+ lib/fop-transcoder-allinone-1.1.jar,
+ lib/hibernate-core-3.3.2.GA.jar,
+ lib/itext-2.1.7.js5.jar,
+ lib/jasperreports-6.3.0.jar,
+ lib/jasperreports-fonts-6.3.0.jar,
+ lib/jasperreports-functions-6.3.0.jar,
+ lib/jaxen-1.1.1.jar,
+ lib/jcommon-1.0.23.jar,
+ lib/jfreechart-1.0.19.jar,
+ lib/js.jar,
+ lib/jxl-2.6.10.jar,
+ lib/lucene-analyzers-common-4.5.1.jar,
+ lib/lucene-core-4.5.1.jar,
+ lib/lucene-queryparser-4.5.1.jar,
+ lib/mondrian-3.1.1.12687.jar,
+ lib/olap4j-0.9.7.309-JS-3.jar,
+ lib/persistence-api-1.0.jar,
+ lib/poi-3.10.1.jar,
+ lib/poi-ooxml-3.10.1.jar,
+ lib/rhino-1.7.6.jar,
+ lib/spring-beans-2.5.jar,
+ lib/spring-core-2.5.jar,
+ lib/velocity-1.7.jar,
+ lib/xalan-2.7.2.jar,
+ lib/xml-apis-ext-1.3.04.jar,
+ lib/xmlgraphics-commons-1.5.jar,
+ lib/xmpcore-5.1.1.jar,
+ .
+Export-Package: net.sf.jasperreports.ant,
  net.sf.jasperreports.charts,
  net.sf.jasperreports.charts.base,
  net.sf.jasperreports.charts.design,
@@ -38,15 +73,20 @@ Export-Package: .,
  net.sf.jasperreports.components.headertoolbar,
  net.sf.jasperreports.components.headertoolbar.actions,
  net.sf.jasperreports.components.headertoolbar.json,
+ net.sf.jasperreports.components.headertoolbar.json.resources,
  net.sf.jasperreports.components.headertoolbar.resources,
  net.sf.jasperreports.components.headertoolbar.resources.images,
  net.sf.jasperreports.components.headertoolbar.resources.images.format,
  net.sf.jasperreports.components.headertoolbar.resources.images.jive,
  net.sf.jasperreports.components.headertoolbar.resources.images.style,
+ net.sf.jasperreports.components.headertoolbar.resources.require,
  net.sf.jasperreports.components.iconlabel,
+ net.sf.jasperreports.components.items,
+ net.sf.jasperreports.components.items.fill,
  net.sf.jasperreports.components.list,
  net.sf.jasperreports.components.map,
  net.sf.jasperreports.components.map.fill,
+ net.sf.jasperreports.components.map.resources.require,
  net.sf.jasperreports.components.map.resources.templates,
  net.sf.jasperreports.components.map.type,
  net.sf.jasperreports.components.sort,
@@ -76,6 +116,7 @@ Export-Package: .,
  net.sf.jasperreports.data.excel,
  net.sf.jasperreports.data.hibernate,
  net.sf.jasperreports.data.hibernate.spring,
+ net.sf.jasperreports.data.http,
  net.sf.jasperreports.data.jdbc,
  net.sf.jasperreports.data.jndi,
  net.sf.jasperreports.data.json,
@@ -117,6 +158,7 @@ Export-Package: .,
  net.sf.jasperreports.engine.fill,
  net.sf.jasperreports.engine.fonts,
  net.sf.jasperreports.engine.images,
+ net.sf.jasperreports.engine.part,
  net.sf.jasperreports.engine.print,
  net.sf.jasperreports.engine.query,
  net.sf.jasperreports.engine.scriptlets,
@@ -134,6 +176,7 @@ Export-Package: .,
  net.sf.jasperreports.extensions,
  net.sf.jasperreports.fonts,
  net.sf.jasperreports.fonts.dejavu,
+ net.sf.jasperreports.fonts.pictonic,
  net.sf.jasperreports.functions,
  net.sf.jasperreports.functions.annotations,
  net.sf.jasperreports.functions.standard,
@@ -145,7 +188,10 @@ Export-Package: .,
  net.sf.jasperreports.olap.olap4j,
  net.sf.jasperreports.olap.result,
  net.sf.jasperreports.olap.xmla,
+ net.sf.jasperreports.parts,
+ net.sf.jasperreports.parts.subreport,
  net.sf.jasperreports.renderers,
+ net.sf.jasperreports.renderers.util,
  net.sf.jasperreports.repo,
  net.sf.jasperreports.search,
  net.sf.jasperreports.swing,
@@ -160,89 +206,140 @@ Export-Package: .,
  net.sf.jasperreports.web.listeners,
  net.sf.jasperreports.web.servlets,
  net.sf.jasperreports.web.servlets.resources,
+ net.sf.jasperreports.web.servlets.resources.require.report,
+ net.sf.jasperreports.web.servlets.resources.require.util,
+ net.sf.jasperreports.web.servlets.resources.require.viewer,
  net.sf.jasperreports.web.servlets.resources.templates,
  net.sf.jasperreports.web.servlets.resources.viewer,
- net.sf.jasperreports.web.util,
- org.apache.bcel,
- org.apache.bcel.classfile,
- org.apache.bcel.generic,
- org.apache.bcel.util,
- org.apache.bcel.verifier,
- org.apache.bcel.verifier.exc,
- org.apache.bcel.verifier.statics,
- org.apache.bcel.verifier.structurals,
- org.apache.commons.beanutils,
- org.apache.commons.beanutils.converters,
- org.apache.commons.beanutils.expression,
- org.apache.commons.beanutils.locale,
- org.apache.commons.beanutils.locale.converters,
- org.apache.commons.collections,
- org.apache.commons.digester,
- org.apache.commons.digester.annotations,
- org.apache.commons.digester.annotations.handlers,
- org.apache.commons.digester.annotations.internal,
- org.apache.commons.digester.annotations.providers,
- org.apache.commons.digester.annotations.reflect,
- org.apache.commons.digester.annotations.rules,
- org.apache.commons.digester.annotations.spi,
- org.apache.commons.digester.annotations.utils,
- org.apache.commons.digester.parser,
- org.apache.commons.digester.plugins,
- org.apache.commons.digester.plugins.strategies,
- org.apache.commons.digester.substitution,
- org.apache.commons.digester.xmlrules,
- org.apache.regexp,
- org.apache.xalan,
- org.apache.xalan.client,
- org.apache.xalan.extensions,
- org.apache.xalan.lib,
- org.apache.xalan.lib.sql,
- org.apache.xalan.processor,
- org.apache.xalan.res,
- org.apache.xalan.serialize,
- org.apache.xalan.templates,
- org.apache.xalan.trace,
- org.apache.xalan.transformer,
- org.apache.xalan.xslt,
- org.apache.xalan.xsltc,
- org.apache.xalan.xsltc.cmdline,
- org.apache.xalan.xsltc.cmdline.getopt,
- org.apache.xalan.xsltc.compiler,
- org.apache.xalan.xsltc.compiler.util,
- org.apache.xalan.xsltc.dom,
- org.apache.xalan.xsltc.runtime,
- org.apache.xalan.xsltc.runtime.output,
- org.apache.xalan.xsltc.trax,
- org.apache.xalan.xsltc.util,
- org.apache.xml.dtm,
- org.apache.xml.dtm.ref,
- org.apache.xml.dtm.ref.dom2dtm,
- org.apache.xml.dtm.ref.sax2dtm,
- org.apache.xml.res,
- org.apache.xml.utils,
- org.apache.xml.utils.res,
- org.apache.xpath,
- org.apache.xpath.axes,
- org.apache.xpath.compiler,
- org.apache.xpath.domapi,
- org.apache.xpath.functions,
- org.apache.xpath.jaxp,
- org.apache.xpath.objects,
- org.apache.xpath.operations,
- org.apache.xpath.patterns,
- org.apache.xpath.res,
- org.joda.time,
- org.joda.time.base,
- org.joda.time.chrono,
- org.joda.time.convert,
- org.joda.time.field,
- org.joda.time.format,
- org.joda.time.tz,
- org.w3c.tools.codec
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.apache.commons.collections,
- org.w3c.tools.codec
-DynamicImport-Package: *
-Eclipse-BuddyPolicy: registered
-Require-Bundle: bcprov;bundle-version="1.53.0"
-
+ net.sf.jasperreports.web.util
+Require-Bundle: bcprov;bundle-version="1.54.0",
+ org.apache.commons.beanutils;bundle-version="0.0.0",
+ org.apache.commons.collections;bundle-version="0.0.0",
+ org.eclipse.jdt.core.compiler.batch;bundle-version="0.0.0",
+ org.apache.httpcomponents.httpclient;bundle-version="0.0.0",
+ org.apache.httpcomponents.httpcore;bundle-version="0.0.0",
+ groovy-all;bundle-version="0.0.0",
+ com.fasterxml.jackson.core.jackson-annotations;bundle-version="0.0.0",
+ com.fasterxml.jackson.core.jackson-core;bundle-version="0.0.0",
+ com.fasterxml.jackson.core.jackson-databind;bundle-version="0.0.0",
+ joda-time;bundle-version="0.0.0",
+ com.ibm.icu;bundle-version="0.0.0"
+Import-Package: bsh,
+ bsh.classpath,
+ bsh.collection,
+ bsh.commands,
+ bsh.engine,
+ bsh.org.objectweb.asm,
+ bsh.reflect,
+ bsh.servlet,
+ bsh.util,
+ javax.servlet;version="3.1.0",
+ javax.servlet.http;version="3.1.0",
+ javax.servlet.resources;version="3.1.0",
+ net.sourceforge.barbecue,
+ net.sourceforge.barbecue.env,
+ net.sourceforge.barbecue.formatter,
+ net.sourceforge.barbecue.linear,
+ net.sourceforge.barbecue.linear.codabar,
+ net.sourceforge.barbecue.linear.code128,
+ net.sourceforge.barbecue.linear.code39,
+ net.sourceforge.barbecue.linear.ean,
+ net.sourceforge.barbecue.linear.postnet,
+ net.sourceforge.barbecue.linear.twoOfFive,
+ net.sourceforge.barbecue.linear.upc,
+ net.sourceforge.barbecue.output,
+ net.sourceforge.barbecue.twod.pdf417,
+ org.apache.commons.codec.digest;version="1.6.0",
+ org.apache.tools.ant,
+ org.apache.tools.ant.attribute,
+ org.apache.tools.ant.dispatch,
+ org.apache.tools.ant.filters,
+ org.apache.tools.ant.filters.util,
+ org.apache.tools.ant.helper,
+ org.apache.tools.ant.input,
+ org.apache.tools.ant.launch,
+ org.apache.tools.ant.listener,
+ org.apache.tools.ant.loader,
+ org.apache.tools.ant.property,
+ org.apache.tools.ant.taskdefs,
+ org.apache.tools.ant.taskdefs.compilers,
+ org.apache.tools.ant.taskdefs.condition,
+ org.apache.tools.ant.taskdefs.cvslib,
+ org.apache.tools.ant.taskdefs.email,
+ org.apache.tools.ant.taskdefs.launcher,
+ org.apache.tools.ant.taskdefs.optional,
+ org.apache.tools.ant.taskdefs.optional.ccm,
+ org.apache.tools.ant.taskdefs.optional.clearcase,
+ org.apache.tools.ant.taskdefs.optional.depend,
+ org.apache.tools.ant.taskdefs.optional.depend.constantpool,
+ org.apache.tools.ant.taskdefs.optional.ejb,
+ org.apache.tools.ant.taskdefs.optional.extension,
+ org.apache.tools.ant.taskdefs.optional.extension.resolvers,
+ org.apache.tools.ant.taskdefs.optional.i18n,
+ org.apache.tools.ant.taskdefs.optional.image,
+ org.apache.tools.ant.taskdefs.optional.j2ee,
+ org.apache.tools.ant.taskdefs.optional.javacc,
+ org.apache.tools.ant.taskdefs.optional.javah,
+ org.apache.tools.ant.taskdefs.optional.jdepend,
+ org.apache.tools.ant.taskdefs.optional.jlink,
+ org.apache.tools.ant.taskdefs.optional.jsp,
+ org.apache.tools.ant.taskdefs.optional.jsp.compilers,
+ org.apache.tools.ant.taskdefs.optional.junit,
+ org.apache.tools.ant.taskdefs.optional.native2ascii,
+ org.apache.tools.ant.taskdefs.optional.net,
+ org.apache.tools.ant.taskdefs.optional.pvcs,
+ org.apache.tools.ant.taskdefs.optional.script,
+ org.apache.tools.ant.taskdefs.optional.sos,
+ org.apache.tools.ant.taskdefs.optional.sound,
+ org.apache.tools.ant.taskdefs.optional.splash,
+ org.apache.tools.ant.taskdefs.optional.ssh,
+ org.apache.tools.ant.taskdefs.optional.testing,
+ org.apache.tools.ant.taskdefs.optional.unix,
+ org.apache.tools.ant.taskdefs.optional.vss,
+ org.apache.tools.ant.taskdefs.optional.windows,
+ org.apache.tools.ant.taskdefs.rmic,
+ org.apache.tools.ant.types,
+ org.apache.tools.ant.types.mappers,
+ org.apache.tools.ant.types.optional,
+ org.apache.tools.ant.types.optional.depend,
+ org.apache.tools.ant.types.optional.image,
+ org.apache.tools.ant.types.resolver,
+ org.apache.tools.ant.types.resources,
+ org.apache.tools.ant.types.resources.comparators,
+ org.apache.tools.ant.types.resources.selectors,
+ org.apache.tools.ant.types.selectors,
+ org.apache.tools.ant.types.selectors.modifiedselector,
+ org.apache.tools.ant.types.spi,
+ org.apache.tools.ant.util,
+ org.apache.tools.ant.util.depend,
+ org.apache.tools.ant.util.depend.bcel,
+ org.apache.tools.ant.util.facade,
+ org.apache.tools.ant.util.java15,
+ org.apache.tools.ant.util.optional,
+ org.apache.tools.ant.util.regexp,
+ org.apache.tools.bzip2,
+ org.apache.tools.mail,
+ org.apache.tools.tar,
+ org.apache.tools.zip,
+ org.apache.xml.serializer;version="2.7.1",
+ org.krysalis.barcode4j,
+ org.krysalis.barcode4j.ant,
+ org.krysalis.barcode4j.cli,
+ org.krysalis.barcode4j.impl,
+ org.krysalis.barcode4j.impl.codabar,
+ org.krysalis.barcode4j.impl.code128,
+ org.krysalis.barcode4j.impl.code39,
+ org.krysalis.barcode4j.impl.datamatrix,
+ org.krysalis.barcode4j.impl.fourstate,
+ org.krysalis.barcode4j.impl.int2of5,
+ org.krysalis.barcode4j.impl.pdf417,
+ org.krysalis.barcode4j.impl.postnet,
+ org.krysalis.barcode4j.impl.upcean,
+ org.krysalis.barcode4j.output,
+ org.krysalis.barcode4j.output.bitmap,
+ org.krysalis.barcode4j.output.eps,
+ org.krysalis.barcode4j.output.java2d,
+ org.krysalis.barcode4j.output.svg,
+ org.krysalis.barcode4j.servlet,
+ org.krysalis.barcode4j.tools,
+ org.krysalis.barcode4j.xalan
diff --git a/org.adempiere.report.jasper.library/bin/.cvsignore b/org.adempiere.report.jasper.library/bin/.cvsignore
deleted file mode 100644
index d3f5a12faa..0000000000
--- a/org.adempiere.report.jasper.library/bin/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/org.adempiere.report.jasper.library/build.properties b/org.adempiere.report.jasper.library/build.properties
index dc4d13af94..fd53389ce7 100644
--- a/org.adempiere.report.jasper.library/build.properties
+++ b/org.adempiere.report.jasper.library/build.properties
@@ -1,11 +1,54 @@
 bin.includes = META-INF/,\
-               lib/commons-beanutils-1.8.0.jar,\
+               .,\
+               lib/antlr-2.7.5.jar,\
+               lib/batik-anim-1.8.jar,\
+               lib/batik-awt-util-1.8.jar,\
+               lib/batik-bridge-1.8.jar,\
+               lib/batik-codec-1.8.jar,\
+               lib/batik-css-1.8.jar,\
+               lib/batik-dom-1.8.jar,\
+               lib/batik-ext-1.8.jar,\
+               lib/batik-extension-1.8.jar,\
+               lib/batik-gui-util-1.8.jar,\
+               lib/batik-gui-util-1.8batik-parser-1.8.jar,\
+               lib/batik-gvt-1.8.jar,\
+               lib/batik-parser-1.8.jar,\
+               lib/batik-script-1.8.jar,\
+               lib/batik-svg-dom-1.8.jar,\
+               lib/batik-svggen-1.8.jar,\
+               lib/batik-swing-1.8.jar,\
+               lib/batik-transcoder-1.8.jar,\
+               lib/batik-util-1.8.jar,\
+               lib/batik-xml-1.8.jar,\
+               lib/castor-core-1.3.3.jar,\
+               lib/castor-xml-1.3.3.jar,\
                lib/commons-digester-2.1.jar,\
-               lib/jasperreports-5.6.1.jar,\
-               lib/jasperreports-fonts-5.6.1.jar,\
-               lib/jackson-core-2.1.4.jar,\
-               lib/xalan-2.7.1.jar,\
-               lib/jasperreports-functions-5.6.1.jar,\
-               lib/joda-time-2.1.jar,\
-               lib/itext-2.1.7.jar,\
-               lib/bcprov-jdk14-140.jar
+               lib/commons-javaflow-20160505.jar,\
+               lib/core-2.3.0.jar,\
+               lib/fop-transcoder-allinone-1.1.jar,\
+               lib/hibernate-core-3.3.2.GA.jar,\
+               lib/itext-2.1.7.js5.jar,\
+               lib/jasperreports-6.3.0.jar,\
+               lib/jasperreports-fonts-6.3.0.jar,\
+               lib/jasperreports-functions-6.3.0.jar,\
+               lib/jaxen-1.1.1.jar,\
+               lib/jcommon-1.0.23.jar,\
+               lib/jfreechart-1.0.19.jar,\
+               lib/js.jar,\
+               lib/jxl-2.6.10.jar,\
+               lib/lucene-analyzers-common-4.5.1.jar,\
+               lib/lucene-core-4.5.1.jar,\
+               lib/lucene-queryparser-4.5.1.jar,\
+               lib/mondrian-3.1.1.12687.jar,\
+               lib/olap4j-0.9.7.309-JS-3.jar,\
+               lib/persistence-api-1.0.jar,\
+               lib/poi-3.10.1.jar,\
+               lib/poi-ooxml-3.10.1.jar,\
+               lib/rhino-1.7.6.jar,\
+               lib/spring-beans-2.5.jar,\
+               lib/spring-core-2.5.jar,\
+               lib/velocity-1.7.jar,\
+               lib/xalan-2.7.2.jar,\
+               lib/xml-apis-ext-1.3.04.jar,\
+               lib/xmlgraphics-commons-1.5.jar,\
+               lib/xmpcore-5.1.1.jar
diff --git a/org.adempiere.report.jasper.library/copyjars.xml b/org.adempiere.report.jasper.library/copyjars.xml
index 56058ecfef..75a08ac32d 100644
--- a/org.adempiere.report.jasper.library/copyjars.xml
+++ b/org.adempiere.report.jasper.library/copyjars.xml
@@ -1,15 +1,58 @@
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
 		<mkdir dir="lib" />
-		<get src="${url.maven2.lib}/maven2/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar" dest="lib/commons-beanutils-1.8.0.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/commons-digester/commons-digester/2.1/commons-digester-2.1.jar" dest="lib/commons-digester-2.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/net/sf/jasperreports/jasperreports/5.6.1/jasperreports-5.6.1.jar" dest="lib/jasperreports-5.6.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/net/sf/jasperreports/jasperreports-fonts/5.6.1/jasperreports-fonts-5.6.1.jar" dest="lib/jasperreports-fonts-5.6.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/com/fasterxml/jackson/core/jackson-core/2.1.4/jackson-core-2.1.4.jar" dest="lib/jackson-core-2.1.4.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/xalan/xalan/2.7.1/xalan-2.7.1.jar" dest="lib/xalan-2.7.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.srv}/jarfile/3.1/jasperreports-functions-5.6.1.jar" dest="lib/jasperreports-functions-5.6.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/joda-time/joda-time/2.1/joda-time-2.1.jar" dest="lib/joda-time-2.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/com/lowagie/itext/2.1.7/itext-2.1.7.jar" dest="lib/itext-2.1.7.jar" usetimestamp="true" verbose="true" retries="5" />
-    <get src="${url.maven2.lib}/maven2/bouncycastle/bcprov-jdk14/140/bcprov-jdk14-140.jar" dest="lib/bcprov-jdk14-140.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/antlr-2.7.5.jar" dest="lib/antlr-2.7.5.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-anim-1.8.jar" dest="lib/batik-anim-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-awt-util-1.8.jar" dest="lib/batik-awt-util-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-bridge-1.8.jar" dest="lib/batik-bridge-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-codec-1.8.jar" dest="lib/batik-codec-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-css-1.8.jar" dest="lib/batik-css-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-dom-1.8.jar" dest="lib/batik-dom-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-ext-1.8.jar" dest="lib/batik-ext-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-extension-1.8.jar" dest="lib/batik-extension-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-gui-util-1.8batik-parser-1.8.jar" dest="lib/batik-gui-util-1.8batik-parser-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-gui-util-1.8.jar" dest="lib/batik-gui-util-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-gvt-1.8.jar" dest="lib/batik-gvt-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-parser-1.8.jar" dest="lib/batik-parser-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-script-1.8.jar" dest="lib/batik-script-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-svg-dom-1.8.jar" dest="lib/batik-svg-dom-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-svggen-1.8.jar" dest="lib/batik-svggen-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-swing-1.8.jar" dest="lib/batik-swing-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-transcoder-1.8.jar" dest="lib/batik-transcoder-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-util-1.8.jar" dest="lib/batik-util-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/batik-xml-1.8.jar" dest="lib/batik-xml-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/castor-core-1.3.3.jar" dest="lib/castor-core-1.3.3.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/castor-xml-1.3.3.jar" dest="lib/castor-xml-1.3.3.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/commons-digester-2.1.jar" dest="lib/commons-digester-2.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/commons-javaflow-20160505.jar" dest="lib/commons-javaflow-20160505.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/core-2.3.0.jar" dest="lib/core-2.3.0.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/fop-transcoder-allinone-1.1.jar" dest="lib/fop-transcoder-allinone-1.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/hibernate-core-3.3.2.GA.jar" dest="lib/hibernate-core-3.3.2.GA.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/httpcore-4.3.2.jar" dest="lib/httpcore-4.3.2.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/itext-2.1.7.js5.jar" dest="lib/itext-2.1.7.js5.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/jasperreports-6.3.0.jar" dest="lib/jasperreports-6.3.0.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/jasperreports-fonts-6.3.0.jar" dest="lib/jasperreports-fonts-6.3.0.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/jasperreports-functions-6.3.0.jar" dest="lib/jasperreports-functions-6.3.0.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/jaxen-1.1.1.jar" dest="lib/jaxen-1.1.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/jcommon-1.0.23.jar" dest="lib/jcommon-1.0.23.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/jfreechart-1.0.19.jar" dest="lib/jfreechart-1.0.19.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/js.jar" dest="lib/js.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/jxl-2.6.10.jar" dest="lib/jxl-2.6.10.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/lucene-analyzers-common-4.5.1.jar" dest="lib/lucene-analyzers-common-4.5.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/lucene-core-4.5.1.jar" dest="lib/lucene-core-4.5.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/lucene-queryparser-4.5.1.jar" dest="lib/lucene-queryparser-4.5.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/mondrian-3.1.1.12687.jar" dest="lib/mondrian-3.1.1.12687.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/olap4j-0.9.7.309-JS-3.jar" dest="lib/olap4j-0.9.7.309-JS-3.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/persistence-api-1.0.jar" dest="lib/persistence-api-1.0.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/poi-3.10.1.jar" dest="lib/poi-3.10.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/poi-ooxml-3.10.1.jar" dest="lib/poi-ooxml-3.10.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/rhino-1.7.6.jar" dest="lib/rhino-1.7.6.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/spring-beans-2.5.jar" dest="lib/spring-beans-2.5.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/spring-core-2.5.jar" dest="lib/spring-core-2.5.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/velocity-1.7.jar" dest="lib/velocity-1.7.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/xalan-2.7.2.jar" dest="lib/xalan-2.7.2.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/xml-apis-ext-1.3.04.jar" dest="lib/xml-apis-ext-1.3.04.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/xmlgraphics-commons-1.5.jar" dest="lib/xmlgraphics-commons-1.5.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/xmpcore-5.1.1.jar" dest="lib/xmpcore-5.1.1.jar" usetimestamp="true" verbose="true" retries="5" />	
 	</target>
 </project>
diff --git a/org.adempiere.report.jasper.library/note_for_update_jr_library.readme b/org.adempiere.report.jasper.library/note_for_update_jr_library.readme
new file mode 100644
index 0000000000..91a8fad01e
--- /dev/null
+++ b/org.adempiere.report.jasper.library/note_for_update_jr_library.readme
@@ -0,0 +1,25 @@
+jasper report use some library have osgi version on maven or orbit.
+but alot not yet have osgi version or have but outdate.
+it ever use a modify version like itext
+
+guide for update:
+1. download distribute at https://sourceforge.net/projects/jasperreports/files/jasperreports/
+   download file (jasperreports-x.x.x-project.zip)
+
+2. extract it and run ant to get all dependency library
+(ant just get normal library to let Jasperreport do common job, 
+for extra like encrypt, have go to sample project to get dependency
+but just focus common job and already know extra like encrypt)
+
+3. also download jasperreports-functions-x.x.x.jar
+
+4. now edit org.adempiere.report.jasper.library follow bellow rule
+   + if library have same version with library already use on idempiere, just use import package or bundle dependency
+   + if library have osgi on net (manven, orbit,...), add to org.adempiere.base-feature or org.adempiere.report.jasper-feature to materialize it
+   + if library not yet have osgi version, push it in lib folder and use Bundle-ClassPath
+   
+note for version 6.3.0
+poi-3.10.1 haven't yet osgi version, ever on newest obit repository. so use  Bundle-ClassPath
+batik haven't yet osgi version, ever on newest obit repository. so use  Bundle-ClassPath
+current batik osgi version isn't use by other bundle, so can remove it. 
+itext is very old and have modify code from JP community, so use version from JP
\ No newline at end of file
diff --git a/org.adempiere.report.jasper.library/resource/test/OrderFormat.jrxml b/org.adempiere.report.jasper.library/resource/test/OrderFormat.jrxml
deleted file mode 100644
index 1adbafd85f..0000000000
--- a/org.adempiere.report.jasper.library/resource/test/OrderFormat.jrxml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="OrderFormat" language="groovy" pageWidth="595" pageHeight="842" whenNoDataType="AllSectionsNoDetail" columnWidth="519" leftMargin="38" rightMargin="38" topMargin="38" bottomMargin="38" uuid="385b8f49-623c-4260-b1fd-9943131f1fef">
-	<property name="ireport.zoom" value="1.5"/>
-	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="0"/>
-	<style name="BoxedHeader" mode="Opaque" backcolor="#F0F0F0" hAlign="Center" vAlign="Middle" fontName="Arial" fontSize="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false">
-		<box leftPadding="1" rightPadding="1">
-			<pen lineWidth="1.0"/>
-			<topPen lineWidth="1.0"/>
-			<leftPen lineWidth="1.0"/>
-			<bottomPen lineWidth="1.0"/>
-			<rightPen lineWidth="1.0"/>
-		</box>
-	</style>
-	<style name="BoxedDetail" hAlign="Center" vAlign="Middle" fontName="Arial" fontSize="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false">
-		<box>
-			<pen lineWidth="0.5"/>
-			<topPen lineWidth="0.5"/>
-			<leftPen lineWidth="0.5"/>
-			<bottomPen lineWidth="0.5"/>
-			<rightPen lineWidth="0.5"/>
-		</box>
-	</style>
-	<style name="DottedBox" hAlign="Center" vAlign="Middle" fontName="Arial" fontSize="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false">
-		<box rightPadding="3">
-			<pen lineWidth="0.5" lineStyle="Dashed"/>
-			<topPen lineWidth="0.5" lineStyle="Dashed"/>
-			<leftPen lineWidth="0.5" lineStyle="Dashed"/>
-			<bottomPen lineWidth="0.5" lineStyle="Dashed"/>
-			<rightPen lineWidth="0.5" lineStyle="Dashed"/>
-		</box>
-	</style>
-	<style name="NormalText" isDefault="true" fontName="Arial" fontSize="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
-	<parameter name="AD_CLIENT_ID" class="java.lang.Integer" isForPrompting="false"/>
-	<parameter name="AD_ROLE_ID" class="java.lang.Integer" isForPrompting="false"/>
-	<parameter name="AD_USER_ID" class="java.lang.Integer" isForPrompting="false"/>
-	<parameter name="RECORD_ID" class="java.lang.Integer">
-		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
-	</parameter>
-	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA["./"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="RESOURCE_DIR" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA["./"]]></defaultValueExpression>
-	</parameter>
-	<queryString>
-		<![CDATA[SELECT  IsSOTrx
-FROM C_Order
-WHERE C_Order_ID = $P{RECORD_ID}]]>
-	</queryString>
-	<field name="issotrx" class="java.lang.String"/>
-	<background>
-		<band height="766" splitType="Stretch">
-			<staticText>
-				<reportElement uuid="7b7e36cb-b4c4-467b-a117-dff02366cd18" x="310" y="6" width="208" height="22"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font fontName="Arial" size="14" isBold="true"/>
-				</textElement>
-				<text><![CDATA[]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="837fbfef-be58-4ad2-a53a-4f2eae058cd4" x="0" y="6" width="258" height="22"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="Arial" size="10" isBold="true"/>
-				</textElement>
-				<text><![CDATA[COMPANY NAME]]></text>
-			</staticText>
-			<line>
-				<reportElement uuid="0355a655-9fb5-44ac-90c5-fabbcd35f2e1" x="0" y="37" width="519" height="1"/>
-			</line>
-			<staticText>
-				<reportElement uuid="8a5c234e-868b-4e6b-9918-8ee9756b57a7" x="0" y="748" width="519" height="17"/>
-				<textElement textAlignment="Center">
-					<font size="7"/>
-				</textElement>
-				<text><![CDATA[Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam vitae consequat nunc. Curabitur convallis est at erat mattis tincidunt. Donec consequat,
-odio sed cursus sodales, quam magna placerat dui, at molestie leo nisi id leo. Pellentesque ante lectus, ultricies id laoreet ac, tempus vel felis.]]></text>
-			</staticText>
-			<image onErrorType="Blank" evaluationTime="Report">
-				<reportElement uuid="8773235e-76ad-4cda-8eeb-15173cff21b6" x="397" y="707" width="75" height="35"/>
-				<imageExpression><![CDATA[$P{RESOURCE_DIR} + "9001.jpg"]]></imageExpression>
-			</image>
-			<staticText>
-				<reportElement uuid="7199355e-5611-4b4a-9cd2-5a32d8b2cdca" x="487" y="721" width="32" height="9"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font fontName="Arial" size="5"/>
-				</textElement>
-				<text><![CDATA[E&OE]]></text>
-			</staticText>
-			<image onErrorType="Blank" evaluationTime="Report">
-				<reportElement uuid="f50898e9-fd85-4c3a-93e5-d3e2873a9a07" x="277" y="707" width="75" height="35"/>
-				<imageExpression><![CDATA[$P{RESOURCE_DIR} + "2200.jpg"]]></imageExpression>
-			</image>
-			<image onErrorType="Blank" evaluationTime="Report">
-				<reportElement uuid="d78dff55-6d72-4d13-a5a7-69fa969b56b0" x="157" y="707" width="75" height="35"/>
-				<imageExpression><![CDATA[$P{RESOURCE_DIR} + "18001.jpg"]]></imageExpression>
-			</image>
-			<textField pattern="h.mm a">
-				<reportElement uuid="107fe3b6-3e59-44b5-87a3-283019ef58e3" x="487" y="707" width="32" height="14"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font fontName="Arial" size="7"/>
-				</textElement>
-				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
-			</textField>
-			<image onErrorType="Blank" evaluationTime="Report">
-				<reportElement uuid="6548fbcf-523f-4be9-a7be-1f9c7efcb987" x="37" y="707" width="75" height="35"/>
-				<imageExpression><![CDATA[$P{RESOURCE_DIR} + "14001.jpg"]]></imageExpression>
-			</image>
-			<line>
-				<reportElement uuid="b8baff98-5837-470d-ac97-5068f4c8883f" x="0" y="702" width="519" height="1"/>
-			</line>
-		</band>
-	</background>
-	<detail>
-		<band height="60">
-			<printWhenExpression><![CDATA[$F{issotrx}.equals( 'N' )]]></printWhenExpression>
-			<subreport>
-				<reportElement uuid="15a217b1-99e7-438e-a5a5-5a938d6ca3c8" x="0" y="0" width="518" height="60"/>
-				<subreportParameter name="AD_ROLE_ID"/>
-				<subreportParameter name="RECORD_ID">
-					<subreportParameterExpression><![CDATA[$P{RECORD_ID}]]></subreportParameterExpression>
-				</subreportParameter>
-				<subreportParameter name="AD_USER_ID"/>
-				<subreportParameter name="AD_CLIENT_ID"/>
-				<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
-				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "PurchaseOrder.jasper"]]></subreportExpression>
-			</subreport>
-		</band>
-		<band height="61">
-			<printWhenExpression><![CDATA[$F{issotrx}.equals( 'Y' )]]></printWhenExpression>
-		</band>
-	</detail>
-</jasperReport>
diff --git a/org.adempiere.report.jasper.library/resource/test/PurchaseOrder.jrxml b/org.adempiere.report.jasper.library/resource/test/PurchaseOrder.jrxml
deleted file mode 100644
index fba1538c20..0000000000
--- a/org.adempiere.report.jasper.library/resource/test/PurchaseOrder.jrxml
+++ /dev/null
@@ -1,800 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="PurchaseOrder" language="groovy" pageWidth="519" pageHeight="766" whenNoDataType="AllSectionsNoDetail" columnWidth="519" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isTitleNewPage="true" uuid="385b8f49-623c-4260-b1fd-9943131f1fef">
-	<property name="ireport.zoom" value="1.5"/>
-	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="0"/>
-	<style name="BoxedHeader" mode="Opaque" backcolor="#F0F0F0" hAlign="Center" vAlign="Middle" fontName="Arial" fontSize="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false">
-		<box leftPadding="1" rightPadding="1">
-			<pen lineWidth="1.0"/>
-			<topPen lineWidth="1.0"/>
-			<leftPen lineWidth="1.0"/>
-			<bottomPen lineWidth="1.0"/>
-			<rightPen lineWidth="1.0"/>
-		</box>
-	</style>
-	<style name="BoxedDetail" hAlign="Center" vAlign="Middle" fontName="Arial" fontSize="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false">
-		<box>
-			<pen lineWidth="0.5"/>
-			<topPen lineWidth="0.5"/>
-			<leftPen lineWidth="0.5"/>
-			<bottomPen lineWidth="0.5"/>
-			<rightPen lineWidth="0.5"/>
-		</box>
-	</style>
-	<style name="DottedBox" hAlign="Center" vAlign="Middle" fontName="Arial" fontSize="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false">
-		<box rightPadding="3">
-			<pen lineWidth="0.5" lineStyle="Dashed"/>
-			<topPen lineWidth="0.5" lineStyle="Dashed"/>
-			<leftPen lineWidth="0.5" lineStyle="Dashed"/>
-			<bottomPen lineWidth="0.5" lineStyle="Dashed"/>
-			<rightPen lineWidth="0.5" lineStyle="Dashed"/>
-		</box>
-	</style>
-	<style name="NormalText" isDefault="true" fontName="Arial" fontSize="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
-	<subDataset name="Bank Data" whenResourceMissingType="Empty" uuid="ed1d6c81-23a7-44b4-a841-61d7bac92d0f">
-		<parameter name="C_BPartner_ID" class="java.math.BigDecimal" isForPrompting="false"/>
-		<queryString>
-			<![CDATA[SELECT
-	b.Name BankName,
-	ba.A_Name AccountName,
-	ba.AccountNo,
-	b.SwiftCode,
-	b.RoutingNo,
-	bl.Address1,
-	bl.Address2,
-	bl.City,
-	bcon.Name BankCountry
-FROM C_BP_BankAccount ba
-	INNER JOIN C_Bank b ON b.C_Bank_ID = ba.C_Bank_ID
-	LEFT JOIN C_Location bl ON b.C_Location_ID = bl.C_Location_ID
-	LEFT JOIN C_Country bcon ON bl.C_Country_ID = bcon.C_Country_ID
-WHERE C_BPartner_ID = $P{C_BPartner_ID}
-AND ba.IsActive = 'Y'
-AND ba.IsACH = 'Y']]>
-		</queryString>
-		<field name="bankname" class="java.lang.String"/>
-		<field name="accountname" class="java.lang.String"/>
-		<field name="accountno" class="java.lang.String"/>
-		<field name="swiftcode" class="java.lang.String"/>
-		<field name="routingno" class="java.lang.String"/>
-		<field name="address1" class="java.lang.String"/>
-		<field name="address2" class="java.lang.String"/>
-		<field name="city" class="java.lang.String"/>
-		<field name="bankcountry" class="java.lang.String"/>
-	</subDataset>
-	<parameter name="AD_CLIENT_ID" class="java.lang.Integer" isForPrompting="false"/>
-	<parameter name="AD_ROLE_ID" class="java.lang.Integer" isForPrompting="false"/>
-	<parameter name="AD_USER_ID" class="java.lang.Integer" isForPrompting="false"/>
-	<parameter name="RECORD_ID" class="java.lang.Integer">
-		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
-	</parameter>
-	<queryString>
-		<![CDATA[SELECT  DISTINCT
-	o.DocumentNo,
-	o.DocStatus,
-	o.Description OrderDescription,
-	o.DateOrdered,
-	o.DatePromised,
-	o.POReference,
-	o.GrandTotal,
-	ocur.ISO_Code OrderCurrency,
-	bp.Name PartnerName,
-	l.Address1 Address1,
-	l.Address2 Address2,
-	l.Postal Postal,
-	l.City City,
-	con.Name CountryName,
-	con.CountryCode,
-	bpl.Phone Phone,
-	bpl.Phone2 Phone2,
-	bpl.Fax Fax,
-	bpu.Name ContactName,
-	pt.Name PaymentTermName,
-	pt.DocumentNote PaymentTermNote,
-	w.Name WarehouseName,
-	wl.Address1 WarehouseAddress1,
-	wl.Address2 WarehouseAddress2,
-	wl.City WarehouseCity,
-	wl.Postal WarehousePostal,
-	wl.Address3 WarehousePhone,
-	wl.Address4 WarehouseFax,
-	ol.Line,
-	COALESCE(p.Name, c.Name) ProductName,
-	ol.Description LineDescription,
-	ol.QtyEntered,
-	ol.PriceActual,
-	ol.LineNetAmt,
-	ol.Discount,
-	ol.PriceList,
-	o.IsDiscountPrinted,
-	cur.ISO_Code CurrencyCode,
-	cur.Description CurrencyDesc,
-	uom.UOMSymbol,
-	bp.C_BPartner_ID
-FROM
-	C_Order o INNER JOIN C_OrderLine ol ON o.C_Order_ID = ol.C_Order_ID
-	LEFT JOIN C_BPartner bp ON o.C_BPartner_ID = bp.C_BPartner_ID
-	LEFT JOIN C_BPartner_Location bpl ON o.C_BPartner_Location_ID = bpl.C_BPartner_Location_ID
-	LEFT JOIN C_Location l ON bpl.C_Location_ID = l.C_Location_ID
-	LEFT JOIN C_Country con ON l.C_Country_ID = con.C_Country_ID
-	LEFT JOIN AD_User bpu ON o.AD_User_ID = bpu.AD_User_ID
-	LEFT JOIN M_Warehouse w ON o.M_Warehouse_ID = w.M_Warehouse_ID
-	LEFT JOIN C_Location wl ON w.C_Location_ID = wl.C_Location_ID
-	LEFT JOIN M_Product p ON ol.M_Product_ID = p.M_Product_ID
-	LEFT JOIN C_UOM uom ON ol.C_UOM_ID = uom.C_UOM_ID
-	LEFT JOIN C_Currency cur ON ol.C_Currency_ID = cur.C_Currency_ID
-	LEFT JOIN C_Currency ocur ON o.C_Currency_ID = ocur.C_Currency_ID
-	LEFT JOIN C_PaymentTerm pt ON o.C_PaymentTerm_ID = pt.C_PaymentTerm_ID
-	LEFT JOIN C_Charge c ON ol.C_Charge_ID = c.C_Charge_ID
-WHERE o.IsSOTrx = 'N'
-AND o.C_Order_ID = $P{RECORD_ID}
-ORDER BY ol.Line]]>
-	</queryString>
-	<field name="documentno" class="java.lang.String"/>
-	<field name="docstatus" class="java.lang.String"/>
-	<field name="orderdescription" class="java.lang.String"/>
-	<field name="dateordered" class="java.sql.Timestamp"/>
-	<field name="datepromised" class="java.sql.Timestamp"/>
-	<field name="poreference" class="java.lang.String"/>
-	<field name="grandtotal" class="java.math.BigDecimal"/>
-	<field name="ordercurrency" class="java.lang.String"/>
-	<field name="partnername" class="java.lang.String"/>
-	<field name="address1" class="java.lang.String"/>
-	<field name="address2" class="java.lang.String"/>
-	<field name="postal" class="java.lang.String"/>
-	<field name="city" class="java.lang.String"/>
-	<field name="countryname" class="java.lang.String"/>
-	<field name="countrycode" class="java.lang.String"/>
-	<field name="phone" class="java.lang.String"/>
-	<field name="phone2" class="java.lang.String"/>
-	<field name="fax" class="java.lang.String"/>
-	<field name="contactname" class="java.lang.String"/>
-	<field name="paymenttermname" class="java.lang.String"/>
-	<field name="paymenttermnote" class="java.lang.String"/>
-	<field name="warehousename" class="java.lang.String"/>
-	<field name="warehouseaddress1" class="java.lang.String"/>
-	<field name="warehouseaddress2" class="java.lang.String"/>
-	<field name="warehousecity" class="java.lang.String"/>
-	<field name="warehousepostal" class="java.lang.String"/>
-	<field name="warehousephone" class="java.lang.String"/>
-	<field name="warehousefax" class="java.lang.String"/>
-	<field name="line" class="java.math.BigDecimal"/>
-	<field name="productname" class="java.lang.String"/>
-	<field name="linedescription" class="java.lang.String"/>
-	<field name="qtyentered" class="java.math.BigDecimal"/>
-	<field name="priceactual" class="java.math.BigDecimal"/>
-	<field name="linenetamt" class="java.math.BigDecimal"/>
-	<field name="discount" class="java.math.BigDecimal"/>
-	<field name="pricelist" class="java.math.BigDecimal"/>
-	<field name="isdiscountprinted" class="java.lang.String"/>
-	<field name="currencycode" class="java.lang.String"/>
-	<field name="currencydesc" class="java.lang.String"/>
-	<field name="uomsymbol" class="java.lang.String"/>
-	<field name="c_bpartner_id" class="java.math.BigDecimal"/>
-	<variable name="linenetamt_1" class="java.math.BigDecimal" calculation="Sum">
-		<variableExpression><![CDATA[$F{linenetamt}]]></variableExpression>
-	</variable>
-	<title>
-		<band height="705" splitType="Stretch">
-			<rectangle radius="15">
-				<reportElement uuid="99af1176-b4e6-4bcd-843b-4c2ebd71c345" x="172" y="64" width="336" height="32" forecolor="#000000" backcolor="#FFFFFF"/>
-			</rectangle>
-			<staticText>
-				<reportElement uuid="0191a55b-2f3d-4b49-9467-05871c720834" x="172" y="64" width="336" height="32" forecolor="#000000"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="Arial" size="18" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Purchase Order (PO)]]></text>
-			</staticText>
-			<textField>
-				<reportElement uuid="607d0892-67e1-47ff-a96b-9e9b61b05863" x="341" y="107" width="127" height="20"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{documentno}]]></textFieldExpression>
-			</textField>
-			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="d7b7df10-01e8-4344-95ea-eb40fa8e30d6" x="341" y="127" width="127" height="20"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{dateordered}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="ddb6ebf4-c5e1-41ce-ba05-c0f681561c84" x="72" y="238" width="436" height="20"/>
-				<textElement verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{contactname}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="88cc6600-a60f-41ef-bc7c-3c0c1b4a3153" x="72" y="258" width="436" height="20"/>
-				<textElement verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{orderdescription}]]></textFieldExpression>
-			</textField>
-			<line>
-				<reportElement uuid="6d9564a8-1575-4027-9bc8-fc73cba44c5d" x="1" y="289" width="518" height="1"/>
-			</line>
-			<frame>
-				<reportElement uuid="252b3c50-1d3b-426e-b296-1e4849ba5bf9" x="5" y="136" width="246" height="92"/>
-				<textField isBlankWhenNull="true">
-					<reportElement uuid="b5ee249b-5912-44a1-b433-f7cffae723d0" x="0" y="0" width="235" height="12" isRemoveLineWhenBlank="true"/>
-					<textElement/>
-					<textFieldExpression><![CDATA[$F{partnername}]]></textFieldExpression>
-				</textField>
-				<textField isBlankWhenNull="true">
-					<reportElement uuid="5c8e495d-6723-402f-9457-434eac704ed5" positionType="Float" x="0" y="72" width="235" height="12" isRemoveLineWhenBlank="true"/>
-					<textElement/>
-					<textFieldExpression><![CDATA[$F{fax} != null ?
-    "Fax: " + $F{fax}
-    : null]]></textFieldExpression>
-				</textField>
-				<textField isBlankWhenNull="true">
-					<reportElement uuid="28e28fa1-eff1-4f57-b510-73d437ae9b25" positionType="Float" x="0" y="60" width="235" height="12" isRemoveLineWhenBlank="true"/>
-					<textElement/>
-					<textFieldExpression><![CDATA[$F{phone} != null ?
-    "Phone: " + $F{phone}
-    : null]]></textFieldExpression>
-				</textField>
-				<textField isBlankWhenNull="true">
-					<reportElement uuid="69c52846-66ab-4a94-97fb-9328ccfa4d65" positionType="Float" x="0" y="24" width="235" height="12" isRemoveLineWhenBlank="true"/>
-					<textElement/>
-					<textFieldExpression><![CDATA[$F{address2}]]></textFieldExpression>
-				</textField>
-				<textField isBlankWhenNull="true">
-					<reportElement uuid="9c82a651-1acc-43e2-8a7b-c00080ccc224" positionType="Float" x="0" y="36" width="235" height="12" isRemoveLineWhenBlank="true"/>
-					<textElement/>
-					<textFieldExpression><![CDATA[$F{city}]]></textFieldExpression>
-				</textField>
-				<textField isBlankWhenNull="true">
-					<reportElement uuid="2d41e8e5-e468-4c6b-97b5-ced0256e46b3" positionType="Float" x="0" y="12" width="235" height="12" isRemoveLineWhenBlank="true"/>
-					<textElement/>
-					<textFieldExpression><![CDATA[$F{address1}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement uuid="c128ea97-cc13-461a-8388-50296f6d1548" positionType="Float" x="0" y="48" width="235" height="12"/>
-					<textElement/>
-					<textFieldExpression><![CDATA[$F{countryname}]]></textFieldExpression>
-				</textField>
-			</frame>
-			<staticText>
-				<reportElement uuid="42afe8aa-2e25-40f7-b11f-81ebcd59bf81" x="263" y="107" width="77" height="20"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font fontName="Arial" size="14" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Number:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="96fb64dc-dd78-4b42-aebe-8ac4d37db4b8" x="468" y="107" width="50" height="20"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="Arial" size="14" isBold="true" isPdfEmbedded="true"/>
-				</textElement>
-				<text><![CDATA[الرقم:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="b7927e9b-51a0-4a48-8c1f-eb2e3003f731" x="251" y="127" width="89" height="20"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font fontName="Arial"/>
-				</textElement>
-				<text><![CDATA[Date:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="e5f44ce8-42f7-4837-bffd-1f8643292ebd" x="468" y="127" width="62" height="20"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="Arial" pdfEncoding="Cp1252" isPdfEmbedded="true"/>
-				</textElement>
-				<text><![CDATA[التاريخ:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="cede6cbf-1771-40b1-8ab8-7958f2d2032d" x="5" y="116" width="100" height="20"/>
-				<textElement verticalAlignment="Middle"/>
-				<text><![CDATA[To:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="0d7ac135-bac5-4e54-b2be-5451e76036e8" x="5" y="238" width="67" height="20"/>
-				<textElement verticalAlignment="Middle"/>
-				<text><![CDATA[Attn:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="db75ddae-ae49-48bc-a908-55c16e757875" x="5" y="258" width="67" height="20"/>
-				<textElement verticalAlignment="Middle"/>
-				<text><![CDATA[Subject:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="5184afd4-1e31-4836-8ed3-d6bf3130b8ec" x="5" y="299" width="503" height="20"/>
-				<textElement/>
-				<text><![CDATA[We are pleased to place our order as per the following terms and conditions.]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="e7540143-27e6-41bd-bcfa-2a0d6b8dc09e" x="5" y="425" width="100" height="20"/>
-				<textElement verticalAlignment="Middle"/>
-				<text><![CDATA[Note:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="b8607489-9f93-4d0a-a8ff-0158a6d1c54f" x="37" y="445" width="450" height="118">
-					<printWhenExpression><![CDATA[$F{countrycode}.equals( "SA" )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[1 - Please send you Invoice/Order Confirmation to process the payment upon receipt of this order.
-
-2 - Our Purchase Order number must appear on Invoices and Delivery notes.
-
-3 - Any error and omissions are excepted from this order.
-
-4 - Send all correspondence to the procurement manager.
-
-5 - Supplier has to comply with all precautions like spillage, leakage and statutory requirements related to health, safety & environment aspects in delivering this order.]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="0bc95ecd-c5f7-400e-8e73-d43838542ce2" x="5" y="593" width="253" height="12"/>
-				<textElement/>
-				<text><![CDATA[For COMPANY NAME]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="59616d29-fb34-41a5-96d0-d4f931d56099" x="5" y="661" width="135" height="20"/>
-				<box>
-					<topPen lineWidth="1.0"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<text><![CDATA[Procurement Department]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="825bbcb2-067c-4aa0-9b4d-a2209d90d157" x="174" y="661" width="152" height="20"/>
-				<box>
-					<pen lineWidth="1.0"/>
-					<topPen lineWidth="1.0"/>
-					<leftPen lineWidth="0.0"/>
-					<bottomPen lineWidth="0.0"/>
-					<rightPen lineWidth="0.0"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<text><![CDATA[Department Head]]></text>
-			</staticText>
-			<textField evaluationTime="Report">
-				<reportElement uuid="c8d8338c-44bd-4c13-bd1b-5f49162c2df5" x="483" y="689" width="35" height="14"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="35562288-17c4-41b6-b5e0-773c3ea6d628" x="403" y="689" width="80" height="14"/>
-				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA["Page "+$V{PAGE_NUMBER}+" of"]]></textFieldExpression>
-			</textField>
-			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="72fd6ff3-1202-44ac-ab7a-a5fe11b05b13" x="0" y="689" width="100" height="14"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement uuid="2518fb3c-a5c5-4101-aae6-b8eccdc19c65" x="251" y="147" width="89" height="20"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font fontName="Arial"/>
-				</textElement>
-				<text><![CDATA[Quotation Ref:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="65132faa-eddb-4de9-bb7e-be78621da847" x="468" y="147" width="62" height="20"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="Arial" pdfEncoding="Cp1252" isPdfEmbedded="true"/>
-				</textElement>
-				<text><![CDATA[رقم العرض:]]></text>
-			</staticText>
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="2b66dcd9-5c32-4dff-8c09-73bcb9500ee7" x="341" y="147" width="127" height="20"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{poreference}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement uuid="30ba4070-8d4a-4703-a5d0-80e0d63cf401" x="37" y="445" width="450" height="118">
-					<printWhenExpression><![CDATA[!$F{countrycode}.equals( "SA" )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[1 - Please send you Invoice/Order Confirmation to process the payment upon receipt of this order.
-
-2 - Documents required for shipment
-	a - Chambered Invoice (1+3 Original)
-	b - Chambered Certificate of Origin (1+1)
-	c - Packing List (1+2)
-
-3 - Supplier has to comply with all precautions like spillage, leakage and statutory requirements related to health, safety & environment aspects in delivering this order.]]></text>
-			</staticText>
-			<frame>
-				<reportElement uuid="9d38ab41-c6ae-44d7-89b4-02b7751b33ba" positionType="Float" x="5" y="322" width="503" height="15"/>
-				<staticText>
-					<reportElement uuid="cfe8e27f-0f84-48ad-87c6-4cd94d325acf" x="135" y="0" width="15" height="15"/>
-					<textElement/>
-					<text><![CDATA[:]]></text>
-				</staticText>
-				<staticText>
-					<reportElement uuid="930f3a37-a9f2-42fa-bfeb-083b7ff16714" x="0" y="0" width="135" height="15"/>
-					<textElement verticalAlignment="Middle"/>
-					<text><![CDATA[A - Scope of Supply]]></text>
-				</staticText>
-				<staticText>
-					<reportElement uuid="e6d4c9b9-b007-44ab-bd61-8959207a4735" x="150" y="0" width="295" height="15"/>
-					<textElement verticalAlignment="Middle"/>
-					<text><![CDATA[As per attached list]]></text>
-				</staticText>
-			</frame>
-			<frame>
-				<reportElement uuid="55ca0544-97cf-46a8-b1a6-023dc68d3427" positionType="Float" x="5" y="337" width="503" height="15"/>
-				<staticText>
-					<reportElement uuid="21adce03-6225-49c2-8317-8916a83941e5" x="135" y="0" width="15" height="15"/>
-					<textElement/>
-					<text><![CDATA[:]]></text>
-				</staticText>
-				<staticText>
-					<reportElement uuid="a612f025-64b7-4d1c-9d54-5670846e6619" x="0" y="0" width="135" height="15"/>
-					<textElement verticalAlignment="Middle"/>
-					<text><![CDATA[B - Total Amount]]></text>
-				</staticText>
-				<textField isStretchWithOverflow="true">
-					<reportElement uuid="ba9492d1-5e23-4b12-abeb-db96a49b8a50" x="150" y="0" width="353" height="15"/>
-					<textElement/>
-					<textFieldExpression><![CDATA[$F{ordercurrency}
-+ " "
-+ java.lang.String.format("%-,1.2f", [$F{grandtotal}] as Object[])
-+ " ("
-+ $F{currencydesc} + " "
-+ org.compiere.util.Msg.getAmtInWords(org.compiere.util.Language.getLoginLanguage(), java.lang.String.format("%-3.2f", [$F{grandtotal}] as Object[]))
-+ ")"]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<reportElement uuid="0c286e68-89b6-4c4b-87d6-a562e5aa48e6" positionType="Float" x="5" y="352" width="503" height="15"/>
-				<staticText>
-					<reportElement uuid="5710aed7-90c9-415d-a1c8-2ae143a58d13" x="135" y="0" width="15" height="15"/>
-					<textElement/>
-					<text><![CDATA[:]]></text>
-				</staticText>
-				<staticText>
-					<reportElement uuid="bfced459-3740-450b-88ec-ace1a99c481c" x="0" y="0" width="135" height="15"/>
-					<textElement verticalAlignment="Middle"/>
-					<text><![CDATA[C - Payment Terms]]></text>
-				</staticText>
-				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement uuid="a9004540-6394-4ab1-91f1-aa3e91016d60" x="150" y="0" width="353" height="15"/>
-					<textElement/>
-					<textFieldExpression><![CDATA[$F{paymenttermname}
-+ ($F{paymenttermnote} != null ? ", " + $F{paymenttermnote} : "")]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<reportElement uuid="38ffdc64-dcd7-4ce9-8713-f4b7b36ced73" positionType="Float" x="5" y="367" width="503" height="15"/>
-				<staticText>
-					<reportElement uuid="a3559bc6-6c01-4e52-94ab-41a69ea6ea1b" x="135" y="0" width="15" height="15"/>
-					<textElement/>
-					<text><![CDATA[:]]></text>
-				</staticText>
-				<staticText>
-					<reportElement uuid="7d984508-633f-46e8-ad83-eae6b5750457" x="0" y="0" width="135" height="15"/>
-					<textElement verticalAlignment="Middle"/>
-					<text><![CDATA[D - Delivery Date]]></text>
-				</staticText>
-				<textField pattern="dd/MM/yyyy">
-					<reportElement uuid="7b688c17-8383-4d7a-995d-dc50060e9ec5" x="150" y="0" width="353" height="15"/>
-					<textElement/>
-					<textFieldExpression><![CDATA[$F{datepromised}]]></textFieldExpression>
-				</textField>
-			</frame>
-			<frame>
-				<reportElement uuid="c515e9cd-24c6-4f83-b7ca-ec3ccd7894de" positionType="Float" x="5" y="382" width="503" height="15"/>
-				<staticText>
-					<reportElement uuid="6bd07502-d49c-423e-bd94-ed3066d181ec" x="135" y="0" width="15" height="15"/>
-					<textElement/>
-					<text><![CDATA[:]]></text>
-				</staticText>
-				<staticText>
-					<reportElement uuid="647d108b-0ec9-45d7-a8b8-2f1b226c2eb8" x="0" y="0" width="135" height="15"/>
-					<textElement verticalAlignment="Middle"/>
-					<text><![CDATA[E - Delivery Place]]></text>
-				</staticText>
-				<textField isStretchWithOverflow="true">
-					<reportElement uuid="2ae449c4-50bd-42a1-a606-fa6ad97419ef" x="150" y="0" width="353" height="15"/>
-					<textElement/>
-					<textFieldExpression><![CDATA[$F{warehousename}
-+ ($F{warehouseaddress1} != null ? ", " + $F{warehouseaddress1} : "")
-+ ($F{warehouseaddress2} != null ? ", " + $F{warehouseaddress2} : "")
-+ ($F{warehousecity} != null ? ", " + $F{warehousecity} : "")
-+ ($F{warehousephone} != null ? ", " + $F{warehousephone} : "")
-+ ($F{warehousefax} != null ? ", " + $F{warehousefax} : "")]]></textFieldExpression>
-				</textField>
-			</frame>
-			<staticText>
-				<reportElement uuid="1c3f4e9b-5650-4769-add2-cffd8dd1a8a7" x="360" y="661" width="152" height="20"/>
-				<box>
-					<pen lineWidth="1.0"/>
-					<topPen lineWidth="1.0"/>
-					<leftPen lineWidth="0.0"/>
-					<bottomPen lineWidth="0.0"/>
-					<rightPen lineWidth="0.0"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<text><![CDATA[Operation Director]]></text>
-			</staticText>
-			<componentElement>
-				<reportElement uuid="f4e23ad0-bcca-4ef8-9c23-01e6ccba7283" x="297" y="192" width="200" height="28"/>
-				<jr:barbecue xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd" type="Code128" drawText="false" checksumRequired="false" evaluationTime="Report">
-					<jr:codeExpression><![CDATA[$F{documentno}]]></jr:codeExpression>
-				</jr:barbecue>
-			</componentElement>
-		</band>
-	</title>
-	<pageHeader>
-		<band height="96" splitType="Stretch">
-			<printWhenExpression><![CDATA[$V{PAGE_NUMBER} != 1]]></printWhenExpression>
-			<staticText>
-				<reportElement uuid="14213c35-db64-4617-88fd-6a013eb3d57b" x="263" y="54" width="77" height="20"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font fontName="Arial" size="14" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Number:]]></text>
-			</staticText>
-			<textField>
-				<reportElement uuid="13a43b75-2f42-4f60-b569-4fe235801758" x="341" y="54" width="127" height="20"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="10"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{documentno}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement uuid="4090cc65-bf1e-4d94-9e23-73c1067dbd2c" x="468" y="54" width="50" height="20"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="Arial" size="14" isBold="true" isPdfEmbedded="true"/>
-				</textElement>
-				<text><![CDATA[الرقم:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="5f1c80b5-d50f-41f6-ae99-8219bf2d6eea" x="0" y="54" width="67" height="20"/>
-				<textElement verticalAlignment="Middle"/>
-				<text><![CDATA[Subject:]]></text>
-			</staticText>
-			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="9bb16fc8-94d2-4420-96ef-419733811853" x="67" y="54" width="196" height="20"/>
-				<textElement verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{orderdescription}]]></textFieldExpression>
-			</textField>
-		</band>
-	</pageHeader>
-	<columnHeader>
-		<band height="20">
-			<staticText>
-				<reportElement uuid="313775e0-ede5-4603-8ded-0b27f10f6628" style="BoxedHeader" x="0" y="0" width="37" height="20">
-					<printWhenExpression><![CDATA[!$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[No]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="845206e4-101f-4b2b-ba49-5e3c4cd1e8fe" style="BoxedHeader" x="37" y="0" width="221" height="20">
-					<printWhenExpression><![CDATA[!$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[Description]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="371cd165-1d58-4da3-8d5a-934d87687e94" style="BoxedHeader" x="258" y="0" width="39" height="20">
-					<printWhenExpression><![CDATA[!$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[Qty]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="6f5e6271-7785-4487-aba4-031c5537f26e" style="BoxedHeader" x="341" y="0" width="83" height="20">
-					<printWhenExpression><![CDATA[!$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[Unit Price]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="802d2718-9a56-486d-9f9b-86984e2d54ab" style="BoxedHeader" x="297" y="0" width="44" height="20">
-					<printWhenExpression><![CDATA[!$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[UoM]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="20484da8-7b6a-4e7b-9f8e-b4885c27fbd1" style="BoxedHeader" x="424" y="0" width="94" height="20">
-					<printWhenExpression><![CDATA[!$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[Total Value]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="72216a78-3140-46c5-b053-002468aec069" style="BoxedHeader" x="378" y="0" width="46" height="20">
-					<printWhenExpression><![CDATA[$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[Discount]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="313775e0-ede5-4603-8ded-0b27f10f6628" style="BoxedHeader" x="0" y="0" width="37" height="20">
-					<printWhenExpression><![CDATA[$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[No]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="845206e4-101f-4b2b-ba49-5e3c4cd1e8fe" style="BoxedHeader" x="37" y="0" width="175" height="20">
-					<printWhenExpression><![CDATA[$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[Description]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="371cd165-1d58-4da3-8d5a-934d87687e94" style="BoxedHeader" x="212" y="0" width="39" height="20">
-					<printWhenExpression><![CDATA[$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[Qty]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="802d2718-9a56-486d-9f9b-86984e2d54ab" style="BoxedHeader" x="251" y="0" width="44" height="20">
-					<printWhenExpression><![CDATA[$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[UoM]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="6f5e6271-7785-4487-aba4-031c5537f26e" style="BoxedHeader" x="295" y="0" width="83" height="20">
-					<printWhenExpression><![CDATA[$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[Unit Price]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="20484da8-7b6a-4e7b-9f8e-b4885c27fbd1" style="BoxedHeader" x="424" y="0" width="94" height="20">
-					<printWhenExpression><![CDATA[$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-				</reportElement>
-				<textElement/>
-				<text><![CDATA[Total Value]]></text>
-			</staticText>
-		</band>
-	</columnHeader>
-	<detail>
-		<band height="20">
-			<printWhenExpression><![CDATA[!$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-			<textField>
-				<reportElement uuid="5bdaf8db-9dae-4e66-99fb-8224b56f49c8" style="BoxedDetail" stretchType="RelativeToBandHeight" x="0" y="0" width="37" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{line}]]></textFieldExpression>
-			</textField>
-			<textField isStretchWithOverflow="true">
-				<reportElement uuid="8bb16467-dc7b-457c-8f5b-56df838abb34" style="BoxedDetail" stretchType="RelativeToBandHeight" x="37" y="0" width="221" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[($F{productname} != null ? $F{productname} : "") +
-($F{linedescription} != null ? "\n" + $F{linedescription}
-    : "")]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="bced812b-5378-4935-a5cc-800d66c3aeef" style="BoxedDetail" stretchType="RelativeToBandHeight" x="258" y="0" width="39" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{qtyentered}]]></textFieldExpression>
-			</textField>
-			<textField pattern="#,##0.00">
-				<reportElement uuid="0cde8765-7117-4c85-be34-a1265498f8c5" style="BoxedDetail" stretchType="RelativeToBandHeight" x="341" y="0" width="83" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{priceactual}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="66e492e3-f34d-490e-a48d-95d6e4c6f0ab" style="BoxedDetail" stretchType="RelativeToBandHeight" x="297" y="0" width="44" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{uomsymbol}]]></textFieldExpression>
-			</textField>
-			<textField pattern="#,##0.00">
-				<reportElement uuid="8db0967e-92e9-46bd-832a-ef90aac89fc5" style="BoxedDetail" stretchType="RelativeToBandHeight" x="424" y="0" width="94" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{linenetamt}]]></textFieldExpression>
-			</textField>
-		</band>
-		<band height="20">
-			<printWhenExpression><![CDATA[$F{isdiscountprinted}.equals( 'Y' )]]></printWhenExpression>
-			<textField>
-				<reportElement uuid="5bdaf8db-9dae-4e66-99fb-8224b56f49c8" style="BoxedDetail" stretchType="RelativeToBandHeight" x="0" y="0" width="37" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{line}]]></textFieldExpression>
-			</textField>
-			<textField isStretchWithOverflow="true">
-				<reportElement uuid="8bb16467-dc7b-457c-8f5b-56df838abb34" style="BoxedDetail" stretchType="RelativeToBandHeight" x="37" y="0" width="175" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[($F{productname} != null ? $F{productname} : "") +
-($F{linedescription} != null ? "\n" + $F{linedescription}
-    : "")]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="bced812b-5378-4935-a5cc-800d66c3aeef" style="BoxedDetail" stretchType="RelativeToBandHeight" x="212" y="0" width="39" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{qtyentered}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="66e492e3-f34d-490e-a48d-95d6e4c6f0ab" style="BoxedDetail" stretchType="RelativeToBandHeight" x="251" y="0" width="44" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{uomsymbol}]]></textFieldExpression>
-			</textField>
-			<textField pattern="#,##0.00">
-				<reportElement uuid="0cde8765-7117-4c85-be34-a1265498f8c5" style="BoxedDetail" stretchType="RelativeToBandHeight" x="295" y="0" width="83" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{pricelist}]]></textFieldExpression>
-			</textField>
-			<textField pattern="###0.00">
-				<reportElement uuid="e91d48ab-fb4f-41d4-8d46-de86c786546d" style="BoxedDetail" x="378" y="0" width="46" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{discount}.toString().concat(" %")]]></textFieldExpression>
-			</textField>
-			<textField pattern="#,##0.00">
-				<reportElement uuid="8db0967e-92e9-46bd-832a-ef90aac89fc5" style="BoxedDetail" stretchType="RelativeToBandHeight" x="424" y="0" width="94" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{linenetamt}]]></textFieldExpression>
-			</textField>
-		</band>
-	</detail>
-	<pageFooter>
-		<band height="78" splitType="Stretch">
-			<textField evaluationTime="Report">
-				<reportElement uuid="a95b0e12-c0af-42a0-8116-a2d497754271" x="484" y="0" width="35" height="14"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="ee0f6630-eb29-46af-97d7-e6ffaf3c7799" x="0" y="0" width="100" height="14"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="20aa33da-2c6a-4fc2-936f-6384db7babaa" x="404" y="0" width="80" height="14"/>
-				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA["Page "+$V{PAGE_NUMBER}+" of"]]></textFieldExpression>
-			</textField>
-		</band>
-	</pageFooter>
-	<summary>
-		<band height="100" splitType="Stretch">
-			<textField pattern="#,##0.00">
-				<reportElement uuid="744fe6a7-64c3-471d-9de3-84bc919f05a6" style="BoxedHeader" x="424" y="0" width="94" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$V{linenetamt_1}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="91e06a1d-8901-476f-9082-cd176cb49430" style="BoxedHeader" x="211" y="0" width="213" height="20"/>
-				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA["Total Amount " + $F{ordercurrency} + ":  "]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement uuid="57f61f32-124f-41e8-9d57-e396d54648c0" x="1" y="35" width="100" height="20"/>
-				<textElement verticalAlignment="Middle">
-					<font isBold="true"/>
-				</textElement>
-				<text><![CDATA[Bank Details:]]></text>
-			</staticText>
-			<componentElement>
-				<reportElement uuid="dc9e5bf6-b3d1-4306-94d5-d6302bd9d3c7" key="table" x="0" y="55" width="519" height="45"/>
-				<jr:table xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd">
-					<datasetRun subDataset="Bank Data" uuid="70636702-ede3-4f49-856a-6d5db6394905">
-						<datasetParameter name="C_BPartner_ID">
-							<datasetParameterExpression><![CDATA[$F{c_bpartner_id}]]></datasetParameterExpression>
-						</datasetParameter>
-						<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
-					</datasetRun>
-					<jr:column uuid="820d7587-e279-4daf-adbe-c435c7c385b2" width="519">
-						<jr:detailCell height="32" rowSpan="1">
-							<box>
-								<topPen lineWidth="0.0"/>
-								<leftPen lineWidth="0.0"/>
-								<bottomPen lineWidth="0.0"/>
-								<rightPen lineWidth="0.0"/>
-							</box>
-							<textField isStretchWithOverflow="true" evaluationTime="Auto">
-								<reportElement uuid="0300c7fc-7f12-4baa-9e97-81bb0617d0f7" x="0" y="0" width="519" height="20"/>
-								<textElement/>
-								<textFieldExpression><![CDATA["A/C Holder: " + $F{accountname} + "\n"
-+ "Bank Name: " + $F{bankname} + "\n"
-+ ($F{address1} != null ? "Branch: " + $F{address1} + "\n" : "")
-+ ($F{city} != null ? "City: " + $F{city} : "")
-+ ($F{bankcountry} != null ? ", " + $F{bankcountry} : "") + "\n"
-+ "Clearing No: " + $F{routingno} + "\n"
-+ ($F{swiftcode} != null ? "SWIFT Code: " + $F{swiftcode} + "\n" : "")
-+ "Account/IBAN No: " + $F{accountno} + "\n"]]></textFieldExpression>
-							</textField>
-						</jr:detailCell>
-					</jr:column>
-				</jr:table>
-			</componentElement>
-		</band>
-	</summary>
-</jasperReport>
diff --git a/org.adempiere.report.jasper.library/resource/test/Requisition.jrxml b/org.adempiere.report.jasper.library/resource/test/Requisition.jrxml
deleted file mode 100644
index fabd7db036..0000000000
--- a/org.adempiere.report.jasper.library/resource/test/Requisition.jrxml
+++ /dev/null
@@ -1,431 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="LocalPurchaseRequest" pageWidth="595" pageHeight="842" whenNoDataType="BlankPage" columnWidth="519" leftMargin="38" rightMargin="38" topMargin="38" bottomMargin="38" uuid="8d6070fd-c1c6-4a92-8c36-46e15d09e000">
-	<property name="ireport.zoom" value="1.5"/>
-	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="768"/>
-	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="AdempiereDev"/>
-	<style name="BoxedHeader" mode="Opaque" backcolor="#F0F0F0" hAlign="Center" vAlign="Middle" fontName="Arial" fontSize="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false">
-		<box leftPadding="1" rightPadding="1">
-			<pen lineWidth="1.0"/>
-			<topPen lineWidth="1.0"/>
-			<leftPen lineWidth="1.0"/>
-			<bottomPen lineWidth="1.0"/>
-			<rightPen lineWidth="1.0"/>
-		</box>
-	</style>
-	<style name="BoxedDetail" hAlign="Center" vAlign="Middle" fontName="Arial" fontSize="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false">
-		<box>
-			<pen lineWidth="0.5"/>
-			<topPen lineWidth="0.5"/>
-			<leftPen lineWidth="0.5"/>
-			<bottomPen lineWidth="0.5"/>
-			<rightPen lineWidth="0.5"/>
-		</box>
-	</style>
-	<style name="DottedBox" hAlign="Center" vAlign="Middle" fontName="Arial" fontSize="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false">
-		<box rightPadding="3">
-			<pen lineWidth="0.5" lineStyle="Dashed"/>
-			<topPen lineWidth="0.5" lineStyle="Dashed"/>
-			<leftPen lineWidth="0.5" lineStyle="Dashed"/>
-			<bottomPen lineWidth="0.5" lineStyle="Dashed"/>
-			<rightPen lineWidth="0.5" lineStyle="Dashed"/>
-		</box>
-	</style>
-	<style name="NormalText" isDefault="true" fontName="Arial" fontSize="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
-	<parameter name="AD_CLIENT_ID" class="java.lang.Integer" isForPrompting="false"/>
-	<parameter name="AD_ROLE_ID" class="java.lang.Integer" isForPrompting="false"/>
-	<parameter name="AD_USER_ID" class="java.lang.Integer" isForPrompting="false"/>
-	<parameter name="RECORD_ID" class="java.lang.Integer">
-		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
-	</parameter>
-	<parameter name="RESOURCE_DIR" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA["./"]]></defaultValueExpression>
-	</parameter>
-	<queryString>
-		<![CDATA[SELECT
-	r.DocumentNo,
-	r.Description, --justification
-	r.DateDoc,
-	r.DateRequired,
-	r.TotalLines, --estimate value
-	r.DocStatus,
-	u.Name RequesterName, -- Requester Name
-	bpg.Name Department, -- Department
-	w.Name DeliverTo, -- Deliver To
-	rl.Line,
-	p.Value ProductNo, --product no
-	p.Name ProductName, -- Product Name
-	rl.Description LineDescription, -- Product Description
-	rl.Qty,
-	uom.UOMSymbol,
-	rl.LineNetAmt
-FROM M_Requisition r
-	INNER JOIN M_RequisitionLine rl ON r.M_Requisition_ID = rl.M_Requisition_ID
-	LEFT JOIN C_UOM uom ON  rl.C_UOM_ID = uom.C_UOM_ID
-	LEFT JOIN AD_User u ON r.AD_User_ID = u.AD_User_ID
-	LEFT JOIN C_BPartner bp ON u.C_BPartner_ID = bp.C_BPartner_ID
-	LEFT JOIN C_BP_Group bpg ON bp.C_BP_Group_ID = bpg.C_BP_Group_ID
-	LEFT JOIN M_Warehouse w ON r.M_Warehouse_ID = w.M_Warehouse_ID
-	LEFT JOIN M_Product p ON rl.M_Product_ID = p.M_Product_ID
-WHERE r.M_Requisition_ID = $P{RECORD_ID}
-ORDER BY rl.Line]]>
-	</queryString>
-	<field name="documentno" class="java.lang.String"/>
-	<field name="description" class="java.lang.String"/>
-	<field name="datedoc" class="java.sql.Timestamp"/>
-	<field name="daterequired" class="java.sql.Timestamp"/>
-	<field name="totallines" class="java.math.BigDecimal"/>
-	<field name="docstatus" class="java.lang.String"/>
-	<field name="requestername" class="java.lang.String"/>
-	<field name="department" class="java.lang.String"/>
-	<field name="deliverto" class="java.lang.String"/>
-	<field name="line" class="java.math.BigDecimal"/>
-	<field name="productno" class="java.lang.String"/>
-	<field name="productname" class="java.lang.String"/>
-	<field name="linedescription" class="java.lang.String"/>
-	<field name="qty" class="java.math.BigDecimal"/>
-	<field name="uomsymbol" class="java.lang.String"/>
-	<field name="linenetamt" class="java.math.BigDecimal"/>
-	<background>
-		<band height="766" splitType="Stretch">
-			<staticText>
-				<reportElement uuid="00227d6d-401e-4cc2-afac-f161d5953f7e" x="310" y="6" width="208" height="22"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font fontName="Arial" size="14" isBold="true"/>
-				</textElement>
-				<text><![CDATA[]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="1623617d-d456-4af2-a954-0e3887d92c0f" x="0" y="6" width="258" height="22"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="Arial" size="10" isBold="true"/>
-				</textElement>
-				<text><![CDATA[COMPANY NAME]]></text>
-			</staticText>
-			<line>
-				<reportElement uuid="8c8d18a4-a3cd-466c-8375-10eec65ffda5" x="0" y="37" width="519" height="1"/>
-			</line>
-			<staticText>
-				<reportElement uuid="925bd6b3-6f75-4e2f-ac4e-7f9c033dc8f5" x="0" y="748" width="519" height="17"/>
-				<textElement textAlignment="Center">
-					<font size="7"/>
-				</textElement>
-				<text><![CDATA[Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam vitae consequat nunc. Curabitur convallis est at erat mattis tincidunt. Donec consequat,
-odio sed cursus sodales, quam magna placerat dui, at molestie leo nisi id leo. Pellentesque ante lectus, ultricies id laoreet ac, tempus vel felis.]]></text>
-			</staticText>
-			<image onErrorType="Blank">
-				<reportElement uuid="f95ea447-de3f-4b74-a9d1-cbc5cb4d1c47" x="397" y="707" width="75" height="35"/>
-				<imageExpression><![CDATA[$P{RESOURCE_DIR} + "9001.jpg"]]></imageExpression>
-			</image>
-			<staticText>
-				<reportElement uuid="7e9cd737-98c9-44cc-a30a-6c516097c95e" x="487" y="721" width="32" height="9"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font fontName="Arial" size="5"/>
-				</textElement>
-				<text><![CDATA[E&OE]]></text>
-			</staticText>
-			<image onErrorType="Blank">
-				<reportElement uuid="581b3fad-1f4b-4ca8-9a8c-9baf69d010b0" x="277" y="707" width="75" height="35"/>
-				<imageExpression><![CDATA[$P{RESOURCE_DIR} + "2200.jpg"]]></imageExpression>
-			</image>
-			<image onErrorType="Blank">
-				<reportElement uuid="3fc06ae7-d529-4853-b7dc-f09990d00672" x="157" y="707" width="75" height="35"/>
-				<imageExpression><![CDATA[$P{RESOURCE_DIR} + "18001.jpg"]]></imageExpression>
-			</image>
-			<textField pattern="h.mm a">
-				<reportElement uuid="091484c4-f756-40c1-a374-690d2111f2f3" x="487" y="707" width="32" height="14"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font fontName="Arial" size="7"/>
-				</textElement>
-				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
-			</textField>
-			<image onErrorType="Blank">
-				<reportElement uuid="15f145e6-04b5-495c-8b64-3a9cfc320add" x="37" y="707" width="75" height="35"/>
-				<imageExpression><![CDATA[$P{RESOURCE_DIR} + "14001.jpg"]]></imageExpression>
-			</image>
-			<line>
-				<reportElement uuid="dfd6a4fb-6c43-4ebe-b160-19539fa303f5" x="0" y="702" width="519" height="1"/>
-			</line>
-		</band>
-	</background>
-	<title>
-		<band height="231" splitType="Stretch">
-			<staticText>
-				<reportElement uuid="b2d0c2f1-74ed-47d5-b2de-dd54d42eb5e0" x="240" y="124" width="89" height="72"/>
-				<textElement textAlignment="Right">
-					<font fontName="Arial" size="10" isBold="false"/>
-				</textElement>
-				<text><![CDATA[Date:
-Required Date:
-Requester Name:
-Department:
-Estimate Value:
-Deliver To:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="5faf863c-a519-4dd4-a188-ac422ef62fce" x="252" y="104" width="77" height="20"/>
-				<textElement textAlignment="Right">
-					<font fontName="Arial" size="14" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Number:]]></text>
-			</staticText>
-			<rectangle radius="15">
-				<reportElement uuid="7951f135-1401-4e96-acdc-01e7e8ca403d" x="183" y="66" width="336" height="32" forecolor="#000000" backcolor="#FFFFFF"/>
-			</rectangle>
-			<staticText>
-				<reportElement uuid="b93194a9-4c71-4407-ba5e-ad7cec80f41c" x="183" y="66" width="336" height="32" forecolor="#000000"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="Arial" size="18" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Purchase Request (PR)
-]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="edbc84ec-4162-4ea6-be85-990b007bfa4a" x="456" y="124" width="62" height="72"/>
-				<textElement>
-					<font fontName="Arial" size="10" isBold="false" pdfEncoding="Cp1252" isPdfEmbedded="true"/>
-				</textElement>
-				<text><![CDATA[التاريخ:
-تاريخ الطلب:
-اسم الطالب:
-القسم:
-سعر التقدير:
-التوصيل الى:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="187587ae-ea97-4496-948d-bc4eedec09eb" x="456" y="104" width="50" height="20"/>
-				<textElement>
-					<font fontName="Arial" size="14" isBold="true" isPdfEmbedded="true"/>
-				</textElement>
-				<text><![CDATA[الرقم:]]></text>
-			</staticText>
-			<textField>
-				<reportElement uuid="557d8657-2a76-4007-8e1f-c23962e366a1" x="329" y="104" width="127" height="20"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{documentno}]]></textFieldExpression>
-			</textField>
-			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement uuid="9aa2f29e-2913-4a36-831c-8f4cefa255d4" x="329" y="124" width="127" height="12"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{datedoc}]]></textFieldExpression>
-			</textField>
-			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement uuid="378061f3-6445-4c31-9736-a862493647e8" x="329" y="136" width="127" height="12"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{daterequired}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="4dabac0b-f594-4124-8d65-b462fe2cc47f" x="329" y="148" width="127" height="12"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{requestername}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="87874a93-1fe9-4f7f-b4aa-f7cf7820c6fd" x="329" y="160" width="127" height="12"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{department}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="dba6924e-7d15-4840-b79c-f0923033c42b" x="329" y="184" width="127" height="12"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{deliverto}]]></textFieldExpression>
-			</textField>
-			<textField pattern="#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="85f23771-d9e6-42a1-9d97-90c2617683c1" x="329" y="172" width="127" height="12"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{totallines}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="288d4269-e9c6-47ed-bf4c-94bff4718b6e" x="0" y="124" width="232" height="72"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{description}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement uuid="cac0b756-b744-42c8-89ff-9779864709f5" x="0" y="104" width="112" height="20"/>
-				<textElement verticalAlignment="Middle">
-					<font isBold="true"/>
-				</textElement>
-				<text><![CDATA[Justification:]]></text>
-			</staticText>
-			<componentElement>
-				<reportElement uuid="2055affb-1068-41b4-9d64-48c987106fbc" x="17" y="200" width="200" height="28"/>
-				<jr:barbecue xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd" type="Code128" drawText="false" checksumRequired="false" evaluationTime="Report">
-					<jr:codeExpression><![CDATA[$F{documentno}]]></jr:codeExpression>
-				</jr:barbecue>
-			</componentElement>
-		</band>
-	</title>
-	<pageHeader>
-		<band height="96" splitType="Stretch">
-			<printWhenExpression><![CDATA[$V{PAGE_NUMBER} != 1]]></printWhenExpression>
-			<textField>
-				<reportElement uuid="557d8657-2a76-4007-8e1f-c23962e366a1" x="329" y="63" width="127" height="20"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle"/>
-				<textFieldExpression><![CDATA[$F{documentno}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement uuid="5faf863c-a519-4dd4-a188-ac422ef62fce" x="252" y="63" width="77" height="20"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font fontName="Arial" size="14" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Number:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="187587ae-ea97-4496-948d-bc4eedec09eb" x="456" y="63" width="50" height="20"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="Arial" size="14" isBold="true" isPdfEmbedded="true"/>
-				</textElement>
-				<text><![CDATA[الرقم:]]></text>
-			</staticText>
-		</band>
-	</pageHeader>
-	<columnHeader>
-		<band height="40">
-			<staticText>
-				<reportElement uuid="b3782001-2989-4172-b4bf-e6eac2be97ac" style="BoxedHeader" x="0" y="0" width="47" height="40"/>
-				<textElement/>
-				<text><![CDATA[Sl No]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="ede5b212-2567-49dc-b5aa-b453d497df59" style="BoxedHeader" x="47" y="0" width="81" height="40"/>
-				<textElement/>
-				<text><![CDATA[Product No]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="5a5b58b8-d9f2-4b4a-ab9d-f23cc1bba888" style="BoxedHeader" x="128" y="0" width="182" height="40"/>
-				<textElement/>
-				<text><![CDATA[Description]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="e4013810-1b24-444e-a301-d11d7710fac4" style="BoxedHeader" x="310" y="0" width="42" height="40"/>
-				<textElement/>
-				<text><![CDATA[Qty]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="8a8a035c-fc86-42e9-ae50-4b900d460e86" style="BoxedHeader" x="352" y="0" width="68" height="40"/>
-				<textElement/>
-				<text><![CDATA[UoM]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="44e13c3f-2a33-4bf6-99f4-4ca8c5b43538" style="BoxedHeader" x="420" y="0" width="100" height="40"/>
-				<textElement/>
-				<text><![CDATA[Line Total]]></text>
-			</staticText>
-		</band>
-	</columnHeader>
-	<detail>
-		<band height="20">
-			<textField>
-				<reportElement uuid="566c991c-b416-411d-a8c4-a5c7e3942a42" style="BoxedDetail" stretchType="RelativeToBandHeight" x="0" y="0" width="47" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{line}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="0c22ec8c-8ad3-4e86-b3da-0d63343f49da" style="BoxedDetail" stretchType="RelativeToBandHeight" x="47" y="0" width="81" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{productno}]]></textFieldExpression>
-			</textField>
-			<textField isStretchWithOverflow="true">
-				<reportElement uuid="3b41b69e-b698-423c-9b35-bf626713c92c" style="BoxedDetail" stretchType="RelativeToBandHeight" x="128" y="0" width="182" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{productname}]]></textFieldExpression>
-			</textField>
-			<textField pattern="###0">
-				<reportElement uuid="51193f35-f5c1-4f37-b5fe-3d21334e495e" style="BoxedDetail" stretchType="RelativeToBandHeight" x="310" y="0" width="42" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{qty}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="7c0edc58-b69f-4991-a5cc-65a78c5e384f" style="BoxedDetail" stretchType="RelativeToBandHeight" x="352" y="0" width="68" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{uomsymbol}]]></textFieldExpression>
-			</textField>
-			<textField pattern="#,##0.00">
-				<reportElement uuid="2e541b7a-23ca-4a05-9022-2e2830b60f59" style="BoxedDetail" stretchType="RelativeToBandHeight" x="420" y="0" width="100" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{linenetamt}]]></textFieldExpression>
-			</textField>
-		</band>
-	</detail>
-	<pageFooter>
-		<band height="78" splitType="Stretch">
-			<textField evaluationTime="Report">
-				<reportElement uuid="d40e242b-9c33-4d20-a9ad-6de6c47adb80" x="484" y="0" width="35" height="14"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="971104a9-7117-4ecf-a07f-82f191ee770f" x="0" y="0" width="100" height="14"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="6d1247c4-3eb9-48ec-8996-90db829a053b" x="404" y="0" width="80" height="14"/>
-				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA["Page "+$V{PAGE_NUMBER}+" of"]]></textFieldExpression>
-			</textField>
-		</band>
-	</pageFooter>
-	<lastPageFooter>
-		<band height="187">
-			<staticText>
-				<reportElement uuid="3398e14a-d21e-4b8e-90f7-43cb0a8ccce3" style="BoxedHeader" x="0" y="0" width="173" height="20"/>
-				<textElement/>
-				<text><![CDATA[Prepared By]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="d6f54e22-eec9-43fc-9ee6-c3f49c5b2545" style="BoxedHeader" x="173" y="0" width="173" height="20"/>
-				<textElement/>
-				<text><![CDATA[Reviewed By]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="1d47c62a-4903-440f-9b7c-a5050a7d4535" style="BoxedHeader" x="345" y="0" width="173" height="20"/>
-				<textElement/>
-				<text><![CDATA[Approved By]]></text>
-			</staticText>
-			<rectangle>
-				<reportElement uuid="19fb8338-89f6-4aed-9fe5-24a290d34c63" x="0" y="20" width="173" height="54"/>
-			</rectangle>
-			<rectangle>
-				<reportElement uuid="9ed7f145-7634-49db-9105-373ba093902a" x="173" y="20" width="172" height="54"/>
-			</rectangle>
-			<rectangle>
-				<reportElement uuid="2ff6928a-6bfb-47d1-8638-4173edfb300f" x="345" y="20" width="173" height="54"/>
-			</rectangle>
-			<rectangle>
-				<reportElement uuid="294c9025-896f-4bb5-86d3-c6640c1ea83b" x="345" y="74" width="173" height="20"/>
-			</rectangle>
-			<rectangle>
-				<reportElement uuid="908671ed-f9a7-4e72-a249-a6bb4ca5b3a2" x="173" y="74" width="172" height="20"/>
-			</rectangle>
-			<rectangle>
-				<reportElement uuid="c986af10-8f07-4442-b480-3b71c6f1c36e" x="0" y="74" width="173" height="20"/>
-			</rectangle>
-			<textField evaluationTime="Report">
-				<reportElement uuid="2102cdc1-3c12-47e7-b461-7ee9ea82d4db" x="485" y="109" width="35" height="14"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="5aeefb44-a674-4d2f-b62b-df9ec4027017" x="405" y="109" width="80" height="14"/>
-				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA["Page "+$V{PAGE_NUMBER}+" of"]]></textFieldExpression>
-			</textField>
-			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="96e58102-43bc-461c-a5cf-8eae0680df95" x="0" y="109" width="100" height="14"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
-			</textField>
-		</band>
-	</lastPageFooter>
-	<summary>
-		<band height="12">
-			<staticText>
-				<reportElement uuid="155168f8-f795-4781-8eaf-6d3444adf13f" x="73" y="0" width="373" height="12"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font isBold="true"/>
-				</textElement>
-				<text><![CDATA[**** End of List ****]]></text>
-			</staticText>
-		</band>
-	</summary>
-</jasperReport>
diff --git a/org.adempiere.report.jasper.library/resource/test/VoidedDN.jrxml b/org.adempiere.report.jasper.library/resource/test/VoidedDN.jrxml
deleted file mode 100644
index d558bbc594..0000000000
--- a/org.adempiere.report.jasper.library/resource/test/VoidedDN.jrxml
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="VoidedDN" language="groovy" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="766" leftMargin="38" rightMargin="38" topMargin="38" bottomMargin="38" isSummaryWithPageHeaderAndFooter="true" uuid="5b68a071-d552-43a8-8a9c-4842a004cb32">
-	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="0"/>
-	<style name="BoxedHeader" mode="Opaque" backcolor="#F0F0F0" hAlign="Center" vAlign="Middle" fontName="Arial" fontSize="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false">
-		<box leftPadding="1" rightPadding="1">
-			<pen lineWidth="1.0"/>
-			<topPen lineWidth="1.0"/>
-			<leftPen lineWidth="1.0"/>
-			<bottomPen lineWidth="1.0"/>
-			<rightPen lineWidth="1.0"/>
-		</box>
-	</style>
-	<style name="BoxedDetail" hAlign="Center" vAlign="Middle" isBlankWhenNull="true" fontName="Arial" fontSize="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false">
-		<box leftPadding="1" rightPadding="1">
-			<pen lineWidth="0.5"/>
-			<topPen lineWidth="0.5"/>
-			<leftPen lineWidth="0.5"/>
-			<bottomPen lineWidth="0.5"/>
-			<rightPen lineWidth="0.5"/>
-		</box>
-		<conditionalStyle>
-			<conditionExpression><![CDATA[$F{invoicenum}!=null]]></conditionExpression>
-			<style mode="Opaque" backcolor="#FF9090" isBlankWhenNull="true"/>
-		</conditionalStyle>
-	</style>
-	<style name="DottedBox" hAlign="Center" vAlign="Middle" fontName="Arial" fontSize="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false">
-		<box rightPadding="3">
-			<pen lineWidth="0.5" lineStyle="Dashed"/>
-			<topPen lineWidth="0.5" lineStyle="Dashed"/>
-			<leftPen lineWidth="0.5" lineStyle="Dashed"/>
-			<bottomPen lineWidth="0.5" lineStyle="Dashed"/>
-			<rightPen lineWidth="0.5" lineStyle="Dashed"/>
-		</box>
-	</style>
-	<style name="NormalText" isDefault="true" fontName="Arial" fontSize="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
-	<parameter name="AD_CLIENT_ID" class="java.lang.Integer" isForPrompting="false">
-		<defaultValueExpression><![CDATA[1000000]]></defaultValueExpression>
-	</parameter>
-	<parameter name="DATE_FROM" class="java.util.Date">
-		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
-	</parameter>
-	<parameter name="DATE_TO" class="java.util.Date">
-		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
-	</parameter>
-	<queryString>
-		<![CDATA[SELECT io.documentno, io.movementdate, io.updated, bp.name, bp.name2, p.value productvalue, iol.qtyentered, io.description, io.docstatus dnstatus,
-	i.documentno invoicenum, i.docstatus invoicestatus
-FROM  m_inout io
-INNER JOIN m_inoutline iol ON io.m_inout_id = iol.m_inout_id
-LEFT JOIN c_invoiceline il ON iol.m_inoutline_id = il.m_inoutline_id
-LEFT JOIN c_invoice i ON il.c_invoice_id = i.c_invoice_id
-LEFT JOIN c_bpartner bp ON io.c_Bpartner_Id = bp.C_BPartner_ID
-LEFT JOIN m_product p ON iol.m_product_id = p.m_product_id
-WHERE io.docstatus IN ('VO', 'RE')
-AND io.AD_CLIENT_ID = $P{AD_CLIENT_ID}
-AND io.movementdate BETWEEN $P{DATE_FROM} AND $P{DATE_TO}]]>
-	</queryString>
-	<field name="documentno" class="java.lang.String"/>
-	<field name="movementdate" class="java.sql.Timestamp"/>
-	<field name="updated" class="java.sql.Timestamp"/>
-	<field name="name" class="java.lang.String"/>
-	<field name="name2" class="java.lang.String"/>
-	<field name="productvalue" class="java.lang.String"/>
-	<field name="qtyentered" class="java.math.BigDecimal"/>
-	<field name="description" class="java.lang.String"/>
-	<field name="dnstatus" class="java.lang.String"/>
-	<field name="invoicenum" class="java.lang.String"/>
-	<field name="invoicestatus" class="java.lang.String"/>
-	<title>
-		<band height="97" splitType="Stretch">
-			<staticText>
-				<reportElement uuid="e9cb2c71-efff-43fe-9b1d-9e938fb0dd38" x="266" y="69" width="55" height="16"/>
-				<textElement textAlignment="Right"/>
-				<text><![CDATA[From Date:]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="2e207f4a-b02f-48df-8f92-17bfe0866968" x="124" y="49" width="519" height="20"/>
-				<textElement textAlignment="Center">
-					<font size="14" isBold="true"/>
-				</textElement>
-				<text><![CDATA[Voided/Reversed Delivery Notes]]></text>
-			</staticText>
-			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="6b1a0b3e-aa22-4494-a44d-db4c33c807f9" x="324" y="69" width="70" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$P{DATE_FROM}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement uuid="1ad5649b-bf29-4aed-9079-f128721b3f75" x="396" y="69" width="50" height="16"/>
-				<textElement textAlignment="Right"/>
-				<text><![CDATA[To Date:]]></text>
-			</staticText>
-			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="61eeb302-80bd-448a-9b1c-f7a16efe6722" x="448" y="69" width="70" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$P{DATE_TO}]]></textFieldExpression>
-			</textField>
-		</band>
-	</title>
-	<pageHeader>
-		<band height="64" splitType="Stretch">
-			<printWhenExpression><![CDATA[$V{PAGE_NUMBER} != 1]]></printWhenExpression>
-		</band>
-	</pageHeader>
-	<columnHeader>
-		<band height="40" splitType="Stretch">
-			<staticText>
-				<reportElement uuid="fa0a9fdc-a297-4d12-bc72-21716ecfc40d" style="BoxedHeader" x="0" y="0" width="70" height="40"/>
-				<textElement/>
-				<text><![CDATA[DN No]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="138a341d-3fca-4395-bb43-d6e242491fde" style="BoxedHeader" x="70" y="0" width="70" height="40"/>
-				<textElement/>
-				<text><![CDATA[DN Date]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="781d8435-88e1-4f64-9e51-247d1fe5179b" style="BoxedHeader" x="140" y="0" width="70" height="40"/>
-				<textElement/>
-				<text><![CDATA[Void Date]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="497dc179-abca-42e2-b7c1-c7136cd20af3" style="BoxedHeader" x="210" y="0" width="100" height="40"/>
-				<textElement/>
-				<text><![CDATA[Customer Name]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="b8e9e4c1-7549-46d3-a9c0-d940ca66a8b4" style="BoxedHeader" x="360" y="0" width="50" height="40"/>
-				<textElement/>
-				<text><![CDATA[Quantity]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="1110dc44-b88c-4e17-86d8-4c7002a0d1df" style="BoxedHeader" x="310" y="0" width="50" height="40"/>
-				<textElement/>
-				<text><![CDATA[Product Value]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="d7444f2a-78f8-4681-830f-075ce2bfee3c" style="BoxedHeader" x="410" y="0" width="70" height="40"/>
-				<textElement/>
-				<text><![CDATA[Invoice Number]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="51cdef60-c5de-4295-bdc5-cf80fd0941d9" style="BoxedHeader" x="480" y="0" width="286" height="40"/>
-				<textElement/>
-				<text><![CDATA[Void Reason]]></text>
-			</staticText>
-		</band>
-	</columnHeader>
-	<detail>
-		<band height="20" splitType="Stretch">
-			<textField isStretchWithOverflow="true">
-				<reportElement uuid="28e5f108-f94a-4f8f-9263-303801158761" style="BoxedDetail" stretchType="RelativeToTallestObject" x="0" y="0" width="70" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{documentno}]]></textFieldExpression>
-			</textField>
-			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="0c20f539-8068-4e8a-8496-f86b5e9945ba" style="BoxedDetail" stretchType="RelativeToTallestObject" x="70" y="0" width="70" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{movementdate}]]></textFieldExpression>
-			</textField>
-			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="2cb4c364-026d-478b-9d29-9c6aeeecc004" style="BoxedDetail" stretchType="RelativeToTallestObject" x="140" y="0" width="70" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{updated}]]></textFieldExpression>
-			</textField>
-			<textField isStretchWithOverflow="true">
-				<reportElement uuid="4de7a8fe-7760-49a6-87f7-09301c828828" style="BoxedDetail" stretchType="RelativeToTallestObject" x="210" y="0" width="100" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[($F{name2} == null ? $F{name} : $F{name2})]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="d718ef32-7bcc-463f-90f4-65fd8a27d5ba" style="BoxedDetail" stretchType="RelativeToTallestObject" x="310" y="0" width="50" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{productvalue}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="8a37a753-e308-48b8-a97a-dfac32771c86" style="BoxedDetail" stretchType="RelativeToTallestObject" x="360" y="0" width="50" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{qtyentered}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="db59a7ba-604f-4119-a3fb-1d908ec73cfe" style="BoxedDetail" stretchType="RelativeToTallestObject" x="410" y="0" width="70" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{invoicenum}]]></textFieldExpression>
-			</textField>
-			<textField isStretchWithOverflow="true">
-				<reportElement uuid="80b32326-cc7d-4e2f-b4f1-e81040b739eb" style="BoxedDetail" stretchType="RelativeToTallestObject" x="480" y="0" width="286" height="20"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[$F{description}]]></textFieldExpression>
-			</textField>
-		</band>
-	</detail>
-	<columnFooter>
-		<band height="31" splitType="Stretch"/>
-	</columnFooter>
-	<pageFooter>
-		<band height="77" splitType="Stretch">
-			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="0087af29-67de-403a-aa54-f7b3dbc5518e" x="0" y="0" width="100" height="14"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="0b03ab04-0716-4f8b-b757-2af195a2c26c" x="651" y="0" width="80" height="14"/>
-				<textElement textAlignment="Right"/>
-				<textFieldExpression><![CDATA["Page "+$V{PAGE_NUMBER}+" of"]]></textFieldExpression>
-			</textField>
-			<textField evaluationTime="Report">
-				<reportElement uuid="db258e74-b94c-40cc-8ed1-7a83013fa968" x="731" y="0" width="35" height="14"/>
-				<textElement/>
-				<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
-			</textField>
-		</band>
-	</pageFooter>
-	<summary>
-		<band height="105" splitType="Stretch">
-			<staticText>
-				<reportElement uuid="d5f2b64c-754f-48cc-b12c-09983ac4ee02" x="47" y="60" width="202" height="28"/>
-				<box>
-					<pen lineStyle="Dashed"/>
-					<topPen lineWidth="1.0" lineStyle="Dashed"/>
-					<leftPen lineStyle="Dashed"/>
-					<bottomPen lineStyle="Dashed"/>
-					<rightPen lineStyle="Dashed"/>
-				</box>
-				<textElement textAlignment="Center"/>
-				<text><![CDATA[Reviewed By]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="f89d2a93-cccb-4852-8aef-ef419fb64e01" x="510" y="60" width="202" height="28"/>
-				<box>
-					<pen lineStyle="Dashed"/>
-					<topPen lineWidth="1.0" lineStyle="Dashed"/>
-					<leftPen lineStyle="Dashed"/>
-					<bottomPen lineStyle="Dashed"/>
-					<rightPen lineStyle="Dashed"/>
-				</box>
-				<textElement textAlignment="Center"/>
-				<text><![CDATA[Approved By]]></text>
-			</staticText>
-		</band>
-	</summary>
-</jasperReport>
diff --git a/org.adempiere.report.jasper/src/org/adempiere/report/jasper/ReportStarter.java b/org.adempiere.report.jasper/src/org/adempiere/report/jasper/ReportStarter.java
index 5e7840195f..670166f218 100644
--- a/org.adempiere.report.jasper/src/org/adempiere/report/jasper/ReportStarter.java
+++ b/org.adempiere.report.jasper/src/org/adempiere/report/jasper/ReportStarter.java
@@ -85,6 +85,7 @@ import net.sf.jasperreports.export.SimplePrintServiceExporterConfiguration;
 import net.sf.jasperreports.export.SimpleTextExporterConfiguration;
 import net.sf.jasperreports.export.SimpleWriterExporterOutput;
 import net.sf.jasperreports.export.SimpleXlsExporterConfiguration;
+import net.sf.jasperreports.export.SimpleXmlExporterOutput;
 
 import org.adempiere.base.Service;
 import org.adempiere.exceptions.AdempiereException;
@@ -741,7 +742,7 @@ public class ReportStarter implements ProcessCall, ClientProcess
             				JRXmlExporter export = new JRXmlExporter(jasperContext);
             				SimpleExporterConfiguration config = new SimpleExporterConfiguration();
             				export.setConfiguration(config);
-            				export.setExporterOutput(new SimpleWriterExporterOutput(strm));
+            				export.setExporterOutput(new SimpleXmlExporterOutput(strm));
             				exporter = export;
             			} else if (ext.equals("csv") || ext.equals("ssv") ) {
             				JRCsvExporter export = new JRCsvExporter(jasperContext);
diff --git a/org.adempiere.server-feature/server.product.eventtest.launch b/org.adempiere.server-feature/server.product.eventtest.launch
index 5fa163f036..7b4b4c5c5f 100644
--- a/org.adempiere.server-feature/server.product.eventtest.launch
+++ b/org.adempiere.server-feature/server.product.eventtest.launch
@@ -23,7 +23,7 @@
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
 <stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
 <stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.annotation@default:default,javax.ejb@default:default,javax.inject@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.persistence@default:default,javax.transaction@default:false,javax.websocket-api@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.aries.spifly.dynamic.bundle@2:true,org.apache.aries.util@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.extension@default:default,org.apache.batik.parser@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.batik.xml@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime@4:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.annotations@default:default,org.eclipse.jetty.apache-jsp@3:true,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.osgi.httpservice@default:default,org.eclipse.jetty.plus@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.jetty.util.ajax@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:default,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.mortbay.jasper.apache-el@default:default,org.mortbay.jasper.apache-jsp@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.restlet.ext.servlet@default:default,org.restlet@4:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.eclipse.equinox.http.servlet@default:true,org.adempiere.eclipse.equinox.http.servletbridge@default:true,org.adempiere.eclipse.equinox.servletbridge@default:true,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:default,org.adempiere.server@4:true,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:false,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:false,org.w3c.dom.fragment@default:false"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.eclipse.equinox.http.servlet@default:true,org.adempiere.eclipse.equinox.http.servletbridge@default:true,org.adempiere.eclipse.equinox.servletbridge@default:true,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:default,org.adempiere.server@4:true,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:false,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/org.adempiere.server-feature/server.product.functionaltest.launch b/org.adempiere.server-feature/server.product.functionaltest.launch
index 4c8b4657a2..a5703955dc 100644
--- a/org.adempiere.server-feature/server.product.functionaltest.launch
+++ b/org.adempiere.server-feature/server.product.functionaltest.launch
@@ -23,7 +23,7 @@
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
 <stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
 <stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.annotation@default:default,javax.ejb@default:default,javax.inject@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.persistence@default:default,javax.transaction@default:false,javax.websocket-api@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.aries.spifly.dynamic.bundle@2:true,org.apache.aries.util@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.extension@default:default,org.apache.batik.parser@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.batik.xml@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@2:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.felix.webconsole@default:true,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime@4:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@2:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.metatype@2:true,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.annotations@default:default,org.eclipse.jetty.apache-jsp@3:true,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.osgi.httpservice@default:true,org.eclipse.jetty.plus@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.jetty.util.ajax@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:true,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.json@default:default,org.junit@default:default,org.mortbay.jasper.apache-el@default:default,org.mortbay.jasper.apache-jsp@default:default,org.objectweb.asm.commons@default:true,org.objectweb.asm.tree@default:true,org.objectweb.asm@default:true,org.restlet.ext.servlet@default:default,org.restlet@4:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.eclipse.equinox.http.servlet@default:true,org.adempiere.eclipse.equinox.http.servletbridge@default:true,org.adempiere.eclipse.equinox.servletbridge@default:true,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:default,org.adempiere.server@4:true,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:false,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.felix.webconsole@default:true,org.idempiere.fitnesse.fixture@default:true,org.idempiere.fitnesse.server@default:true,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.ui.zk.selenium@default:true,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:false,org.w3c.dom.fragment@default:false,org.zkoss.zk.library@default:true"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.eclipse.equinox.http.servlet@default:true,org.adempiere.eclipse.equinox.http.servletbridge@default:true,org.adempiere.eclipse.equinox.servletbridge@default:true,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:default,org.adempiere.server@4:true,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:false,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.felix.webconsole@default:true,org.idempiere.fitnesse.fixture@default:true,org.idempiere.fitnesse.server@default:true,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.ui.zk.selenium@default:true,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:false,org.zkoss.zk.library@default:true"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index deb3559e23..ad89995a22 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -25,7 +25,7 @@
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
 <stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
 <stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.persistence@default:default,javax.transaction@default:false,javax.websocket-api@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.aries.spifly.dynamic.bundle@2:true,org.apache.aries.util@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.extension@default:default,org.apache.batik.parser@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.batik.xml@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.fileupload@default:default,org.apache.commons.io@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.felix.webconsole@default:true,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime@4:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@2:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.metatype@2:true,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.annotations@default:default,org.eclipse.jetty.apache-jsp@3:true,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.osgi.httpservice@default:false,org.eclipse.jetty.plus@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.jetty.util.ajax@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:true,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.json@default:default,org.junit@default:default,org.mortbay.jasper.apache-el@default:default,org.mortbay.jasper.apache-jsp@default:default,org.objectweb.asm.commons@default:true,org.objectweb.asm.tree@default:true,org.objectweb.asm@default:true,org.restlet.ext.servlet@default:default,org.restlet@4:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default,zcommon@default:default,zel@default:default,zhtml@default:default,zjavassist@default:default,zk@default:default,zkbind@default:default,zkplus@default:default,zul@default:default,zweb@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.eclipse.equinox.http.servlet@default:default,org.adempiere.eclipse.equinox.http.servletbridge@default:default,org.adempiere.eclipse.equinox.servletbridge@default:default,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:true,org.adempiere.pipo@default:true,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:true,org.adempiere.server@4:true,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:false,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.felix.webconsole@default:true,org.idempiere.fitnesse.fixture@default:default,org.idempiere.fitnesse.server@default:default,org.idempiere.fitrecorder@default:default,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.webservices@5:true,org.idempiere.zk.extra@default:default,org.slf4j.jdk14@default:false,org.w3c.dom.fragment@default:false"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.eclipse.equinox.http.servlet@default:default,org.adempiere.eclipse.equinox.http.servletbridge@default:default,org.adempiere.eclipse.equinox.servletbridge@default:default,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:true,org.adempiere.pipo@default:true,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:true,org.adempiere.server@4:true,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:false,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.felix.webconsole@default:true,org.idempiere.fitnesse.fixture@default:default,org.idempiere.fitnesse.server@default:default,org.idempiere.fitrecorder@default:default,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.webservices@5:true,org.idempiere.zk.extra@default:default,org.slf4j.jdk14@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/org.adempiere.ui.swing-feature/swingclient.product.launch b/org.adempiere.ui.swing-feature/swingclient.product.launch
index 19b17453fe..d68504eb00 100644
--- a/org.adempiere.ui.swing-feature/swingclient.product.launch
+++ b/org.adempiere.ui.swing-feature/swingclient.product.launch
@@ -23,7 +23,7 @@
 <stringAttribute key="product" value="org.adempiere.ui.swing.client_product"/>
 <stringAttribute key="productFile" value="/org.adempiere.ui.swing-feature/swingclient.product"/>
 <stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.extension@default:default,org.apache.batik.parser@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.batik.xml@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:default,org.eclipse.osgi.compatibility.state@default:default,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.restlet.ext.net@default:true,org.restlet.ext.servlet@default:default,org.restlet.ext.ssl@default:default,org.restlet@default:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.swing@default:default,org.adempiere.report.jasper@default:default,org.adempiere.ui.swing@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:default,org.w3c.dom.fragment@default:false"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.swing@default:default,org.adempiere.report.jasper@default:default,org.adempiere.ui.swing@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>

From 99e4596159dc058b96e351cb0b93bfc6fa35c7c2 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Fri, 8 Jul 2016 11:55:07 +0700
Subject: [PATCH 18/34] IDEMPIERE-3136:all stuff relate library of idempiere
 correct, add some common bundle

---
 org.adempiere.base-feature/feature.xml        | 45 ++++++++++++++++---
 .../feature.xml                               |  4 +-
 2 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml
index cfec87d152..5e83b1a700 100644
--- a/org.adempiere.base-feature/feature.xml
+++ b/org.adempiere.base-feature/feature.xml
@@ -286,6 +286,13 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="bcpkix"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
    <plugin
          id="org.cryptacular"
          download-size="0"
@@ -314,13 +321,6 @@
          version="0.0.0"
          unpack="false"/>
          
-   <plugin
-         id="org.apache.commons.logging"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-         
    <plugin
          id="groovy-all"
          download-size="0"
@@ -371,4 +371,35 @@
          fragment="true"
          unpack="false"/>
 
+   <plugin
+         id="org.apache.commons.collections4"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.commons.configuration"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+         
+   <plugin
+         id="org.apache.commons.net"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.xalan"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
 </feature>
diff --git a/org.idempiere.eclipse.platform-feature/feature.xml b/org.idempiere.eclipse.platform-feature/feature.xml
index f0b018d856..6a9b7ed801 100644
--- a/org.idempiere.eclipse.platform-feature/feature.xml
+++ b/org.idempiere.eclipse.platform-feature/feature.xml
@@ -138,14 +138,14 @@
          unpack="false"/>
 
    <plugin
-         id="org.apache.httpcomponents.httpclient.source"
+         id="org.apache.httpcomponents.httpclient"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.apache.httpcomponents.httpcore.source"
+         id="org.apache.httpcomponents.httpcore"
          download-size="0"
          install-size="0"
          version="0.0.0"

From 91c52aeded38b9ccc91d4d75b310d3b32f2de72d Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Fri, 8 Jul 2016 15:40:24 +0700
Subject: [PATCH 19/34] IDEMPIERE-3136:all stuff relate library of idempiere
 update jetty to 9.3.10

---
 org.adempiere.install/build.xml               |  14 +-
 org.adempiere.server-feature/build.xml        |   4 +
 .../jettyhome/etc/jetty-alpn.xml              |  31 +
 .../jettyhome/etc/jetty-deployer.xml          |  55 +-
 .../jettyhome/etc/jetty-http-template.xml     |  51 ++
 .../jettyhome/etc/jetty-http2.xml             |  39 ++
 .../jettyhome/etc/jetty-https.xml             |   9 +-
 .../jettyhome/etc/jetty-plus.xml              |  25 +
 .../etc/jetty-ssl-context-template.xml        | 310 ++++++++++
 .../jettyhome/etc/jetty-ssl-template.xml      |  60 +-
 .../jettyhome/etc/jetty-template.xml          | 170 ++++--
 .../jettyhome/etc/webdefault.xml              | 533 ++++++++++++++++++
 12 files changed, 1180 insertions(+), 121 deletions(-)
 create mode 100644 org.adempiere.server-feature/jettyhome/etc/jetty-alpn.xml
 create mode 100644 org.adempiere.server-feature/jettyhome/etc/jetty-http-template.xml
 create mode 100644 org.adempiere.server-feature/jettyhome/etc/jetty-http2.xml
 create mode 100644 org.adempiere.server-feature/jettyhome/etc/jetty-plus.xml
 create mode 100644 org.adempiere.server-feature/jettyhome/etc/jetty-ssl-context-template.xml
 create mode 100644 org.adempiere.server-feature/jettyhome/etc/webdefault.xml

diff --git a/org.adempiere.install/build.xml b/org.adempiere.install/build.xml
index 2bc738f9d9..590cd9886f 100644
--- a/org.adempiere.install/build.xml
+++ b/org.adempiere.install/build.xml
@@ -30,13 +30,21 @@
 		<copy file="../org.adempiere.server-feature/jettyhome/etc/jetty-template.xml"
 			tofile="../jettyhome/etc/jetty.xml" filtering="yes" overwrite="yes"/>
 		<copy file="../org.adempiere.server-feature/jettyhome/etc/jetty-ssl-template.xml"
-					tofile="../jettyhome/etc/jetty-ssl.xml" filtering="yes" overwrite="yes"/>
-		<copy file="../org.adempiere.server-feature/jettyhome/etc/jetty-selector-template.xml"
-					tofile="../jettyhome/etc/jetty-selector.xml" filtering="yes" overwrite="yes"/>
+					tofile="../jettyhome/etc/jetty-ssl.xml" filtering="yes" overwrite="yes"/>								
 		<copy file="../org.adempiere.server-feature/jettyhome/etc/jetty-deployer.xml"
 					tofile="../jettyhome/etc/jetty-deployer.xml" filtering="no" overwrite="yes"/>
 		<copy file="../org.adempiere.server-feature/jettyhome/etc/jetty-https.xml"
 					tofile="../jettyhome/etc/jetty-https.xml" filtering="no" overwrite="yes"/>
+		<copy file="../org.adempiere.server-feature/jettyhome/etc/jetty-ssl-context-template.xml"
+					tofile="../jettyhome/etc/jetty-ssl-context.xml" filtering="yes" overwrite="yes"/>
+		<copy file="../org.adempiere.server-feature/jettyhome/etc/jetty-http-template.xml"
+					tofile="../jettyhome/etc/jetty-http.xml" filtering="yes" overwrite="yes"/>
+		<copy file="../org.adempiere.server-feature/jettyhome/etc/jetty-alpn.xml"
+					tofile="../jettyhome/etc/jetty-alpn.xml" filtering="no" overwrite="yes"/>
+		<copy file="../org.adempiere.server-feature/jettyhome/etc/jetty-http2.xml"
+					tofile="../jettyhome/etc/jetty-http2.xml" filtering="no" overwrite="yes"/>
+		<copy file="../org.adempiere.server-feature/jettyhome/etc/jetty-plus.xml"
+					tofile="../jettyhome/etc/jetty-plus.xml" filtering="no" overwrite="yes"/>
 		<copy file="../org.adempiere.server-feature/hazelcast-template.xml"
 					tofile="../hazelcast.xml" filtering="yes" overwrite="yes"/>
 	</target>
diff --git a/org.adempiere.server-feature/build.xml b/org.adempiere.server-feature/build.xml
index bad2bc0cb3..4e9b23445a 100644
--- a/org.adempiere.server-feature/build.xml
+++ b/org.adempiere.server-feature/build.xml
@@ -45,6 +45,10 @@
 					tofile="jettyhome/etc/jetty-ssl.xml" filtering="yes" overwrite="yes"/>
 		<copy file="jettyhome/etc/jetty-selector-template.xml"
 					tofile="jettyhome/etc/jetty-selector.xml" filtering="yes" overwrite="yes"/>
+		<copy file="jettyhome/etc/jetty-ssl-context-template.xml"
+							tofile="jettyhome/etc/jetty-ssl-context.xml" filtering="yes" overwrite="yes"/>		
+		<copy file="jettyhome/etc/jetty-http-template.xml"
+							tofile="jettyhome/etc/jetty-http.xml" filtering="yes" overwrite="yes"/>
 		<copy file="hazelcast-template.xml"
 							tofile="hazelcast.xml" filtering="yes" overwrite="yes"/>
 
diff --git a/org.adempiere.server-feature/jettyhome/etc/jetty-alpn.xml b/org.adempiere.server-feature/jettyhome/etc/jetty-alpn.xml
new file mode 100644
index 0000000000..44030bd07e
--- /dev/null
+++ b/org.adempiere.server-feature/jettyhome/etc/jetty-alpn.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
+
+  <Call name="addConnectionFactory">
+    <Arg>
+      <New class="org.eclipse.jetty.server.SslConnectionFactory">
+        <Arg name="next">alpn</Arg>
+        <Arg name="sslContextFactory"><Ref refid="sslContextFactory"/></Arg>
+      </New>
+    </Arg>
+  </Call>
+  
+  <Call name="addConnectionFactory">
+    <Arg>
+      <New id="alpn" class="org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory">
+        <Arg type="String">
+          <Property name="jetty.alpn.protocols" deprecated="alpn.protocols" default="" />
+        </Arg>
+        <Set name="defaultProtocol">
+          <Property name="jetty.alpn.defaultProtocol" deprecated="alpn.defaultProtocol" />
+        </Set>
+      </New>
+    </Arg>
+  </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>
diff --git a/org.adempiere.server-feature/jettyhome/etc/jetty-deployer.xml b/org.adempiere.server-feature/jettyhome/etc/jetty-deployer.xml
index b03a648e3d..158fb45190 100644
--- a/org.adempiere.server-feature/jettyhome/etc/jetty-deployer.xml
+++ b/org.adempiere.server-feature/jettyhome/etc/jetty-deployer.xml
@@ -1,23 +1,42 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
+<!-- =============================================================== -->
+<!-- Create the deployment manager                                   -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- The deplyment manager handles the lifecycle of deploying web    -->
+<!-- applications. Apps are provided by instances of the             -->
+<!-- AppProvider interface.                                          -->
+<!-- =============================================================== -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
-    <!-- =========================================================== -->
-    <!-- Configure the deployment manager                            -->
-    <!-- =========================================================== -->
-    <Call name="addBean">
-      <Arg>
-        <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
-          <Set name="contexts">
-            <Ref refid="Contexts" />
-          </Set>
-          <Call name="setContextAttribute">
-            <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
-            <Arg>.*/jsp-api-[^/]*\.jar$|.*/jsp-[^/]*\.jar$</Arg>
-          </Call>
-        </New>
-      </Arg>
-    </Call>
+  <Call name="addBean">
+    <Arg>
+      <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
+        <Set name="contexts">
+          <Ref refid="Contexts" />
+        </Set>
+        <Call name="setContextAttribute">
+          <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
+          <Arg>.*/[^/]*servlet-api-[^/]*\.jar$|.*/javax.servlet.jsp.jstl-.*\.jar$|.*/org.apache.taglibs.taglibs-standard-impl-.*\.jar$</Arg>
+        </Call>
 
-</Configure>
+        <!-- Add a customize step to the deployment lifecycle -->
+        <!-- uncomment and replace DebugBinding with your extended AppLifeCycle.Binding class
+        <Call name="insertLifeCycleNode">
+          <Arg>deployed</Arg>
+          <Arg>starting</Arg>
+          <Arg>customise</Arg>
+        </Call>
+        <Call name="addLifeCycleBinding">
+          <Arg>
+            <New class="org.eclipse.jetty.deploy.bindings.DebugBinding">
+              <Arg>customise</Arg>
+            </New>
+          </Arg>
+        </Call> -->
+        
+      </New>
+    </Arg>
+  </Call>
+</Configure>
\ No newline at end of file
diff --git a/org.adempiere.server-feature/jettyhome/etc/jetty-http-template.xml b/org.adempiere.server-feature/jettyhome/etc/jetty-http-template.xml
new file mode 100644
index 0000000000..476b0f0b86
--- /dev/null
+++ b/org.adempiere.server-feature/jettyhome/etc/jetty-http-template.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<!-- ============================================================= -->
+<!-- Configure the Jetty Server instance with an ID "Server"       -->
+<!-- by adding a HTTP connector.                                   -->
+<!-- This configuration must be used in conjunction with jetty.xml -->
+<!-- ============================================================= -->
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+
+  <!-- =========================================================== -->
+  <!-- Add a HTTP Connector.                                       -->
+  <!-- Configure an o.e.j.server.ServerConnector with a single     -->
+  <!-- HttpConnectionFactory instance using the common httpConfig  -->
+  <!-- instance defined in jetty.xml                               -->
+  <!--                                                             -->
+  <!-- Consult the javadoc of o.e.j.server.ServerConnector and     -->
+  <!-- o.e.j.server.HttpConnectionFactory for all configuration    -->
+  <!-- that may be set here.                                       -->
+  <!-- =========================================================== -->
+  <Call name="addConnector">
+    <Arg>
+      <New id="httpConnector" class="org.eclipse.jetty.server.ServerConnector">
+        <Arg name="server"><Ref refid="Server" /></Arg>
+        <Arg name="acceptors" type="int"><Property name="jetty.http.acceptors" deprecated="http.acceptors" default="-1"/></Arg>
+        <Arg name="selectors" type="int"><Property name="jetty.http.selectors" deprecated="http.selectors" default="-1"/></Arg>
+        <Arg name="factories">
+          <Array type="org.eclipse.jetty.server.ConnectionFactory">
+            <Item>
+              <New class="org.eclipse.jetty.server.HttpConnectionFactory">
+                <Arg name="config"><Ref refid="httpConfig" /></Arg>
+              </New>
+            </Item>
+            <Item>
+              <New class="org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory">
+                <Arg name="config"><Ref refid="httpConfig" /></Arg>
+              </New>
+            </Item>
+          </Array>
+        </Arg>
+        <Set name="host"><Property name="jetty.http.host" deprecated="jetty.host" default="@ADEMPIERE_APPS_SERVER@"/></Set>
+        <Set name="port"><Property name="jetty.http.port" deprecated="jetty.port" default="@ADEMPIERE_WEB_PORT@" /></Set>
+        <Set name="idleTimeout"><Property name="jetty.http.idleTimeout" deprecated="http.timeout" default="123000"/></Set>
+        <Set name="soLingerTime"><Property name="jetty.http.soLingerTime" deprecated="http.soLingerTime" default="-1"/></Set>
+        <Set name="acceptorPriorityDelta"><Property name="jetty.http.acceptorPriorityDelta" deprecated="http.acceptorPriorityDelta" default="0"/></Set>
+        <Set name="acceptQueueSize"><Property name="jetty.http.acceptQueueSize" deprecated="http.acceptQueueSize" default="0"/></Set>
+      </New>
+    </Arg>
+  </Call>
+
+</Configure>
\ No newline at end of file
diff --git a/org.adempiere.server-feature/jettyhome/etc/jetty-http2.xml b/org.adempiere.server-feature/jettyhome/etc/jetty-http2.xml
new file mode 100644
index 0000000000..1785854c38
--- /dev/null
+++ b/org.adempiere.server-feature/jettyhome/etc/jetty-http2.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<!-- ============================================================= -->
+<!-- Configure a HTTP2 on the ssl connector.                       -->
+<!-- ============================================================= -->
+<Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
+  <Call name="addConnectionFactory">
+    <Arg>
+      <New class="org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory">
+        <Arg name="config"><Ref refid="sslHttpConfig"/></Arg>
+        <Set name="maxConcurrentStreams"><Property name="jetty.http2.maxConcurrentStreams" deprecated="http2.maxConcurrentStreams" default="1024"/></Set>
+        <Set name="initialStreamSendWindow"><Property name="jetty.http2.initialStreamSendWindow" default="65535"/></Set>
+      </New>
+    </Arg>
+  </Call>
+
+  <Ref refid="sslContextFactory">
+    <Set name="CipherComparator">
+      <Get class="org.eclipse.jetty.http2.HTTP2Cipher" name="COMPARATOR"/>
+    </Set>
+    <Set name="useCipherSuitesOrder">true</Set>
+  </Ref>
+
+  
+  <!-- remove http/1.1 from first list and push in end list -->
+  <Call name="removeConnectionFactory">
+    <Arg name="config">http/1.1</Arg>
+  </Call>
+  
+  <Call name="addConnectionFactory">
+    <Arg>
+      <New class="org.eclipse.jetty.server.HttpConnectionFactory">
+        <Arg name="config"><Ref refid="sslHttpConfig" /></Arg>
+      </New>
+    </Arg>
+  </Call>
+  
+</Configure>
diff --git a/org.adempiere.server-feature/jettyhome/etc/jetty-https.xml b/org.adempiere.server-feature/jettyhome/etc/jetty-https.xml
index ad838cb864..43b93ca1f5 100644
--- a/org.adempiere.server-feature/jettyhome/etc/jetty-https.xml
+++ b/org.adempiere.server-feature/jettyhome/etc/jetty-https.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
 <!-- ============================================================= -->
 <!-- Configure a HTTPS connector.                                  -->
@@ -8,7 +8,7 @@
 <!-- ============================================================= -->
 <Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
 
-  <Call name="addConnectionFactory">
+  <Call name="addIfAbsentConnectionFactory">
     <Arg>
       <New class="org.eclipse.jetty.server.SslConnectionFactory">
         <Arg name="next">http/1.1</Arg>
@@ -16,7 +16,7 @@
       </New>
     </Arg>
   </Call>
-
+  
   <Call name="addConnectionFactory">
     <Arg>
       <New class="org.eclipse.jetty.server.HttpConnectionFactory">
@@ -24,5 +24,4 @@
       </New>
     </Arg>
   </Call>
-  
-</Configure>
+</Configure>
\ No newline at end of file
diff --git a/org.adempiere.server-feature/jettyhome/etc/jetty-plus.xml b/org.adempiere.server-feature/jettyhome/etc/jetty-plus.xml
new file mode 100644
index 0000000000..8fb78af58f
--- /dev/null
+++ b/org.adempiere.server-feature/jettyhome/etc/jetty-plus.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<!-- =============================================================== -->
+<!-- Configure extended support for webapps                          -->
+<!-- =============================================================== -->
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+
+  <!-- =========================================================== -->
+  <!-- Add plus Configuring classes to all webapps for this Server -->
+  <!-- =========================================================== -->
+  <Call class="org.eclipse.jetty.webapp.Configuration$ClassList" name="setServerDefault">
+    <Arg><Ref refid="Server" /></Arg>
+    <Call name="addAfter">
+      <Arg name="afterClass">org.eclipse.jetty.webapp.FragmentConfiguration</Arg>
+      <Arg>
+        <Array type="String">
+          <Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item>
+          <Item>org.eclipse.jetty.plus.webapp.PlusConfiguration</Item>
+        </Array>
+      </Arg>
+    </Call>
+  </Call>
+
+</Configure>
diff --git a/org.adempiere.server-feature/jettyhome/etc/jetty-ssl-context-template.xml b/org.adempiere.server-feature/jettyhome/etc/jetty-ssl-context-template.xml
new file mode 100644
index 0000000000..9a1ff81daa
--- /dev/null
+++ b/org.adempiere.server-feature/jettyhome/etc/jetty-ssl-context-template.xml
@@ -0,0 +1,310 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<!-- ============================================================= -->
+<!-- SSL ContextFactory configuration                              -->
+<!-- ============================================================= -->
+<Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
+  <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="KeyStoreType"><Property name="jetty.sslContext.keyStoreType" default="JKS"/></Set>
+  <Set name="KeyStoreProvider"><Property name="jetty.sslContext.keyStoreProvider"/></Set>
+  <Set name="KeyManagerPassword"><Property name="jetty.sslContext.keyManagerPassword" deprecated="jetty.keymanager.password" default="@ADEMPIERE_KEYSTOREPASS@"/></Set>
+  <Set name="TrustStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.trustStorePath" deprecated="jetty.truststore" default="etc/keystore"/></Set>
+  <Set name="TrustStorePassword"><Property name="jetty.sslContext.trustStorePassword" deprecated="jetty.truststore.password"/></Set>
+  <Set name="TrustStoreType"><Property name="jetty.sslContext.trustStoreType"/></Set>
+  <Set name="TrustStoreProvider"><Property name="jetty.sslContext.trustStoreProvider"/></Set>
+  <Set name="EndpointIdentificationAlgorithm"></Set>
+  <Set name="NeedClientAuth"><Property name="jetty.sslContext.needClientAuth" deprecated="jetty.ssl.needClientAuth" default="false"/></Set>
+  <Set name="WantClientAuth"><Property name="jetty.sslContext.wantClientAuth" deprecated="jetty.ssl.wantClientAuth" default="false"/></Set>
+  <Set name="renegotiationAllowed">FALSE</Set>
+  <Set name="ExcludeCipherSuites">
+   <Array type="String">
+    <Item>TLS_NULL_WITH_NULL_NULL</Item>
+    <Item>TLS_RSA_WITH_NULL_MD5</Item>
+    <Item>TLS_RSA_WITH_NULL_SHA</Item>
+    <Item>TLS_RSA_EXPORT_WITH_RC4_40_MD5</Item>
+    <Item>TLS_RSA_WITH_RC4_128_MD5</Item>
+    <Item>TLS_RSA_WITH_RC4_128_SHA</Item>
+    <Item>TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5</Item>
+    <Item>TLS_RSA_WITH_IDEA_CBC_SHA</Item>
+    <Item>TLS_RSA_EXPORT_WITH_DES40_CBC_SHA</Item>
+    <Item>TLS_RSA_WITH_DES_CBC_SHA</Item>
+    <Item>TLS_RSA_WITH_3DES_EDE_CBC_SHA</Item>
+    <Item>TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA</Item>
+    <Item>TLS_DH_DSS_WITH_DES_CBC_SHA</Item>
+    <Item>TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA</Item>
+    <Item>TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA</Item>
+    <Item>TLS_DH_RSA_WITH_DES_CBC_SHA</Item>
+    <Item>TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA</Item>
+    <Item>TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA</Item>
+    <Item>TLS_DHE_DSS_WITH_DES_CBC_SHA</Item>
+    <Item>TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA</Item>
+    <Item>TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA</Item>
+    <Item>TLS_DHE_RSA_WITH_DES_CBC_SHA</Item>
+    <Item>TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA</Item>
+    <Item>TLS_DH_anon_EXPORT_WITH_RC4_40_MD5</Item>
+    <Item>TLS_DH_anon_WITH_RC4_128_MD5</Item>
+    <Item>TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA</Item>
+    <Item>TLS_DH_anon_WITH_DES_CBC_SHA</Item>
+    <Item>TLS_DH_anon_WITH_3DES_EDE_CBC_SHA</Item>
+    <Item>TLS_KRB5_WITH_DES_CBC_SHA</Item>
+    <Item>TLS_KRB5_WITH_3DES_EDE_CBC_SHA</Item>
+    <Item>TLS_KRB5_WITH_RC4_128_SHA</Item>
+    <Item>TLS_KRB5_WITH_IDEA_CBC_SHA</Item>
+    <Item>TLS_KRB5_WITH_DES_CBC_MD5</Item>
+    <Item>TLS_KRB5_WITH_3DES_EDE_CBC_MD5</Item>
+    <Item>TLS_KRB5_WITH_RC4_128_MD5</Item>
+    <Item>TLS_KRB5_WITH_IDEA_CBC_MD5</Item>
+    <Item>TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA</Item>
+    <Item>TLS_KRB5_EXPORT_WITH_RC2_CBC_40_SHA</Item>
+    <Item>TLS_KRB5_EXPORT_WITH_RC4_40_SHA</Item>
+    <Item>TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5</Item>
+    <Item>TLS_KRB5_EXPORT_WITH_RC2_CBC_40_MD5</Item>
+    <Item>TLS_KRB5_EXPORT_WITH_RC4_40_MD5</Item>
+    <Item>TLS_PSK_WITH_NULL_SHA</Item>
+    <Item>TLS_DHE_PSK_WITH_NULL_SHA</Item>
+    <Item>TLS_RSA_PSK_WITH_NULL_SHA</Item>
+    <Item>TLS_RSA_WITH_AES_128_CBC_SHA</Item>
+    <Item>TLS_DH_DSS_WITH_AES_128_CBC_SHA</Item>
+    <Item>TLS_DH_RSA_WITH_AES_128_CBC_SHA</Item>
+    <Item>TLS_DHE_DSS_WITH_AES_128_CBC_SHA</Item>
+    <Item>TLS_DHE_RSA_WITH_AES_128_CBC_SHA</Item>
+    <Item>TLS_DH_anon_WITH_AES_128_CBC_SHA</Item>
+    <Item>TLS_RSA_WITH_AES_256_CBC_SHA</Item>
+    <Item>TLS_DH_DSS_WITH_AES_256_CBC_SHA</Item>
+    <Item>TLS_DH_RSA_WITH_AES_256_CBC_SHA</Item>
+    <Item>TLS_DHE_DSS_WITH_AES_256_CBC_SHA</Item>
+    <Item>TLS_DHE_RSA_WITH_AES_256_CBC_SHA</Item>
+    <Item>TLS_DH_anon_WITH_AES_256_CBC_SHA</Item>
+    <Item>TLS_RSA_WITH_NULL_SHA256</Item>
+    <Item>TLS_RSA_WITH_AES_128_CBC_SHA256</Item>
+    <Item>TLS_RSA_WITH_AES_256_CBC_SHA256</Item>
+    <Item>TLS_DH_DSS_WITH_AES_128_CBC_SHA256</Item>
+    <Item>TLS_DH_RSA_WITH_AES_128_CBC_SHA256</Item>
+    <Item>TLS_DHE_DSS_WITH_AES_128_CBC_SHA256</Item>
+    <Item>TLS_RSA_WITH_CAMELLIA_128_CBC_SHA</Item>
+    <Item>TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA</Item>
+    <Item>TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA</Item>
+    <Item>TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA</Item>
+    <Item>TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA</Item>
+    <Item>TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA</Item>
+    <Item>TLS_DHE_RSA_WITH_AES_128_CBC_SHA256</Item>
+    <Item>TLS_DH_DSS_WITH_AES_256_CBC_SHA256</Item>
+    <Item>TLS_DH_RSA_WITH_AES_256_CBC_SHA256</Item>
+    <Item>TLS_DHE_DSS_WITH_AES_256_CBC_SHA256</Item>
+    <Item>TLS_DHE_RSA_WITH_AES_256_CBC_SHA256</Item>
+    <Item>TLS_DH_anon_WITH_AES_128_CBC_SHA256</Item>
+    <Item>TLS_DH_anon_WITH_AES_256_CBC_SHA256</Item>
+    <Item>TLS_RSA_WITH_CAMELLIA_256_CBC_SHA</Item>
+    <Item>TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA</Item>
+    <Item>TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA</Item>
+    <Item>TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA</Item>
+    <Item>TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA</Item>
+    <Item>TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA</Item>
+    <Item>TLS_PSK_WITH_RC4_128_SHA</Item>
+    <Item>TLS_PSK_WITH_3DES_EDE_CBC_SHA</Item>
+    <Item>TLS_PSK_WITH_AES_128_CBC_SHA</Item>
+    <Item>TLS_PSK_WITH_AES_256_CBC_SHA</Item>
+    <Item>TLS_DHE_PSK_WITH_RC4_128_SHA</Item>
+    <Item>TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA</Item>
+    <Item>TLS_DHE_PSK_WITH_AES_128_CBC_SHA</Item>
+    <Item>TLS_DHE_PSK_WITH_AES_256_CBC_SHA</Item>
+    <Item>TLS_RSA_PSK_WITH_RC4_128_SHA</Item>
+    <Item>TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA</Item>
+    <Item>TLS_RSA_PSK_WITH_AES_128_CBC_SHA</Item>
+    <Item>TLS_RSA_PSK_WITH_AES_256_CBC_SHA</Item>
+    <Item>TLS_RSA_WITH_SEED_CBC_SHA</Item>
+    <Item>TLS_DH_DSS_WITH_SEED_CBC_SHA</Item>
+    <Item>TLS_DH_RSA_WITH_SEED_CBC_SHA</Item>
+    <Item>TLS_DHE_DSS_WITH_SEED_CBC_SHA</Item>
+    <Item>TLS_DHE_RSA_WITH_SEED_CBC_SHA</Item>
+    <Item>TLS_DH_anon_WITH_SEED_CBC_SHA</Item>
+    <Item>TLS_RSA_WITH_AES_128_GCM_SHA256</Item>
+    <Item>TLS_RSA_WITH_AES_256_GCM_SHA384</Item>
+    <Item>TLS_DH_RSA_WITH_AES_128_GCM_SHA256</Item>
+    <Item>TLS_DH_RSA_WITH_AES_256_GCM_SHA384</Item>
+    <Item>TLS_DH_DSS_WITH_AES_128_GCM_SHA256</Item>
+    <Item>TLS_DH_DSS_WITH_AES_256_GCM_SHA384</Item>
+    <Item>TLS_DH_anon_WITH_AES_128_GCM_SHA256</Item>
+    <Item>TLS_DH_anon_WITH_AES_256_GCM_SHA384</Item>
+    <Item>TLS_PSK_WITH_AES_128_GCM_SHA256</Item>
+    <Item>TLS_PSK_WITH_AES_256_GCM_SHA384</Item>
+    <Item>TLS_RSA_PSK_WITH_AES_128_GCM_SHA256</Item>
+    <Item>TLS_RSA_PSK_WITH_AES_256_GCM_SHA384</Item>
+    <Item>TLS_PSK_WITH_AES_128_CBC_SHA256</Item>
+    <Item>TLS_PSK_WITH_AES_256_CBC_SHA384</Item>
+    <Item>TLS_PSK_WITH_NULL_SHA256</Item>
+    <Item>TLS_PSK_WITH_NULL_SHA384</Item>
+    <Item>TLS_DHE_PSK_WITH_AES_128_CBC_SHA256</Item>
+    <Item>TLS_DHE_PSK_WITH_AES_256_CBC_SHA384</Item>
+    <Item>TLS_DHE_PSK_WITH_NULL_SHA256</Item>
+    <Item>TLS_DHE_PSK_WITH_NULL_SHA384</Item>
+    <Item>TLS_RSA_PSK_WITH_AES_128_CBC_SHA256</Item>
+    <Item>TLS_RSA_PSK_WITH_AES_256_CBC_SHA384</Item>
+    <Item>TLS_RSA_PSK_WITH_NULL_SHA256</Item>
+    <Item>TLS_RSA_PSK_WITH_NULL_SHA384</Item>
+    <Item>TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256</Item>
+    <Item>TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256</Item>
+    <Item>TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256</Item>
+    <Item>TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256</Item>
+    <Item>TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256</Item>
+    <Item>TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256</Item>
+    <Item>TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256</Item>
+    <Item>TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256</Item>
+    <Item>TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256</Item>
+    <Item>TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256</Item>
+    <Item>TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256</Item>
+    <Item>TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256</Item>
+    <Item>TLS_EMPTY_RENEGOTIATION_INFO_SCSV</Item>
+    <Item>TLS_ECDH_ECDSA_WITH_NULL_SHA</Item>
+    <Item>TLS_ECDH_ECDSA_WITH_RC4_128_SHA</Item>
+    <Item>TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA</Item>
+    <Item>TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA</Item>
+    <Item>TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA</Item>
+    <Item>TLS_ECDHE_ECDSA_WITH_NULL_SHA</Item>
+    <Item>TLS_ECDHE_ECDSA_WITH_RC4_128_SHA</Item>
+    <Item>TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA</Item>
+    <Item>TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA</Item>
+    <Item>TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA</Item>
+    <Item>TLS_ECDH_RSA_WITH_NULL_SHA</Item>
+    <Item>TLS_ECDH_RSA_WITH_RC4_128_SHA</Item>
+    <Item>TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA</Item>
+    <Item>TLS_ECDH_RSA_WITH_AES_128_CBC_SHA</Item>
+    <Item>TLS_ECDH_RSA_WITH_AES_256_CBC_SHA</Item>
+    <Item>TLS_ECDHE_RSA_WITH_NULL_SHA</Item>
+    <Item>TLS_ECDHE_RSA_WITH_RC4_128_SHA</Item>
+    <Item>TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA</Item>
+    <Item>TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA</Item>
+    <Item>TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA</Item>
+    <Item>TLS_ECDH_anon_WITH_NULL_SHA</Item>
+    <Item>TLS_ECDH_anon_WITH_RC4_128_SHA</Item>
+    <Item>TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA</Item>
+    <Item>TLS_ECDH_anon_WITH_AES_128_CBC_SHA</Item>
+    <Item>TLS_ECDH_anon_WITH_AES_256_CBC_SHA</Item>
+    <Item>TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA</Item>
+    <Item>TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA</Item>
+    <Item>TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA</Item>
+    <Item>TLS_SRP_SHA_WITH_AES_128_CBC_SHA</Item>
+    <Item>TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA</Item>
+    <Item>TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA</Item>
+    <Item>TLS_SRP_SHA_WITH_AES_256_CBC_SHA</Item>
+    <Item>TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA</Item>
+    <Item>TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA</Item>
+    <Item>TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256</Item>
+    <Item>TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384</Item>
+    <Item>TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256</Item>
+    <Item>TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384</Item>
+    <Item>TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256</Item>
+    <Item>TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384</Item>
+    <Item>TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256</Item>
+    <Item>TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384</Item>
+    <Item>TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256</Item>
+    <Item>TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384</Item>
+    <Item>TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256</Item>
+    <Item>TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384</Item>
+    <Item>TLS_ECDHE_PSK_WITH_RC4_128_SHA</Item>
+    <Item>TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA</Item>
+    <Item>TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA</Item>
+    <Item>TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA</Item>
+    <Item>TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256</Item>
+    <Item>TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384</Item>
+    <Item>TLS_ECDHE_PSK_WITH_NULL_SHA</Item>
+    <Item>TLS_ECDHE_PSK_WITH_NULL_SHA256</Item>
+    <Item>TLS_ECDHE_PSK_WITH_NULL_SHA384</Item>
+    <Item>TLS_RSA_WITH_ARIA_128_CBC_SHA256</Item>
+    <Item>TLS_RSA_WITH_ARIA_256_CBC_SHA384</Item>
+    <Item>TLS_DH_DSS_WITH_ARIA_128_CBC_SHA256</Item>
+    <Item>TLS_DH_DSS_WITH_ARIA_256_CBC_SHA384</Item>
+    <Item>TLS_DH_RSA_WITH_ARIA_128_CBC_SHA256</Item>
+    <Item>TLS_DH_RSA_WITH_ARIA_256_CBC_SHA384</Item>
+    <Item>TLS_DHE_DSS_WITH_ARIA_128_CBC_SHA256</Item>
+    <Item>TLS_DHE_DSS_WITH_ARIA_256_CBC_SHA384</Item>
+    <Item>TLS_DHE_RSA_WITH_ARIA_128_CBC_SHA256</Item>
+    <Item>TLS_DHE_RSA_WITH_ARIA_256_CBC_SHA384</Item>
+    <Item>TLS_DH_anon_WITH_ARIA_128_CBC_SHA256</Item>
+    <Item>TLS_DH_anon_WITH_ARIA_256_CBC_SHA384</Item>
+    <Item>TLS_ECDHE_ECDSA_WITH_ARIA_128_CBC_SHA256</Item>
+    <Item>TLS_ECDHE_ECDSA_WITH_ARIA_256_CBC_SHA384</Item>
+    <Item>TLS_ECDH_ECDSA_WITH_ARIA_128_CBC_SHA256</Item>
+    <Item>TLS_ECDH_ECDSA_WITH_ARIA_256_CBC_SHA384</Item>
+    <Item>TLS_ECDHE_RSA_WITH_ARIA_128_CBC_SHA256</Item>
+    <Item>TLS_ECDHE_RSA_WITH_ARIA_256_CBC_SHA384</Item>
+    <Item>TLS_ECDH_RSA_WITH_ARIA_128_CBC_SHA256</Item>
+    <Item>TLS_ECDH_RSA_WITH_ARIA_256_CBC_SHA384</Item>
+    <Item>TLS_RSA_WITH_ARIA_128_GCM_SHA256</Item>
+    <Item>TLS_RSA_WITH_ARIA_256_GCM_SHA384</Item>
+    <Item>TLS_DH_RSA_WITH_ARIA_128_GCM_SHA256</Item>
+    <Item>TLS_DH_RSA_WITH_ARIA_256_GCM_SHA384</Item>
+    <Item>TLS_DH_DSS_WITH_ARIA_128_GCM_SHA256</Item>
+    <Item>TLS_DH_DSS_WITH_ARIA_256_GCM_SHA384</Item>
+    <Item>TLS_DH_anon_WITH_ARIA_128_GCM_SHA256</Item>
+    <Item>TLS_DH_anon_WITH_ARIA_256_GCM_SHA384</Item>
+    <Item>TLS_ECDH_ECDSA_WITH_ARIA_128_GCM_SHA256</Item>
+    <Item>TLS_ECDH_ECDSA_WITH_ARIA_256_GCM_SHA384</Item>
+    <Item>TLS_ECDH_RSA_WITH_ARIA_128_GCM_SHA256</Item>
+    <Item>TLS_ECDH_RSA_WITH_ARIA_256_GCM_SHA384</Item>
+    <Item>TLS_PSK_WITH_ARIA_128_CBC_SHA256</Item>
+    <Item>TLS_PSK_WITH_ARIA_256_CBC_SHA384</Item>
+    <Item>TLS_DHE_PSK_WITH_ARIA_128_CBC_SHA256</Item>
+    <Item>TLS_DHE_PSK_WITH_ARIA_256_CBC_SHA384</Item>
+    <Item>TLS_RSA_PSK_WITH_ARIA_128_CBC_SHA256</Item>
+    <Item>TLS_RSA_PSK_WITH_ARIA_256_CBC_SHA384</Item>
+    <Item>TLS_PSK_WITH_ARIA_128_GCM_SHA256</Item>
+    <Item>TLS_PSK_WITH_ARIA_256_GCM_SHA384</Item>
+    <Item>TLS_RSA_PSK_WITH_ARIA_128_GCM_SHA256</Item>
+    <Item>TLS_RSA_PSK_WITH_ARIA_256_GCM_SHA384</Item>
+    <Item>TLS_ECDHE_PSK_WITH_ARIA_128_CBC_SHA256</Item>
+    <Item>TLS_ECDHE_PSK_WITH_ARIA_256_CBC_SHA384</Item>
+    <Item>TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256</Item>
+    <Item>TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384</Item>
+    <Item>TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256</Item>
+    <Item>TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384</Item>
+    <Item>TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256</Item>
+    <Item>TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384</Item>
+    <Item>TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256</Item>
+    <Item>TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384</Item>
+    <Item>TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256</Item>
+    <Item>TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384</Item>
+    <Item>TLS_DH_RSA_WITH_CAMELLIA_128_GCM_SHA256</Item>
+    <Item>TLS_DH_RSA_WITH_CAMELLIA_256_GCM_SHA384</Item>
+    <Item>TLS_DH_DSS_WITH_CAMELLIA_128_GCM_SHA256</Item>
+    <Item>TLS_DH_DSS_WITH_CAMELLIA_256_GCM_SHA384</Item>
+    <Item>TLS_DH_anon_WITH_CAMELLIA_128_GCM_SHA256</Item>
+    <Item>TLS_DH_anon_WITH_CAMELLIA_256_GCM_SHA384</Item>
+    <Item>TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256</Item>
+    <Item>TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384</Item>
+    <Item>TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256</Item>
+    <Item>TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384</Item>
+    <Item>TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256</Item>
+    <Item>TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384</Item>
+    <Item>TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256</Item>
+    <Item>TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384</Item>
+    <Item>TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256</Item>
+    <Item>TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384</Item>
+    <Item>TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256</Item>
+    <Item>TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384</Item>
+    <Item>TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256</Item>
+    <Item>TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384</Item>
+    <Item>TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256</Item>
+    <Item>TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384</Item>
+    <Item>TLS_RSA_WITH_AES_128_CCM</Item>
+    <Item>TLS_RSA_WITH_AES_256_CCM</Item>
+    <Item>TLS_RSA_WITH_AES_128_CCM_8</Item>
+    <Item>TLS_RSA_WITH_AES_256_CCM_8</Item>
+    <Item>TLS_PSK_WITH_AES_128_CCM</Item>
+    <Item>TLS_PSK_WITH_AES_256_CCM</Item>
+    <Item>TLS_PSK_WITH_AES_128_CCM_8</Item>
+    <Item>TLS_PSK_WITH_AES_256_CCM_8</Item>
+   </Array>
+  </Set>
+	<Set name="ExcludeProtocols">
+     <Array type="java.lang.String">
+         <Item>SSL</Item>
+         <Item>SSLv2</Item>
+         <Item>SSLv2Hello</Item>
+         <Item>SSLv3</Item>
+     </Array>
+</Set>
+  <Set name="useCipherSuitesOrder"><Property name="jetty.sslContext.useCipherSuitesOrder" default="true"/></Set>
+</Configure>
\ No newline at end of file
diff --git a/org.adempiere.server-feature/jettyhome/etc/jetty-ssl-template.xml b/org.adempiere.server-feature/jettyhome/etc/jetty-ssl-template.xml
index 18c5acebc9..dba32bb44d 100644
--- a/org.adempiere.server-feature/jettyhome/etc/jetty-ssl-template.xml
+++ b/org.adempiere.server-feature/jettyhome/etc/jetty-ssl-template.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
 <!-- ============================================================= -->
 <!-- Base SSL configuration                                        -->
 <!-- This configuration needs to be used together with 1 or more   -->
-<!-- of jetty-https.xml, jetty-spdy.xml and/or jetty-http2.xml     --> 
+<!-- of jetty-https.xml or jetty-http2.xml                         -->
 <!-- ============================================================= -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
@@ -15,49 +15,27 @@
     <Arg>
       <New id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
         <Arg name="server"><Ref refid="Server" /></Arg>
-        <Arg name="acceptors" type="int"><Property name="ssl.acceptors" default="-1"/></Arg>
-        <Arg name="selectors" type="int"><Property name="ssl.selectors" default="-1"/></Arg>
+        <Arg name="acceptors" type="int"><Property name="jetty.ssl.acceptors" deprecated="ssl.acceptors" default="-1"/></Arg>
+        <Arg name="selectors" type="int"><Property name="jetty.ssl.selectors" deprecated="ssl.selectors" default="-1"/></Arg>
         <Arg name="factories">
           <Array type="org.eclipse.jetty.server.ConnectionFactory">
+            <!-- uncomment to support proxy protocol
+            <Item>
+              <New class="org.eclipse.jetty.server.ProxyConnectionFactory"/>
+            </Item>-->
           </Array>
         </Arg>
 
-        <Set name="host"><Property name="jetty.host" default="@ADEMPIERE_APPS_SERVER@" /></Set>
-        <Set name="port"><Property name="ssl.port" default="@ADEMPIERE_SSL_PORT@" /></Set>
-        <Set name="idleTimeout"><Property name="ssl.timeout" default="300000"/></Set>
-        <Set name="soLingerTime"><Property name="ssl.soLingerTime" default="-1"/></Set>
-        <Set name="acceptorPriorityDelta"><Property name="ssl.acceptorPriorityDelta" default="0"/></Set>
-        <Set name="selectorPriorityDelta"><Property name="ssl.selectorPriorityDelta" default="0"/></Set>
+        <Set name="host"><Property name="jetty.ssl.host" deprecated="jetty.host" default="@ADEMPIERE_APPS_SERVER@" /></Set>
+        <Set name="port"><Property name="jetty.ssl.port" deprecated="ssl.port" default="@ADEMPIERE_SSL_PORT@" /></Set>
+        <Set name="idleTimeout"><Property name="jetty.ssl.idleTimeout" deprecated="ssl.timeout" default="123000"/></Set>
+        <Set name="soLingerTime"><Property name="jetty.ssl.soLingerTime" deprecated="ssl.soLingerTime" default="-1"/></Set>
+        <Set name="acceptorPriorityDelta"><Property name="jetty.ssl.acceptorPriorityDelta" deprecated="ssl.acceptorPriorityDelta" default="0"/></Set>
+        <Set name="acceptQueueSize"><Property name="jetty.ssl.acceptQueueSize" deprecated="ssl.acceptQueueSize" default="0"/></Set>
       </New>
     </Arg>
   </Call>
-  
-  <!-- ============================================================= -->
-  <!-- Create a TLS (SSL) Context Factory  for later reuse           -->
-  <!-- ============================================================= -->
-  <New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
-    <Set name="CertAlias">@ADEMPIERE_KEYSTORECODEALIAS@</Set>
-    <Set name="KeyStorePath">@ADEMPIERE_KEYSTORE@</Set>
-    <Set name="KeyStorePassword"><Property name="jetty.keystore.password" default="@ADEMPIERE_KEYSTOREPASS@"/></Set>
-    <Set name="KeyManagerPassword"><Property name="jetty.keymanager.password" default="@ADEMPIERE_KEYSTOREPASS@"/></Set>
-    <Set name="TrustStorePath">@ADEMPIERE_KEYSTORE@</Set>
-    <Set name="TrustStorePassword"><Property name="jetty.truststore.password" default="@ADEMPIERE_KEYSTOREPASS@"/></Set>
-    <Set name="EndpointIdentificationAlgorithm"></Set>
-    <Set name="NeedClientAuth"><Property name="jetty.ssl.needClientAuth" default="false"/></Set>
-    <Set name="WantClientAuth"><Property name="jetty.ssl.wantClientAuth" default="false"/></Set>
-    <Set name="ExcludeCipherSuites">
-     <Array type="String">
-      <Item>SSL_RSA_WITH_DES_CBC_SHA</Item>
-      <Item>SSL_DHE_RSA_WITH_DES_CBC_SHA</Item>
-      <Item>SSL_DHE_DSS_WITH_DES_CBC_SHA</Item>
-      <Item>SSL_RSA_EXPORT_WITH_RC4_40_MD5</Item>
-      <Item>SSL_RSA_EXPORT_WITH_DES40_CBC_SHA</Item>
-      <Item>SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA</Item>
-      <Item>SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA</Item>
-     </Array>
-    </Set>
-  </New>
-  
+
   <!-- =========================================================== -->
   <!-- Create a TLS specific HttpConfiguration based on the        -->
   <!-- common HttpConfiguration defined in jetty.xml               -->
@@ -67,8 +45,12 @@
   <New id="sslHttpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
     <Arg><Ref refid="httpConfig"/></Arg>
     <Call name="addCustomizer">
-      <Arg><New class="org.eclipse.jetty.server.SecureRequestCustomizer"/></Arg>
+      <Arg>
+        <New class="org.eclipse.jetty.server.SecureRequestCustomizer">
+          <Arg type="boolean"><Property name="jetty.ssl.sniHostCheck" default="true"/></Arg>
+        </New>
+      </Arg>
     </Call>
   </New>
 
-</Configure>
+</Configure>
\ No newline at end of file
diff --git a/org.adempiere.server-feature/jettyhome/etc/jetty-template.xml b/org.adempiere.server-feature/jettyhome/etc/jetty-template.xml
index 5e8da989e2..c53ad4377b 100644
--- a/org.adempiere.server-feature/jettyhome/etc/jetty-template.xml
+++ b/org.adempiere.server-feature/jettyhome/etc/jetty-template.xml
@@ -1,27 +1,111 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
-
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
 <!-- =============================================================== -->
-<!-- Configure the Jetty Server                                      -->
-<!--                                                                 -->
 <!-- Documentation of this file format can be found at:              -->
 <!-- http://wiki.eclipse.org/Jetty/Reference/jetty.xml_syntax        -->
+<!--                                                                 -->
+<!-- Additional configuration files are available in $JETTY_HOME/etc -->
+<!-- and can be mixed in. See start.ini file for the default         -->
+<!-- configuration files.                                            -->
+<!--                                                                 -->
+<!-- For a description of the configuration mechanism, see the       -->
+<!-- output of:                                                      -->
+<!--   java -jar start.jar -?                                        -->
 <!-- =============================================================== -->
 
+<!-- =============================================================== -->
+<!-- Configure a Jetty Server instance with an ID "Server"           -->
+<!-- Other configuration files may also configure the "Server"       -->
+<!-- ID, in which case they are adding configuration to the same     -->
+<!-- instance.  If other configuration have a different ID, they     -->
+<!-- will create and configure another instance of Jetty.            -->
+<!-- Consult the javadoc of o.e.j.server.Server for all              -->
+<!-- configuration that may be set here.                             -->
+<!-- =============================================================== -->
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
     <!-- =========================================================== -->
-    <!-- Server Thread Pool                                          -->
+    <!-- Configure the Server Thread Pool.                           -->
+    <!-- The server holds a common thread pool which is used by      -->
+    <!-- default as the executor used by all connectors and servlet  -->
+    <!-- dispatches.                                                 -->
+    <!--                                                             -->
+    <!-- Configuring a fixed thread pool is vital to controlling the -->
+    <!-- maximal memory footprint of the server and is a key tuning  -->
+    <!-- parameter for tuning.  In an application that rarely blocks -->
+    <!-- then maximal threads may be close to the number of 5*CPUs.  -->
+    <!-- In an application that frequently blocks, then maximal      -->
+    <!-- threads should be set as high as possible given the memory  -->
+    <!-- available.                                                  -->
+    <!--                                                             -->
+    <!-- Consult the javadoc of o.e.j.util.thread.QueuedThreadPool   -->
+    <!-- for all configuration that may be set here.                 -->
     <!-- =========================================================== -->
+    <!-- uncomment to change type of threadpool
+    <Arg name="threadpool"><New id="threadpool" class="org.eclipse.jetty.util.thread.QueuedThreadPool"/></Arg>
+    -->
     <Get name="ThreadPool">
-      <Set name="minThreads">10</Set>
-      <Set name="maxThreads">200</Set>
+      <Set name="minThreads" type="int"><Property name="jetty.threadPool.minThreads" deprecated="threads.min" default="10"/></Set>
+      <Set name="maxThreads" type="int"><Property name="jetty.threadPool.maxThreads" deprecated="threads.max" default="200"/></Set>
+      <Set name="idleTimeout" type="int"><Property name="jetty.threadPool.idleTimeout" deprecated="threads.timeout" default="60000"/></Set>
+      <Set name="detailedDump">false</Set>
     </Get>
 
+    <!-- =========================================================== -->
+    <!-- Add shared Scheduler instance                               -->
+    <!-- =========================================================== -->
+    <Call name="addBean">
+      <Arg>
+        <New class="org.eclipse.jetty.util.thread.ScheduledExecutorScheduler"/>
+      </Arg>
+    </Call>
 
     <!-- =========================================================== -->
-    <!-- Set handler Collection Structure                            -->
+    <!-- Http Configuration.                                         -->
+    <!-- This is a common configuration instance used by all         -->
+    <!-- connectors that can carry HTTP semantics (HTTP, HTTPS, etc.)-->
+    <!-- It configures the non wire protocol aspects of the HTTP     -->
+    <!-- semantic.                                                   -->
+    <!--                                                             -->
+    <!-- This configuration is only defined here and is used by      -->
+    <!-- reference from other XML files such as jetty-http.xml,      -->
+    <!-- jetty-https.xml and other configuration files which         -->
+    <!-- instantiate the connectors.                                 -->
+    <!--                                                             -->
+    <!-- Consult the javadoc of o.e.j.server.HttpConfiguration       -->
+    <!-- for all configuration that may be set here.                 -->
+    <!-- =========================================================== -->
+    <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
+      <Set name="secureScheme"><Property name="jetty.httpConfig.secureScheme" default="https" /></Set>
+      <Set name="securePort"><Property name="jetty.httpConfig.securePort" deprecated="jetty.secure.port" default="@ADEMPIERE_SSL_PORT@" /></Set>
+      <Set name="outputBufferSize"><Property name="jetty.httpConfig.outputBufferSize" deprecated="jetty.output.buffer.size" default="32768" /></Set>
+      <Set name="outputAggregationSize"><Property name="jetty.httpConfig.outputAggregationSize" deprecated="jetty.output.aggregation.size" default="8192" /></Set>
+      <Set name="requestHeaderSize"><Property name="jetty.httpConfig.requestHeaderSize" deprecated="jetty.request.header.size" default="8192" /></Set>
+      <Set name="responseHeaderSize"><Property name="jetty.httpConfig.responseHeaderSize" deprecated="jetty.response.header.size" default="8192" /></Set>
+      <Set name="sendServerVersion"><Property name="jetty.httpConfig.sendServerVersion" deprecated="jetty.send.server.version" default="true" /></Set>
+      <Set name="sendDateHeader"><Property name="jetty.httpConfig.sendDateHeader" deprecated="jetty.send.date.header" default="false" /></Set>
+      <Set name="headerCacheSize"><Property name="jetty.httpConfig.headerCacheSize" default="512" /></Set>
+      <Set name="delayDispatchUntilContent"><Property name="jetty.httpConfig.delayDispatchUntilContent" deprecated="jetty.delayDispatchUntilContent" default="true"/></Set>
+      <Set name="maxErrorDispatches"><Property name="jetty.httpConfig.maxErrorDispatches" default="10"/></Set>
+      <Set name="blockingTimeout"><Property name="jetty.httpConfig.blockingTimeout" default="-1"/></Set>
+      <!-- Uncomment to enable handling of X-Forwarded- style headers
+      <Call name="addCustomizer">
+        <Arg><New class="org.eclipse.jetty.server.ForwardedRequestCustomizer"/></Arg>
+      </Call>
+      -->
+    </New>
+
+    <!-- =========================================================== -->
+    <!-- Set the default handler structure for the Server            -->
+    <!-- A handler collection is used to pass received requests to   -->
+    <!-- both the ContextHandlerCollection, which selects the next   -->
+    <!-- handler by context path and virtual host, and the           -->
+    <!-- DefaultHandler, which handles any requests not handled by   -->
+    <!-- the context handlers.                                       -->
+    <!-- Other handlers may be added to the "Handlers" collection,   -->
+    <!-- for example the jetty-requestlog.xml file adds the          -->
+    <!-- RequestLogHandler after the default handler                 -->
     <!-- =========================================================== -->
     <Set name="handler">
       <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
@@ -33,51 +117,36 @@
            <Item>
              <New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
            </Item>
-           <Item>
-             <New id="RequestLog" class="org.eclipse.jetty.server.handler.RequestLogHandler"/>
-           </Item>
          </Array>
         </Set>
       </New>
     </Set>
 
-    <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
-      <Set name="secureScheme">https</Set>
-      <Set name="securePort"><Property name="jetty.secure.port" default="@ADEMPIERE_SSL_PORT@" /></Set>
-      <Set name="outputBufferSize">32768</Set>
-      <Set name="requestHeaderSize">8192</Set>
-      <Set name="responseHeaderSize">8192</Set>
-      <Set name="sendServerVersion">true</Set>
-      <Set name="sendDateHeader">false</Set>
-      <Set name="headerCacheSize">512</Set>
-    </New>
-
-
     <!-- =========================================================== -->
-    <!-- extra options                                               -->
+    <!-- extra server options                                        -->
     <!-- =========================================================== -->
-    <Set name="stopAtShutdown">true</Set>
-    <Set name="stopTimeout">1000</Set>
-    <Set name="dumpAfterStart">false</Set>
-    <Set name="dumpBeforeStop">false</Set>
+    <Set name="stopAtShutdown"><Property name="jetty.server.stopAtShutdown" default="true"/></Set>
+    <Set name="stopTimeout">5000</Set>
+    <Set name="dumpAfterStart"><Property name="jetty.server.dumpAfterStart" deprecated="jetty.dump.start" default="false"/></Set>
+    <Set name="dumpBeforeStop"><Property name="jetty.server.dumpBeforeStop" deprecated="jetty.dump.stop" default="false"/></Set>
 
-
-    <!-- =========================================================== -->
-    <!-- jetty-jndi by default                                       -->
-    <!-- =========================================================== -->
-    <Call class="org.eclipse.jetty.webapp.Configuration$ClassList" name="setServerDefault">
-      <Arg><Ref refid="Server" /></Arg>
-      <Call name="addAfter">
-        <Arg name="afterClass">org.eclipse.jetty.webapp.FragmentConfiguration</Arg>
-        <Arg>
-          <Array type="String">
-            <Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item>
-            <Item>org.eclipse.jetty.plus.webapp.PlusConfiguration</Item>
-            <Item>org.eclipse.jetty.annotations.AnnotationConfiguration</Item>
-          </Array>
-        </Arg>
-      </Call>
+	<Call name="setAttribute">
+       <Arg>org.eclipse.jetty.webapp.configuration</Arg>
+       <Arg>
+        <New class="org.eclipse.jetty.webapp.Configuration$ClassList">
+          <Arg>
+            <Array type="String">
+              <Item>org.eclipse.jetty.osgi.boot.OSGiWebInfConfiguration</Item>
+              <Item>org.eclipse.jetty.webapp.WebXmlConfiguration</Item>
+              <Item>org.eclipse.jetty.webapp.MetaInfConfiguration</Item>
+              <Item>org.eclipse.jetty.webapp.FragmentConfiguration</Item>
+              <Item>org.eclipse.jetty.webapp.JettyWebXmlConfiguration</Item>  
+            </Array>
+          </Arg>
+        </New>
+       </Arg>
     </Call>
+
     <Call class="java.lang.System" name="setProperty">
       <Arg>java.naming.factory.initial</Arg>
       <Arg><Property name="java.naming.factory.initial" default="org.eclipse.jetty.jndi.InitialContextFactory"/></Arg>
@@ -86,15 +155,4 @@
       <Arg>java.naming.factory.url.pkgs</Arg>
       <Arg><Property name="java.naming.factory.url.pkgs" default="org.eclipse.jetty.jndi"/></Arg>
     </Call>
-    <Call name="setAttribute">
-      <Arg>org.eclipse.jetty.server.Request.maxFormContentSize</Arg>
-      <Arg>1048576</Arg>
-    </Call>
-
-	<!-- Call class="org.eclipse.jetty.util.log.Log" name="getRootLogger">
-	  <Call name="setDebugEnabled">
-	    <Arg type="boolean">true</Arg>
-	  </Call>
-	</Call -->
-
-</Configure>
+</Configure>
\ No newline at end of file
diff --git a/org.adempiere.server-feature/jettyhome/etc/webdefault.xml b/org.adempiere.server-feature/jettyhome/etc/webdefault.xml
new file mode 100644
index 0000000000..ee0124f753
--- /dev/null
+++ b/org.adempiere.server-feature/jettyhome/etc/webdefault.xml
@@ -0,0 +1,533 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app 
+   xmlns="http://xmlns.jcp.org/xml/ns/javaee" 
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+   metadata-complete="false"
+   version="3.1"> 
+
+  <!-- ===================================================================== -->
+  <!-- This file contains the default descriptor for web applications.       -->
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+  <!-- The intent of this descriptor is to include jetty specific or common  -->
+  <!-- configuration for all webapps.   If a context has a webdefault.xml    -->
+  <!-- descriptor, it is applied before the context's own web.xml file       -->
+  <!--                                                                       -->
+  <!-- A context may be assigned a default descriptor by calling             -->
+  <!-- WebAppContext.setDefaultsDescriptor(String).                          -->
+  <!--                                                                       -->
+  <!-- This file is present in the jetty-webapp.jar, and is used as the      -->
+  <!-- defaults descriptor if no other is explicitly set on a context.       -->
+  <!--                                                                       -->
+  <!-- A copy of this file is also placed into the $JETTY_HOME/etc dir of    -->
+  <!-- the  distribution, and is referenced by some of the other xml files,  -->
+  <!-- eg the jetty-deploy.xml file.                                         -->
+  <!-- ===================================================================== -->
+
+  <description>
+    Default web.xml file.  
+    This file is applied to a Web application before it's own WEB_INF/web.xml file
+  </description>
+
+  <!-- ==================================================================== -->
+  <!-- Removes static references to beans from javax.el.BeanELResolver to   -->
+  <!-- ensure webapp classloader can be released on undeploy                -->
+  <!-- ==================================================================== -->
+  <listener>
+   <listener-class>org.eclipse.jetty.servlet.listener.ELContextCleaner</listener-class>
+  </listener>
+  
+  <!-- ==================================================================== -->
+  <!-- Removes static cache of Methods from java.beans.Introspector to      -->
+  <!-- ensure webapp classloader can be released on undeploy                -->
+  <!-- ==================================================================== -->  
+  <listener>
+   <listener-class>org.eclipse.jetty.servlet.listener.IntrospectorCleaner</listener-class>
+  </listener>
+  
+
+  <!-- ==================================================================== -->
+  <!-- Context params to control Session Cookies                            -->
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+  <!--
+    UNCOMMENT TO ACTIVATE 
+    <context-param> 
+      <param-name>org.eclipse.jetty.servlet.SessionDomain</param-name> 
+      <param-value>127.0.0.1</param-value> 
+    </context-param> 
+    <context-param>
+      <param-name>org.eclipse.jetty.servlet.SessionPath</param-name>
+      <param-value>/</param-value>
+    </context-param>
+    <context-param>
+      <param-name>org.eclipse.jetty.servlet.MaxAge</param-name>
+      <param-value>-1</param-value>
+    </context-param>
+  -->
+
+  <!-- ==================================================================== -->
+  <!-- The default servlet.                                                 -->
+  <!-- This servlet, normally mapped to /, provides the handling for static -->
+  <!-- content, OPTIONS and TRACE methods for the context.                  -->
+  <!-- The following initParameters are supported:                          -->
+  <!--  
+ *  acceptRanges      If true, range requests and responses are
+ *                    supported
+ *
+ *  dirAllowed        If true, directory listings are returned if no
+ *                    welcome file is found. Else 403 Forbidden.
+ *
+ *  welcomeServlets   If true, attempt to dispatch to welcome files
+ *                    that are servlets, but only after no matching static
+ *                    resources could be found. If false, then a welcome
+ *                    file must exist on disk. If "exact", then exact
+ *                    servlet matches are supported without an existing file.
+ *                    Default is true.
+ *
+ *                    This must be false if you want directory listings,
+ *                    but have index.jsp in your welcome file list.
+ *
+ *  redirectWelcome   If true, welcome files are redirected rather than
+ *                    forwarded to.
+ *
+ *  gzip              If set to true, then static content will be served as
+ *                    gzip content encoded if a matching resource is
+ *                    found ending with ".gz"
+ *
+ *  resourceBase      Set to replace the context resource base
+ *
+ *  resourceCache     If set, this is a context attribute name, which the servlet
+ *                    will use to look for a shared ResourceCache instance.
+ *
+ *  relativeResourceBase
+ *                    Set with a pathname relative to the base of the
+ *                    servlet context root. Useful for only serving static content out
+ *                    of only specific subdirectories.
+ *
+ *  pathInfoOnly      If true, only the path info will be applied to the resourceBase
+ *
+ *  stylesheet        Set with the location of an optional stylesheet that will be used
+ *                    to decorate the directory listing html.
+ *
+ *  aliases           If True, aliases of resources are allowed (eg. symbolic
+ *                    links and caps variations). May bypass security constraints.
+ *                    
+ *  etags             If True, weak etags will be generated and handled.
+ *
+ *  maxCacheSize      The maximum total size of the cache or 0 for no cache.
+ *  maxCachedFileSize The maximum size of a file to cache
+ *  maxCachedFiles    The maximum number of files to cache
+ *
+ *  useFileMappedBuffer
+ *                    If set to true, it will use mapped file buffers to serve static content
+ *                    when using an NIO connector. Setting this value to false means that
+ *                    a direct buffer will be used instead of a mapped file buffer.
+ *                    This file sets the value to true.
+ *
+ *  cacheControl      If set, all static content will have this value set as the cache-control
+ *                    header.
+ *
+ -->
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+  <servlet>
+    <servlet-name>default</servlet-name>
+    <servlet-class>org.eclipse.jetty.servlet.DefaultServlet</servlet-class>
+    <init-param>
+      <param-name>aliases</param-name>
+      <param-value>false</param-value>
+    </init-param>
+    <init-param>
+      <param-name>acceptRanges</param-name>
+      <param-value>true</param-value>
+    </init-param>
+    <init-param>
+      <param-name>dirAllowed</param-name>
+      <param-value>true</param-value>
+    </init-param>
+    <init-param>
+      <param-name>welcomeServlets</param-name>
+      <param-value>false</param-value>
+    </init-param>
+    <init-param>
+      <param-name>redirectWelcome</param-name>
+      <param-value>false</param-value>
+    </init-param>
+    <init-param>
+      <param-name>maxCacheSize</param-name>
+      <param-value>256000000</param-value>
+    </init-param>
+    <init-param>
+      <param-name>maxCachedFileSize</param-name>
+      <param-value>200000000</param-value>
+    </init-param>
+    <init-param>
+      <param-name>maxCachedFiles</param-name>
+      <param-value>2048</param-value>
+    </init-param>
+    <init-param>
+      <param-name>gzip</param-name>
+      <param-value>false</param-value>
+    </init-param>
+    <init-param>
+      <param-name>etags</param-name>
+      <param-value>false</param-value>
+    </init-param>
+    <init-param>
+      <param-name>useFileMappedBuffer</param-name>
+      <param-value>true</param-value>
+    </init-param>
+    <!--
+    <init-param>
+      <param-name>resourceCache</param-name>
+      <param-value>resourceCache</param-value>
+    </init-param>
+    -->
+    <!--
+    <init-param>
+      <param-name>cacheControl</param-name>
+      <param-value>max-age=3600,public</param-value>
+    </init-param>
+    -->
+    <load-on-startup>0</load-on-startup>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>default</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+
+  <!-- ==================================================================== -->
+  <!-- JSP Servlet                                                          -->
+  <!-- This is the jasper JSP servlet.                                      -->
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+  <!-- The JSP page compiler and execution servlet, which is the mechanism  -->
+  <!-- used by the jsp container to support JSP pages.  Traditionally,      -->
+  <!-- this servlet is mapped to URL pattern "*.jsp".  This servlet         -->
+  <!-- supports the following initialization parameters (default values     -->
+  <!-- are in square brackets):                                             -->
+  <!--                                                                      -->
+  <!--   checkInterval       If development is false and reloading is true, -->
+  <!--                       background compiles are enabled. checkInterval -->
+  <!--                       is the time in seconds between checks to see   -->
+  <!--                       if a JSP page needs to be recompiled. [300]    -->
+  <!--                                                                      -->
+  <!--   compiler            Which compiler Ant should use to compile JSP   -->
+  <!--                       pages.  See the Ant documentation for more     -->
+  <!--                       information. [javac]                           -->
+  <!--                                                                      -->
+  <!--   classdebuginfo      Should the class file be compiled with         -->
+  <!--                       debugging information?  [true]                 -->
+  <!--                                                                      -->
+  <!--   classpath           What class path should I use while compiling   -->
+  <!--                       generated servlets?  [Created dynamically      -->
+  <!--                       based on the current web application]          -->
+  <!--                       Set to ? to make the container explicitly set  -->
+  <!--                       this parameter.                                -->
+  <!--                                                                      -->
+  <!--   development         Is Jasper used in development mode (will check -->
+  <!--                       for JSP modification on every access)?  [true] -->
+  <!--                                                                      -->
+  <!--   enablePooling       Determines whether tag handler pooling is      -->
+  <!--                       enabled  [true]                                -->
+  <!--                                                                      -->
+  <!--   fork                Tell Ant to fork compiles of JSP pages so that -->
+  <!--                       a separate JVM is used for JSP page compiles   -->
+  <!--                       from the one Tomcat is running in. [true]      -->
+  <!--                                                                      -->
+  <!--   ieClassId           The class-id value to be sent to Internet      -->
+  <!--                       Explorer when using <jsp:plugin> tags.         -->
+  <!--                       [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93]   -->
+  <!--                                                                      -->
+  <!--   javaEncoding        Java file encoding to use for generating java  -->
+  <!--                       source files. [UTF-8]                          -->
+  <!--                                                                      -->
+  <!--   keepgenerated       Should we keep the generated Java source code  -->
+  <!--                       for each page instead of deleting it? [true]   -->
+  <!--                                                                      -->
+  <!--   logVerbosityLevel   The level of detailed messages to be produced  -->
+  <!--                       by this servlet.  Increasing levels cause the  -->
+  <!--                       generation of more messages.  Valid values are -->
+  <!--                       FATAL, ERROR, WARNING, INFORMATION, and DEBUG. -->
+  <!--                       [WARNING]                                      -->
+  <!--                                                                      -->
+  <!--   mappedfile          Should we generate static content with one     -->
+  <!--                       print statement per input line, to ease        -->
+  <!--                       debugging?  [false]                            -->
+  <!--                                                                      -->
+  <!--                                                                      -->
+  <!--   reloading           Should Jasper check for modified JSPs?  [true] -->
+  <!--                                                                      -->
+  <!--   suppressSmap        Should the generation of SMAP info for JSR45   -->
+  <!--                       debugging be suppressed?  [false]              -->
+  <!--                                                                      -->
+  <!--   dumpSmap            Should the SMAP info for JSR45 debugging be    -->
+  <!--                       dumped to a file? [false]                      -->
+  <!--                       False if suppressSmap is true                  -->
+  <!--                                                                      -->
+  <!--   scratchdir          What scratch directory should we use when      -->
+  <!--                       compiling JSP pages?  [default work directory  -->
+  <!--                       for the current web application]               -->
+  <!--                                                                      -->
+  <!--   tagpoolMaxSize      The maximum tag handler pool size  [5]         -->
+  <!--                                                                      -->
+  <!--   xpoweredBy          Determines whether X-Powered-By response       -->
+  <!--                       header is added by generated servlet  [false]  -->
+  <!--                                                                      -->
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+  <servlet id="jsp">
+    <servlet-name>jsp</servlet-name>
+    <servlet-class>org.eclipse.jetty.jsp.JettyJspServlet</servlet-class>
+    <init-param>
+      <param-name>logVerbosityLevel</param-name>
+      <param-value>DEBUG</param-value>
+    </init-param>
+    <init-param>
+      <param-name>fork</param-name>
+      <param-value>false</param-value>
+    </init-param>
+    <init-param>
+      <param-name>xpoweredBy</param-name>
+      <param-value>false</param-value>
+    </init-param>
+    <init-param>
+      <param-name>compilerTargetVM</param-name>
+      <param-value>1.7</param-value>
+    </init-param>
+    <init-param>
+      <param-name>compilerSourceVM</param-name>
+      <param-value>1.7</param-value>
+    </init-param>
+    <!--  
+    <init-param>
+        <param-name>classpath</param-name>
+        <param-value>?</param-value>
+    </init-param>
+    -->
+    <load-on-startup>0</load-on-startup>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>jsp</servlet-name>
+    <url-pattern>*.jsp</url-pattern>
+    <url-pattern>*.jspf</url-pattern>
+    <url-pattern>*.jspx</url-pattern>
+    <url-pattern>*.xsp</url-pattern>
+    <url-pattern>*.JSP</url-pattern>
+    <url-pattern>*.JSPF</url-pattern>
+    <url-pattern>*.JSPX</url-pattern>
+    <url-pattern>*.XSP</url-pattern>
+  </servlet-mapping>
+
+
+  <!-- ==================================================================== -->
+  <!-- Default session configuration                                        -->
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+  <session-config>
+    <session-timeout>30</session-timeout>
+  </session-config>
+
+  <!-- ==================================================================== -->
+  <!-- Default MIME mappings                                                -->
+  <!-- The default MIME mappings are provided by the mime.properties        -->
+  <!-- resource in the jetty-http.jar file.  Additional or modified         -->
+  <!-- mappings may be specified here                                       -->
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+  <!-- UNCOMMENT TO ACTIVATE
+  <mime-mapping>
+    <extension>mysuffix</extension>
+    <mime-type>mymime/type</mime-type>
+  </mime-mapping>
+  -->
+
+  <!-- ==================================================================== -->
+  <!-- Default welcome files                                                -->
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+  <welcome-file-list>
+    <welcome-file>index.html</welcome-file>
+    <welcome-file>index.htm</welcome-file>
+    <welcome-file>index.jsp</welcome-file>
+  </welcome-file-list>
+
+  <!-- ==================================================================== -->
+  <!-- Default locale encodings                                             -->
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+  <locale-encoding-mapping-list>
+    <locale-encoding-mapping>
+      <locale>ar</locale>
+      <encoding>ISO-8859-6</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>be</locale>
+      <encoding>ISO-8859-5</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>bg</locale>
+      <encoding>ISO-8859-5</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>ca</locale>
+      <encoding>ISO-8859-1</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>cs</locale>
+      <encoding>ISO-8859-2</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>da</locale>
+      <encoding>ISO-8859-1</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>de</locale>
+      <encoding>ISO-8859-1</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>el</locale>
+      <encoding>ISO-8859-7</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>en</locale>
+      <encoding>ISO-8859-1</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>es</locale>
+      <encoding>ISO-8859-1</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>et</locale>
+      <encoding>ISO-8859-1</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>fi</locale>
+      <encoding>ISO-8859-1</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>fr</locale>
+      <encoding>ISO-8859-1</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>hr</locale>
+      <encoding>ISO-8859-2</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>hu</locale>
+      <encoding>ISO-8859-2</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>is</locale>
+      <encoding>ISO-8859-1</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>it</locale>
+      <encoding>ISO-8859-1</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>iw</locale>
+      <encoding>ISO-8859-8</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>ja</locale>
+      <encoding>Shift_JIS</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>ko</locale>
+      <encoding>EUC-KR</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>lt</locale>
+      <encoding>ISO-8859-2</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>lv</locale>
+      <encoding>ISO-8859-2</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>mk</locale>
+      <encoding>ISO-8859-5</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>nl</locale>
+      <encoding>ISO-8859-1</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>no</locale>
+      <encoding>ISO-8859-1</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>pl</locale>
+      <encoding>ISO-8859-2</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>pt</locale>
+      <encoding>ISO-8859-1</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>ro</locale>
+      <encoding>ISO-8859-2</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>ru</locale>
+      <encoding>ISO-8859-5</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>sh</locale>
+      <encoding>ISO-8859-5</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>sk</locale>
+      <encoding>ISO-8859-2</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>sl</locale>
+      <encoding>ISO-8859-2</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>sq</locale>
+      <encoding>ISO-8859-2</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>sr</locale>
+      <encoding>ISO-8859-5</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>sv</locale>
+      <encoding>ISO-8859-1</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>tr</locale>
+      <encoding>ISO-8859-9</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>uk</locale>
+      <encoding>ISO-8859-5</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>zh</locale>
+      <encoding>GB2312</encoding>
+    </locale-encoding-mapping>
+    <locale-encoding-mapping>
+      <locale>zh_TW</locale>
+      <encoding>Big5</encoding>
+    </locale-encoding-mapping>
+  </locale-encoding-mapping-list>
+
+  <!-- ==================================================================== -->
+  <!-- Disable TRACE method with security constraint                        -->
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+  <security-constraint>
+    <web-resource-collection>
+      <web-resource-name>Disable TRACE</web-resource-name>
+      <url-pattern>/</url-pattern>
+      <http-method>TRACE</http-method>
+    </web-resource-collection>
+    <auth-constraint/>
+  </security-constraint>
+  <security-constraint>
+    <web-resource-collection>
+      <web-resource-name>Enable everything but TRACE</web-resource-name>
+      <url-pattern>/</url-pattern>
+      <http-method-omission>TRACE</http-method-omission>
+    </web-resource-collection>
+  </security-constraint>
+
+</web-app>

From 093c95874f70845e6799b91e5378070caf7ba796 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Fri, 8 Jul 2016 16:18:44 +0700
Subject: [PATCH 20/34] IDEMPIERE-3136:all stuff relate library of idempiere
 set runtime of all project to 1.8

---
 org.adempiere.base-feature/model.generator.launch           | 6 +++---
 org.adempiere.base-feature/sign.database.build.launch       | 6 +++---
 .../synchronize-terminology.app.launch                      | 2 +-
 org.adempiere.base-feature/translation.app.launch           | 2 +-
 org.adempiere.install/install.app.launch                    | 2 +-
 org.adempiere.install/install.console.app.launch            | 2 +-
 .../server.product.eventtest.launch                         | 6 +++---
 .../server.product.functionaltest.launch                    | 6 +++---
 org.adempiere.server-feature/server.product.launch          | 6 +++---
 org.adempiere.ui.swing-feature/swingclient.product.launch   | 6 +++---
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/org.adempiere.base-feature/model.generator.launch b/org.adempiere.base-feature/model.generator.launch
index 183fc2327d..549d72de80 100644
--- a/org.adempiere.base-feature/model.generator.launch
+++ b/org.adempiere.base-feature/model.generator.launch
@@ -14,14 +14,14 @@
 <booleanAttribute key="default" value="false"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../runtime-model.generator"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
-<stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.annotation@default:default,javax.ejb@default:default,javax.inject@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.extension@default:default,org.apache.batik.parser@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.batik.xml@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.restlet.ext.net@default:default,org.restlet.ext.ssl@default:default,org.restlet@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.eclipse.equinox.http.servlet@default:default,org.adempiere.eclipse.equinox.http.servletbridge@default:default,org.adempiere.eclipse.equinox.servletbridge@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.fitrecorder@default:default,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:false"/>
+<stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.annotation@default:default,javax.ejb@default:default,javax.inject@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.restlet@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.fitrecorder@default:default,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
 <booleanAttribute key="tracing" value="false"/>
diff --git a/org.adempiere.base-feature/sign.database.build.launch b/org.adempiere.base-feature/sign.database.build.launch
index 1c4ea275cb..9fca88ba25 100644
--- a/org.adempiere.base-feature/sign.database.build.launch
+++ b/org.adempiere.base-feature/sign.database.build.launch
@@ -14,14 +14,14 @@
 <booleanAttribute key="default" value="false"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../runtime-sign.database.build"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
-<stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.annotation@default:default,javax.ejb@default:default,javax.inject@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.extension@default:default,org.apache.batik.parser@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.batik.xml@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:default,org.eclipse.osgi.compatibility.state@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.restlet.ext.net@default:default,org.restlet.ext.ssl@default:default,org.restlet@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.eclipse.equinox.http.servlet@default:default,org.adempiere.eclipse.equinox.http.servletbridge@default:default,org.adempiere.eclipse.equinox.servletbridge@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.fitrecorder@default:default,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:default"/>
+<stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.annotation@default:default,javax.ejb@default:default,javax.inject@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.restlet@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.fitrecorder@default:default,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
 <booleanAttribute key="tracing" value="false"/>
diff --git a/org.adempiere.base-feature/synchronize-terminology.app.launch b/org.adempiere.base-feature/synchronize-terminology.app.launch
index 69c11a275c..619a6689a8 100644
--- a/org.adempiere.base-feature/synchronize-terminology.app.launch
+++ b/org.adempiere.base-feature/synchronize-terminology.app.launch
@@ -14,7 +14,7 @@
 <booleanAttribute key="default" value="false"/>
 <booleanAttribute key="includeOptional" value="false"/>
 <stringAttribute key="location" value="${workspace_loc}/../runtime-translation.app"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog&#10;sync"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
diff --git a/org.adempiere.base-feature/translation.app.launch b/org.adempiere.base-feature/translation.app.launch
index 507f5f1cb8..d73e9c3ef7 100644
--- a/org.adempiere.base-feature/translation.app.launch
+++ b/org.adempiere.base-feature/translation.app.launch
@@ -14,7 +14,7 @@
 <booleanAttribute key="default" value="false"/>
 <booleanAttribute key="includeOptional" value="false"/>
 <stringAttribute key="location" value="${workspace_loc}/../runtime-translation.app"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog&#10;import ../globalqss-idempiere-lco/es_CO es_CO"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch
index bdd21ce681..a4e7a980f7 100644
--- a/org.adempiere.install/install.app.launch
+++ b/org.adempiere.install/install.app.launch
@@ -14,7 +14,7 @@
 <booleanAttribute key="default" value="false"/>
 <booleanAttribute key="includeOptional" value="false"/>
 <stringAttribute key="location" value="${workspace_loc}/../runtime-install.app"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.compatibility.bootdelegation=true"/>
diff --git a/org.adempiere.install/install.console.app.launch b/org.adempiere.install/install.console.app.launch
index 98d3e83a05..d51cf9c952 100644
--- a/org.adempiere.install/install.console.app.launch
+++ b/org.adempiere.install/install.console.app.launch
@@ -14,7 +14,7 @@
 <booleanAttribute key="default" value="false"/>
 <booleanAttribute key="includeOptional" value="false"/>
 <stringAttribute key="location" value="${workspace_loc}/../runtime-install.console.app"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
diff --git a/org.adempiere.server-feature/server.product.eventtest.launch b/org.adempiere.server-feature/server.product.eventtest.launch
index 7b4b4c5c5f..59c9aca21c 100644
--- a/org.adempiere.server-feature/server.product.eventtest.launch
+++ b/org.adempiere.server-feature/server.product.eventtest.launch
@@ -14,7 +14,7 @@
 <booleanAttribute key="default" value="false"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../runtime-server.product.eventtest"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dosgi.compatibility.bootdelegation=true"/>
@@ -22,8 +22,8 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
 <stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
-<stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.annotation@default:default,javax.ejb@default:default,javax.inject@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.persistence@default:default,javax.transaction@default:false,javax.websocket-api@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.aries.spifly.dynamic.bundle@2:true,org.apache.aries.util@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.extension@default:default,org.apache.batik.parser@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.batik.xml@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime@4:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.annotations@default:default,org.eclipse.jetty.apache-jsp@3:true,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.osgi.httpservice@default:default,org.eclipse.jetty.plus@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.jetty.util.ajax@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:default,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.mortbay.jasper.apache-el@default:default,org.mortbay.jasper.apache-jsp@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.restlet.ext.servlet@default:default,org.restlet@4:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.eclipse.equinox.http.servlet@default:true,org.adempiere.eclipse.equinox.http.servletbridge@default:true,org.adempiere.eclipse.equinox.servletbridge@default:true,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:default,org.adempiere.server@4:true,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:false,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:false"/>
+<stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.annotation@default:default,javax.ejb@default:default,javax.inject@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.persistence@default:default,javax.transaction@default:false,javax.websocket-api@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.aries.spifly.dynamic.bundle@2:true,org.apache.aries.util@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime@4:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.annotations@default:default,org.eclipse.jetty.apache-jsp@3:true,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.osgi.httpservice@default:default,org.eclipse.jetty.plus@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.jetty.util.ajax@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:default,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.mortbay.jasper.apache-el@default:default,org.mortbay.jasper.apache-jsp@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.restlet.ext.servlet@default:default,org.restlet@4:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:default,org.adempiere.server@4:true,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:false,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/org.adempiere.server-feature/server.product.functionaltest.launch b/org.adempiere.server-feature/server.product.functionaltest.launch
index a5703955dc..7dfd74ef46 100644
--- a/org.adempiere.server-feature/server.product.functionaltest.launch
+++ b/org.adempiere.server-feature/server.product.functionaltest.launch
@@ -14,7 +14,7 @@
 <booleanAttribute key="default" value="false"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../runtime-server.product"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.zkoss.zk.config.path=/WEB-INF/zk-selenium.xml -Dosgi.compatibility.bootdelegation=true"/>
@@ -22,8 +22,8 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
 <stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
-<stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.annotation@default:default,javax.ejb@default:default,javax.inject@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.persistence@default:default,javax.transaction@default:false,javax.websocket-api@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.aries.spifly.dynamic.bundle@2:true,org.apache.aries.util@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.extension@default:default,org.apache.batik.parser@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.batik.xml@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@2:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.felix.webconsole@default:true,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime@4:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@2:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.metatype@2:true,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.annotations@default:default,org.eclipse.jetty.apache-jsp@3:true,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.osgi.httpservice@default:true,org.eclipse.jetty.plus@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.jetty.util.ajax@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:true,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.json@default:default,org.junit@default:default,org.mortbay.jasper.apache-el@default:default,org.mortbay.jasper.apache-jsp@default:default,org.objectweb.asm.commons@default:true,org.objectweb.asm.tree@default:true,org.objectweb.asm@default:true,org.restlet.ext.servlet@default:default,org.restlet@4:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.eclipse.equinox.http.servlet@default:true,org.adempiere.eclipse.equinox.http.servletbridge@default:true,org.adempiere.eclipse.equinox.servletbridge@default:true,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:default,org.adempiere.server@4:true,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:false,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.felix.webconsole@default:true,org.idempiere.fitnesse.fixture@default:true,org.idempiere.fitnesse.server@default:true,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.ui.zk.selenium@default:true,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:false,org.zkoss.zk.library@default:true"/>
+<stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.annotation@default:default,javax.ejb@default:default,javax.inject@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.persistence@default:default,javax.transaction@default:false,javax.websocket-api@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.aries.spifly.dynamic.bundle@2:true,org.apache.aries.util@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@2:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.felix.webconsole@default:true,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime@4:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@2:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.metatype@2:true,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.annotations@default:default,org.eclipse.jetty.apache-jsp@3:true,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.osgi.httpservice@default:true,org.eclipse.jetty.plus@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.jetty.util.ajax@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:true,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.json@default:default,org.junit@default:default,org.mortbay.jasper.apache-el@default:default,org.mortbay.jasper.apache-jsp@default:default,org.objectweb.asm.commons@default:true,org.objectweb.asm.tree@default:true,org.objectweb.asm@default:true,org.restlet.ext.servlet@default:default,org.restlet@4:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:default,org.adempiere.server@4:true,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:false,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.felix.webconsole@default:true,org.idempiere.fitnesse.fixture@default:true,org.idempiere.fitnesse.server@default:true,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.ui.zk.selenium@default:true,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index ad89995a22..17412871d1 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -16,7 +16,7 @@
 <stringAttribute key="location" value="${workspace_loc}/../runtime-server.product"/>
 <stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.pde.ui.launcher.PDESourceLookupDirector"/>
 <stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;archive detectRoot=&amp;quot;true&amp;quot; path=&amp;quot;/home/hengsin/Downloads/eclipse-4.4/org.apache.felix.webconsole-4.0.0-sources.jar&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.externalArchive&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;archive detectRoot=&amp;quot;true&amp;quot; path=&amp;quot;/home/hengsin/Downloads/jetty-9.2.3.sources/org.apache.aries.spifly.dynamic.bundle-1.0.1-sources.jar&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.externalArchive&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;archive detectRoot=&amp;quot;true&amp;quot; path=&amp;quot;/home/hengsin/Downloads/jetty-9.2.3.sources/apache-jsp-8.0.9.M3-sources.jar&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.externalArchive&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;archive detectRoot=&amp;quot;true&amp;quot; path=&amp;quot;/home/hengsin/Downloads/jetty-9.2.3.sources/jetty-osgi-boot-9.2.3.v20140905-sources.jar&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.externalArchive&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;archive detectRoot=&amp;quot;true&amp;quot; path=&amp;quot;/home/hengsin/Downloads/jetty-9.2.3.sources/jetty-annotations-9.2.3.v20140905-sources.jar&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.externalArchive&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#10;&amp;lt;default/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#10;&lt;/sourceContainers&gt;&#10;&lt;/sourceLookupDirector&gt;&#10;"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dosgi.compatibility.bootdelegation=true -Dosgi.console.enable.builtin=false -XX:MaxPermSize=128M -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  -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true&#10;-Dhazelcast.config=${workspace_loc}/org.adempiere.server-feature/hazelcast-template.xml"/>
@@ -24,8 +24,8 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
 <stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
-<stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.persistence@default:default,javax.transaction@default:false,javax.websocket-api@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.aries.spifly.dynamic.bundle@2:true,org.apache.aries.util@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.extension@default:default,org.apache.batik.parser@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.batik.xml@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.fileupload@default:default,org.apache.commons.io@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.felix.webconsole@default:true,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime@4:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@2:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.metatype@2:true,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.annotations@default:default,org.eclipse.jetty.apache-jsp@3:true,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.osgi.httpservice@default:false,org.eclipse.jetty.plus@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.jetty.util.ajax@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:true,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.json@default:default,org.junit@default:default,org.mortbay.jasper.apache-el@default:default,org.mortbay.jasper.apache-jsp@default:default,org.objectweb.asm.commons@default:true,org.objectweb.asm.tree@default:true,org.objectweb.asm@default:true,org.restlet.ext.servlet@default:default,org.restlet@4:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default,zcommon@default:default,zel@default:default,zhtml@default:default,zjavassist@default:default,zk@default:default,zkbind@default:default,zkplus@default:default,zul@default:default,zweb@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.eclipse.equinox.http.servlet@default:default,org.adempiere.eclipse.equinox.http.servletbridge@default:default,org.adempiere.eclipse.equinox.servletbridge@default:default,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:true,org.adempiere.pipo@default:true,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:true,org.adempiere.server@4:true,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:false,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.felix.webconsole@default:true,org.idempiere.fitnesse.fixture@default:default,org.idempiere.fitnesse.server@default:default,org.idempiere.fitrecorder@default:default,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.webservices@5:true,org.idempiere.zk.extra@default:default,org.slf4j.jdk14@default:false"/>
+<stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.persistence@default:default,javax.transaction@default:false,javax.websocket-api@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.aries.spifly.dynamic.bundle@2:true,org.apache.aries.util@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.fileupload@default:default,org.apache.commons.io@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.felix.webconsole@default:true,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime@4:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@2:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.metatype@2:true,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.annotations@default:default,org.eclipse.jetty.apache-jsp@3:true,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.osgi.httpservice@default:false,org.eclipse.jetty.plus@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.jetty.util.ajax@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:true,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.json@default:default,org.junit@default:default,org.mortbay.jasper.apache-el@default:default,org.mortbay.jasper.apache-jsp@default:default,org.objectweb.asm.commons@default:true,org.objectweb.asm.tree@default:true,org.objectweb.asm@default:true,org.restlet.ext.servlet@default:default,org.restlet@4:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,zcommon@default:default,zel@default:default,zhtml@default:default,zjavassist@default:default,zk@default:default,zkbind@default:default,zkplus@default:default,zul@default:default,zweb@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:true,org.adempiere.pipo@default:true,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:true,org.adempiere.server@4:true,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:false,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.felix.webconsole@default:true,org.idempiere.fitnesse.fixture@default:default,org.idempiere.fitnesse.server@default:default,org.idempiere.fitrecorder@default:default,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.webservices@5:true,org.idempiere.zk.extra@default:default,org.slf4j.jdk14@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/org.adempiere.ui.swing-feature/swingclient.product.launch b/org.adempiere.ui.swing-feature/swingclient.product.launch
index d68504eb00..0a89e35972 100644
--- a/org.adempiere.ui.swing-feature/swingclient.product.launch
+++ b/org.adempiere.ui.swing-feature/swingclient.product.launch
@@ -14,7 +14,7 @@
 <booleanAttribute key="default" value="false"/>
 <booleanAttribute key="includeOptional" value="false"/>
 <stringAttribute key="location" value="${workspace_loc}/../runtime-swingclient.product"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal&#10;-Dsun.awt.disablegrab=true -Dosgi.compatibility.bootdelegation=true"/>
@@ -22,8 +22,8 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.ui.swing.client_product"/>
 <stringAttribute key="productFile" value="/org.adempiere.ui.swing-feature/swingclient.product"/>
-<stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.extension@default:default,org.apache.batik.parser@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.batik.xml@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:default,org.eclipse.osgi.compatibility.state@default:default,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.restlet.ext.net@default:true,org.restlet.ext.servlet@default:default,org.restlet.ext.ssl@default:default,org.restlet@default:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.swing@default:default,org.adempiere.report.jasper@default:default,org.adempiere.ui.swing@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:default"/>
+<stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.restlet.ext.servlet@default:default,org.restlet@default:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.swing@default:default,org.adempiere.report.jasper@default:default,org.adempiere.ui.swing@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>

From 16bfc4f59b65580c320c572719bfaf55885494f6 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Fri, 8 Jul 2016 23:22:03 +0700
Subject: [PATCH 21/34] IDEMPIERE-3136:all stuff relate library of idempiere
 update jetty to 9.3.10

---
 .../model.generator.launch                    |  4 +-
 org.adempiere.install/install.app.launch      |  2 +-
 .../install.console.app.launch                |  2 +-
 org.adempiere.sdk-feature/adempiere.cquery    |  6 +-
 org.adempiere.sdk-feature/adempiere.rmap      |  9 +++
 org.adempiere.server-feature/feature.xml      | 57 +++++++++++++++++++
 .../server.product.launch                     |  2 +-
 7 files changed, 74 insertions(+), 8 deletions(-)

diff --git a/org.adempiere.base-feature/model.generator.launch b/org.adempiere.base-feature/model.generator.launch
index 549d72de80..1aaf96a257 100644
--- a/org.adempiere.base-feature/model.generator.launch
+++ b/org.adempiere.base-feature/model.generator.launch
@@ -20,8 +20,8 @@
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
-<stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.annotation@default:default,javax.ejb@default:default,javax.inject@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.restlet@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.fitrecorder@default:default,org.idempiere.webservices@default:default,org.slf4j.jdk14@default:false"/>
+<stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.itextpdf@default:default,com.sun.mail.javax.mail@default:default,groovy-all@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.annotation@default:default,javax.ejb@default:default,javax.inject@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.passay@default:default,org.restlet@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.ui@default:default,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.fitrecorder@default:default,org.slf4j.jdk14@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
 <booleanAttribute key="tracing" value="false"/>
diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch
index a4e7a980f7..e6f0bd0ae1 100644
--- a/org.adempiere.install/install.app.launch
+++ b/org.adempiere.install/install.app.launch
@@ -21,7 +21,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
-<stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:false,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.restlet@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/>
+<stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.itextpdf@default:default,com.sun.mail.javax.mail@default:default,groovy-all@default:default,javax.activation@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:false,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.passay@default:default,org.restlet@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/>
 <stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.slf4j.jdk14@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
diff --git a/org.adempiere.install/install.console.app.launch b/org.adempiere.install/install.console.app.launch
index d51cf9c952..d68fb0a5ed 100644
--- a/org.adempiere.install/install.console.app.launch
+++ b/org.adempiere.install/install.console.app.launch
@@ -20,7 +20,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
-<stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.restlet@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/>
+<stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.itextpdf@default:default,com.sun.mail.javax.mail@default:default,groovy-all@default:default,javax.activation@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.transaction@default:false,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.passay@default:default,org.restlet@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/>
 <stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.slf4j.jdk14@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
diff --git a/org.adempiere.sdk-feature/adempiere.cquery b/org.adempiere.sdk-feature/adempiere.cquery
index 6e381a868b..3a8388744e 100644
--- a/org.adempiere.sdk-feature/adempiere.cquery
+++ b/org.adempiere.sdk-feature/adempiere.cquery
@@ -11,8 +11,8 @@
     <cq:advisorNode namePattern="^org\.objectweb\.asm(\..+)?" componentType="osgi.bundle" versionOverride="[5.0.1,6.0.0)"/>
     <cq:advisorNode namePattern="^org\.apache\.felix\.webconsole$" useTargetPlatform="false" useWorkspace="false" versionOverride="[4.2.2,4.3.0)"/>
     <cq:advisorNode namePattern="^org\.apache\.felix\.webconsole\.plugins\.packageadmin$" useTargetPlatform="false" useWorkspace="false" versionOverride="[1.0.0,1.0.0]"/>
-    <cq:advisorNode namePattern="^org\.eclipse\.jetty\.osgi-servlet-api$" useTargetPlatform="false" useWorkspace="false" versionOverride="[0.0.0,9.3.0]"/>
-    <cq:advisorNode namePattern="^org\.eclipse\.jetty\.alpn\.api$" versionOverride="[0.0.0,9.3.0)"/>
-    <cq:advisorNode namePattern="^org\.eclipse\.jetty(\..+)?" useTargetPlatform="false" useWorkspace="false" versionOverride="[9.2.0,9.3.0)"/>
+    <cq:advisorNode namePattern="^org\.eclipse\.jetty\.osgi-servlet-api$" useTargetPlatform="false" useWorkspace="false" versionOverride="[0.0.0,9.3.11]"/>
+    <cq:advisorNode namePattern="^org\.eclipse\.jetty\.alpn\.api$" versionOverride="[0.0.0,9.3.11)"/>
+    <cq:advisorNode namePattern="^org\.eclipse\.jetty(\..+)?" useTargetPlatform="false" useWorkspace="false" versionOverride="[9.2.0,9.3.11)"/>
     <cq:advisorNode namePattern="^.*$" useTargetPlatform="false" useWorkspace="false"/>
 </cq:componentQuery>
diff --git a/org.adempiere.sdk-feature/adempiere.rmap b/org.adempiere.sdk-feature/adempiere.rmap
index 962bad1c93..b57e370d6e 100644
--- a/org.adempiere.sdk-feature/adempiere.rmap
+++ b/org.adempiere.sdk-feature/adempiere.rmap
@@ -5,9 +5,13 @@
   <rm:locator pattern="^org\.idempiere\.hazelcast\.service$" searchPathRef="workspace.project"/>
   <rm:locator pattern="^org\.apache\.poi$" searchPathRef="orbit"/>
   <rm:locator pattern="^org\.eclipse\.jdt\.core\.compiler\.batch$" searchPathRef="bundles.maven"/>
+  <rm:locator pattern="^org\.apache\.commons\.collections4$" searchPathRef="bundles.maven"/>
+  <rm:locator pattern="^org\.apache\.commons\.configuration$" searchPathRef="bundles.maven"/>
   <rm:locator pattern="^org\.mortbay\.jasper(\..+)?" searchPathRef="bundles.maven"/>
   <rm:locator pattern="^org\.eclipse\.jetty\.apache\-jsp$" searchPathRef="bundles.maven"/>
   <rm:locator pattern="^org\.eclipse\.jetty\.osgi\-servlet\-api$" searchPathRef="bundles.maven"/>
+  <rm:locator pattern="^org\.eclipse\.jetty\.alpn\.api$" searchPathRef="bundles.maven"/>
+  <rm:locator pattern="^org\.mortbay\.jetty\.alpn\.boot$" searchPathRef="bundles.maven"/>
   <rm:locator pattern="^org\.apache\.felix\.webconsole(\..+)?" searchPathRef="bundles.maven"/>
   <rm:locator pattern="^org\.apache\.felix\.inventory" searchPathRef="bundles.maven"/>
   <rm:locator pattern="^org\.passay$" searchPathRef="bundles.maven" />
@@ -149,9 +153,14 @@
         <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" />
         <maven:entry groupId="com.ibm.icu" artifactId="icu4j" name="com.ibm.icu" />
         <maven:entry groupId="joda-time" artifactId="joda-time" name="joda-time" />
+	<maven:entry groupId="commons-configuration" artifactId="commons-configuration" name="org.apache.commons.configuration"/>
+        <maven:entry artifactId="commons-collections4" groupId="org.apache.commons" name="org.apache.commons.collections4"/>
       </maven:mappings>
     </rm:provider>
   </rm:searchPath>
diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml
index 04aa68fdfa..a5c05d1ffe 100644
--- a/org.adempiere.server-feature/feature.xml
+++ b/org.adempiere.server-feature/feature.xml
@@ -453,6 +453,63 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.jetty.http2.common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.http2.server"
+         download-size="0"
+         install-size="0"
+         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"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.xml"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.osgi.alpn.fragment"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.alpn.api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="org.eclipse.jetty.http2.hpack"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="org.slf4j.jdk14"
          download-size="0"
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index 17412871d1..22ef40eb7e 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -24,7 +24,7 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
 <stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
-<stringAttribute key="selected_target_plugins" value="com.sun.mail.javax.mail@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.persistence@default:default,javax.transaction@default:false,javax.websocket-api@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.aries.spifly.dynamic.bundle@2:true,org.apache.aries.util@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.fileupload@default:default,org.apache.commons.io@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.felix.webconsole@default:true,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime@4:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@2:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.metatype@2:true,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.annotations@default:default,org.eclipse.jetty.apache-jsp@3:true,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.osgi.httpservice@default:false,org.eclipse.jetty.plus@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.jetty.util.ajax@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:true,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.json@default:default,org.junit@default:default,org.mortbay.jasper.apache-el@default:default,org.mortbay.jasper.apache-jsp@default:default,org.objectweb.asm.commons@default:true,org.objectweb.asm.tree@default:true,org.objectweb.asm@default:true,org.restlet.ext.servlet@default:default,org.restlet@4:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,zcommon@default:default,zel@default:default,zhtml@default:default,zjavassist@default:default,zk@default:default,zkbind@default:default,zkplus@default:default,zul@default:default,zweb@default:default"/>
+<stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.ibm.icu@default:default,com.itextpdf@default:default,com.sun.mail.javax.mail@default:default,groovy-all@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.persistence@default:default,javax.transaction@default:false,javax.websocket-api@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,joda-time@default:default,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.aries.spifly.dynamic.bundle@2:true,org.apache.aries.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.fileupload@default:default,org.apache.commons.io@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.felix.webconsole@default:true,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.xalan@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.atmosphere.runtime@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime@4:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@2:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.http.servletbridge@default:default,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.metatype@2:true,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.servletbridge@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.alpn.api@default:default,org.eclipse.jetty.alpn.server@default:default,org.eclipse.jetty.annotations@default:default,org.eclipse.jetty.apache-jsp@3:true,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http2.common@default:default,org.eclipse.jetty.http2.hpack@default:default,org.eclipse.jetty.http2.server@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.alpn.fragment@default:false,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.osgi.httpservice@default:false,org.eclipse.jetty.plus@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.jetty.util.ajax@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:true,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.json@default:default,org.junit@default:default,org.mortbay.jasper.apache-el@default:default,org.mortbay.jasper.apache-jsp@default:default,org.mortbay.jetty.alpn.boot@default:default,org.objectweb.asm.commons@default:true,org.objectweb.asm.tree@default:true,org.objectweb.asm@default:true,org.passay@default:default,org.restlet.ext.servlet@default:default,org.restlet@4:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,zcommon@default:default,zel@default:default,zhtml@default:default,zjavassist@default:default,zk@default:default,zkbind@default:default,zkplus@default:default,zul@default:default,zweb@default:default"/>
 <stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:true,org.adempiere.pipo@default:true,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:true,org.adempiere.server@4:true,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:false,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.felix.webconsole@default:true,org.idempiere.fitnesse.fixture@default:default,org.idempiere.fitnesse.server@default:default,org.idempiere.fitrecorder@default:default,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.webservices@5:true,org.idempiere.zk.extra@default:default,org.slf4j.jdk14@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>

From a46d233f3728584398f45c551789784f56bbbd47 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Fri, 8 Jul 2016 23:54:51 +0700
Subject: [PATCH 22/34] IDEMPIERE-3136:all stuff relate library of idempiere
 update jetty to 9.3.10 work-around for:
 https://github.com/eclipse/jetty.project/issues/262
 https://github.com/eclipse/jetty.project/issues/704

---
 .hgignore                                     |    1 +
 org.adempiere.sdk-feature/adempiere.rmap      |    9 +
 .../materialize.properties                    |    2 +
 .../server.product.launch                     |    4 +-
 org.eclipse.jetty.http/.classpath             |    7 +
 org.eclipse.jetty.http/.project               |   33 +
 org.eclipse.jetty.http/META-INF/MANIFEST.MF   |   35 +
 ...org.eclipse.jetty.http.HttpFieldPreEncoder |    2 +
 org.eclipse.jetty.http/about.html             |   27 +
 org.eclipse.jetty.http/build.properties       |    4 +
 .../jetty/http/BadMessageException.java       |   71 +
 .../org/eclipse/jetty/http/DateGenerator.java |  173 ++
 .../org/eclipse/jetty/http/DateParser.java    |  109 +
 .../eclipse/jetty/http/GzipHttpContent.java   |  188 ++
 .../eclipse/jetty/http/HostPortHttpField.java |  106 +
 .../jetty/http/Http1FieldPreEncoder.java      |   69 +
 .../eclipse/jetty/http/HttpCompliance.java    |   32 +
 .../org/eclipse/jetty/http/HttpContent.java   |   80 +
 .../org/eclipse/jetty/http/HttpCookie.java    |  164 ++
 .../src/org/eclipse/jetty/http/HttpField.java |  510 +++++
 .../jetty/http/HttpFieldPreEncoder.java       |   36 +
 .../org/eclipse/jetty/http/HttpFields.java    |  970 +++++++++
 .../org/eclipse/jetty/http/HttpGenerator.java | 1023 ++++++++++
 .../org/eclipse/jetty/http/HttpHeader.java    |  191 ++
 .../eclipse/jetty/http/HttpHeaderValue.java   |  104 +
 .../org/eclipse/jetty/http/HttpMethod.java    |  187 ++
 .../org/eclipse/jetty/http/HttpParser.java    | 1802 +++++++++++++++++
 .../org/eclipse/jetty/http/HttpScheme.java    |   79 +
 .../org/eclipse/jetty/http/HttpStatus.java    | 1076 ++++++++++
 .../org/eclipse/jetty/http/HttpTokens.java    |   38 +
 .../src/org/eclipse/jetty/http/HttpURI.java   |  783 +++++++
 .../org/eclipse/jetty/http/HttpVersion.java   |  173 ++
 .../src/org/eclipse/jetty/http/MetaData.java  |  298 +++
 .../src/org/eclipse/jetty/http/MimeTypes.java |  497 +++++
 .../src/org/eclipse/jetty/http/PathMap.java   |  641 ++++++
 .../jetty/http/PreEncodedHttpField.java       |   94 +
 .../src/org/eclipse/jetty/http/QuotedCSV.java |  229 +++
 .../eclipse/jetty/http/QuotedQualityCSV.java  |  252 +++
 .../jetty/http/ResourceHttpContent.java       |  227 +++
 .../eclipse/jetty/http/encoding.properties    |    5 +
 .../org/eclipse/jetty/http/mime.properties    |  189 ++
 .../org/eclipse/jetty/http/package-info.java  |   23 +
 .../jetty/http/pathmap/MappedResource.java    |  101 +
 .../jetty/http/pathmap/PathMappings.java      |  159 ++
 .../eclipse/jetty/http/pathmap/PathSpec.java  |  167 ++
 .../jetty/http/pathmap/PathSpecGroup.java     |  101 +
 .../jetty/http/pathmap/PathSpecSet.java       |  222 ++
 .../jetty/http/pathmap/RegexPathSpec.java     |  176 ++
 .../jetty/http/pathmap/ServletPathSpec.java   |  261 +++
 .../http/pathmap/UriTemplatePathSpec.java     |  341 ++++
 .../jetty/http2/hpack/AuthorityHttpField.java |   43 +
 .../jetty/http2/hpack/HpackContext.java       |  515 +++++
 .../jetty/http2/hpack/HpackDecoder.java       |  280 +++
 .../jetty/http2/hpack/HpackEncoder.java       |  354 ++++
 .../http2/hpack/HpackFieldPreEncoder.java     |   97 +
 .../eclipse/jetty/http2/hpack/Huffman.java    |  480 +++++
 .../jetty/http2/hpack/MetaDataBuilder.java    |  184 ++
 .../jetty/http2/hpack/NBitInteger.java        |  151 ++
 .../http2/hpack/StaticTableHttpField.java     |   61 +
 59 files changed, 14234 insertions(+), 2 deletions(-)
 create mode 100644 org.eclipse.jetty.http/.classpath
 create mode 100644 org.eclipse.jetty.http/.project
 create mode 100644 org.eclipse.jetty.http/META-INF/MANIFEST.MF
 create mode 100644 org.eclipse.jetty.http/META-INF/services/org.eclipse.jetty.http.HttpFieldPreEncoder
 create mode 100644 org.eclipse.jetty.http/about.html
 create mode 100644 org.eclipse.jetty.http/build.properties
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/BadMessageException.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/DateGenerator.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/DateParser.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/GzipHttpContent.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/HostPortHttpField.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/Http1FieldPreEncoder.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpCompliance.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpContent.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpCookie.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpField.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpFieldPreEncoder.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpFields.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpGenerator.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpHeader.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpHeaderValue.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpMethod.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpParser.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpScheme.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpStatus.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpTokens.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpURI.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpVersion.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/MetaData.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/MimeTypes.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/PathMap.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/PreEncodedHttpField.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/QuotedCSV.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/QuotedQualityCSV.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/ResourceHttpContent.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/encoding.properties
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/mime.properties
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/package-info.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/MappedResource.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/PathMappings.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/PathSpec.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/PathSpecGroup.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/PathSpecSet.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/RegexPathSpec.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/ServletPathSpec.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/UriTemplatePathSpec.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/AuthorityHttpField.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/HpackContext.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/HpackDecoder.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/HpackEncoder.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/HpackFieldPreEncoder.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/Huffman.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/MetaDataBuilder.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/NBitInteger.java
 create mode 100644 org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/StaticTableHttpField.java

diff --git a/.hgignore b/.hgignore
index 0b340a0611..a5668b81f8 100644
--- a/.hgignore
+++ b/.hgignore
@@ -2,6 +2,7 @@ syntax: glob
 build
 
 External Plug-in Libraries
+org.eclipse.jetty.http/bin
 syntax: regexp
 ^adempiere$
 ^org\.adempiere\.install/lib$
diff --git a/org.adempiere.sdk-feature/adempiere.rmap b/org.adempiere.sdk-feature/adempiere.rmap
index b57e370d6e..0755abc8f0 100644
--- a/org.adempiere.sdk-feature/adempiere.rmap
+++ b/org.adempiere.sdk-feature/adempiere.rmap
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rm:rmap xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns:maven="http://www.eclipse.org/buckminster/MavenProvider-1.0" xmlns:rm="http://www.eclipse.org/buckminster/RMap-1.0">
+  <rm:locator pattern="^org\.eclipse\.jetty\.http$" searchPathRef="workspace.project"/>
+  <rm:locator pattern="^org\.eclipse\.jetty\.alpn\.api$" searchPathRef="modify-bundle"/>
   <rm:locator pattern="^org\.apache\.felix\.webconsole\.plugins\.packageadmin$" searchPathRef="bundles.maven"/>
   <rm:locator pattern="^org\.idempiere\.hazelcast\.service$" searchPathRef="workspace.feature" failOnError="false"/>
   <rm:locator pattern="^org\.idempiere\.hazelcast\.service$" searchPathRef="workspace.project"/>
@@ -171,4 +173,11 @@
       <rm:uri format="${url.zkoss.osgi}"/>
     </rm:provider>
   </rm:searchPath>
+  <rm:searchPath name="modify-bundle">
+    <rm:provider componentTypes="osgi.bundle" readerType="p2" source="false" mutable="false">
+      <rm:property key="buckminster.source" value="false"/>
+      <rm:property key="buckminster.mutable" value="false"/>
+      <rm:uri format="${url.modify.bundle}"/>
+    </rm:provider>
+  </rm:searchPath>
 </rm:rmap>
diff --git a/org.adempiere.sdk-feature/materialize.properties b/org.adempiere.sdk-feature/materialize.properties
index f8742f20b0..44deafc490 100644
--- a/org.adempiere.sdk-feature/materialize.properties
+++ b/org.adempiere.sdk-feature/materialize.properties
@@ -26,3 +26,5 @@ url.orbit.neon=http://download.eclipse.org/tools/orbit/downloads/drops/R20160520
 url.file.srv=http://downloads.sourceforge.net/project/idempiere/binary.file
 
 url.restlet.p2=http://p2.restlet.com/2.3
+
+url.modify.bundle=http://downloads.sourceforge.net/project/idempiere/p2/modifyBundle-1.0.0
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index 22ef40eb7e..651c99c7e8 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -24,8 +24,8 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
 <stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
-<stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.ibm.icu@default:default,com.itextpdf@default:default,com.sun.mail.javax.mail@default:default,groovy-all@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.persistence@default:default,javax.transaction@default:false,javax.websocket-api@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,joda-time@default:default,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.aries.spifly.dynamic.bundle@2:true,org.apache.aries.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.fileupload@default:default,org.apache.commons.io@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.felix.webconsole@default:true,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.xalan@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.atmosphere.runtime@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime@4:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@2:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.http.servletbridge@default:default,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.metatype@2:true,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.servletbridge@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.alpn.api@default:default,org.eclipse.jetty.alpn.server@default:default,org.eclipse.jetty.annotations@default:default,org.eclipse.jetty.apache-jsp@3:true,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http2.common@default:default,org.eclipse.jetty.http2.hpack@default:default,org.eclipse.jetty.http2.server@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.alpn.fragment@default:false,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.osgi.httpservice@default:false,org.eclipse.jetty.plus@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.jetty.util.ajax@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:true,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.json@default:default,org.junit@default:default,org.mortbay.jasper.apache-el@default:default,org.mortbay.jasper.apache-jsp@default:default,org.mortbay.jetty.alpn.boot@default:default,org.objectweb.asm.commons@default:true,org.objectweb.asm.tree@default:true,org.objectweb.asm@default:true,org.passay@default:default,org.restlet.ext.servlet@default:default,org.restlet@4:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,zcommon@default:default,zel@default:default,zhtml@default:default,zjavassist@default:default,zk@default:default,zkbind@default:default,zkplus@default:default,zul@default:default,zweb@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:true,org.adempiere.pipo@default:true,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:true,org.adempiere.server@4:true,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:false,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.felix.webconsole@default:true,org.idempiere.fitnesse.fixture@default:default,org.idempiere.fitnesse.server@default:default,org.idempiere.fitrecorder@default:default,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.webservices@5:true,org.idempiere.zk.extra@default:default,org.slf4j.jdk14@default:false"/>
+<stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.ibm.icu@default:default,com.itextpdf@default:default,com.sun.mail.javax.mail@default:default,groovy-all@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.persistence@default:default,javax.transaction@default:false,javax.websocket-api@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,joda-time@default:default,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.aries.spifly.dynamic.bundle@2:true,org.apache.aries.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.fileupload@default:default,org.apache.commons.io@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.felix.webconsole@default:true,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.xalan@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.atmosphere.runtime@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime@4:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@2:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.http.servletbridge@default:default,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.metatype@2:true,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.servletbridge@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.alpn.api@default:default,org.eclipse.jetty.alpn.server@default:default,org.eclipse.jetty.annotations@default:default,org.eclipse.jetty.apache-jsp@3:true,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http2.common@default:default,org.eclipse.jetty.http2.server@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.alpn.fragment@default:false,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.osgi.httpservice@default:false,org.eclipse.jetty.plus@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.jetty.util.ajax@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:true,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.json@default:default,org.junit@default:default,org.mortbay.jasper.apache-el@default:default,org.mortbay.jasper.apache-jsp@default:default,org.mortbay.jetty.alpn.boot@default:default,org.objectweb.asm.commons@default:true,org.objectweb.asm.tree@default:true,org.objectweb.asm@default:true,org.passay@default:default,org.restlet.ext.servlet@default:default,org.restlet@4:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,zcommon@default:default,zel@default:default,zhtml@default:default,zjavassist@default:default,zk@default:default,zkbind@default:default,zkplus@default:default,zul@default:default,zweb@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:true,org.adempiere.pipo@default:true,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:true,org.adempiere.server@4:true,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:false,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.eclipse.jetty.http@default:default,org.idempiere.felix.webconsole@default:true,org.idempiere.fitnesse.fixture@default:default,org.idempiere.fitnesse.server@default:default,org.idempiere.fitrecorder@default:default,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.webservices@5:true,org.idempiere.zk.extra@default:default,org.slf4j.jdk14@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/org.eclipse.jetty.http/.classpath b/org.eclipse.jetty.http/.classpath
new file mode 100644
index 0000000000..ed0eb24c50
--- /dev/null
+++ b/org.eclipse.jetty.http/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.eclipse.jetty.http/.project b/org.eclipse.jetty.http/.project
new file mode 100644
index 0000000000..dd72cce6c0
--- /dev/null
+++ b/org.eclipse.jetty.http/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.jetty.http</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.jetty.http/META-INF/MANIFEST.MF b/org.eclipse.jetty.http/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..91b423aa8a
--- /dev/null
+++ b/org.eclipse.jetty.http/META-INF/MANIFEST.MF
@@ -0,0 +1,35 @@
+Manifest-Version: 1.0
+Archiver-Version: Plexus Archiver
+Created-By: Apache Maven Bundle Plugin
+Built-By: joakim
+Build-Jdk: 1.8.0_65
+Implementation-Vendor: Eclipse.org - Jetty
+Implementation-Version: 9.3.10.v20160621
+url: http://www.eclipse.org/jetty
+Bnd-LastModified: 1457969504223
+Bundle-Classpath: .
+Bundle-Copyright: Copyright (c) 2008-2016 Mort Bay Consulting Pty. Ltd.
+Bundle-Description: Jetty module for Jetty :: Http Utility
+Bundle-DocURL: http://www.eclipse.org/jetty
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0, http://www
+ .eclipse.org/org/documents/epl-v10.php
+Bundle-ManifestVersion: 2
+Bundle-Name: Jetty :: Http Utility
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-SymbolicName: org.eclipse.jetty.http
+Bundle-Vendor: Eclipse Jetty Project
+Bundle-Version: 9.3.10.v20160621
+Export-Package: org.eclipse.jetty.http;version="9.3.10";uses:="org.ecl
+ ipse.jetty.util,org.eclipse.jetty.util.log,org.eclipse.jetty.util.res
+ ource",org.eclipse.jetty.http.pathmap;version="9.3.10";uses:="org.ecl
+ ipse.jetty.util.annotation,org.eclipse.jetty.util.component",org.ecli
+ pse.jetty.http2.hpack;version="9.3.10";uses:="org.eclipse.jetty.http,
+ org.eclipse.jetty.util.log"
+Import-Package: org.eclipse.jetty.util;version="[9.3.10,9.3.11)",org.e
+ clipse.jetty.util.annotation;version="[9.3.10,9.3.11)",org.eclipse.je
+ tty.util.component;version="[9.3.10,9.3.11)",org.eclipse.jetty.util.l
+ og;version="[9.3.10,9.3.11)",org.eclipse.jetty.util.resource;version=
+ "[9.3.10,9.3.11)"
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
+Tool: Bnd-2.4.1.201501161923
+
diff --git a/org.eclipse.jetty.http/META-INF/services/org.eclipse.jetty.http.HttpFieldPreEncoder b/org.eclipse.jetty.http/META-INF/services/org.eclipse.jetty.http.HttpFieldPreEncoder
new file mode 100644
index 0000000000..0da39aad7a
--- /dev/null
+++ b/org.eclipse.jetty.http/META-INF/services/org.eclipse.jetty.http.HttpFieldPreEncoder
@@ -0,0 +1,2 @@
+org.eclipse.jetty.http.Http1FieldPreEncoder
+org.eclipse.jetty.http2.hpack.HpackFieldPreEncoder
diff --git a/org.eclipse.jetty.http/about.html b/org.eclipse.jetty.http/about.html
new file mode 100644
index 0000000000..e13b48d47f
--- /dev/null
+++ b/org.eclipse.jetty.http/about.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>19 May, 2009</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  The Content is dual licensed and is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 (&quot;EPL&quot;) as well as the Apache Software License Version 2.0.  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.  A copy of the ASL is available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html">http://www.apache.org/licenses/LICENSE-2.0.html</a>.  For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+<p><b>jetty-util</b> artifact only:<br/><br/>The UnixCrypt.java code implements the one way cryptography used by
+Unix systems for simple password protection.  Copyright 1996 Aki Yoshida,
+modified April 2001  by Iris Van den Broeke, Daniel Deville.
+Permission to use, copy, modify and distribute UnixCrypt
+for non-commercial or commercial purposes and without fee is
+granted provided that the copyright notice appears in all copies.</p>
+
+</body>
+</html>
diff --git a/org.eclipse.jetty.http/build.properties b/org.eclipse.jetty.http/build.properties
new file mode 100644
index 0000000000..34d2e4d2da
--- /dev/null
+++ b/org.eclipse.jetty.http/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/BadMessageException.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/BadMessageException.java
new file mode 100644
index 0000000000..c3a68d8ef9
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/BadMessageException.java
@@ -0,0 +1,71 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http;
+
+/* ------------------------------------------------------------------------------- */
+/** 
+ * <p>Exception thrown to indicate a Bad HTTP Message has either been received
+ * or attempted to be generated.  Typically these are handled with either 400
+ * or 500 responses.</p>
+ */
+@SuppressWarnings("serial")
+public class BadMessageException extends RuntimeException
+{
+    final int _code;
+    final String _reason;
+
+    public BadMessageException()
+    {
+        this(400,null);
+    }
+    
+    public BadMessageException(int code)
+    {
+        this(code,null);
+    }
+    
+    public BadMessageException(String reason)
+    {
+        this(400,reason);
+    }
+    
+    public BadMessageException(int code, String reason)
+    {
+        super(code+": "+reason);
+        _code=code;
+        _reason=reason;
+    }
+    
+    public BadMessageException(int code, String reason, Throwable cause)
+    {
+        super(code+": "+reason, cause);
+        _code=code;
+        _reason=reason;
+    }
+    
+    public int getCode()
+    {
+        return _code;
+    }
+    
+    public String getReason()
+    {
+        return _reason;
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/DateGenerator.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/DateGenerator.java
new file mode 100644
index 0000000000..183b29f6b6
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/DateGenerator.java
@@ -0,0 +1,173 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http;
+
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.TimeZone;
+
+import org.eclipse.jetty.util.StringUtil;
+
+/**
+ * ThreadLocal Date formatters for HTTP style dates.
+ */
+public class DateGenerator
+{
+    private static final TimeZone __GMT = TimeZone.getTimeZone("GMT");
+    static
+    {
+        __GMT.setID("GMT");
+    }
+    
+    static final String[] DAYS =
+        { "Sat", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
+    static final String[] MONTHS =
+        { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "Jan"};
+
+
+    private static final ThreadLocal<DateGenerator> __dateGenerator =new ThreadLocal<DateGenerator>()
+    {
+        @Override
+        protected DateGenerator initialValue()
+        {
+            return new DateGenerator();
+        }
+    };
+
+
+    public final static String __01Jan1970=DateGenerator.formatDate(0);
+    
+    /**
+     * Format HTTP date "EEE, dd MMM yyyy HH:mm:ss 'GMT'"
+     * @param date the date in milliseconds
+     * @return the formatted date
+     */
+    public static String formatDate(long date)
+    {
+        return __dateGenerator.get().doFormatDate(date);
+    }
+
+    /**
+     * Format "EEE, dd-MMM-yyyy HH:mm:ss 'GMT'" for cookies
+     * @param buf the buffer to put the formatted date into
+     * @param date the date in milliseconds
+     */
+    public static void formatCookieDate(StringBuilder buf, long date)
+    {
+        __dateGenerator.get().doFormatCookieDate(buf,date);
+    }
+
+    /**
+     * Format "EEE, dd-MMM-yyyy HH:mm:ss 'GMT'" for cookies
+     * @param date the date in milliseconds 
+     * @return the formatted date
+     */
+    public static String formatCookieDate(long date)
+    {
+        StringBuilder buf = new StringBuilder(28);
+        formatCookieDate(buf, date);
+        return buf.toString();
+    }
+    
+    private final StringBuilder buf = new StringBuilder(32);
+    private final GregorianCalendar gc = new GregorianCalendar(__GMT);
+
+    /**
+     * Format HTTP date "EEE, dd MMM yyyy HH:mm:ss 'GMT'"
+     * @param date the date in milliseconds
+     * @return the formatted date
+     */
+    public String doFormatDate(long date)
+    {
+        buf.setLength(0);
+        gc.setTimeInMillis(date);
+
+        int day_of_week = gc.get(Calendar.DAY_OF_WEEK);
+        int day_of_month = gc.get(Calendar.DAY_OF_MONTH);
+        int month = gc.get(Calendar.MONTH);
+        int year = gc.get(Calendar.YEAR);
+        int century = year / 100;
+        year = year % 100;
+
+        int hours = gc.get(Calendar.HOUR_OF_DAY);
+        int minutes = gc.get(Calendar.MINUTE);
+        int seconds = gc.get(Calendar.SECOND);
+
+        buf.append(DAYS[day_of_week]);
+        buf.append(',');
+        buf.append(' ');
+        StringUtil.append2digits(buf, day_of_month);
+
+        buf.append(' ');
+        buf.append(MONTHS[month]);
+        buf.append(' ');
+        StringUtil.append2digits(buf, century);
+        StringUtil.append2digits(buf, year);
+
+        buf.append(' ');
+        StringUtil.append2digits(buf, hours);
+        buf.append(':');
+        StringUtil.append2digits(buf, minutes);
+        buf.append(':');
+        StringUtil.append2digits(buf, seconds);
+        buf.append(" GMT");
+        return buf.toString();
+    }
+
+    /**
+     * Format "EEE, dd-MMM-yy HH:mm:ss 'GMT'" for cookies
+     * @param buf the buffer to format the date into
+     * @param date the date in milliseconds
+     */
+    public void doFormatCookieDate(StringBuilder buf, long date)
+    {
+        gc.setTimeInMillis(date);
+
+        int day_of_week = gc.get(Calendar.DAY_OF_WEEK);
+        int day_of_month = gc.get(Calendar.DAY_OF_MONTH);
+        int month = gc.get(Calendar.MONTH);
+        int year = gc.get(Calendar.YEAR);
+        year = year % 10000;
+
+        int epoch = (int) ((date / 1000) % (60 * 60 * 24));
+        int seconds = epoch % 60;
+        epoch = epoch / 60;
+        int minutes = epoch % 60;
+        int hours = epoch / 60;
+
+        buf.append(DAYS[day_of_week]);
+        buf.append(',');
+        buf.append(' ');
+        StringUtil.append2digits(buf, day_of_month);
+
+        buf.append('-');
+        buf.append(MONTHS[month]);
+        buf.append('-');
+        StringUtil.append2digits(buf, year/100);
+        StringUtil.append2digits(buf, year%100);
+
+        buf.append(' ');
+        StringUtil.append2digits(buf, hours);
+        buf.append(':');
+        StringUtil.append2digits(buf, minutes);
+        buf.append(':');
+        StringUtil.append2digits(buf, seconds);
+        buf.append(" GMT");
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/DateParser.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/DateParser.java
new file mode 100644
index 0000000000..8c95694071
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/DateParser.java
@@ -0,0 +1,109 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
+
+/**
+ * ThreadLocal data parsers for HTTP style dates
+ *
+ */
+public class DateParser
+{
+    private static final TimeZone __GMT = TimeZone.getTimeZone("GMT");
+    static
+    {
+        __GMT.setID("GMT");
+    }
+    
+    final static String __dateReceiveFmt[] =
+    {
+        "EEE, dd MMM yyyy HH:mm:ss zzz",
+        "EEE, dd-MMM-yy HH:mm:ss",
+        "EEE MMM dd HH:mm:ss yyyy",
+
+        "EEE, dd MMM yyyy HH:mm:ss", "EEE dd MMM yyyy HH:mm:ss zzz",
+        "EEE dd MMM yyyy HH:mm:ss", "EEE MMM dd yyyy HH:mm:ss zzz", "EEE MMM dd yyyy HH:mm:ss",
+        "EEE MMM-dd-yyyy HH:mm:ss zzz", "EEE MMM-dd-yyyy HH:mm:ss", "dd MMM yyyy HH:mm:ss zzz",
+        "dd MMM yyyy HH:mm:ss", "dd-MMM-yy HH:mm:ss zzz", "dd-MMM-yy HH:mm:ss", "MMM dd HH:mm:ss yyyy zzz",
+        "MMM dd HH:mm:ss yyyy", "EEE MMM dd HH:mm:ss yyyy zzz",
+        "EEE, MMM dd HH:mm:ss yyyy zzz", "EEE, MMM dd HH:mm:ss yyyy", "EEE, dd-MMM-yy HH:mm:ss zzz",
+        "EEE dd-MMM-yy HH:mm:ss zzz", "EEE dd-MMM-yy HH:mm:ss",
+    };
+
+    public static long parseDate(String date)
+    {
+        return __dateParser.get().parse(date);
+    }
+
+    private static final ThreadLocal<DateParser> __dateParser =new ThreadLocal<DateParser>()
+    {
+        @Override
+        protected DateParser initialValue()
+        {
+            return new DateParser();
+        }
+    };
+    
+    final SimpleDateFormat _dateReceive[]= new SimpleDateFormat[__dateReceiveFmt.length];
+
+    private long parse(final String dateVal)
+    {
+        for (int i = 0; i < _dateReceive.length; i++)
+        {
+            if (_dateReceive[i] == null)
+            {
+                _dateReceive[i] = new SimpleDateFormat(__dateReceiveFmt[i], Locale.US);
+                _dateReceive[i].setTimeZone(__GMT);
+            }
+
+            try
+            {
+                Date date = (Date) _dateReceive[i].parseObject(dateVal);
+                return date.getTime();
+            }
+            catch (java.lang.Exception e)
+            {
+                // LOG.ignore(e);
+            }
+        }
+
+        if (dateVal.endsWith(" GMT"))
+        {
+            final String val = dateVal.substring(0, dateVal.length() - 4);
+
+            for (SimpleDateFormat element : _dateReceive)
+            {
+                try
+                {
+                    Date date = (Date) element.parseObject(val);
+                    return date.getTime();
+                }
+                catch (java.lang.Exception e)
+                {
+                    // LOG.ignore(e);
+                }
+            }
+        }
+        return -1;
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/GzipHttpContent.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/GzipHttpContent.java
new file mode 100644
index 0000000000..3d237347a6
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/GzipHttpContent.java
@@ -0,0 +1,188 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.nio.channels.ReadableByteChannel;
+import org.eclipse.jetty.http.MimeTypes.Type;
+
+import org.eclipse.jetty.util.resource.Resource;
+
+/* ------------------------------------------------------------ */
+public class GzipHttpContent implements HttpContent
+{
+    private final HttpContent _content; 
+    private final HttpContent _contentGz;
+    public final static String ETAG_GZIP="--gzip";
+    public final static String ETAG_GZIP_QUOTE="--gzip\"";
+    public final static PreEncodedHttpField CONTENT_ENCODING_GZIP=new PreEncodedHttpField(HttpHeader.CONTENT_ENCODING,"gzip");
+    
+    public static String removeGzipFromETag(String etag)
+    {
+        if (etag==null)
+            return null;
+        int i = etag.indexOf(ETAG_GZIP_QUOTE);
+        if (i<0)
+            return etag;
+        return etag.substring(0,i)+'"';
+    }
+    
+    public GzipHttpContent(HttpContent content, HttpContent contentGz)
+    {  
+        _content=content;
+        _contentGz=contentGz;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return _content.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return _content.equals(obj);
+    }
+
+    @Override
+    public Resource getResource()
+    {
+        return _content.getResource();
+    }
+
+    @Override
+    public HttpField getETag()
+    {
+        return new HttpField(HttpHeader.ETAG,getETagValue());
+    }
+
+    @Override
+    public String getETagValue()
+    {
+        return _content.getResource().getWeakETag(ETAG_GZIP);
+    }
+
+    @Override
+    public HttpField getLastModified()
+    {
+        return _content.getLastModified();
+    }
+
+    @Override
+    public String getLastModifiedValue()
+    {
+        return _content.getLastModifiedValue();
+    }
+
+    @Override
+    public HttpField getContentType()
+    {
+        return _content.getContentType();
+    }
+
+    @Override
+    public String getContentTypeValue()
+    {
+        return _content.getContentTypeValue();
+    }
+
+    @Override
+    public HttpField getContentEncoding()
+    {
+        return CONTENT_ENCODING_GZIP;
+    }
+
+    @Override
+    public String getContentEncodingValue()
+    {
+        return CONTENT_ENCODING_GZIP.getValue();
+    }
+
+    @Override
+    public String getCharacterEncoding()
+    {
+        return _content.getCharacterEncoding();
+    }
+
+    @Override
+    public Type getMimeType()
+    {
+        return _content.getMimeType();
+    }
+
+    @Override
+    public void release()
+    {
+        _content.release();
+    }
+
+    @Override
+    public ByteBuffer getIndirectBuffer()
+    {
+        return _contentGz.getIndirectBuffer();
+    }
+
+    @Override
+    public ByteBuffer getDirectBuffer()
+    {
+        return _contentGz.getDirectBuffer();
+    }
+
+    @Override
+    public HttpField getContentLength()
+    {
+        return _contentGz.getContentLength();
+    }
+
+    @Override
+    public long getContentLengthValue()
+    {
+        return _contentGz.getContentLengthValue();
+    }
+
+    @Override
+    public InputStream getInputStream() throws IOException
+    {
+        return _contentGz.getInputStream();
+    }
+
+    @Override
+    public ReadableByteChannel getReadableByteChannel() throws IOException
+    {
+        return _contentGz.getReadableByteChannel();
+    }
+
+    @Override
+    public String toString()
+    {
+        return String.format("GzipHttpContent@%x{r=%s|%s,lm=%s|%s,ct=%s}",hashCode(),
+                _content.getResource(),_contentGz.getResource(),
+                _content.getResource().lastModified(),_contentGz.getResource().lastModified(),
+                getContentType());
+    }
+
+    @Override
+    public HttpContent getGzipContent()
+    {
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HostPortHttpField.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HostPortHttpField.java
new file mode 100644
index 0000000000..5818e138e5
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HostPortHttpField.java
@@ -0,0 +1,106 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+
+package org.eclipse.jetty.http;
+
+import org.eclipse.jetty.util.StringUtil;
+
+
+
+/* ------------------------------------------------------------ */
+/**
+ */
+public class HostPortHttpField extends HttpField
+{
+    private final String _host;
+    private final int _port;
+
+    public HostPortHttpField(String authority)
+    {
+        this(HttpHeader.HOST,HttpHeader.HOST.asString(),authority);
+    }
+    
+    public HostPortHttpField(HttpHeader header, String name, String authority)
+    {
+        super(header,name,authority);
+        if (authority==null || authority.length()==0)
+            throw new IllegalArgumentException("No Authority");
+        try
+        {
+            if (authority.charAt(0)=='[')
+            {
+                // ipv6reference
+                int close=authority.lastIndexOf(']');
+                if (close<0)
+                    throw new BadMessageException(HttpStatus.BAD_REQUEST_400,"Bad ipv6");
+                _host=authority.substring(0,close+1);
+
+                if (authority.length()>close+1)
+                {
+                    if (authority.charAt(close+1)!=':')
+                        throw new BadMessageException(HttpStatus.BAD_REQUEST_400,"Bad ipv6 port");
+                    _port=StringUtil.toInt(authority,close+2);
+                }
+                else
+                    _port=0;
+            }
+            else
+            {
+                // ipv4address or hostname
+                int c = authority.lastIndexOf(':');
+                if (c>=0)
+                {
+                    _host=authority.substring(0,c);
+                    _port=StringUtil.toInt(authority,c+1);
+                }
+                else
+                {
+                    _host=authority;
+                    _port=0;
+                }
+            }
+        }
+        catch (BadMessageException bm)
+        {
+            throw bm;
+        }
+        catch(Exception e)
+        {
+            throw new BadMessageException(HttpStatus.BAD_REQUEST_400,"Bad HostPort",e);
+        }
+    }
+
+    /* ------------------------------------------------------------ */
+    /** Get the host.
+     * @return the host
+     */
+    public String getHost()
+    {
+        return _host;
+    }
+
+    /* ------------------------------------------------------------ */
+    /** Get the port.
+     * @return the port
+     */
+    public int getPort()
+    {
+        return _port;
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/Http1FieldPreEncoder.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/Http1FieldPreEncoder.java
new file mode 100644
index 0000000000..aefb28159a
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/Http1FieldPreEncoder.java
@@ -0,0 +1,69 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+
+package org.eclipse.jetty.http;
+
+import static java.nio.charset.StandardCharsets.ISO_8859_1;
+
+import java.util.Arrays;
+
+
+/* ------------------------------------------------------------ */
+/**
+ */
+public class Http1FieldPreEncoder implements HttpFieldPreEncoder
+{
+    /* ------------------------------------------------------------ */
+    /**
+     * @see org.eclipse.jetty.http.HttpFieldPreEncoder#getHttpVersion()
+     */
+    @Override
+    public HttpVersion getHttpVersion()
+    {
+        return HttpVersion.HTTP_1_0;
+    }
+
+    /* ------------------------------------------------------------ */
+    /**
+     * @see org.eclipse.jetty.http.HttpFieldPreEncoder#getEncodedField(org.eclipse.jetty.http.HttpHeader, java.lang.String, java.lang.String)
+     */
+    @Override
+    public byte[] getEncodedField(HttpHeader header, String headerString, String value)
+    {
+        if (header!=null)
+        {
+            int cbl=header.getBytesColonSpace().length;
+            byte[] bytes=Arrays.copyOf(header.getBytesColonSpace(), cbl+value.length()+2);
+            System.arraycopy(value.getBytes(ISO_8859_1),0,bytes,cbl,value.length());
+            bytes[bytes.length-2]=(byte)'\r';
+            bytes[bytes.length-1]=(byte)'\n';
+            return bytes;
+        }
+
+        byte[] n=headerString.getBytes(ISO_8859_1);
+        byte[] v=value.getBytes(ISO_8859_1);
+        byte[] bytes=Arrays.copyOf(n,n.length+2+v.length+2);
+        bytes[n.length]=(byte)':';
+        bytes[n.length]=(byte)' ';
+        bytes[bytes.length-2]=(byte)'\r';
+        bytes[bytes.length-1]=(byte)'\n';
+
+        return bytes;
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpCompliance.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpCompliance.java
new file mode 100644
index 0000000000..8a74370430
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpCompliance.java
@@ -0,0 +1,32 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http;
+
+
+/**
+ * HTTP compliance modes:
+ * <dl>
+ * <dt>RFC7230</dt><dd>(default) Compliance with RFC7230</dd>
+ * <dt>RFC2616</dt><dd>Wrapped/Continued headers and HTTP/0.9 supported</dd>
+ * <dt>LEGACY</dt><dd>(aka STRICT) Adherence to Servlet Specification requirement for 
+ * exact case of header names, bypassing the header caches, which are case insensitive, 
+ * otherwise equivalent to RFC2616</dd>
+ * </dl>
+ */
+public enum HttpCompliance { LEGACY, RFC2616, RFC7230 }
\ No newline at end of file
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpContent.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpContent.java
new file mode 100644
index 0000000000..50871afede
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpContent.java
@@ -0,0 +1,80 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.nio.channels.ReadableByteChannel;
+
+import org.eclipse.jetty.http.MimeTypes.Type;
+import org.eclipse.jetty.util.resource.Resource;
+
+/* ------------------------------------------------------------ */
+/** HttpContent interface.
+ * <p>This information represents all the information about a 
+ * static resource that is needed to evaluate conditional headers
+ * and to serve the content if need be.     It can be implemented
+ * either transiently (values and fields generated on demand) or 
+ * persistently (values and fields pre-generated in anticipation of
+ * reuse in from a cache).
+ * </p> 
+ *
+ */
+public interface HttpContent
+{
+    HttpField getContentType();
+    String getContentTypeValue();
+    String getCharacterEncoding();
+    Type getMimeType();
+
+    HttpField getContentEncoding();
+    String getContentEncodingValue();
+    
+    HttpField getContentLength();
+    long getContentLengthValue();
+    
+    HttpField getLastModified();
+    String getLastModifiedValue();
+    
+    HttpField getETag();
+    String getETagValue();
+    
+    ByteBuffer getIndirectBuffer();
+    ByteBuffer getDirectBuffer();
+    Resource getResource();
+    InputStream getInputStream() throws IOException;
+    ReadableByteChannel getReadableByteChannel() throws IOException;
+    void release();
+
+    HttpContent getGzipContent();
+    
+    
+    public interface Factory
+    {
+        /**
+         * @param path The path within the context to the resource
+         * @param maxBuffer The maximum buffer to allocated for this request.  For cached content, a larger buffer may have
+         * previously been allocated and returned by the {@link HttpContent#getDirectBuffer()} or {@link HttpContent#getIndirectBuffer()} calls.
+         * @return A {@link HttpContent}
+         * @throws IOException
+         */
+        HttpContent getContent(String path,int maxBuffer) throws IOException;
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpCookie.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpCookie.java
new file mode 100644
index 0000000000..2d769df6ff
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpCookie.java
@@ -0,0 +1,164 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http;
+
+import java.util.concurrent.TimeUnit;
+
+public class HttpCookie
+{
+    private final String _name;
+    private final String _value;
+    private final String _comment;
+    private final String _domain;
+    private final long _maxAge;
+    private final String _path;
+    private final boolean _secure;
+    private final int _version;
+    private final boolean _httpOnly;
+    private final long _expiration;
+
+    public HttpCookie(String name, String value)
+    {
+        this(name, value, -1);
+    }
+
+    public HttpCookie(String name, String value, String domain, String path)
+    {
+        this(name, value, domain, path, -1, false, false);
+    }
+
+    public HttpCookie(String name, String value, long maxAge)
+    {
+        this(name, value, null, null, maxAge, false, false);
+    }
+
+    public HttpCookie(String name, String value, String domain, String path, long maxAge, boolean httpOnly, boolean secure)
+    {
+        this(name, value, domain, path, maxAge, httpOnly, secure, null, 0);
+    }
+
+    public HttpCookie(String name, String value, String domain, String path, long maxAge, boolean httpOnly, boolean secure, String comment, int version)
+    {
+        _name = name;
+        _value = value;
+        _domain = domain;
+        _path = path;
+        _maxAge = maxAge;
+        _httpOnly = httpOnly;
+        _secure = secure;
+        _comment = comment;
+        _version = version;
+        _expiration = maxAge < 0 ? -1 : System.nanoTime() + TimeUnit.SECONDS.toNanos(maxAge);
+    }
+
+    /**
+     * @return the cookie name
+     */
+    public String getName()
+    {
+        return _name;
+    }
+
+    /**
+     * @return the cookie value
+     */
+    public String getValue()
+    {
+        return _value;
+    }
+
+    /**
+     * @return the cookie comment
+     */
+    public String getComment()
+    {
+        return _comment;
+    }
+
+    /**
+     * @return the cookie domain
+     */
+    public String getDomain()
+    {
+        return _domain;
+    }
+
+    /**
+     * @return the cookie max age in seconds
+     */
+    public long getMaxAge()
+    {
+        return _maxAge;
+    }
+
+    /**
+     * @return the cookie path
+     */
+    public String getPath()
+    {
+        return _path;
+    }
+
+    /**
+     * @return whether the cookie is valid for secure domains
+     */
+    public boolean isSecure()
+    {
+        return _secure;
+    }
+
+    /**
+     * @return the cookie version
+     */
+    public int getVersion()
+    {
+        return _version;
+    }
+
+    /**
+     * @return whether the cookie is valid for the http protocol only
+     */
+    public boolean isHttpOnly()
+    {
+        return _httpOnly;
+    }
+
+    /**
+     * @param timeNanos the time to check for cookie expiration, in nanoseconds
+     * @return whether the cookie is expired by the given time
+     */
+    public boolean isExpired(long timeNanos)
+    {
+        return _expiration >= 0 && timeNanos >= _expiration;
+    }
+
+    /**
+     * @return a string representation of this cookie
+     */
+    public String asString()
+    {
+        StringBuilder builder = new StringBuilder();
+        builder.append(getName()).append("=").append(getValue());
+        if (getDomain() != null)
+            builder.append(";$Domain=").append(getDomain());
+        if (getPath() != null)
+            builder.append(";$Path=").append(getPath());
+        return builder.toString();
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpField.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpField.java
new file mode 100644
index 0000000000..584ed74269
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpField.java
@@ -0,0 +1,510 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http;
+
+import java.util.ArrayList;
+import java.util.Objects;
+
+import org.eclipse.jetty.util.StringUtil;
+
+/** A HTTP Field
+ */
+public class HttpField
+{
+    private final static String __zeroquality="q=0";
+    private final HttpHeader _header;
+    private final String _name;
+    private final String _value;
+    // cached hashcode for case insensitive name
+    private int hash = 0;
+
+    public HttpField(HttpHeader header, String name, String value)
+    {
+        _header = header;
+        _name = name;
+        _value = value;
+    }
+
+    public HttpField(HttpHeader header, String value)
+    {
+        this(header,header.asString(),value);
+    }
+
+    public HttpField(HttpHeader header, HttpHeaderValue value)
+    {
+        this(header,header.asString(),value.asString());
+    }
+
+    public HttpField(String name, String value)
+    {
+        this(HttpHeader.CACHE.get(name),name,value);
+    }
+
+    public HttpHeader getHeader()
+    {
+        return _header;
+    }
+
+    public String getName()
+    {
+        return _name;
+    }
+
+    public String getValue()
+    {
+        return _value;
+    }
+
+    public int getIntValue()
+    {
+        return Integer.valueOf(_value);
+    }
+
+    public long getLongValue()
+    {
+        return Long.valueOf(_value);
+    }
+
+    public String[] getValues()
+    {
+        ArrayList<String> list = new ArrayList<>();
+        int state = 0;
+        int start=0;
+        int end=0;
+        StringBuilder builder = new StringBuilder();
+
+        for (int i=0;i<_value.length();i++)
+        {
+            char c = _value.charAt(i);
+            switch(state)
+            {
+                case 0: // initial white space
+                    switch(c)
+                    {
+                        case '"': // open quote
+                            state=2;
+                            break;
+
+                        case ',': // ignore leading empty field
+                            break;
+
+                        case ' ': // more white space
+                        case '\t':
+                            break;
+
+                        default: // character
+                            start=i;
+                            end=i;
+                            state=1;
+                    }
+                    break;
+
+                case 1: // In token
+                    switch(c)
+                    {
+                        case ',': // next field
+                            list.add(_value.substring(start,end+1));
+                            state=0;
+                            break;
+
+                        case ' ': // more white space
+                        case '\t':
+                            break;
+
+                        default:
+                            end=i;
+                    }
+                    break;
+
+                case 2: // In Quoted
+                    switch(c)
+                    {
+                        case '\\': // next field
+                            state=3;
+                            break;
+
+                        case '"': // end quote
+                            list.add(builder.toString());
+                            builder.setLength(0);
+                            state=4;
+                            break;
+
+                        default:
+                            builder.append(c);
+                    }
+                    break;
+
+                case 3: // In Quoted Quoted
+                    builder.append(c);
+                    state=2;
+                    break;
+
+                case 4: // WS after end quote
+                    switch(c)
+                    {
+                        case ' ': // white space
+                        case '\t': // white space
+                            break;
+
+                        case ',': // white space
+                            state=0;
+                            break;
+
+                        default:
+                            throw new IllegalArgumentException("c="+(int)c);
+
+                    }
+                    break;
+            }
+        }
+
+        switch(state)
+        {
+            case 0:
+                break;
+            case 1:
+                list.add(_value.substring(start,end+1));
+                break;
+            case 4:
+                break;
+
+            default:
+                throw new IllegalArgumentException("state="+state);
+        }
+
+        return list.toArray(new String[list.size()]);
+    }
+
+    /* ------------------------------------------------------------ */
+    /** Look for a value in a possible multi valued field
+     * @param search Values to search for (case insensitive)
+     * @return True iff the value is contained in the field value entirely or
+     * as an element of a quoted comma separated list. List element parameters (eg qualities) are ignored,
+     * except if they are q=0, in which case the item itself is ignored.
+     */
+    public boolean contains(String search)
+    {
+        if (search==null)
+            return _value==null;
+        if (search.length()==0)
+            return false;
+        if (_value==null)
+            return false;
+        
+        search = StringUtil.asciiToLowerCase(search);
+
+        int state=0;
+        int match=0;
+        int param=0;
+
+        for (int i=0;i<_value.length();i++)
+        {
+            char c = _value.charAt(i);
+            switch(state)
+            {
+                case 0: // initial white space
+                    switch(c)
+                    {
+                        case '"': // open quote
+                            match=0;
+                            state=2;
+                            break;
+
+                        case ',': // ignore leading empty field
+                            break;
+
+                        case ';': // ignore leading empty field parameter
+                            param=-1;
+                            match=-1;
+                            state=5;
+                            break;
+
+                        case ' ': // more white space
+                        case '\t':
+                            break;
+
+                        default: // character
+                            match = Character.toLowerCase(c)==search.charAt(0)?1:-1;
+                            state=1;
+                            break;
+                    }
+                    break;
+
+                case 1: // In token
+                    switch(c)
+                    {
+                        case ',': // next field
+                            // Have we matched the token?
+                            if (match==search.length())
+                                return true;
+                            state=0;
+                            break;
+
+                        case ';':
+                            param=match>=0?0:-1;
+                            state=5; // parameter
+                            break;
+
+                        default:
+                            if (match>0)
+                            {
+                                if (match<search.length())
+                                    match=Character.toLowerCase(c)==search.charAt(match)?(match+1):-1;
+                                else if (c!=' ' && c!= '\t')
+                                    match=-1;
+                            }
+                            break;
+
+                    }
+                    break;
+
+                case 2: // In Quoted token
+                    switch(c)
+                    {
+                        case '\\': // quoted character
+                            state=3;
+                            break;
+
+                        case '"': // end quote
+                            state=4;
+                            break;
+
+                        default:
+                            if (match>=0)
+                            {
+                                if (match<search.length())
+                                    match=Character.toLowerCase(c)==search.charAt(match)?(match+1):-1;
+                                else
+                                    match=-1;
+                            }
+                    }
+                    break;
+
+                case 3: // In Quoted character in quoted token
+                    if (match>=0)
+                    {
+                        if (match<search.length())
+                            match=Character.toLowerCase(c)==search.charAt(match)?(match+1):-1;
+                        else
+                            match=-1;
+                    }
+                    state=2;
+                    break;
+
+                case 4: // WS after end quote
+                    switch(c)
+                    {
+                        case ' ': // white space
+                        case '\t': // white space
+                            break;
+
+                        case ';':
+                            state=5; // parameter
+                            break;
+
+                        case ',': // end token
+                            // Have we matched the token?
+                            if (match==search.length())
+                                return true;
+                            state=0;
+                            break;
+
+                        default:
+                            // This is an illegal token, just ignore
+                            match=-1;
+                    }
+                    break;
+
+                case 5:  // parameter
+                    switch(c)
+                    {
+                        case ',': // end token
+                            // Have we matched the token and not q=0?
+                            if (param!=__zeroquality.length() && match==search.length())
+                                return true;
+                            param=0;
+                            state=0;
+                            break;
+
+                        case ' ': // white space
+                        case '\t': // white space
+                            break;
+
+                        default:
+                            if (param>=0)
+                            {
+                                if (param<__zeroquality.length())
+                                    param=Character.toLowerCase(c)==__zeroquality.charAt(param)?(param+1):-1;
+                                else if (c!='0'&&c!='.')
+                                    param=-1;
+                            }
+
+                    }
+                    break;
+
+                default:
+                    throw new IllegalStateException();
+            }
+        }
+
+        return param!=__zeroquality.length() && match==search.length();
+    }
+
+
+    @Override
+    public String toString()
+    {
+        String v=getValue();
+        return getName() + ": " + (v==null?"":v);
+    }
+
+    public boolean isSameName(HttpField field)
+    {
+        if (field==null)
+            return false;
+        if (field==this)
+            return true;
+        if (_header!=null && _header==field.getHeader())
+            return true;
+        if (_name.equalsIgnoreCase(field.getName()))
+            return true;
+        return false;
+    }
+
+    private int nameHashCode()
+    {
+        int h = this.hash;
+        int len = _name.length();
+        if (h == 0 && len > 0)
+        {
+            for (int i = 0; i < len; i++)
+            {
+                // simple case insensitive hash
+                char c = _name.charAt(i);
+                // assuming us-ascii (per last paragraph on http://tools.ietf.org/html/rfc7230#section-3.2.4)
+                if ((c >= 'a' && c <= 'z'))
+                    c -= 0x20;
+                h = 31 * h + c;
+            }
+            this.hash = h;
+        }
+        return h;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        if (_header==null)
+            return _value.hashCode() ^ nameHashCode();
+        return _value.hashCode() ^ _header.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (o==this)
+            return true;
+        if (!(o instanceof HttpField))
+            return false;
+        HttpField field=(HttpField)o;
+        if (_header!=field.getHeader())
+            return false;
+        if (!_name.equalsIgnoreCase(field.getName()))
+            return false;
+        if (_value==null && field.getValue()!=null)
+            return false;
+        return Objects.equals(_value,field.getValue());
+    }
+
+    public static class IntValueHttpField extends HttpField
+    {
+        private final int _int;
+
+        public IntValueHttpField(HttpHeader header, String name, String value, int intValue)
+        {
+            super(header,name,value);
+            _int=intValue;
+        }
+
+        public IntValueHttpField(HttpHeader header, String name, String value)
+        {
+            this(header,name,value,Integer.valueOf(value));
+        }
+
+        public IntValueHttpField(HttpHeader header, String name, int intValue)
+        {
+            this(header,name,Integer.toString(intValue),intValue);
+        }
+
+        public IntValueHttpField(HttpHeader header, int value)
+        {
+            this(header,header.asString(),value);
+        }
+
+        @Override
+        public int getIntValue()
+        {
+            return _int;
+        }
+
+        @Override
+        public long getLongValue()
+        {
+            return _int;
+        }
+    }
+
+    public static class LongValueHttpField extends HttpField
+    {
+        private final long _long;
+
+        public LongValueHttpField(HttpHeader header, String name, String value, long longValue)
+        {
+            super(header,name,value);
+            _long=longValue;
+        }
+
+        public LongValueHttpField(HttpHeader header, String name, String value)
+        {
+            this(header,name,value,Long.valueOf(value));
+        }
+
+        public LongValueHttpField(HttpHeader header, String name, long value)
+        {
+            this(header,name,Long.toString(value),value);
+        }
+
+        public LongValueHttpField(HttpHeader header,long value)
+        {
+            this(header,header.asString(),value);
+        }
+
+        @Override
+        public int getIntValue()
+        {
+            return (int)_long;
+        }
+
+        @Override
+        public long getLongValue()
+        {
+            return _long;
+        }
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpFieldPreEncoder.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpFieldPreEncoder.java
new file mode 100644
index 0000000000..0b1e4d47af
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpFieldPreEncoder.java
@@ -0,0 +1,36 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+
+package org.eclipse.jetty.http;
+
+
+/* ------------------------------------------------------------ */
+/** Interface to pre-encode HttpFields.  Used by {@link PreEncodedHttpField}
+ */
+public interface HttpFieldPreEncoder
+{
+    /* ------------------------------------------------------------ */
+    /** The major version this encoder is for.  Both HTTP/1.0 and HTTP/1.1
+     * use the same field encoding, so the {@link HttpVersion#HTTP_1_0} should
+     * be return for all HTTP/1.x encodings.
+     * @return The major version this encoder is for.
+     */
+    HttpVersion getHttpVersion();
+    byte[] getEncodedField(HttpHeader header, String headerString, String value);
+}
\ No newline at end of file
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpFields.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpFields.java
new file mode 100644
index 0000000000..0951a6de51
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpFields.java
@@ -0,0 +1,970 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import org.eclipse.jetty.util.ArrayTernaryTrie;
+import org.eclipse.jetty.util.QuotedStringTokenizer;
+import org.eclipse.jetty.util.Trie;
+import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.util.log.Logger;
+
+
+/**
+ * HTTP Fields. A collection of HTTP header and or Trailer fields.
+ *
+ * <p>This class is not synchronized as it is expected that modifications will only be performed by a
+ * single thread.
+ * 
+ * <p>The cookie handling provided by this class is guided by the Servlet specification and RFC6265.
+ *
+ */
+public class HttpFields implements Iterable<HttpField>
+{
+    @Deprecated
+    public static final String __separators = ", \t";
+
+    private static final Logger LOG = Log.getLogger(HttpFields.class);
+
+    private HttpField[] _fields;
+    private int _size;
+    
+    /**
+     * Initialize an empty HttpFields.
+     */
+    public HttpFields()
+    {
+        _fields=new HttpField[20];
+    }
+    
+    /**
+     * Initialize an empty HttpFields.
+     * 
+     * @param capacity the capacity of the http fields
+     */
+    public HttpFields(int capacity)
+    {
+        _fields=new HttpField[capacity];
+    }
+    
+    /**
+     * Initialize HttpFields from copy.
+     * 
+     * @param fields the fields to copy data from
+     */
+    public HttpFields(HttpFields fields)
+    {
+        _fields=Arrays.copyOf(fields._fields,fields._fields.length+10);
+        _size=fields._size;
+    }
+
+    public int size()
+    {
+        return _size;
+    }
+    
+    @Override
+    public Iterator<HttpField> iterator()
+    {
+        return new Itr();
+    }
+
+    /**
+     * Get Collection of header names.
+     * @return the unique set of field names.
+     */
+    public Set<String> getFieldNamesCollection()
+    {
+        final Set<String> set = new HashSet<>(_size);
+        for (HttpField f : this)
+        {
+            if (f!=null)
+                set.add(f.getName());
+        }
+        return set;
+    }
+
+    /**
+     * Get enumeration of header _names. Returns an enumeration of strings representing the header
+     * _names for this request.
+     * @return an enumeration of field names
+     */
+    public Enumeration<String> getFieldNames()
+    {
+        return Collections.enumeration(getFieldNamesCollection());
+    }
+
+    /**
+     * Get a Field by index.
+     * @param index the field index 
+     * @return A Field value or null if the Field value has not been set
+     */
+    public HttpField getField(int index)
+    {
+        if (index>=_size)
+            throw new NoSuchElementException();
+        return _fields[index];
+    }
+
+    public HttpField getField(HttpHeader header)
+    {
+        for (int i=0;i<_size;i++)
+        {
+            HttpField f=_fields[i];
+            if (f.getHeader()==header)
+                return f;
+        }
+        return null;
+    }
+
+    public HttpField getField(String name)
+    {
+        for (int i=0;i<_size;i++)
+        {
+            HttpField f=_fields[i];
+            if (f.getName().equalsIgnoreCase(name))
+                return f;
+        }
+        return null;
+    }
+
+    public boolean contains(HttpField field)
+    {
+        for (int i=_size;i-->0;)
+        {
+            HttpField f=_fields[i];
+            if (f.isSameName(field) && f.contains(field.getValue()))
+                return true;
+        }
+        return false;
+    }
+
+    public boolean contains(HttpHeader header, String value)
+    {
+        for (int i=_size;i-->0;)
+        {
+            HttpField f=_fields[i];
+            if (f.getHeader()==header && f.contains(value))
+                return true;
+        }
+        return false;
+    }
+    
+    public boolean contains(String name, String value)
+    {
+        for (int i=_size;i-->0;)
+        {
+            HttpField f=_fields[i];
+            if (f.getName().equalsIgnoreCase(name) && f.contains(value))
+                return true;
+        }
+        return false;
+    }
+
+    public boolean contains(HttpHeader header)
+    {
+        for (int i=_size;i-->0;)
+        {
+            HttpField f=_fields[i];
+            if (f.getHeader()==header)
+                return true;
+        }
+        return false;
+    }
+    
+    public boolean containsKey(String name)
+    {
+        for (int i=_size;i-->0;)
+        {
+            HttpField f=_fields[i];
+            if (f.getName().equalsIgnoreCase(name))
+                return true;
+        }
+        return false;
+    }
+
+    @Deprecated
+    public String getStringField(HttpHeader header)
+    {
+        return get(header);
+    }
+    
+    public String get(HttpHeader header)
+    {
+        for (int i=0;i<_size;i++)
+        {
+            HttpField f=_fields[i];
+            if (f.getHeader()==header)
+                return f.getValue();
+        }
+        return null;
+    }
+
+    @Deprecated
+    public String getStringField(String name)
+    {
+        return get(name);
+    }
+    
+    public String get(String header)
+    {
+        for (int i=0;i<_size;i++)
+        {
+            HttpField f=_fields[i];
+            if (f.getName().equalsIgnoreCase(header))
+                return f.getValue();
+        }
+        return null;
+    }
+
+    /**
+     * Get multiple header of the same name
+     *
+     * @return List the values
+     * @param header the header
+     */
+    public List<String> getValuesList(HttpHeader header)
+    {
+        final List<String> list = new ArrayList<>();
+        for (HttpField f : this)
+            if (f.getHeader()==header)
+                list.add(f.getValue());
+        return list;
+    }
+    
+    /**
+     * Get multiple header of the same name
+     *    
+     * @return List the header values
+     * @param name the case-insensitive field name
+     */
+    public List<String> getValuesList(String name)
+    {
+        final List<String> list = new ArrayList<>();
+        for (HttpField f : this)
+            if (f.getName().equalsIgnoreCase(name))
+                list.add(f.getValue());
+        return list;
+    }
+
+    /**
+     * Get multiple field values of the same name, split 
+     * as a {@link QuotedCSV}
+     *
+     * @return List the values with OWS stripped
+     * @param header The header
+     * @param keepQuotes True if the fields are kept quoted
+     */
+    public List<String> getCSV(HttpHeader header,boolean keepQuotes)
+    {
+        QuotedCSV values = new QuotedCSV(keepQuotes);
+        for (HttpField f : this)
+            if (f.getHeader()==header)
+                values.addValue(f.getValue());
+        return values.getValues();
+    }
+
+    /**
+     * Get multiple field values of the same name
+     * as a {@link QuotedCSV}
+     *
+     * @return List the values with OWS stripped
+     * @param name the case-insensitive field name
+     * @param keepQuotes True if the fields are kept quoted
+     */
+    public List<String> getCSV(String name,boolean keepQuotes)
+    {
+        QuotedCSV values = new QuotedCSV(keepQuotes);
+        for (HttpField f : this)
+            if (f.getName().equalsIgnoreCase(name))
+                values.addValue(f.getValue());
+        return values.getValues();
+    }
+
+    /**
+     * Get multiple field values of the same name, split and
+     * sorted as a {@link QuotedQualityCSV}
+     *
+     * @return List the values in quality order with the q param and OWS stripped
+     * @param header The header
+     */
+    public List<String> getQualityCSV(HttpHeader header)
+    {
+        QuotedQualityCSV values = new QuotedQualityCSV();
+        for (HttpField f : this)
+            if (f.getHeader()==header)
+                values.addValue(f.getValue());
+        return values.getValues();
+    }
+
+    /**
+     * Get multiple field values of the same name, split and
+     * sorted as a {@link QuotedQualityCSV}
+     *
+     * @return List the values in quality order with the q param and OWS stripped
+     * @param name the case-insensitive field name
+     */
+    public List<String> getQualityCSV(String name)
+    {
+        QuotedQualityCSV values = new QuotedQualityCSV();
+        for (HttpField f : this)
+            if (f.getName().equalsIgnoreCase(name))
+                values.addValue(f.getValue());
+        return values.getValues();
+    }
+
+    /**
+     * Get multi headers
+     *
+     * @return Enumeration of the values
+     * @param name the case-insensitive field name
+     */
+    public Enumeration<String> getValues(final String name)
+    {
+        for (int i=0;i<_size;i++)
+        {
+            final HttpField f = _fields[i];
+            
+            if (f.getName().equalsIgnoreCase(name) && f.getValue()!=null)
+            {
+                final int first=i;
+                return new Enumeration<String>()
+                {
+                    HttpField field=f;
+                    int i = first+1;
+
+                    @Override
+                    public boolean hasMoreElements()
+                    {
+                        if (field==null)
+                        {
+                            while (i<_size) 
+                            {
+                                field=_fields[i++];
+                                if (field.getName().equalsIgnoreCase(name) && field.getValue()!=null)
+                                    return true;
+                            }
+                            field=null;
+                            return false;
+                        }
+                        return true;
+                    }
+
+                    @Override
+                    public String nextElement() throws NoSuchElementException
+                    {
+                        if (hasMoreElements())
+                        {
+                            String value=field.getValue();
+                            field=null;
+                            return value;
+                        }
+                        throw new NoSuchElementException();
+                    }
+                };
+            }
+        }
+
+        List<String> empty=Collections.emptyList();
+        return Collections.enumeration(empty);
+    }
+
+    /**
+     * Get multi field values with separator. The multiple values can be represented as separate
+     * headers of the same name, or by a single header using the separator(s), or a combination of
+     * both. Separators may be quoted.
+     *
+     * @param name the case-insensitive field name
+     * @param separators String of separators.
+     * @return Enumeration of the values, or null if no such header.
+     */
+    @Deprecated
+    public Enumeration<String> getValues(String name, final String separators)
+    {
+        final Enumeration<String> e = getValues(name);
+        if (e == null)
+            return null;
+        return new Enumeration<String>()
+        {
+            QuotedStringTokenizer tok = null;
+
+            @Override
+            public boolean hasMoreElements()
+            {
+                if (tok != null && tok.hasMoreElements()) return true;
+                while (e.hasMoreElements())
+                {
+                    String value = e.nextElement();
+                    if (value!=null)
+                    {
+                        tok = new QuotedStringTokenizer(value, separators, false, false);
+                        if (tok.hasMoreElements()) return true;
+                    }
+                }
+                tok = null;
+                return false;
+            }
+
+            @Override
+            public String nextElement() throws NoSuchElementException
+            {
+                if (!hasMoreElements()) throw new NoSuchElementException();
+                String next = (String) tok.nextElement();
+                if (next != null) next = next.trim();
+                return next;
+            }
+        };
+    }
+
+    public void put(HttpField field)
+    {
+        boolean put=false;
+        for (int i=_size;i-->0;)
+        {
+            HttpField f=_fields[i];
+            if (f.isSameName(field))
+            {
+                if (put)
+                {
+                    System.arraycopy(_fields,i+1,_fields,i,--_size-i);
+                }
+                else
+                {
+                    _fields[i]=field;
+                    put=true;
+                }
+            }
+        }
+        if (!put)
+            add(field);
+    }
+    
+    /**
+     * Set a field.
+     *
+     * @param name the name of the field
+     * @param value the value of the field. If null the field is cleared.
+     */
+    public void put(String name, String value)
+    {
+        if (value == null)
+            remove(name);
+        else
+            put(new HttpField(name, value));
+    }
+
+    public void put(HttpHeader header, HttpHeaderValue value)
+    {
+        put(header,value.toString());
+    }
+
+    /**
+     * Set a field.
+     *
+     * @param header the header name of the field
+     * @param value the value of the field. If null the field is cleared.
+     */
+    public void put(HttpHeader header, String value)
+    {
+        if (value == null)
+            remove(header);
+        else
+            put(new HttpField(header, value));
+    }
+
+    /**
+     * Set a field.
+     *
+     * @param name the name of the field
+     * @param list the List value of the field. If null the field is cleared.
+     */
+    public void put(String name, List<String> list)
+    {
+        remove(name);
+        for (String v : list)
+            if (v!=null)
+                add(name,v);
+    }
+
+    /**
+     * Add to or set a field. If the field is allowed to have multiple values, add will add multiple
+     * headers of the same name.
+     *
+     * @param name the name of the field
+     * @param value the value of the field.
+     */
+    public void add(String name, String value)
+    {
+        if (value == null)
+            return;
+
+        HttpField field = new HttpField(name, value);
+        add(field);
+    }
+
+    public void add(HttpHeader header, HttpHeaderValue value)
+    {
+        add(header,value.toString());
+    }
+
+    /**
+     * Add to or set a field. If the field is allowed to have multiple values, add will add multiple
+     * headers of the same name.
+     *
+     * @param header the header
+     * @param value the value of the field.
+     */
+    public void add(HttpHeader header, String value)
+    {
+        if (value == null) throw new IllegalArgumentException("null value");
+
+        HttpField field = new HttpField(header, value);
+        add(field);
+    }
+
+    /**
+     * Remove a field.
+     *
+     * @param name the field to remove
+     * @return the header that was removed
+     */
+    public HttpField remove(HttpHeader name)
+    {
+        HttpField removed=null;
+        for (int i=_size;i-->0;)
+        {
+            HttpField f=_fields[i];
+            if (f.getHeader()==name)
+            {
+                removed=f;
+                System.arraycopy(_fields,i+1,_fields,i,--_size-i);
+            }
+        }
+        return removed;
+    }
+
+    /**
+     * Remove a field.
+     *
+     * @param name the field to remove
+     * @return the header that was removed
+     */
+    public HttpField remove(String name)
+    {
+        HttpField removed=null;
+        for (int i=_size;i-->0;)
+        {
+            HttpField f=_fields[i];
+            if (f.getName().equalsIgnoreCase(name))
+            {
+                removed=f;
+                System.arraycopy(_fields,i+1,_fields,i,--_size-i);
+            }
+        }
+        return removed;
+    }
+
+    /**
+     * Get a header as an long value. Returns the value of an integer field or -1 if not found. The
+     * case of the field name is ignored.
+     *
+     * @param name the case-insensitive field name
+     * @return the value of the field as a long
+     * @exception NumberFormatException If bad long found
+     */
+    public long getLongField(String name) throws NumberFormatException
+    {
+        HttpField field = getField(name);
+        return field==null?-1L:field.getLongValue();
+    }
+
+    /**
+     * Get a header as a date value. Returns the value of a date field, or -1 if not found. The case
+     * of the field name is ignored.
+     *
+     * @param name the case-insensitive field name
+     * @return the value of the field as a number of milliseconds since unix epoch
+     */
+    public long getDateField(String name)
+    {
+        HttpField field = getField(name);
+        if (field == null)
+            return -1;
+
+        String val = valueParameters(field.getValue(), null);
+        if (val == null)
+            return -1;
+
+        final long date = DateParser.parseDate(val);
+        if (date==-1)
+            throw new IllegalArgumentException("Cannot convert date: " + val);
+        return date;
+    }
+
+
+    /**
+     * Sets the value of an long field.
+     *
+     * @param name the field name
+     * @param value the field long value
+     */
+    public void putLongField(HttpHeader name, long value)
+    {
+        String v = Long.toString(value);
+        put(name, v);
+    }
+
+    /**
+     * Sets the value of an long field.
+     *
+     * @param name the field name
+     * @param value the field long value
+     */
+    public void putLongField(String name, long value)
+    {
+        String v = Long.toString(value);
+        put(name, v);
+    }
+
+
+    /**
+     * Sets the value of a date field.
+     *
+     * @param name the field name
+     * @param date the field date value
+     */
+    public void putDateField(HttpHeader name, long date)
+    {
+        String d=DateGenerator.formatDate(date);
+        put(name, d);
+    }
+
+    /**
+     * Sets the value of a date field.
+     *
+     * @param name the field name
+     * @param date the field date value
+     */
+    public void putDateField(String name, long date)
+    {
+        String d=DateGenerator.formatDate(date);
+        put(name, d);
+    }
+
+    /**
+     * Sets the value of a date field.
+     *
+     * @param name the field name
+     * @param date the field date value
+     */
+    public void addDateField(String name, long date)
+    {
+        String d=DateGenerator.formatDate(date);
+        add(name,d);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        int hash=0;
+        for (HttpField field:_fields)
+            hash+=field.hashCode();
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o)
+            return true;
+        if (!(o instanceof HttpFields))
+            return false;
+
+        HttpFields that = (HttpFields)o;
+
+        // Order is not important, so we cannot rely on List.equals().
+        if (size() != that.size())
+            return false;
+
+        loop: for (HttpField fi : this)
+        {
+            for (HttpField fa : that)
+            {
+                if (fi.equals(fa))
+                    continue loop;
+            }
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString()
+    {
+        try
+        {
+            StringBuilder buffer = new StringBuilder();
+            for (HttpField field : this)
+            {
+                if (field != null)
+                {
+                    String tmp = field.getName();
+                    if (tmp != null) buffer.append(tmp);
+                    buffer.append(": ");
+                    tmp = field.getValue();
+                    if (tmp != null) buffer.append(tmp);
+                    buffer.append("\r\n");
+                }
+            }
+            buffer.append("\r\n");
+            return buffer.toString();
+        }
+        catch (Exception e)
+        {
+            LOG.warn(e);
+            return e.toString();
+        }
+    }
+
+    public void clear()
+    {
+        _size=0;
+    }
+    
+    public void add(HttpField field)
+    {
+        if (field!=null)
+        {
+            if (_size==_fields.length)
+                _fields=Arrays.copyOf(_fields,_size*2);
+            _fields[_size++]=field;
+        }
+    }
+
+    public void addAll(HttpFields fields)
+    {
+        for (int i=0;i<fields._size;i++)
+            add(fields._fields[i]);
+    }
+
+    /**
+     * Add fields from another HttpFields instance. Single valued fields are replaced, while all
+     * others are added.
+     *
+     * @param fields the fields to add
+     */
+    public void add(HttpFields fields)
+    {
+        if (fields == null) return;
+
+        Enumeration<String> e = fields.getFieldNames();
+        while (e.hasMoreElements())
+        {
+            String name = e.nextElement();
+            Enumeration<String> values = fields.getValues(name);
+            while (values.hasMoreElements())
+                add(name, values.nextElement());
+        }
+    }
+
+    /**
+     * Get field value without parameters. Some field values can have parameters. This method separates the
+     * value from the parameters and optionally populates a map with the parameters. For example:
+     *
+     * <PRE>
+     *
+     * FieldName : Value ; param1=val1 ; param2=val2
+     *
+     * </PRE>
+     *
+     * @param value The Field value, possibly with parameters.
+     * @return The value.
+     */
+    public static String stripParameters(String value)
+    {
+        if (value == null) return null;
+
+        int i = value.indexOf(';');
+        if (i < 0) return value;
+        return value.substring(0, i).trim();
+    }
+
+    /**
+     * Get field value parameters. Some field values can have parameters. This method separates the
+     * value from the parameters and optionally populates a map with the parameters. For example:
+     *
+     * <PRE>
+     *
+     * FieldName : Value ; param1=val1 ; param2=val2
+     *
+     * </PRE>
+     *
+     * @param value The Field value, possibly with parameters.
+     * @param parameters A map to populate with the parameters, or null
+     * @return The value.
+     */
+    public static String valueParameters(String value, Map<String,String> parameters)
+    {
+        if (value == null) return null;
+
+        int i = value.indexOf(';');
+        if (i < 0) return value;
+        if (parameters == null) return value.substring(0, i).trim();
+
+        StringTokenizer tok1 = new QuotedStringTokenizer(value.substring(i), ";", false, true);
+        while (tok1.hasMoreTokens())
+        {
+            String token = tok1.nextToken();
+            StringTokenizer tok2 = new QuotedStringTokenizer(token, "= ");
+            if (tok2.hasMoreTokens())
+            {
+                String paramName = tok2.nextToken();
+                String paramVal = null;
+                if (tok2.hasMoreTokens()) paramVal = tok2.nextToken();
+                parameters.put(paramName, paramVal);
+            }
+        }
+
+        return value.substring(0, i).trim();
+    }
+
+    @Deprecated
+    private static final Float __one = new Float("1.0");
+    @Deprecated
+    private static final Float __zero = new Float("0.0");
+    @Deprecated
+    private static final Trie<Float> __qualities = new ArrayTernaryTrie<>();
+    static
+    {
+        __qualities.put("*", __one);
+        __qualities.put("1.0", __one);
+        __qualities.put("1", __one);
+        __qualities.put("0.9", new Float("0.9"));
+        __qualities.put("0.8", new Float("0.8"));
+        __qualities.put("0.7", new Float("0.7"));
+        __qualities.put("0.66", new Float("0.66"));
+        __qualities.put("0.6", new Float("0.6"));
+        __qualities.put("0.5", new Float("0.5"));
+        __qualities.put("0.4", new Float("0.4"));
+        __qualities.put("0.33", new Float("0.33"));
+        __qualities.put("0.3", new Float("0.3"));
+        __qualities.put("0.2", new Float("0.2"));
+        __qualities.put("0.1", new Float("0.1"));
+        __qualities.put("0", __zero);
+        __qualities.put("0.0", __zero);
+    }
+
+    @Deprecated
+    public static Float getQuality(String value)
+    {
+        if (value == null) return __zero;
+
+        int qe = value.indexOf(";");
+        if (qe++ < 0 || qe == value.length()) return __one;
+
+        if (value.charAt(qe++) == 'q')
+        {
+            qe++;
+            Float q = __qualities.get(value, qe, value.length() - qe);
+            if (q != null)
+                return q;
+        }
+
+        Map<String,String> params = new HashMap<>(4);
+        valueParameters(value, params);
+        String qs = params.get("q");
+        if (qs==null)
+            qs="*";
+        Float q = __qualities.get(qs);
+        if (q == null)
+        {
+            try
+            {
+                q = new Float(qs);
+            }
+            catch (Exception e)
+            {
+                q = __one;
+            }
+        }
+        return q;
+    }
+
+    /**
+     * List values in quality order.
+     *
+     * @param e Enumeration of values with quality parameters
+     * @return values in quality order.
+     */
+    @Deprecated
+    public static List<String> qualityList(Enumeration<String> e)
+    {
+        if (e == null || !e.hasMoreElements())
+            return Collections.emptyList();
+
+        QuotedQualityCSV values = new QuotedQualityCSV();
+        while(e.hasMoreElements())
+            values.addValue(e.nextElement());
+        return values.getValues();
+    }
+
+
+    private class Itr implements Iterator<HttpField> 
+    {
+        int _cursor;       // index of next element to return
+        int _last=-1;
+
+        public boolean hasNext() 
+        {
+            return _cursor != _size;
+        }
+
+        public HttpField next() 
+        {
+            int i = _cursor;
+            if (i >= _size)
+                throw new NoSuchElementException();
+            _cursor = i + 1;
+            return _fields[_last=i];
+        }
+
+        public void remove() 
+        {
+            if (_last<0)
+                throw new IllegalStateException();
+
+            System.arraycopy(_fields,_last+1,_fields,_last,--_size-_last);
+            _cursor=_last;
+            _last=-1;
+        }
+    }
+
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpGenerator.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpGenerator.java
new file mode 100644
index 0000000000..f743379eb4
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpGenerator.java
@@ -0,0 +1,1023 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.nio.BufferOverflowException;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.jetty.http.HttpTokens.EndOfContent;
+import org.eclipse.jetty.util.BufferUtil;
+import org.eclipse.jetty.util.StringUtil;
+import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.util.log.Logger;
+
+/**
+ * HttpGenerator. Builds HTTP Messages.
+ * <p>
+ * If the system property "org.eclipse.jetty.http.HttpGenerator.STRICT" is set to true,
+ * then the generator will strictly pass on the exact strings received from methods and header
+ * fields.  Otherwise a fast case insensitive string lookup is used that may alter the
+ * case and white space of some methods/headers
+ */
+public class HttpGenerator
+{
+    private final static Logger LOG = Log.getLogger(HttpGenerator.class);
+
+    public final static boolean __STRICT=Boolean.getBoolean("org.eclipse.jetty.http.HttpGenerator.STRICT");
+
+    private final static byte[] __colon_space = new byte[] {':',' '};
+    private final static HttpHeaderValue[] CLOSE = {HttpHeaderValue.CLOSE};
+    public static final MetaData.Response CONTINUE_100_INFO = new MetaData.Response(HttpVersion.HTTP_1_1,100,null,null,-1);
+    public static final MetaData.Response PROGRESS_102_INFO = new MetaData.Response(HttpVersion.HTTP_1_1,102,null,null,-1);
+    public final static MetaData.Response RESPONSE_500_INFO =
+        new MetaData.Response(HttpVersion.HTTP_1_1,HttpStatus.INTERNAL_SERVER_ERROR_500,null,new HttpFields(){{put(HttpHeader.CONNECTION,HttpHeaderValue.CLOSE);}},0);
+
+    // states
+    public enum State { START, COMMITTED, COMPLETING, COMPLETING_1XX, END }
+    public enum Result { NEED_CHUNK,NEED_INFO,NEED_HEADER,FLUSH,CONTINUE,SHUTDOWN_OUT,DONE}
+
+    // other statics
+    public static final int CHUNK_SIZE = 12;
+
+    private State _state = State.START;
+    private EndOfContent _endOfContent = EndOfContent.UNKNOWN_CONTENT;
+
+    private long _contentPrepared = 0;
+    private boolean _noContent = false;
+    private Boolean _persistent = null;
+
+    private final int _send;
+    private final static int SEND_SERVER = 0x01;
+    private final static int SEND_XPOWEREDBY = 0x02;
+    private final static Set<String> __assumedContentMethods = new HashSet<>(Arrays.asList(new String[]{HttpMethod.POST.asString(),HttpMethod.PUT.asString()}));
+  
+    /* ------------------------------------------------------------------------------- */
+    public static void setJettyVersion(String serverVersion)
+    {
+        SEND[SEND_SERVER] = StringUtil.getBytes("Server: " + serverVersion + "\015\012");
+        SEND[SEND_XPOWEREDBY] = StringUtil.getBytes("X-Powered-By: " + serverVersion + "\015\012");
+        SEND[SEND_SERVER | SEND_XPOWEREDBY] = StringUtil.getBytes("Server: " + serverVersion + "\015\012X-Powered-By: " +
+                serverVersion + "\015\012");
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    // data
+    private boolean _needCRLF = false;
+
+    /* ------------------------------------------------------------------------------- */
+    public HttpGenerator()
+    {
+        this(false,false);
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    public HttpGenerator(boolean sendServerVersion,boolean sendXPoweredBy)
+    {
+        _send=(sendServerVersion?SEND_SERVER:0) | (sendXPoweredBy?SEND_XPOWEREDBY:0);
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    public void reset()
+    {
+        _state = State.START;
+        _endOfContent = EndOfContent.UNKNOWN_CONTENT;
+        _noContent=false;
+        _persistent = null;
+        _contentPrepared = 0;
+        _needCRLF = false;
+    }
+
+    /* ------------------------------------------------------------ */
+    @Deprecated
+    public boolean getSendServerVersion ()
+    {
+        return (_send&SEND_SERVER)!=0;
+    }
+
+    /* ------------------------------------------------------------ */
+    @Deprecated
+    public void setSendServerVersion (boolean sendServerVersion)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    /* ------------------------------------------------------------ */
+    public State getState()
+    {
+        return _state;
+    }
+
+    /* ------------------------------------------------------------ */
+    public boolean isState(State state)
+    {
+        return _state == state;
+    }
+
+    /* ------------------------------------------------------------ */
+    public boolean isIdle()
+    {
+        return _state == State.START;
+    }
+
+    /* ------------------------------------------------------------ */
+    public boolean isEnd()
+    {
+        return _state == State.END;
+    }
+
+    /* ------------------------------------------------------------ */
+    public boolean isCommitted()
+    {
+        return _state.ordinal() >= State.COMMITTED.ordinal();
+    }
+
+    /* ------------------------------------------------------------ */
+    public boolean isChunking()
+    {
+        return _endOfContent==EndOfContent.CHUNKED_CONTENT;
+    }
+
+    /* ------------------------------------------------------------ */
+    public boolean isNoContent()
+    {
+        return _noContent;
+    }
+
+    /* ------------------------------------------------------------ */
+    public void setPersistent(boolean persistent)
+    {
+        _persistent=persistent;
+    }
+
+    /* ------------------------------------------------------------ */
+    /**
+     * @return true if known to be persistent
+     */
+    public boolean isPersistent()
+    {
+        return Boolean.TRUE.equals(_persistent);
+    }
+
+    /* ------------------------------------------------------------ */
+    public boolean isWritten()
+    {
+        return _contentPrepared>0;
+    }
+
+    /* ------------------------------------------------------------ */
+    public long getContentPrepared()
+    {
+        return _contentPrepared;
+    }
+
+    /* ------------------------------------------------------------ */
+    public void abort()
+    {
+        _persistent=false;
+        _state=State.END;
+        _endOfContent=null;
+    }
+
+    /* ------------------------------------------------------------ */
+    public Result generateRequest(MetaData.Request info, ByteBuffer header, ByteBuffer chunk, ByteBuffer content, boolean last) throws IOException
+    {
+        switch(_state)
+        {
+            case START:
+            {
+                if (info==null)
+                    return Result.NEED_INFO;
+
+                if (header==null)
+                    return Result.NEED_HEADER;
+
+                // If we have not been told our persistence, set the default
+                if (_persistent==null)
+                {
+                    _persistent=info.getVersion().ordinal() > HttpVersion.HTTP_1_0.ordinal();
+                    if (!_persistent && HttpMethod.CONNECT.is(info.getMethod()))
+                        _persistent=true;
+                }
+
+                // prepare the header
+                int pos=BufferUtil.flipToFill(header);
+                try
+                {
+                    // generate ResponseLine
+                    generateRequestLine(info,header);
+
+                    if (info.getVersion()==HttpVersion.HTTP_0_9)
+                        throw new BadMessageException(500,"HTTP/0.9 not supported");
+                    
+                    generateHeaders(info,header,content,last);
+
+                    boolean expect100 = info.getFields().contains(HttpHeader.EXPECT, HttpHeaderValue.CONTINUE.asString());
+
+                    if (expect100)
+                    {
+                        _state = State.COMMITTED;
+                    }
+                    else
+                    {
+                        // handle the content.
+                        int len = BufferUtil.length(content);
+                        if (len>0)
+                        {
+                            _contentPrepared+=len;
+                            if (isChunking())
+                                prepareChunk(header,len);
+                        }
+                        _state = last?State.COMPLETING:State.COMMITTED;
+                    }
+
+                    return Result.FLUSH;
+                }
+                catch(Exception e)
+                {
+                    String message= (e instanceof BufferOverflowException)?"Request header too large":e.getMessage();
+                    throw new BadMessageException(500,message,e);
+                }
+                finally
+                {
+                    BufferUtil.flipToFlush(header,pos);
+                }
+            }
+
+            case COMMITTED:
+            {
+                int len = BufferUtil.length(content);
+
+                if (len>0)
+                {
+                    // Do we need a chunk buffer?
+                    if (isChunking())
+                    {
+                        // Do we need a chunk buffer?
+                        if (chunk==null)
+                            return Result.NEED_CHUNK;
+                        BufferUtil.clearToFill(chunk);
+                        prepareChunk(chunk,len);
+                        BufferUtil.flipToFlush(chunk,0);
+                    }
+                    _contentPrepared+=len;
+                }
+
+                if (last)
+                    _state=State.COMPLETING;
+
+                return len>0?Result.FLUSH:Result.CONTINUE;
+            }
+
+            case COMPLETING:
+            {
+                if (BufferUtil.hasContent(content))
+                {
+                    if (LOG.isDebugEnabled())
+                        LOG.debug("discarding content in COMPLETING");
+                    BufferUtil.clear(content);
+                }
+
+                if (isChunking())
+                {
+                    // Do we need a chunk buffer?
+                    if (chunk==null)
+                        return Result.NEED_CHUNK;
+                    BufferUtil.clearToFill(chunk);
+                    prepareChunk(chunk,0);
+                    BufferUtil.flipToFlush(chunk,0);
+                    _endOfContent=EndOfContent.UNKNOWN_CONTENT;
+                    return Result.FLUSH;
+                }
+
+                _state=State.END;
+               return Boolean.TRUE.equals(_persistent)?Result.DONE:Result.SHUTDOWN_OUT;
+            }
+
+            case END:
+                if (BufferUtil.hasContent(content))
+                {
+                    if (LOG.isDebugEnabled())
+                        LOG.debug("discarding content in COMPLETING");
+                    BufferUtil.clear(content);
+                }
+                return Result.DONE;
+
+            default:
+                throw new IllegalStateException();
+        }
+    }
+
+    /* ------------------------------------------------------------ */
+    public Result generateResponse(MetaData.Response info, ByteBuffer header, ByteBuffer chunk, ByteBuffer content, boolean last) throws IOException
+    {
+        return generateResponse(info,false,header,chunk,content,last);
+    }
+
+    /* ------------------------------------------------------------ */
+    public Result generateResponse(MetaData.Response info, boolean head, ByteBuffer header, ByteBuffer chunk, ByteBuffer content, boolean last) throws IOException
+    {
+        switch(_state)
+        {
+            case START:
+            {
+                if (info==null)
+                    return Result.NEED_INFO;
+                HttpVersion version=info.getVersion();
+                if (version==null)
+                    throw new BadMessageException(500,"No version");
+                switch(version)
+                {
+                    case HTTP_1_0:
+                        if (_persistent==null)
+                            _persistent=Boolean.FALSE;
+                        break;
+                        
+                    case HTTP_1_1:
+                        if (_persistent==null)
+                            _persistent=Boolean.TRUE;
+                        break;
+                        
+                    default:
+                        _persistent = false;
+                        _endOfContent=EndOfContent.EOF_CONTENT;
+                        if (BufferUtil.hasContent(content))
+                            _contentPrepared+=content.remaining();
+                        _state = last?State.COMPLETING:State.COMMITTED;
+                        return Result.FLUSH;
+                }
+                
+                // Do we need a response header
+                if (header==null)
+                    return Result.NEED_HEADER;
+
+                // prepare the header
+                int pos=BufferUtil.flipToFill(header);
+                try
+                {
+                    // generate ResponseLine
+                    generateResponseLine(info,header);
+
+                    // Handle 1xx and no content responses
+                    int status=info.getStatus();
+                    if (status>=100 && status<200 )
+                    {
+                        _noContent=true;
+
+                        if (status!=HttpStatus.SWITCHING_PROTOCOLS_101 )
+                        {
+                            header.put(HttpTokens.CRLF);
+                            _state=State.COMPLETING_1XX;
+                            return Result.FLUSH;
+                        }
+                    }
+                    else if (status==HttpStatus.NO_CONTENT_204 || status==HttpStatus.NOT_MODIFIED_304)
+                    {
+                        _noContent=true;
+                    }
+
+                    generateHeaders(info,header,content,last);
+
+                    // handle the content.
+                    int len = BufferUtil.length(content);
+                    if (len>0)
+                    {
+                        _contentPrepared+=len;
+                        if (isChunking() && !head)
+                            prepareChunk(header,len);
+                    }
+                    _state = last?State.COMPLETING:State.COMMITTED;
+                }
+                catch(Exception e)
+                {
+                    String message= (e instanceof BufferOverflowException)?"Response header too large":e.getMessage();
+                    throw new BadMessageException(500,message,e);
+                }
+                finally
+                {
+                    BufferUtil.flipToFlush(header,pos);
+                }
+
+                return Result.FLUSH;
+            }
+
+            case COMMITTED:
+            {
+                int len = BufferUtil.length(content);
+
+                // handle the content.
+                if (len>0)
+                {
+                    if (isChunking())
+                    {
+                        if (chunk==null)
+                            return Result.NEED_CHUNK;
+                        BufferUtil.clearToFill(chunk);
+                        prepareChunk(chunk,len);
+                        BufferUtil.flipToFlush(chunk,0);
+                    }
+                    _contentPrepared+=len;
+                }
+
+                if (last)
+                {
+                    _state=State.COMPLETING;
+                    return len>0?Result.FLUSH:Result.CONTINUE;
+                }
+                return len>0?Result.FLUSH:Result.DONE;
+
+            }
+
+            case COMPLETING_1XX:
+            {
+                reset();
+                return Result.DONE;
+            }
+
+            case COMPLETING:
+            {
+                if (BufferUtil.hasContent(content))
+                {
+                    if (LOG.isDebugEnabled())
+                        LOG.debug("discarding content in COMPLETING");
+                    BufferUtil.clear(content);
+                }
+
+                if (isChunking())
+                {
+                    // Do we need a chunk buffer?
+                    if (chunk==null)
+                        return Result.NEED_CHUNK;
+
+                    // Write the last chunk
+                    BufferUtil.clearToFill(chunk);
+                    prepareChunk(chunk,0);
+                    BufferUtil.flipToFlush(chunk,0);
+                    _endOfContent=EndOfContent.UNKNOWN_CONTENT;
+                    return Result.FLUSH;
+                }
+
+                _state=State.END;
+
+               return Boolean.TRUE.equals(_persistent)?Result.DONE:Result.SHUTDOWN_OUT;
+            }
+
+            case END:
+                if (BufferUtil.hasContent(content))
+                {
+                    if (LOG.isDebugEnabled())
+                        LOG.debug("discarding content in COMPLETING");
+                    BufferUtil.clear(content);
+                }
+                return Result.DONE;
+
+            default:
+                throw new IllegalStateException();
+        }
+    }
+
+    /* ------------------------------------------------------------ */
+    private void prepareChunk(ByteBuffer chunk, int remaining)
+    {
+        // if we need CRLF add this to header
+        if (_needCRLF)
+            BufferUtil.putCRLF(chunk);
+
+        // Add the chunk size to the header
+        if (remaining>0)
+        {
+            BufferUtil.putHexInt(chunk, remaining);
+            BufferUtil.putCRLF(chunk);
+            _needCRLF=true;
+        }
+        else
+        {
+            chunk.put(LAST_CHUNK);
+            _needCRLF=false;
+        }
+    }
+
+    /* ------------------------------------------------------------ */
+    private void generateRequestLine(MetaData.Request request,ByteBuffer header)
+    {
+        header.put(StringUtil.getBytes(request.getMethod()));
+        header.put((byte)' ');
+        header.put(StringUtil.getBytes(request.getURIString()));
+        header.put((byte)' ');
+        header.put(request.getVersion().toBytes());
+        header.put(HttpTokens.CRLF);
+    }
+
+    /* ------------------------------------------------------------ */
+    private void generateResponseLine(MetaData.Response response, ByteBuffer header)
+    {
+        // Look for prepared response line
+        int status=response.getStatus();
+        PreparedResponse preprepared = status<__preprepared.length?__preprepared[status]:null;
+        String reason=response.getReason();
+        if (preprepared!=null)
+        {
+            if (reason==null)
+                header.put(preprepared._responseLine);
+            else
+            {
+                header.put(preprepared._schemeCode);
+                header.put(getReasonBytes(reason));
+                header.put(HttpTokens.CRLF);
+            }
+        }
+        else // generate response line
+        {
+            header.put(HTTP_1_1_SPACE);
+            header.put((byte) ('0' + status / 100));
+            header.put((byte) ('0' + (status % 100) / 10));
+            header.put((byte) ('0' + (status % 10)));
+            header.put((byte) ' ');
+            if (reason==null)
+            {
+                header.put((byte) ('0' + status / 100));
+                header.put((byte) ('0' + (status % 100) / 10));
+                header.put((byte) ('0' + (status % 10)));
+            }
+            else
+                header.put(getReasonBytes(reason));
+            header.put(HttpTokens.CRLF);
+        }
+    }
+
+    /* ------------------------------------------------------------ */
+    private byte[] getReasonBytes(String reason)
+    {
+        if (reason.length()>1024)
+            reason=reason.substring(0,1024);
+        byte[] _bytes = StringUtil.getBytes(reason);
+
+        for (int i=_bytes.length;i-->0;)
+            if (_bytes[i]=='\r' || _bytes[i]=='\n')
+                _bytes[i]='?';
+        return _bytes;
+    }
+
+    /* ------------------------------------------------------------ */
+    private void generateHeaders(MetaData _info,ByteBuffer header,ByteBuffer content,boolean last)
+    {
+        final MetaData.Request request=(_info instanceof MetaData.Request)?(MetaData.Request)_info:null;
+        final MetaData.Response response=(_info instanceof MetaData.Response)?(MetaData.Response)_info:null;
+
+        // default field values
+        int send=_send;
+        HttpField transfer_encoding=null;
+        boolean keep_alive=false;
+        boolean close=false;
+        boolean content_type=false;
+        StringBuilder connection = null;
+        long content_length = _info.getContentLength();
+
+        // Generate fields
+        HttpFields fields = _info.getFields();
+        if (fields != null)
+        {
+            int n=fields.size();
+            for (int f=0;f<n;f++)
+            {
+                HttpField field = fields.getField(f);
+                String v = field.getValue();
+                if (v==null || v.length()==0)
+                    continue; // rfc7230 does not allow no value
+
+                HttpHeader h = field.getHeader();
+                if (h==null)
+                    putTo(field,header);
+                else
+                {
+                    switch (h)
+                    {
+                        case CONTENT_LENGTH:
+                            _endOfContent=EndOfContent.CONTENT_LENGTH;
+                            if (content_length<0)
+                                content_length=Long.valueOf(field.getValue());
+                            // handle setting the field specially below
+                            break;
+
+                        case CONTENT_TYPE:
+                        {
+                            // write the field to the header
+                            content_type=true;
+                            putTo(field,header);
+                            break;
+                        }
+
+                        case TRANSFER_ENCODING:
+                        {
+                            if (_info.getVersion() == HttpVersion.HTTP_1_1)
+                                transfer_encoding = field;
+                            // Do NOT add yet!
+                            break;
+                        }
+
+                        case CONNECTION:
+                        {
+                            if (request!=null)
+                                putTo(field,header);
+
+                            // Lookup and/or split connection value field
+                            HttpHeaderValue[] values = HttpHeaderValue.CLOSE.is(field.getValue())?CLOSE:new HttpHeaderValue[]{HttpHeaderValue.CACHE.get(field.getValue())};
+                            String[] split = null;
+
+                            if (values[0]==null)
+                            {
+                            split = StringUtil.csvSplit(field.getValue());
+                                if (split.length>0)
+                                {
+                                    values=new HttpHeaderValue[split.length];
+                                    for (int i=0;i<split.length;i++)
+                                        values[i]=HttpHeaderValue.CACHE.get(split[i]);
+                                }
+                            }
+
+                            // Handle connection values
+                            for (int i=0;i<values.length;i++)
+                            {
+                                HttpHeaderValue value=values[i];
+                                switch (value==null?HttpHeaderValue.UNKNOWN:value)
+                                {
+                                    case UPGRADE:
+                                    {
+                                        // special case for websocket connection ordering
+                                        header.put(HttpHeader.CONNECTION.getBytesColonSpace()).put(HttpHeader.UPGRADE.getBytes());
+                                        header.put(CRLF);
+                                        break;
+                                    }
+
+                                    case CLOSE:
+                                    {
+                                        close=true;
+                                        _persistent=false;
+                                        if (response!=null)
+                                        {
+                                            if (_endOfContent == EndOfContent.UNKNOWN_CONTENT)
+                                                _endOfContent=EndOfContent.EOF_CONTENT;
+                                        }
+                                        break;
+                                    }
+
+                                    case KEEP_ALIVE:
+                                    {
+                                        if (_info.getVersion() == HttpVersion.HTTP_1_0)
+                                        {
+                                            keep_alive = true;
+                                            if (response!=null)
+                                                _persistent=true;
+                                        }
+                                        break;
+                                    }
+
+                                    default:
+                                    {
+                                        if (connection==null)
+                                            connection=new StringBuilder();
+                                        else
+                                            connection.append(',');
+                                        connection.append(split==null?field.getValue():split[i]);
+                                    }
+                                }
+                            }
+
+                            // Do NOT add yet!
+                            break;
+                        }
+
+                        case SERVER:
+                        {
+                            send=send&~SEND_SERVER;
+                            putTo(field,header);
+                            break;
+                        }
+
+                        default:
+                            putTo(field,header);
+                    }
+                }
+            }
+        }
+
+
+        // Calculate how to end _content and connection, _content length and transfer encoding
+        // settings.
+        // From http://tools.ietf.org/html/rfc7230#section-3.3.3
+        // From RFC 2616 4.4:
+        // 1. No body for 1xx, 204, 304 & HEAD response
+        // 3. If Transfer-Encoding==(.*,)?chunked && HTTP/1.1 && !HttpConnection==close then chunk
+        // 5. Content-Length without Transfer-Encoding
+        // 6. Request and none over the above, then Content-Length=0 if POST/PUT
+        // 7. close
+        
+        
+        int status=response!=null?response.getStatus():-1;
+        switch (_endOfContent)
+        {
+            case UNKNOWN_CONTENT:
+                // It may be that we have no _content, or perhaps _content just has not been
+                // written yet?
+
+                // Response known not to have a body
+                if (_contentPrepared == 0 && response!=null && _noContent)
+                    _endOfContent=EndOfContent.NO_CONTENT;
+                else if (_info.getContentLength()>0)
+                {
+                    // we have been given a content length
+                    _endOfContent=EndOfContent.CONTENT_LENGTH;
+                    if ((response!=null || content_length>0 || content_type ) && !_noContent)
+                    {
+                        // known length but not actually set.
+                        header.put(HttpHeader.CONTENT_LENGTH.getBytesColonSpace());
+                        BufferUtil.putDecLong(header, content_length);
+                        header.put(HttpTokens.CRLF);
+                    }
+                }
+                else if (last)
+                {
+                    // we have seen all the _content there is, so we can be content-length limited.
+                    _endOfContent=EndOfContent.CONTENT_LENGTH;
+                    long actual_length = _contentPrepared+BufferUtil.length(content);
+
+                    if (content_length>=0 && content_length!=actual_length)
+                        throw new BadMessageException(500,"Content-Length header("+content_length+") != actual("+actual_length+")");
+                    
+                    // Do we need to tell the headers about it
+                    putContentLength(header,actual_length,content_type,request,response);
+                }
+                else
+                {
+                    // No idea, so we must assume that a body is coming.
+                    _endOfContent = EndOfContent.CHUNKED_CONTENT;
+                    // HTTP 1.0 does not understand chunked content, so we must use EOF content.
+                    // For a request with HTTP 1.0 & Connection: keep-alive
+                    // we *must* close the connection, otherwise the client
+                    // has no way to detect the end of the content.
+                    if (!isPersistent() || _info.getVersion().ordinal() < HttpVersion.HTTP_1_1.ordinal())
+                        _endOfContent = EndOfContent.EOF_CONTENT;
+                }
+                break;
+
+            case CONTENT_LENGTH:
+            {
+                putContentLength(header,content_length,content_type,request,response);
+                break;
+            }
+
+            case NO_CONTENT:
+                throw new BadMessageException(500);
+
+            case EOF_CONTENT:
+                _persistent = request!=null;
+                break;
+
+            case CHUNKED_CONTENT:
+                break;
+
+            default:
+                break;
+        }
+
+        // Add transfer_encoding if needed
+        if (isChunking())
+        {
+            // try to use user supplied encoding as it may have other values.
+            if (transfer_encoding != null && !HttpHeaderValue.CHUNKED.toString().equalsIgnoreCase(transfer_encoding.getValue()))
+            {
+                String c = transfer_encoding.getValue();
+                if (c.endsWith(HttpHeaderValue.CHUNKED.toString()))
+                    putTo(transfer_encoding,header);
+                else
+                    throw new BadMessageException(500,"BAD TE");
+            }
+            else
+                header.put(TRANSFER_ENCODING_CHUNKED);
+        }
+
+        // Handle connection if need be
+        if (_endOfContent==EndOfContent.EOF_CONTENT)
+        {
+            keep_alive=false;
+            _persistent=false;
+        }
+
+        // If this is a response, work out persistence
+        if (response!=null)
+        {
+            if (!isPersistent() && (close || _info.getVersion().ordinal() > HttpVersion.HTTP_1_0.ordinal()))
+            {
+                if (connection==null)
+                    header.put(CONNECTION_CLOSE);
+                else
+                {
+                    header.put(CONNECTION_CLOSE,0,CONNECTION_CLOSE.length-2);
+                    header.put((byte)',');
+                    header.put(StringUtil.getBytes(connection.toString()));
+                    header.put(CRLF);
+                }
+            }
+            else if (keep_alive)
+            {
+                if (connection==null)
+                    header.put(CONNECTION_KEEP_ALIVE);
+                else
+                {
+                    header.put(CONNECTION_KEEP_ALIVE,0,CONNECTION_KEEP_ALIVE.length-2);
+                    header.put((byte)',');
+                    header.put(StringUtil.getBytes(connection.toString()));
+                    header.put(CRLF);
+                }
+            }
+            else if (connection!=null)
+            {
+                header.put(HttpHeader.CONNECTION.getBytesColonSpace());
+                header.put(StringUtil.getBytes(connection.toString()));
+                header.put(CRLF);
+            }
+        }
+
+        if (status>199)
+            header.put(SEND[send]);
+
+        // end the header.
+        header.put(HttpTokens.CRLF);
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    private void putContentLength(ByteBuffer header, long contentLength, boolean contentType, MetaData.Request request, MetaData.Response response)
+    {
+        if (contentLength>0)
+        {
+            header.put(HttpHeader.CONTENT_LENGTH.getBytesColonSpace());
+            BufferUtil.putDecLong(header, contentLength);
+            header.put(HttpTokens.CRLF);
+        }
+        else if (!_noContent)
+        {
+            if (contentType || response!=null || (request!=null && __assumedContentMethods.contains(request.getMethod())))
+                header.put(CONTENT_LENGTH_0);
+        }
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    public static byte[] getReasonBuffer(int code)
+    {
+        PreparedResponse status = code<__preprepared.length?__preprepared[code]:null;
+        if (status!=null)
+            return status._reason;
+        return null;
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    @Override
+    public String toString()
+    {
+        return String.format("%s@%x{s=%s}",
+                getClass().getSimpleName(),
+                hashCode(),
+                _state);
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    /* ------------------------------------------------------------------------------- */
+    /* ------------------------------------------------------------------------------- */
+    // common _content
+    private static final byte[] LAST_CHUNK =    { (byte) '0', (byte) '\015', (byte) '\012', (byte) '\015', (byte) '\012'};
+    private static final byte[] CONTENT_LENGTH_0 = StringUtil.getBytes("Content-Length: 0\015\012");
+    private static final byte[] CONNECTION_KEEP_ALIVE = StringUtil.getBytes("Connection: keep-alive\015\012");
+    private static final byte[] CONNECTION_CLOSE = StringUtil.getBytes("Connection: close\015\012");
+    private static final byte[] HTTP_1_1_SPACE = StringUtil.getBytes(HttpVersion.HTTP_1_1+" ");
+    private static final byte[] CRLF = StringUtil.getBytes("\015\012");
+    private static final byte[] TRANSFER_ENCODING_CHUNKED = StringUtil.getBytes("Transfer-Encoding: chunked\015\012");
+    private static final byte[][] SEND = new byte[][]{
+            new byte[0],
+            StringUtil.getBytes("Server: Jetty(9.x.x)\015\012"),
+        StringUtil.getBytes("X-Powered-By: Jetty(9.x.x)\015\012"),
+        StringUtil.getBytes("Server: Jetty(9.x.x)\015\012X-Powered-By: Jetty(9.x.x)\015\012")
+    };
+
+    /* ------------------------------------------------------------------------------- */
+    /* ------------------------------------------------------------------------------- */
+    /* ------------------------------------------------------------------------------- */
+    // Build cache of response lines for status
+    private static class PreparedResponse
+    {
+        byte[] _reason;
+        byte[] _schemeCode;
+        byte[] _responseLine;
+    }
+    private static final PreparedResponse[] __preprepared = new PreparedResponse[HttpStatus.MAX_CODE+1];
+    static
+    {
+        int versionLength=HttpVersion.HTTP_1_1.toString().length();
+
+        for (int i=0;i<__preprepared.length;i++)
+        {
+            HttpStatus.Code code = HttpStatus.getCode(i);
+            if (code==null)
+                continue;
+            String reason=code.getMessage();
+            byte[] line=new byte[versionLength+5+reason.length()+2];
+            HttpVersion.HTTP_1_1.toBuffer().get(line,0,versionLength);
+            line[versionLength+0]=' ';
+            line[versionLength+1]=(byte)('0'+i/100);
+            line[versionLength+2]=(byte)('0'+(i%100)/10);
+            line[versionLength+3]=(byte)('0'+(i%10));
+            line[versionLength+4]=' ';
+            for (int j=0;j<reason.length();j++)
+                line[versionLength+5+j]=(byte)reason.charAt(j);
+            line[versionLength+5+reason.length()]=HttpTokens.CARRIAGE_RETURN;
+            line[versionLength+6+reason.length()]=HttpTokens.LINE_FEED;
+
+            __preprepared[i] = new PreparedResponse();
+            __preprepared[i]._schemeCode = Arrays.copyOfRange(line, 0,versionLength+5);
+            __preprepared[i]._reason = Arrays.copyOfRange(line, versionLength+5, line.length-2);
+            __preprepared[i]._responseLine=line;
+        }
+    }
+
+    private static void putSanitisedName(String s,ByteBuffer buffer)
+    {
+        int l=s.length();
+        for (int i=0;i<l;i++)
+        {
+            char c=s.charAt(i);
+
+            if (c<0 || c>0xff || c=='\r' || c=='\n'|| c==':')
+                buffer.put((byte)'?');
+            else
+                buffer.put((byte)(0xff&c));
+        }
+    }
+
+    private static void putSanitisedValue(String s,ByteBuffer buffer)
+    {
+        int l=s.length();
+        for (int i=0;i<l;i++)
+        {
+            char c=s.charAt(i);
+
+            if (c<0 || c>0xff || c=='\r' || c=='\n')
+                buffer.put((byte)' ');
+            else
+                buffer.put((byte)(0xff&c));
+        }
+    }
+
+    public static void putTo(HttpField field, ByteBuffer bufferInFillMode)
+    {
+        if (field instanceof PreEncodedHttpField)
+        {
+            ((PreEncodedHttpField)field).putTo(bufferInFillMode,HttpVersion.HTTP_1_0);
+        }
+        else
+        {
+            HttpHeader header=field.getHeader();
+            if (header!=null)
+            {
+                bufferInFillMode.put(header.getBytesColonSpace());
+                putSanitisedValue(field.getValue(),bufferInFillMode);
+            }
+            else
+            {
+                putSanitisedName(field.getName(),bufferInFillMode);
+                bufferInFillMode.put(__colon_space);
+                putSanitisedValue(field.getValue(),bufferInFillMode);
+            }
+
+            BufferUtil.putCRLF(bufferInFillMode);
+        }
+    }
+
+    public static void putTo(HttpFields fields, ByteBuffer bufferInFillMode)
+    {
+        for (HttpField field : fields)
+        {
+            if (field != null)
+                putTo(field,bufferInFillMode);
+        }
+        BufferUtil.putCRLF(bufferInFillMode);
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpHeader.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpHeader.java
new file mode 100644
index 0000000000..b57a5fa244
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpHeader.java
@@ -0,0 +1,191 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http;
+
+import java.nio.ByteBuffer;
+
+import org.eclipse.jetty.util.ArrayTrie;
+import org.eclipse.jetty.util.StringUtil;
+import org.eclipse.jetty.util.Trie;
+
+
+public enum HttpHeader
+{
+    /* ------------------------------------------------------------ */
+    /** General Fields.
+     */
+    CONNECTION("Connection"),
+    CACHE_CONTROL("Cache-Control"),
+    DATE("Date"),
+    PRAGMA("Pragma"),
+    PROXY_CONNECTION ("Proxy-Connection"),
+    TRAILER("Trailer"),
+    TRANSFER_ENCODING("Transfer-Encoding"),
+    UPGRADE("Upgrade"),
+    VIA("Via"),
+    WARNING("Warning"),
+    NEGOTIATE("Negotiate"),
+
+    /* ------------------------------------------------------------ */
+    /** Entity Fields.
+     */
+    ALLOW("Allow"),
+    CONTENT_ENCODING("Content-Encoding"),
+    CONTENT_LANGUAGE("Content-Language"),
+    CONTENT_LENGTH("Content-Length"),
+    CONTENT_LOCATION("Content-Location"),
+    CONTENT_MD5("Content-MD5"),
+    CONTENT_RANGE("Content-Range"),
+    CONTENT_TYPE("Content-Type"),
+    EXPIRES("Expires"),
+    LAST_MODIFIED("Last-Modified"),
+
+    /* ------------------------------------------------------------ */
+    /** Request Fields.
+     */
+    ACCEPT("Accept"),
+    ACCEPT_CHARSET("Accept-Charset"),
+    ACCEPT_ENCODING("Accept-Encoding"),
+    ACCEPT_LANGUAGE("Accept-Language"),
+    AUTHORIZATION("Authorization"),
+    EXPECT("Expect"),
+    FORWARDED("Forwarded"),
+    FROM("From"),
+    HOST("Host"),
+    IF_MATCH("If-Match"),
+    IF_MODIFIED_SINCE("If-Modified-Since"),
+    IF_NONE_MATCH("If-None-Match"),
+    IF_RANGE("If-Range"),
+    IF_UNMODIFIED_SINCE("If-Unmodified-Since"),
+    KEEP_ALIVE("Keep-Alive"),
+    MAX_FORWARDS("Max-Forwards"),
+    PROXY_AUTHORIZATION("Proxy-Authorization"),
+    RANGE("Range"),
+    REQUEST_RANGE("Request-Range"),
+    REFERER("Referer"),
+    TE("TE"),
+    USER_AGENT("User-Agent"),
+    X_FORWARDED_FOR("X-Forwarded-For"),
+    X_FORWARDED_PROTO("X-Forwarded-Proto"),
+    X_FORWARDED_SERVER("X-Forwarded-Server"),
+    X_FORWARDED_HOST("X-Forwarded-Host"),
+
+    /* ------------------------------------------------------------ */
+    /** Response Fields.
+     */
+    ACCEPT_RANGES("Accept-Ranges"),
+    AGE("Age"),
+    ETAG("ETag"),
+    LOCATION("Location"),
+    PROXY_AUTHENTICATE("Proxy-Authenticate"),
+    RETRY_AFTER("Retry-After"),
+    SERVER("Server"),
+    SERVLET_ENGINE("Servlet-Engine"),
+    VARY("Vary"),
+    WWW_AUTHENTICATE("WWW-Authenticate"),
+
+    /* ------------------------------------------------------------ */
+    /** Other Fields.
+     */
+    COOKIE("Cookie"),
+    SET_COOKIE("Set-Cookie"),
+    SET_COOKIE2("Set-Cookie2"),
+    MIME_VERSION("MIME-Version"),
+    IDENTITY("identity"),
+    
+    X_POWERED_BY("X-Powered-By"),
+    HTTP2_SETTINGS("HTTP2-Settings"),
+
+    STRICT_TRANSPORT_SECURITY("Strict-Transport-Security"),
+    
+    /* ------------------------------------------------------------ */
+    /** HTTP2 Fields.
+     */
+    C_METHOD(":method"),
+    C_SCHEME(":scheme"),
+    C_AUTHORITY(":authority"),
+    C_PATH(":path"),
+    C_STATUS(":status"),
+    
+    UNKNOWN("::UNKNOWN::");
+
+
+    /* ------------------------------------------------------------ */
+    public final static Trie<HttpHeader> CACHE= new ArrayTrie<>(560);
+    static
+    {
+        for (HttpHeader header : HttpHeader.values())
+            if (header!=UNKNOWN)
+                if (!CACHE.put(header.toString(),header))
+                    throw new IllegalStateException();
+    }
+    
+    private final String _string;
+    private final byte[] _bytes;
+    private final byte[] _bytesColonSpace;
+    private final ByteBuffer _buffer;
+
+    /* ------------------------------------------------------------ */
+    HttpHeader(String s)
+    {
+        _string=s;
+        _bytes=StringUtil.getBytes(s);
+        _bytesColonSpace=StringUtil.getBytes(s+": ");
+        _buffer=ByteBuffer.wrap(_bytes);
+    }
+
+    /* ------------------------------------------------------------ */
+    public ByteBuffer toBuffer()
+    {
+        return _buffer.asReadOnlyBuffer();
+    }
+
+    /* ------------------------------------------------------------ */
+    public byte[] getBytes()
+    {
+        return _bytes;
+    }
+
+    /* ------------------------------------------------------------ */
+    public byte[] getBytesColonSpace()
+    {
+        return _bytesColonSpace;
+    }
+
+    /* ------------------------------------------------------------ */
+    public boolean is(String s)
+    {
+        return _string.equalsIgnoreCase(s);    
+    }
+
+    /* ------------------------------------------------------------ */
+    public String asString()
+    {
+        return _string;
+    }
+    
+    /* ------------------------------------------------------------ */
+    @Override
+    public String toString()
+    {
+        return _string;
+    }
+    
+}
+
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpHeaderValue.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpHeaderValue.java
new file mode 100644
index 0000000000..71301003ee
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpHeaderValue.java
@@ -0,0 +1,104 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http;
+
+import java.nio.ByteBuffer;
+import java.util.EnumSet;
+
+import org.eclipse.jetty.util.ArrayTrie;
+import org.eclipse.jetty.util.BufferUtil;
+import org.eclipse.jetty.util.Trie;
+
+
+/**
+ * 
+ */
+public enum HttpHeaderValue
+{
+    CLOSE("close"),
+    CHUNKED("chunked"),
+    GZIP("gzip"),
+    IDENTITY("identity"),
+    KEEP_ALIVE("keep-alive"),
+    CONTINUE("100-continue"),
+    PROCESSING("102-processing"),
+    TE("TE"),
+    BYTES("bytes"),
+    NO_CACHE("no-cache"),
+    UPGRADE("Upgrade"),
+    UNKNOWN("::UNKNOWN::");
+
+    /* ------------------------------------------------------------ */
+    public final static Trie<HttpHeaderValue> CACHE= new ArrayTrie<HttpHeaderValue>();
+    static
+    {
+        for (HttpHeaderValue value : HttpHeaderValue.values())
+            if (value!=UNKNOWN)
+                CACHE.put(value.toString(),value);
+    }
+
+    private final String _string;
+    private final ByteBuffer _buffer;
+
+    /* ------------------------------------------------------------ */
+    HttpHeaderValue(String s)
+    {
+        _string=s;
+        _buffer=BufferUtil.toBuffer(s);
+    }
+
+    /* ------------------------------------------------------------ */
+    public ByteBuffer toBuffer()
+    {
+        return _buffer.asReadOnlyBuffer();
+    }
+
+    /* ------------------------------------------------------------ */
+    public boolean is(String s)
+    {
+        return _string.equalsIgnoreCase(s);
+    }
+    
+    /* ------------------------------------------------------------ */
+    public String asString()
+    {
+        return _string;
+    }
+
+    /* ------------------------------------------------------------ */
+    @Override
+    public String toString()
+    {
+        return _string;
+    }
+
+    /* ------------------------------------------------------------ */
+    private static EnumSet<HttpHeader> __known =
+            EnumSet.of(HttpHeader.CONNECTION,
+                    HttpHeader.TRANSFER_ENCODING,
+                    HttpHeader.CONTENT_ENCODING);
+
+    /* ------------------------------------------------------------ */
+    public static boolean hasKnownValues(HttpHeader header)
+    {
+        if (header==null)
+            return false;
+        return __known.contains(header);
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpMethod.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpMethod.java
new file mode 100644
index 0000000000..1d2eeda0e5
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpMethod.java
@@ -0,0 +1,187 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http;
+
+import java.nio.ByteBuffer;
+
+import org.eclipse.jetty.util.ArrayTrie;
+import org.eclipse.jetty.util.StringUtil;
+import org.eclipse.jetty.util.Trie;
+
+
+/* ------------------------------------------------------------------------------- */
+/**
+ */
+public enum HttpMethod
+{
+    GET,
+    POST,
+    HEAD,
+    PUT,
+    OPTIONS,
+    DELETE,
+    TRACE,
+    CONNECT,
+    MOVE,
+    PROXY,
+    PRI;
+
+    /* ------------------------------------------------------------ */
+    /**
+     * Optimized lookup to find a method name and trailing space in a byte array.
+     * @param bytes Array containing ISO-8859-1 characters
+     * @param position The first valid index
+     * @param limit The first non valid index
+     * @return A HttpMethod if a match or null if no easy match.
+     */
+    public static HttpMethod lookAheadGet(byte[] bytes, final int position, int limit)
+    {
+        int length=limit-position;
+        if (length<4)
+            return null;
+        switch(bytes[position])
+        {
+            case 'G':
+                if (bytes[position+1]=='E' && bytes[position+2]=='T' && bytes[position+3]==' ')
+                    return GET;
+                break;
+            case 'P':
+                if (bytes[position+1]=='O' && bytes[position+2]=='S' && bytes[position+3]=='T' && length>=5 && bytes[position+4]==' ')
+                    return POST;
+                if (bytes[position+1]=='R' && bytes[position+2]=='O' && bytes[position+3]=='X' && length>=6 && bytes[position+4]=='Y' && bytes[position+5]==' ')
+                    return PROXY;
+                if (bytes[position+1]=='U' && bytes[position+2]=='T' && bytes[position+3]==' ')
+                    return PUT;
+                if (bytes[position+1]=='R' && bytes[position+2]=='I' && bytes[position+3]==' ')
+                    return PRI;
+                break;
+            case 'H':
+                if (bytes[position+1]=='E' && bytes[position+2]=='A' && bytes[position+3]=='D' && length>=5 && bytes[position+4]==' ')
+                    return HEAD;
+                break;
+            case 'O':
+                if (bytes[position+1]=='P' && bytes[position+2]=='T' && bytes[position+3]=='I' && length>=8 &&
+                    bytes[position+4]=='O' && bytes[position+5]=='N' && bytes[position+6]=='S' && bytes[position+7]==' ' )
+                    return OPTIONS;
+                break;
+            case 'D':
+                if (bytes[position+1]=='E' && bytes[position+2]=='L' && bytes[position+3]=='E' && length>=7 &&
+                    bytes[position+4]=='T' && bytes[position+5]=='E' && bytes[position+6]==' ' )
+                    return DELETE;
+                break;
+            case 'T':
+                if (bytes[position+1]=='R' && bytes[position+2]=='A' && bytes[position+3]=='C' && length>=6 &&
+                    bytes[position+4]=='E' && bytes[position+5]==' ' )
+                    return TRACE;
+                break;
+            case 'C':
+                if (bytes[position+1]=='O' && bytes[position+2]=='N' && bytes[position+3]=='N' && length>=8 &&
+                    bytes[position+4]=='E' && bytes[position+5]=='C' && bytes[position+6]=='T' && bytes[position+7]==' ' )
+                    return CONNECT;
+                break;
+            case 'M':
+                if (bytes[position+1]=='O' && bytes[position+2]=='V' && bytes[position+3]=='E' && length>=5 && bytes[position+4]==' ')
+                    return MOVE;
+                break;
+
+            default:
+                break;
+        }
+        return null;
+    }
+
+    /* ------------------------------------------------------------ */
+    /**
+     * Optimized lookup to find a method name and trailing space in a byte array.
+     * @param buffer buffer containing ISO-8859-1 characters, it is not modified.
+     * @return A HttpMethod if a match or null if no easy match.
+     */
+    public static HttpMethod lookAheadGet(ByteBuffer buffer)
+    {
+        if (buffer.hasArray())
+            return lookAheadGet(buffer.array(),buffer.arrayOffset()+buffer.position(),buffer.arrayOffset()+buffer.limit());
+        
+        int l = buffer.remaining();
+        if (l>=4)
+        {
+            HttpMethod m = CACHE.getBest(buffer,0,l);
+            if (m!=null)
+            {
+                int ml = m.asString().length();
+                if (l>ml && buffer.get(buffer.position()+ml)==' ')
+                    return m;
+            }
+        }
+        return null;
+    }
+
+    /* ------------------------------------------------------------ */
+    public final static Trie<HttpMethod> CACHE= new ArrayTrie<>();
+    static
+    {
+        for (HttpMethod method : HttpMethod.values())
+            CACHE.put(method.toString(),method);
+    }
+
+    /* ------------------------------------------------------------ */
+    private final ByteBuffer _buffer;
+    private final byte[] _bytes;
+
+    /* ------------------------------------------------------------ */
+    HttpMethod()
+    {
+        _bytes=StringUtil.getBytes(toString());
+        _buffer=ByteBuffer.wrap(_bytes);
+    }
+
+    /* ------------------------------------------------------------ */
+    public byte[] getBytes()
+    {
+        return _bytes;
+    }
+
+    /* ------------------------------------------------------------ */
+    public boolean is(String s)
+    {
+        return toString().equalsIgnoreCase(s);
+    }
+
+    /* ------------------------------------------------------------ */
+    public ByteBuffer asBuffer()
+    {
+        return _buffer.asReadOnlyBuffer();
+    }
+
+    /* ------------------------------------------------------------ */
+    public String asString()
+    {
+        return toString();
+    }
+
+    /* ------------------------------------------------------------ */
+    /**
+     * Converts the given String parameter to an HttpMethod
+     * @param method the String to get the equivalent HttpMethod from
+     * @return the HttpMethod or null if the parameter method is unknown
+     */
+    public static HttpMethod fromString(String method)
+    {
+        return CACHE.get(method);
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpParser.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpParser.java
new file mode 100644
index 0000000000..12f74a50bb
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpParser.java
@@ -0,0 +1,1802 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.EnumSet;
+import java.util.Locale;
+
+import org.eclipse.jetty.http.HttpTokens.EndOfContent;
+import org.eclipse.jetty.util.ArrayTernaryTrie;
+import org.eclipse.jetty.util.ArrayTrie;
+import org.eclipse.jetty.util.BufferUtil;
+import org.eclipse.jetty.util.Trie;
+import org.eclipse.jetty.util.TypeUtil;
+import org.eclipse.jetty.util.Utf8StringBuilder;
+import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.util.log.Logger;
+
+import static org.eclipse.jetty.http.HttpCompliance.LEGACY;
+import static org.eclipse.jetty.http.HttpCompliance.RFC2616;
+import static org.eclipse.jetty.http.HttpCompliance.RFC7230;
+import static org.eclipse.jetty.http.HttpTokens.CARRIAGE_RETURN;
+import static org.eclipse.jetty.http.HttpTokens.LINE_FEED;
+import static org.eclipse.jetty.http.HttpTokens.SPACE;
+import static org.eclipse.jetty.http.HttpTokens.TAB;
+
+
+/* ------------------------------------------------------------ */
+/** A Parser for 1.0 and 1.1 as defined by RFC7230
+ * <p>
+ * This parser parses HTTP client and server messages from buffers
+ * passed in the {@link #parseNext(ByteBuffer)} method.  The parsed
+ * elements of the HTTP message are passed as event calls to the
+ * {@link HttpHandler} instance the parser is constructed with.
+ * If the passed handler is a {@link RequestHandler} then server side
+ * parsing is performed and if it is a {@link ResponseHandler}, then
+ * client side parsing is done.
+ * </p>
+ * <p>
+ * The contract of the {@link HttpHandler} API is that if a call returns
+ * true then the call to {@link #parseNext(ByteBuffer)} will return as
+ * soon as possible also with a true response.  Typically this indicates
+ * that the parsing has reached a stage where the caller should process
+ * the events accumulated by the handler.    It is the preferred calling
+ * style that handling such as calling a servlet to process a request,
+ * should be done after a true return from {@link #parseNext(ByteBuffer)}
+ * rather than from within the scope of a call like
+ * {@link RequestHandler#messageComplete()}
+ * </p>
+ * <p>
+ * For performance, the parse is heavily dependent on the
+ * {@link Trie#getBest(ByteBuffer, int, int)} method to look ahead in a
+ * single pass for both the structure ( : and CRLF ) and semantic (which
+ * header and value) of a header.  Specifically the static {@link HttpHeader#CACHE}
+ * is used to lookup common combinations of headers and values
+ * (eg. "Connection: close"), or just header names (eg. "Connection:" ).
+ * For headers who's value is not known statically (eg. Host, COOKIE) then a
+ * per parser dynamic Trie of {@link HttpFields} from previous parsed messages
+ * is used to help the parsing of subsequent messages.
+ * </p>
+ * <p>
+ * The parser can work in varying compliance modes:
+ * <dl>
+ * <dt>RFC7230</dt><dd>(default) Compliance with RFC7230</dd>
+ * <dt>RFC2616</dt><dd>Wrapped headers and HTTP/0.9 supported</dd>
+ * <dt>LEGACY</dt><dd>(aka STRICT) Adherence to Servlet Specification requirement for
+ * exact case of header names, bypassing the header caches, which are case insensitive,
+ * otherwise equivalent to RFC2616</dd>
+ * </dl>
+ * @see <a href="http://tools.ietf.org/html/rfc7230">RFC 7230</a>
+ */
+public class HttpParser
+{
+    public static final Logger LOG = Log.getLogger(HttpParser.class);
+    @Deprecated
+    public final static String __STRICT="org.eclipse.jetty.http.HttpParser.STRICT";
+    public final static int INITIAL_URI_LENGTH=256;
+
+    /**
+     * Cache of common {@link HttpField}s including: <UL>
+     * <LI>Common static combinations such as:<UL>
+     *   <li>Connection: close
+     *   <li>Accept-Encoding: gzip
+     *   <li>Content-Length: 0
+     * </ul>
+     * <li>Combinations of Content-Type header for common mime types by common charsets
+     * <li>Most common headers with null values so that a lookup will at least
+     * determine the header name even if the name:value combination is not cached
+     * </ul>
+     */
+    public final static Trie<HttpField> CACHE = new ArrayTrie<>(2048);
+
+    // States
+    public enum State
+    {
+        START,
+        METHOD,
+        RESPONSE_VERSION,
+        SPACE1,
+        STATUS,
+        URI,
+        SPACE2,
+        REQUEST_VERSION,
+        REASON,
+        PROXY,
+        HEADER,
+        HEADER_IN_NAME,
+        HEADER_VALUE,
+        HEADER_IN_VALUE,
+        CONTENT,
+        EOF_CONTENT,
+        CHUNKED_CONTENT,
+        CHUNK_SIZE,
+        CHUNK_PARAMS,
+        CHUNK,
+        CHUNK_END,
+        END,
+        CLOSE,  // The associated stream/endpoint should be closed
+        CLOSED  // The associated stream/endpoint is at EOF
+    }
+
+    private final static EnumSet<State> __idleStates = EnumSet.of(State.START,State.END,State.CLOSE,State.CLOSED);
+    private final static EnumSet<State> __completeStates = EnumSet.of(State.END,State.CLOSE,State.CLOSED);
+
+    private final boolean DEBUG=LOG.isDebugEnabled(); // Cache debug to help branch prediction
+    private final HttpHandler _handler;
+    private final RequestHandler _requestHandler;
+    private final ResponseHandler _responseHandler;
+    private final ComplianceHandler _complianceHandler;
+    private final int _maxHeaderBytes;
+    private final HttpCompliance _compliance;
+    private HttpField _field;
+    private HttpHeader _header;
+    private String _headerString;
+    private HttpHeaderValue _value;
+    private String _valueString;
+    private int _responseStatus;
+    private int _headerBytes;
+    private boolean _host;
+
+    /* ------------------------------------------------------------------------------- */
+    private volatile State _state=State.START;
+    private volatile boolean _eof;
+    private HttpMethod _method;
+    private String _methodString;
+    private HttpVersion _version;
+    private Utf8StringBuilder _uri=new Utf8StringBuilder(INITIAL_URI_LENGTH); // Tune?
+    private EndOfContent _endOfContent;
+    private long _contentLength;
+    private long _contentPosition;
+    private int _chunkLength;
+    private int _chunkPosition;
+    private boolean _headResponse;
+    private boolean _cr;
+    private ByteBuffer _contentChunk;
+    private Trie<HttpField> _connectionFields;
+
+    private int _length;
+    private final StringBuilder _string=new StringBuilder();
+
+    static
+    {
+        CACHE.put(new HttpField(HttpHeader.CONNECTION,HttpHeaderValue.CLOSE));
+        CACHE.put(new HttpField(HttpHeader.CONNECTION,HttpHeaderValue.KEEP_ALIVE));
+        CACHE.put(new HttpField(HttpHeader.CONNECTION,HttpHeaderValue.UPGRADE));
+        CACHE.put(new HttpField(HttpHeader.ACCEPT_ENCODING,"gzip"));
+        CACHE.put(new HttpField(HttpHeader.ACCEPT_ENCODING,"gzip, deflate"));
+        CACHE.put(new HttpField(HttpHeader.ACCEPT_ENCODING,"gzip,deflate,sdch"));
+        CACHE.put(new HttpField(HttpHeader.ACCEPT_LANGUAGE,"en-US,en;q=0.5"));
+        CACHE.put(new HttpField(HttpHeader.ACCEPT_LANGUAGE,"en-GB,en-US;q=0.8,en;q=0.6"));
+        CACHE.put(new HttpField(HttpHeader.ACCEPT_CHARSET,"ISO-8859-1,utf-8;q=0.7,*;q=0.3"));
+        CACHE.put(new HttpField(HttpHeader.ACCEPT,"*/*"));
+        CACHE.put(new HttpField(HttpHeader.ACCEPT,"image/png,image/*;q=0.8,*/*;q=0.5"));
+        CACHE.put(new HttpField(HttpHeader.ACCEPT,"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"));
+        CACHE.put(new HttpField(HttpHeader.PRAGMA,"no-cache"));
+        CACHE.put(new HttpField(HttpHeader.CACHE_CONTROL,"private, no-cache, no-cache=Set-Cookie, proxy-revalidate"));
+        CACHE.put(new HttpField(HttpHeader.CACHE_CONTROL,"no-cache"));
+        CACHE.put(new HttpField(HttpHeader.CONTENT_LENGTH,"0"));
+        CACHE.put(new HttpField(HttpHeader.CONTENT_ENCODING,"gzip"));
+        CACHE.put(new HttpField(HttpHeader.CONTENT_ENCODING,"deflate"));
+        CACHE.put(new HttpField(HttpHeader.TRANSFER_ENCODING,"chunked"));
+        CACHE.put(new HttpField(HttpHeader.EXPIRES,"Fri, 01 Jan 1990 00:00:00 GMT"));
+
+        // Add common Content types as fields
+        for (String type : new String[]{"text/plain","text/html","text/xml","text/json","application/json","application/x-www-form-urlencoded"})
+        {
+            HttpField field=new PreEncodedHttpField(HttpHeader.CONTENT_TYPE,type);
+            CACHE.put(field);
+
+            for (String charset : new String[]{"utf-8","iso-8859-1"})
+            {
+                CACHE.put(new PreEncodedHttpField(HttpHeader.CONTENT_TYPE,type+";charset="+charset));
+                CACHE.put(new PreEncodedHttpField(HttpHeader.CONTENT_TYPE,type+"; charset="+charset));
+                CACHE.put(new PreEncodedHttpField(HttpHeader.CONTENT_TYPE,type+";charset="+charset.toUpperCase(Locale.ENGLISH)));
+                CACHE.put(new PreEncodedHttpField(HttpHeader.CONTENT_TYPE,type+"; charset="+charset.toUpperCase(Locale.ENGLISH)));
+            }
+        }
+
+        // Add headers with null values so HttpParser can avoid looking up name again for unknown values
+        for (HttpHeader h:HttpHeader.values())
+            if (!CACHE.put(new HttpField(h,(String)null)))
+                throw new IllegalStateException("CACHE FULL");
+        // Add some more common headers
+        CACHE.put(new HttpField(HttpHeader.REFERER,(String)null));
+        CACHE.put(new HttpField(HttpHeader.IF_MODIFIED_SINCE,(String)null));
+        CACHE.put(new HttpField(HttpHeader.IF_NONE_MATCH,(String)null));
+        CACHE.put(new HttpField(HttpHeader.AUTHORIZATION,(String)null));
+        CACHE.put(new HttpField(HttpHeader.COOKIE,(String)null));
+    }
+
+    private static HttpCompliance compliance()
+    {
+        Boolean strict = Boolean.getBoolean(__STRICT);
+        return strict?HttpCompliance.LEGACY:HttpCompliance.RFC7230;
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    public HttpParser(RequestHandler handler)
+    {
+        this(handler,-1,compliance());
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    public HttpParser(ResponseHandler handler)
+    {
+        this(handler,-1,compliance());
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    public HttpParser(RequestHandler handler,int maxHeaderBytes)
+    {
+        this(handler,maxHeaderBytes,compliance());
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    public HttpParser(ResponseHandler handler,int maxHeaderBytes)
+    {
+        this(handler,maxHeaderBytes,compliance());
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    @Deprecated
+    public HttpParser(RequestHandler handler,int maxHeaderBytes,boolean strict)
+    {
+        this(handler,maxHeaderBytes,strict?HttpCompliance.LEGACY:compliance());
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    @Deprecated
+    public HttpParser(ResponseHandler handler,int maxHeaderBytes,boolean strict)
+    {
+        this(handler,maxHeaderBytes,strict?HttpCompliance.LEGACY:compliance());
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    public HttpParser(RequestHandler handler,HttpCompliance compliance)
+    {
+        this(handler,-1,compliance);
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    public HttpParser(RequestHandler handler,int maxHeaderBytes,HttpCompliance compliance)
+    {
+        _handler=handler;
+        _requestHandler=handler;
+        _responseHandler=null;
+        _maxHeaderBytes=maxHeaderBytes;
+        _compliance=compliance==null?compliance():compliance;
+        _complianceHandler=(ComplianceHandler)(handler instanceof ComplianceHandler?handler:null);
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    public HttpParser(ResponseHandler handler,int maxHeaderBytes,HttpCompliance compliance)
+    {
+        _handler=handler;
+        _requestHandler=null;
+        _responseHandler=handler;
+        _maxHeaderBytes=maxHeaderBytes;
+        _compliance=compliance==null?compliance():compliance;
+        _complianceHandler=(ComplianceHandler)(handler instanceof ComplianceHandler?handler:null);
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    public HttpHandler getHandler()
+    {
+        return _handler;
+    }
+    
+    /* ------------------------------------------------------------------------------- */
+    /** Check RFC compliance violation
+     * @param compliance The compliance level violated
+     * @param reason The reason for the violation
+     * @return True if the current compliance level is set so as to Not allow this violation
+     */
+    protected boolean complianceViolation(HttpCompliance compliance,String reason)
+    {
+        if (_complianceHandler==null)
+            return _compliance.ordinal()>=compliance.ordinal();
+        if (_compliance.ordinal()<compliance.ordinal())
+        {
+            _complianceHandler.onComplianceViolation(_compliance,compliance,reason);
+            return false;
+        }
+        return true;
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    protected String legacyString(String orig, String cached)
+    {                   
+        return (_compliance!=LEGACY || orig.equals(cached) || complianceViolation(RFC2616,"case sensitive"))?cached:orig;
+    }
+    
+    /* ------------------------------------------------------------------------------- */
+    public long getContentLength()
+    {
+        return _contentLength;
+    }
+
+    /* ------------------------------------------------------------ */
+    public long getContentRead()
+    {
+        return _contentPosition;
+    }
+
+    /* ------------------------------------------------------------ */
+    /** Set if a HEAD response is expected
+     * @param head true if head response is expected
+     */
+    public void setHeadResponse(boolean head)
+    {
+        _headResponse=head;
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    protected void setResponseStatus(int status)
+    {
+        _responseStatus=status;
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    public State getState()
+    {
+        return _state;
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    public boolean inContentState()
+    {
+        return _state.ordinal()>=State.CONTENT.ordinal() && _state.ordinal()<State.END.ordinal();
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    public boolean inHeaderState()
+    {
+        return _state.ordinal() < State.CONTENT.ordinal();
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    public boolean isChunking()
+    {
+        return _endOfContent==EndOfContent.CHUNKED_CONTENT;
+    }
+
+    /* ------------------------------------------------------------ */
+    public boolean isStart()
+    {
+        return isState(State.START);
+    }
+
+    /* ------------------------------------------------------------ */
+    public boolean isClose()
+    {
+        return isState(State.CLOSE);
+    }
+
+    /* ------------------------------------------------------------ */
+    public boolean isClosed()
+    {
+        return isState(State.CLOSED);
+    }
+
+    /* ------------------------------------------------------------ */
+    public boolean isIdle()
+    {
+        return __idleStates.contains(_state);
+    }
+
+    /* ------------------------------------------------------------ */
+    public boolean isComplete()
+    {
+        return __completeStates.contains(_state);
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    public boolean isState(State state)
+    {
+        return _state == state;
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    enum CharState { ILLEGAL, CR, LF, LEGAL }
+    private final static CharState[] __charState;
+    static
+    {
+        // token          = 1*tchar
+        // tchar          = "!" / "#" / "$" / "%" / "&" / "'" / "*"
+        //                / "+" / "-" / "." / "^" / "_" / "`" / "|" / "~"
+        //                / DIGIT / ALPHA
+        //                ; any VCHAR, except delimiters
+        // quoted-string  = DQUOTE *( qdtext / quoted-pair ) DQUOTE
+        // qdtext         = HTAB / SP /%x21 / %x23-5B / %x5D-7E / obs-text
+        // obs-text       = %x80-FF
+        // comment        = "(" *( ctext / quoted-pair / comment ) ")"
+        // ctext          = HTAB / SP / %x21-27 / %x2A-5B / %x5D-7E / obs-text
+        // quoted-pair    = "\" ( HTAB / SP / VCHAR / obs-text )
+
+        __charState=new CharState[256];
+        Arrays.fill(__charState,CharState.ILLEGAL);
+        __charState[LINE_FEED]=CharState.LF;
+        __charState[CARRIAGE_RETURN]=CharState.CR;
+        __charState[TAB]=CharState.LEGAL;
+        __charState[SPACE]=CharState.LEGAL;
+
+        __charState['!']=CharState.LEGAL;
+        __charState['#']=CharState.LEGAL;
+        __charState['$']=CharState.LEGAL;
+        __charState['%']=CharState.LEGAL;
+        __charState['&']=CharState.LEGAL;
+        __charState['\'']=CharState.LEGAL;
+        __charState['*']=CharState.LEGAL;
+        __charState['+']=CharState.LEGAL;
+        __charState['-']=CharState.LEGAL;
+        __charState['.']=CharState.LEGAL;
+        __charState['^']=CharState.LEGAL;
+        __charState['_']=CharState.LEGAL;
+        __charState['`']=CharState.LEGAL;
+        __charState['|']=CharState.LEGAL;
+        __charState['~']=CharState.LEGAL;
+
+        __charState['"']=CharState.LEGAL;
+
+        __charState['\\']=CharState.LEGAL;
+        __charState['(']=CharState.LEGAL;
+        __charState[')']=CharState.LEGAL;
+        Arrays.fill(__charState,0x21,0x27+1,CharState.LEGAL);
+        Arrays.fill(__charState,0x2A,0x5B+1,CharState.LEGAL);
+        Arrays.fill(__charState,0x5D,0x7E+1,CharState.LEGAL);
+        Arrays.fill(__charState,0x80,0xFF+1,CharState.LEGAL);
+
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    private byte next(ByteBuffer buffer)
+    {
+        byte ch = buffer.get();
+
+        CharState s = __charState[0xff & ch];
+        switch(s)
+        {
+            case ILLEGAL:
+                throw new IllegalCharacterException(_state,ch,buffer);
+
+            case LF:
+                _cr=false;
+                break;
+
+            case CR:
+                if (_cr)
+                    throw new BadMessageException("Bad EOL");
+
+                _cr=true;
+                if (buffer.hasRemaining())
+                {
+                    if(_maxHeaderBytes>0 && _state.ordinal()<State.END.ordinal())
+                        _headerBytes++;
+                    return next(buffer);
+                }
+
+                // Can return 0 here to indicate the need for more characters,
+                // because a real 0 in the buffer would cause a BadMessage below
+                return 0;
+
+            case LEGAL:
+                if (_cr)
+                    throw new BadMessageException("Bad EOL");
+
+        }
+
+        return ch;
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    /* Quick lookahead for the start state looking for a request method or a HTTP version,
+     * otherwise skip white space until something else to parse.
+     */
+    private boolean quickStart(ByteBuffer buffer)
+    {
+        if (_requestHandler!=null)
+        {
+            _method = HttpMethod.lookAheadGet(buffer);
+            if (_method!=null)
+            {
+                _methodString = _method.asString();
+                buffer.position(buffer.position()+_methodString.length()+1);
+
+                setState(State.SPACE1);
+                return false;
+            }
+        }
+        else if (_responseHandler!=null)
+        {
+            _version = HttpVersion.lookAheadGet(buffer);
+            if (_version!=null)
+            {
+                buffer.position(buffer.position()+_version.asString().length()+1);
+                setState(State.SPACE1);
+                return false;
+            }
+        }
+
+        // Quick start look
+        while (_state==State.START && buffer.hasRemaining())
+        {
+            int ch=next(buffer);
+
+            if (ch > SPACE)
+            {
+                _string.setLength(0);
+                _string.append((char)ch);
+                setState(_requestHandler!=null?State.METHOD:State.RESPONSE_VERSION);
+                return false;
+            }
+            else if (ch==0)
+                break;
+            else if (ch<0)
+                throw new BadMessageException();
+
+            // count this white space as a header byte to avoid DOS
+            if (_maxHeaderBytes>0 && ++_headerBytes>_maxHeaderBytes)
+            {
+                LOG.warn("padding is too large >"+_maxHeaderBytes);
+                throw new BadMessageException(HttpStatus.BAD_REQUEST_400);
+            }
+        }
+        return false;
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    private void setString(String s)
+    {
+        _string.setLength(0);
+        _string.append(s);
+        _length=s.length();
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    private String takeString()
+    {
+        _string.setLength(_length);
+        String s =_string.toString();
+        _string.setLength(0);
+        _length=-1;
+        return s;
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    /* Parse a request or response line
+     */
+    private boolean parseLine(ByteBuffer buffer)
+    {
+        boolean handle=false;
+
+        // Process headers
+        while (_state.ordinal()<State.HEADER.ordinal() && buffer.hasRemaining() && !handle)
+        {
+            // process each character
+            byte ch=next(buffer);
+            if (ch==0)
+                break;
+
+            if (_maxHeaderBytes>0 && ++_headerBytes>_maxHeaderBytes)
+            {
+                if (_state==State.URI)
+                {
+                    LOG.warn("URI is too large >"+_maxHeaderBytes);
+                    throw new BadMessageException(HttpStatus.REQUEST_URI_TOO_LONG_414);
+                }
+                else
+                {
+                    if (_requestHandler!=null)
+                        LOG.warn("request is too large >"+_maxHeaderBytes);
+                    else
+                        LOG.warn("response is too large >"+_maxHeaderBytes);
+                    throw new BadMessageException(HttpStatus.REQUEST_ENTITY_TOO_LARGE_413);
+                }
+            }
+
+            switch (_state)
+            {
+                case METHOD:
+                    if (ch == SPACE)
+                    {
+                        _length=_string.length();
+                        _methodString=takeString();
+                        HttpMethod method=HttpMethod.CACHE.get(_methodString);
+                        if (method!=null)
+                            _methodString=legacyString(_methodString,method.asString());
+                        setState(State.SPACE1);
+                    }
+                    else if (ch < SPACE)
+                    {
+                        if (ch==LINE_FEED)
+                            throw new BadMessageException("No URI");
+                        else
+                            throw new IllegalCharacterException(_state,ch,buffer);
+                    }
+                    else
+                        _string.append((char)ch);
+                    break;
+
+                case RESPONSE_VERSION:
+                    if (ch == HttpTokens.SPACE)
+                    {
+                        _length=_string.length();
+                        String version=takeString();
+                        _version=HttpVersion.CACHE.get(version);
+                        if (_version==null)
+                            throw new BadMessageException(HttpStatus.BAD_REQUEST_400,"Unknown Version");
+                        setState(State.SPACE1);
+                    }
+                    else if (ch < HttpTokens.SPACE)
+                        throw new IllegalCharacterException(_state,ch,buffer);
+                    else
+                        _string.append((char)ch);
+                    break;
+
+                case SPACE1:
+                    if (ch > HttpTokens.SPACE || ch<0)
+                    {
+                        if (_responseHandler!=null)
+                        {
+                            setState(State.STATUS);
+                            setResponseStatus(ch-'0');
+                        }
+                        else
+                        {
+                            _uri.reset();
+                            setState(State.URI);
+                            // quick scan for space or EoBuffer
+                            if (buffer.hasArray())
+                            {
+                                byte[] array=buffer.array();
+                                int p=buffer.arrayOffset()+buffer.position();
+                                int l=buffer.arrayOffset()+buffer.limit();
+                                int i=p;
+                                while (i<l && array[i]>HttpTokens.SPACE)
+                                    i++;
+
+                                int len=i-p;
+                                _headerBytes+=len;
+
+                                if (_maxHeaderBytes>0 && ++_headerBytes>_maxHeaderBytes)
+                                {
+                                    LOG.warn("URI is too large >"+_maxHeaderBytes);
+                                    throw new BadMessageException(HttpStatus.REQUEST_URI_TOO_LONG_414);
+                                }
+                                _uri.append(array,p-1,len+1);
+                                buffer.position(i-buffer.arrayOffset());
+                            }
+                            else
+                                _uri.append(ch);
+                        }
+                    }
+                    else if (ch < HttpTokens.SPACE)
+                    {
+                        throw new BadMessageException(HttpStatus.BAD_REQUEST_400,_requestHandler!=null?"No URI":"No Status");
+                    }
+                    break;
+
+                case STATUS:
+                    if (ch == HttpTokens.SPACE)
+                    {
+                        setState(State.SPACE2);
+                    }
+                    else if (ch>='0' && ch<='9')
+                    {
+                        _responseStatus=_responseStatus*10+(ch-'0');
+                    }
+                    else if (ch < HttpTokens.SPACE && ch>=0)
+                    {
+                        setState(State.HEADER);
+                        handle=_responseHandler.startResponse(_version, _responseStatus, null)||handle;
+                    }
+                    else
+                    {
+                        throw new BadMessageException();
+                    }
+                    break;
+
+                case URI:
+                    if (ch == HttpTokens.SPACE)
+                    {
+                        setState(State.SPACE2);
+                    }
+                    else if (ch < HttpTokens.SPACE && ch>=0)
+                    {
+                        // HTTP/0.9
+                        if (complianceViolation(RFC7230,"HTTP/0.9"))
+                            throw new BadMessageException("HTTP/0.9 not supported");
+                        handle=_requestHandler.startRequest(_methodString,_uri.toString(), HttpVersion.HTTP_0_9);
+                        setState(State.END);
+                        BufferUtil.clear(buffer);
+                        handle=_handler.headerComplete()||handle;
+                        handle=_handler.messageComplete()||handle;
+                        return handle;
+                    }
+                    else
+                    {
+                        _uri.append(ch);
+                    }
+                    break;
+
+                case SPACE2:
+                    if (ch > HttpTokens.SPACE)
+                    {
+                        _string.setLength(0);
+                        _string.append((char)ch);
+                        if (_responseHandler!=null)
+                        {
+                            _length=1;
+                            setState(State.REASON);
+                        }
+                        else
+                        {
+                            setState(State.REQUEST_VERSION);
+
+                            // try quick look ahead for HTTP Version
+                            HttpVersion version;
+                            if (buffer.position()>0 && buffer.hasArray())
+                                version=HttpVersion.lookAheadGet(buffer.array(),buffer.arrayOffset()+buffer.position()-1,buffer.arrayOffset()+buffer.limit());
+                            else
+                                version=HttpVersion.CACHE.getBest(buffer,0,buffer.remaining());
+
+                            if (version!=null)
+                            {
+                                int pos = buffer.position()+version.asString().length()-1;
+                                if (pos<buffer.limit())
+                                {
+                                    byte n=buffer.get(pos);
+                                    if (n==HttpTokens.CARRIAGE_RETURN)
+                                    {
+                                        _cr=true;
+                                        _version=version;
+                                        _string.setLength(0);
+                                        buffer.position(pos+1);
+                                    }
+                                    else if (n==HttpTokens.LINE_FEED)
+                                    {
+                                        _version=version;
+                                        _string.setLength(0);
+                                        buffer.position(pos);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    else if (ch == HttpTokens.LINE_FEED)
+                    {
+                        if (_responseHandler!=null)
+                        {
+                            setState(State.HEADER);
+                            handle=_responseHandler.startResponse(_version, _responseStatus, null)||handle;
+                        }
+                        else
+                        {
+                            // HTTP/0.9
+                            if (complianceViolation(RFC7230,"HTTP/0.9"))
+                                throw new BadMessageException("HTTP/0.9 not supported");
+
+                            handle=_requestHandler.startRequest(_methodString,_uri.toString(), HttpVersion.HTTP_0_9);
+                            setState(State.END);
+                            BufferUtil.clear(buffer);
+                            handle=_handler.headerComplete()||handle;
+                            handle=_handler.messageComplete()||handle;
+                            return handle;
+                        }
+                    }
+                    else if (ch<0)
+                        throw new BadMessageException();
+                    break;
+
+                case REQUEST_VERSION:
+                    if (ch == HttpTokens.LINE_FEED)
+                    {
+                        if (_version==null)
+                        {
+                            _length=_string.length();
+                            _version=HttpVersion.CACHE.get(takeString());
+                        }
+                        if (_version==null)
+                            throw new BadMessageException(HttpStatus.BAD_REQUEST_400,"Unknown Version");
+
+                        // Should we try to cache header fields?
+                        if (_connectionFields==null && _version.getVersion()>=HttpVersion.HTTP_1_1.getVersion() && _handler.getHeaderCacheSize()>0)
+                        {
+                            int header_cache = _handler.getHeaderCacheSize();
+                            _connectionFields=new ArrayTernaryTrie<>(header_cache);
+                        }
+
+                        setState(State.HEADER);
+
+                        handle=_requestHandler.startRequest(_methodString,_uri.toString(), _version)||handle;
+                        continue;
+                    }
+                    else if (ch>=HttpTokens.SPACE)
+                        _string.append((char)ch);
+                    else
+                        throw new BadMessageException();
+
+                    break;
+
+                case REASON:
+                    if (ch == HttpTokens.LINE_FEED)
+                    {
+                        String reason=takeString();
+                        setState(State.HEADER);
+                        handle=_responseHandler.startResponse(_version, _responseStatus, reason)||handle;
+                        continue;
+                    }
+                    else if (ch>=HttpTokens.SPACE)
+                    {
+                        _string.append((char)ch);
+                        if (ch!=' '&&ch!='\t')
+                            _length=_string.length();
+                    }
+                    else
+                        throw new BadMessageException();
+                    break;
+
+                default:
+                    throw new IllegalStateException(_state.toString());
+
+            }
+        }
+
+        return handle;
+    }
+
+    private void parsedHeader()
+    {
+        // handler last header if any.  Delayed to here just in case there was a continuation line (above)
+        if (_headerString!=null || _valueString!=null)
+        {
+            // Handle known headers
+            if (_header!=null)
+            {
+                boolean add_to_connection_trie=false;
+                switch (_header)
+                {
+                    case CONTENT_LENGTH:
+                        if (_endOfContent == EndOfContent.CONTENT_LENGTH)
+                        {
+                            throw new BadMessageException(HttpStatus.BAD_REQUEST_400, "Duplicate Content-Length");
+                        }
+                        else if (_endOfContent != EndOfContent.CHUNKED_CONTENT)
+                        {
+                            _contentLength=convertContentLength(_valueString);
+                            if (_contentLength <= 0)
+                                _endOfContent=EndOfContent.NO_CONTENT;
+                            else
+                                _endOfContent=EndOfContent.CONTENT_LENGTH;
+                        }
+                        break;
+
+                    case TRANSFER_ENCODING:
+                        if (_value==HttpHeaderValue.CHUNKED)
+                        {
+                            _endOfContent=EndOfContent.CHUNKED_CONTENT;
+                            _contentLength=-1;
+                        }
+                        else
+                        {
+                            if (_valueString.endsWith(HttpHeaderValue.CHUNKED.toString()))
+                                _endOfContent=EndOfContent.CHUNKED_CONTENT;
+                            else if (_valueString.contains(HttpHeaderValue.CHUNKED.toString()))
+                                throw new BadMessageException(HttpStatus.BAD_REQUEST_400,"Bad chunking");
+                        }
+                        break;
+
+                    case HOST:
+                        _host=true;
+                        if (!(_field instanceof HostPortHttpField))
+                        {
+                            _field=new HostPortHttpField(_header,legacyString(_headerString,_header.asString()),_valueString);
+                            add_to_connection_trie=_connectionFields!=null;
+                        }
+                      break;
+
+                    case CONNECTION:
+                        // Don't cache if not persistent
+                        if (_valueString!=null && _valueString.contains("close"))
+                            _connectionFields=null;
+
+                        break;
+
+                    case AUTHORIZATION:
+                    case ACCEPT:
+                    case ACCEPT_CHARSET:
+                    case ACCEPT_ENCODING:
+                    case ACCEPT_LANGUAGE:
+                    case COOKIE:
+                    case CACHE_CONTROL:
+                    case USER_AGENT:
+                        add_to_connection_trie=_connectionFields!=null && _field==null;
+                        break;
+
+                    default: break;
+                }
+
+                if (add_to_connection_trie && !_connectionFields.isFull() && _header!=null && _valueString!=null)
+                {
+                    if (_field==null)
+                        _field=new HttpField(_header,legacyString(_headerString,_header.asString()),_valueString);
+                    _connectionFields.put(_field);
+                }
+            }
+            _handler.parsedHeader(_field!=null?_field:new HttpField(_header,_headerString,_valueString));
+        }
+
+        _headerString=_valueString=null;
+        _header=null;
+        _value=null;
+        _field=null;
+    }
+
+    private long convertContentLength(String valueString)
+    {
+        try
+        {
+            return Long.parseLong(valueString);
+        }
+        catch(NumberFormatException e)
+        {
+            LOG.ignore(e);
+            throw new BadMessageException(HttpStatus.BAD_REQUEST_400,"Invalid Content-Length Value");
+        }
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    /*
+     * Parse the message headers and return true if the handler has signaled for a return
+     */
+    protected boolean parseHeaders(ByteBuffer buffer)
+    {
+        boolean handle=false;
+
+        // Process headers
+        while (_state.ordinal()<State.CONTENT.ordinal() && buffer.hasRemaining() && !handle)
+        {
+            // process each character
+            byte ch=next(buffer);
+            if (ch==0)
+                break;
+
+            if (_maxHeaderBytes>0 && ++_headerBytes>_maxHeaderBytes)
+            {
+                LOG.warn("Header is too large >"+_maxHeaderBytes);
+                throw new BadMessageException(HttpStatus.REQUEST_ENTITY_TOO_LARGE_413);
+            }
+
+            switch (_state)
+            {
+                case HEADER:
+                    switch(ch)
+                    {
+                        case HttpTokens.COLON:
+                        case HttpTokens.SPACE:
+                        case HttpTokens.TAB:
+                        {
+                            if (complianceViolation(RFC7230,"header folding"))
+                                throw new BadMessageException(HttpStatus.BAD_REQUEST_400,"Header Folding");
+
+                            // header value without name - continuation?
+                            if (_valueString==null)
+                            {
+                                _string.setLength(0);
+                                _length=0;
+                            }
+                            else
+                            {
+                                setString(_valueString);
+                                _string.append(' ');
+                                _length++;
+                                _valueString=null;
+                            }
+                            setState(State.HEADER_VALUE);
+                            break;
+                        }
+
+                        case HttpTokens.LINE_FEED:
+                        {
+                            // process previous header
+                            parsedHeader();
+
+                            _contentPosition=0;
+
+                            // End of headers!
+
+                            // Was there a required host header?
+                            if (!_host && _version==HttpVersion.HTTP_1_1 && _requestHandler!=null)
+                            {
+                                throw new BadMessageException(HttpStatus.BAD_REQUEST_400,"No Host");
+                            }
+
+                            // is it a response that cannot have a body?
+                            if (_responseHandler !=null  && // response
+                                    (_responseStatus == 304  || // not-modified response
+                                    _responseStatus == 204 || // no-content response
+                                    _responseStatus < 200)) // 1xx response
+                                _endOfContent=EndOfContent.NO_CONTENT; // ignore any other headers set
+
+                            // else if we don't know framing
+                            else if (_endOfContent == EndOfContent.UNKNOWN_CONTENT)
+                            {
+                                if (_responseStatus == 0  // request
+                                        || _responseStatus == 304 // not-modified response
+                                        || _responseStatus == 204 // no-content response
+                                        || _responseStatus < 200) // 1xx response
+                                    _endOfContent=EndOfContent.NO_CONTENT;
+                                else
+                                    _endOfContent=EndOfContent.EOF_CONTENT;
+                            }
+
+                            // How is the message ended?
+                            switch (_endOfContent)
+                            {
+                                case EOF_CONTENT:
+                                    setState(State.EOF_CONTENT);
+                                    handle=_handler.headerComplete()||handle;
+                                    return handle;
+
+                                case CHUNKED_CONTENT:
+                                    setState(State.CHUNKED_CONTENT);
+                                    handle=_handler.headerComplete()||handle;
+                                    return handle;
+
+                                case NO_CONTENT:
+                                    setState(State.END);
+                                    handle=_handler.headerComplete()||handle;
+                                    handle=_handler.messageComplete()||handle;
+                                    return handle;
+
+                                default:
+                                    setState(State.CONTENT);
+                                    handle=_handler.headerComplete()||handle;
+                                    return handle;
+                            }
+                        }
+
+                        default:
+                        {
+                            // now handle the ch
+                            if (ch<HttpTokens.SPACE)
+                                throw new BadMessageException();
+
+                            // process previous header
+                            parsedHeader();
+
+                            // handle new header
+                            if (buffer.hasRemaining())
+                            {
+                                // Try a look ahead for the known header name and value.
+                                HttpField field=_connectionFields==null?null:_connectionFields.getBest(buffer,-1,buffer.remaining());
+                                if (field==null)
+                                    field=CACHE.getBest(buffer,-1,buffer.remaining());
+
+                                if (field!=null)
+                                {
+                                    final String n;
+                                    final String v;
+
+                                    if (_compliance==LEGACY)
+                                    {
+                                        // Have to get the fields exactly from the buffer to match case
+                                        String fn=field.getName();
+                                        n=legacyString(BufferUtil.toString(buffer,buffer.position()-1,fn.length(),StandardCharsets.US_ASCII),fn);
+                                        String fv=field.getValue();
+                                        if (fv==null)
+                                            v=null;
+                                        else
+                                        {
+                                            v=legacyString(BufferUtil.toString(buffer,buffer.position()+fn.length()+1,fv.length(),StandardCharsets.ISO_8859_1),fv);
+                                            field=new HttpField(field.getHeader(),n,v);
+                                        }
+                                    }
+                                    else
+                                    {
+                                        n=field.getName();
+                                        v=field.getValue();
+                                    }
+
+                                    _header=field.getHeader();
+                                    _headerString=n;
+
+                                    if (v==null)
+                                    {
+                                        // Header only
+                                        setState(State.HEADER_VALUE);
+                                        _string.setLength(0);
+                                        _length=0;
+                                        buffer.position(buffer.position()+n.length()+1);
+                                        break;
+                                    }
+                                    else
+                                    {
+                                        // Header and value
+                                        int pos=buffer.position()+n.length()+v.length()+1;
+                                        byte b=buffer.get(pos);
+
+                                        if (b==HttpTokens.CARRIAGE_RETURN || b==HttpTokens.LINE_FEED)
+                                        {
+                                            _field=field;
+                                            _valueString=v;
+                                            setState(State.HEADER_IN_VALUE);
+
+                                            if (b==HttpTokens.CARRIAGE_RETURN)
+                                            {
+                                                _cr=true;
+                                                buffer.position(pos+1);
+                                            }
+                                            else
+                                                buffer.position(pos);
+                                            break;
+                                        }
+                                        else
+                                        {
+                                            setState(State.HEADER_IN_VALUE);
+                                            setString(v);
+                                            buffer.position(pos);
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+
+                            // New header
+                            setState(State.HEADER_IN_NAME);
+                            _string.setLength(0);
+                            _string.append((char)ch);
+                            _length=1;
+
+                        }
+                    }
+                    break;
+
+                case HEADER_IN_NAME:
+                    if (ch==HttpTokens.COLON)
+                    {
+                        if (_headerString==null)
+                        {
+                            _headerString=takeString();
+                            _header=HttpHeader.CACHE.get(_headerString);
+                        }
+                        _length=-1;
+
+                        setState(State.HEADER_VALUE);
+                        break;
+                    }
+
+                    if (ch>HttpTokens.SPACE)
+                    {
+                        if (_header!=null)
+                        {
+                            setString(_header.asString());
+                            _header=null;
+                            _headerString=null;
+                        }
+
+                        _string.append((char)ch);
+                        if (ch>HttpTokens.SPACE)
+                            _length=_string.length();
+                        break;
+                    }
+                    
+                    if (ch==HttpTokens.LINE_FEED && !complianceViolation(RFC7230,"name only header"))
+                    {
+                        if (_headerString==null)
+                        {
+                            _headerString=takeString();
+                            _header=HttpHeader.CACHE.get(_headerString);
+                        }
+                        _value=null;
+                        _string.setLength(0);
+                        _valueString="";
+                        _length=-1;
+
+                        setState(State.HEADER);
+                        break;
+                    }
+
+                    throw new IllegalCharacterException(_state,ch,buffer);
+
+                case HEADER_VALUE:
+                    if (ch>HttpTokens.SPACE || ch<0)
+                    {
+                        _string.append((char)(0xff&ch));
+                        _length=_string.length();
+                        setState(State.HEADER_IN_VALUE);
+                        break;
+                    }
+
+                    if (ch==HttpTokens.SPACE || ch==HttpTokens.TAB)
+                        break;
+
+                    if (ch==HttpTokens.LINE_FEED)
+                    {
+                        _value=null;
+                        _string.setLength(0);
+                        _valueString="";
+                        _length=-1;
+
+                        setState(State.HEADER);
+                        break;
+                    }
+                    throw new IllegalCharacterException(_state,ch,buffer);
+
+                case HEADER_IN_VALUE:
+                    if (ch>=HttpTokens.SPACE || ch<0 || ch==HttpTokens.TAB)
+                    {
+                        if (_valueString!=null)
+                        {
+                            setString(_valueString);
+                            _valueString=null;
+                            _field=null;
+                        }
+                        _string.append((char)(0xff&ch));
+                        if (ch>HttpTokens.SPACE || ch<0)
+                            _length=_string.length();
+                        break;
+                    }
+
+                    if (ch==HttpTokens.LINE_FEED)
+                    {
+                        if (_length > 0)
+                        {
+                            _value=null;
+                            _valueString=takeString();
+                            _length=-1;
+                        }
+                        setState(State.HEADER);
+                        break;
+                    }
+
+                    throw new IllegalCharacterException(_state,ch,buffer);
+
+                default:
+                    throw new IllegalStateException(_state.toString());
+
+            }
+        }
+
+        return handle;
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    /**
+     * Parse until next Event.
+     * @param buffer the buffer to parse
+     * @return True if an {@link RequestHandler} method was called and it returned true;
+     */
+    public boolean parseNext(ByteBuffer buffer)
+    {
+        if (DEBUG)
+            LOG.debug("parseNext s={} {}",_state,BufferUtil.toDetailString(buffer));
+        try
+        {
+            // Start a request/response
+            if (_state==State.START)
+            {
+                _version=null;
+                _method=null;
+                _methodString=null;
+                _endOfContent=EndOfContent.UNKNOWN_CONTENT;
+                _header=null;
+                if (quickStart(buffer))
+                    return true;
+            }
+
+            // Request/response line
+            if (_state.ordinal()>= State.START.ordinal() && _state.ordinal()<State.HEADER.ordinal())
+            {
+                if (parseLine(buffer))
+                    return true;
+            }
+
+            // parse headers
+            if (_state.ordinal()>= State.HEADER.ordinal() && _state.ordinal()<State.CONTENT.ordinal())
+            {
+                if (parseHeaders(buffer))
+                    return true;
+            }
+
+            // parse content
+            if (_state.ordinal()>= State.CONTENT.ordinal() && _state.ordinal()<State.END.ordinal())
+            {
+                // Handle HEAD response
+                if (_responseStatus>0 && _headResponse)
+                {
+                    setState(State.END);
+                    return _handler.messageComplete();
+                }
+                else
+                {
+                    if (parseContent(buffer))
+                        return true;
+                }
+            }
+
+            // handle end states
+            if (_state==State.END)
+            {
+                // eat white space
+                while (buffer.remaining()>0 && buffer.get(buffer.position())<=HttpTokens.SPACE)
+                    buffer.get();
+            }
+            else if (_state==State.CLOSE)
+            {
+                // Seeking EOF
+                if (BufferUtil.hasContent(buffer))
+                {
+                    // Just ignore data when closed
+                    _headerBytes+=buffer.remaining();
+                    BufferUtil.clear(buffer);
+                    if (_maxHeaderBytes>0 && _headerBytes>_maxHeaderBytes)
+                    {
+                        // Don't want to waste time reading data of a closed request
+                        throw new IllegalStateException("too much data seeking EOF");
+                    }
+                }
+            }
+            else if (_state==State.CLOSED)
+            {
+                BufferUtil.clear(buffer);
+            }
+
+            // Handle EOF
+            if (_eof && !buffer.hasRemaining())
+            {
+                switch(_state)
+                {
+                    case CLOSED:
+                        break;
+
+                    case START:
+                        setState(State.CLOSED);
+                        _handler.earlyEOF();
+                        break;
+
+                    case END:
+                    case CLOSE:
+                        setState(State.CLOSED);
+                        break;
+
+                    case EOF_CONTENT:
+                        setState(State.CLOSED);
+                        return _handler.messageComplete();
+
+                    case  CONTENT:
+                    case  CHUNKED_CONTENT:
+                    case  CHUNK_SIZE:
+                    case  CHUNK_PARAMS:
+                    case  CHUNK:
+                        setState(State.CLOSED);
+                        _handler.earlyEOF();
+                        break;
+
+                    default:
+                        if (DEBUG)
+                            LOG.debug("{} EOF in {}",this,_state);
+                        setState(State.CLOSED);
+                        _handler.badMessage(400,null);
+                        break;
+                }
+            }
+        }
+        catch(BadMessageException e)
+        {
+            BufferUtil.clear(buffer);
+
+            Throwable cause = e.getCause();
+            boolean stack = LOG.isDebugEnabled() ||
+                    (!(cause instanceof NumberFormatException )  && (cause instanceof RuntimeException || cause instanceof Error));
+
+            if (stack)
+                LOG.warn("bad HTTP parsed: "+e._code+(e.getReason()!=null?" "+e.getReason():"")+" for "+_handler,e);
+            else
+                LOG.warn("bad HTTP parsed: "+e._code+(e.getReason()!=null?" "+e.getReason():"")+" for "+_handler);
+            setState(State.CLOSE);
+            _handler.badMessage(e.getCode(), e.getReason());
+        }
+        catch(NumberFormatException|IllegalStateException e)
+        {
+            BufferUtil.clear(buffer);
+            LOG.warn("parse exception: {} in {} for {}",e.toString(),_state,_handler);
+            if (DEBUG)
+                LOG.debug(e);
+
+            switch(_state)
+            {
+                case CLOSED:
+                    break;
+                case CLOSE:
+                    _handler.earlyEOF();
+                    break;
+                default:
+                    setState(State.CLOSE);
+                    _handler.badMessage(400,"Bad Message "+e.toString());
+            }
+        }
+        catch(Exception|Error e)
+        {
+            BufferUtil.clear(buffer);
+
+            LOG.warn("parse exception: "+e.toString()+" for "+_handler,e);
+
+            switch(_state)
+            {
+                case CLOSED:
+                    break;
+                case CLOSE:
+                    _handler.earlyEOF();
+                    break;
+                default:
+                    setState(State.CLOSE);
+                    _handler.badMessage(400,null);
+            }
+        }
+        return false;
+    }
+
+    protected boolean parseContent(ByteBuffer buffer)
+    {
+        int remaining=buffer.remaining();
+        if (remaining==0 && _state==State.CONTENT)
+        {
+            long content=_contentLength - _contentPosition;
+            if (content == 0)
+            {
+                setState(State.END);
+                return _handler.messageComplete();
+            }
+        }
+
+        // Handle _content
+        byte ch;
+        while (_state.ordinal() < State.END.ordinal() && remaining>0)
+        {
+            switch (_state)
+            {
+                case EOF_CONTENT:
+                    _contentChunk=buffer.asReadOnlyBuffer();
+                    _contentPosition += remaining;
+                    buffer.position(buffer.position()+remaining);
+                    if (_handler.content(_contentChunk))
+                        return true;
+                    break;
+
+                case CONTENT:
+                {
+                    long content=_contentLength - _contentPosition;
+                    if (content == 0)
+                    {
+                        setState(State.END);
+                        return _handler.messageComplete();
+                    }
+                    else
+                    {
+                        _contentChunk=buffer.asReadOnlyBuffer();
+
+                        // limit content by expected size
+                        if (remaining > content)
+                        {
+                            // We can cast remaining to an int as we know that it is smaller than
+                            // or equal to length which is already an int.
+                            _contentChunk.limit(_contentChunk.position()+(int)content);
+                        }
+
+                        _contentPosition += _contentChunk.remaining();
+                        buffer.position(buffer.position()+_contentChunk.remaining());
+
+                        if (_handler.content(_contentChunk))
+                            return true;
+
+                        if(_contentPosition == _contentLength)
+                        {
+                            setState(State.END);
+                            return _handler.messageComplete();
+                        }
+                    }
+                    break;
+                }
+
+                case CHUNKED_CONTENT:
+                {
+                    ch=next(buffer);
+                    if (ch>HttpTokens.SPACE)
+                    {
+                        _chunkLength=TypeUtil.convertHexDigit(ch);
+                        _chunkPosition=0;
+                        setState(State.CHUNK_SIZE);
+                    }
+
+                    break;
+                }
+
+                case CHUNK_SIZE:
+                {
+                    ch=next(buffer);
+                    if (ch==0)
+                        break;
+                    if (ch == HttpTokens.LINE_FEED)
+                    {
+                        if (_chunkLength == 0)
+                            setState(State.CHUNK_END);
+                        else
+                            setState(State.CHUNK);
+                    }
+                    else if (ch <= HttpTokens.SPACE || ch == HttpTokens.SEMI_COLON)
+                        setState(State.CHUNK_PARAMS);
+                    else
+                        _chunkLength=_chunkLength * 16 + TypeUtil.convertHexDigit(ch);
+                    break;
+                }
+
+                case CHUNK_PARAMS:
+                {
+                    ch=next(buffer);
+                    if (ch == HttpTokens.LINE_FEED)
+                    {
+                        if (_chunkLength == 0)
+                            setState(State.CHUNK_END);
+                        else
+                            setState(State.CHUNK);
+                    }
+                    break;
+                }
+
+                case CHUNK:
+                {
+                    int chunk=_chunkLength - _chunkPosition;
+                    if (chunk == 0)
+                    {
+                        setState(State.CHUNKED_CONTENT);
+                    }
+                    else
+                    {
+                        _contentChunk=buffer.asReadOnlyBuffer();
+
+                        if (remaining > chunk)
+                            _contentChunk.limit(_contentChunk.position()+chunk);
+                        chunk=_contentChunk.remaining();
+
+                        _contentPosition += chunk;
+                        _chunkPosition += chunk;
+                        buffer.position(buffer.position()+chunk);
+                        if (_handler.content(_contentChunk))
+                            return true;
+                    }
+                    break;
+                }
+
+                case CHUNK_END:
+                {
+                    // TODO handle chunk trailer
+                    ch=next(buffer);
+                    if (ch==0)
+                        break;
+                    if (ch == HttpTokens.LINE_FEED)
+                    {
+                        setState(State.END);
+                        return _handler.messageComplete();
+                    }
+                    throw new IllegalCharacterException(_state,ch,buffer);
+                }
+
+                case CLOSED:
+                {
+                    BufferUtil.clear(buffer);
+                    return false;
+                }
+
+                default:
+                    break;
+
+            }
+
+            remaining=buffer.remaining();
+        }
+        return false;
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    public boolean isAtEOF()
+
+    {
+        return _eof;
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    /** Signal that the associated data source is at EOF
+     */
+    public void atEOF()
+    {
+        if (DEBUG)
+            LOG.debug("atEOF {}", this);
+        _eof=true;
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    /** Request that the associated data source be closed
+     */
+    public void close()
+    {
+        if (DEBUG)
+            LOG.debug("close {}", this);
+        setState(State.CLOSE);
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    public void reset()
+    {
+        if (DEBUG)
+            LOG.debug("reset {}", this);
+
+        // reset state
+        if (_state==State.CLOSE || _state==State.CLOSED)
+            return;
+
+        setState(State.START);
+        _endOfContent=EndOfContent.UNKNOWN_CONTENT;
+        _contentLength=-1;
+        _contentPosition=0;
+        _responseStatus=0;
+        _contentChunk=null;
+        _headerBytes=0;
+        _host=false;
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    protected void setState(State state)
+    {
+        if (DEBUG)
+            LOG.debug("{} --> {}",_state,state);
+        _state=state;
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    public Trie<HttpField> getFieldCache()
+    {
+        return _connectionFields;
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    private String getProxyField(ByteBuffer buffer)
+    {
+        _string.setLength(0);
+        _length=0;
+
+        while (buffer.hasRemaining())
+        {
+            // process each character
+            byte ch=next(buffer);
+            if (ch<=' ')
+                return _string.toString();
+            _string.append((char)ch);
+        }
+        throw new BadMessageException();
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    @Override
+    public String toString()
+    {
+        return String.format("%s{s=%s,%d of %d}",
+                getClass().getSimpleName(),
+                _state,
+                _contentPosition,
+                _contentLength);
+    }
+
+    /* ------------------------------------------------------------ */
+    /* ------------------------------------------------------------ */
+    /* ------------------------------------------------------------ */
+    /* Event Handler interface
+     * These methods return true if the caller should process the events
+     * so far received (eg return from parseNext and call HttpChannel.handle).
+     * If multiple callbacks are called in sequence (eg
+     * headerComplete then messageComplete) from the same point in the parsing
+     * then it is sufficient for the caller to process the events only once.
+     */
+    public interface HttpHandler
+    {
+        public boolean content(ByteBuffer item);
+
+        public boolean headerComplete();
+
+        public boolean messageComplete();
+
+        /**
+         * This is the method called by parser when a HTTP Header name and value is found
+         * @param field The field parsed
+         */
+        public void parsedHeader(HttpField field);
+
+        /* ------------------------------------------------------------ */
+        /** Called to signal that an EOF was received unexpectedly
+         * during the parsing of a HTTP message
+         */
+        public void earlyEOF();
+
+        /* ------------------------------------------------------------ */
+        /** Called to signal that a bad HTTP message has been received.
+         * @param status The bad status to send
+         * @param reason The textual reason for badness
+         */
+        public void badMessage(int status, String reason);
+
+        /* ------------------------------------------------------------ */
+        /** @return the size in bytes of the per parser header cache
+         */
+        public int getHeaderCacheSize();
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    /* ------------------------------------------------------------------------------- */
+    /* ------------------------------------------------------------------------------- */
+    public interface RequestHandler extends HttpHandler
+    {
+        /**
+         * This is the method called by parser when the HTTP request line is parsed
+         * @param method The method
+         * @param uri The raw bytes of the URI.  These are copied into a ByteBuffer that will not be changed until this parser is reset and reused.
+         * @param version the http version in use
+         * @return true if handling parsing should return.
+         */
+        public boolean startRequest(String method, String uri, HttpVersion version);
+
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    /* ------------------------------------------------------------------------------- */
+    /* ------------------------------------------------------------------------------- */
+    public interface ResponseHandler extends HttpHandler
+    {
+        /**
+         * This is the method called by parser when the HTTP request line is parsed
+         * @param version the http version in use
+         * @param status the response status
+         * @param reason the response reason phrase
+         * @return true if handling parsing should return
+         */
+        public boolean startResponse(HttpVersion version, int status, String reason);
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    /* ------------------------------------------------------------------------------- */
+    /* ------------------------------------------------------------------------------- */
+    public interface ComplianceHandler extends HttpHandler
+    {
+        public void onComplianceViolation(HttpCompliance compliance,HttpCompliance required,String reason);
+    }
+
+    /* ------------------------------------------------------------------------------- */
+    @SuppressWarnings("serial")
+    private static class IllegalCharacterException extends BadMessageException
+    {
+        private IllegalCharacterException(State state,byte ch,ByteBuffer buffer)
+        {
+            super(400,String.format("Illegal character 0x%X",ch));
+            // Bug #460642 - don't reveal buffers to end user
+            LOG.warn(String.format("Illegal character 0x%X in state=%s for buffer %s",ch,state,BufferUtil.toDetailString(buffer)));
+        }
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpScheme.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpScheme.java
new file mode 100644
index 0000000000..44ac0c6bc7
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpScheme.java
@@ -0,0 +1,79 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http;
+
+import java.nio.ByteBuffer;
+
+import org.eclipse.jetty.util.ArrayTrie;
+import org.eclipse.jetty.util.BufferUtil;
+import org.eclipse.jetty.util.Trie;
+
+/* ------------------------------------------------------------------------------- */
+/**
+ */
+public enum HttpScheme
+{
+    HTTP("http"),
+    HTTPS("https"),
+    WS("ws"),
+    WSS("wss");
+
+    /* ------------------------------------------------------------ */
+    public final static Trie<HttpScheme> CACHE= new ArrayTrie<HttpScheme>();
+    static
+    {
+        for (HttpScheme version : HttpScheme.values())
+            CACHE.put(version.asString(),version);
+    }
+
+    private final String _string;
+    private final ByteBuffer _buffer;
+
+    /* ------------------------------------------------------------ */
+    HttpScheme(String s)
+    {
+        _string=s;
+        _buffer=BufferUtil.toBuffer(s);
+    }
+
+    /* ------------------------------------------------------------ */
+    public ByteBuffer asByteBuffer()
+    {
+        return _buffer.asReadOnlyBuffer();
+    }
+
+    /* ------------------------------------------------------------ */
+    public boolean is(String s)
+    {
+        return s!=null && _string.equalsIgnoreCase(s);
+    }
+
+    public String asString()
+    {
+        return _string;
+    }
+
+    /* ------------------------------------------------------------ */
+    @Override
+    public String toString()
+    {
+        return _string;
+    }
+
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpStatus.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpStatus.java
new file mode 100644
index 0000000000..5682889537
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpStatus.java
@@ -0,0 +1,1076 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http;
+
+/**
+ * <p>
+ * HttpStatusCode enum class, for status codes based on various HTTP RFCs. (see
+ * table below)
+ * </p>
+ *
+ * <table border="1" cellpadding="5">
+ * <caption>HTTP Status Codes Table</caption>
+ * <tr>
+ * <th>Enum</th>
+ * <th>Code</th>
+ * <th>Message</th>
+ * <th> 
+ * <a href="http://tools.ietf.org/html/rfc1945">RFC 1945 - HTTP/1.0</a></th>
+ * <th> 
+ * <a href="http://tools.ietf.org/html/rfc7231">RFC 7231 - HTTP/1.1 Semantics and Content</a></th>
+ * <th>
+ * <a href="http://tools.ietf.org/html/rfc7238">RFC 7238 - HTTP/1.1 Permanent Redirect</a></th>
+ * <th>
+ * <a href="http://tools.ietf.org/html/rfc2518">RFC 2518 - WEBDAV</a></th>
+ * </tr>
+ *
+ * <tr>
+ * <td><strong><code>Informational - 1xx</code></strong></td>
+ * <td colspan="5">{@link #isInformational(int)}</td>
+ * </tr>
+ *
+ * <tr>
+ * <td>{@link #CONTINUE_100}</td>
+ * <td>100</td>
+ * <td>Continue</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.2.1">Sec. 6.2.1</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #SWITCHING_PROTOCOLS_101}</td>
+ * <td>101</td>
+ * <td>Switching Protocols</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.2.2">Sec. 6.2.2</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #PROCESSING_102}</td>
+ * <td>102</td>
+ * <td>Processing</td>
+ * <td>&nbsp;</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc2518#section-10.1">Sec. 10.1</a></td>
+ * </tr>
+ *
+ * <tr>
+ * <td><strong><code>Success - 2xx</code></strong></td>
+ * <td colspan="5">{@link #isSuccess(int)}</td>
+ * </tr>
+ *
+ * <tr>
+ * <td>{@link #OK_200}</td>
+ * <td>200</td>
+ * <td>OK</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc1945#section-9.2">Sec. 9.2</a></td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.3.1">Sec. 6.3.1</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #CREATED_201}</td>
+ * <td>201</td>
+ * <td>Created</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc1945#section-9.2">Sec. 9.2</a></td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.3.2">Sec. 6.3.2</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #ACCEPTED_202}</td>
+ * <td>202</td>
+ * <td>Accepted</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc1945#section-9.2">Sec. 9.2</a></td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.3.3">Sec. 6.3.3</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #NON_AUTHORITATIVE_INFORMATION_203}</td>
+ * <td>203</td>
+ * <td>Non Authoritative Information</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.3.4">Sec. 6.3.4</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #NO_CONTENT_204}</td>
+ * <td>204</td>
+ * <td>No Content</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc1945#section-9.2">Sec. 9.2</a></td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.3.5">Sec. 6.3.5</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #RESET_CONTENT_205}</td>
+ * <td>205</td>
+ * <td>Reset Content</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.3.6">Sec. 6.3.6</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #PARTIAL_CONTENT_206}</td>
+ * <td>206</td>
+ * <td>Partial Content</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.3.7">Sec. 6.3.7</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #MULTI_STATUS_207}</td>
+ * <td>207</td>
+ * <td>Multi-Status</td>
+ * <td>&nbsp;</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc2518#section-10.2">Sec. 10.2</a></td>
+ * </tr>
+ * <tr>
+ * <td>&nbsp;</td>
+ * <td style="text-decoration: line-through;">207</td>
+ * <td style="text-decoration: line-through;">Partial Update OK</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href=
+ * "http://www.w3.org/Protocols/HTTP/1.1/draft-ietf-http-v11-spec-rev-01.txt"
+ * >draft/01</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ *
+ * <tr>
+ * <td><strong><code>Redirection - 3xx</code></strong></td>
+ * <td colspan="5">{@link #isRedirection(int)}</td>
+ * </tr>
+ *
+ * <tr>
+ * <td>{@link #MULTIPLE_CHOICES_300}</td>
+ * <td>300</td>
+ * <td>Multiple Choices</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc1945#section-9.3">Sec. 9.3</a></td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.4.1">Sec. 6.4.1</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #MOVED_PERMANENTLY_301}</td>
+ * <td>301</td>
+ * <td>Moved Permanently</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc1945#section-9.3">Sec. 9.3</a></td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.4.2">Sec. 6.4.2</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #MOVED_TEMPORARILY_302}</td>
+ * <td>302</td>
+ * <td>Moved Temporarily</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc1945#section-9.3">Sec. 9.3</a></td>
+ * <td>(now "<code>302 Found</code>")</td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #FOUND_302}</td>
+ * <td>302</td>
+ * <td>Found</td>
+ * <td>(was "<code>302 Moved Temporarily</code>")</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.4.3">Sec. 6.4.3</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #SEE_OTHER_303}</td>
+ * <td>303</td>
+ * <td>See Other</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.4.4">Sec. 6.4.4</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #NOT_MODIFIED_304}</td>
+ * <td>304</td>
+ * <td>Not Modified</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc1945#section-9.3">Sec. 9.3</a></td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.4.5">Sec. 6.4.5</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #USE_PROXY_305}</td>
+ * <td>305</td>
+ * <td>Use Proxy</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.4.6">Sec. 6.4.6</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>&nbsp;</td>
+ * <td>306</td>
+ * <td><em>(Unused)</em></td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.4.7">Sec. 6.4.7</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #TEMPORARY_REDIRECT_307}</td>
+ * <td>307</td>
+ * <td>Temporary Redirect</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.4.8">Sec. 6.4.8</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ *
+ * <tr>
+ * <td>{@link #PERMANENT_REDIRECT_308}</td>
+ * <td>307</td>
+ * <td>Permanent Redirect</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7238">RFC7238</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ *
+ * <tr>
+ * <td><strong><code>Client Error - 4xx</code></strong></td>
+ * <td colspan="5">{@link #isClientError(int)}</td>
+ * </tr>
+ *
+ * <tr>
+ * <td>{@link #BAD_REQUEST_400}</td>
+ * <td>400</td>
+ * <td>Bad Request</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc1945#section-9.4">Sec. 9.4</a></td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.5.1">Sec. 6.5.1</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #UNAUTHORIZED_401}</td>
+ * <td>401</td>
+ * <td>Unauthorized</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc1945#section-9.4">Sec. 9.4</a></td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.5.2">Sec. 6.5.2</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #PAYMENT_REQUIRED_402}</td>
+ * <td>402</td>
+ * <td>Payment Required</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc1945#section-9.4">Sec. 9.4</a></td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.5.3">Sec. 6.5.3</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #FORBIDDEN_403}</td>
+ * <td>403</td>
+ * <td>Forbidden</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc1945#section-9.4">Sec. 9.4</a></td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.5.4">Sec. 6.5.4</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #NOT_FOUND_404}</td>
+ * <td>404</td>
+ * <td>Not Found</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc1945#section-9.4">Sec. 9.4</a></td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.5.5">Sec. 6.5.5</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #METHOD_NOT_ALLOWED_405}</td>
+ * <td>405</td>
+ * <td>Method Not Allowed</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.5.6">Sec. 6.5.6</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #NOT_ACCEPTABLE_406}</td>
+ * <td>406</td>
+ * <td>Not Acceptable</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.5.7">Sec. 6.5.7</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #PROXY_AUTHENTICATION_REQUIRED_407}</td>
+ * <td>407</td>
+ * <td>Proxy Authentication Required</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.5.8">Sec. 6.5.8</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #REQUEST_TIMEOUT_408}</td>
+ * <td>408</td>
+ * <td>Request Timeout</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.5.9">Sec. 6.5.9</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #CONFLICT_409}</td>
+ * <td>409</td>
+ * <td>Conflict</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-10.4.10">Sec. 10.4.10</a>
+ * </td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #GONE_410}</td>
+ * <td>410</td>
+ * <td>Gone</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-10.4.11">Sec. 10.4.11</a>
+ * </td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #LENGTH_REQUIRED_411}</td>
+ * <td>411</td>
+ * <td>Length Required</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-10.4.12">Sec. 10.4.12</a>
+ * </td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #PRECONDITION_FAILED_412}</td>
+ * <td>412</td>
+ * <td>Precondition Failed</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-10.4.13">Sec. 10.4.13</a>
+ * </td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #REQUEST_ENTITY_TOO_LARGE_413}</td>
+ * <td>413</td>
+ * <td>Request Entity Too Large</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-10.4.14">Sec. 10.4.14</a>
+ * </td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #REQUEST_URI_TOO_LONG_414}</td>
+ * <td>414</td>
+ * <td>Request-URI Too Long</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-10.4.15">Sec. 10.4.15</a>
+ * </td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #UNSUPPORTED_MEDIA_TYPE_415}</td>
+ * <td>415</td>
+ * <td>Unsupported Media Type</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-10.4.16">Sec. 10.4.16</a>
+ * </td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #REQUESTED_RANGE_NOT_SATISFIABLE_416}</td>
+ * <td>416</td>
+ * <td>Requested Range Not Satisfiable</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-10.4.17">Sec. 10.4.17</a>
+ * </td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #EXPECTATION_FAILED_417}</td>
+ * <td>417</td>
+ * <td>Expectation Failed</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-10.4.18">Sec. 10.4.18</a>
+ * </td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>&nbsp;</td>
+ * <td style="text-decoration: line-through;">418</td>
+ * <td style="text-decoration: line-through;">Reauthentication Required</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href=
+ * "http://tools.ietf.org/html/draft-ietf-http-v11-spec-rev-01#section-10.4.19"
+ * >draft/01</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>&nbsp;</td>
+ * <td style="text-decoration: line-through;">418</td>
+ * <td style="text-decoration: line-through;">Unprocessable Entity</td>
+ * <td>&nbsp;</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href=
+ * "http://tools.ietf.org/html/draft-ietf-webdav-protocol-05#section-10.3"
+ * >draft/05</a></td>
+ * </tr>
+ * <tr>
+ * <td>&nbsp;</td>
+ * <td style="text-decoration: line-through;">419</td>
+ * <td style="text-decoration: line-through;">Proxy Reauthentication Required</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href=
+ * "http://tools.ietf.org/html/draft-ietf-http-v11-spec-rev-01#section-10.4.20"
+ * >draft/01</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>&nbsp;</td>
+ * <td style="text-decoration: line-through;">419</td>
+ * <td style="text-decoration: line-through;">Insufficient Space on Resource</td>
+ * <td>&nbsp;</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href=
+ * "http://tools.ietf.org/html/draft-ietf-webdav-protocol-05#section-10.4"
+ * >draft/05</a></td>
+ * </tr>
+ * <tr>
+ * <td>&nbsp;</td>
+ * <td style="text-decoration: line-through;">420</td>
+ * <td style="text-decoration: line-through;">Method Failure</td>
+ * <td>&nbsp;</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href=
+ * "http://tools.ietf.org/html/draft-ietf-webdav-protocol-05#section-10.5"
+ * >draft/05</a></td>
+ * </tr>
+ * <tr>
+ * <td>&nbsp;</td>
+ * <td>421</td>
+ * <td><em>(Unused)</em></td>
+ * <td>&nbsp;</td>
+ * <td>&nbsp;</td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #UNPROCESSABLE_ENTITY_422}</td>
+ * <td>422</td>
+ * <td>Unprocessable Entity</td>
+ * <td>&nbsp;</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc2518#section-10.3">Sec. 10.3</a></td>
+ * </tr>
+ * <tr>
+ * <td>{@link #LOCKED_423}</td>
+ * <td>423</td>
+ * <td>Locked</td>
+ * <td>&nbsp;</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc2518#section-10.4">Sec. 10.4</a></td>
+ * </tr>
+ * <tr>
+ * <td>{@link #FAILED_DEPENDENCY_424}</td>
+ * <td>424</td>
+ * <td>Failed Dependency</td>
+ * <td>&nbsp;</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc2518#section-10.5">Sec. 10.5</a></td>
+ * </tr>
+ *
+ * <tr>
+ * <td><strong><code>Server Error - 5xx</code></strong></td>
+ * <td colspan="5">{@link #isServerError(int)}</td>
+ * </tr>
+ *
+ * <tr>
+ * <td>{@link #INTERNAL_SERVER_ERROR_500}</td>
+ * <td>500</td>
+ * <td>Internal Server Error</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc1945#section-9.5">Sec. 9.5</a></td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.6.1">Sec. 6.6.1</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #NOT_IMPLEMENTED_501}</td>
+ * <td>501</td>
+ * <td>Not Implemented</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc1945#section-9.5">Sec. 9.5</a></td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.6.2">Sec. 6.6.2</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #BAD_GATEWAY_502}</td>
+ * <td>502</td>
+ * <td>Bad Gateway</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc1945#section-9.5">Sec. 9.5</a></td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.6.3">Sec. 6.6.3</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #SERVICE_UNAVAILABLE_503}</td>
+ * <td>503</td>
+ * <td>Service Unavailable</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc1945#section-9.5">Sec. 9.5</a></td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.6.4">Sec. 6.6.4</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #GATEWAY_TIMEOUT_504}</td>
+ * <td>504</td>
+ * <td>Gateway Timeout</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.6.5">Sec. 6.6.5</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #HTTP_VERSION_NOT_SUPPORTED_505}</td>
+ * <td>505</td>
+ * <td>HTTP Version Not Supported</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc7231#section-6.6.6">Sec. 6.6.6</a></td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>&nbsp;</td>
+ * <td>506</td>
+ * <td><em>(Unused)</em></td>
+ * <td>&nbsp;</td>
+ * <td>&nbsp;</td>
+ * <td>&nbsp;</td>
+ * </tr>
+ * <tr>
+ * <td>{@link #INSUFFICIENT_STORAGE_507}</td>
+ * <td>507</td>
+ * <td>Insufficient Storage</td>
+ * <td>&nbsp;</td>
+ * <td>&nbsp;</td>
+ * <td>
+ * <a href="http://tools.ietf.org/html/rfc2518#section-10.6">Sec. 10.6</a></td>
+ * </tr>
+ *
+ * </table>
+ *
+ * @version $Id$
+ */
+public class HttpStatus
+{
+    public final static int CONTINUE_100 = 100;
+    public final static int SWITCHING_PROTOCOLS_101 = 101;
+    public final static int PROCESSING_102 = 102;
+
+    public final static int OK_200 = 200;
+    public final static int CREATED_201 = 201;
+    public final static int ACCEPTED_202 = 202;
+    public final static int NON_AUTHORITATIVE_INFORMATION_203 = 203;
+    public final static int NO_CONTENT_204 = 204;
+    public final static int RESET_CONTENT_205 = 205;
+    public final static int PARTIAL_CONTENT_206 = 206;
+    public final static int MULTI_STATUS_207 = 207;
+
+    public final static int MULTIPLE_CHOICES_300 = 300;
+    public final static int MOVED_PERMANENTLY_301 = 301;
+    public final static int MOVED_TEMPORARILY_302 = 302;
+    public final static int FOUND_302 = 302;
+    public final static int SEE_OTHER_303 = 303;
+    public final static int NOT_MODIFIED_304 = 304;
+    public final static int USE_PROXY_305 = 305;
+    public final static int TEMPORARY_REDIRECT_307 = 307;
+    public final static int PERMANENT_REDIRECT_308 = 308;
+
+    public final static int BAD_REQUEST_400 = 400;
+    public final static int UNAUTHORIZED_401 = 401;
+    public final static int PAYMENT_REQUIRED_402 = 402;
+    public final static int FORBIDDEN_403 = 403;
+    public final static int NOT_FOUND_404 = 404;
+    public final static int METHOD_NOT_ALLOWED_405 = 405;
+    public final static int NOT_ACCEPTABLE_406 = 406;
+    public final static int PROXY_AUTHENTICATION_REQUIRED_407 = 407;
+    public final static int REQUEST_TIMEOUT_408 = 408;
+    public final static int CONFLICT_409 = 409;
+    public final static int GONE_410 = 410;
+    public final static int LENGTH_REQUIRED_411 = 411;
+    public final static int PRECONDITION_FAILED_412 = 412;
+    public final static int REQUEST_ENTITY_TOO_LARGE_413 = 413;
+    public final static int REQUEST_URI_TOO_LONG_414 = 414;
+    public final static int UNSUPPORTED_MEDIA_TYPE_415 = 415;
+    public final static int REQUESTED_RANGE_NOT_SATISFIABLE_416 = 416;
+    public final static int EXPECTATION_FAILED_417 = 417;
+    public final static int MISDIRECTED_REQUEST_421 = 421;
+    public final static int UNPROCESSABLE_ENTITY_422 = 422;
+    public final static int LOCKED_423 = 423;
+    public final static int FAILED_DEPENDENCY_424 = 424;
+    public final static int UPGRADE_REQUIRED_426 = 426;
+
+    public final static int INTERNAL_SERVER_ERROR_500 = 500;
+    public final static int NOT_IMPLEMENTED_501 = 501;
+    public final static int BAD_GATEWAY_502 = 502;
+    public final static int SERVICE_UNAVAILABLE_503 = 503;
+    public final static int GATEWAY_TIMEOUT_504 = 504;
+    public final static int HTTP_VERSION_NOT_SUPPORTED_505 = 505;
+    public final static int INSUFFICIENT_STORAGE_507 = 507;
+
+    // RFC 6585
+    public final static int PRECONDITION_REQUIRED_428 = 428;
+    public final static int TOO_MANY_REQUESTS_429 = 429;
+    public final static int REQUEST_HEADER_FIELDS_TOO_LARGE_431 = 431;
+    public final static int NETWORK_AUTHENTICATION_REQUIRED_511 = 511;
+    
+    public static final int MAX_CODE = 511;
+
+    private static final Code[] codeMap = new Code[MAX_CODE+1];
+
+    static
+    {
+        for (Code code : Code.values())
+        {
+            codeMap[code._code] = code;
+        }
+    }
+
+
+    public enum Code
+    {
+        /*
+         * --------------------------------------------------------------------
+         * Informational messages in 1xx series. As defined by ... RFC 1945 -
+         * HTTP/1.0 RFC 7231 - HTTP/1.1 RFC 2518 - WebDAV
+         */
+
+        /** <code>100 Continue</code> */
+        CONTINUE(CONTINUE_100, "Continue"),
+        /** <code>101 Switching Protocols</code> */
+        SWITCHING_PROTOCOLS(SWITCHING_PROTOCOLS_101, "Switching Protocols"),
+        /** <code>102 Processing</code> */
+        PROCESSING(PROCESSING_102, "Processing"),
+
+        /*
+         * --------------------------------------------------------------------
+         * Success messages in 2xx series. As defined by ... RFC 1945 - HTTP/1.0
+         * RFC 7231 - HTTP/1.1 RFC 2518 - WebDAV
+         */
+
+        /** <code>200 OK</code> */
+        OK(OK_200, "OK"),
+        /** <code>201 Created</code> */
+        CREATED(CREATED_201, "Created"),
+        /** <code>202 Accepted</code> */
+        ACCEPTED(ACCEPTED_202, "Accepted"),
+        /** <code>203 Non Authoritative Information</code> */
+        NON_AUTHORITATIVE_INFORMATION(NON_AUTHORITATIVE_INFORMATION_203, "Non Authoritative Information"),
+        /** <code>204 No Content</code> */
+        NO_CONTENT(NO_CONTENT_204, "No Content"),
+        /** <code>205 Reset Content</code> */
+        RESET_CONTENT(RESET_CONTENT_205, "Reset Content"),
+        /** <code>206 Partial Content</code> */
+        PARTIAL_CONTENT(PARTIAL_CONTENT_206, "Partial Content"),
+        /** <code>207 Multi-Status</code> */
+        MULTI_STATUS(MULTI_STATUS_207, "Multi-Status"),
+
+        /*
+         * --------------------------------------------------------------------
+         * Redirection messages in 3xx series. As defined by ... RFC 1945 -
+         * HTTP/1.0 RFC 7231 - HTTP/1.1
+         */
+
+        /** <code>300 Mutliple Choices</code> */
+        MULTIPLE_CHOICES(MULTIPLE_CHOICES_300, "Multiple Choices"),
+        /** <code>301 Moved Permanently</code> */
+        MOVED_PERMANENTLY(MOVED_PERMANENTLY_301, "Moved Permanently"),
+        /** <code>302 Moved Temporarily</code> */
+        MOVED_TEMPORARILY(MOVED_TEMPORARILY_302, "Moved Temporarily"),
+        /** <code>302 Found</code> */
+        FOUND(FOUND_302, "Found"),
+        /** <code>303 See Other</code> */
+        SEE_OTHER(SEE_OTHER_303, "See Other"),
+        /** <code>304 Not Modified</code> */
+        NOT_MODIFIED(NOT_MODIFIED_304, "Not Modified"),
+        /** <code>305 Use Proxy</code> */
+        USE_PROXY(USE_PROXY_305, "Use Proxy"),
+        /** <code>307 Temporary Redirect</code> */
+        TEMPORARY_REDIRECT(TEMPORARY_REDIRECT_307, "Temporary Redirect"),
+        /** <code>308 Permanent Redirect</code> */
+        PERMANET_REDIRECT(PERMANENT_REDIRECT_308, "Permanent Redirect"),
+
+        /*
+         * --------------------------------------------------------------------
+         * Client Error messages in 4xx series. As defined by ... RFC 1945 -
+         * HTTP/1.0 RFC 7231 - HTTP/1.1 RFC 2518 - WebDAV
+         */
+
+        /** <code>400 Bad Request</code> */
+        BAD_REQUEST(BAD_REQUEST_400, "Bad Request"),
+        /** <code>401 Unauthorized</code> */
+        UNAUTHORIZED(UNAUTHORIZED_401, "Unauthorized"),
+        /** <code>402 Payment Required</code> */
+        PAYMENT_REQUIRED(PAYMENT_REQUIRED_402, "Payment Required"),
+        /** <code>403 Forbidden</code> */
+        FORBIDDEN(FORBIDDEN_403, "Forbidden"),
+        /** <code>404 Not Found</code> */
+        NOT_FOUND(NOT_FOUND_404, "Not Found"),
+        /** <code>405 Method Not Allowed</code> */
+        METHOD_NOT_ALLOWED(METHOD_NOT_ALLOWED_405, "Method Not Allowed"),
+        /** <code>406 Not Acceptable</code> */
+        NOT_ACCEPTABLE(NOT_ACCEPTABLE_406, "Not Acceptable"),
+        /** <code>407 Proxy Authentication Required</code> */
+        PROXY_AUTHENTICATION_REQUIRED(PROXY_AUTHENTICATION_REQUIRED_407, "Proxy Authentication Required"),
+        /** <code>408 Request Timeout</code> */
+        REQUEST_TIMEOUT(REQUEST_TIMEOUT_408, "Request Timeout"),
+        /** <code>409 Conflict</code> */
+        CONFLICT(CONFLICT_409, "Conflict"),
+        /** <code>410 Gone</code> */
+        GONE(GONE_410, "Gone"),
+        /** <code>411 Length Required</code> */
+        LENGTH_REQUIRED(LENGTH_REQUIRED_411, "Length Required"),
+        /** <code>412 Precondition Failed</code> */
+        PRECONDITION_FAILED(PRECONDITION_FAILED_412, "Precondition Failed"),
+        /** <code>413 Request Entity Too Large</code> */
+        REQUEST_ENTITY_TOO_LARGE(REQUEST_ENTITY_TOO_LARGE_413, "Request Entity Too Large"),
+        /** <code>414 Request-URI Too Long</code> */
+        REQUEST_URI_TOO_LONG(REQUEST_URI_TOO_LONG_414, "Request-URI Too Long"),
+        /** <code>415 Unsupported Media Type</code> */
+        UNSUPPORTED_MEDIA_TYPE(UNSUPPORTED_MEDIA_TYPE_415, "Unsupported Media Type"),
+        /** <code>416 Requested Range Not Satisfiable</code> */
+        REQUESTED_RANGE_NOT_SATISFIABLE(REQUESTED_RANGE_NOT_SATISFIABLE_416, "Requested Range Not Satisfiable"),
+        /** <code>417 Expectation Failed</code> */
+        EXPECTATION_FAILED(EXPECTATION_FAILED_417, "Expectation Failed"),
+        /** <code>421 Misdirected Request(RFC7234)y</code> */
+        MISDIRECTED_REQUEST(MISDIRECTED_REQUEST_421, "Misdirected Request"),
+        /** <code>422 Unprocessable Entity</code> */
+        UNPROCESSABLE_ENTITY(UNPROCESSABLE_ENTITY_422, "Unprocessable Entity"),
+        /** <code>423 Locked</code> */
+        LOCKED(LOCKED_423, "Locked"),
+        /** <code>424 Failed Dependency</code> */
+        FAILED_DEPENDENCY(FAILED_DEPENDENCY_424, "Failed Dependency"),
+        
+        /** <code>426 Upgrade Required (RFC7231)</code> */
+        UPGRADE_REQUIRED(UPGRADE_REQUIRED_426, "Upgrade Required"),
+        
+        /** <code>428 Precondition Required (RFC6585)</code> */
+        PRECONDITION_REQUIRED(PRECONDITION_REQUIRED_428, "Precondition Required"),
+        /** <code>429 Too Many Requests (RFC6585)</code> */
+        TOO_MANY_REQUESTS(TOO_MANY_REQUESTS_429, "Too Many Requests"),
+        /** <code>431 Request Header Fields Too Large (RFC6585)</code> */
+        REQUEST_HEADER_FIELDS_TOO_LARGE(REQUEST_HEADER_FIELDS_TOO_LARGE_431, "Request Header Fields Too Large"),
+      
+        /*
+         * --------------------------------------------------------------------
+         * Server Error messages in 5xx series. As defined by ... RFC 1945 -
+         * HTTP/1.0 RFC 7231 - HTTP/1.1 RFC 2518 - WebDAV
+         */
+
+        /** <code>500 Server Error</code> */
+        INTERNAL_SERVER_ERROR(INTERNAL_SERVER_ERROR_500, "Server Error"),
+        /** <code>501 Not Implemented</code> */
+        NOT_IMPLEMENTED(NOT_IMPLEMENTED_501, "Not Implemented"),
+        /** <code>502 Bad Gateway</code> */
+        BAD_GATEWAY(BAD_GATEWAY_502, "Bad Gateway"),
+        /** <code>503 Service Unavailable</code> */
+        SERVICE_UNAVAILABLE(SERVICE_UNAVAILABLE_503, "Service Unavailable"),
+        /** <code>504 Gateway Timeout</code> */
+        GATEWAY_TIMEOUT(GATEWAY_TIMEOUT_504, "Gateway Timeout"),
+        /** <code>505 HTTP Version Not Supported</code> */
+        HTTP_VERSION_NOT_SUPPORTED(HTTP_VERSION_NOT_SUPPORTED_505, "HTTP Version Not Supported"),
+        /** <code>507 Insufficient Storage</code> */
+        INSUFFICIENT_STORAGE(INSUFFICIENT_STORAGE_507, "Insufficient Storage"),
+
+        /** <code>511 Network Authentication Required (RFC6585)</code> */
+        NETWORK_AUTHENTICATION_REQUIRED(NETWORK_AUTHENTICATION_REQUIRED_511, "Network Authentication Required"),
+        
+        ;
+        
+        private final int _code;
+        private final String _message;
+
+        private Code(int code, String message)
+        {
+            this._code = code;
+            _message=message;
+        }
+
+        public int getCode()
+        {
+            return _code;
+        }
+
+        public String getMessage()
+        {
+            return _message;
+        }
+
+
+        public boolean equals(int code)
+        {
+            return (this._code == code);
+        }
+
+        @Override
+        public String toString()
+        {
+            return String.format("[%03d %s]",this._code,this.getMessage());
+        }
+
+        /**
+         * Simple test against an code to determine if it falls into the
+         * <code>Informational</code> message category as defined in the <a
+         * href="http://tools.ietf.org/html/rfc1945">RFC 1945 - HTTP/1.0</a>,
+         * and <a href="http://tools.ietf.org/html/rfc7231">RFC 7231 -
+         * HTTP/1.1</a>.
+         *
+         * @return true if within range of codes that belongs to
+         *         <code>Informational</code> messages.
+         */
+        public boolean isInformational()
+        {
+            return HttpStatus.isInformational(this._code);
+        }
+
+        /**
+         * Simple test against an code to determine if it falls into the
+         * <code>Success</code> message category as defined in the <a
+         * href="http://tools.ietf.org/html/rfc1945">RFC 1945 - HTTP/1.0</a>,
+         * and <a href="http://tools.ietf.org/html/rfc7231">RFC 7231 -
+         * HTTP/1.1</a>.
+         *
+         * @return true if within range of codes that belongs to
+         *         <code>Success</code> messages.
+         */
+        public boolean isSuccess()
+        {
+            return HttpStatus.isSuccess(this._code);
+        }
+
+        /**
+         * Simple test against an code to determine if it falls into the
+         * <code>Redirection</code> message category as defined in the <a
+         * href="http://tools.ietf.org/html/rfc1945">RFC 1945 - HTTP/1.0</a>,
+         * and <a href="http://tools.ietf.org/html/rfc7231">RFC 7231 -
+         * HTTP/1.1</a>.
+         *
+         * @return true if within range of codes that belongs to
+         *         <code>Redirection</code> messages.
+         */
+        public boolean isRedirection()
+        {
+            return HttpStatus.isRedirection(this._code);
+        }
+
+        /**
+         * Simple test against an code to determine if it falls into the
+         * <code>Client Error</code> message category as defined in the <a
+         * href="http://tools.ietf.org/html/rfc1945">RFC 1945 - HTTP/1.0</a>,
+         * and <a href="http://tools.ietf.org/html/rfc7231">RFC 7231 -
+         * HTTP/1.1</a>.
+         *
+         * @return true if within range of codes that belongs to
+         *         <code>Client Error</code> messages.
+         */
+        public boolean isClientError()
+        {
+            return HttpStatus.isClientError(this._code);
+        }
+
+        /**
+         * Simple test against an code to determine if it falls into the
+         * <code>Server Error</code> message category as defined in the <a
+         * href="http://tools.ietf.org/html/rfc1945">RFC 1945 - HTTP/1.0</a>,
+         * and <a href="http://tools.ietf.org/html/rfc7231">RFC 7231 -
+         * HTTP/1.1</a>.
+         *
+         * @return true if within range of codes that belongs to
+         *         <code>Server Error</code> messages.
+         */
+        public boolean isServerError()
+        {
+            return HttpStatus.isServerError(this._code);
+        }
+    }
+
+
+    /**
+     * Get the HttpStatusCode for a specific code
+     *
+     * @param code
+     *            the code to lookup.
+     * @return the {@link HttpStatus} if found, or null if not found.
+     */
+    public static Code getCode(int code)
+    {
+        if (code <= MAX_CODE)
+        {
+            return codeMap[code];
+        }
+        return null;
+    }
+
+    /**
+     * Get the status message for a specific code.
+     *
+     * @param code
+     *            the code to look up
+     * @return the specific message, or the code number itself if code
+     *         does not match known list.
+     */
+    public static String getMessage(int code)
+    {
+        Code codeEnum = getCode(code);
+        if (codeEnum != null)
+        {
+            return codeEnum.getMessage();
+        }
+        else
+        {
+            return Integer.toString(code);
+        }
+    }
+
+    /**
+     * Simple test against an code to determine if it falls into the
+     * <code>Informational</code> message category as defined in the <a
+     * href="http://tools.ietf.org/html/rfc1945">RFC 1945 - HTTP/1.0</a>, and <a
+     * href="http://tools.ietf.org/html/rfc7231">RFC 7231 - HTTP/1.1</a>.
+     *
+     * @param code
+     *            the code to test.
+     * @return true if within range of codes that belongs to
+     *         <code>Informational</code> messages.
+     */
+    public static boolean isInformational(int code)
+    {
+        return ((100 <= code) && (code <= 199));
+    }
+
+    /**
+     * Simple test against an code to determine if it falls into the
+     * <code>Success</code> message category as defined in the <a
+     * href="http://tools.ietf.org/html/rfc1945">RFC 1945 - HTTP/1.0</a>, and <a
+     * href="http://tools.ietf.org/html/rfc7231">RFC 7231 - HTTP/1.1</a>.
+     *
+     * @param code
+     *            the code to test.
+     * @return true if within range of codes that belongs to
+     *         <code>Success</code> messages.
+     */
+    public static boolean isSuccess(int code)
+    {
+        return ((200 <= code) && (code <= 299));
+    }
+
+    /**
+     * Simple test against an code to determine if it falls into the
+     * <code>Redirection</code> message category as defined in the <a
+     * href="http://tools.ietf.org/html/rfc1945">RFC 1945 - HTTP/1.0</a>, and <a
+     * href="http://tools.ietf.org/html/rfc7231">RFC 7231 - HTTP/1.1</a>.
+     *
+     * @param code
+     *            the code to test.
+     * @return true if within range of codes that belongs to
+     *         <code>Redirection</code> messages.
+     */
+    public static boolean isRedirection(int code)
+    {
+        return ((300 <= code) && (code <= 399));
+    }
+
+    /**
+     * Simple test against an code to determine if it falls into the
+     * <code>Client Error</code> message category as defined in the <a
+     * href="http://tools.ietf.org/html/rfc1945">RFC 1945 - HTTP/1.0</a>, and <a
+     * href="http://tools.ietf.org/html/rfc7231">RFC 7231 - HTTP/1.1</a>.
+     *
+     * @param code
+     *            the code to test.
+     * @return true if within range of codes that belongs to
+     *         <code>Client Error</code> messages.
+     */
+    public static boolean isClientError(int code)
+    {
+        return ((400 <= code) && (code <= 499));
+    }
+
+    /**
+     * Simple test against an code to determine if it falls into the
+     * <code>Server Error</code> message category as defined in the <a
+     * href="http://tools.ietf.org/html/rfc1945">RFC 1945 - HTTP/1.0</a>, and <a
+     * href="http://tools.ietf.org/html/rfc7231">RFC 7231 - HTTP/1.1</a>.
+     *
+     * @param code
+     *            the code to test.
+     * @return true if within range of codes that belongs to
+     *         <code>Server Error</code> messages.
+     */
+    public static boolean isServerError(int code)
+    {
+        return ((500 <= code) && (code <= 599));
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpTokens.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpTokens.java
new file mode 100644
index 0000000000..66aabdaf72
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpTokens.java
@@ -0,0 +1,38 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http;
+
+/**
+ * HTTP constants
+ */
+public interface HttpTokens
+{
+    // Terminal symbols.
+    static final byte COLON= (byte)':';
+    static final byte TAB= 0x09;
+    static final byte LINE_FEED= 0x0A;
+    static final byte CARRIAGE_RETURN= 0x0D;
+    static final byte SPACE= 0x20;
+    static final byte[] CRLF = {CARRIAGE_RETURN,LINE_FEED};
+    static final byte SEMI_COLON= (byte)';';
+
+    public enum EndOfContent { UNKNOWN_CONTENT,NO_CONTENT,EOF_CONTENT,CONTENT_LENGTH,CHUNKED_CONTENT }
+
+}
+
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpURI.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpURI.java
new file mode 100644
index 0000000000..87ce90cf42
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpURI.java
@@ -0,0 +1,783 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+
+import org.eclipse.jetty.util.MultiMap;
+import org.eclipse.jetty.util.TypeUtil;
+import org.eclipse.jetty.util.URIUtil;
+import org.eclipse.jetty.util.UrlEncoded;
+
+
+/* ------------------------------------------------------------ */
+/** Http URI.
+ * Parse a HTTP URI from a string or byte array.  Given a URI
+ * <code>http://user@host:port/path/info;param?query#fragment</code>
+ * this class will split it into the following undecoded optional elements:<ul>
+ * <li>{@link #getScheme()} - http:</li>
+ * <li>{@link #getAuthority()} - //name@host:port</li>
+ * <li>{@link #getHost()} - host</li>
+ * <li>{@link #getPort()} - port</li>
+ * <li>{@link #getPath()} - /path/info</li>
+ * <li>{@link #getParam()} - param</li>
+ * <li>{@link #getQuery()} - query</li>
+ * <li>{@link #getFragment()} - fragment</li>
+ * </ul>
+ * 
+ * <p>Any parameters will be returned from {@link #getPath()}, but are excluded from the
+ * return value of {@link #getDecodedPath()}.   If there are multiple parameters, the 
+ * {@link #getParam()} method returns only the last one.
+ */
+public class HttpURI
+{
+    private enum State {
+    START,
+    HOST_OR_PATH,
+    SCHEME_OR_PATH,
+    HOST,
+    IPV6,
+    PORT,
+    PATH,
+    PARAM,
+    QUERY,
+    FRAGMENT,
+    ASTERISK};
+
+    private String _scheme;
+    private String _user;
+    private String _host;
+    private int _port;
+    private String _path;
+    private String _param;
+    private String _query;
+    private String _fragment;
+    
+    String _uri;
+    String _decodedPath;
+
+    /* ------------------------------------------------------------ */
+    /**
+     * Construct a normalized URI.
+     * Port is not set if it is the default port.
+     * @param scheme the URI scheme
+     * @param host the URI hose
+     * @param port the URI port
+     * @param path the URI path
+     * @param param the URI param
+     * @param query the URI query
+     * @param fragment the URI fragment
+     * @return the normalized URI
+     */
+    public static HttpURI createHttpURI(String scheme, String host, int port, String path, String param, String query, String fragment)
+    {
+        if (port==80 && HttpScheme.HTTP.is(scheme))
+            port=0;
+        if (port==443 && HttpScheme.HTTPS.is(scheme))
+            port=0;
+        return new HttpURI(scheme,host,port,path,param,query,fragment);
+    }
+    
+    /* ------------------------------------------------------------ */
+    public HttpURI()
+    {
+    }
+
+    /* ------------------------------------------------------------ */
+    public HttpURI(String scheme, String host, int port, String path, String param, String query, String fragment)
+    {
+        _scheme = scheme;
+        _host = host;
+        _port = port;
+        _path = path;
+        _param = param;
+        _query = query;
+        _fragment = fragment;
+    }
+
+    /* ------------------------------------------------------------ */
+    public HttpURI(HttpURI uri)
+    {
+        this(uri._scheme,uri._host,uri._port,uri._path,uri._param,uri._query,uri._fragment);
+    }
+    
+    /* ------------------------------------------------------------ */
+    public HttpURI(String uri)
+    {
+        _port=-1;
+        parse(State.START,uri,0,uri.length());
+    }
+
+    /* ------------------------------------------------------------ */
+    public HttpURI(URI uri)
+    {
+        _uri=null;
+        
+        _scheme=uri.getScheme();
+        _host=uri.getHost();
+        if (_host==null && uri.getRawSchemeSpecificPart().startsWith("//"))
+            _host="";
+        _port=uri.getPort();
+        _user = uri.getUserInfo();
+        _path=uri.getRawPath();
+        
+        _decodedPath = uri.getPath();
+        if (_decodedPath != null)
+        {
+            int p = _decodedPath.lastIndexOf(';');
+            if (p >= 0)
+                _param = _decodedPath.substring(p + 1);
+        }
+        _query=uri.getRawQuery();
+        _fragment=uri.getFragment();
+        
+        _decodedPath=null;
+    }
+
+    /* ------------------------------------------------------------ */
+    public HttpURI(String scheme, String host, int port, String pathQuery)
+    {
+        _uri=null;
+        
+        _scheme=scheme;
+        _host=host;
+        _port=port;
+
+        parse(State.PATH,pathQuery,0,pathQuery.length());
+        
+    }
+
+    /* ------------------------------------------------------------ */
+    public void parse(String uri)
+    {
+        clear();
+        _uri=uri;
+        parse(State.START,uri,0,uri.length());
+    }
+
+    /* ------------------------------------------------------------ */
+    /** Parse according to https://tools.ietf.org/html/rfc7230#section-5.3
+     * @param method
+     * @param uri
+     */
+    public void parseRequestTarget(String method,String uri)
+    {
+        clear();
+        _uri=uri;
+
+        if (HttpMethod.CONNECT.is(method))
+            _path=uri;
+        else
+            parse(uri.startsWith("/")?State.PATH:State.START,uri,0,uri.length());
+    }
+
+    /* ------------------------------------------------------------ */
+    @Deprecated
+    public void parseConnect(String uri)
+    {
+        clear();
+        _uri=uri;
+        _path=uri;
+    }
+
+    /* ------------------------------------------------------------ */
+    public void parse(String uri, int offset, int length)
+    {
+        clear();
+        int end=offset+length;
+        _uri=uri.substring(offset,end);
+        parse(State.START,uri,offset,end);
+    }
+
+    /* ------------------------------------------------------------ */
+    private void parse(State state, final String uri, final int offset, final int end)
+    {
+        boolean encoded=false;
+        int mark=offset;
+        int path_mark=0;
+        
+        for (int i=offset; i<end; i++)
+        {
+            char c=uri.charAt(i);
+
+            switch (state)
+            {
+                case START:
+                {
+                    switch(c)
+                    {
+                        case '/':
+                            mark = i;
+                            state = State.HOST_OR_PATH;
+                            break;
+                        case ';':
+                            mark=i+1;
+                            state=State.PARAM;
+                            break;
+                        case '?':
+                            // assume empty path (if seen at start)
+                            _path = "";
+                            mark=i+1;
+                            state=State.QUERY;
+                            break;
+                        case '#':
+                            mark=i+1;
+                            state=State.FRAGMENT;
+                            break;
+                        case '*':
+                            _path="*";
+                            state=State.ASTERISK;
+                            break;
+
+                        default:
+                            mark=i;
+                            if (_scheme==null)
+                                state=State.SCHEME_OR_PATH;
+                            else
+                            {
+                                path_mark=i;
+                                state=State.PATH;
+                            }
+                    }
+
+                    continue;
+                }
+
+                case SCHEME_OR_PATH:
+                {
+                    switch (c)
+                    {
+                        case ':':
+                            // must have been a scheme
+                            _scheme=uri.substring(mark,i);
+                            // Start again with scheme set
+                            state=State.START;
+                            break;
+
+                        case '/':
+                            // must have been in a path and still are
+                            state=State.PATH;
+                            break;
+
+                        case ';':
+                            // must have been in a path 
+                            mark=i+1;
+                            state=State.PARAM;
+                            break;
+
+                        case '?':
+                            // must have been in a path 
+                            _path=uri.substring(mark,i);
+                            mark=i+1;
+                            state=State.QUERY;
+                            break;
+
+                        case '%':
+                            // must have be in an encoded path 
+                            encoded=true;
+                            state=State.PATH;
+                            break;
+                        
+                        case '#':
+                            // must have been in a path 
+                            _path=uri.substring(mark,i);
+                            state=State.FRAGMENT;
+                            break;
+                    }
+                    continue;
+                }
+                
+                case HOST_OR_PATH:
+                {
+                    switch(c)
+                    {
+                        case '/':
+                            _host="";
+                            mark=i+1;
+                            state=State.HOST;
+                            break;
+                            
+                        case '@':
+                        case ';':
+                        case '?':
+                        case '#':
+                            // was a path, look again
+                            i--;
+                            path_mark=mark;
+                            state=State.PATH;
+                            break;
+                        default:
+                            // it is a path
+                            path_mark=mark;
+                            state=State.PATH;
+                    }
+                    continue;
+                }
+
+                case HOST:
+                {
+                    switch (c)
+                    {
+                        case '/':
+                            _host = uri.substring(mark,i);
+                            path_mark=mark=i;
+                            state=State.PATH;
+                            break;
+                        case ':':
+                            if (i > mark)
+                                _host=uri.substring(mark,i);
+                            mark=i+1;
+                            state=State.PORT;
+                            break;
+                        case '@':
+                            if (_user!=null)
+                                throw new IllegalArgumentException("Bad authority");
+                            _user=uri.substring(mark,i);
+                            mark=i+1;
+                            break;
+                            
+                        case '[':
+                            state=State.IPV6;
+                            break;
+                    }
+                    continue;
+                }
+
+                case IPV6:
+                {
+                    switch (c)
+                    {
+                        case '/':
+                            throw new IllegalArgumentException("No closing ']' for ipv6 in " + uri);
+                        case ']':
+                            c = uri.charAt(++i);
+                            _host=uri.substring(mark,i);
+                            if (c == ':')
+                            {
+                                mark=i+1;
+                                state=State.PORT;
+                            }
+                            else
+                            {
+                                path_mark=mark=i;
+                                state=State.PATH;
+                            }
+                            break;
+                    }
+
+                    continue;
+                }
+
+                case PORT:
+                {
+                    if (c=='@')
+                    {
+                        if (_user!=null)
+                            throw new IllegalArgumentException("Bad authority");
+                        // It wasn't a port, but a password!
+                        _user=_host+":"+uri.substring(mark,i);
+                        mark=i+1;
+                        state=State.HOST;
+                    }
+                    else if (c=='/')
+                    {
+                        _port=TypeUtil.parseInt(uri,mark,i-mark,10);
+                        path_mark=mark=i;
+                        state=State.PATH;
+                    }
+                    continue;
+                }
+
+                case PATH:
+                {
+                    switch (c)
+                    {
+                        case ';':
+                            mark=i+1;
+                            state=State.PARAM;
+                            break;
+                        case '?':
+                            _path=uri.substring(path_mark,i);
+                            mark=i+1;
+                            state=State.QUERY;
+                            break;
+                        case '#':
+                            _path=uri.substring(path_mark,i);
+                            mark=i+1;
+                            state=State.FRAGMENT;
+                            break;
+                        case '%':
+                            encoded=true;
+                            break;
+                    }
+                    continue;
+                }
+
+                case PARAM:
+                {
+                    switch (c)
+                    {
+                        case '?':
+                            _path=uri.substring(path_mark,i);
+                            _param=uri.substring(mark,i);
+                            mark=i+1;
+                            state=State.QUERY;
+                            break;
+                        case '#':
+                            _path=uri.substring(path_mark,i);
+                            _param=uri.substring(mark,i);
+                            mark=i+1;
+                            state=State.FRAGMENT;
+                            break;
+                        case '/':
+                            encoded=true;
+                            // ignore internal params
+                            state=State.PATH;
+                            break;
+                        case ';':
+                            // multiple parameters
+                            mark=i+1;
+                            break;
+                    }
+                    continue;
+                }
+
+                case QUERY:
+                {
+                    if (c=='#')
+                    {
+                        _query=uri.substring(mark,i);
+                        mark=i+1;
+                        state=State.FRAGMENT;
+                    }
+                    continue;
+                }
+
+                case ASTERISK:
+                {
+                    throw new IllegalArgumentException("only '*'");
+                }
+                
+                case FRAGMENT:
+                {
+                    _fragment=uri.substring(mark,end);
+                    i=end;
+                }
+            }
+        }
+
+        
+        switch(state)
+        {
+            case START:
+                break;
+            case SCHEME_OR_PATH:
+                _path=uri.substring(mark,end);
+                break;
+
+            case HOST_OR_PATH:
+                _path=uri.substring(mark,end);
+                break;
+                
+            case HOST:
+                if(end>mark)
+                    _host=uri.substring(mark,end);
+                break;
+                
+            case IPV6:
+                throw new IllegalArgumentException("No closing ']' for ipv6 in " + uri);
+
+            case PORT:
+                _port=TypeUtil.parseInt(uri,mark,end-mark,10);
+                break;
+                
+            case ASTERISK:
+                break;
+                
+            case FRAGMENT:
+                _fragment=uri.substring(mark,end);
+                break;
+                
+            case PARAM:
+                _path=uri.substring(path_mark,end);
+                _param=uri.substring(mark,end);
+                break;
+                
+            case PATH:
+                _path=uri.substring(path_mark,end);
+                break;
+                
+            case QUERY:
+                _query=uri.substring(mark,end);
+                break;
+        }
+        
+        if (!encoded)
+        {
+            if (_param==null)
+                _decodedPath=_path;
+            else
+                _decodedPath=_path.substring(0,_path.length()-_param.length()-1);
+        }
+    }
+
+    /* ------------------------------------------------------------ */
+    public String getScheme()
+    {
+        return _scheme;
+    }
+
+    /* ------------------------------------------------------------ */
+    public String getHost()
+    {
+        // Return null for empty host to retain compatibility with java.net.URI
+        if (_host!=null && _host.length()==0)
+            return null;
+        return _host;
+    }
+
+    /* ------------------------------------------------------------ */
+    public int getPort()
+    {
+        return _port;
+    }
+
+    /* ------------------------------------------------------------ */
+    /**
+     * The parsed Path.
+     * 
+     * @return the path as parsed on valid URI.  null for invalid URI.
+     */
+    public String getPath()
+    {
+        return _path;
+    }
+
+    /* ------------------------------------------------------------ */
+    public String getDecodedPath()
+    {
+        if (_decodedPath==null && _path!=null)
+            _decodedPath=URIUtil.decodePath(_path);
+        return _decodedPath;
+    }
+
+    /* ------------------------------------------------------------ */
+    public String getParam()
+    {
+        return _param;
+    }
+
+    /* ------------------------------------------------------------ */
+    public String getQuery()
+    {
+        return _query;
+    }
+
+    /* ------------------------------------------------------------ */
+    public boolean hasQuery()
+    {
+        return _query!=null && _query.length()>0;
+    }
+
+    /* ------------------------------------------------------------ */
+    public String getFragment()
+    {
+        return _fragment;
+    }
+
+    /* ------------------------------------------------------------ */
+    public void decodeQueryTo(MultiMap<String> parameters)
+    {
+        if (_query==_fragment)
+            return;
+        UrlEncoded.decodeUtf8To(_query,parameters);
+    }
+
+    /* ------------------------------------------------------------ */
+    public void decodeQueryTo(MultiMap<String> parameters, String encoding) throws UnsupportedEncodingException
+    {
+        decodeQueryTo(parameters,Charset.forName(encoding));
+    }
+
+    /* ------------------------------------------------------------ */
+    public void decodeQueryTo(MultiMap<String> parameters, Charset encoding) throws UnsupportedEncodingException
+    {
+        if (_query==_fragment)
+            return;
+
+        if (encoding==null || StandardCharsets.UTF_8.equals(encoding))
+            UrlEncoded.decodeUtf8To(_query,parameters);
+        else
+            UrlEncoded.decodeTo(_query,parameters,encoding);
+    }
+
+    /* ------------------------------------------------------------ */
+    public void clear()
+    {
+        _uri=null;
+
+        _scheme=null;
+        _host=null;
+        _port=-1;
+        _path=null;
+        _param=null;
+        _query=null;
+        _fragment=null;
+
+        _decodedPath=null;
+    }
+
+    /* ------------------------------------------------------------ */
+    public boolean isAbsolute()
+    {
+        return _scheme!=null && _scheme.length()>0;
+    }
+    
+    /* ------------------------------------------------------------ */
+    @Override
+    public String toString()
+    {
+        if (_uri==null)
+        {
+            StringBuilder out = new StringBuilder();
+            
+            if (_scheme!=null)
+                out.append(_scheme).append(':');
+            
+            if (_host != null)
+            {
+                out.append("//");
+                if (_user != null)
+                    out.append(_user).append('@');
+                out.append(_host);
+            }
+            
+            if (_port>0)
+                out.append(':').append(_port);
+            
+            if (_path!=null)
+                out.append(_path);
+            
+            if (_query!=null)
+                out.append('?').append(_query);
+            
+            if (_fragment!=null)
+                out.append('#').append(_fragment);
+            
+            if (out.length()>0)
+                _uri=out.toString();
+            else
+                _uri="";
+        }
+        return _uri;
+    }
+
+    /* ------------------------------------------------------------ */
+    public boolean equals(Object o)
+    {
+        if (o==this)
+            return true;
+        if (!(o instanceof HttpURI))
+            return false;
+        return toString().equals(o.toString());
+    }
+
+    /* ------------------------------------------------------------ */
+    public void setScheme(String scheme)
+    {
+        _scheme=scheme;
+        _uri=null;
+    }
+    
+    /* ------------------------------------------------------------ */
+    /**
+     * @param host the host
+     * @param port the port
+     */
+    public void setAuthority(String host, int port)
+    {
+        _host=host;
+        _port=port;
+        _uri=null;
+    }
+
+    /* ------------------------------------------------------------ */
+    /**
+     * @param path the path
+     */
+    public void setPath(String path)
+    {
+        _uri=null;
+        _path=path;
+        _decodedPath=null;
+    }
+    
+    /* ------------------------------------------------------------ */
+    public void setPathQuery(String path)
+    {
+        _uri=null;
+        _path=null;
+        _decodedPath=null;
+        _param=null;
+        _fragment=null;
+        if (path!=null)
+            parse(State.PATH,path,0,path.length());
+    }
+    
+    /* ------------------------------------------------------------ */
+    public void setQuery(String query)
+    {
+        _query=query;
+        _uri=null;
+    }
+    
+    /* ------------------------------------------------------------ */
+    public URI toURI() throws URISyntaxException
+    {
+        return new URI(_scheme,null,_host,_port,_path,_query==null?null:UrlEncoded.decodeString(_query),_fragment);
+    }
+
+    /* ------------------------------------------------------------ */
+    public String getPathQuery()
+    {
+        if (_query==null)
+            return _path;
+        return _path+"?"+_query;
+    }
+    
+    /* ------------------------------------------------------------ */
+    public String getAuthority()
+    {
+        if (_port>0)
+            return _host+":"+_port;
+        return _host;
+    }
+    
+    /* ------------------------------------------------------------ */
+    public String getUser()
+    {
+        return _user;
+    }
+
+
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpVersion.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpVersion.java
new file mode 100644
index 0000000000..ddedc27471
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/HttpVersion.java
@@ -0,0 +1,173 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http;
+
+import java.nio.ByteBuffer;
+
+import org.eclipse.jetty.util.ArrayTrie;
+import org.eclipse.jetty.util.StringUtil;
+import org.eclipse.jetty.util.Trie;
+
+
+/* ------------------------------------------------------------------------------- */
+public enum HttpVersion
+{
+    HTTP_0_9("HTTP/0.9",9),
+    HTTP_1_0("HTTP/1.0",10),
+    HTTP_1_1("HTTP/1.1",11),
+    HTTP_2("HTTP/2.0",20);
+
+    /* ------------------------------------------------------------ */
+    public final static Trie<HttpVersion> CACHE= new ArrayTrie<HttpVersion>();
+    static
+    {
+        for (HttpVersion version : HttpVersion.values())
+            CACHE.put(version.toString(),version);
+    }
+
+    /* ------------------------------------------------------------ */
+    /** 
+     * Optimised lookup to find a Http Version and whitespace in a byte array.
+     * @param bytes Array containing ISO-8859-1 characters
+     * @param position The first valid index
+     * @param limit The first non valid index
+     * @return A HttpMethod if a match or null if no easy match.
+     */
+    public static HttpVersion lookAheadGet(byte[] bytes, int position, int limit)
+    {
+        int length=limit-position;
+        if (length<9)
+            return null;
+
+        if (bytes[position+4]=='/' && bytes[position+6]=='.' && Character.isWhitespace((char)bytes[position+8]) &&
+            ((bytes[position]=='H' &&  bytes[position+1]=='T' && bytes[position+2]=='T' && bytes[position+3]=='P') ||
+             (bytes[position]=='h' &&  bytes[position+1]=='t' && bytes[position+2]=='t' && bytes[position+3]=='p')))
+        {
+            switch(bytes[position+5])
+            {
+                case '1':
+                    switch(bytes[position+7])
+                    {
+                        case '0':
+                            return HTTP_1_0;
+                        case '1':
+                            return HTTP_1_1;
+                    }
+                    break;
+                case '2':
+                    switch(bytes[position+7])
+                    {
+                        case '0':
+                            return HTTP_2;
+                    }
+                    break;
+            }
+        }
+        
+        return null;
+    }
+
+    /* ------------------------------------------------------------ */
+    /** 
+     * Optimised lookup to find a HTTP Version and trailing white space in a byte array.
+     * @param buffer buffer containing ISO-8859-1 characters
+     * @return A HttpVersion if a match or null if no easy match.
+     */
+    public static HttpVersion lookAheadGet(ByteBuffer buffer)
+    {
+        if (buffer.hasArray())
+            return lookAheadGet(buffer.array(),buffer.arrayOffset()+buffer.position(),buffer.arrayOffset()+buffer.limit());
+        return null;
+    }
+    
+    
+    private final String _string;
+    private final byte[] _bytes;
+    private final ByteBuffer _buffer;
+    private final int _version;
+
+    /* ------------------------------------------------------------ */
+    HttpVersion(String s,int version)
+    {
+        _string=s;
+        _bytes=StringUtil.getBytes(s);
+        _buffer=ByteBuffer.wrap(_bytes);
+        _version=version;
+    }
+
+    /* ------------------------------------------------------------ */
+    public byte[] toBytes()
+    {
+        return _bytes;
+    }
+
+    /* ------------------------------------------------------------ */
+    public ByteBuffer toBuffer()
+    {
+        return _buffer.asReadOnlyBuffer();
+    }
+
+    /* ------------------------------------------------------------ */
+    public int getVersion()
+    {
+        return _version;
+    }
+
+    /* ------------------------------------------------------------ */
+    public boolean is(String s)
+    {
+        return _string.equalsIgnoreCase(s);    
+    }
+    
+    /* ------------------------------------------------------------ */
+    public String asString()
+    {
+        return _string;
+    }
+    
+    /* ------------------------------------------------------------ */
+    @Override
+    public String toString()
+    {
+        return _string;
+    }
+
+    /**
+     * Case insensitive fromString() conversion
+     * @param version the String to convert to enum constant
+     * @return the enum constant or null if version unknown
+     */
+    public static HttpVersion fromString(String version)
+    {
+        return CACHE.get(version);
+    }
+
+    /* ------------------------------------------------------------ */
+    public static HttpVersion fromVersion(int version)
+    {
+        switch(version)
+        {
+            case 9: return HttpVersion.HTTP_0_9;
+            case 10: return HttpVersion.HTTP_1_0;
+            case 11: return HttpVersion.HTTP_1_1;
+            case 20: return HttpVersion.HTTP_2;
+            default: throw new IllegalArgumentException();
+        }
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/MetaData.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/MetaData.java
new file mode 100644
index 0000000000..725870db92
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/MetaData.java
@@ -0,0 +1,298 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http;
+
+import java.util.Collections;
+import java.util.Iterator;
+
+public class MetaData implements Iterable<HttpField>
+{
+    private HttpVersion _httpVersion;
+    private HttpFields _fields;
+    private long _contentLength;
+
+    public MetaData(HttpVersion version, HttpFields fields)
+    {
+        this(version, fields, Long.MIN_VALUE);
+    }
+
+    public MetaData(HttpVersion version, HttpFields fields, long contentLength)
+    {
+        _httpVersion = version;
+        _fields = fields;
+        _contentLength = contentLength;
+    }
+
+    protected void recycle()
+    {
+        _httpVersion = null;
+        if (_fields != null)
+            _fields.clear();
+        _contentLength = Long.MIN_VALUE;
+    }
+
+    public boolean isRequest()
+    {
+        return false;
+    }
+
+    public boolean isResponse()
+    {
+        return false;
+    }
+
+    /**
+     * @return the HTTP version of this MetaData object
+     */
+    public HttpVersion getVersion()
+    {
+        return _httpVersion;
+    }
+
+    /**
+     * @param httpVersion the HTTP version to set
+     */
+    public void setHttpVersion(HttpVersion httpVersion)
+    {
+        _httpVersion = httpVersion;
+    }
+
+    /**
+     * @return the HTTP fields of this MetaData object
+     */
+    public HttpFields getFields()
+    {
+        return _fields;
+    }
+
+    /**
+     * @return the content length if available, otherwise {@link Long#MIN_VALUE}
+     */
+    public long getContentLength()
+    {
+        if (_contentLength == Long.MIN_VALUE)
+        {
+            if (_fields != null)
+            {
+                HttpField field = _fields.getField(HttpHeader.CONTENT_LENGTH);
+                _contentLength = field == null ? -1 : field.getLongValue();
+            }
+        }
+        return _contentLength;
+    }
+
+    /**
+     * @return an iterator over the HTTP fields
+     * @see #getFields()
+     */
+    public Iterator<HttpField> iterator()
+    {
+        HttpFields fields = getFields();
+        return fields == null ? Collections.<HttpField>emptyIterator() : fields.iterator();
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder out = new StringBuilder();
+        for (HttpField field : this)
+            out.append(field).append(System.lineSeparator());
+        return out.toString();
+    }
+
+    public static class Request extends MetaData
+    {
+        private String _method;
+        private HttpURI _uri;
+
+        public Request(HttpFields fields)
+        {
+            this(null, null, null, fields);
+        }
+
+        public Request(String method, HttpURI uri, HttpVersion version, HttpFields fields)
+        {
+            this(method, uri, version, fields, Long.MIN_VALUE);
+        }
+
+        public Request(String method, HttpURI uri, HttpVersion version, HttpFields fields, long contentLength)
+        {
+            super(version, fields, contentLength);
+            _method = method;
+            _uri = uri;
+        }
+
+        public Request(String method, HttpScheme scheme, HostPortHttpField hostPort, String uri, HttpVersion version, HttpFields fields)
+        {
+            this(method, new HttpURI(scheme == null ? null : scheme.asString(), hostPort.getHost(), hostPort.getPort(), uri), version, fields);
+        }
+
+        public Request(String method, HttpScheme scheme, HostPortHttpField hostPort, String uri, HttpVersion version, HttpFields fields, long contentLength)
+        {
+            this(method, new HttpURI(scheme == null ? null : scheme.asString(), hostPort.getHost(), hostPort.getPort(), uri), version, fields, contentLength);
+        }
+
+        public Request(String method, String scheme, HostPortHttpField hostPort, String uri, HttpVersion version, HttpFields fields, long contentLength)
+        {
+            this(method, new HttpURI(scheme, hostPort.getHost(), hostPort.getPort(), uri), version, fields, contentLength);
+        }
+
+        public Request(Request request)
+        {
+            this(request.getMethod(),new HttpURI(request.getURI()), request.getVersion(), new HttpFields(request.getFields()), request.getContentLength());
+        }
+
+        // TODO MetaData should be immuttable!!! 
+        public void recycle()
+        {
+            super.recycle();
+            _method = null;
+            if (_uri != null)
+                _uri.clear();
+        }
+
+        @Override
+        public boolean isRequest()
+        {
+            return true;
+        }
+
+        /**
+         * @return the HTTP method
+         */
+        public String getMethod()
+        {
+            return _method;
+        }
+
+        /**
+         * @param method the HTTP method to set
+         */
+        public void setMethod(String method)
+        {
+            _method = method;
+        }
+
+        /**
+         * @return the HTTP URI
+         */
+        public HttpURI getURI()
+        {
+            return _uri;
+        }
+
+        /**
+         * @return the HTTP URI in string form
+         */
+        public String getURIString()
+        {
+            return _uri == null ? null : _uri.toString();
+        }
+
+        /**
+         * @param uri the HTTP URI to set
+         */
+        public void setURI(HttpURI uri)
+        {
+            _uri = uri;
+        }
+
+        @Override
+        public String toString()
+        {
+            HttpFields fields = getFields();
+            return String.format("%s{u=%s,%s,h=%d}",
+                    getMethod(), getURI(), getVersion(), fields == null ? -1 : fields.size());
+        }
+    }
+
+    public static class Response extends MetaData
+    {
+        private int _status;
+        private String _reason;
+
+        public Response()
+        {
+            this(null, 0, null);
+        }
+
+        public Response(HttpVersion version, int status, HttpFields fields)
+        {
+            this(version, status, fields, Long.MIN_VALUE);
+        }
+
+        public Response(HttpVersion version, int status, HttpFields fields, long contentLength)
+        {
+            super(version, fields, contentLength);
+            _status = status;
+        }
+
+        public Response(HttpVersion version, int status, String reason, HttpFields fields, long contentLength)
+        {
+            super(version, fields, contentLength);
+            _reason = reason;
+            _status = status;
+        }
+
+        @Override
+        public boolean isResponse()
+        {
+            return true;
+        }
+
+        /**
+         * @return the HTTP status
+         */
+        public int getStatus()
+        {
+            return _status;
+        }
+
+        /**
+         * @return the HTTP reason
+         */
+        public String getReason()
+        {
+            return _reason;
+        }
+
+        /**
+         * @param status the HTTP status to set
+         */
+        public void setStatus(int status)
+        {
+            _status = status;
+        }
+
+        /**
+         * @param reason the HTTP reason to set
+         */
+        public void setReason(String reason)
+        {
+            _reason = reason;
+        }
+
+        @Override
+        public String toString()
+        {
+            HttpFields fields = getFields();
+            return String.format("%s{s=%d,h=%d}", getVersion(), getStatus(), fields == null ? -1 : fields.size());
+        }
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/MimeTypes.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/MimeTypes.java
new file mode 100644
index 0000000000..dbdd4b83c6
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/MimeTypes.java
@@ -0,0 +1,497 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+import java.util.Set;
+
+import org.eclipse.jetty.util.ArrayTrie;
+import org.eclipse.jetty.util.BufferUtil;
+import org.eclipse.jetty.util.StringUtil;
+import org.eclipse.jetty.util.Trie;
+import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.util.log.Logger;
+
+
+/* ------------------------------------------------------------ */
+/**
+ *
+ */
+public class MimeTypes
+{
+    public enum Type
+    {
+        FORM_ENCODED("application/x-www-form-urlencoded"),
+        MESSAGE_HTTP("message/http"),
+        MULTIPART_BYTERANGES("multipart/byteranges"),
+
+        TEXT_HTML("text/html"),
+        TEXT_PLAIN("text/plain"),
+        TEXT_XML("text/xml"),
+        TEXT_JSON("text/json",StandardCharsets.UTF_8),
+        APPLICATION_JSON("application/json",StandardCharsets.UTF_8),
+
+        TEXT_HTML_8859_1("text/html;charset=iso-8859-1",TEXT_HTML),
+        TEXT_HTML_UTF_8("text/html;charset=utf-8",TEXT_HTML),
+
+        TEXT_PLAIN_8859_1("text/plain;charset=iso-8859-1",TEXT_PLAIN),
+        TEXT_PLAIN_UTF_8("text/plain;charset=utf-8",TEXT_PLAIN),
+
+        TEXT_XML_8859_1("text/xml;charset=iso-8859-1",TEXT_XML),
+        TEXT_XML_UTF_8("text/xml;charset=utf-8",TEXT_XML),
+
+        TEXT_JSON_8859_1("text/json;charset=iso-8859-1",TEXT_JSON),
+        TEXT_JSON_UTF_8("text/json;charset=utf-8",TEXT_JSON),
+
+        APPLICATION_JSON_8859_1("text/json;charset=iso-8859-1",APPLICATION_JSON),
+        APPLICATION_JSON_UTF_8("text/json;charset=utf-8",APPLICATION_JSON);
+
+
+        /* ------------------------------------------------------------ */
+        private final String _string;
+        private final Type _base;
+        private final ByteBuffer _buffer;
+        private final Charset _charset;
+        private final String _charsetString;
+        private final boolean _assumedCharset;
+        private final HttpField _field;
+
+        /* ------------------------------------------------------------ */
+        Type(String s)
+        {
+            _string=s;
+            _buffer=BufferUtil.toBuffer(s);
+            _base=this;
+            _charset=null;
+            _charsetString=null;
+            _assumedCharset=false;
+            _field=new PreEncodedHttpField(HttpHeader.CONTENT_TYPE,_string);
+        }
+
+        /* ------------------------------------------------------------ */
+        Type(String s,Type base)
+        {
+            _string=s;
+            _buffer=BufferUtil.toBuffer(s);
+            _base=base;
+            int i=s.indexOf(";charset=");
+            _charset=Charset.forName(s.substring(i+9));
+            _charsetString=_charset.toString().toLowerCase(Locale.ENGLISH);
+            _assumedCharset=false;
+            _field=new PreEncodedHttpField(HttpHeader.CONTENT_TYPE,_string);
+        }
+
+        /* ------------------------------------------------------------ */
+        Type(String s,Charset cs)
+        {
+            _string=s;
+            _base=this;
+            _buffer=BufferUtil.toBuffer(s);
+            _charset=cs;
+            _charsetString=_charset==null?null:_charset.toString().toLowerCase(Locale.ENGLISH);
+            _assumedCharset=true;
+            _field=new PreEncodedHttpField(HttpHeader.CONTENT_TYPE,_string);
+        }
+
+        /* ------------------------------------------------------------ */
+        public ByteBuffer asBuffer()
+        {
+            return _buffer.asReadOnlyBuffer();
+        }
+
+        /* ------------------------------------------------------------ */
+        public Charset getCharset()
+        {
+            return _charset;
+        }
+
+        /* ------------------------------------------------------------ */
+        public String getCharsetString()
+        {
+            return _charsetString;
+        }
+
+        /* ------------------------------------------------------------ */
+        public boolean is(String s)
+        {
+            return _string.equalsIgnoreCase(s);
+        }
+
+        /* ------------------------------------------------------------ */
+        public String asString()
+        {
+            return _string;
+        }
+
+        /* ------------------------------------------------------------ */
+        @Override
+        public String toString()
+        {
+            return _string;
+        }
+
+        /* ------------------------------------------------------------ */
+        public boolean isCharsetAssumed()
+        {
+            return _assumedCharset;
+        }
+
+        /* ------------------------------------------------------------ */
+        public HttpField getContentTypeField()
+        {
+            return _field;
+        }
+
+        /* ------------------------------------------------------------ */
+        public Type getBaseType()
+        {
+            return _base;
+        }
+    }
+
+    /* ------------------------------------------------------------ */
+    private static final Logger LOG = Log.getLogger(MimeTypes.class);
+    public  final static Trie<MimeTypes.Type> CACHE= new ArrayTrie<>(512);
+    private final static Trie<ByteBuffer> TYPES= new ArrayTrie<ByteBuffer>(512);
+    private final static Map<String,String> __dftMimeMap = new HashMap<String,String>();
+    private final static Map<String,String> __encodings = new HashMap<String,String>();
+
+    static
+    {
+        for (MimeTypes.Type type : MimeTypes.Type.values())
+        {
+            CACHE.put(type.toString(),type);
+            TYPES.put(type.toString(),type.asBuffer());
+
+            int charset=type.toString().indexOf(";charset=");
+            if (charset>0)
+            {
+                String alt=type.toString().replace(";charset=","; charset=");
+                CACHE.put(alt,type);
+                TYPES.put(alt,type.asBuffer());
+            }
+        }
+
+        try
+        {
+            ResourceBundle mime = ResourceBundle.getBundle("org/eclipse/jetty/http/mime");
+            Enumeration<String> i = mime.getKeys();
+            while(i.hasMoreElements())
+            {
+                String ext = i.nextElement();
+                String m = mime.getString(ext);
+                __dftMimeMap.put(StringUtil.asciiToLowerCase(ext),normalizeMimeType(m));
+            }
+        }
+        catch(MissingResourceException e)
+        {
+            LOG.warn(e.toString());
+            LOG.debug(e);
+        }
+
+        try
+        {
+            ResourceBundle encoding = ResourceBundle.getBundle("org/eclipse/jetty/http/encoding");
+            Enumeration<String> i = encoding.getKeys();
+            while(i.hasMoreElements())
+            {
+                String type = i.nextElement();
+                __encodings.put(type,encoding.getString(type));
+            }
+        }
+        catch(MissingResourceException e)
+        {
+            LOG.warn(e.toString());
+            LOG.debug(e);
+        }
+    }
+
+
+    /* ------------------------------------------------------------ */
+    private final Map<String,String> _mimeMap=new HashMap<String,String>();
+
+    /* ------------------------------------------------------------ */
+    /** Constructor.
+     */
+    public MimeTypes()
+    {
+    }
+
+    /* ------------------------------------------------------------ */
+    public synchronized Map<String,String> getMimeMap()
+    {
+        return _mimeMap;
+    }
+
+    /* ------------------------------------------------------------ */
+    /**
+     * @param mimeMap A Map of file extension to mime-type.
+     */
+    public void setMimeMap(Map<String,String> mimeMap)
+    {
+        _mimeMap.clear();
+        if (mimeMap!=null)
+        {
+            for (Entry<String, String> ext : mimeMap.entrySet())
+                _mimeMap.put(StringUtil.asciiToLowerCase(ext.getKey()),normalizeMimeType(ext.getValue()));
+        }
+    }
+
+    /* ------------------------------------------------------------ */
+    /** Get the MIME type by filename extension.
+     * @param filename A file name
+     * @return MIME type matching the longest dot extension of the
+     * file name.
+     */
+    public String getMimeByExtension(String filename)
+    {
+        String type=null;
+
+        if (filename!=null)
+        {
+            int i=-1;
+            while(type==null)
+            {
+                i=filename.indexOf(".",i+1);
+
+                if (i<0 || i>=filename.length())
+                    break;
+
+                String ext=StringUtil.asciiToLowerCase(filename.substring(i+1));
+                if (_mimeMap!=null)
+                    type=_mimeMap.get(ext);
+                if (type==null)
+                    type=__dftMimeMap.get(ext);
+            }
+        }
+
+        if (type==null)
+        {
+            if (_mimeMap!=null)
+                type=_mimeMap.get("*");
+            if (type==null)
+                type=__dftMimeMap.get("*");
+        }
+
+        return type;
+    }
+
+    /* ------------------------------------------------------------ */
+    /** Set a mime mapping
+     * @param extension the extension
+     * @param type the mime type
+     */
+    public void addMimeMapping(String extension,String type)
+    {
+        _mimeMap.put(StringUtil.asciiToLowerCase(extension),normalizeMimeType(type));
+    }
+
+    /* ------------------------------------------------------------ */
+    public static Set<String> getKnownMimeTypes()
+    {
+        return new HashSet<>(__dftMimeMap.values());
+    }
+
+    /* ------------------------------------------------------------ */
+    private static String normalizeMimeType(String type)
+    {
+        MimeTypes.Type t =CACHE.get(type);
+        if (t!=null)
+            return t.asString();
+
+        return StringUtil.asciiToLowerCase(type);
+    }
+
+    /* ------------------------------------------------------------ */
+    public static String getCharsetFromContentType(String value)
+    {
+        if (value==null)
+            return null;
+        int end=value.length();
+        int state=0;
+        int start=0;
+        boolean quote=false;
+        int i=0;
+        for (;i<end;i++)
+        {
+            char b = value.charAt(i);
+
+            if (quote && state!=10)
+            {
+                if ('"'==b)
+                    quote=false;
+                continue;
+            }
+
+            switch(state)
+            {
+                case 0:
+                    if ('"'==b)
+                    {
+                        quote=true;
+                        break;
+                    }
+                    if (';'==b)
+                        state=1;
+                    break;
+
+                case 1: if ('c'==b) state=2; else if (' '!=b) state=0; break;
+                case 2: if ('h'==b) state=3; else state=0;break;
+                case 3: if ('a'==b) state=4; else state=0;break;
+                case 4: if ('r'==b) state=5; else state=0;break;
+                case 5: if ('s'==b) state=6; else state=0;break;
+                case 6: if ('e'==b) state=7; else state=0;break;
+                case 7: if ('t'==b) state=8; else state=0;break;
+
+                case 8: if ('='==b) state=9; else if (' '!=b) state=0; break;
+
+                case 9:
+                    if (' '==b)
+                        break;
+                    if ('"'==b)
+                    {
+                        quote=true;
+                        start=i+1;
+                        state=10;
+                        break;
+                    }
+                    start=i;
+                    state=10;
+                    break;
+
+                case 10:
+                    if (!quote && (';'==b || ' '==b )||
+                            (quote && '"'==b ))
+                        return StringUtil.normalizeCharset(value,start,i-start);
+            }
+        }
+
+        if (state==10)
+            return StringUtil.normalizeCharset(value,start,i-start);
+
+        return null;
+    }
+
+    public static String inferCharsetFromContentType(String value)
+    {
+        return __encodings.get(value);
+    }
+
+    public static String getContentTypeWithoutCharset(String value)
+    {
+        int end=value.length();
+        int state=0;
+        int start=0;
+        boolean quote=false;
+        int i=0;
+        StringBuilder builder=null;
+        for (;i<end;i++)
+        {
+            char b = value.charAt(i);
+
+            if ('"'==b)
+            {
+                if (quote)
+                {
+                    quote=false;
+                }
+                else
+                {
+                    quote=true;
+                }
+
+                switch(state)
+                {
+                    case 11:
+                        builder.append(b);break;
+                    case 10:
+                        break;
+                    case 9:
+                        builder=new StringBuilder();
+                        builder.append(value,0,start+1);
+                        state=10;
+                        break;
+                    default:
+                        start=i;
+                        state=0;
+                }
+                continue;
+            }
+
+            if (quote)
+            {
+                if (builder!=null && state!=10)
+                    builder.append(b);
+                continue;
+            }
+
+            switch(state)
+            {
+                case 0:
+                    if (';'==b)
+                        state=1;
+                    else if (' '!=b)
+                        start=i;
+                    break;
+
+                case 1: if ('c'==b) state=2; else if (' '!=b) state=0; break;
+                case 2: if ('h'==b) state=3; else state=0;break;
+                case 3: if ('a'==b) state=4; else state=0;break;
+                case 4: if ('r'==b) state=5; else state=0;break;
+                case 5: if ('s'==b) state=6; else state=0;break;
+                case 6: if ('e'==b) state=7; else state=0;break;
+                case 7: if ('t'==b) state=8; else state=0;break;
+                case 8: if ('='==b) state=9; else if (' '!=b) state=0; break;
+
+                case 9:
+                    if (' '==b)
+                        break;
+                    builder=new StringBuilder();
+                    builder.append(value,0,start+1);
+                    state=10;
+                    break;
+
+                case 10:
+                    if (';'==b)
+                    {
+                        builder.append(b);
+                        state=11;
+                    }
+                    break;
+                case 11:
+                    if (' '!=b)
+                        builder.append(b);
+            }
+        }
+        if (builder==null)
+            return value;
+        return builder.toString();
+
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/PathMap.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/PathMap.java
new file mode 100644
index 0000000000..61c047c8c5
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/PathMap.java
@@ -0,0 +1,641 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http;
+
+import java.util.AbstractSet;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.function.Predicate;
+
+import org.eclipse.jetty.util.ArrayTernaryTrie;
+import org.eclipse.jetty.util.Trie;
+import org.eclipse.jetty.util.URIUtil;
+
+/** 
+ * URI path map to Object.
+ * <p>
+ * This mapping implements the path specification recommended
+ * in the 2.2 Servlet API.
+ * </p>
+ *
+ * <p>
+ * Path specifications can be of the following forms:
+ * </p>
+ * <pre>
+ * /foo/bar           - an exact path specification.
+ * /foo/*             - a prefix path specification (must end '/*').
+ * *.ext              - a suffix path specification.
+ * /                  - the default path specification.
+ * ""                 - the / path specification
+ * </pre>
+ * 
+ * Matching is performed in the following order 
+ * <ol>
+ * <li>Exact match.</li>
+ * <li>Longest prefix match.</li>
+ * <li>Longest suffix match.</li>
+ * <li>default.</li>
+ * </ol>
+ * 
+ * <p>
+ * Multiple path specifications can be mapped by providing a list of
+ * specifications. By default this class uses characters ":," as path
+ * separators, unless configured differently by calling the static
+ * method @see PathMap#setPathSpecSeparators(String)
+ * <p>
+ * Special characters within paths such as '?� and ';' are not treated specially
+ * as it is assumed they would have been either encoded in the original URL or
+ * stripped from the path.
+ * <p>
+ * This class is not synchronized.  If concurrent modifications are
+ * possible then it should be synchronized at a higher level.
+ * 
+ * @param <O> the Map.Entry value type
+ * @deprecated replaced with {@link org.eclipse.jetty.http.pathmap.PathMappings} (this class will be removed in Jetty 10) 
+ */
+@Deprecated
+public class PathMap<O> extends HashMap<String,O>
+{
+    /* ------------------------------------------------------------ */
+    private static String __pathSpecSeparators = ":,";
+
+    /* ------------------------------------------------------------ */
+    /** Set the path spec separator.
+     * Multiple path specification may be included in a single string
+     * if they are separated by the characters set in this string.
+     * By default this class uses ":," characters as path separators.
+     * @param s separators
+     */
+    public static void setPathSpecSeparators(String s)
+    {
+        __pathSpecSeparators=s;
+    }
+
+    /* --------------------------------------------------------------- */
+    Trie<MappedEntry<O>> _prefixMap=new ArrayTernaryTrie<>(false);
+    Trie<MappedEntry<O>> _suffixMap=new ArrayTernaryTrie<>(false);
+    final Map<String,MappedEntry<O>> _exactMap=new HashMap<>();
+
+    List<MappedEntry<O>> _defaultSingletonList=null;
+    MappedEntry<O> _prefixDefault=null;
+    MappedEntry<O> _default=null;
+    boolean _nodefault=false;
+
+    /* --------------------------------------------------------------- */
+    public PathMap()
+    {
+        this(11);
+    }
+
+    /* --------------------------------------------------------------- */
+    public PathMap(boolean noDefault)
+    {
+        this(11, noDefault);
+    }
+
+    /* --------------------------------------------------------------- */
+    public PathMap(int capacity)
+    {
+        this(capacity, false);
+    }
+
+    /* --------------------------------------------------------------- */
+    private PathMap(int capacity, boolean noDefault)
+    {
+        super(capacity);
+        _nodefault=noDefault;
+    }
+
+    /* --------------------------------------------------------------- */
+    /** 
+     * Construct from dictionary PathMap.
+     * @param dictMap the map representing the dictionary to build this PathMap from
+     */
+    public PathMap(Map<String, ? extends O> dictMap)
+    {
+        putAll(dictMap);
+    }
+
+    /* --------------------------------------------------------------- */
+    /** Add a single path match to the PathMap.
+     * @param pathSpec The path specification, or comma separated list of
+     * path specifications.
+     * @param object The object the path maps to
+     */
+    @Override
+    public O put(String pathSpec, O object)
+    {
+        if ("".equals(pathSpec.trim()))
+        {
+            MappedEntry<O> entry = new MappedEntry<>("",object);
+            entry.setMapped("");
+            _exactMap.put("", entry);
+            return super.put("", object);
+        }
+
+        StringTokenizer tok = new StringTokenizer(pathSpec,__pathSpecSeparators);
+        O old =null;
+
+        while (tok.hasMoreTokens())
+        {
+            String spec=tok.nextToken();
+
+            if (!spec.startsWith("/") && !spec.startsWith("*."))
+                throw new IllegalArgumentException("PathSpec "+spec+". must start with '/' or '*.'");
+
+            old = super.put(spec,object);
+
+            // Make entry that was just created.
+            MappedEntry<O> entry = new MappedEntry<>(spec,object);
+
+            if (entry.getKey().equals(spec))
+            {
+                if (spec.equals("/*"))
+                    _prefixDefault=entry;
+                else if (spec.endsWith("/*"))
+                {
+                    String mapped=spec.substring(0,spec.length()-2);
+                    entry.setMapped(mapped);
+                    while (!_prefixMap.put(mapped,entry))
+                        _prefixMap=new ArrayTernaryTrie<>((ArrayTernaryTrie<MappedEntry<O>>)_prefixMap,1.5);
+                }
+                else if (spec.startsWith("*."))
+                {
+                    String suffix=spec.substring(2);
+                    while(!_suffixMap.put(suffix,entry))
+                        _suffixMap=new ArrayTernaryTrie<>((ArrayTernaryTrie<MappedEntry<O>>)_suffixMap,1.5);
+                }
+                else if (spec.equals(URIUtil.SLASH))
+                {
+                    if (_nodefault)
+                        _exactMap.put(spec,entry);
+                    else
+                    {
+                        _default=entry;
+                        _defaultSingletonList=Collections.singletonList(_default);
+                    }
+                }
+                else
+                {
+                    entry.setMapped(spec);
+                    _exactMap.put(spec,entry);
+                }
+            }
+        }
+
+        return old;
+    }
+
+    /* ------------------------------------------------------------ */
+    /** Get object matched by the path.
+     * @param path the path.
+     * @return Best matched object or null.
+     */
+    public O match(String path)
+    {
+        MappedEntry<O> entry = getMatch(path);
+        if (entry!=null)
+            return entry.getValue();
+        return null;
+    }
+
+
+    /* --------------------------------------------------------------- */
+    /** Get the entry mapped by the best specification.
+     * @param path the path.
+     * @return Map.Entry of the best matched  or null.
+     */
+    public MappedEntry<O> getMatch(String path)
+    {
+        if (path==null)
+            return null;
+
+        int l=path.length();
+
+        MappedEntry<O> entry=null;
+
+        //special case
+        if (l == 1 && path.charAt(0)=='/')
+        {
+            entry = _exactMap.get("");
+            if (entry != null)
+                return entry;
+        }
+
+        // try exact match
+        entry=_exactMap.get(path);
+        if (entry!=null)
+            return entry;
+
+        // prefix search
+        int i=l;
+        final Trie<PathMap.MappedEntry<O>> prefix_map=_prefixMap;
+        while(i>=0)
+        {
+            entry=prefix_map.getBest(path,0,i);
+            if (entry==null)
+                break;
+            String key = entry.getKey();
+            if (key.length()-2>=path.length() || path.charAt(key.length()-2)=='/')
+                return entry;
+            i=key.length()-3;
+        }
+
+        // Prefix Default
+        if (_prefixDefault!=null)
+            return _prefixDefault;
+
+        // Extension search
+        i=0;
+        final Trie<PathMap.MappedEntry<O>> suffix_map=_suffixMap;
+        while ((i=path.indexOf('.',i+1))>0)
+        {
+            entry=suffix_map.get(path,i+1,l-i-1);
+            if (entry!=null)
+                return entry;
+        }
+
+        // Default
+        return _default;
+    }
+
+    /* --------------------------------------------------------------- */
+    /** Get all entries matched by the path.
+     * Best match first.
+     * @param path Path to match
+     * @return List of Map.Entry instances key=pathSpec
+     */
+    public List<? extends Map.Entry<String,O>> getMatches(String path)
+    {
+        MappedEntry<O> entry;
+        List<MappedEntry<O>> entries=new ArrayList<>();
+
+        if (path==null)
+            return entries;
+        if (path.length()==0)
+            return _defaultSingletonList;
+
+        // try exact match
+        entry=_exactMap.get(path);
+        if (entry!=null)
+            entries.add(entry);
+
+        // prefix search
+        int l=path.length();
+        int i=l;
+        final Trie<PathMap.MappedEntry<O>> prefix_map=_prefixMap;
+        while(i>=0)
+        {
+            entry=prefix_map.getBest(path,0,i);
+            if (entry==null)
+                break;
+            String key = entry.getKey();
+            if (key.length()-2>=path.length() || path.charAt(key.length()-2)=='/')
+                entries.add(entry);
+
+            i=key.length()-3;
+        }
+
+        // Prefix Default
+        if (_prefixDefault!=null)
+            entries.add(_prefixDefault);
+
+        // Extension search
+        i=0;
+        final Trie<PathMap.MappedEntry<O>> suffix_map=_suffixMap;
+        while ((i=path.indexOf('.',i+1))>0)
+        {
+            entry=suffix_map.get(path,i+1,l-i-1);
+            if (entry!=null)
+                entries.add(entry);
+        }
+
+        // root match
+        if ("/".equals(path))
+        {
+            entry=_exactMap.get("");
+            if (entry!=null)
+                entries.add(entry);
+        }
+            
+        // Default
+        if (_default!=null)
+            entries.add(_default);
+
+        return entries;
+    }
+
+
+    /* --------------------------------------------------------------- */
+    /** Return whether the path matches any entries in the PathMap,
+     * excluding the default entry
+     * @param path Path to match
+     * @return Whether the PathMap contains any entries that match this
+     */
+    public boolean containsMatch(String path)
+    {
+        MappedEntry<?> match = getMatch(path);
+        return match!=null && !match.equals(_default);
+    }
+
+    /* --------------------------------------------------------------- */
+    @Override
+    public O remove(Object pathSpec)
+    {
+        if (pathSpec!=null)
+        {
+            String spec=(String) pathSpec;
+            if (spec.equals("/*"))
+                _prefixDefault=null;
+            else if (spec.endsWith("/*"))
+                _prefixMap.remove(spec.substring(0,spec.length()-2));
+            else if (spec.startsWith("*."))
+                _suffixMap.remove(spec.substring(2));
+            else if (spec.equals(URIUtil.SLASH))
+            {
+                _default=null;
+                _defaultSingletonList=null;
+            }
+            else
+                _exactMap.remove(spec);
+        }
+        return super.remove(pathSpec);
+    }
+
+    /* --------------------------------------------------------------- */
+    @Override
+    public void clear()
+    {
+        _exactMap.clear();
+        _prefixMap=new ArrayTernaryTrie<>(false);
+        _suffixMap=new ArrayTernaryTrie<>(false);
+        _default=null;
+        _defaultSingletonList=null;
+        _prefixDefault=null;
+        super.clear();
+    }
+
+    /* --------------------------------------------------------------- */
+    /**
+     * @param pathSpec the path spec
+     * @param path the path
+     * @return true if match.
+     */
+    public static boolean match(String pathSpec, String path)
+    {
+        return match(pathSpec, path, false);
+    }
+
+    /* --------------------------------------------------------------- */
+    /**
+     * @param pathSpec the path spec
+     * @param path the path
+     * @param noDefault true to not handle the default path "/" special, false to allow matcher rules to run  
+     * @return true if match.
+     */
+    public static boolean match(String pathSpec, String path, boolean noDefault)
+    {
+        if (pathSpec.length()==0)
+            return "/".equals(path);
+            
+        char c = pathSpec.charAt(0);
+        if (c=='/')
+        {
+            if (!noDefault && pathSpec.length()==1 || pathSpec.equals(path))
+                return true;
+
+            if(isPathWildcardMatch(pathSpec, path))
+                return true;
+        }
+        else if (c=='*')
+            return path.regionMatches(path.length()-pathSpec.length()+1,
+                    pathSpec,1,pathSpec.length()-1);
+        return false;
+    }
+
+    /* --------------------------------------------------------------- */
+    private static boolean isPathWildcardMatch(String pathSpec, String path)
+    {
+        // For a spec of "/foo/*" match "/foo" , "/foo/..." but not "/foobar"
+        int cpl=pathSpec.length()-2;
+        if (pathSpec.endsWith("/*") && path.regionMatches(0,pathSpec,0,cpl))
+        {
+            if (path.length()==cpl || '/'==path.charAt(cpl))
+                return true;
+        }
+        return false;
+    }
+
+
+    /* --------------------------------------------------------------- */
+    /** Return the portion of a path that matches a path spec.
+     * @param pathSpec the path spec
+     * @param path the path
+     * @return null if no match at all.
+     */
+    public static String pathMatch(String pathSpec, String path)
+    {
+        char c = pathSpec.charAt(0);
+
+        if (c=='/')
+        {
+            if (pathSpec.length()==1)
+                return path;
+
+            if (pathSpec.equals(path))
+                return path;
+
+            if (isPathWildcardMatch(pathSpec, path))
+                return path.substring(0,pathSpec.length()-2);
+        }
+        else if (c=='*')
+        {
+            if (path.regionMatches(path.length()-(pathSpec.length()-1),
+                    pathSpec,1,pathSpec.length()-1))
+                return path;
+        }
+        return null;
+    }
+
+    /* --------------------------------------------------------------- */
+    /** Return the portion of a path that is after a path spec.
+     * @param pathSpec the path spec
+     * @param path the path
+     * @return The path info string
+     */
+    public static String pathInfo(String pathSpec, String path)
+    {
+        if ("".equals(pathSpec))
+            return path; //servlet 3 spec sec 12.2 will be '/'
+
+        char c = pathSpec.charAt(0);
+
+        if (c=='/')
+        {
+            if (pathSpec.length()==1)
+                return null;
+
+            boolean wildcard = isPathWildcardMatch(pathSpec, path);
+
+            // handle the case where pathSpec uses a wildcard and path info is "/*"
+            if (pathSpec.equals(path) && !wildcard)
+                return null;
+
+            if (wildcard)
+            {
+                if (path.length()==pathSpec.length()-2)
+                    return null;
+                return path.substring(pathSpec.length()-2);
+            }
+        }
+        return null;
+    }
+
+
+    /* ------------------------------------------------------------ */
+    /** Relative path.
+     * @param base The base the path is relative to.
+     * @param pathSpec The spec of the path segment to ignore.
+     * @param path the additional path
+     * @return base plus path with pathspec removed
+     */
+    public static String relativePath(String base,
+            String pathSpec,
+            String path )
+    {
+        String info=pathInfo(pathSpec,path);
+        if (info==null)
+            info=path;
+
+        if( info.startsWith( "./"))
+            info = info.substring( 2);
+        if( base.endsWith( URIUtil.SLASH))
+            if( info.startsWith( URIUtil.SLASH))
+                path = base + info.substring(1);
+            else
+                path = base + info;
+        else
+            if( info.startsWith( URIUtil.SLASH))
+                path = base + info;
+            else
+                path = base + URIUtil.SLASH + info;
+        return path;
+    }
+
+    /* ------------------------------------------------------------ */
+    /* ------------------------------------------------------------ */
+    /* ------------------------------------------------------------ */
+    public static class MappedEntry<O> implements Map.Entry<String,O>
+    {
+        private final String key;
+        private final O value;
+        private String mapped;
+
+        MappedEntry(String key, O value)
+        {
+            this.key=key;
+            this.value=value;
+        }
+
+        @Override
+        public String getKey()
+        {
+            return key;
+        }
+
+        @Override
+        public O getValue()
+        {
+            return value;
+        }
+
+        @Override
+        public O setValue(O o)
+        {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public String toString()
+        {
+            return key+"="+value;
+        }
+
+        public String getMapped()
+        {
+            return mapped;
+        }
+
+        void setMapped(String mapped)
+        {
+            this.mapped = mapped;
+        }
+    }
+    
+    public static class PathSet extends AbstractSet<String> implements Predicate<String>
+    {
+        private final PathMap<Boolean> _map = new PathMap<>();
+        
+        @Override
+        public Iterator<String> iterator()
+        {
+            return _map.keySet().iterator();
+        }
+
+        @Override
+        public int size()
+        {
+            return _map.size();
+        }
+        
+        @Override
+        public boolean add(String item)
+        {
+            return _map.put(item,Boolean.TRUE)==null;
+        }
+        
+        @Override
+        public boolean remove(Object item)
+        {
+            return _map.remove(item)!=null;
+        }
+
+        @Override
+        public boolean contains(Object o) 
+        { 
+            return _map.containsKey(o); 
+        }
+        
+        @Override
+        public boolean test(String s)
+        {
+            return _map.containsMatch(s);
+        }
+        
+        public boolean containsMatch(String s) 
+        { 
+            return _map.containsMatch(s); 
+        }
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/PreEncodedHttpField.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/PreEncodedHttpField.java
new file mode 100644
index 0000000000..6c81a91469
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/PreEncodedHttpField.java
@@ -0,0 +1,94 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+
+package org.eclipse.jetty.http;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ServiceLoader;
+
+import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.util.log.Logger;
+
+
+/* ------------------------------------------------------------ */
+/** Pre encoded HttpField.
+ * <p>A HttpField that will be cached and used many times can be created as 
+ * a {@link PreEncodedHttpField}, which will use the {@link HttpFieldPreEncoder}
+ * instances discovered by the {@link ServiceLoader} to pre-encode the header 
+ * for each version of HTTP in use.  This will save garbage 
+ * and CPU each time the field is encoded into a response.
+ * </p>
+ */
+public class PreEncodedHttpField extends HttpField
+{
+    private final static Logger LOG = Log.getLogger(PreEncodedHttpField.class);
+    private final static HttpFieldPreEncoder[] __encoders;
+    
+    static
+    { 
+        List<HttpFieldPreEncoder> encoders = new ArrayList<>();
+        Iterator<HttpFieldPreEncoder> iter = ServiceLoader.load(HttpFieldPreEncoder.class,PreEncodedHttpField.class.getClassLoader()).iterator();
+        while (iter.hasNext())
+        {
+            try
+            {
+                encoders.add(iter.next());
+            }
+            catch(Error|RuntimeException e)
+            {
+                LOG.debug(e);
+            }
+        }
+        // TODO avoid needing this catch all
+        if (encoders.size()==0)
+            encoders.add(new Http1FieldPreEncoder());
+        LOG.debug("HttpField encoders loaded: {}",encoders);
+        __encoders = encoders.toArray(new HttpFieldPreEncoder[encoders.size()]);
+    }
+    
+    private final byte[][] _encodedField=new byte[2][];
+
+    public PreEncodedHttpField(HttpHeader header,String name,String value)
+    {
+        super(header,name, value);
+        
+        for (HttpFieldPreEncoder e:__encoders)
+        {
+            _encodedField[e.getHttpVersion()==HttpVersion.HTTP_2?1:0]=e.getEncodedField(header,header.asString(),value);
+        }
+    }
+    
+    public PreEncodedHttpField(HttpHeader header,String value)
+    {
+        this(header,header.asString(),value);
+    }
+    
+    public PreEncodedHttpField(String name,String value)
+    {
+        this(null,name,value);
+    }
+    
+    public void putTo(ByteBuffer bufferInFillMode, HttpVersion version)
+    {
+        bufferInFillMode.put(_encodedField[version==HttpVersion.HTTP_2?1:0]);
+    }
+}
\ No newline at end of file
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/QuotedCSV.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/QuotedCSV.java
new file mode 100644
index 0000000000..8c9a779c41
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/QuotedCSV.java
@@ -0,0 +1,229 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+/* ------------------------------------------------------------ */
+/**
+ * Implements a quoted comma separated list of values
+ * in accordance with RFC7230.
+ * OWS is removed and quoted characters ignored for parsing.
+ * @see "https://tools.ietf.org/html/rfc7230#section-3.2.6"
+ * @see "https://tools.ietf.org/html/rfc7230#section-7"
+ */
+public class QuotedCSV implements Iterable<String>
+{    
+    private enum State { VALUE, PARAM_NAME, PARAM_VALUE};
+    
+    private final List<String> _values = new ArrayList<>();
+    private final boolean _keepQuotes;
+    
+    /* ------------------------------------------------------------ */
+    public QuotedCSV(String... values)
+    {
+        this(true,values);
+    }
+    
+    /* ------------------------------------------------------------ */
+    public QuotedCSV(boolean keepQuotes,String... values)
+    {
+        _keepQuotes=keepQuotes;
+        for (String v:values)
+            addValue(v);
+    }
+    
+    /* ------------------------------------------------------------ */
+    public void addValue(String value)
+    {
+        StringBuffer buffer = new StringBuffer();
+        
+        int l=value.length();
+        State state=State.VALUE;
+        boolean quoted=false;
+        boolean sloshed=false;
+        int nws_length=0;
+        int last_length=0;
+        for (int i=0;i<=l;i++)
+        {
+            char c=i==l?0:value.charAt(i);
+            
+            // Handle quoting https://tools.ietf.org/html/rfc7230#section-3.2.6
+            if (quoted && c!=0)
+            {
+                if (sloshed)
+                    sloshed=false;
+                else
+                {
+                    switch(c)
+                    {
+                        case '\\':
+                            sloshed=true;
+                            if (!_keepQuotes)
+                                continue;
+                            break;
+                        case '"':
+                            quoted=false;
+                            if (!_keepQuotes)
+                                continue;
+                            break;
+                    }
+                }
+
+                buffer.append(c);
+                nws_length=buffer.length();
+                continue;
+            }
+            
+            // Handle common cases
+            switch(c)
+            {
+                case ' ':
+                case '\t':
+                    if (buffer.length()>last_length) // not leading OWS
+                        buffer.append(c);
+                    continue;
+
+                case '"':
+                    quoted=true;
+                    if (_keepQuotes)
+                        buffer.append(c);
+                    nws_length=buffer.length();
+                    continue;
+                    
+                case ';':                    
+                    buffer.setLength(nws_length); // trim following OWS
+                    buffer.append(c);
+                    last_length=++nws_length;
+                    state=State.PARAM_NAME;
+                    continue;
+                    
+                case ',':
+                case 0:
+                    if (nws_length>0)
+                    {
+                        buffer.setLength(nws_length); // trim following OWS
+                        _values.add(buffer.toString());
+                    }
+                    buffer.setLength(0);
+                    last_length=0;
+                    nws_length=0;
+                    state=State.VALUE;
+                    continue;
+
+                default:
+                {
+                    switch (state)
+                    {
+                        case VALUE:
+                        {
+                            buffer.append(c);
+                            nws_length=buffer.length();
+                            continue;
+                        }
+
+                        case PARAM_NAME:
+                        {
+                            if (c=='=')
+                            {
+                                buffer.setLength(nws_length); // trim following OWS
+                                buffer.append(c);
+                                last_length=++nws_length;
+                                state=State.PARAM_VALUE;
+                                continue;
+                            }
+                            buffer.append(c);
+                            nws_length=buffer.length();
+
+                            continue;
+                        }
+
+                        case PARAM_VALUE:
+                        {
+                            buffer.append(c);
+                            nws_length=buffer.length();
+                            continue;
+                        }
+                    }
+                }
+            }  
+        }
+    }
+
+    public List<String> getValues()
+    {
+        return _values;
+    }
+    
+    @Override
+    public Iterator<String> iterator()
+    {
+        return _values.iterator();
+    }
+
+    public static String unquote(String s)
+    {
+        // handle trivial cases
+        int l=s.length();
+        if (s==null || l==0)
+            return s;
+        
+        // Look for any quotes
+        int i=0;
+        for (;i<l;i++)
+        {
+            char c=s.charAt(i);
+            if (c=='"')
+                break;
+        }
+        if (i==l)
+            return s;
+
+        boolean quoted=true;
+        boolean sloshed=false;
+        StringBuffer buffer = new StringBuffer();
+        buffer.append(s,0,i);
+        i++;
+        for (;i<l;i++)
+        {
+            char c=s.charAt(i);
+            if (quoted)
+            {
+                if (sloshed)
+                {
+                    buffer.append(c);
+                    sloshed=false;
+                }
+                else if (c=='"')
+                    quoted=false;
+                else if (c=='\\')
+                    sloshed=true;
+                else
+                    buffer.append(c);
+            }
+            else if (c=='"')
+                quoted=true;
+            else
+                buffer.append(c);
+        }
+        return buffer.toString();
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/QuotedQualityCSV.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/QuotedQualityCSV.java
new file mode 100644
index 0000000000..76da9bd832
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/QuotedQualityCSV.java
@@ -0,0 +1,252 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+/* ------------------------------------------------------------ */
+/**
+ * Implements a quoted comma separated list of quality values
+ * in accordance with RFC7230 and RFC7231.
+ * Values are returned sorted in quality order, with OWS and the 
+ * quality parameters removed.
+ * @see "https://tools.ietf.org/html/rfc7230#section-3.2.6"
+ * @see "https://tools.ietf.org/html/rfc7230#section-7"
+ * @see "https://tools.ietf.org/html/rfc7231#section-5.3.1"
+ */
+public class QuotedQualityCSV implements Iterable<String>
+{    
+    private final static Double ZERO=new Double(0.0);
+    private final static Double ONE=new Double(1.0);
+    private enum State { VALUE, PARAM_NAME, PARAM_VALUE, Q_VALUE};
+    
+    private final List<String> _values = new ArrayList<>();
+    private final List<Double> _quality = new ArrayList<>();
+    private boolean _sorted = false;
+    
+    /* ------------------------------------------------------------ */
+    public QuotedQualityCSV(String... values)
+    {
+        for (String v:values)
+            addValue(v);
+    }
+
+    
+    /* ------------------------------------------------------------ */
+    public void addValue(String value)
+    {
+        StringBuffer buffer = new StringBuffer();
+        
+        int l=value.length();
+        State state=State.VALUE;
+        boolean quoted=false;
+        boolean sloshed=false;
+        int nws_length=0;
+        int last_length=0;
+        Double q=ONE;
+        for (int i=0;i<=l;i++)
+        {
+            char c=i==l?0:value.charAt(i);
+            
+            // Handle quoting https://tools.ietf.org/html/rfc7230#section-3.2.6
+            if (quoted && c!=0)
+            {
+                if (sloshed)
+                    sloshed=false;
+                else
+                {
+                    switch(c)
+                    {
+                        case '\\':
+                            sloshed=true;
+                            break;
+                        case '"':
+                            quoted=false;
+                            if (state==State.Q_VALUE)
+                                continue;
+                            break;
+                    }
+                }
+
+                buffer.append(c);
+                nws_length=buffer.length();
+                continue;
+            }
+            
+            // Handle common cases
+            switch(c)
+            {
+                case ' ':
+                case '\t':
+                    if (buffer.length()>last_length) // not leading OWS
+                        buffer.append(c);
+                    continue;
+
+                case '"':
+                    quoted=true;
+                    if (state==State.Q_VALUE)
+                        continue;
+        
+                    buffer.append(c);
+                    nws_length=buffer.length();
+                    continue;
+                    
+                case ';':
+                    if (state==State.Q_VALUE)
+                    {
+                        try
+                        {
+                            q=new Double(buffer.substring(last_length));
+                        }
+                        catch(Exception e)
+                        {
+                            q=ZERO;
+                        }
+                        nws_length=last_length;
+                    }
+                    
+                    buffer.setLength(nws_length); // trim following OWS
+                    buffer.append(c);
+                    last_length=++nws_length;
+                    state=State.PARAM_NAME;
+                    continue;
+                    
+                case ',':
+                case 0:
+                    if (state==State.Q_VALUE)
+                    {
+                        try
+                        {
+                            q=new Double(buffer.substring(last_length));
+                        }
+                        catch(Exception e)
+                        {
+                            q=ZERO;
+                        }
+                        nws_length=last_length;
+                    }
+                    buffer.setLength(nws_length); // trim following OWS
+                    if (q>0.0 && nws_length>0)
+                    {
+                        _values.add(buffer.toString());
+                        _quality.add(q);
+                        _sorted=false;
+                    }
+                    buffer.setLength(0);
+                    last_length=0;
+                    nws_length=0;
+                    q=ONE;
+                    state=State.VALUE;
+                    continue;
+
+                default:
+                {
+                    switch (state)
+                    {
+                        case VALUE:
+                        {
+                            buffer.append(c);
+                            nws_length=buffer.length();
+                            continue;
+                        }
+
+                        case PARAM_NAME:
+                        {
+                            if (c=='=')
+                            {
+                                buffer.setLength(nws_length); // trim following OWS
+                                if (nws_length-last_length==1 && Character.toLowerCase(buffer.charAt(last_length))=='q')
+                                {
+                                    buffer.setLength(last_length-1);
+                                    nws_length=buffer.length();
+                                    last_length=nws_length;
+                                    state=State.Q_VALUE;
+                                    continue;
+                                }
+                                buffer.append(c);
+                                last_length=++nws_length;
+                                state=State.PARAM_VALUE;
+                                continue;
+                            }
+                            buffer.append(c);
+                            nws_length=buffer.length();
+                            continue;
+                        }
+
+                        case PARAM_VALUE:
+                        case Q_VALUE:
+                        {
+                            buffer.append(c);
+                            nws_length=buffer.length();
+                            continue;
+                        }
+                    }
+                }
+            }  
+        }
+    }
+
+    public List<String> getValues()
+    {
+        if (!_sorted)
+            sort();
+        return _values;
+    }
+    
+    @Override
+    public Iterator<String> iterator()
+    {
+        if (!_sorted)
+            sort();
+        return _values.iterator();
+    }
+
+    protected void sort()
+    {
+        _sorted=true;
+
+        Double last = ZERO;
+        int len = Integer.MIN_VALUE;
+
+        for (int i = _values.size(); i-- > 0;)
+        {
+            String v = _values.get(i);
+            Double q = _quality.get(i);
+
+            int compare=last.compareTo(q);
+            if (compare > 0  || (compare==0 && v.length()<len))
+            {
+                _values.set(i, _values.get(i + 1));
+                _values.set(i + 1, v);
+                _quality.set(i, _quality.get(i + 1));
+                _quality.set(i + 1, q);
+                last = ZERO;
+                len=0;
+                i = _values.size();
+                continue;
+            }
+
+            last=q;
+            len=v.length();
+
+        }
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/ResourceHttpContent.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/ResourceHttpContent.java
new file mode 100644
index 0000000000..7416c2c4ab
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/ResourceHttpContent.java
@@ -0,0 +1,227 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.nio.channels.ReadableByteChannel;
+
+import org.eclipse.jetty.http.MimeTypes.Type;
+import org.eclipse.jetty.util.BufferUtil;
+import org.eclipse.jetty.util.resource.Resource;
+
+
+/* ------------------------------------------------------------ */
+/** HttpContent created from a {@link Resource}.
+ * <p>The HttpContent is used to server static content that is not
+ * cached. So fields and values are only generated as need be an not 
+ * kept for reuse</p>
+ */
+public class ResourceHttpContent implements HttpContent
+{
+    final Resource _resource;
+    final String _contentType;
+    final int _maxBuffer;
+    HttpContent _gzip;
+    String _etag;
+
+    /* ------------------------------------------------------------ */
+    public ResourceHttpContent(final Resource resource, final String contentType)
+    {
+        this(resource,contentType,-1,null);
+    }
+
+    /* ------------------------------------------------------------ */
+    public ResourceHttpContent(final Resource resource, final String contentType, int maxBuffer)
+    {
+        this(resource,contentType,maxBuffer,null);
+    }
+    
+    /* ------------------------------------------------------------ */
+    public ResourceHttpContent(final Resource resource, final String contentType, int maxBuffer, HttpContent gzip)
+    {
+        _resource=resource;
+        _contentType=contentType;
+        _maxBuffer=maxBuffer;
+        _gzip=gzip;
+    }
+
+    /* ------------------------------------------------------------ */
+    @Override
+    public String getContentTypeValue()
+    {
+        return _contentType;
+    }
+    
+    /* ------------------------------------------------------------ */
+    @Override
+    public HttpField getContentType()
+    {
+        return _contentType==null?null:new HttpField(HttpHeader.CONTENT_TYPE,_contentType);
+    }
+
+    /* ------------------------------------------------------------ */
+    @Override
+    public HttpField getContentEncoding()
+    {
+        return null;
+    }
+
+    /* ------------------------------------------------------------ */
+    @Override
+    public String getContentEncodingValue()
+    {
+        return null;
+    }
+
+    /* ------------------------------------------------------------ */
+    @Override
+    public String getCharacterEncoding()
+    {
+        return _contentType==null?null:MimeTypes.getCharsetFromContentType(_contentType);
+    }
+
+    /* ------------------------------------------------------------ */
+    @Override
+    public Type getMimeType()
+    {
+        return _contentType==null?null:MimeTypes.CACHE.get(MimeTypes.getContentTypeWithoutCharset(_contentType));
+    }
+
+    /* ------------------------------------------------------------ */
+    @Override
+    public HttpField getLastModified()
+    {
+        long lm = _resource.lastModified();
+        return lm>=0?new HttpField(HttpHeader.LAST_MODIFIED,DateGenerator.formatDate(lm)):null;
+    }
+
+    /* ------------------------------------------------------------ */
+    @Override
+    public String getLastModifiedValue()
+    {
+        long lm = _resource.lastModified();
+        return lm>=0?DateGenerator.formatDate(lm):null;
+    }
+
+    /* ------------------------------------------------------------ */
+    @Override
+    public ByteBuffer getDirectBuffer()
+    {
+        if (_resource.length()<=0 || _maxBuffer>0 && _maxBuffer<_resource.length())
+            return null;
+        try
+        {
+            return BufferUtil.toBuffer(_resource,true);
+        }
+        catch(IOException e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+    
+    /* ------------------------------------------------------------ */
+    @Override
+    public HttpField getETag()
+    {
+        return new HttpField(HttpHeader.ETAG,getETagValue());
+    }
+    
+    /* ------------------------------------------------------------ */
+    @Override
+    public String getETagValue()
+    {
+        return _resource.getWeakETag();
+    }
+
+    /* ------------------------------------------------------------ */
+    @Override
+    public ByteBuffer getIndirectBuffer()
+    {
+        if (_resource.length()<=0 || _maxBuffer>0 && _maxBuffer<_resource.length())
+            return null;
+        try
+        {
+            return BufferUtil.toBuffer(_resource,false);
+        }
+        catch(IOException e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /* ------------------------------------------------------------ */
+    @Override
+    public HttpField getContentLength()
+    {
+        long l=_resource.length();
+        return l==-1?null:new HttpField.LongValueHttpField(HttpHeader.CONTENT_LENGTH,_resource.length());
+    }
+
+    /* ------------------------------------------------------------ */
+    @Override
+    public long getContentLengthValue()
+    {
+        return _resource.length();
+    }
+
+    /* ------------------------------------------------------------ */
+    @Override
+    public InputStream getInputStream() throws IOException
+    {
+        return _resource.getInputStream();
+    }
+    
+    /* ------------------------------------------------------------ */
+    @Override
+    public ReadableByteChannel getReadableByteChannel() throws IOException
+    {
+        return _resource.getReadableByteChannel();
+    }
+
+    /* ------------------------------------------------------------ */
+    @Override
+    public Resource getResource()
+    {
+        return _resource;
+    }
+
+    /* ------------------------------------------------------------ */
+    @Override
+    public void release()
+    {
+        _resource.close();
+    }
+    
+    /* ------------------------------------------------------------ */
+    @Override
+    public String toString()
+    {
+        return String.format("%s@%x{r=%s,gz=%b}",this.getClass().getSimpleName(),hashCode(),_resource,_gzip!=null);
+    }
+
+    /* ------------------------------------------------------------ */
+    @Override
+    public HttpContent getGzipContent()
+    {
+        return _gzip==null?null:new GzipHttpContent(this,_gzip);
+    }
+
+}
\ No newline at end of file
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/encoding.properties b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/encoding.properties
new file mode 100644
index 0000000000..04fe87e751
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/encoding.properties
@@ -0,0 +1,5 @@
+text/html=utf-8
+text/plain=iso-8859-1
+text/xml=utf-8
+text/json=utf-8
+application/xhtml+xml=utf-8
\ No newline at end of file
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/mime.properties b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/mime.properties
new file mode 100644
index 0000000000..0112b88a25
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/mime.properties
@@ -0,0 +1,189 @@
+ai=application/postscript
+aif=audio/x-aiff
+aifc=audio/x-aiff
+aiff=audio/x-aiff
+apk=application/vnd.android.package-archive
+asc=text/plain
+asf=video/x.ms.asf
+asx=video/x.ms.asx
+au=audio/basic
+avi=video/x-msvideo
+bcpio=application/x-bcpio
+bin=application/octet-stream
+bmp=image/bmp
+cab=application/x-cabinet
+cdf=application/x-netcdf
+chm=application/vnd.ms-htmlhelp
+class=application/java-vm
+cpio=application/x-cpio
+cpt=application/mac-compactpro
+crt=application/x-x509-ca-cert
+csh=application/x-csh
+css=text/css
+csv=text/csv
+dcr=application/x-director
+dir=application/x-director
+dll=application/x-msdownload
+dms=application/octet-stream
+doc=application/msword
+dtd=application/xml-dtd
+dvi=application/x-dvi
+dxr=application/x-director
+eps=application/postscript
+etx=text/x-setext
+exe=application/octet-stream
+ez=application/andrew-inset
+gif=image/gif
+gtar=application/x-gtar
+gz=application/gzip
+gzip=application/gzip
+hdf=application/x-hdf
+hqx=application/mac-binhex40
+htc=text/x-component
+htm=text/html
+html=text/html
+ice=x-conference/x-cooltalk
+ico=image/x-icon
+ief=image/ief
+iges=model/iges
+igs=model/iges
+jad=text/vnd.sun.j2me.app-descriptor
+jar=application/java-archive
+java=text/plain
+jnlp=application/x-java-jnlp-file
+jpe=image/jpeg
+jp2=image/jpeg2000
+jpeg=image/jpeg
+jpg=image/jpeg
+js=application/javascript
+json=application/json
+jsp=text/html
+kar=audio/midi
+latex=application/x-latex
+lha=application/octet-stream
+lzh=application/octet-stream
+man=application/x-troff-man
+mathml=application/mathml+xml
+me=application/x-troff-me
+mesh=model/mesh
+mid=audio/midi
+midi=audio/midi
+mif=application/vnd.mif
+mol=chemical/x-mdl-molfile
+mov=video/quicktime
+movie=video/x-sgi-movie
+mp2=audio/mpeg
+mp3=audio/mpeg
+mpe=video/mpeg
+mpeg=video/mpeg
+mpg=video/mpeg
+mpga=audio/mpeg
+ms=application/x-troff-ms
+msh=model/mesh
+msi=application/octet-stream
+nc=application/x-netcdf
+oda=application/oda
+odb=application/vnd.oasis.opendocument.database
+odc=application/vnd.oasis.opendocument.chart
+odf=application/vnd.oasis.opendocument.formula
+odg=application/vnd.oasis.opendocument.graphics
+odi=application/vnd.oasis.opendocument.image
+odm=application/vnd.oasis.opendocument.text-master
+odp=application/vnd.oasis.opendocument.presentation
+ods=application/vnd.oasis.opendocument.spreadsheet
+odt=application/vnd.oasis.opendocument.text
+ogg=application/ogg
+otc=application/vnd.oasis.opendocument.chart-template
+otf=application/vnd.oasis.opendocument.formula-template
+otg=application/vnd.oasis.opendocument.graphics-template
+oth=application/vnd.oasis.opendocument.text-web
+oti=application/vnd.oasis.opendocument.image-template
+otp=application/vnd.oasis.opendocument.presentation-template
+ots=application/vnd.oasis.opendocument.spreadsheet-template
+ott=application/vnd.oasis.opendocument.text-template
+pbm=image/x-portable-bitmap
+pdb=chemical/x-pdb
+pdf=application/pdf
+pgm=image/x-portable-graymap
+pgn=application/x-chess-pgn
+png=image/png
+pnm=image/x-portable-anymap
+ppm=image/x-portable-pixmap
+pps=application/vnd.ms-powerpoint
+ppt=application/vnd.ms-powerpoint
+ps=application/postscript
+qml=text/x-qml
+qt=video/quicktime
+ra=audio/x-pn-realaudio
+rar=application/x-rar-compressed
+ram=audio/x-pn-realaudio
+ras=image/x-cmu-raster
+rdf=application/rdf+xml
+rgb=image/x-rgb
+rm=audio/x-pn-realaudio
+roff=application/x-troff
+rpm=application/x-rpm
+rtf=application/rtf
+rtx=text/richtext
+rv=video/vnd.rn-realvideo
+ser=application/java-serialized-object
+sgm=text/sgml
+sgml=text/sgml
+sh=application/x-sh
+shar=application/x-shar
+silo=model/mesh
+sit=application/x-stuffit
+skd=application/x-koan
+skm=application/x-koan
+skp=application/x-koan
+skt=application/x-koan
+smi=application/smil
+smil=application/smil
+snd=audio/basic
+spl=application/x-futuresplash
+src=application/x-wais-source
+sv4cpio=application/x-sv4cpio
+sv4crc=application/x-sv4crc
+svg=image/svg+xml
+svgz=image/svg+xml
+swf=application/x-shockwave-flash
+t=application/x-troff
+tar=application/x-tar
+tar.gz=application/x-gtar
+tcl=application/x-tcl
+tex=application/x-tex
+texi=application/x-texinfo
+texinfo=application/x-texinfo
+tgz=application/x-gtar
+tif=image/tiff
+tiff=image/tiff
+tr=application/x-troff
+tsv=text/tab-separated-values
+txt=text/plain
+ustar=application/x-ustar
+vcd=application/x-cdlink
+vrml=model/vrml
+vxml=application/voicexml+xml
+wav=audio/x-wav
+wbmp=image/vnd.wap.wbmp
+wml=text/vnd.wap.wml
+wmlc=application/vnd.wap.wmlc
+wmls=text/vnd.wap.wmlscript
+wmlsc=application/vnd.wap.wmlscriptc
+wrl=model/vrml
+wtls-ca-certificate=application/vnd.wap.wtls-ca-certificate
+xbm=image/x-xbitmap
+xcf=image/xcf
+xht=application/xhtml+xml
+xhtml=application/xhtml+xml
+xls=application/vnd.ms-excel
+xml=application/xml
+xpm=image/x-xpixmap
+xsd=application/xml
+xsl=application/xml
+xslt=application/xslt+xml
+xul=application/vnd.mozilla.xul+xml
+xwd=image/x-xwindowdump
+xyz=chemical/x-xyz
+z=application/compress
+zip=application/zip
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/package-info.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/package-info.java
new file mode 100644
index 0000000000..aeca4a3f2a
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/package-info.java
@@ -0,0 +1,23 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+/**
+ * Jetty Http : Tools for Http processing
+ */
+package org.eclipse.jetty.http;
+
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/MappedResource.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/MappedResource.java
new file mode 100644
index 0000000000..155dce8b8b
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/MappedResource.java
@@ -0,0 +1,101 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http.pathmap;
+
+import org.eclipse.jetty.util.annotation.ManagedAttribute;
+import org.eclipse.jetty.util.annotation.ManagedObject;
+
+@ManagedObject("Mapped Resource")
+public class MappedResource<E> implements Comparable<MappedResource<E>>
+{
+    private final PathSpec pathSpec;
+    private final E resource;
+
+    public MappedResource(PathSpec pathSpec, E resource)
+    {
+        this.pathSpec = pathSpec;
+        this.resource = resource;
+    }
+
+    /**
+     * Comparison is based solely on the pathSpec
+     */
+    @Override
+    public int compareTo(MappedResource<E> other)
+    {
+        return this.pathSpec.compareTo(other.pathSpec);
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj)
+        {
+            return true;
+        }
+        if (obj == null)
+        {
+            return false;
+        }
+        if (getClass() != obj.getClass())
+        {
+            return false;
+        }
+        MappedResource<?> other = (MappedResource<?>)obj;
+        if (pathSpec == null)
+        {
+            if (other.pathSpec != null)
+            {
+                return false;
+            }
+        }
+        else if (!pathSpec.equals(other.pathSpec))
+        {
+            return false;
+        }
+        return true;
+    }
+
+    @ManagedAttribute(value = "path spec", readonly = true)
+    public PathSpec getPathSpec()
+    {
+        return pathSpec;
+    }
+
+    @ManagedAttribute(value = "resource", readonly = true)
+    public E getResource()
+    {
+        return resource;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        final int prime = 31;
+        int result = 1;
+        result = (prime * result) + ((pathSpec == null) ? 0 : pathSpec.hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString()
+    {
+        return String.format("MappedResource[pathSpec=%s,resource=%s]",pathSpec,resource);
+    }
+}
\ No newline at end of file
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/PathMappings.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/PathMappings.java
new file mode 100644
index 0000000000..d1c36cfbd6
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/PathMappings.java
@@ -0,0 +1,159 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http.pathmap;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.jetty.util.annotation.ManagedAttribute;
+import org.eclipse.jetty.util.annotation.ManagedObject;
+import org.eclipse.jetty.util.component.ContainerLifeCycle;
+import org.eclipse.jetty.util.component.Dumpable;
+import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.util.log.Logger;
+
+/**
+ * Path Mappings of PathSpec to Resource.
+ * <p>
+ * Sorted into search order upon entry into the Set
+ * 
+ * @param <E> the type of mapping endpoint
+ */
+@ManagedObject("Path Mappings")
+public class PathMappings<E> implements Iterable<MappedResource<E>>, Dumpable
+{
+    private static final Logger LOG = Log.getLogger(PathMappings.class);
+    private List<MappedResource<E>> mappings = new ArrayList<MappedResource<E>>();
+    private MappedResource<E> defaultResource = null;
+    private MappedResource<E> rootResource = null;
+
+    @Override
+    public String dump()
+    {
+        return ContainerLifeCycle.dump(this);
+    }
+
+    @Override
+    public void dump(Appendable out, String indent) throws IOException
+    {
+        ContainerLifeCycle.dump(out,indent,mappings);
+    }
+
+    @ManagedAttribute(value = "mappings", readonly = true)
+    public List<MappedResource<E>> getMappings()
+    {
+        return mappings;
+    }
+
+    public void reset()
+    {
+        mappings.clear();
+    }
+    
+    /**
+     * Return a list of MappedResource matches for the specified path.
+     * 
+     * @param path the path to return matches on
+     * @return the list of mapped resource the path matches on
+     */
+    public List<MappedResource<E>> getMatches(String path)
+    {
+        boolean matchRoot = "/".equals(path);
+        
+        List<MappedResource<E>> ret = new ArrayList<>();
+        int len = mappings.size();
+        for (int i = 0; i < len; i++)
+        {
+            MappedResource<E> mr = mappings.get(i);
+
+            switch (mr.getPathSpec().group)
+            {
+                case ROOT:
+                    if (matchRoot)
+                        ret.add(mr);
+                    break;
+                case DEFAULT:
+                    if (matchRoot || mr.getPathSpec().matches(path))
+                        ret.add(mr);
+                    break;
+                default:
+                    if (mr.getPathSpec().matches(path))
+                        ret.add(mr);
+                    break;
+            }
+        }
+        return ret;
+    }
+
+    public MappedResource<E> getMatch(String path)
+    {
+        if (path.equals("/") && rootResource != null)
+        {
+            return rootResource;
+        }
+        
+        int len = mappings.size();
+        for (int i = 0; i < len; i++)
+        {
+            MappedResource<E> mr = mappings.get(i);
+            if (mr.getPathSpec().matches(path))
+            {
+                return mr;
+            }
+        }
+        return defaultResource;
+    }
+
+    @Override
+    public Iterator<MappedResource<E>> iterator()
+    {
+        return mappings.iterator();
+    }
+
+    @SuppressWarnings("incomplete-switch")
+    public void put(PathSpec pathSpec, E resource)
+    {
+        MappedResource<E> entry = new MappedResource<>(pathSpec,resource);
+        switch (pathSpec.group)
+        {
+            case DEFAULT:
+                defaultResource = entry;
+                break;
+            case ROOT:
+                rootResource = entry;
+                break;
+        }
+        
+        // TODO: add warning when replacing an existing pathspec?
+        
+        mappings.add(entry);
+        if (LOG.isDebugEnabled())
+            LOG.debug("Added {} to {}",entry,this);
+        Collections.sort(mappings);
+    }
+
+    @Override
+    public String toString()
+    {
+        return String.format("%s[size=%d]",this.getClass().getSimpleName(),mappings.size());
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/PathSpec.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/PathSpec.java
new file mode 100644
index 0000000000..a2b8ea56cf
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/PathSpec.java
@@ -0,0 +1,167 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http.pathmap;
+
+/**
+ * The base PathSpec, what all other path specs are based on
+ */
+public abstract class PathSpec implements Comparable<PathSpec>
+{
+    protected String pathSpec;
+    protected PathSpecGroup group;
+    protected int pathDepth;
+    protected int specLength;
+
+    @Override
+    public int compareTo(PathSpec other)
+    {
+        // Grouping (increasing)
+        int diff = this.group.ordinal() - other.group.ordinal();
+        if (diff != 0)
+        {
+            return diff;
+        }
+
+        // Spec Length (decreasing)
+        diff = other.specLength - this.specLength;
+        if (diff != 0)
+        {
+            return diff;
+        }
+
+        // Path Spec Name (alphabetical)
+        return this.pathSpec.compareTo(other.pathSpec);
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (this == obj)
+        {
+            return true;
+        }
+        if (obj == null)
+        {
+            return false;
+        }
+        if (getClass() != obj.getClass())
+        {
+            return false;
+        }
+        PathSpec other = (PathSpec)obj;
+        if (pathSpec == null)
+        {
+            if (other.pathSpec != null)
+            {
+                return false;
+            }
+        }
+        else if (!pathSpec.equals(other.pathSpec))
+        {
+            return false;
+        }
+        return true;
+    }
+
+    public PathSpecGroup getGroup()
+    {
+        return group;
+    }
+
+    /**
+     * Get the number of path elements that this path spec declares.
+     * <p>
+     * This is used to determine longest match logic.
+     * 
+     * @return the depth of the path segments that this spec declares
+     */
+    public int getPathDepth()
+    {
+        return pathDepth;
+    }
+
+    /**
+     * Return the portion of the path that is after the path spec.
+     * 
+     * @param path
+     *            the path to match against
+     * @return the path info portion of the string
+     */
+    public abstract String getPathInfo(String path);
+
+    /**
+     * Return the portion of the path that matches a path spec.
+     * 
+     * @param path
+     *            the path to match against
+     * @return the match, or null if no match at all
+     */
+    public abstract String getPathMatch(String path);
+
+    /**
+     * The as-provided path spec.
+     * 
+     * @return the as-provided path spec
+     */
+    public String getDeclaration()
+    {
+        return pathSpec;
+    }
+
+    /**
+     * Get the relative path.
+     * 
+     * @param base
+     *            the base the path is relative to
+     * @param path
+     *            the additional path
+     * @return the base plus path with pathSpec portion removed
+     */
+    public abstract String getRelativePath(String base, String path);
+
+    @Override
+    public int hashCode()
+    {
+        final int prime = 31;
+        int result = 1;
+        result = (prime * result) + ((pathSpec == null)?0:pathSpec.hashCode());
+        return result;
+    }
+
+    /**
+     * Test to see if the provided path matches this path spec
+     * 
+     * @param path
+     *            the path to test
+     * @return true if the path matches this path spec, false otherwise
+     */
+    public abstract boolean matches(String path);
+
+    @Override
+    public String toString()
+    {
+        StringBuilder str = new StringBuilder();
+        str.append(this.getClass().getSimpleName()).append("[\"");
+        str.append(pathSpec);
+        str.append("\",pathDepth=").append(pathDepth);
+        str.append(",group=").append(group);
+        str.append("]");
+        return str.toString();
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/PathSpecGroup.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/PathSpecGroup.java
new file mode 100644
index 0000000000..f9d96ced22
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/PathSpecGroup.java
@@ -0,0 +1,101 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http.pathmap;
+
+/**
+ * Types of path spec groups.
+ * <p>
+ * This is used to facilitate proper pathspec search order.
+ * <p>
+ * Search Order: 
+ * <ol>
+ * <li>{@link PathSpecGroup#ordinal()} [increasing]</li>
+ * <li>{@link PathSpec#specLength} [decreasing]</li>
+ * <li>{@link PathSpec#pathSpec} [natural sort order]</li>
+ * </ol>
+ */
+public enum PathSpecGroup
+{
+    // NOTE: Order of enums determines order of Groups.
+
+    /**
+     * For exactly defined path specs, no glob.
+     */
+    EXACT,
+    /**
+     * For path specs that have a hardcoded prefix and suffix with wildcard glob in the middle.
+     * 
+     * <pre>
+     *   "^/downloads/[^/]*.zip$"  - regex spec
+     *   "/a/{var}/c"              - uri-template spec
+     * </pre>
+     * 
+     * Note: there is no known servlet spec variant of this kind of path spec
+     */
+    MIDDLE_GLOB,
+    /**
+     * For path specs that have a hardcoded prefix and a trailing wildcard glob.
+     * <p>
+     * 
+     * <pre>
+     *   "/downloads/*"          - servlet spec
+     *   "/api/*"                - servlet spec
+     *   "^/rest/.*$"            - regex spec
+     *   "/bookings/{guest-id}"  - uri-template spec
+     *   "/rewards/{vip-level}"  - uri-template spec
+     * </pre>
+     */
+    PREFIX_GLOB,
+    /**
+     * For path specs that have a wildcard glob with a hardcoded suffix
+     * 
+     * <pre>
+     *   "*.do"        - servlet spec
+     *   "*.css"       - servlet spec
+     *   "^.*\.zip$"   - regex spec
+     * </pre>
+     * 
+     * Note: there is no known uri-template spec variant of this kind of path spec
+     */
+    SUFFIX_GLOB,
+    /**
+     * The root spec for accessing the Root behavior.
+     * 
+     * <pre>
+     *   ""           - servlet spec       (Root Servlet)
+     *   null         - servlet spec       (Root Servlet)
+     * </pre>
+     * 
+     * Note: there is no known uri-template spec variant of this kind of path spec
+     */
+    ROOT,
+    /**
+     * The default spec for accessing the Default path behavior.
+     * 
+     * <pre>
+     *   "/"           - servlet spec      (Default Servlet)
+     *   "/"           - uri-template spec (Root Context)
+     *   "^/$"         - regex spec        (Root Context)
+     * </pre>
+     * 
+     * Per Servlet Spec, pathInfo is always null for these specs.
+     * If nothing above matches, then default will match.
+     */
+    DEFAULT,
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/PathSpecSet.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/PathSpecSet.java
new file mode 100644
index 0000000000..c1a3235472
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/PathSpecSet.java
@@ -0,0 +1,222 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http.pathmap;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.function.Predicate;
+
+/**
+ * A Set of PathSpec strings.
+ * <p>
+ * Used by {@link org.eclipse.jetty.util.IncludeExclude} logic
+ */
+public class PathSpecSet implements Set<String>, Predicate<String>
+{
+    private final Set<PathSpec> specs = new TreeSet<>();
+
+    @Override
+    public boolean test(String s)
+    {
+        for (PathSpec spec : specs)
+        {
+            if (spec.matches(s))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean isEmpty()
+    {
+        return specs.isEmpty();
+    }
+
+    @Override
+    public Iterator<String> iterator()
+    {
+        return new Iterator<String>()
+        {
+            private Iterator<PathSpec> iter = specs.iterator();
+
+            @Override
+            public boolean hasNext()
+            {
+                return iter.hasNext();
+            }
+
+            @Override
+            public String next()
+            {
+                PathSpec spec = iter.next();
+                if (spec == null)
+                {
+                    return null;
+                }
+                return spec.getDeclaration();
+            }
+
+            @Override
+            public void remove()
+            {
+                throw new UnsupportedOperationException("Remove not supported by this Iterator");
+            }
+        };
+    }
+
+    @Override
+    public int size()
+    {
+        return specs.size();
+    }
+
+    @Override
+    public boolean contains(Object o)
+    {
+        if (o instanceof PathSpec)
+        {
+            return specs.contains(o);
+        }
+        if (o instanceof String)
+        {
+            return specs.contains(toPathSpec((String)o));
+        }
+        return false;
+    }
+
+    private PathSpec asPathSpec(Object o)
+    {
+        if (o == null)
+        {
+            return null;
+        }
+        if (o instanceof PathSpec)
+        {
+            return (PathSpec)o;
+        }
+        if (o instanceof String)
+        {
+            return toPathSpec((String)o);
+        }
+        return toPathSpec(o.toString());
+    }
+
+    private PathSpec toPathSpec(String rawSpec)
+    {
+        if ((rawSpec == null) || (rawSpec.length() < 1))
+        {
+            throw new RuntimeException("Path Spec String must start with '^', '/', or '*.': got [" + rawSpec + "]");
+        }
+        if (rawSpec.charAt(0) == '^')
+        {
+            return new RegexPathSpec(rawSpec);
+        }
+        else
+        {
+            return new ServletPathSpec(rawSpec);
+        }
+    }
+
+    @Override
+    public Object[] toArray()
+    {
+        return toArray(new String[specs.size()]);
+    }
+
+    @Override
+    public <T> T[] toArray(T[] a)
+    {
+        int i = 0;
+        for (PathSpec spec : specs)
+        {
+            a[i++] = (T)spec.getDeclaration();
+        }
+        return a;
+    }
+
+    @Override
+    public boolean add(String e)
+    {
+        return specs.add(toPathSpec(e));
+    }
+
+    @Override
+    public boolean remove(Object o)
+    {
+        return specs.remove(asPathSpec(o));
+    }
+
+    @Override
+    public boolean containsAll(Collection<?> coll)
+    {
+        for (Object o : coll)
+        {
+            if (!specs.contains(asPathSpec(o)))
+                return false;
+        }
+        return true;
+    }
+
+    @Override
+    public boolean addAll(Collection<? extends String> coll)
+    {
+        boolean ret = false;
+
+        for (String s : coll)
+        {
+            ret |= add(s);
+        }
+
+        return ret;
+    }
+
+    @Override
+    public boolean retainAll(Collection<?> coll)
+    {
+        List<PathSpec> collSpecs = new ArrayList<>();
+        for (Object o : coll)
+        {
+            collSpecs.add(asPathSpec(o));
+        }
+        return specs.retainAll(collSpecs);
+    }
+
+    @Override
+    public boolean removeAll(Collection<?> coll)
+    {
+        List<PathSpec> collSpecs = new ArrayList<>();
+        for (Object o : coll)
+        {
+            collSpecs.add(asPathSpec(o));
+        }
+        return specs.removeAll(collSpecs);
+    }
+
+    @Override
+    public void clear()
+    {
+        specs.clear();
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/RegexPathSpec.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/RegexPathSpec.java
new file mode 100644
index 0000000000..0d83f3b000
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/RegexPathSpec.java
@@ -0,0 +1,176 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http.pathmap;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class RegexPathSpec extends PathSpec
+{
+    protected Pattern pattern;
+
+    protected RegexPathSpec()
+    {
+        super();
+    }
+
+    public RegexPathSpec(String regex)
+    {
+        super.pathSpec = regex;
+        boolean inGrouping = false;
+        this.pathDepth = 0;
+        this.specLength = pathSpec.length();
+        // build up a simple signature we can use to identify the grouping
+        StringBuilder signature = new StringBuilder();
+        for (char c : pathSpec.toCharArray())
+        {
+            switch (c)
+            {
+                case '[':
+                    inGrouping = true;
+                    break;
+                case ']':
+                    inGrouping = false;
+                    signature.append('g'); // glob
+                    break;
+                case '*':
+                    signature.append('g'); // glob
+                    break;
+                case '/':
+                    if (!inGrouping)
+                    {
+                        this.pathDepth++;
+                    }
+                    break;
+                default:
+                    if (!inGrouping)
+                    {
+                        if (Character.isLetterOrDigit(c))
+                        {
+                            signature.append('l'); // literal (exact)
+                        }
+                    }
+                    break;
+            }
+        }
+        this.pattern = Pattern.compile(pathSpec);
+
+        // Figure out the grouping based on the signature
+        String sig = signature.toString();
+
+        if (Pattern.matches("^l*$",sig))
+        {
+            this.group = PathSpecGroup.EXACT;
+        }
+        else if (Pattern.matches("^l*g+",sig))
+        {
+            this.group = PathSpecGroup.PREFIX_GLOB;
+        }
+        else if (Pattern.matches("^g+l+$",sig))
+        {
+            this.group = PathSpecGroup.SUFFIX_GLOB;
+        }
+        else
+        {
+            this.group = PathSpecGroup.MIDDLE_GLOB;
+        }
+    }
+
+    public Matcher getMatcher(String path)
+    {
+        return this.pattern.matcher(path);
+    }
+
+    @Override
+    public String getPathInfo(String path)
+    {
+        // Path Info only valid for PREFIX_GLOB types
+        if (group == PathSpecGroup.PREFIX_GLOB)
+        {
+            Matcher matcher = getMatcher(path);
+            if (matcher.matches())
+            {
+                if (matcher.groupCount() >= 1)
+                {
+                    String pathInfo = matcher.group(1);
+                    if ("".equals(pathInfo))
+                    {
+                        return "/";
+                    }
+                    else
+                    {
+                        return pathInfo;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public String getPathMatch(String path)
+    {
+        Matcher matcher = getMatcher(path);
+        if (matcher.matches())
+        {
+            if (matcher.groupCount() >= 1)
+            {
+                int idx = matcher.start(1);
+                if (idx > 0)
+                {
+                    if (path.charAt(idx - 1) == '/')
+                    {
+                        idx--;
+                    }
+                    return path.substring(0,idx);
+                }
+            }
+            return path;
+        }
+        return null;
+    }
+
+    public Pattern getPattern()
+    {
+        return this.pattern;
+    }
+
+    @Override
+    public String getRelativePath(String base, String path)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public boolean matches(final String path)
+    {
+        int idx = path.indexOf('?');
+        if (idx >= 0)
+        {
+            // match only non-query part
+            return getMatcher(path.substring(0,idx)).matches();
+        }
+        else
+        {
+            // match entire path
+            return getMatcher(path).matches();
+        }
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/ServletPathSpec.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/ServletPathSpec.java
new file mode 100644
index 0000000000..4563305659
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/ServletPathSpec.java
@@ -0,0 +1,261 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http.pathmap;
+
+import org.eclipse.jetty.util.URIUtil;
+
+public class ServletPathSpec extends PathSpec
+{
+    public ServletPathSpec(String servletPathSpec)
+    {
+        super();
+        assertValidServletPathSpec(servletPathSpec);
+
+        // The Root Path Spec
+        if ((servletPathSpec == null) || (servletPathSpec.length() == 0))
+        {
+            super.pathSpec = "";
+            super.pathDepth = -1; // force this to be at the end of the sort order
+            this.specLength = 1;
+            this.group = PathSpecGroup.ROOT;
+            return;
+        }
+
+        // The Default Path Spec
+        if("/".equals(servletPathSpec))
+        {
+            super.pathSpec = "/";
+            super.pathDepth = -1; // force this to be at the end of the sort order
+            this.specLength = 1;
+            this.group = PathSpecGroup.DEFAULT;
+            return;
+        }
+        
+        this.specLength = servletPathSpec.length();
+        super.pathDepth = 0;
+        char lastChar = servletPathSpec.charAt(specLength - 1);
+        // prefix based
+        if ((servletPathSpec.charAt(0) == '/') && (specLength > 1) && (lastChar == '*'))
+        {
+            this.group = PathSpecGroup.PREFIX_GLOB;
+        }
+        // suffix based
+        else if (servletPathSpec.charAt(0) == '*')
+        {
+            this.group = PathSpecGroup.SUFFIX_GLOB;
+        }
+        else
+        {
+            this.group = PathSpecGroup.EXACT;
+        }
+
+        for (int i = 0; i < specLength; i++)
+        {
+            int cp = servletPathSpec.codePointAt(i);
+            if (cp < 128)
+            {
+                char c = (char)cp;
+                switch (c)
+                {
+                    case '/':
+                        super.pathDepth++;
+                        break;
+                }
+            }
+        }
+
+        super.pathSpec = servletPathSpec;
+    }
+
+    private void assertValidServletPathSpec(String servletPathSpec)
+    {
+        if ((servletPathSpec == null) || servletPathSpec.equals(""))
+        {
+            return; // empty path spec
+        }
+
+        int len = servletPathSpec.length();
+        // path spec must either start with '/' or '*.'
+        if (servletPathSpec.charAt(0) == '/')
+        {
+            // Prefix Based
+            if (len == 1)
+            {
+                return; // simple '/' path spec
+            }
+            int idx = servletPathSpec.indexOf('*');
+            if (idx < 0)
+            {
+                return; // no hit on glob '*'
+            }
+            // only allowed to have '*' at the end of the path spec
+            if (idx != (len - 1))
+            {
+                throw new IllegalArgumentException("Servlet Spec 12.2 violation: glob '*' can only exist at end of prefix based matches: bad spec \""+ servletPathSpec +"\"");
+            }
+        }
+        else if (servletPathSpec.startsWith("*."))
+        {
+            // Suffix Based
+            int idx = servletPathSpec.indexOf('/');
+            // cannot have path separator
+            if (idx >= 0)
+            {
+                throw new IllegalArgumentException("Servlet Spec 12.2 violation: suffix based path spec cannot have path separators: bad spec \""+ servletPathSpec +"\"");
+            }
+
+            idx = servletPathSpec.indexOf('*',2);
+            // only allowed to have 1 glob '*', at the start of the path spec
+            if (idx >= 1)
+            {
+                throw new IllegalArgumentException("Servlet Spec 12.2 violation: suffix based path spec cannot have multiple glob '*': bad spec \""+ servletPathSpec +"\"");
+            }
+        }
+        else
+        {
+            throw new IllegalArgumentException("Servlet Spec 12.2 violation: path spec must start with \"/\" or \"*.\": bad spec \""+ servletPathSpec +"\"");
+        }
+    }
+
+    @Override
+    public String getPathInfo(String path)
+    {
+        // Path Info only valid for PREFIX_GLOB types
+        if (group == PathSpecGroup.PREFIX_GLOB)
+        {
+            if (path.length() == (specLength - 2))
+            {
+                return null;
+            }
+            return path.substring(specLength - 2);
+        }
+
+        return null;
+    }
+
+    @Override
+    public String getPathMatch(String path)
+    {
+        switch (group)
+        {
+            case EXACT:
+                if (pathSpec.equals(path))
+                {
+                    return path;
+                }
+                else
+                {
+                    return null;
+                }
+            case PREFIX_GLOB:
+                if (isWildcardMatch(path))
+                {
+                    return path.substring(0,specLength - 2);
+                }
+                else
+                {
+                    return null;
+                }
+            case SUFFIX_GLOB:
+                if (path.regionMatches(path.length() - (specLength - 1),pathSpec,1,specLength - 1))
+                {
+                    return path;
+                }
+                else
+                {
+                    return null;
+                }
+            case DEFAULT:
+                return path;
+            default:
+                return null;
+        }
+    }
+
+    @Override
+    public String getRelativePath(String base, String path)
+    {
+        String info = getPathInfo(path);
+        if (info == null)
+        {
+            info = path;
+        }
+
+        if (info.startsWith("./"))
+        {
+            info = info.substring(2);
+        }
+        if (base.endsWith(URIUtil.SLASH))
+        {
+            if (info.startsWith(URIUtil.SLASH))
+            {
+                path = base + info.substring(1);
+            }
+            else
+            {
+                path = base + info;
+            }
+        }
+        else if (info.startsWith(URIUtil.SLASH))
+        {
+            path = base + info;
+        }
+        else
+        {
+            path = base + URIUtil.SLASH + info;
+        }
+        return path;
+    }
+
+    private boolean isWildcardMatch(String path)
+    {
+        // For a spec of "/foo/*" match "/foo" , "/foo/..." but not "/foobar"
+        int cpl = specLength - 2;
+        if ((group == PathSpecGroup.PREFIX_GLOB) && (path.regionMatches(0,pathSpec,0,cpl)))
+        {
+            if ((path.length() == cpl) || ('/' == path.charAt(cpl)))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean matches(String path)
+    {
+        switch (group)
+        {
+            case EXACT:
+                return pathSpec.equals(path);
+            case PREFIX_GLOB:
+                return isWildcardMatch(path);
+            case SUFFIX_GLOB:
+                return path.regionMatches((path.length() - specLength) + 1,pathSpec,1,specLength - 1);
+            case ROOT:
+                // Only "/" matches
+                return ("/".equals(path));
+            case DEFAULT:
+                // If we reached this point, then everything matches
+                return true;
+            default:
+                return false;
+        }
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/UriTemplatePathSpec.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/UriTemplatePathSpec.java
new file mode 100644
index 0000000000..208820b6e3
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http/pathmap/UriTemplatePathSpec.java
@@ -0,0 +1,341 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http.pathmap;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.jetty.util.TypeUtil;
+import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.util.log.Logger;
+
+/**
+ * PathSpec for URI Template based declarations
+ * 
+ * @see <a href="https://tools.ietf.org/html/rfc6570">URI Templates (Level 1)</a>
+ */
+public class UriTemplatePathSpec extends RegexPathSpec
+{
+    private static final Logger LOG = Log.getLogger(UriTemplatePathSpec.class);
+    
+    private static final Pattern VARIABLE_PATTERN = Pattern.compile("\\{(.*)\\}");
+    /** Reserved Symbols in URI Template variable */
+    private static final String VARIABLE_RESERVED = ":/?#[]@" + // gen-delims
+                                                    "!$&'()*+,;="; // sub-delims
+    /** Allowed Symbols in a URI Template variable */
+    private static final String VARIABLE_SYMBOLS="-._";
+    private static final Set<String> FORBIDDEN_SEGMENTS;
+
+    static
+    {
+        FORBIDDEN_SEGMENTS = new HashSet<>();
+        FORBIDDEN_SEGMENTS.add("/./");
+        FORBIDDEN_SEGMENTS.add("/../");
+        FORBIDDEN_SEGMENTS.add("//");
+    }
+
+    private String variables[];
+
+    public UriTemplatePathSpec(String rawSpec)
+    {
+        super();
+        Objects.requireNonNull(rawSpec,"Path Param Spec cannot be null");
+
+        if ("".equals(rawSpec) || "/".equals(rawSpec))
+        {
+            super.pathSpec = "/";
+            super.pattern = Pattern.compile("^/$");
+            super.pathDepth = 1;
+            this.specLength = 1;
+            this.variables = new String[0];
+            this.group = PathSpecGroup.EXACT;
+            return;
+        }
+
+        if (rawSpec.charAt(0) != '/')
+        {
+            // path specs must start with '/'
+            StringBuilder err = new StringBuilder();
+            err.append("Syntax Error: path spec \"");
+            err.append(rawSpec);
+            err.append("\" must start with '/'");
+            throw new IllegalArgumentException(err.toString());
+        }
+
+        for (String forbidden : FORBIDDEN_SEGMENTS)
+        {
+            if (rawSpec.contains(forbidden))
+            {
+                StringBuilder err = new StringBuilder();
+                err.append("Syntax Error: segment ");
+                err.append(forbidden);
+                err.append(" is forbidden in path spec: ");
+                err.append(rawSpec);
+                throw new IllegalArgumentException(err.toString());
+            }
+        }
+
+        this.pathSpec = rawSpec;
+
+        StringBuilder regex = new StringBuilder();
+        regex.append('^');
+
+        List<String> varNames = new ArrayList<>();
+        // split up into path segments (ignoring the first slash that will always be empty)
+        String segments[] = rawSpec.substring(1).split("/");
+        char segmentSignature[] = new char[segments.length];
+        this.pathDepth = segments.length;
+        for (int i = 0; i < segments.length; i++)
+        {
+            String segment = segments[i];
+            Matcher mat = VARIABLE_PATTERN.matcher(segment);
+
+            if (mat.matches())
+            {
+                // entire path segment is a variable.
+                String variable = mat.group(1);
+                if (varNames.contains(variable))
+                {
+                    // duplicate variable names
+                    StringBuilder err = new StringBuilder();
+                    err.append("Syntax Error: variable ");
+                    err.append(variable);
+                    err.append(" is duplicated in path spec: ");
+                    err.append(rawSpec);
+                    throw new IllegalArgumentException(err.toString());
+                }
+
+                assertIsValidVariableLiteral(variable);
+
+                segmentSignature[i] = 'v'; // variable
+                // valid variable name
+                varNames.add(variable);
+                // build regex
+                regex.append("/([^/]+)");
+            }
+            else if (mat.find(0))
+            {
+                // variable exists as partial segment
+                StringBuilder err = new StringBuilder();
+                err.append("Syntax Error: variable ");
+                err.append(mat.group());
+                err.append(" must exist as entire path segment: ");
+                err.append(rawSpec);
+                throw new IllegalArgumentException(err.toString());
+            }
+            else if ((segment.indexOf('{') >= 0) || (segment.indexOf('}') >= 0))
+            {
+                // variable is split with a path separator
+                StringBuilder err = new StringBuilder();
+                err.append("Syntax Error: invalid path segment /");
+                err.append(segment);
+                err.append("/ variable declaration incomplete: ");
+                err.append(rawSpec);
+                throw new IllegalArgumentException(err.toString());
+            }
+            else if (segment.indexOf('*') >= 0)
+            {
+                // glob segment
+                StringBuilder err = new StringBuilder();
+                err.append("Syntax Error: path segment /");
+                err.append(segment);
+                err.append("/ contains a wildcard symbol (not supported by this uri-template implementation): ");
+                err.append(rawSpec);
+                throw new IllegalArgumentException(err.toString());
+            }
+            else
+            {
+                // valid path segment
+                segmentSignature[i] = 'e'; // exact
+                // build regex
+                regex.append('/');
+                // escape regex special characters
+                for (char c : segment.toCharArray())
+                {
+                    if ((c == '.') || (c == '[') || (c == ']') || (c == '\\'))
+                    {
+                        regex.append('\\');
+                    }
+                    regex.append(c);
+                }
+            }
+        }
+        
+        // Handle trailing slash (which is not picked up during split)
+        if(rawSpec.charAt(rawSpec.length()-1) == '/')
+        {
+            regex.append('/');
+        }
+
+        regex.append('$');
+
+        this.pattern = Pattern.compile(regex.toString());
+
+        int varcount = varNames.size();
+        this.variables = varNames.toArray(new String[varcount]);
+
+        // Convert signature to group
+        String sig = String.valueOf(segmentSignature);
+
+        if (Pattern.matches("^e*$",sig))
+        {
+            this.group = PathSpecGroup.EXACT;
+        }
+        else if (Pattern.matches("^e*v+",sig))
+        {
+            this.group = PathSpecGroup.PREFIX_GLOB;
+        }
+        else if (Pattern.matches("^v+e+",sig))
+        {
+            this.group = PathSpecGroup.SUFFIX_GLOB;
+        }
+        else
+        {
+            this.group = PathSpecGroup.MIDDLE_GLOB;
+        }
+    }
+
+    /**
+     * Validate variable literal name, per RFC6570, Section 2.1 Literals
+     * @param variable
+     * @param pathParamSpec
+     */
+    private void assertIsValidVariableLiteral(String variable)
+    {
+        int len = variable.length();
+        
+        int i = 0;
+        int codepoint;
+        boolean valid = (len > 0); // must not be zero length
+        
+        while (valid && i < len)
+        {
+            codepoint = variable.codePointAt(i);
+            i += Character.charCount(codepoint);
+
+            // basic letters, digits, or symbols
+            if (isValidBasicLiteralCodepoint(codepoint))
+            {
+                continue;
+            }
+
+            // The ucschar and iprivate pieces
+            if (Character.isSupplementaryCodePoint(codepoint))
+            {
+                continue;
+            }
+
+            // pct-encoded
+            if (codepoint == '%')
+            {
+                if (i + 2 > len)
+                {
+                    // invalid percent encoding, missing extra 2 chars
+                    valid = false;
+                    continue;
+                }
+                codepoint = TypeUtil.convertHexDigit(variable.codePointAt(i++)) << 4;
+                codepoint |= TypeUtil.convertHexDigit(variable.codePointAt(i++));
+
+                // validate basic literal
+                if (isValidBasicLiteralCodepoint(codepoint))
+                {
+                    continue;
+                }
+            }
+            
+            valid = false;
+        }
+
+        if (!valid)
+        {
+            // invalid variable name
+            StringBuilder err = new StringBuilder();
+            err.append("Syntax Error: variable {");
+            err.append(variable);
+            err.append("} an invalid variable name: ");
+            err.append(pathSpec);
+            throw new IllegalArgumentException(err.toString());
+        }
+    }
+    
+    private boolean isValidBasicLiteralCodepoint(int codepoint)
+    {
+        // basic letters or digits
+        if((codepoint >= 'a' && codepoint <= 'z') ||
+           (codepoint >= 'A' && codepoint <= 'Z') ||
+           (codepoint >= '0' && codepoint <= '9'))
+        {
+            return true;
+        }
+        
+        // basic allowed symbols
+        if(VARIABLE_SYMBOLS.indexOf(codepoint) >= 0)
+        {
+            return true; // valid simple value
+        }
+        
+        // basic reserved symbols
+        if(VARIABLE_RESERVED.indexOf(codepoint) >= 0)
+        {
+            LOG.warn("Detected URI Template reserved symbol [{}] in path spec \"{}\"",(char)codepoint,pathSpec);
+            return false; // valid simple value
+        }
+
+        return false;
+    }
+
+    public Map<String, String> getPathParams(String path)
+    {
+        Matcher matcher = getMatcher(path);
+        if (matcher.matches())
+        {
+            if (group == PathSpecGroup.EXACT)
+            {
+                return Collections.emptyMap();
+            }
+            Map<String, String> ret = new HashMap<>();
+            int groupCount = matcher.groupCount();
+            for (int i = 1; i <= groupCount; i++)
+            {
+                ret.put(this.variables[i - 1],matcher.group(i));
+            }
+            return ret;
+        }
+        return null;
+    }
+
+    public int getVariableCount()
+    {
+        return variables.length;
+    }
+
+    public String[] getVariables()
+    {
+        return this.variables;
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/AuthorityHttpField.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/AuthorityHttpField.java
new file mode 100644
index 0000000000..155b3f7520
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/AuthorityHttpField.java
@@ -0,0 +1,43 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+
+package org.eclipse.jetty.http2.hpack;
+
+import org.eclipse.jetty.http.HostPortHttpField;
+import org.eclipse.jetty.http.HttpHeader;
+
+
+/* ------------------------------------------------------------ */
+/**
+ */
+public class AuthorityHttpField extends HostPortHttpField
+{
+    public final static String AUTHORITY = HpackContext.STATIC_TABLE[1][0];
+    
+    public AuthorityHttpField(String authority)
+    {
+        super(HttpHeader.C_AUTHORITY,AUTHORITY,authority);
+    }
+    
+    @Override
+    public String toString()
+    {
+        return String.format("%s(preparsed h=%s p=%d)",super.toString(),getHost(),getPort());
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/HpackContext.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/HpackContext.java
new file mode 100644
index 0000000000..89fbf00e4a
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/HpackContext.java
@@ -0,0 +1,515 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http2.hpack;
+
+import java.nio.ByteBuffer;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.jetty.http.HttpField;
+import org.eclipse.jetty.http.HttpHeader;
+import org.eclipse.jetty.http.HttpMethod;
+import org.eclipse.jetty.http.HttpScheme;
+import org.eclipse.jetty.util.ArrayQueue;
+import org.eclipse.jetty.util.ArrayTernaryTrie;
+import org.eclipse.jetty.util.StringUtil;
+import org.eclipse.jetty.util.Trie;
+import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.util.log.Logger;
+
+
+/* ------------------------------------------------------------ */
+/** HPACK - Header Compression for HTTP/2
+ * <p>This class maintains the compression context for a single HTTP/2
+ * connection. Specifically it holds the static and dynamic Header Field Tables
+ * and the associated sizes and limits.
+ * </p>
+ * <p>It is compliant with draft 11 of the specification</p>
+ */
+public class HpackContext
+{
+    public static final Logger LOG = Log.getLogger(HpackContext.class);
+    
+    public static final String[][] STATIC_TABLE = 
+    {
+        {null,null},
+        /* 1  */ {":authority",null},
+        /* 2  */ {":method","GET"},
+        /* 3  */ {":method","POST"},
+        /* 4  */ {":path","/"},
+        /* 5  */ {":path","/index.html"},
+        /* 6  */ {":scheme","http"},
+        /* 7  */ {":scheme","https"},
+        /* 8  */ {":status","200"},
+        /* 9  */ {":status","204"},
+        /* 10 */ {":status","206"},
+        /* 11 */ {":status","304"},
+        /* 12 */ {":status","400"},
+        /* 13 */ {":status","404"},
+        /* 14 */ {":status","500"},
+        /* 15 */ {"accept-charset",null},
+        /* 16 */ {"accept-encoding","gzip, deflate"},
+        /* 17 */ {"accept-language",null},
+        /* 18 */ {"accept-ranges",null},
+        /* 19 */ {"accept",null},
+        /* 20 */ {"access-control-allow-origin",null},
+        /* 21 */ {"age",null},
+        /* 22 */ {"allow",null},
+        /* 23 */ {"authorization",null},
+        /* 24 */ {"cache-control",null},
+        /* 25 */ {"content-disposition",null},
+        /* 26 */ {"content-encoding",null},
+        /* 27 */ {"content-language",null},
+        /* 28 */ {"content-length",null},
+        /* 29 */ {"content-location",null},
+        /* 30 */ {"content-range",null},
+        /* 31 */ {"content-type",null},
+        /* 32 */ {"cookie",null},
+        /* 33 */ {"date",null},
+        /* 34 */ {"etag",null},
+        /* 35 */ {"expect",null},
+        /* 36 */ {"expires",null},
+        /* 37 */ {"from",null},
+        /* 38 */ {"host",null},
+        /* 39 */ {"if-match",null},
+        /* 40 */ {"if-modified-since",null},
+        /* 41 */ {"if-none-match",null},
+        /* 42 */ {"if-range",null},
+        /* 43 */ {"if-unmodified-since",null},
+        /* 44 */ {"last-modified",null},
+        /* 45 */ {"link",null},
+        /* 46 */ {"location",null},
+        /* 47 */ {"max-forwards",null},
+        /* 48 */ {"proxy-authenticate",null},
+        /* 49 */ {"proxy-authorization",null},
+        /* 50 */ {"range",null},
+        /* 51 */ {"referer",null},
+        /* 52 */ {"refresh",null},
+        /* 53 */ {"retry-after",null},
+        /* 54 */ {"server",null},
+        /* 55 */ {"set-cookie",null},
+        /* 56 */ {"strict-transport-security",null},
+        /* 57 */ {"transfer-encoding",null},
+        /* 58 */ {"user-agent",null},
+        /* 59 */ {"vary",null},
+        /* 60 */ {"via",null},
+        /* 61 */ {"www-authenticate",null},
+    };
+    
+    private static final Map<HttpField,Entry> __staticFieldMap = new HashMap<>();
+    private static final Trie<StaticEntry> __staticNameMap = new ArrayTernaryTrie<>(true,512);
+    private static final StaticEntry[] __staticTableByHeader = new StaticEntry[HttpHeader.UNKNOWN.ordinal()];
+    private static final StaticEntry[] __staticTable=new StaticEntry[STATIC_TABLE.length];
+    static
+    {
+        Set<String> added = new HashSet<>();
+        for (int i=1;i<STATIC_TABLE.length;i++)
+        {
+            StaticEntry entry=null;
+
+            String name  = STATIC_TABLE[i][0];
+            String value = STATIC_TABLE[i][1];
+            HttpHeader header = HttpHeader.CACHE.get(name);
+            if (header!=null && value!=null)
+            {
+                switch (header)
+                {
+                    case C_METHOD:
+                    {
+                        
+                        HttpMethod method = HttpMethod.CACHE.get(value);
+                        if (method!=null)
+                            entry=new StaticEntry(i,new StaticTableHttpField(header,name,value,method));
+                        break;
+                    }
+                    
+                    case C_SCHEME:
+                    {
+                        
+                        HttpScheme scheme = HttpScheme.CACHE.get(value);
+                        if (scheme!=null)
+                            entry=new StaticEntry(i,new StaticTableHttpField(header,name,value,scheme));
+                        break;
+                    }
+                    
+                    case C_STATUS:
+                    {
+                        entry=new StaticEntry(i,new StaticTableHttpField(header,name,value,Integer.valueOf(value)));
+                        break;
+                    }
+                    
+                    default:
+                        break;
+                }
+            }
+            
+            if (entry==null)
+                entry=new StaticEntry(i,header==null?new HttpField(STATIC_TABLE[i][0],value):new HttpField(header,name,value));
+            
+                        
+            __staticTable[i]=entry;
+            
+            if (entry._field.getValue()!=null)
+                __staticFieldMap.put(entry._field,entry);
+            
+            if (!added.contains(entry._field.getName()))
+            {
+                added.add(entry._field.getName());
+                __staticNameMap.put(entry._field.getName(),entry);
+                if (__staticNameMap.get(entry._field.getName())==null)
+                    throw new IllegalStateException("name trie too small");
+            }
+        }
+        
+        for (HttpHeader h : HttpHeader.values())
+        {
+            StaticEntry entry = __staticNameMap.get(h.asString());
+            if (entry!=null)
+                __staticTableByHeader[h.ordinal()]=entry;
+        }
+    }
+    
+    private int _maxDynamicTableSizeInBytes;
+    private int _dynamicTableSizeInBytes;
+    private final DynamicTable _dynamicTable;
+    private final Map<HttpField,Entry> _fieldMap = new HashMap<>();
+    private final Map<String,Entry> _nameMap = new HashMap<>();
+    
+    HpackContext(int maxDynamicTableSize)
+    {
+        _maxDynamicTableSizeInBytes=maxDynamicTableSize;
+        int guesstimateEntries = 10+maxDynamicTableSize/(32+10+10);
+        _dynamicTable=new DynamicTable(guesstimateEntries,guesstimateEntries+10);
+        if (LOG.isDebugEnabled())
+            LOG.debug(String.format("HdrTbl[%x] created max=%d",hashCode(),maxDynamicTableSize));
+    }
+    
+    public void resize(int newMaxDynamicTableSize)
+    {
+        if (LOG.isDebugEnabled())
+            LOG.debug(String.format("HdrTbl[%x] resized max=%d->%d",hashCode(),_maxDynamicTableSizeInBytes,newMaxDynamicTableSize));
+        _maxDynamicTableSizeInBytes=newMaxDynamicTableSize;
+        int guesstimateEntries = 10+newMaxDynamicTableSize/(32+10+10);
+        evict();
+        _dynamicTable.resizeUnsafe(guesstimateEntries);
+    }
+    
+    public Entry get(HttpField field)
+    {
+        Entry entry = _fieldMap.get(field);
+        if (entry==null)
+            entry=__staticFieldMap.get(field);
+        return entry;
+    }
+    
+    public Entry get(String name)
+    {
+        Entry entry = __staticNameMap.get(name);
+        if (entry!=null)
+            return entry;
+        return _nameMap.get(StringUtil.asciiToLowerCase(name));
+    }
+    
+    public Entry get(int index)
+    {
+        if (index<__staticTable.length)
+            return __staticTable[index];
+            
+        int d=_dynamicTable.size()-index+__staticTable.length-1;
+
+        if (d>=0) 
+            return _dynamicTable.getUnsafe(d);      
+        return null;
+    }
+    
+    public Entry get(HttpHeader header)
+    {
+        Entry e = __staticTableByHeader[header.ordinal()];
+        if (e==null)
+            return get(header.asString());
+        return e;
+    }
+
+    public static Entry getStatic(HttpHeader header)
+    {
+        return __staticTableByHeader[header.ordinal()];
+    }
+    
+    public Entry add(HttpField field)
+    {
+        int slot=_dynamicTable.getNextSlotUnsafe();
+        Entry entry=new Entry(slot,field);
+        int size = entry.getSize();
+        if (size>_maxDynamicTableSizeInBytes)
+        {
+            if (LOG.isDebugEnabled())
+                LOG.debug(String.format("HdrTbl[%x] !added size %d>%d",hashCode(),size,_maxDynamicTableSizeInBytes));
+            return null;
+        }
+        _dynamicTableSizeInBytes+=size;
+        _dynamicTable.addUnsafe(entry);
+        _fieldMap.put(field,entry);
+        _nameMap.put(StringUtil.asciiToLowerCase(field.getName()),entry);
+
+        if (LOG.isDebugEnabled())
+            LOG.debug(String.format("HdrTbl[%x] added %s",hashCode(),entry));
+        evict();
+        return entry;
+    }
+
+    /**
+     * @return Current dynamic table size in entries
+     */
+    public int size()
+    {
+        return _dynamicTable.size();
+    }
+    
+    /**
+     * @return Current Dynamic table size in Octets
+     */
+    public int getDynamicTableSize()
+    {
+        return _dynamicTableSizeInBytes;
+    }
+
+    /**
+     * @return Max Dynamic table size in Octets
+     */
+    public int getMaxDynamicTableSize()
+    {
+        return _maxDynamicTableSizeInBytes;
+    }
+
+    public int index(Entry entry)
+    {
+        if (entry._slot<0)
+            return 0;
+        if (entry.isStatic())
+            return entry._slot;
+
+        return _dynamicTable.index(entry)+__staticTable.length-1;
+    }
+    
+    public static int staticIndex(HttpHeader header)
+    {
+        if (header==null)
+            return 0;
+        Entry entry=__staticNameMap.get(header.asString());
+        if (entry==null)
+            return 0;
+        return entry.getSlot();
+    }
+    
+    private void evict()
+    {
+        while (_dynamicTableSizeInBytes>_maxDynamicTableSizeInBytes)
+        {
+            Entry entry = _dynamicTable.pollUnsafe();
+            if (LOG.isDebugEnabled())
+                LOG.debug(String.format("HdrTbl[%x] evict %s",hashCode(),entry));
+            _dynamicTableSizeInBytes-=entry.getSize();
+            entry._slot=-1;
+            _fieldMap.remove(entry.getHttpField());
+            String lc=StringUtil.asciiToLowerCase(entry.getHttpField().getName());
+            if (entry==_nameMap.get(lc))
+                _nameMap.remove(lc);
+        }
+        if (LOG.isDebugEnabled())
+            LOG.debug(String.format("HdrTbl[%x] entries=%d, size=%d, max=%d",hashCode(),_dynamicTable.size(),_dynamicTableSizeInBytes,_maxDynamicTableSizeInBytes));
+    }
+    
+    @Override
+    public String toString()
+    {
+        return String.format("HpackContext@%x{entries=%d,size=%d,max=%d}",hashCode(),_dynamicTable.size(),_dynamicTableSizeInBytes,_maxDynamicTableSizeInBytes);
+    }
+    
+    
+    
+    /* ------------------------------------------------------------ */
+    /**
+     */
+    private class DynamicTable extends ArrayQueue<HpackContext.Entry>
+    {
+        /* ------------------------------------------------------------ */
+        /**
+         * @param initCapacity
+         * @param growBy
+         */
+        private DynamicTable(int initCapacity, int growBy)
+        {
+            super(initCapacity,growBy);
+        }
+
+        /* ------------------------------------------------------------ */
+        /**
+         * @see org.eclipse.jetty.util.ArrayQueue#growUnsafe()
+         */
+        @Override
+        protected void resizeUnsafe(int newCapacity)
+        {
+            // Relay on super.growUnsafe to pack all entries 0 to _nextSlot
+            super.resizeUnsafe(newCapacity);
+            for (int s=0;s<_nextSlot;s++)
+                ((Entry)_elements[s])._slot=s;
+        }
+
+        /* ------------------------------------------------------------ */
+        /**
+         * @see org.eclipse.jetty.util.ArrayQueue#enqueue(java.lang.Object)
+         */
+        @Override
+        public boolean enqueue(Entry e)
+        {
+            return super.enqueue(e);
+        }
+
+        /* ------------------------------------------------------------ */
+        /**
+         * @see org.eclipse.jetty.util.ArrayQueue#dequeue()
+         */
+        @Override
+        public Entry dequeue()
+        {
+            return super.dequeue();
+        }
+        
+        /* ------------------------------------------------------------ */
+        /**
+         * @param entry
+         * @return
+         */
+        private int index(Entry entry)
+        {
+            return entry._slot>=_nextE?_size-entry._slot+_nextE:_nextSlot-entry._slot;
+        }
+
+    }
+
+
+
+    /* ------------------------------------------------------------ */
+    /* ------------------------------------------------------------ */
+    /* ------------------------------------------------------------ */
+    public static class Entry
+    {
+        final HttpField _field;
+        int _slot;
+        
+        Entry()
+        {    
+            _slot=0;
+            _field=null;
+        }
+        
+        Entry(int index,String name, String value)
+        {    
+            _slot=index;
+            _field=new HttpField(name,value);
+        }
+        
+        Entry(int slot, HttpField field)
+        {    
+            _slot=slot;
+            _field=field;
+        }
+
+        public int getSize()
+        {
+            return 32+_field.getName().length()+_field.getValue().length();
+        }
+        
+        public HttpField getHttpField()
+        {
+            return _field;
+        }
+        
+        public boolean isStatic()
+        {
+            return false;
+        }
+        
+        public byte[] getStaticHuffmanValue()
+        {
+            return null;
+        }
+        
+        public int getSlot()
+        {
+            return _slot;
+        }
+        
+        public String toString()
+        {
+            return String.format("{%s,%d,%s,%x}",isStatic()?"S":"D",_slot,_field,hashCode());
+        }
+    } 
+    
+    public static class StaticEntry extends Entry
+    {
+        private final byte[] _huffmanValue;
+        private final byte _encodedField;
+        
+        StaticEntry(int index,HttpField field)
+        {    
+            super(index,field);
+            String value = field.getValue();
+            if (value!=null && value.length()>0)
+            {
+                int huffmanLen = Huffman.octetsNeeded(value);
+                int lenLen = NBitInteger.octectsNeeded(7,huffmanLen);
+                _huffmanValue = new byte[1+lenLen+huffmanLen];
+                ByteBuffer buffer = ByteBuffer.wrap(_huffmanValue); 
+                        
+                // Indicate Huffman
+                buffer.put((byte)0x80);
+                // Add huffman length
+                NBitInteger.encode(buffer,7,huffmanLen);
+                // Encode value
+                Huffman.encode(buffer,value);       
+            }
+            else
+                _huffmanValue=null;
+            
+            _encodedField=(byte)(0x80|index);
+        }
+
+        @Override
+        public boolean isStatic()
+        {
+            return true;
+        }
+        
+        @Override
+        public byte[] getStaticHuffmanValue()
+        {
+            return _huffmanValue;
+        }
+        
+        public byte getEncodedField()
+        {
+            return _encodedField;
+        }
+    }
+
+
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/HpackDecoder.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/HpackDecoder.java
new file mode 100644
index 0000000000..38dc8567f1
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/HpackDecoder.java
@@ -0,0 +1,280 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+
+package org.eclipse.jetty.http2.hpack;
+
+import java.nio.ByteBuffer;
+
+import org.eclipse.jetty.http.BadMessageException;
+import org.eclipse.jetty.http.HttpField;
+import org.eclipse.jetty.http.HttpHeader;
+import org.eclipse.jetty.http.HttpStatus;
+import org.eclipse.jetty.http.MetaData;
+import org.eclipse.jetty.http2.hpack.HpackContext.Entry;
+import org.eclipse.jetty.util.TypeUtil;
+import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.util.log.Logger;
+
+/**
+ * Hpack Decoder
+ * <p>This is not thread safe and may only be called by 1 thread at a time.</p>
+ */
+public class HpackDecoder
+{
+    public static final Logger LOG = Log.getLogger(HpackDecoder.class);
+    public final static HttpField.LongValueHttpField CONTENT_LENGTH_0 =
+            new HttpField.LongValueHttpField(HttpHeader.CONTENT_LENGTH,0L);
+
+    private final HpackContext _context;
+    private final MetaDataBuilder _builder;
+    private int _localMaxDynamicTableSize;
+
+    /**
+     * @param localMaxDynamicTableSize  The maximum allowed size of the local dynamic header field table.
+     * @param maxHeaderSize The maximum allowed size of a headers block, expressed as total of all name and value characters.
+     */
+    public HpackDecoder(int localMaxDynamicTableSize, int maxHeaderSize)
+    {
+        _context=new HpackContext(localMaxDynamicTableSize);
+        _localMaxDynamicTableSize=localMaxDynamicTableSize;
+        _builder = new MetaDataBuilder(maxHeaderSize);
+    }
+
+    public HpackContext getHpackContext()
+    {
+        return _context;
+    }
+
+    public void setLocalMaxDynamicTableSize(int localMaxdynamciTableSize)
+    {
+        _localMaxDynamicTableSize=localMaxdynamciTableSize;
+    }
+
+    public MetaData decode(ByteBuffer buffer)
+    {
+        if (LOG.isDebugEnabled())
+            LOG.debug(String.format("CtxTbl[%x] decoding %d octets",_context.hashCode(),buffer.remaining()));
+
+        // If the buffer is big, don't even think about decoding it
+        if (buffer.remaining()>_builder.getMaxSize())
+            throw new BadMessageException(HttpStatus.REQUEST_ENTITY_TOO_LARGE_413,"Header frame size "+buffer.remaining()+">"+_builder.getMaxSize());
+
+
+        while(buffer.hasRemaining())
+        {
+            if (LOG.isDebugEnabled())
+            {
+                int l=Math.min(buffer.remaining(),16);
+                // TODO: not guaranteed the buffer has a backing array !
+                LOG.debug("decode {}{}",
+                        TypeUtil.toHexString(buffer.array(),buffer.arrayOffset()+buffer.position(),l),
+                        l<buffer.remaining()?"...":"");
+            }
+
+            byte b = buffer.get();
+            if (b<0)
+            {
+                // 7.1 indexed if the high bit is set
+                int index = NBitInteger.decode(buffer,7);
+                Entry entry=_context.get(index);
+                if (entry==null)
+                {
+                    throw new BadMessageException("Unknown index "+index);
+                }
+                else if (entry.isStatic())
+                {
+                    if (LOG.isDebugEnabled())
+                        LOG.debug("decode IdxStatic {}",entry);
+                    // emit field
+                    _builder.emit(entry.getHttpField());
+
+                    // TODO copy and add to reference set if there is room
+                    // _context.add(entry.getHttpField());
+                }
+                else
+                {
+                    if (LOG.isDebugEnabled())
+                        LOG.debug("decode Idx {}",entry);
+                    // emit
+                    _builder.emit(entry.getHttpField());
+                }
+            }
+            else
+            {
+                // look at the first nibble in detail
+                byte f= (byte)((b&0xF0)>>4);
+                String name;
+                HttpHeader header;
+                String value;
+
+                boolean indexed;
+                int name_index;
+
+                switch (f)
+                {
+                    case 2: // 7.3
+                    case 3: // 7.3
+                        // change table size
+                        int size = NBitInteger.decode(buffer,5);
+                        if (LOG.isDebugEnabled())
+                            LOG.debug("decode resize="+size);
+                        if (size>_localMaxDynamicTableSize)
+                            throw new IllegalArgumentException();
+                        _context.resize(size);
+                        continue;
+
+                    case 0: // 7.2.2
+                    case 1: // 7.2.3
+                        indexed=false;
+                        name_index=NBitInteger.decode(buffer,4);
+                        break;
+
+
+                    case 4: // 7.2.1
+                    case 5: // 7.2.1
+                    case 6: // 7.2.1
+                    case 7: // 7.2.1
+                        indexed=true;
+                        name_index=NBitInteger.decode(buffer,6);
+                        break;
+
+                    default:
+                        throw new IllegalStateException();
+                }
+
+
+                boolean huffmanName=false;
+
+                // decode the name
+                if (name_index>0)
+                {
+                    Entry name_entry=_context.get(name_index);
+                    name=name_entry.getHttpField().getName();
+                    header=name_entry.getHttpField().getHeader();
+                }
+                else
+                {
+                    huffmanName = (buffer.get()&0x80)==0x80;
+                    int length = NBitInteger.decode(buffer,7);
+                    _builder.checkSize(length,huffmanName);
+                    if (huffmanName)
+                        name=Huffman.decode(buffer,length);
+                    else
+                        name=toASCIIString(buffer,length);
+                    for (int i=0;i<name.length();i++)
+                    {
+                        char c=name.charAt(i);
+                        if (c>='A'&&c<='Z')
+                        {
+                            throw new BadMessageException(400,"Uppercase header name");
+                        }
+                    }
+                    header=HttpHeader.CACHE.get(name);
+                }
+
+                // decode the value
+                boolean huffmanValue = (buffer.get()&0x80)==0x80;
+                int length = NBitInteger.decode(buffer,7);
+                _builder.checkSize(length,huffmanValue);
+                if (huffmanValue)
+                    value=Huffman.decode(buffer,length);
+                else
+                    value=toASCIIString(buffer,length);
+
+                // Make the new field
+                HttpField field;
+                if (header==null)
+                {
+                    // just make a normal field and bypass header name lookup
+                    field = new HttpField(null,name,value);
+                }
+                else
+                {
+                    // might be worthwhile to create a value HttpField if it is indexed
+                    // and/or of a type that may be looked up multiple times.
+                    switch(header)
+                    {
+                        case C_STATUS:
+                            if (indexed)
+                                field = new HttpField.IntValueHttpField(header,name,value);
+                            else
+                                field = new HttpField(header,name,value);
+                            break;
+
+                        case C_AUTHORITY:
+                            field = new AuthorityHttpField(value);
+                            break;
+
+                        case CONTENT_LENGTH:
+                            if ("0".equals(value))
+                                field = CONTENT_LENGTH_0;
+                            else
+                                field = new HttpField.LongValueHttpField(header,name,value);
+                            break;
+
+                        default:
+                            field = new HttpField(header,name,value);
+                            break;
+                    }
+                }
+
+                if (LOG.isDebugEnabled())
+                {
+                    LOG.debug("decoded '{}' by {}/{}/{}",
+                            field,
+                            name_index > 0 ? "IdxName" : (huffmanName ? "HuffName" : "LitName"),
+                            huffmanValue ? "HuffVal" : "LitVal",
+                            indexed ? "Idx" : "");
+                }
+
+                // emit the field
+                _builder.emit(field);
+
+                // if indexed
+                if (indexed)
+                {
+                    // add to dynamic table
+                    _context.add(field);
+                }
+
+            }
+        }
+
+        return _builder.build();
+    }
+
+    public static String toASCIIString(ByteBuffer buffer,int length)
+    {
+        StringBuilder builder = new StringBuilder(length);
+        int position=buffer.position();
+        int start=buffer.arrayOffset()+ position;
+        int end=start+length;
+        buffer.position(position+length);
+        byte[] array=buffer.array();
+        for (int i=start;i<end;i++)
+            builder.append((char)(0x7f&array[i]));
+        return builder.toString();
+    }
+
+    @Override
+    public String toString()
+    {
+        return String.format("HpackDecoder@%x{%s}",hashCode(),_context);
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/HpackEncoder.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/HpackEncoder.java
new file mode 100644
index 0000000000..e42ffb86b5
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/HpackEncoder.java
@@ -0,0 +1,354 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+
+package org.eclipse.jetty.http2.hpack;
+
+import java.nio.ByteBuffer;
+import java.util.EnumSet;
+
+import org.eclipse.jetty.http.HttpField;
+import org.eclipse.jetty.http.HttpHeader;
+import org.eclipse.jetty.http.HttpScheme;
+import org.eclipse.jetty.http.HttpStatus;
+import org.eclipse.jetty.http.HttpVersion;
+import org.eclipse.jetty.http.MetaData;
+import org.eclipse.jetty.http.PreEncodedHttpField;
+import org.eclipse.jetty.http2.hpack.HpackContext.Entry;
+import org.eclipse.jetty.http2.hpack.HpackContext.StaticEntry;
+import org.eclipse.jetty.util.TypeUtil;
+import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.util.log.Logger;
+
+public class HpackEncoder
+{
+    public static final Logger LOG = Log.getLogger(HpackEncoder.class);
+
+    private final static HttpField[] __status= new HttpField[599];
+
+
+    final static EnumSet<HttpHeader> __DO_NOT_HUFFMAN =
+            EnumSet.of(
+                    HttpHeader.AUTHORIZATION,
+                    HttpHeader.CONTENT_MD5,
+                    HttpHeader.PROXY_AUTHENTICATE,
+                    HttpHeader.PROXY_AUTHORIZATION);
+
+    final static EnumSet<HttpHeader> __DO_NOT_INDEX =
+            EnumSet.of(
+                    // HttpHeader.C_PATH,  // TODO more data needed
+                    // HttpHeader.DATE,    // TODO more data needed
+                    HttpHeader.AUTHORIZATION,
+                    HttpHeader.CONTENT_MD5,
+                    HttpHeader.CONTENT_RANGE,
+                    HttpHeader.ETAG,
+                    HttpHeader.IF_MODIFIED_SINCE,
+                    HttpHeader.IF_UNMODIFIED_SINCE,
+                    HttpHeader.IF_NONE_MATCH,
+                    HttpHeader.IF_RANGE,
+                    HttpHeader.IF_MATCH,
+                    HttpHeader.LOCATION,
+                    HttpHeader.RANGE,
+                    HttpHeader.RETRY_AFTER,
+                    // HttpHeader.EXPIRES,
+                    HttpHeader.LAST_MODIFIED,
+                    HttpHeader.SET_COOKIE,
+                    HttpHeader.SET_COOKIE2);
+
+
+    final static EnumSet<HttpHeader> __NEVER_INDEX =
+            EnumSet.of(
+                    HttpHeader.AUTHORIZATION,
+                    HttpHeader.SET_COOKIE,
+                    HttpHeader.SET_COOKIE2);
+
+    static
+    {
+        for (HttpStatus.Code code : HttpStatus.Code.values())
+            __status[code.getCode()]=new PreEncodedHttpField(HttpHeader.C_STATUS,Integer.toString(code.getCode()));
+    }
+
+    private final HpackContext _context;
+    private final boolean _debug;
+    private int _remoteMaxDynamicTableSize;
+    private int _localMaxDynamicTableSize;
+
+    public HpackEncoder()
+    {
+        this(4096,4096);
+    }
+
+    public HpackEncoder(int localMaxDynamicTableSize)
+    {
+        this(localMaxDynamicTableSize,4096);
+    }
+
+    public HpackEncoder(int localMaxDynamicTableSize,int remoteMaxDynamicTableSize)
+    {
+        _context=new HpackContext(remoteMaxDynamicTableSize);
+        _remoteMaxDynamicTableSize=remoteMaxDynamicTableSize;
+        _localMaxDynamicTableSize=localMaxDynamicTableSize;
+        _debug=LOG.isDebugEnabled();
+    }
+
+    public HpackContext getHpackContext()
+    {
+        return _context;
+    }
+
+    public void setRemoteMaxDynamicTableSize(int remoteMaxDynamicTableSize)
+    {
+        _remoteMaxDynamicTableSize=remoteMaxDynamicTableSize;
+    }
+
+    public void setLocalMaxDynamicTableSize(int localMaxDynamicTableSize)
+    {
+        _localMaxDynamicTableSize=localMaxDynamicTableSize;
+    }
+
+    public void encode(ByteBuffer buffer, MetaData metadata)
+    {
+        if (LOG.isDebugEnabled())
+            LOG.debug(String.format("CtxTbl[%x] encoding",_context.hashCode()));
+
+        int pos = buffer.position();
+
+        // Check the dynamic table sizes!
+        int maxDynamicTableSize=Math.min(_remoteMaxDynamicTableSize,_localMaxDynamicTableSize);
+        if (maxDynamicTableSize!=_context.getMaxDynamicTableSize())
+            encodeMaxDynamicTableSize(buffer,maxDynamicTableSize);
+
+        // Add Request/response meta fields
+        if (metadata.isRequest())
+        {
+            MetaData.Request request = (MetaData.Request)metadata;
+
+            // TODO optimise these to avoid HttpField creation
+            String scheme=request.getURI().getScheme();
+            encode(buffer,new HttpField(HttpHeader.C_SCHEME,scheme==null?HttpScheme.HTTP.asString():scheme));
+            encode(buffer,new HttpField(HttpHeader.C_METHOD,request.getMethod()));
+            encode(buffer,new HttpField(HttpHeader.C_AUTHORITY,request.getURI().getAuthority()));
+            encode(buffer,new HttpField(HttpHeader.C_PATH,request.getURI().getPathQuery()));
+
+        }
+        else if (metadata.isResponse())
+        {
+            MetaData.Response response = (MetaData.Response)metadata;
+            int code=response.getStatus();
+            HttpField status = code<__status.length?__status[code]:null;
+            if (status==null)
+                status=new HttpField.IntValueHttpField(HttpHeader.C_STATUS,code);
+            encode(buffer,status);
+        }
+
+        // Add all the other fields
+        for (HttpField field : metadata)
+            encode(buffer,field);
+
+        if (LOG.isDebugEnabled())
+            LOG.debug(String.format("CtxTbl[%x] encoded %d octets",_context.hashCode(), buffer.position() - pos));
+    }
+
+    public void encodeMaxDynamicTableSize(ByteBuffer buffer, int maxDynamicTableSize)
+    {
+        if (maxDynamicTableSize>_remoteMaxDynamicTableSize)
+            throw new IllegalArgumentException();
+        buffer.put((byte)0x20);
+        NBitInteger.encode(buffer,5,maxDynamicTableSize);
+        _context.resize(maxDynamicTableSize);
+    }
+
+    public void encode(ByteBuffer buffer, HttpField field)
+    {
+        final int p=_debug?buffer.position():-1;
+
+        String encoding=null;
+
+        // Is there an entry for the field?
+        Entry entry = _context.get(field);
+        if (entry!=null)
+        {
+            // Known field entry, so encode it as indexed
+            if (entry.isStatic())
+            {
+                buffer.put(((StaticEntry)entry).getEncodedField());
+                if (_debug)
+                    encoding="IdxFieldS1";
+            }
+            else
+            {
+                int index=_context.index(entry);
+                buffer.put((byte)0x80);
+                NBitInteger.encode(buffer,7,index);
+                if (_debug)
+                    encoding="IdxField"+(entry.isStatic()?"S":"")+(1+NBitInteger.octectsNeeded(7,index));
+            }
+        }
+        else
+        {
+            // Unknown field entry, so we will have to send literally.
+            final boolean indexed;
+
+            // But do we know it's name?
+            HttpHeader header = field.getHeader();
+
+            // Select encoding strategy
+            if (header==null)
+            {
+                // Select encoding strategy for unknown header names
+                Entry name = _context.get(field.getName());
+
+                if (field instanceof PreEncodedHttpField)
+                {
+                    int i=buffer.position();
+                    ((PreEncodedHttpField)field).putTo(buffer,HttpVersion.HTTP_2);
+                    byte b=buffer.get(i);
+                    indexed=b<0||b>=0x40;
+                    if (_debug)
+                        encoding=indexed?"PreEncodedIdx":"PreEncoded";
+                }
+                // has the custom header name been seen before?
+                else if (name==null)
+                {
+                    // unknown name and value, so let's index this just in case it is
+                    // the first time we have seen a custom name or a custom field.
+                    // unless the name is changing, this is worthwhile
+                    indexed=true;
+                    encodeName(buffer,(byte)0x40,6,field.getName(),null);
+                    encodeValue(buffer,true,field.getValue());
+                    if (_debug)
+                        encoding="LitHuffNHuffVIdx";
+                }
+                else
+                {
+                    // known custom name, but unknown value.
+                    // This is probably a custom field with changing value, so don't index.
+                    indexed=false;
+                    encodeName(buffer,(byte)0x00,4,field.getName(),null);
+                    encodeValue(buffer,true,field.getValue());
+                    if (_debug)
+                        encoding="LitHuffNHuffV!Idx";
+                }
+            }
+            else
+            {
+                // Select encoding strategy for known header names
+                Entry name = _context.get(header);
+
+                if (field instanceof PreEncodedHttpField)
+                {
+                    // Preencoded field
+                    int i=buffer.position();
+                    ((PreEncodedHttpField)field).putTo(buffer,HttpVersion.HTTP_2);
+                    byte b=buffer.get(i);
+                    indexed=b<0||b>=0x40;
+                    if (_debug)
+                        encoding=indexed?"PreEncodedIdx":"PreEncoded";
+                }
+                else if (__DO_NOT_INDEX.contains(header))
+                {
+                    // Non indexed field
+                    indexed=false;
+                    boolean never_index=__NEVER_INDEX.contains(header);
+                    boolean huffman=!__DO_NOT_HUFFMAN.contains(header);
+                    encodeName(buffer,never_index?(byte)0x10:(byte)0x00,4,header.asString(),name);
+                    encodeValue(buffer,huffman,field.getValue());
+
+                    if (_debug)
+                        encoding="Lit"+
+                                ((name==null)?"HuffN":("IdxN"+(name.isStatic()?"S":"")+(1+NBitInteger.octectsNeeded(4,_context.index(name)))))+
+                                (huffman?"HuffV":"LitV")+
+                                (indexed?"Idx":(never_index?"!!Idx":"!Idx"));
+                }
+                else if (header==HttpHeader.CONTENT_LENGTH && field.getValue().length()>1)
+                {
+                    // Non indexed content length for 2 digits or more
+                    indexed=false;
+                    encodeName(buffer,(byte)0x00,4,header.asString(),name);
+                    encodeValue(buffer,true,field.getValue());
+                    if (_debug)
+                        encoding="LitIdxNS"+(1+NBitInteger.octectsNeeded(4,_context.index(name)))+"HuffV!Idx";
+                }
+                else
+                {
+                    // indexed
+                    indexed=true;
+                    boolean huffman=!__DO_NOT_HUFFMAN.contains(header);
+                    encodeName(buffer,(byte)0x40,6,header.asString(),name);
+                    encodeValue(buffer,huffman,field.getValue());
+                    if (_debug)
+                        encoding=((name==null)?"LitHuffN":("LitIdxN"+(name.isStatic()?"S":"")+(1+NBitInteger.octectsNeeded(6,_context.index(name)))))+
+                                (huffman?"HuffVIdx":"LitVIdx");
+                }
+            }
+
+            // If we want the field referenced, then we add it to our
+            // table and reference set.
+            if (indexed)
+                _context.add(field);
+        }
+
+        if (_debug)
+        {
+            int e=buffer.position();
+            if (LOG.isDebugEnabled())
+                LOG.debug("encode {}:'{}' to '{}'",encoding,field,TypeUtil.toHexString(buffer.array(),buffer.arrayOffset()+p,e-p));
+        }
+    }
+
+    private void encodeName(ByteBuffer buffer, byte mask, int bits, String name, Entry entry)
+    {
+        buffer.put(mask);
+        if (entry==null)
+        {
+            // leave name index bits as 0
+            // Encode the name always with lowercase huffman
+            buffer.put((byte)0x80);
+            NBitInteger.encode(buffer,7,Huffman.octetsNeededLC(name));
+            Huffman.encodeLC(buffer,name);
+        }
+        else
+        {
+            NBitInteger.encode(buffer,bits,_context.index(entry));
+        }
+    }
+
+    static void encodeValue(ByteBuffer buffer, boolean huffman, String value)
+    {
+        if (huffman)
+        {
+            // huffman literal value
+            buffer.put((byte)0x80);
+            NBitInteger.encode(buffer,7,Huffman.octetsNeeded(value));
+            Huffman.encode(buffer,value);
+        }
+        else
+        {
+            // add literal assuming iso_8859_1
+            buffer.put((byte)0x00);
+            NBitInteger.encode(buffer,7,value.length());
+            for (int i=0;i<value.length();i++)
+            {
+                char c=value.charAt(i);
+                if (c<' '|| c>127)
+                    throw new IllegalArgumentException();
+                buffer.put((byte)c);
+            }
+        }
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/HpackFieldPreEncoder.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/HpackFieldPreEncoder.java
new file mode 100644
index 0000000000..f73b34728e
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/HpackFieldPreEncoder.java
@@ -0,0 +1,97 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+
+package org.eclipse.jetty.http2.hpack;
+
+import java.nio.ByteBuffer;
+
+import org.eclipse.jetty.http.HttpFieldPreEncoder;
+import org.eclipse.jetty.http.HttpHeader;
+import org.eclipse.jetty.http.HttpVersion;
+import org.eclipse.jetty.util.BufferUtil;
+
+
+/* ------------------------------------------------------------ */
+/**
+ */
+public class HpackFieldPreEncoder implements HttpFieldPreEncoder
+{
+    /* ------------------------------------------------------------ */
+    /**
+     * @see org.eclipse.jetty.http.HttpFieldPreEncoder#getHttpVersion()
+     */
+    @Override
+    public HttpVersion getHttpVersion()
+    {
+        return HttpVersion.HTTP_2;
+    }
+
+    /* ------------------------------------------------------------ */
+    /**
+     * @see org.eclipse.jetty.http.HttpFieldPreEncoder#getEncodedField(org.eclipse.jetty.http.HttpHeader, java.lang.String, java.lang.String)
+     */
+    @Override
+    public byte[] getEncodedField(HttpHeader header, String name, String value)
+    {
+        boolean not_indexed=HpackEncoder.__DO_NOT_INDEX.contains(header);
+        
+        ByteBuffer buffer = BufferUtil.allocate(name.length()+value.length()+10);
+        BufferUtil.clearToFill(buffer);
+        boolean huffman;
+        int bits;
+        
+        if (not_indexed)
+        {
+            // Non indexed field
+            boolean never_index=HpackEncoder.__NEVER_INDEX.contains(header);
+            huffman=!HpackEncoder.__DO_NOT_HUFFMAN.contains(header);
+            buffer.put(never_index?(byte)0x10:(byte)0x00);
+            bits=4;
+        }
+        else if (header==HttpHeader.CONTENT_LENGTH && value.length()>1)
+        {
+            // Non indexed content length for 2 digits or more
+            buffer.put((byte)0x00);
+            huffman=true;
+            bits=4;
+        }
+        else
+        {
+            // indexed
+            buffer.put((byte)0x40);
+            huffman=!HpackEncoder.__DO_NOT_HUFFMAN.contains(header);
+            bits=6;
+        }
+        
+        int name_idx=HpackContext.staticIndex(header);
+        if (name_idx>0)
+            NBitInteger.encode(buffer,bits,name_idx);
+        else
+        {
+            buffer.put((byte)0x80);
+            NBitInteger.encode(buffer,7,Huffman.octetsNeededLC(name));
+            Huffman.encodeLC(buffer,name);
+        }
+
+        HpackEncoder.encodeValue(buffer,huffman,value);
+        
+        BufferUtil.flipToFlush(buffer,0);
+        return BufferUtil.toArray(buffer);
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/Huffman.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/Huffman.java
new file mode 100644
index 0000000000..da28684c4a
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/Huffman.java
@@ -0,0 +1,480 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http2.hpack;
+
+import java.nio.ByteBuffer;
+
+public class Huffman
+{
+
+    // Appendix C: Huffman Codes
+    // http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-12#appendix-C
+    static final int[][] CODES =
+    { 
+        /*    (  0)  |11111111|11000                      */       {0x1ff8,13},
+        /*    (  1)  |11111111|11111111|1011000           */     {0x7fffd8,23},
+        /*    (  2)  |11111111|11111111|11111110|0010     */    {0xfffffe2,28},
+        /*    (  3)  |11111111|11111111|11111110|0011     */    {0xfffffe3,28},
+        /*    (  4)  |11111111|11111111|11111110|0100     */    {0xfffffe4,28},
+        /*    (  5)  |11111111|11111111|11111110|0101     */    {0xfffffe5,28},
+        /*    (  6)  |11111111|11111111|11111110|0110     */    {0xfffffe6,28},
+        /*    (  7)  |11111111|11111111|11111110|0111     */    {0xfffffe7,28},
+        /*    (  8)  |11111111|11111111|11111110|1000     */    {0xfffffe8,28},
+        /*    (  9)  |11111111|11111111|11101010          */     {0xffffea,24},
+        /*    ( 10)  |11111111|11111111|11111111|111100   */   {0x3ffffffc,30},
+        /*    ( 11)  |11111111|11111111|11111110|1001     */    {0xfffffe9,28},
+        /*    ( 12)  |11111111|11111111|11111110|1010     */    {0xfffffea,28},
+        /*    ( 13)  |11111111|11111111|11111111|111101   */   {0x3ffffffd,30},
+        /*    ( 14)  |11111111|11111111|11111110|1011     */    {0xfffffeb,28},
+        /*    ( 15)  |11111111|11111111|11111110|1100     */    {0xfffffec,28},
+        /*    ( 16)  |11111111|11111111|11111110|1101     */    {0xfffffed,28},
+        /*    ( 17)  |11111111|11111111|11111110|1110     */    {0xfffffee,28},
+        /*    ( 18)  |11111111|11111111|11111110|1111     */    {0xfffffef,28},
+        /*    ( 19)  |11111111|11111111|11111111|0000     */    {0xffffff0,28},
+        /*    ( 20)  |11111111|11111111|11111111|0001     */    {0xffffff1,28},
+        /*    ( 21)  |11111111|11111111|11111111|0010     */    {0xffffff2,28},
+        /*    ( 22)  |11111111|11111111|11111111|111110   */   {0x3ffffffe,30},
+        /*    ( 23)  |11111111|11111111|11111111|0011     */    {0xffffff3,28},
+        /*    ( 24)  |11111111|11111111|11111111|0100     */    {0xffffff4,28},
+        /*    ( 25)  |11111111|11111111|11111111|0101     */    {0xffffff5,28},
+        /*    ( 26)  |11111111|11111111|11111111|0110     */    {0xffffff6,28},
+        /*    ( 27)  |11111111|11111111|11111111|0111     */    {0xffffff7,28},
+        /*    ( 28)  |11111111|11111111|11111111|1000     */    {0xffffff8,28},
+        /*    ( 29)  |11111111|11111111|11111111|1001     */    {0xffffff9,28},
+        /*    ( 30)  |11111111|11111111|11111111|1010     */    {0xffffffa,28},
+        /*    ( 31)  |11111111|11111111|11111111|1011     */    {0xffffffb,28},
+        /*' ' ( 32)  |010100                              */         {0x14, 6},
+        /*'!' ( 33)  |11111110|00                         */        {0x3f8,10},
+        /*'"' ( 34)  |11111110|01                         */        {0x3f9,10},
+        /*'#' ( 35)  |11111111|1010                       */        {0xffa,12},
+        /*'$' ( 36)  |11111111|11001                      */       {0x1ff9,13},
+        /*'%' ( 37)  |010101                              */         {0x15, 6},
+        /*'&' ( 38)  |11111000                            */         {0xf8, 8},
+        /*''' ( 39)  |11111111|010                        */        {0x7fa,11},
+        /*'(' ( 40)  |11111110|10                         */        {0x3fa,10},
+        /*')' ( 41)  |11111110|11                         */        {0x3fb,10},
+        /*'*' ( 42)  |11111001                            */         {0xf9, 8},
+        /*'+' ( 43)  |11111111|011                        */        {0x7fb,11},
+        /*',' ( 44)  |11111010                            */         {0xfa, 8},
+        /*'-' ( 45)  |010110                              */         {0x16, 6},
+        /*'.' ( 46)  |010111                              */         {0x17, 6},
+        /*'/' ( 47)  |011000                              */         {0x18, 6},
+        /*'0' ( 48)  |00000                               */          {0x0, 5},
+        /*'1' ( 49)  |00001                               */          {0x1, 5},
+        /*'2' ( 50)  |00010                               */          {0x2, 5},
+        /*'3' ( 51)  |011001                              */         {0x19, 6},
+        /*'4' ( 52)  |011010                              */         {0x1a, 6},
+        /*'5' ( 53)  |011011                              */         {0x1b, 6},
+        /*'6' ( 54)  |011100                              */         {0x1c, 6},
+        /*'7' ( 55)  |011101                              */         {0x1d, 6},
+        /*'8' ( 56)  |011110                              */         {0x1e, 6},
+        /*'9' ( 57)  |011111                              */         {0x1f, 6},
+        /*':' ( 58)  |1011100                             */         {0x5c, 7},
+        /*';' ( 59)  |11111011                            */         {0xfb, 8},
+        /*'<' ( 60)  |11111111|1111100                    */       {0x7ffc,15},
+        /*'=' ( 61)  |100000                              */         {0x20, 6},
+        /*'>' ( 62)  |11111111|1011                       */        {0xffb,12},
+        /*'?' ( 63)  |11111111|00                         */        {0x3fc,10},
+        /*'@' ( 64)  |11111111|11010                      */       {0x1ffa,13},
+        /*'A' ( 65)  |100001                              */         {0x21, 6},
+        /*'B' ( 66)  |1011101                             */         {0x5d, 7},
+        /*'C' ( 67)  |1011110                             */         {0x5e, 7},
+        /*'D' ( 68)  |1011111                             */         {0x5f, 7},
+        /*'E' ( 69)  |1100000                             */         {0x60, 7},
+        /*'F' ( 70)  |1100001                             */         {0x61, 7},
+        /*'G' ( 71)  |1100010                             */         {0x62, 7},
+        /*'H' ( 72)  |1100011                             */         {0x63, 7},
+        /*'I' ( 73)  |1100100                             */         {0x64, 7},
+        /*'J' ( 74)  |1100101                             */         {0x65, 7},
+        /*'K' ( 75)  |1100110                             */         {0x66, 7},
+        /*'L' ( 76)  |1100111                             */         {0x67, 7},
+        /*'M' ( 77)  |1101000                             */         {0x68, 7},
+        /*'N' ( 78)  |1101001                             */         {0x69, 7},
+        /*'O' ( 79)  |1101010                             */         {0x6a, 7},
+        /*'P' ( 80)  |1101011                             */         {0x6b, 7},
+        /*'Q' ( 81)  |1101100                             */         {0x6c, 7},
+        /*'R' ( 82)  |1101101                             */         {0x6d, 7},
+        /*'S' ( 83)  |1101110                             */         {0x6e, 7},
+        /*'T' ( 84)  |1101111                             */         {0x6f, 7},
+        /*'U' ( 85)  |1110000                             */         {0x70, 7},
+        /*'V' ( 86)  |1110001                             */         {0x71, 7},
+        /*'W' ( 87)  |1110010                             */         {0x72, 7},
+        /*'X' ( 88)  |11111100                            */         {0xfc, 8},
+        /*'Y' ( 89)  |1110011                             */         {0x73, 7},
+        /*'Z' ( 90)  |11111101                            */         {0xfd, 8},
+        /*'[' ( 91)  |11111111|11011                      */       {0x1ffb,13},
+        /*'\' ( 92)  |11111111|11111110|000               */      {0x7fff0,19},
+        /*']' ( 93)  |11111111|11100                      */       {0x1ffc,13},
+        /*'^' ( 94)  |11111111|111100                     */       {0x3ffc,14},
+        /*'_' ( 95)  |100010                              */         {0x22, 6},
+        /*'`' ( 96)  |11111111|1111101                    */       {0x7ffd,15},
+        /*'a' ( 97)  |00011                               */          {0x3, 5},
+        /*'b' ( 98)  |100011                              */         {0x23, 6},
+        /*'c' ( 99)  |00100                               */          {0x4, 5},
+        /*'d' (100)  |100100                              */         {0x24, 6},
+        /*'e' (101)  |00101                               */          {0x5, 5},
+        /*'f' (102)  |100101                              */         {0x25, 6},
+        /*'g' (103)  |100110                              */         {0x26, 6},
+        /*'h' (104)  |100111                              */         {0x27, 6},
+        /*'i' (105)  |00110                               */          {0x6, 5},
+        /*'j' (106)  |1110100                             */         {0x74, 7},
+        /*'k' (107)  |1110101                             */         {0x75, 7},
+        /*'l' (108)  |101000                              */         {0x28, 6},
+        /*'m' (109)  |101001                              */         {0x29, 6},
+        /*'n' (110)  |101010                              */         {0x2a, 6},
+        /*'o' (111)  |00111                               */          {0x7, 5},
+        /*'p' (112)  |101011                              */         {0x2b, 6},
+        /*'q' (113)  |1110110                             */         {0x76, 7},
+        /*'r' (114)  |101100                              */         {0x2c, 6},
+        /*'s' (115)  |01000                               */          {0x8, 5},
+        /*'t' (116)  |01001                               */          {0x9, 5},
+        /*'u' (117)  |101101                              */         {0x2d, 6},
+        /*'v' (118)  |1110111                             */         {0x77, 7},
+        /*'w' (119)  |1111000                             */         {0x78, 7},
+        /*'x' (120)  |1111001                             */         {0x79, 7},
+        /*'y' (121)  |1111010                             */         {0x7a, 7},
+        /*'z' (122)  |1111011                             */         {0x7b, 7},
+        /*'{' (123)  |11111111|1111110                    */       {0x7ffe,15},
+        /*'|' (124)  |11111111|100                        */        {0x7fc,11},
+        /*'}' (125)  |11111111|111101                     */       {0x3ffd,14},
+        /*'~' (126)  |11111111|11101                      */       {0x1ffd,13},
+        /*    (127)  |11111111|11111111|11111111|1100     */    {0xffffffc,28},
+        /*    (128)  |11111111|11111110|0110              */      {0xfffe6,20},
+        /*    (129)  |11111111|11111111|010010            */     {0x3fffd2,22},
+        /*    (130)  |11111111|11111110|0111              */      {0xfffe7,20},
+        /*    (131)  |11111111|11111110|1000              */      {0xfffe8,20},
+        /*    (132)  |11111111|11111111|010011            */     {0x3fffd3,22},
+        /*    (133)  |11111111|11111111|010100            */     {0x3fffd4,22},
+        /*    (134)  |11111111|11111111|010101            */     {0x3fffd5,22},
+        /*    (135)  |11111111|11111111|1011001           */     {0x7fffd9,23},
+        /*    (136)  |11111111|11111111|010110            */     {0x3fffd6,22},
+        /*    (137)  |11111111|11111111|1011010           */     {0x7fffda,23},
+        /*    (138)  |11111111|11111111|1011011           */     {0x7fffdb,23},
+        /*    (139)  |11111111|11111111|1011100           */     {0x7fffdc,23},
+        /*    (140)  |11111111|11111111|1011101           */     {0x7fffdd,23},
+        /*    (141)  |11111111|11111111|1011110           */     {0x7fffde,23},
+        /*    (142)  |11111111|11111111|11101011          */     {0xffffeb,24},
+        /*    (143)  |11111111|11111111|1011111           */     {0x7fffdf,23},
+        /*    (144)  |11111111|11111111|11101100          */     {0xffffec,24},
+        /*    (145)  |11111111|11111111|11101101          */     {0xffffed,24},
+        /*    (146)  |11111111|11111111|010111            */     {0x3fffd7,22},
+        /*    (147)  |11111111|11111111|1100000           */     {0x7fffe0,23},
+        /*    (148)  |11111111|11111111|11101110          */     {0xffffee,24},
+        /*    (149)  |11111111|11111111|1100001           */     {0x7fffe1,23},
+        /*    (150)  |11111111|11111111|1100010           */     {0x7fffe2,23},
+        /*    (151)  |11111111|11111111|1100011           */     {0x7fffe3,23},
+        /*    (152)  |11111111|11111111|1100100           */     {0x7fffe4,23},
+        /*    (153)  |11111111|11111110|11100             */     {0x1fffdc,21},
+        /*    (154)  |11111111|11111111|011000            */     {0x3fffd8,22},
+        /*    (155)  |11111111|11111111|1100101           */     {0x7fffe5,23},
+        /*    (156)  |11111111|11111111|011001            */     {0x3fffd9,22},
+        /*    (157)  |11111111|11111111|1100110           */     {0x7fffe6,23},
+        /*    (158)  |11111111|11111111|1100111           */     {0x7fffe7,23},
+        /*    (159)  |11111111|11111111|11101111          */     {0xffffef,24},
+        /*    (160)  |11111111|11111111|011010            */     {0x3fffda,22},
+        /*    (161)  |11111111|11111110|11101             */     {0x1fffdd,21},
+        /*    (162)  |11111111|11111110|1001              */      {0xfffe9,20},
+        /*    (163)  |11111111|11111111|011011            */     {0x3fffdb,22},
+        /*    (164)  |11111111|11111111|011100            */     {0x3fffdc,22},
+        /*    (165)  |11111111|11111111|1101000           */     {0x7fffe8,23},
+        /*    (166)  |11111111|11111111|1101001           */     {0x7fffe9,23},
+        /*    (167)  |11111111|11111110|11110             */     {0x1fffde,21},
+        /*    (168)  |11111111|11111111|1101010           */     {0x7fffea,23},
+        /*    (169)  |11111111|11111111|011101            */     {0x3fffdd,22},
+        /*    (170)  |11111111|11111111|011110            */     {0x3fffde,22},
+        /*    (171)  |11111111|11111111|11110000          */     {0xfffff0,24},
+        /*    (172)  |11111111|11111110|11111             */     {0x1fffdf,21},
+        /*    (173)  |11111111|11111111|011111            */     {0x3fffdf,22},
+        /*    (174)  |11111111|11111111|1101011           */     {0x7fffeb,23},
+        /*    (175)  |11111111|11111111|1101100           */     {0x7fffec,23},
+        /*    (176)  |11111111|11111111|00000             */     {0x1fffe0,21},
+        /*    (177)  |11111111|11111111|00001             */     {0x1fffe1,21},
+        /*    (178)  |11111111|11111111|100000            */     {0x3fffe0,22},
+        /*    (179)  |11111111|11111111|00010             */     {0x1fffe2,21},
+        /*    (180)  |11111111|11111111|1101101           */     {0x7fffed,23},
+        /*    (181)  |11111111|11111111|100001            */     {0x3fffe1,22},
+        /*    (182)  |11111111|11111111|1101110           */     {0x7fffee,23},
+        /*    (183)  |11111111|11111111|1101111           */     {0x7fffef,23},
+        /*    (184)  |11111111|11111110|1010              */      {0xfffea,20},
+        /*    (185)  |11111111|11111111|100010            */     {0x3fffe2,22},
+        /*    (186)  |11111111|11111111|100011            */     {0x3fffe3,22},
+        /*    (187)  |11111111|11111111|100100            */     {0x3fffe4,22},
+        /*    (188)  |11111111|11111111|1110000           */     {0x7ffff0,23},
+        /*    (189)  |11111111|11111111|100101            */     {0x3fffe5,22},
+        /*    (190)  |11111111|11111111|100110            */     {0x3fffe6,22},
+        /*    (191)  |11111111|11111111|1110001           */     {0x7ffff1,23},
+        /*    (192)  |11111111|11111111|11111000|00       */    {0x3ffffe0,26},
+        /*    (193)  |11111111|11111111|11111000|01       */    {0x3ffffe1,26},
+        /*    (194)  |11111111|11111110|1011              */      {0xfffeb,20},
+        /*    (195)  |11111111|11111110|001               */      {0x7fff1,19},
+        /*    (196)  |11111111|11111111|100111            */     {0x3fffe7,22},
+        /*    (197)  |11111111|11111111|1110010           */     {0x7ffff2,23},
+        /*    (198)  |11111111|11111111|101000            */     {0x3fffe8,22},
+        /*    (199)  |11111111|11111111|11110110|0        */    {0x1ffffec,25},
+        /*    (200)  |11111111|11111111|11111000|10       */    {0x3ffffe2,26},
+        /*    (201)  |11111111|11111111|11111000|11       */    {0x3ffffe3,26},
+        /*    (202)  |11111111|11111111|11111001|00       */    {0x3ffffe4,26},
+        /*    (203)  |11111111|11111111|11111011|110      */    {0x7ffffde,27},
+        /*    (204)  |11111111|11111111|11111011|111      */    {0x7ffffdf,27},
+        /*    (205)  |11111111|11111111|11111001|01       */    {0x3ffffe5,26},
+        /*    (206)  |11111111|11111111|11110001          */     {0xfffff1,24},
+        /*    (207)  |11111111|11111111|11110110|1        */    {0x1ffffed,25},
+        /*    (208)  |11111111|11111110|010               */      {0x7fff2,19},
+        /*    (209)  |11111111|11111111|00011             */     {0x1fffe3,21},
+        /*    (210)  |11111111|11111111|11111001|10       */    {0x3ffffe6,26},
+        /*    (211)  |11111111|11111111|11111100|000      */    {0x7ffffe0,27},
+        /*    (212)  |11111111|11111111|11111100|001      */    {0x7ffffe1,27},
+        /*    (213)  |11111111|11111111|11111001|11       */    {0x3ffffe7,26},
+        /*    (214)  |11111111|11111111|11111100|010      */    {0x7ffffe2,27},
+        /*    (215)  |11111111|11111111|11110010          */     {0xfffff2,24},
+        /*    (216)  |11111111|11111111|00100             */     {0x1fffe4,21},
+        /*    (217)  |11111111|11111111|00101             */     {0x1fffe5,21},
+        /*    (218)  |11111111|11111111|11111010|00       */    {0x3ffffe8,26},
+        /*    (219)  |11111111|11111111|11111010|01       */    {0x3ffffe9,26},
+        /*    (220)  |11111111|11111111|11111111|1101     */    {0xffffffd,28},
+        /*    (221)  |11111111|11111111|11111100|011      */    {0x7ffffe3,27},
+        /*    (222)  |11111111|11111111|11111100|100      */    {0x7ffffe4,27},
+        /*    (223)  |11111111|11111111|11111100|101      */    {0x7ffffe5,27},
+        /*    (224)  |11111111|11111110|1100              */      {0xfffec,20},
+        /*    (225)  |11111111|11111111|11110011          */     {0xfffff3,24},
+        /*    (226)  |11111111|11111110|1101              */      {0xfffed,20},
+        /*    (227)  |11111111|11111111|00110             */     {0x1fffe6,21},
+        /*    (228)  |11111111|11111111|101001            */     {0x3fffe9,22},
+        /*    (229)  |11111111|11111111|00111             */     {0x1fffe7,21},
+        /*    (230)  |11111111|11111111|01000             */     {0x1fffe8,21},
+        /*    (231)  |11111111|11111111|1110011           */     {0x7ffff3,23},
+        /*    (232)  |11111111|11111111|101010            */     {0x3fffea,22},
+        /*    (233)  |11111111|11111111|101011            */     {0x3fffeb,22},
+        /*    (234)  |11111111|11111111|11110111|0        */    {0x1ffffee,25},
+        /*    (235)  |11111111|11111111|11110111|1        */    {0x1ffffef,25},
+        /*    (236)  |11111111|11111111|11110100          */     {0xfffff4,24},
+        /*    (237)  |11111111|11111111|11110101          */     {0xfffff5,24},
+        /*    (238)  |11111111|11111111|11111010|10       */    {0x3ffffea,26},
+        /*    (239)  |11111111|11111111|1110100           */     {0x7ffff4,23},
+        /*    (240)  |11111111|11111111|11111010|11       */    {0x3ffffeb,26},
+        /*    (241)  |11111111|11111111|11111100|110      */    {0x7ffffe6,27},
+        /*    (242)  |11111111|11111111|11111011|00       */    {0x3ffffec,26},
+        /*    (243)  |11111111|11111111|11111011|01       */    {0x3ffffed,26},
+        /*    (244)  |11111111|11111111|11111100|111      */    {0x7ffffe7,27},
+        /*    (245)  |11111111|11111111|11111101|000      */    {0x7ffffe8,27},
+        /*    (246)  |11111111|11111111|11111101|001      */    {0x7ffffe9,27},
+        /*    (247)  |11111111|11111111|11111101|010      */    {0x7ffffea,27},
+        /*    (248)  |11111111|11111111|11111101|011      */    {0x7ffffeb,27},
+        /*    (249)  |11111111|11111111|11111111|1110     */    {0xffffffe,28},
+        /*    (250)  |11111111|11111111|11111101|100      */    {0x7ffffec,27},
+        /*    (251)  |11111111|11111111|11111101|101      */    {0x7ffffed,27},
+        /*    (252)  |11111111|11111111|11111101|110      */    {0x7ffffee,27},
+        /*    (253)  |11111111|11111111|11111101|111      */    {0x7ffffef,27},
+        /*    (254)  |11111111|11111111|11111110|000      */    {0x7fffff0,27},
+        /*    (255)  |11111111|11111111|11111011|10       */    {0x3ffffee,26},
+        /*EOS (256)  |11111111|11111111|11111111|111111   */   {0x3fffffff,30},
+    };
+
+    static final int[][] LCCODES = new int[CODES.length][];
+    
+    // Huffman decode tree stored in a flattened char array for good 
+    // locality of reference.
+    static final char[] tree;
+    static final char[] rowsym;
+    static final byte[] rowbits;
+
+    // Build the Huffman lookup tree and LC TABLE
+    static 
+    {
+        System.arraycopy(CODES,0,LCCODES,0,CODES.length);
+        for (int i='A';i<='Z';i++)
+            LCCODES[i]=LCCODES['a'+i-'A'];
+        
+        int r=0;
+        for (int i=0;i<CODES.length;i++)
+            r+=(CODES[i][1]+7)/8;
+        tree=new char[r*256];
+        rowsym=new char[r];
+        rowbits=new byte[r];
+
+        r=0;
+        for (int sym = 0; sym < CODES.length; sym++) 
+        {
+            int code = CODES[sym][0];
+            int len = CODES[sym][1];
+
+            int current = 0;
+
+            while (len > 8) 
+            {
+                len -= 8;
+                int i = ((code >>> len) & 0xFF);
+
+                int t=current*256+i;
+                current = tree[t];
+                if (current == 0)
+                {
+                    tree[t] = (char)++r;
+                    current=r;
+                }
+            }
+
+            int terminal = ++r;
+            rowsym[r]=(char)sym;
+            int b = len & 0x07;
+            int terminalBits = b == 0?8:b;
+
+            rowbits[r]=(byte)terminalBits;
+            int shift = 8 - len;
+            int start = current*256 + ((code << shift) & 0xFF);
+            int end = start + (1<<shift);
+            for (int i = start; i < end; i++)
+                tree[i]=(char)terminal;
+        }
+    }
+
+    public static String decode(ByteBuffer buffer)
+    {  
+        return decode(buffer,buffer.remaining());
+    }
+
+    public static String decode(ByteBuffer buffer,int length)
+    {        
+        StringBuilder out = new StringBuilder(length*2);
+        int node = 0;
+        int current = 0;
+        int bits = 0;
+        
+        byte[] array = buffer.array();
+        int position=buffer.position();
+        int start=buffer.arrayOffset()+position;
+        int end=start+length;
+        buffer.position(position+length);
+        
+        for (int i=start; i<end; i++)
+        {
+            int b = array[i]&0xFF;
+            current = (current << 8) | b;
+            bits += 8;
+            while (bits >= 8) 
+            {
+                int c = (current >>> (bits - 8)) & 0xFF;
+                node = tree[node*256+c];
+                if (rowbits[node]!=0) 
+                {
+                    // terminal node
+                    out.append(rowsym[node]);
+                    bits -= rowbits[node];
+                    node = 0;
+                } 
+                else 
+                {
+                    // non-terminal node
+                    bits -= 8;
+                }
+            }
+        }
+
+        while (bits > 0) 
+        {
+            int c = (current << (8 - bits)) & 0xFF;
+            node = tree[node*256+c];
+            if (rowbits[node]==0 || rowbits[node] > bits) 
+                break;
+            
+            if (rowbits[node]==0)
+                throw new IllegalStateException();
+            
+            out.append(rowsym[node]);
+            bits -= rowbits[node];
+            node = 0;
+        }
+
+        return out.toString();
+    }
+
+    public static int octetsNeeded(String s)
+    {   
+        return octetsNeeded(CODES,s);
+    }
+    
+    public static void encode(ByteBuffer buffer,String s)
+    {
+        encode(CODES,buffer,s);
+    }
+    
+    public static int octetsNeededLC(String s)
+    {
+        return octetsNeeded(LCCODES,s);
+    }
+
+    public static void encodeLC(ByteBuffer buffer, String s)
+    {
+        encode(LCCODES,buffer,s);
+    }
+    
+    private static int octetsNeeded(final int[][] table,String s)
+    {   
+        int needed=0;
+        int len = s.length();
+        for (int i=0;i<len;i++)
+        {
+            char c=s.charAt(i);
+            if (c>=128 || c<' ')
+                throw new IllegalArgumentException();
+            needed += table[c][1];
+        }
+
+        return (needed+7) / 8;
+    }
+
+    private static void encode(final int[][] table,ByteBuffer buffer,String s)
+    {
+        long current = 0;
+        int n = 0;
+
+        byte[] array = buffer.array();
+        int p=buffer.arrayOffset()+buffer.position();
+
+        int len = s.length();
+        for (int i=0;i<len;i++)
+        {
+            char c=s.charAt(i);
+            if (c>=128 || c<' ')
+                throw new IllegalArgumentException();
+            int code = table[c][0];
+            int bits = table[c][1];
+
+            current <<= bits;
+            current |= code;
+            n += bits;
+
+            while (n >= 8) 
+            {
+                n -= 8;
+                array[p++]=(byte)(current >> n);
+            }
+        }
+
+        if (n > 0) 
+        {
+          current <<= (8 - n);
+          current |= (0xFF >>> n); 
+          array[p++]=(byte)current;
+        }
+        
+        buffer.position(p-buffer.arrayOffset());
+    }
+
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/MetaDataBuilder.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/MetaDataBuilder.java
new file mode 100644
index 0000000000..1db32e3a1e
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/MetaDataBuilder.java
@@ -0,0 +1,184 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+
+package org.eclipse.jetty.http2.hpack;
+
+
+import org.eclipse.jetty.http.BadMessageException;
+import org.eclipse.jetty.http.HostPortHttpField;
+import org.eclipse.jetty.http.HttpField;
+import org.eclipse.jetty.http.HttpFields;
+import org.eclipse.jetty.http.HttpScheme;
+import org.eclipse.jetty.http.HttpStatus;
+import org.eclipse.jetty.http.HttpVersion;
+import org.eclipse.jetty.http.MetaData;
+
+public class MetaDataBuilder
+{ 
+    private final int _maxSize;
+    private int _size;
+    private int _status;
+    private String _method;
+    private HttpScheme _scheme;
+    private HostPortHttpField _authority;
+    private String _path;  
+    private long _contentLength=Long.MIN_VALUE;
+
+    private HttpFields _fields = new HttpFields(10);
+    
+    /* ------------------------------------------------------------ */
+    /**
+     * @param maxHeadersSize The maximum size of the headers, expressed as total name and value characters.
+     */
+    MetaDataBuilder(int maxHeadersSize)
+    {
+        _maxSize=maxHeadersSize;
+    }
+    
+    /** Get the maxSize.
+     * @return the maxSize
+     */
+    public int getMaxSize()
+    {
+        return _maxSize;
+    }
+
+    /** Get the size.
+     * @return the current size in bytes
+     */
+    public int getSize()
+    {
+        return _size;
+    }
+
+    public void emit(HttpField field)
+    {        
+        int field_size = field.getName().length()+field.getValue().length();
+        _size+=field_size;
+        if (_size>_maxSize)
+            throw new BadMessageException(HttpStatus.REQUEST_ENTITY_TOO_LARGE_413,"Header size "+_size+">"+_maxSize);
+        
+        if (field instanceof StaticTableHttpField)
+        {
+            StaticTableHttpField value = (StaticTableHttpField)field;
+            switch(field.getHeader())
+            {
+                case C_STATUS:
+                    _status=(Integer)value.getStaticValue();
+                    break;
+                    
+                case C_METHOD:
+                    _method=field.getValue();
+                    break;
+
+                case C_SCHEME:
+                    _scheme = (HttpScheme)value.getStaticValue();
+                    break;
+                    
+                default:
+                    throw new IllegalArgumentException(field.getName());
+            }
+        }
+        else if (field.getHeader()!=null)
+        {
+            switch(field.getHeader())
+            {
+                case C_STATUS:
+                    _status=field.getIntValue();
+                    break;
+
+                case C_METHOD:
+                    _method=field.getValue();
+                    break;
+
+                case C_SCHEME:
+                    _scheme = HttpScheme.CACHE.get(field.getValue());
+                    break;
+
+                case C_AUTHORITY:
+                    _authority=(field instanceof HostPortHttpField)?((HostPortHttpField)field):new AuthorityHttpField(field.getValue());
+                    break;
+
+                case HOST:
+                    // :authority fields must come first.  If we have one, ignore the host header as far as authority goes.
+                    if (_authority==null)
+                        _authority=(field instanceof HostPortHttpField)?((HostPortHttpField)field):new AuthorityHttpField(field.getValue());
+                    _fields.add(field);
+                    break;
+
+                case C_PATH:
+                    _path = field.getValue();
+                    break;
+
+                case CONTENT_LENGTH:
+                    _contentLength = field.getLongValue();
+                    _fields.add(field);
+                    break;
+                    
+                default:
+                    if (field.getName().charAt(0)!=':')
+                        _fields.add(field);
+            }
+        }
+        else
+        {
+            if (field.getName().charAt(0)!=':')
+                _fields.add(field);
+        }
+    }
+    
+    public MetaData build()
+    {
+        try
+        {
+            HttpFields fields = _fields;
+            _fields = new HttpFields(Math.max(10,fields.size()+5));
+            
+            if (_method!=null)
+                return new MetaData.Request(_method,_scheme,_authority,_path,HttpVersion.HTTP_2,fields,_contentLength);
+            if (_status!=0)
+                return new MetaData.Response(HttpVersion.HTTP_2,_status,fields,_contentLength);
+            return new MetaData(HttpVersion.HTTP_2,fields,_contentLength);
+        }
+        finally
+        {
+            _status=0;
+            _method=null;
+            _scheme=null;
+            _authority=null;
+            _path=null;
+            _size=0;
+            _contentLength=Long.MIN_VALUE;
+        }
+    }
+
+    /* ------------------------------------------------------------ */
+    /** Check that the max size will not be exceeded.
+     * @param length the length
+     * @param huffman the huffman name
+     */
+    public void checkSize(int length, boolean huffman)
+    {
+        // Apply a huffman fudge factor
+        if (huffman)
+            length=(length*4)/3;
+        if ((_size+length)>_maxSize)
+            throw new BadMessageException(HttpStatus.REQUEST_ENTITY_TOO_LARGE_413,"Header size "+(_size+length)+">"+_maxSize);
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/NBitInteger.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/NBitInteger.java
new file mode 100644
index 0000000000..5e991173dc
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/NBitInteger.java
@@ -0,0 +1,151 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.http2.hpack;
+
+import java.nio.ByteBuffer;
+
+public class NBitInteger
+{
+    public static int octectsNeeded(int n,int i)
+    {
+        if (n==8)
+        {
+            int nbits = 0xFF;
+            i=i-nbits;
+            if (i<0)
+                return 1;
+            if (i==0)
+                return 2;
+            int lz=Integer.numberOfLeadingZeros(i);
+            int log=32-lz;
+            return 1+(log+6)/7;
+        }
+        
+        int nbits = 0xFF >>> (8 - n);
+        i=i-nbits;
+        if (i<0)
+            return 0;
+        if (i==0)
+            return 1;
+        int lz=Integer.numberOfLeadingZeros(i);
+        int log=32-lz;
+        return (log+6)/7;
+    }
+    
+    public static void encode(ByteBuffer buf, int n, int i)
+    {
+        if (n==8)
+        {
+            if (i < 0xFF)
+            {
+                buf.put((byte)i);
+            }
+            else
+            {
+                buf.put((byte)0xFF);
+
+                int length = i - 0xFF;
+                while (true)
+                {
+                    if ((length & ~0x7F) == 0)
+                    {
+                        buf.put((byte)length);
+                        return;
+                    }
+                    else
+                    {
+                        buf.put((byte)((length & 0x7F) | 0x80));
+                        length >>>= 7;
+                    }
+                }
+            }
+        }
+        else
+        {
+            int p=buf.position()-1;
+            int bits = 0xFF >>> (8 - n);
+
+            if (i < bits)
+            {
+                buf.put(p,(byte)((buf.get(p)&~bits)|i));
+            }
+            else
+            {
+                buf.put(p,(byte)(buf.get(p)|bits));
+
+                int length = i - bits;
+                while (true)
+                {
+                    if ((length & ~0x7F) == 0)
+                    {
+                        buf.put((byte)length);
+                        return;
+                    }
+                    else
+                    {
+                        buf.put((byte)((length & 0x7F) | 0x80));
+                        length >>>= 7;
+                    }
+                }
+            }
+        }
+    }
+
+    public static int decode(ByteBuffer buffer, int n)
+    {
+        if (n==8)
+        {
+            int nbits = 0xFF;
+
+            int i=buffer.get()&0xff;
+            
+            if (i == nbits)
+            {       
+                int m=1;
+                int b;
+                do
+                {
+                    b = 0xff&buffer.get();
+                    i = i + (b&127) * m;
+                    m = m*128;
+                }
+                while ((b&128) == 128);
+            }
+            return i;
+        }
+        
+        int nbits = 0xFF >>> (8 - n);
+
+        int i=buffer.get(buffer.position()-1)&nbits;
+        
+        if (i == nbits)
+        {       
+            int m=1;
+            int b;
+            do
+            {
+                b = 0xff&buffer.get();
+                i = i + (b&127) * m;
+                m = m*128;
+            }
+            while ((b&128) == 128);
+        }
+        return i;
+    }
+}
diff --git a/org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/StaticTableHttpField.java b/org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/StaticTableHttpField.java
new file mode 100644
index 0000000000..275ab53629
--- /dev/null
+++ b/org.eclipse.jetty.http/src/org/eclipse/jetty/http2/hpack/StaticTableHttpField.java
@@ -0,0 +1,61 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+
+package org.eclipse.jetty.http2.hpack;
+
+import org.eclipse.jetty.http.HttpField;
+import org.eclipse.jetty.http.HttpHeader;
+
+/* ------------------------------------------------------------ */
+public class StaticTableHttpField extends HttpField
+{
+    private final Object _value;
+
+    public StaticTableHttpField(HttpHeader header, String name, String valueString, Object value)
+    {
+        super(header,name,valueString);
+        if (value==null)
+            throw new IllegalArgumentException();
+        _value=value;
+    }
+    
+    public StaticTableHttpField(HttpHeader header,String valueString, Object value)
+    {
+        this (header,header.asString(),valueString, value);
+    }
+    
+    public StaticTableHttpField(String name, String valueString, Object value)
+    {
+        super(name,valueString);
+        if (value==null)
+            throw new IllegalArgumentException();
+        _value=value;
+    }
+
+    public Object getStaticValue()
+    {
+        return _value;
+    }
+    
+    @Override
+    public String toString()
+    {
+        return super.toString()+"(evaluated)";
+    }
+}
\ No newline at end of file

From cf8b2221cbb82b2c6a9155e149a849fe052c619c Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Fri, 8 Jul 2016 23:49:37 +0700
Subject: [PATCH 23/34] IDEMPIERE-3136:all stuff relate library of idempiere
 correct, add some common bundle

---
 org.adempiere.base-feature/feature.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml
index 5e83b1a700..fa86176e0b 100644
--- a/org.adempiere.base-feature/feature.xml
+++ b/org.adempiere.base-feature/feature.xml
@@ -376,7 +376,6 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         fragment="true"
          unpack="false"/>
 
    <plugin
@@ -384,7 +383,6 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         fragment="true"
          unpack="false"/>
          
    <plugin
@@ -392,7 +390,6 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         fragment="true"
          unpack="false"/>
 
    <plugin

From 3bed8537506fb3bb3bb1fb8c3f44f9c4aac35c57 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Sun, 10 Jul 2016 04:08:37 +0700
Subject: [PATCH 24/34] IDEMPIERE-3136:all stuff relate library of idempiere
 remove version of dependency bundle. will add version limit when see any
 necessary (newest version isn't compatible, beta version,...)

---
 org.adempiere.sdk-feature/adempiere.cquery | 2 --
 1 file changed, 2 deletions(-)

diff --git a/org.adempiere.sdk-feature/adempiere.cquery b/org.adempiere.sdk-feature/adempiere.cquery
index 3a8388744e..ad25ebad0a 100644
--- a/org.adempiere.sdk-feature/adempiere.cquery
+++ b/org.adempiere.sdk-feature/adempiere.cquery
@@ -9,8 +9,6 @@
     <cq:property key="target.ws" value="*"/>
 
     <cq:advisorNode namePattern="^org\.objectweb\.asm(\..+)?" componentType="osgi.bundle" versionOverride="[5.0.1,6.0.0)"/>
-    <cq:advisorNode namePattern="^org\.apache\.felix\.webconsole$" useTargetPlatform="false" useWorkspace="false" versionOverride="[4.2.2,4.3.0)"/>
-    <cq:advisorNode namePattern="^org\.apache\.felix\.webconsole\.plugins\.packageadmin$" useTargetPlatform="false" useWorkspace="false" versionOverride="[1.0.0,1.0.0]"/>
     <cq:advisorNode namePattern="^org\.eclipse\.jetty\.osgi-servlet-api$" useTargetPlatform="false" useWorkspace="false" versionOverride="[0.0.0,9.3.11]"/>
     <cq:advisorNode namePattern="^org\.eclipse\.jetty\.alpn\.api$" versionOverride="[0.0.0,9.3.11)"/>
     <cq:advisorNode namePattern="^org\.eclipse\.jetty(\..+)?" useTargetPlatform="false" useWorkspace="false" versionOverride="[9.2.0,9.3.11)"/>

From 35548c18e8936351690668e0139eba2b50df0b93 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Sun, 10 Jul 2016 04:52:14 +0700
Subject: [PATCH 25/34] IDEMPIERE-3136:all stuff relate library of idempiere
 update lauching, configuration for update library and 9.3.10 http2

---
 org.adempiere.server-feature/idempiere-server.sh          | 2 +-
 org.adempiere.server-feature/server.product               | 4 ++--
 org.adempiere.server-feature/server.product.launch        | 6 +++---
 .../setup/configuration/config.ini                        | 8 ++++++++
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/org.adempiere.server-feature/idempiere-server.sh b/org.adempiere.server-feature/idempiere-server.sh
index 1308a078a2..b0cb2c396c 100644
--- a/org.adempiere.server-feature/idempiere-server.sh
+++ b/org.adempiere.server-feature/idempiere-server.sh
@@ -19,4 +19,4 @@ echo ===================================
 
 unset DISPLAY
 BASE=`dirname $( readlink -f idempiere-server.sh )`
-$JAVA ${DEBUG} -Dosgi.console=localhost:12612 -Djetty.home=$BASE/jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-selector.xml,etc/jetty-ssl.xml,etc/jetty-https.xml,etc/jetty-deployer.xml -XX:MaxPermSize=192m -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: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
diff --git a/org.adempiere.server-feature/server.product b/org.adempiere.server-feature/server.product
index 6b786abf97..3fb4044159 100644
--- a/org.adempiere.server-feature/server.product
+++ b/org.adempiere.server-feature/server.product
@@ -7,10 +7,10 @@
    </configIni>
 
    <launcherArgs>
-      <programArgs>--launcher.XXMaxPermSize 192m
+      <programArgs>
          <argsX86>-console 12612 --launcher.XXMaxPermSize 192m</argsX86>
       </programArgs>
-      <vmArgs>-Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-selector.xml,etc/jetty-ssl.xml,etc/jetty-https.xml,etc/jetty-deployer.xml -Dosgi.console=localhost:12612 -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true
+      <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
          <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
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index 651c99c7e8..e47fef68ac 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -19,13 +19,13 @@
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dosgi.compatibility.bootdelegation=true -Dosgi.console.enable.builtin=false -XX:MaxPermSize=128M -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  -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true&#10;-Dhazelcast.config=${workspace_loc}/org.adempiere.server-feature/hazelcast-template.xml"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xbootclasspath/p:${workspace_loc}/targetPlatform/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=${workspace_loc}/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.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dosgi.console.enable.builtin=false -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true&#10;-Dhazelcast.config=${workspace_loc}/org.adempiere.server-feature/hazelcast-template.xml"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
 <stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
-<stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.ibm.icu@default:default,com.itextpdf@default:default,com.sun.mail.javax.mail@default:default,groovy-all@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.persistence@default:default,javax.transaction@default:false,javax.websocket-api@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,joda-time@default:default,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.aries.spifly.dynamic.bundle@2:true,org.apache.aries.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.fileupload@default:default,org.apache.commons.io@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.felix.webconsole@default:true,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.xalan@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.atmosphere.runtime@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime@4:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@2:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.http.servletbridge@default:default,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.metatype@2:true,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.servletbridge@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.alpn.api@default:default,org.eclipse.jetty.alpn.server@default:default,org.eclipse.jetty.annotations@default:default,org.eclipse.jetty.apache-jsp@3:true,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http2.common@default:default,org.eclipse.jetty.http2.server@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.alpn.fragment@default:false,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.osgi.httpservice@default:false,org.eclipse.jetty.plus@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.jetty.util.ajax@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:true,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.json@default:default,org.junit@default:default,org.mortbay.jasper.apache-el@default:default,org.mortbay.jasper.apache-jsp@default:default,org.mortbay.jetty.alpn.boot@default:default,org.objectweb.asm.commons@default:true,org.objectweb.asm.tree@default:true,org.objectweb.asm@default:true,org.passay@default:default,org.restlet.ext.servlet@default:default,org.restlet@4:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,zcommon@default:default,zel@default:default,zhtml@default:default,zjavassist@default:default,zk@default:default,zkbind@default:default,zkplus@default:default,zul@default:default,zweb@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:true,org.adempiere.pipo@default:true,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:true,org.adempiere.server@4:true,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:false,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.eclipse.jetty.http@default:default,org.idempiere.felix.webconsole@default:true,org.idempiere.fitnesse.fixture@default:default,org.idempiere.fitnesse.server@default:default,org.idempiere.fitrecorder@default:default,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.webservices@5:true,org.idempiere.zk.extra@default:default,org.slf4j.jdk14@default:false"/>
+<stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.ibm.icu@default:default,com.itextpdf@default:default,com.sun.mail.javax.mail@default:default,groovy-all@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.ejb@default:default,javax.jms@default:default,javax.management.j2ee-api@default:default,javax.persistence@default:default,javax.transaction@default:false,javax.websocket-api@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,joda-time@default:default,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant@default:default,org.apache.aries.spifly.dynamic.bundle@2:true,org.apache.aries.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.fileupload@default:default,org.apache.commons.io@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.felix.webconsole@default:true,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.apache.taglibs.standard-impl@default:default,org.apache.taglibs.standard-jstlel@default:default,org.apache.taglibs.taglibs-standard-spec@default:default,org.apache.xalan@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.atmosphere.runtime@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime@4:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@2:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.metatype@2:true,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.alpn.api@default:default,org.eclipse.jetty.alpn.server@default:default,org.eclipse.jetty.annotations@default:default,org.eclipse.jetty.apache-jsp@3:true,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http2.common@default:default,org.eclipse.jetty.http2.server@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jaas@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.jndi@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.jetty.osgi.alpn.fragment@default:false,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.osgi.httpservice@default:false,org.eclipse.jetty.plus@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.servlets@default:default,org.eclipse.jetty.util.ajax@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.javax.websocket.server@default:true,org.eclipse.jetty.websocket.javax.websocket@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.compatibility.plugins@default:false,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.json@default:default,org.junit@default:default,org.mortbay.jasper.apache-el@default:default,org.mortbay.jasper.apache-jsp@default:default,org.mortbay.jetty.alpn.boot@default:default,org.objectweb.asm.commons@default:true,org.objectweb.asm.tree@default:true,org.objectweb.asm@default:true,org.passay@default:default,org.restlet.ext.servlet@default:default,org.restlet@4:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,zcommon@default:default,zel@default:default,zhtml@default:default,zjavassist@default:default,zk@default:default,zkbind@default:default,zkplus@default:default,zul@default:default,zweb@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.eclipse.equinox.http.servlet@default:default,org.adempiere.eclipse.equinox.http.servletbridge@default:default,org.adempiere.eclipse.equinox.servletbridge@default:default,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:true,org.adempiere.pipo@default:true,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:true,org.adempiere.server@4:true,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:false,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.eclipse.jetty.http@default:default,org.idempiere.felix.webconsole@default:default,org.idempiere.fitnesse.fixture@default:default,org.idempiere.fitnesse.server@default:default,org.idempiere.fitrecorder@default:default,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.webservices@5:true,org.idempiere.zk.extra@default:default,org.slf4j.jdk14@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini
index 4b5a4c7a3b..ee8fb0eb1a 100644
--- a/org.adempiere.server-feature/setup/configuration/config.ini
+++ b/org.adempiere.server-feature/setup/configuration/config.ini
@@ -49,6 +49,14 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\
  org.apache.commons.codec,\
  org.eclipse.osgi.compatibility.state,\
  org.eclipse.osgi.compatibility.plugins,\
+ org.cryptacular,\
+ net.sf.supercsv.super-csv,\
+ zjavassist,\
+ com.itextpdf,\
+ bcprov,\
+ org.apache.xalan,\
+ org.passay,\
+ groovy-all,\
  org.eclipse.osgi@start
 osgi.framework.extensions=
 osgi.bundles.defaultStartLevel=4

From 20c68ae8972c3f732cadb193274e2d90a3cf1ed1 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Sun, 10 Jul 2016 14:15:33 +0700
Subject: [PATCH 26/34] IDEMPIERE-3136:all stuff relate library of idempiere
 update jetty to 9.3.10

---
 org.adempiere.sdk-feature/adempiere.rmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/org.adempiere.sdk-feature/adempiere.rmap b/org.adempiere.sdk-feature/adempiere.rmap
index 0755abc8f0..8145040d81 100644
--- a/org.adempiere.sdk-feature/adempiere.rmap
+++ b/org.adempiere.sdk-feature/adempiere.rmap
@@ -14,6 +14,7 @@
   <rm:locator pattern="^org\.eclipse\.jetty\.osgi\-servlet\-api$" searchPathRef="bundles.maven"/>
   <rm:locator pattern="^org\.eclipse\.jetty\.alpn\.api$" searchPathRef="bundles.maven"/>
   <rm:locator pattern="^org\.mortbay\.jetty\.alpn\.boot$" searchPathRef="bundles.maven"/>
+  <rm:locator pattern="^org\.eclipse\.jetty\.alpn\.server$" searchPathRef="bundles.maven"/>
   <rm:locator pattern="^org\.apache\.felix\.webconsole(\..+)?" searchPathRef="bundles.maven"/>
   <rm:locator pattern="^org\.apache\.felix\.inventory" searchPathRef="bundles.maven"/>
   <rm:locator pattern="^org\.passay$" searchPathRef="bundles.maven" />

From eacc8cf8db61eb41c90be04676876a7906eb256a Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Sun, 10 Jul 2016 14:18:38 +0700
Subject: [PATCH 27/34] IDEMPIERE-3136:all stuff relate library of idempiere
 replace bundle dependency by use import package for jasper report

---
 org.adempiere.report.jasper.library/.classpath           | 2 --
 org.adempiere.report.jasper.library/META-INF/MANIFEST.MF | 7 +++----
 org.adempiere.report.jasper.library/build.properties     | 2 --
 org.adempiere.report.jasper.library/copyjars.xml         | 2 --
 org.adempiere.sdk-feature/materialize.properties         | 4 +++-
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/org.adempiere.report.jasper.library/.classpath b/org.adempiere.report.jasper.library/.classpath
index 1b7ecbc1b8..b2401114f1 100644
--- a/org.adempiere.report.jasper.library/.classpath
+++ b/org.adempiere.report.jasper.library/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/antlr-2.7.5.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/batik-anim-1.8.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/batik-awt-util-1.8.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/batik-bridge-1.8.jar"/>
@@ -48,7 +47,6 @@
 	<classpathentry exported="true" kind="lib" path="lib/spring-beans-2.5.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/spring-core-2.5.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/velocity-1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xalan-2.7.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-1.5.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xmpcore-5.1.1.jar"/>
diff --git a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
index dd0df1aeab..8a4f52a9b8 100644
--- a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
@@ -4,8 +4,7 @@ Bundle-Name: Library
 Bundle-SymbolicName: org.adempiere.report.jasper.library;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ClassPath: lib/antlr-2.7.5.jar,
- lib/batik-anim-1.8.jar,
+Bundle-ClassPath: lib/batik-anim-1.8.jar,
  lib/batik-awt-util-1.8.jar,
  lib/batik-bridge-1.8.jar,
  lib/batik-codec-1.8.jar,
@@ -52,7 +51,6 @@ Bundle-ClassPath: lib/antlr-2.7.5.jar,
  lib/spring-beans-2.5.jar,
  lib/spring-core-2.5.jar,
  lib/velocity-1.7.jar,
- lib/xalan-2.7.2.jar,
  lib/xml-apis-ext-1.3.04.jar,
  lib/xmlgraphics-commons-1.5.jar,
  lib/xmpcore-5.1.1.jar,
@@ -223,7 +221,8 @@ Require-Bundle: bcprov;bundle-version="1.54.0",
  com.fasterxml.jackson.core.jackson-core;bundle-version="0.0.0",
  com.fasterxml.jackson.core.jackson-databind;bundle-version="0.0.0",
  joda-time;bundle-version="0.0.0",
- com.ibm.icu;bundle-version="0.0.0"
+ com.ibm.icu;bundle-version="0.0.0",
+ org.apache.xalan;bundle-version="2.7.1"
 Import-Package: bsh,
  bsh.classpath,
  bsh.collection,
diff --git a/org.adempiere.report.jasper.library/build.properties b/org.adempiere.report.jasper.library/build.properties
index fd53389ce7..c67dd47a62 100644
--- a/org.adempiere.report.jasper.library/build.properties
+++ b/org.adempiere.report.jasper.library/build.properties
@@ -1,6 +1,5 @@
 bin.includes = META-INF/,\
                .,\
-               lib/antlr-2.7.5.jar,\
                lib/batik-anim-1.8.jar,\
                lib/batik-awt-util-1.8.jar,\
                lib/batik-bridge-1.8.jar,\
@@ -48,7 +47,6 @@ bin.includes = META-INF/,\
                lib/spring-beans-2.5.jar,\
                lib/spring-core-2.5.jar,\
                lib/velocity-1.7.jar,\
-               lib/xalan-2.7.2.jar,\
                lib/xml-apis-ext-1.3.04.jar,\
                lib/xmlgraphics-commons-1.5.jar,\
                lib/xmpcore-5.1.1.jar
diff --git a/org.adempiere.report.jasper.library/copyjars.xml b/org.adempiere.report.jasper.library/copyjars.xml
index 75a08ac32d..0180c155de 100644
--- a/org.adempiere.report.jasper.library/copyjars.xml
+++ b/org.adempiere.report.jasper.library/copyjars.xml
@@ -1,7 +1,6 @@
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
 		<mkdir dir="lib" />
-		<get src="${url.file.jp.lib}/antlr-2.7.5.jar" dest="lib/antlr-2.7.5.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.jp.lib}/batik-anim-1.8.jar" dest="lib/batik-anim-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.jp.lib}/batik-awt-util-1.8.jar" dest="lib/batik-awt-util-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.jp.lib}/batik-bridge-1.8.jar" dest="lib/batik-bridge-1.8.jar" usetimestamp="true" verbose="true" retries="5" />
@@ -50,7 +49,6 @@
 		<get src="${url.file.jp.lib}/spring-beans-2.5.jar" dest="lib/spring-beans-2.5.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.jp.lib}/spring-core-2.5.jar" dest="lib/spring-core-2.5.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.jp.lib}/velocity-1.7.jar" dest="lib/velocity-1.7.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.jp.lib}/xalan-2.7.2.jar" dest="lib/xalan-2.7.2.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.jp.lib}/xml-apis-ext-1.3.04.jar" dest="lib/xml-apis-ext-1.3.04.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.jp.lib}/xmlgraphics-commons-1.5.jar" dest="lib/xmlgraphics-commons-1.5.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.jp.lib}/xmpcore-5.1.1.jar" dest="lib/xmpcore-5.1.1.jar" usetimestamp="true" verbose="true" retries="5" />	
diff --git a/org.adempiere.sdk-feature/materialize.properties b/org.adempiere.sdk-feature/materialize.properties
index 44deafc490..61495afc7d 100644
--- a/org.adempiere.sdk-feature/materialize.properties
+++ b/org.adempiere.sdk-feature/materialize.properties
@@ -27,4 +27,6 @@ url.file.srv=http://downloads.sourceforge.net/project/idempiere/binary.file
 
 url.restlet.p2=http://p2.restlet.com/2.3
 
-url.modify.bundle=http://downloads.sourceforge.net/project/idempiere/p2/modifyBundle-1.0.0
+url.modify.bundle=https://sourceforge.net/projects/hsv/files/p2/modifyBundle-1.0.0
+
+url.file.jp.lib=http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/jp-6.3.0

From f6c962b66beac3dfc90e1ab5adf6f679df919eca Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Sun, 10 Jul 2016 14:25:06 +0700
Subject: [PATCH 28/34] IDEMPIERE-3136:all stuff relate library of idempiere
 add ability to define add more folder to materialize

---
 org.adempiere.sdk-feature/adempiere.rmap      | 45 ++++++++++++++++++-
 .../materialize.properties                    | 11 +++++
 2 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/org.adempiere.sdk-feature/adempiere.rmap b/org.adempiere.sdk-feature/adempiere.rmap
index 8145040d81..039a34d40d 100644
--- a/org.adempiere.sdk-feature/adempiere.rmap
+++ b/org.adempiere.sdk-feature/adempiere.rmap
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rm:rmap xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns:maven="http://www.eclipse.org/buckminster/MavenProvider-1.0" xmlns:rm="http://www.eclipse.org/buckminster/RMap-1.0">
+  <rm:propertyElement key="extend.plugin.root">
+    <bc:replace pattern="/[^/]+$" replacement="/">
+      <bc:propertyRef key="workspace.root"/>
+    </bc:replace>
+  </rm:propertyElement>
   <rm:locator pattern="^org\.eclipse\.jetty\.http$" searchPathRef="workspace.project"/>
   <rm:locator pattern="^org\.eclipse\.jetty\.alpn\.api$" searchPathRef="modify-bundle"/>
   <rm:locator pattern="^org\.apache\.felix\.webconsole\.plugins\.packageadmin$" searchPathRef="bundles.maven"/>
@@ -56,8 +61,9 @@
   <rm:locator pattern="^zjavassist$" searchPathRef="zkoss.osgi"/>
   <rm:locator searchPathRef="orbit" failOnError="false"/>
   <rm:locator searchPathRef="workspace.project" failOnError="false"/>
-  <rm:locator searchPathRef="workspace.feature"/>
-  
+  <rm:locator searchPathRef="workspace.feature" failOnError="false"/>
+  <rm:locator searchPathRef="extend.workspace"/>
+
   <rm:searchPath name="equinox">
     <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="p2" source="false" mutable="false">
       <rm:property key="buckminster.source" value="false"/>
@@ -181,4 +187,39 @@
       <rm:uri format="${url.modify.bundle}"/>
     </rm:provider>
   </rm:searchPath>
+  <rm:searchPath name="extend.workspace">
+    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="local">
+      <rm:uri format="${extend.plugin.root}${buckminster.component}"/>
+    </rm:provider>
+    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="local">
+      <rm:uri format="${extend.plugin.root}${extend.bundle.folder.1}/${buckminster.component}"/>
+    </rm:provider>
+    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="local">
+      <rm:uri format="${extend.plugin.root}${extend.bundle.folder.2}/${buckminster.component}"/>
+    </rm:provider>
+    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="local">
+      <rm:uri format="${extend.plugin.root}${extend.bundle.folder.3}/${buckminster.component}"/>
+    </rm:provider>
+    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="local">
+      <rm:uri format="${extend.plugin.root}${extend.bundle.folder.4}/${buckminster.component}"/>
+    </rm:provider>
+    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="local">
+      <rm:uri format="${extend.plugin.root}${extend.bundle.folder.5}/${buckminster.component}"/>
+    </rm:provider>
+    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="local">
+      <rm:uri format="${extend.plugin.root}${extend.bundle.folder.6}/${buckminster.component}"/>
+    </rm:provider>
+    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="local">
+      <rm:uri format="${extend.plugin.root}${extend.bundle.folder.7}/${buckminster.component}"/>
+    </rm:provider>
+    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="local">
+      <rm:uri format="${extend.plugin.root}${extend.bundle.folder.8}/${buckminster.component}"/>
+    </rm:provider>
+    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="local">
+      <rm:uri format="${extend.plugin.root}${extend.bundle.folder.9}/${buckminster.component}"/>
+    </rm:provider>
+    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="local">
+      <rm:uri format="${extend.plugin.root}${extend.bundle.folder.10}/${buckminster.component}"/>
+    </rm:provider>
+  </rm:searchPath>
 </rm:rmap>
diff --git a/org.adempiere.sdk-feature/materialize.properties b/org.adempiere.sdk-feature/materialize.properties
index 61495afc7d..3fac915def 100644
--- a/org.adempiere.sdk-feature/materialize.properties
+++ b/org.adempiere.sdk-feature/materialize.properties
@@ -30,3 +30,14 @@ url.restlet.p2=http://p2.restlet.com/2.3
 url.modify.bundle=https://sourceforge.net/projects/hsv/files/p2/modifyBundle-1.0.0
 
 url.file.jp.lib=http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/jp-6.3.0
+
+extend.bundle.folder.1=vn.hsv.idempiere.bundles
+extend.bundle.folder.2=vn.hsv.bundles
+extend.bundle.folder.3=vn.hsv.idempiere.base
+extend.bundle.folder.4=theme-business-team
+extend.bundle.folder.5=org.idempiere.ruleEngine
+extend.bundle.folder.6
+extend.bundle.folder.7
+extend.bundle.folder.8
+extend.bundle.folder.9
+extend.bundle.folder.10

From 5244dcc70e0de007fb2cb3ebf0c592fff0d5ca51 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Sun, 10 Jul 2016 18:38:01 +0700
Subject: [PATCH 29/34] IDEMPIERE-3136:all stuff relate library of idempiere
 replace bundle dependency by use import package for jasper report

---
 org.adempiere.report.jasper.library/.classpath           | 1 +
 org.adempiere.report.jasper.library/META-INF/MANIFEST.MF | 6 ++++--
 org.adempiere.report.jasper.library/build.properties     | 3 ++-
 org.adempiere.report.jasper.library/copyjars.xml         | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/org.adempiere.report.jasper.library/.classpath b/org.adempiere.report.jasper.library/.classpath
index b2401114f1..1d10a6d6cc 100644
--- a/org.adempiere.report.jasper.library/.classpath
+++ b/org.adempiere.report.jasper.library/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="lib/bcprov-jdk14-139.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/batik-anim-1.8.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/batik-awt-util-1.8.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/batik-bridge-1.8.jar"/>
diff --git a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
index 8a4f52a9b8..bf0dfb7c4b 100644
--- a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
@@ -54,7 +54,8 @@ Bundle-ClassPath: lib/batik-anim-1.8.jar,
  lib/xml-apis-ext-1.3.04.jar,
  lib/xmlgraphics-commons-1.5.jar,
  lib/xmpcore-5.1.1.jar,
- .
+ .,
+ lib/bcprov-jdk14-139.jar
 Export-Package: net.sf.jasperreports.ant,
  net.sf.jasperreports.charts,
  net.sf.jasperreports.charts.base,
@@ -222,7 +223,8 @@ Require-Bundle: bcprov;bundle-version="1.54.0",
  com.fasterxml.jackson.core.jackson-databind;bundle-version="0.0.0",
  joda-time;bundle-version="0.0.0",
  com.ibm.icu;bundle-version="0.0.0",
- org.apache.xalan;bundle-version="2.7.1"
+ org.apache.xalan;bundle-version="2.7.1",
+ org.apache.xerces;bundle-version="2.9.0"
 Import-Package: bsh,
  bsh.classpath,
  bsh.collection,
diff --git a/org.adempiere.report.jasper.library/build.properties b/org.adempiere.report.jasper.library/build.properties
index c67dd47a62..d6d106ad90 100644
--- a/org.adempiere.report.jasper.library/build.properties
+++ b/org.adempiere.report.jasper.library/build.properties
@@ -49,4 +49,5 @@ bin.includes = META-INF/,\
                lib/velocity-1.7.jar,\
                lib/xml-apis-ext-1.3.04.jar,\
                lib/xmlgraphics-commons-1.5.jar,\
-               lib/xmpcore-5.1.1.jar
+               lib/xmpcore-5.1.1.jar,\
+               lib/bcprov-jdk14-139.jar
diff --git a/org.adempiere.report.jasper.library/copyjars.xml b/org.adempiere.report.jasper.library/copyjars.xml
index 0180c155de..ce36732ecd 100644
--- a/org.adempiere.report.jasper.library/copyjars.xml
+++ b/org.adempiere.report.jasper.library/copyjars.xml
@@ -27,7 +27,6 @@
 		<get src="${url.file.jp.lib}/core-2.3.0.jar" dest="lib/core-2.3.0.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.jp.lib}/fop-transcoder-allinone-1.1.jar" dest="lib/fop-transcoder-allinone-1.1.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.jp.lib}/hibernate-core-3.3.2.GA.jar" dest="lib/hibernate-core-3.3.2.GA.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.jp.lib}/httpcore-4.3.2.jar" dest="lib/httpcore-4.3.2.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.jp.lib}/itext-2.1.7.js5.jar" dest="lib/itext-2.1.7.js5.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.jp.lib}/jasperreports-6.3.0.jar" dest="lib/jasperreports-6.3.0.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.jp.lib}/jasperreports-fonts-6.3.0.jar" dest="lib/jasperreports-fonts-6.3.0.jar" usetimestamp="true" verbose="true" retries="5" />
@@ -51,6 +50,7 @@
 		<get src="${url.file.jp.lib}/velocity-1.7.jar" dest="lib/velocity-1.7.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.jp.lib}/xml-apis-ext-1.3.04.jar" dest="lib/xml-apis-ext-1.3.04.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.jp.lib}/xmlgraphics-commons-1.5.jar" dest="lib/xmlgraphics-commons-1.5.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.jp.lib}/xmpcore-5.1.1.jar" dest="lib/xmpcore-5.1.1.jar" usetimestamp="true" verbose="true" retries="5" />	
+		<get src="${url.file.jp.lib}/xmpcore-5.1.1.jar" dest="lib/xmpcore-5.1.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/bcprov-jdk14-139.jar" dest="lib/bcprov-jdk14-139.jar" usetimestamp="true" verbose="true" retries="5" />		
 	</target>
 </project>

From c0e715a01d2a89b3430f910fa418da7654046e8e Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Sun, 10 Jul 2016 20:34:26 +0700
Subject: [PATCH 30/34] IDEMPIERE-3136:all stuff relate library of idempiere
 replace bundle dependency by use import package for jasper report

---
 org.adempiere.base-feature/feature.xml        | 27 ++++++++------
 org.adempiere.sdk-feature/adempiere.rmap      | 37 ++++++++++++++++---
 org.idempiere.customize-feature/.project      | 17 +++++++++
 .../build.properties                          |  1 +
 org.idempiere.customize-feature/feature.xml   | 19 ++++++++++
 5 files changed, 85 insertions(+), 16 deletions(-)
 create mode 100644 org.idempiere.customize-feature/.project
 create mode 100644 org.idempiere.customize-feature/build.properties
 create mode 100644 org.idempiere.customize-feature/feature.xml

diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml
index fa86176e0b..3d0d79543b 100644
--- a/org.adempiere.base-feature/feature.xml
+++ b/org.adempiere.base-feature/feature.xml
@@ -36,6 +36,10 @@
          id="org.adempiere.report.jasper"
          version="0.0.0"/>
 
+   <includes
+         id="org.idempiere.customize"
+         version="0.0.0"/>
+
    <plugin
          id="org.adempiere.base"
          download-size="0"
@@ -265,6 +269,7 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+
    <plugin
          id="org.passay"
          download-size="0"
@@ -292,7 +297,7 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
+
    <plugin
          id="org.cryptacular"
          download-size="0"
@@ -306,56 +311,56 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
+
    <plugin
          id="org.apache.commons.beanutils"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
+
    <plugin
          id="org.apache.commons.lang"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
+
    <plugin
          id="groovy-all"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
+
    <plugin
          id="com.ibm.icu"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
+
    <plugin
          id="com.fasterxml.jackson.core.jackson-annotations"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
+
    <plugin
          id="com.fasterxml.jackson.core.jackson-core"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
+
    <plugin
          id="com.fasterxml.jackson.core.jackson-databind"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
+
    <plugin
          id="joda-time"
          download-size="0"
@@ -384,7 +389,7 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
+
    <plugin
          id="org.apache.commons.net"
          download-size="0"
@@ -398,5 +403,5 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
+
 </feature>
diff --git a/org.adempiere.sdk-feature/adempiere.rmap b/org.adempiere.sdk-feature/adempiere.rmap
index 039a34d40d..bd2bd46c0d 100644
--- a/org.adempiere.sdk-feature/adempiere.rmap
+++ b/org.adempiere.sdk-feature/adempiere.rmap
@@ -60,9 +60,9 @@
   <rm:locator pattern="^zweb$" searchPathRef="zkoss.osgi"/>
   <rm:locator pattern="^zjavassist$" searchPathRef="zkoss.osgi"/>
   <rm:locator searchPathRef="orbit" failOnError="false"/>
+  <rm:locator searchPathRef="extend.workspace" failOnError="false"/>
   <rm:locator searchPathRef="workspace.project" failOnError="false"/>
-  <rm:locator searchPathRef="workspace.feature" failOnError="false"/>
-  <rm:locator searchPathRef="extend.workspace"/>
+  <rm:locator searchPathRef="workspace.feature"/>
 
   <rm:searchPath name="equinox">
     <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="p2" source="false" mutable="false">
@@ -188,38 +188,65 @@
     </rm:provider>
   </rm:searchPath>
   <rm:searchPath name="extend.workspace">
-    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="local">
-      <rm:uri format="${extend.plugin.root}${buckminster.component}"/>
-    </rm:provider>
     <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="local">
       <rm:uri format="${extend.plugin.root}${extend.bundle.folder.1}/${buckminster.component}"/>
+    </rm:provider>    
+    <rm:provider componentTypes="eclipse.feature" readerType="local">
+      <rm:uri format="${extend.plugin.root}${extend.bundle.folder.1}/${buckminster.component}-feature" />
     </rm:provider>
     <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="local">
       <rm:uri format="${extend.plugin.root}${extend.bundle.folder.2}/${buckminster.component}"/>
     </rm:provider>
+    <rm:provider componentTypes="eclipse.feature" readerType="local">
+      <rm:uri format="${extend.plugin.root}${extend.bundle.folder.2}/${buckminster.component}-feature" />
+    </rm:provider>
     <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="local">
       <rm:uri format="${extend.plugin.root}${extend.bundle.folder.3}/${buckminster.component}"/>
     </rm:provider>
+    <rm:provider componentTypes="eclipse.feature" readerType="local">
+      <rm:uri format="${extend.plugin.root}${extend.bundle.folder.3}/${buckminster.component}-feature" />
+    </rm:provider>
     <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="local">
       <rm:uri format="${extend.plugin.root}${extend.bundle.folder.4}/${buckminster.component}"/>
     </rm:provider>
+    <rm:provider componentTypes="eclipse.feature" readerType="local">
+      <rm:uri format="${extend.plugin.root}${extend.bundle.folder.4}/${buckminster.component}-feature" />
+    </rm:provider>
     <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="local">
       <rm:uri format="${extend.plugin.root}${extend.bundle.folder.5}/${buckminster.component}"/>
     </rm:provider>
+    <rm:provider componentTypes="eclipse.feature" readerType="local">
+      <rm:uri format="${extend.plugin.root}${extend.bundle.folder.5}/${buckminster.component}-feature" />
+    </rm:provider>
     <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="local">
       <rm:uri format="${extend.plugin.root}${extend.bundle.folder.6}/${buckminster.component}"/>
     </rm:provider>
+    <rm:provider componentTypes="eclipse.feature" readerType="local">
+      <rm:uri format="${extend.plugin.root}${extend.bundle.folder.6}/${buckminster.component}-feature" />
+    </rm:provider>
     <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="local">
       <rm:uri format="${extend.plugin.root}${extend.bundle.folder.7}/${buckminster.component}"/>
     </rm:provider>
+    <rm:provider componentTypes="eclipse.feature" readerType="local">
+      <rm:uri format="${extend.plugin.root}${extend.bundle.folder.7}/${buckminster.component}-feature" />
+    </rm:provider>
     <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="local">
       <rm:uri format="${extend.plugin.root}${extend.bundle.folder.8}/${buckminster.component}"/>
     </rm:provider>
+    <rm:provider componentTypes="eclipse.feature" readerType="local">
+      <rm:uri format="${extend.plugin.root}${extend.bundle.folder.8}/${buckminster.component}-feature" />
+    </rm:provider>
     <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="local">
       <rm:uri format="${extend.plugin.root}${extend.bundle.folder.9}/${buckminster.component}"/>
     </rm:provider>
+    <rm:provider componentTypes="eclipse.feature" readerType="local">
+      <rm:uri format="${extend.plugin.root}${extend.bundle.folder.9}/${buckminster.component}-feature" />
+    </rm:provider>
     <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="local">
       <rm:uri format="${extend.plugin.root}${extend.bundle.folder.10}/${buckminster.component}"/>
     </rm:provider>
+    <rm:provider componentTypes="eclipse.feature" readerType="local">
+      <rm:uri format="${extend.plugin.root}${extend.bundle.folder.10}/${buckminster.component}-feature" />
+    </rm:provider>
   </rm:searchPath>
 </rm:rmap>
diff --git a/org.idempiere.customize-feature/.project b/org.idempiere.customize-feature/.project
new file mode 100644
index 0000000000..14d94e9777
--- /dev/null
+++ b/org.idempiere.customize-feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.idempiere.customize-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.idempiere.customize-feature/build.properties b/org.idempiere.customize-feature/build.properties
new file mode 100644
index 0000000000..64f93a9f0b
--- /dev/null
+++ b/org.idempiere.customize-feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/org.idempiere.customize-feature/feature.xml b/org.idempiere.customize-feature/feature.xml
new file mode 100644
index 0000000000..c2a52ec265
--- /dev/null
+++ b/org.idempiere.customize-feature/feature.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.idempiere.customize"
+      label="org.idempiere.customize-feature"
+      version="3.1.0.qualifier">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+</feature>

From 71b88c7da5dfc35072d45dade45d5aa8fc346bd5 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Sun, 10 Jul 2016 20:38:32 +0700
Subject: [PATCH 31/34] IDEMPIERE-2968:make all url as properties let idempiere
 can total material with offline repository use parameter for link to
 repository, so can use offline repository, so help increase test speed

---
 org.idempiere.fitnesse.server/copyjars.xml |  2 +-
 org.idempiere.zk.extra/copyjars.xml        | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/org.idempiere.fitnesse.server/copyjars.xml b/org.idempiere.fitnesse.server/copyjars.xml
index 394d7efa81..ab2dbf17f6 100644
--- a/org.idempiere.fitnesse.server/copyjars.xml
+++ b/org.idempiere.fitnesse.server/copyjars.xml
@@ -9,7 +9,7 @@
 		
 		not sure why use a standalone (full) version.
 		in case use lib version, we can download at maven, it's small ${url.maven2.lib}/maven2/org/seleniumhq/selenium/selenium-server/2.35.0/selenium-server-2.35.0.jar-->
-		<get src="http://selenium-release.storage.googleapis.com/2.39/selenium-server-standalone-2.39.0.jar" dest="lib/selenium-server-standalone-2.35.0.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/selenium-server-standalone-2.39.0.jar" dest="lib/selenium-server-standalone-2.35.0.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven2.lib}/maven2/log4j/log4j/1.2.16/log4j-1.2.16.jar" dest="lib/log4j-1.2.16.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven2.lib}/maven2/com/github/detro/ghostdriver/phantomjsdriver/1.0.3/phantomjsdriver-1.0.3.jar" dest="lib/phantomjsdriver-1.0.3.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
diff --git a/org.idempiere.zk.extra/copyjars.xml b/org.idempiere.zk.extra/copyjars.xml
index 20e59329f0..2848fb09fb 100644
--- a/org.idempiere.zk.extra/copyjars.xml
+++ b/org.idempiere.zk.extra/copyjars.xml
@@ -1,10 +1,10 @@
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
 		<mkdir dir="lib" />
-		<get src="http://mavensync.zkoss.org/maven2/org/zkoss/zkforge/ckez/4.4.6.2/ckez-4.4.6.2.jar" dest="lib/ckez.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://mavensync.zkoss.org/maven2/org/zkoss/zkforge/gmapsz/3.0.3/gmapsz-3.0.3.jar" dest="lib/gmapsz.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://mavensync.zkoss.org/maven2/org/zkoss/zkforge/timelinez/2.3.1_50/timelinez-2.3.1_50.jar" dest="lib/timelinez.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://mavensync.zkoss.org/maven2/org/zkoss/zkforge/timeplotz/1.1_50/timeplotz-1.1_50.jar" dest="lib/timeplotz.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="http://mavensync.zkoss.org/maven2/org/zkoss/calendar/calendar/2.1.5/calendar-2.1.5.jar" dest="lib/calendar.jar" usetimestamp="true" verbose="true" retries="5" />
-	</target>
+		<get src="${url.maven.zkoss.lib}/maven2/org/zkoss/zkforge/ckez/4.4.6.2/ckez-4.4.6.2.jar" dest="lib/ckez.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven.zkoss.lib}/maven2/org/zkoss/zkforge/gmapsz/3.0.3/gmapsz-3.0.3.jar" dest="lib/gmapsz.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven.zkoss.lib}/maven2/org/zkoss/zkforge/timelinez/2.3.1_50/timelinez-2.3.1_50.jar" dest="lib/timelinez.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven.zkoss.lib}/maven2/org/zkoss/zkforge/timeplotz/1.1_50/timeplotz-1.1_50.jar" dest="lib/timeplotz.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven.zkoss.lib}/maven2/org/zkoss/calendar/calendar/2.1.5/calendar-2.1.5.jar" dest="lib/calendar.jar" usetimestamp="true" verbose="true" retries="5" />
+	</target> 
 </project>

From fe3a5c58eef09df1c1b0dbfc4f2022276b1bca46 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Sun, 10 Jul 2016 22:45:34 +0700
Subject: [PATCH 32/34] IDEMPIERE-2968:make all url as properties let idempiere
 can total material with offline repository use parameter for link to
 repository, so can use offline repository, so help increase test speed

---
 org.idempiere.fitnesse.server/.classpath           | 2 +-
 org.idempiere.fitnesse.server/META-INF/MANIFEST.MF | 4 ++--
 org.idempiere.fitnesse.server/build.properties     | 2 +-
 org.idempiere.fitnesse.server/copyjars.xml         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/org.idempiere.fitnesse.server/.classpath b/org.idempiere.fitnesse.server/.classpath
index 62b0413eb0..455f2a5f1e 100644
--- a/org.idempiere.fitnesse.server/.classpath
+++ b/org.idempiere.fitnesse.server/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="lib/selenium-server-standalone-2.39.0.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
@@ -7,7 +8,6 @@
 	<classpathentry exported="true" kind="lib" path="lib/fitnesse.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.16.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/fitlibraryweb-2.0.jar" sourcepath="lib/fitlibraryweb-2.0-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/selenium-server-standalone-2.35.0.jar" sourcepath="/home/hengsin/Downloads/jetty-9.2.3.sources/apache-jsp-8.0.9.M3-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/phantomjsdriver-1.0.3.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF b/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF
index 7c52785e81..3011a52d4b 100644
--- a/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF
+++ b/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF
@@ -18,8 +18,8 @@ Bundle-ClassPath: .,
  lib/fitnesse.jar,
  lib/log4j-1.2.16.jar,
  lib/fitlibraryweb-2.0.jar,
- lib/selenium-server-standalone-2.35.0.jar,
- lib/phantomjsdriver-1.0.3.jar
+ lib/phantomjsdriver-1.0.3.jar,
+ lib/selenium-server-standalone-2.39.0.jar
 Web-ContextPath: fitnesse
 Export-Package: fit,
  fit.decorator,
diff --git a/org.idempiere.fitnesse.server/build.properties b/org.idempiere.fitnesse.server/build.properties
index 2aa4dbabef..03b5d0fbbf 100644
--- a/org.idempiere.fitnesse.server/build.properties
+++ b/org.idempiere.fitnesse.server/build.properties
@@ -8,4 +8,4 @@ bin.includes = META-INF/,\
                lib/fitlibraryweb-2.0.jar,\
                WEB-INF/,\
                lib/phantomjsdriver-1.0.3.jar,\
-               lib/selenium-server-standalone-2.35.0.jar
+               lib/selenium-server-standalone-2.39.0.jar
diff --git a/org.idempiere.fitnesse.server/copyjars.xml b/org.idempiere.fitnesse.server/copyjars.xml
index ab2dbf17f6..a1b71cfe20 100644
--- a/org.idempiere.fitnesse.server/copyjars.xml
+++ b/org.idempiere.fitnesse.server/copyjars.xml
@@ -9,7 +9,7 @@
 		
 		not sure why use a standalone (full) version.
 		in case use lib version, we can download at maven, it's small ${url.maven2.lib}/maven2/org/seleniumhq/selenium/selenium-server/2.35.0/selenium-server-2.35.0.jar-->
-		<get src="${url.file.srv}/jarfile/3.1/selenium-server-standalone-2.39.0.jar" dest="lib/selenium-server-standalone-2.35.0.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/3.1/selenium-server-standalone-2.39.0.jar" dest="lib/selenium-server-standalone-2.39.0.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven2.lib}/maven2/log4j/log4j/1.2.16/log4j-1.2.16.jar" dest="lib/log4j-1.2.16.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven2.lib}/maven2/com/github/detro/ghostdriver/phantomjsdriver/1.0.3/phantomjsdriver-1.0.3.jar" dest="lib/phantomjsdriver-1.0.3.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>

From abd60281c31af209fdb780354288e2175c4af8ba Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Sun, 10 Jul 2016 23:53:13 +0700
Subject: [PATCH 33/34] IDEMPIERE-2968:make all url as properties let idempiere
 can total material with offline repository use parameter for link to
 repository, so can use offline repository, so help increase test speed

---
 org.adempiere.sdk-feature/adempiere.cquery | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.adempiere.sdk-feature/adempiere.cquery b/org.adempiere.sdk-feature/adempiere.cquery
index ad25ebad0a..e2eef0f981 100644
--- a/org.adempiere.sdk-feature/adempiere.cquery
+++ b/org.adempiere.sdk-feature/adempiere.cquery
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="adempiere.rmap" properties="file:/mnt/data/dev/project/me/repository/stuff/setup.idempiere/materialize.local.properties">
+<?xml version="1.0" encoding="UTF-8"?><cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="adempiere.rmap" properties="materialize.properties">
     <cq:rootRequest name="org.adempiere.sdk" componentType="eclipse.feature"/>
     <cq:property key="buckminster.download.source" value="true"/>
     <cq:property key="osgi.configuration.area.default" value="configuration"/>

From 988781a9803161b3cd46ee1b7cf694e29430cccf Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Mon, 11 Jul 2016 10:48:29 +0700
Subject: [PATCH 34/34] IDEMPIERE-3136:all stuff relate library of idempiere
 delete local environment infomation

---
 org.adempiere.sdk-feature/materialize.properties | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/org.adempiere.sdk-feature/materialize.properties b/org.adempiere.sdk-feature/materialize.properties
index 3fac915def..23ec2a4da9 100644
--- a/org.adempiere.sdk-feature/materialize.properties
+++ b/org.adempiere.sdk-feature/materialize.properties
@@ -31,11 +31,11 @@ url.modify.bundle=https://sourceforge.net/projects/hsv/files/p2/modifyBundle-1.0
 
 url.file.jp.lib=http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/jp-6.3.0
 
-extend.bundle.folder.1=vn.hsv.idempiere.bundles
-extend.bundle.folder.2=vn.hsv.bundles
-extend.bundle.folder.3=vn.hsv.idempiere.base
-extend.bundle.folder.4=theme-business-team
-extend.bundle.folder.5=org.idempiere.ruleEngine
+extend.bundle.folder.1
+extend.bundle.folder.2
+extend.bundle.folder.3
+extend.bundle.folder.4
+extend.bundle.folder.5
 extend.bundle.folder.6
 extend.bundle.folder.7
 extend.bundle.folder.8