diff --git a/.hgignore b/.hgignore
index cddda65c24..4414bb744b 100644
--- a/.hgignore
+++ b/.hgignore
@@ -3,85 +3,41 @@ build
 
 syntax: regexp
 ^adempiere$
-^org\.adempiere\.base/Base\.jar$
-^org\.adempiere\.base/base\.jar$
-^org\.adempiere\.ui\.swing/client\.jar$
-^extend/Extend\.jar$
-^extend/extend\.jar$
 ^org\.adempiere\.install/lib$
-^org\.adempiere\.install/CInstall\.jar$
-^org\.adempiere\.install/install\.jar$
-^org\.adempiere\.report\.jasper/needed$
-^org\.adempiere\.report\.jasper/JasperReports\.jar$
-^org\.adempiere\.report\.jasper/CompiereJasper\.jar$
-^org\.adempiere\.report\.jasper/CompiereJasperReqs\.jar$
-^org\.adempiere\.report\.jasper\.webapp/webApp\.ear$
-^org\.adempiere\.report\.jasper\.webapp/webApp\.war$
-^org\.adempiere\.report\.jasper\.webapp/webAppEJB\.jar$
-^org\.adempiere\.report\.jasper\.webapp/webEJB-client\.jar$
-^lib/Adempiere\.jar$
-^lib/adempiereApps\.jar$
-^lib/adempiereApps\.war$
-^lib/adempiereApps\.xml$
-^lib/adempiereRoot\.jar$
-^lib/adempiereRoot\.xml$
-^lib/adempiereRootBase\.war$
-^lib/adempiereWebCM\.xml$
-^lib/adempiereWebCMbase\.war$
-^lib/adempiereWebStore\.war$
-^lib/adempiereWebStore\.xml$
-^lib/CCTools\.jar$
-^lib/CompiereJasperReqs\.jar$
-^lib/CSTools\.jar$
-^lib/glassfish\.jar$
-^lib/jboss\.jar$
-^lib/oracle\.jar$
-^lib/posterita\.jar$
-^lib/posterita\.war$
-^lib/posteritaPatches\.jar$
-^lib/postgresql\.jar$
-^lib/webui\.war$
-^packages/liberoMFG\.jar$
-^posterita/posterita/dist$
-^posterita/posterita/web/WEB-INF/classes$
-^serverApps/serverApps\.jar$
-^sqlj/sqlj\.jar$
-^tools/tools\.jar$
-^utils_dev/mybuild\.properties$
-^webCM/deploy$
+^org\.adempiere\.install/bin/.*\.*$
 ^org\.adempiere\.ui\.zk/dist$
-^org\.adempiere\.ui\.zk/WEB-INF/classes/.*\.class$
-^org\.adempiere\.ui\.zk/WEB-INF/classes/.*\.xml$
-^org\.adempiere\.ui\.zk/WEB-INF/classes/.*\.js$
-^org\.adempiere\.ui\.zk/WEB-INF/classes/.*\.wpd$
+^org\.adempiere\.ui\.zk/bin/.*\.*$
 
 syntax: regexp
 ^lib/plugins$
 ^plugins/.*\.class$
 ^adempiere-local\.properties$
 ^org.adempiere.extend/test.properties$
+^org.adempiere.extend/bin/.*\.*$
 ^org\.adempiere\.ui/.*\.class$
 ^org\.adempiere\.ui/bin/.*\.css$
 ^org\.adempiere\.pipo.handlers/.*\.class$
 ^org\.adempiere\.pipo/.*\.class$
 ^org\.adempiere\.report\.jasper\.swing/.*\.class$
-^tomcatConfig/bin/\.hgignore$
 ^org\.compiere\.db\.oracle\.provider/bin/.*\.class$
 ^org\.compiere\.db\.postgresql\.provider/bin/.*\.class$
+^org\.adempiere\.ui\.swing/bin/.*\.*$
+^org\.adempiere\.report\.jasper\.fonts/bin/.*\.*$
 
 
 syntax: regexp
-^tomcatConfig/META-INF/tomcat/server\.xml$
+^org.adempiere.tomcat.config/META-INF/tomcat/server\.xml$
 ^org\.apache\.ecs/bin/.*\.class$
 ^org\.adempiere\.replication/bin/.*\.class$
-^org\.adempiere\.replication\.server/bin/.*\.class$
+^org\.adempiere\.replication\.server/bin/.*\.*$
+^org\.adempiere\.server/bin/.*\.*$
 ^org\.adempiere\.pipo\.legacy/bin/.*\.class$
+^org\.adempiere\.base/bin/.*\.*$
 ^org\.adempiere\.base\.callout/bin/.*\.class$
 ^org\.adempiere\.base\.process/bin/.*\.class$
 ^org\.adempiere\.payment\.processor/bin/.*\.class$
 ^org\.adempiere\.ui\.swing\.pluginlist/bin/.*\.class$
 ^org\.adempiere\.plugin\.utils/bin/.*\.class$
-^org\.adempiere\.tomcat\.config/META-INF/tomcat/server.xml$
 ^org\.adempiere\.webstore\.servlet/bin/.*\.class$
 ^org\.adempiere\.webstore\.servlet/bin/.*\.tld$
 ^org\.adempiere\.eclipse\.equinox\.servletbridge/bin/.*\.class$
@@ -104,13 +60,32 @@ syntax: regexp
 ^event\.test/bin.*\.class$
 ^packages/.*$
 ^work/.*$
+^hazelcast\.xml$
 
 syntax: regexp
-swingclient.product .*
-server.product .*
+swingclient.product.*
+server.product.*
+
 syntax: regexp
 ^org\.zkoss\.zk\.library/bin$
 syntax: regexp
 \.class$
 syntax: regexp
 \.class$
+
+syntax: regexp
+^org\.zkoss\.zk\.library/.*/calendar[-].*\.jar$
+^org\.zkoss\.zk\.library/.*/ckez[-].*\.jar$
+^org\.zkoss\.zk\.library/.*/gmapsz[-].*\.jar$
+^org\.zkoss\.zk\.library/.*/jruby[-].*\.jar$
+^org\.zkoss\.zk\.library/.*/jython[-].*\.jar$
+^org\.zkoss\.zk\.library/.*/timelinez[-].*\.jar$
+^org\.zkoss\.zk\.library/.*/timeplotz[-].*\.jar$
+^org\.zkoss\.zk\.library/.*/z.*\.jar$
+.buckminster/
+^jettyhome/
+.recommenders/
+^packin
+^packout
+^RemoteSystemsTempFiles
+
diff --git a/lib/artifacts.xml b/lib/artifacts.xml
index f6e64edd5e..3e00052eab 100644
--- a/lib/artifacts.xml
+++ b/lib/artifacts.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <?artifactRepository version='1.1.0'?>
-<repository name='file:/home/hengsin/workspace/idempiere-zk7-test/lib/ - artifacts' type='org.eclipse.equinox.p2.artifact.repository.simpleRepository' version='1'>
+<repository name='idempiere local repository - artifacts' type='org.eclipse.equinox.p2.artifact.repository.simpleRepository' version='1'>
   <properties size='2'>
-    <property name='p2.timestamp' value='1396453941058'/>
+    <property name='p2.timestamp' value='1410940772016'/>
     <property name='p2.compressed' value='false'/>
   </properties>
   <mappings size='3'>
@@ -10,33 +10,12 @@
     <rule filter='(&amp; (classifier=binary))' output='${repoUrl}/binary/${id}_${version}'/>
     <rule filter='(&amp; (classifier=org.eclipse.update.feature))' output='${repoUrl}/features/${id}_${version}.jar'/>
   </mappings>
-  <artifacts size='4'>
-    <artifact classifier='osgi.bundle' id='org.apache.felix.webconsole.plugins.packageadmin' version='1.0.0'>
+  <artifacts size='1'>
+    <artifact classifier='osgi.bundle' id='org.apache.felix.webconsole.plugins.packageadmin' version='1.0.0.1'>
       <properties size='3'>
-        <property name='artifact.size' value='26195'/>
-        <property name='download.size' value='26195'/>
-        <property name='download.md5' value='0d0b1172a4bb948dc62b8fca8310c179'/>
-      </properties>
-    </artifact>
-    <artifact classifier='osgi.bundle' id='com.sun.mail.javax.mail' version='1.5.1'>
-      <properties size='3'>
-        <property name='artifact.size' value='545362'/>
-        <property name='download.size' value='545362'/>
-        <property name='download.md5' value='7568b973bb2e3cc6f150ad908ddf349f'/>
-      </properties>
-    </artifact>
-    <artifact classifier='osgi.bundle' id='org.apache.felix.webconsole.plugins.memoryusage' version='1.0.4'>
-      <properties size='3'>
-        <property name='artifact.size' value='50278'/>
-        <property name='download.size' value='50278'/>
-        <property name='download.md5' value='4efb370c95ffb8c3202bf5634208c313'/>
-      </properties>
-    </artifact>
-    <artifact classifier='osgi.bundle' id='org.apache.felix.webconsole' version='4.0.0'>
-      <properties size='3'>
-        <property name='artifact.size' value='591992'/>
-        <property name='download.size' value='591992'/>
-        <property name='download.md5' value='8f1ea912ae02473b9fd84389ec6f647f'/>
+        <property name='artifact.size' value='27244'/>
+        <property name='download.size' value='27244'/>
+        <property name='download.md5' value='12db1250ba0e1ee705771d8ce293ce52'/>
       </properties>
     </artifact>
   </artifacts>
diff --git a/lib/content.xml b/lib/content.xml
index c71ab698a0..e0add5e5aa 100644
--- a/lib/content.xml
+++ b/lib/content.xml
@@ -1,59 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <?metadataRepository version='1.1.0'?>
-<repository name='file:/home/hengsin/workspace/idempiere-zk7-test/lib/ - metadata' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1'>
+<repository name='idempiere local repository - metadata' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1'>
   <properties size='2'>
-    <property name='p2.timestamp' value='1396453941062'/>
+    <property name='p2.timestamp' value='1410940772018'/>
     <property name='p2.compressed' value='false'/>
   </properties>
-  <units size='4'>
-    <unit id='org.apache.felix.webconsole' version='4.0.0' singleton='false'>
-      <update id='org.apache.felix.webconsole' range='[0.0.0,4.0.0)' severity='0'/>
-      <properties size='4'>
-        <property name='org.eclipse.equinox.p2.name' value='Apache Felix Web Management Console'/>
-        <property name='org.eclipse.equinox.p2.description' value='Web Based Management Console for OSGi Frameworks. See        http://felix.apache.org/site/apache-felix-web-console.html for more        information on this bundle.'/>
-        <property name='org.eclipse.equinox.p2.provider' value='The Apache Software Foundation'/>
-        <property name='org.eclipse.equinox.p2.doc.url' value='http://felix.apache.org/site/apache-felix-web-console.html'/>
-      </properties>
-      <provides size='10'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.apache.felix.webconsole' version='4.0.0'/>
-        <provided namespace='osgi.bundle' name='org.apache.felix.webconsole' version='4.0.0'/>
-        <provided namespace='java.package' name='org.apache.felix.webconsole' version='3.1.2'/>
-        <provided namespace='java.package' name='org.json' version='0.0.0'/>
-        <provided namespace='java.package' name='org.apache.commons.io' version='1.4.0'/>
-        <provided namespace='java.package' name='org.apache.commons.io.output' version='1.4.0'/>
-        <provided namespace='java.package' name='org.apache.commons.io.input' version='1.4.0'/>
-        <provided namespace='java.package' name='org.apache.commons.io.filefilter' version='1.4.0'/>
-        <provided namespace='java.package' name='org.apache.commons.io.comparator' version='1.4.0'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
-      </provides>
-      <requires size='12'>
-        <required namespace='java.package' name='javax.servlet' range='2.4.0'/>
-        <required namespace='java.package' name='javax.servlet.http' range='2.4.0'/>
-        <required namespace='java.package' name='org.apache.commons.fileupload' range='[1.2.0,2.0.0)'/>
-        <required namespace='java.package' name='org.apache.commons.fileupload.disk' range='[1.2.0,2.0.0)'/>
-        <required namespace='java.package' name='org.apache.commons.fileupload.servlet' range='[1.2.0,2.0.0)'/>
-        <required namespace='java.package' name='org.apache.felix.webconsole' range='[3.1.0,3.2.0)'/>
-        <required namespace='java.package' name='org.osgi.framework' range='[1.4.0,2.0.0)'/>
-        <required namespace='java.package' name='org.osgi.service.http' range='[1.2.0,2.0.0)'/>
-        <required namespace='java.package' name='org.osgi.service.metatype' range='[1.1.0,2.0.0)' optional='true' greedy='false'/>
-        <required namespace='java.package' name='org.osgi.service.packageadmin' range='[1.2.0,2.0.0)'/>
-        <required namespace='java.package' name='org.osgi.service.startlevel' range='[1.1.0,2.0.0)'/>
-        <required namespace='java.package' name='org.osgi.util.tracker' range='[1.3.0,2.0.0)'/>
-      </requires>
-      <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.apache.felix.webconsole' version='4.0.0'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='manifest'>
-            Bundle-SymbolicName: org.apache.felix.webconsole&#xA;Bundle-Version: 4.0.0&#xA;
-          </instruction>
-        </instructions>
-      </touchpointData>
-    </unit>
-    <unit id='org.apache.felix.webconsole.plugins.packageadmin' version='1.0.0' singleton='false'>
-      <update id='org.apache.felix.webconsole.plugins.packageadmin' range='[0.0.0,1.0.0)' severity='0'/>
+  <units size='1'>
+    <unit id='org.apache.felix.webconsole.plugins.packageadmin' version='1.0.0.1' singleton='false'>
+      <update id='org.apache.felix.webconsole.plugins.packageadmin' range='[0.0.0,1.0.0.1)' severity='0'/>
       <properties size='4'>
         <property name='org.eclipse.equinox.p2.name' value='Apache Felix Web Console Package Admin Service Plugin'/>
         <property name='org.eclipse.equinox.p2.description' value='Plugin providing support to query the Package Admin service        for various details; e.g. finding duplicate package exports        or finding bundles exporting given packages'/>
@@ -61,14 +15,14 @@
         <property name='org.eclipse.equinox.p2.doc.url' value='http://www.apache.org/'/>
       </properties>
       <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.apache.felix.webconsole.plugins.packageadmin' version='1.0.0'/>
-        <provided namespace='osgi.bundle' name='org.apache.felix.webconsole.plugins.packageadmin' version='1.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.apache.felix.webconsole.plugins.packageadmin' version='1.0.0.1'/>
+        <provided namespace='osgi.bundle' name='org.apache.felix.webconsole.plugins.packageadmin' version='1.0.0.1'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
       </provides>
       <requires size='8'>
         <required namespace='java.package' name='javax.servlet' range='0.0.0'/>
         <required namespace='java.package' name='javax.servlet.http' range='0.0.0'/>
-        <required namespace='java.package' name='org.apache.commons.io' range='[1.4.0,2.0.0)'/>
+        <required namespace='java.package' name='org.apache.commons.io' range='[1.4.0,3.0.0)'/>
         <required namespace='java.package' name='org.apache.felix.webconsole' range='[3.1.0,4.0.0)'/>
         <required namespace='java.package' name='org.json' range='0.0.0'/>
         <required namespace='java.package' name='org.osgi.framework' range='[1.3.0,2.0.0)'/>
@@ -76,106 +30,13 @@
         <required namespace='java.package' name='org.osgi.util.tracker' range='[1.3.0,2.0.0)'/>
       </requires>
       <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.apache.felix.webconsole.plugins.packageadmin' version='1.0.0'/>
+        <artifact classifier='osgi.bundle' id='org.apache.felix.webconsole.plugins.packageadmin' version='1.0.0.1'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-SymbolicName: org.apache.felix.webconsole.plugins.packageadmin&#xA;Bundle-Version: 1.0.0&#xA;
-          </instruction>
-        </instructions>
-      </touchpointData>
-    </unit>
-    <unit id='org.apache.felix.webconsole.plugins.memoryusage' version='1.0.4' singleton='false'>
-      <update id='org.apache.felix.webconsole.plugins.memoryusage' range='[0.0.0,1.0.4)' severity='0'/>
-      <properties size='4'>
-        <property name='org.eclipse.equinox.p2.name' value='Apache Felix Web Console Memory Usage Plugin'/>
-        <property name='org.eclipse.equinox.p2.description' value='Plugin providing plugins to the Felix Shell and Web Console to        observe the VMs memory use and cause try to get thread dumps etc.'/>
-        <property name='org.eclipse.equinox.p2.provider' value='The Apache Software Foundation'/>
-        <property name='org.eclipse.equinox.p2.doc.url' value='http://www.apache.org/'/>
-      </properties>
-      <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.apache.felix.webconsole.plugins.memoryusage' version='1.0.4'/>
-        <provided namespace='osgi.bundle' name='org.apache.felix.webconsole.plugins.memoryusage' version='1.0.4'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
-      </provides>
-      <requires size='2'>
-        <required namespace='java.package' name='javax.management' range='0.0.0'/>
-        <required namespace='java.package' name='org.osgi.framework' range='[1.3.0,2.0.0)'/>
-      </requires>
-      <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.apache.felix.webconsole.plugins.memoryusage' version='1.0.4'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='manifest'>
-            Bundle-SymbolicName: org.apache.felix.webconsole.plugins.memoryusage&#xA;Bundle-Version: 1.0.4&#xA;
-          </instruction>
-        </instructions>
-      </touchpointData>
-    </unit>
-    <unit id='com.sun.mail.javax.mail' version='1.5.1' singleton='false'>
-      <update id='com.sun.mail.javax.mail' range='[0.0.0,1.5.1)' severity='0'/>
-      <properties size='4'>
-        <property name='org.eclipse.equinox.p2.name' value='JavaMail API'/>
-        <property name='org.eclipse.equinox.p2.description' value='JavaMail API'/>
-        <property name='org.eclipse.equinox.p2.provider' value='Oracle'/>
-        <property name='org.eclipse.equinox.p2.doc.url' value='http://www.oracle.com'/>
-      </properties>
-      <provides size='16'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='com.sun.mail.javax.mail' version='1.5.1'/>
-        <provided namespace='osgi.bundle' name='com.sun.mail.javax.mail' version='1.5.1'/>
-        <provided namespace='java.package' name='javax.mail.internet' version='1.5.0'/>
-        <provided namespace='java.package' name='javax.mail.util' version='1.5.0'/>
-        <provided namespace='java.package' name='javax.mail.search' version='1.5.0'/>
-        <provided namespace='java.package' name='javax.mail' version='1.5.0'/>
-        <provided namespace='java.package' name='javax.mail.event' version='1.5.0'/>
-        <provided namespace='java.package' name='com.sun.mail.imap' version='1.5.1'/>
-        <provided namespace='java.package' name='com.sun.mail.imap.protocol' version='1.5.1'/>
-        <provided namespace='java.package' name='com.sun.mail.iap' version='1.5.1'/>
-        <provided namespace='java.package' name='com.sun.mail.pop3' version='1.5.1'/>
-        <provided namespace='java.package' name='com.sun.mail.smtp' version='1.5.1'/>
-        <provided namespace='java.package' name='com.sun.mail.util' version='1.5.1'/>
-        <provided namespace='java.package' name='com.sun.mail.util.logging' version='1.5.1'/>
-        <provided namespace='java.package' name='com.sun.mail.handlers' version='1.5.1'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
-      </provides>
-      <requires size='24'>
-        <required namespace='java.package' name='com.sun.mail.handlers' range='1.5.0'/>
-        <required namespace='java.package' name='com.sun.mail.iap' range='1.5.0'/>
-        <required namespace='java.package' name='com.sun.mail.imap' range='1.5.0'/>
-        <required namespace='java.package' name='com.sun.mail.imap.protocol' range='1.5.0'/>
-        <required namespace='java.package' name='com.sun.mail.pop3' range='1.5.0'/>
-        <required namespace='java.package' name='com.sun.mail.smtp' range='1.5.0'/>
-        <required namespace='java.package' name='com.sun.mail.util' range='1.5.0'/>
-        <required namespace='java.package' name='com.sun.mail.util.logging' range='1.5.0'/>
-        <required namespace='java.package' name='javax.activation' range='0.0.0'/>
-        <required namespace='java.package' name='javax.crypto' range='0.0.0'/>
-        <required namespace='java.package' name='javax.crypto.spec' range='0.0.0'/>
-        <required namespace='java.package' name='javax.mail' range='1.5.0'/>
-        <required namespace='java.package' name='javax.mail.event' range='1.5.0'/>
-        <required namespace='java.package' name='javax.mail.internet' range='1.5.0'/>
-        <required namespace='java.package' name='javax.mail.search' range='1.5.0'/>
-        <required namespace='java.package' name='javax.mail.util' range='1.5.0'/>
-        <required namespace='java.package' name='javax.net' range='0.0.0'/>
-        <required namespace='java.package' name='javax.net.ssl' range='0.0.0'/>
-        <required namespace='java.package' name='javax.security.auth.callback' range='0.0.0'/>
-        <required namespace='java.package' name='javax.security.auth.x500' range='0.0.0'/>
-        <required namespace='java.package' name='javax.security.sasl' range='0.0.0' optional='true' greedy='false'/>
-        <required namespace='java.package' name='javax.xml.transform' range='0.0.0'/>
-        <required namespace='java.package' name='javax.xml.transform.stream' range='0.0.0'/>
-        <required namespace='java.package' name='sun.security.util' range='0.0.0' optional='true' greedy='false'/>
-      </requires>
-      <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='com.sun.mail.javax.mail' version='1.5.1'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='manifest'>
-            Bundle-SymbolicName: com.sun.mail.javax.mail&#xA;Bundle-Version: 1.5.1&#xA;
+            Bundle-SymbolicName: org.apache.felix.webconsole.plugins.packageadmin&#xA;Bundle-Version: 1.0.0.1&#xA;
           </instruction>
         </instructions>
       </touchpointData>
diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml
index e718592070..9a72515b94 100644
--- a/org.adempiere.base-feature/feature.xml
+++ b/org.adempiere.base-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.base"
       label="Adempiere Base"
-      version="2.0.0.qualifier">
+      version="3.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -18,50 +18,50 @@
 
    <includes
          id="org.compiere.db.provider"
-         version="2.0.0.qualifier"/>
+         version="3.0.0.qualifier"/>
 
    <includes
          id="org.adempiere.payment.processor"
-         version="2.0.0.qualifier"/>
+         version="3.0.0.qualifier"/>
 
    <includes
          id="org.adempiere.pipo"
-         version="2.0.0.qualifier"/>
+         version="3.0.0.qualifier"/>
 
    <includes
          id="org.adempiere.replication"
-         version="2.0.0.qualifier"/>
+         version="3.0.0.qualifier"/>
 
    <includes
          id="org.adempiere.report.jasper"
-         version="2.0.0.qualifier"/>
+         version="3.0.0.qualifier"/>
 
    <plugin
          id="org.adempiere.base"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="3.0.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.base.callout"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="3.0.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.base.process"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="3.0.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.extend"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="3.0.0.qualifier"
          fragment="true"
          unpack="false"/>
 
@@ -69,14 +69,14 @@
          id="org.adempiere.ui"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="3.0.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.apache.ecs"
          download-size="0"
          install-size="0"
-         version="1.0.0.qualifier"
+         version="3.0.0.qualifier"
          unpack="false"/>
 
    <plugin
@@ -100,7 +100,7 @@
          unpack="false"/>
 
    <plugin
-         id="com.springsource.javax.activation"
+         id="javax.activation"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -114,10 +114,10 @@
          unpack="false"/>
 
    <plugin
-         id="javax.servlet"
+         id="org.eclipse.jetty.osgi-servlet-api"
          download-size="0"
          install-size="0"
-         version="3.0.0.v201103241009"
+         version="3.1.0.M0"
          unpack="false"/>
 
    <plugin
@@ -128,14 +128,21 @@
          unpack="false"/>
 
    <plugin
-         id="com.springsource.net.sf.cglib"
+         id="org.apache.servicemix.bundles.cglib"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="com.springsource.org.apache.activemq"
+         id="org.apache.activemq.activemq-core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.activemq.kahadb"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -163,14 +170,7 @@
          unpack="false"/>
 
    <plugin
-         id="com.springsource.org.apache.kahadb"
-         download-size="0"
-         install-size="0"
-         version="5.3.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.springsource.javax.management.j2ee"
+         id="javax.management.j2ee-api"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -240,7 +240,7 @@
          unpack="false"/>
 
    <plugin
-         id="javax.el"
+         id="org.mortbay.jasper.apache-el"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -250,7 +250,7 @@
          id="org.adempiere.install"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"/>
+         version="3.0.0.qualifier"/>
 
    <plugin
          id="org.eclipse.osgi.services"
diff --git a/org.adempiere.base-feature/model.generator.launch b/org.adempiere.base-feature/model.generator.launch
index a3b1d5496d..72e3e9a168 100644
--- a/org.adempiere.base-feature/model.generator.launch
+++ b/org.adempiere.base-feature/model.generator.launch
@@ -14,13 +14,13 @@
 <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.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.7"/>
 <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.springsource.javax.activation@default:default,com.springsource.javax.management.j2ee@default:default,com.springsource.net.sf.cglib@default:default,com.springsource.org.apache.activemq@default:default,com.springsource.org.apache.kahadb@default:default,javax.ejb@default:default,javax.el@default:default,javax.jms@default:default,javax.servlet@default:default,javax.transaction@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@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.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.compatibility.auth@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.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"/>
+<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.compatibility.auth@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.jetty.osgi-servlet-api@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"/>
 <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.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.fitrecorder@default:default,org.w3c.dom.fragment@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
diff --git a/org.adempiere.base-feature/sign.database.build.launch b/org.adempiere.base-feature/sign.database.build.launch
index ccb837f9c0..3be75a19f7 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.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.7"/>
 <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.springsource.javax.management.j2ee@default:default,com.springsource.net.sf.cglib@default:default,com.springsource.org.apache.activemq@default:default,com.springsource.org.apache.kahadb@default:default,javax.el@default:default,javax.jms@default:default,javax.servlet@default:default,javax.xml@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.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.compatibility.auth@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.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.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.w3c.dom.fragment@default:false"/>
+<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.runtime.compatibility.auth@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.jetty.osgi-servlet-api@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.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.w3c.dom.fragment@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.callout/.classpath b/org.adempiere.base.callout/.classpath
index ad32c83a78..098194ca4b 100644
--- a/org.adempiere.base.callout/.classpath
+++ b/org.adempiere.base.callout/.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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.base.callout/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.base.callout/.settings/org.eclipse.jdt.core.prefs
index b3ab3997db..f42de363af 100644
--- a/org.adempiere.base.callout/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.base.callout/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Mon Sep 27 17:21:19 MYT 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.base.callout/META-INF/MANIFEST.MF b/org.adempiere.base.callout/META-INF/MANIFEST.MF
index 9f2744691c..c88d34f9d7 100644
--- a/org.adempiere.base.callout/META-INF/MANIFEST.MF
+++ b/org.adempiere.base.callout/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Callout
+Bundle-Name: iDempiere Callout
 Bundle-SymbolicName: org.adempiere.base.callout
-Bundle-Version: 2.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
+Bundle-Version: 3.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Require-Bundle: org.adempiere.base;bundle-version="3.0.0"
 Eclipse-RegisterBuddy: org.adempiere.base
 Service-Component: OSGI-INF/costadjustmentcalloutfactory.xml
 Bundle-ActivationPolicy: lazy
diff --git a/org.adempiere.base.process/.classpath b/org.adempiere.base.process/.classpath
index ad32c83a78..098194ca4b 100644
--- a/org.adempiere.base.process/.classpath
+++ b/org.adempiere.base.process/.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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs
index 9a68a15ddf..f42de363af 100644
--- a/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Mon Sep 27 16:09:02 MYT 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.base.process/META-INF/MANIFEST.MF b/org.adempiere.base.process/META-INF/MANIFEST.MF
index 9c476ee0b9..2aa4e92f5f 100644
--- a/org.adempiere.base.process/META-INF/MANIFEST.MF
+++ b/org.adempiere.base.process/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Adempiere Processes
+Bundle-Name: iDempiere Processes
 Bundle-SymbolicName: org.adempiere.base.process
-Bundle-Version: 2.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
+Bundle-Version: 3.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Require-Bundle: org.adempiere.base;bundle-version="3.0.0"
 Export-Package: org.adempiere.process,
  org.compiere.process,
  org.idempiere.process
diff --git a/org.adempiere.base/.classpath b/org.adempiere.base/.classpath
index dadd26c3bc..a84c08fdc9 100644
--- a/org.adempiere.base/.classpath
+++ b/org.adempiere.base/.classpath
@@ -1,24 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="barcode4j-2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="vt-dictionary-3.0.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="http://vt-middleware.googlecode.com/svn/vt-dictionary/javadoc/vt-dictionary-3.0"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="vt-password-3.1.1.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="http://vt-middleware.googlecode.com/svn/vt-password/javadoc/vt-password-3.1.1"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="groovy-all-1.7.5.jar"/>
-	<classpathentry kind="lib" path="super-csv-2.0.0-beta-1.jar" sourcepath="/home/carlos/libsources/super-csv-2.0.0-beta-1-sources.jar"/>
-	<classpathentry kind="lib" path="bcprov-jdk15on-1.46.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<accessrules>
-			<accessrule kind="accessible" pattern="com/sun/rowset/*"/>
-		</accessrules>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="bsh-2.0b5.jar"/>
@@ -32,5 +13,19 @@
 	<classpathentry exported="true" kind="lib" path="jcommon-1.0.16.jar"/>
 	<classpathentry exported="true" kind="lib" path="jfreechart-1.0.13.jar"/>
 	<classpathentry exported="true" kind="lib" path="jnlp.jar"/>
-	<classpathentry kind="output" path="build"/>
+	<classpathentry exported="true" kind="lib" path="groovy-all-1.7.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="vt-dictionary-3.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="vt-password-3.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="super-csv-2.0.0-beta-1.jar" sourcepath="/home/carlos/libsources/super-csv-2.0.0-beta-1-sources.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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+		<accessrules>
+			<accessrule kind="accessible" pattern="com/sun/rowset/**"/>
+		</accessrules>
+	</classpathentry>
+	<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
index 9b6f197de6..f42de363af 100644
--- a/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Wed Jul 14 15:10:51 MYT 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+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 d0e0b2d1bf..81c1656497 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
@@ -2,6 +2,6 @@
 <faceted-project>
   <fixed facet="jst.java"/>
   <fixed facet="jst.utility"/>
-  <installed facet="jst.java" version="6.0"/>
   <installed facet="jst.utility" version="1.0"/>
+  <installed facet="jst.java" version="1.7"/>
 </faceted-project>
diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
index 7f84e1a37f..8a78586241 100644
--- a/org.adempiere.base/META-INF/MANIFEST.MF
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: org.adempiere.base
+Bundle-Name: iDempiere Core
 Bundle-SymbolicName: org.adempiere.base;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-ClassPath: base.jar,
  bsh-2.0b5.jar,
  bsh-engine.jar,
@@ -353,16 +353,16 @@ Export-Package: bsh,
  org.supercsv.io,
  org.supercsv.prefs,
  org.supercsv.util
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: com.sun.mail.smtp;version="1.5",
- javax.activation;version="1.1.1",
+ javax.activation,
  javax.jms;version="1.1.0",
  javax.mail;version="1.5",
  javax.mail.internet;version="1.5",
- javax.servlet;version="2.5.0",
- javax.servlet.http;version="2.5.0",
- junit.framework;version="3.8.2",
- junit.textui;version="3.8.2",
+ javax.servlet;version="3.0.0",
+ javax.servlet.http;version="3.0.0",
+ junit.framework;version="3.8.2";resolution:=optional,
+ junit.textui;version="3.8.2";resolution:=optional,
  net.sf.cglib.proxy,
  org.apache.activemq;version="5.3.0",
  org.apache.commons.collections;version="3.2.0",
@@ -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.1"
+Require-Bundle: org.eclipse.equinox.app;bundle-version="1.3.200"
diff --git a/org.adempiere.base/build.properties b/org.adempiere.base/build.properties
index c1012cde94..06c6874dd8 100644
--- a/org.adempiere.base/build.properties
+++ b/org.adempiere.base/build.properties
@@ -36,6 +36,6 @@ bin.includes = META-INF/,\
                schema/,\
                barcode4j-2.1.jar,\
                bcprov-jdk15on-1.46.jar
-output.base.jar = build/
+output.base.jar = bin/
 src.includes = schema/
 source.base.jar = src/
diff --git a/org.adempiere.base/src/org/compiere/util/CacheMgt.java b/org.adempiere.base/src/org/compiere/util/CacheMgt.java
index b09c916ca4..b8c6e53f40 100644
--- a/org.adempiere.base/src/org/compiere/util/CacheMgt.java
+++ b/org.adempiere.base/src/org/compiere/util/CacheMgt.java
@@ -27,6 +27,7 @@ import java.util.logging.Level;
 import org.adempiere.base.IServiceHolder;
 import org.adempiere.base.Service;
 import org.idempiere.distributed.ICacheService;
+import org.idempiere.distributed.IClusterMember;
 import org.idempiere.distributed.IClusterService;
 
 /**
@@ -141,13 +142,13 @@ public class CacheMgt
 		IClusterService service = holder.getService();
 		if (service != null) {			
 			ResetCacheCallable callable = new ResetCacheCallable(tableName, recordId);
-			Future<Collection<Integer>> future = service.execute(callable, service.getMembers());
-			if (future != null) {
+			Map<IClusterMember, Future<Integer>> futureMap = service.execute(callable, service.getMembers());
+			if (futureMap != null) {
 				int total = 0;
 				try {
-					Collection<Integer> results = future.get();
-					for(Integer i : results) 
-					{
+					Collection<Future<Integer>> results = futureMap.values();
+					for(Future<Integer> future : results) {						
+						Integer i = future.get();
 						total += i.intValue();
 					}
 				} catch (InterruptedException e) {
diff --git a/org.adempiere.base/src/org/compiere/util/WebEnv.java b/org.adempiere.base/src/org/compiere/util/WebEnv.java
index 7dd30fe746..523e13389a 100644
--- a/org.adempiere.base/src/org/compiere/util/WebEnv.java
+++ b/org.adempiere.base/src/org/compiere/util/WebEnv.java
@@ -62,7 +62,7 @@ public class WebEnv
 
 	/**
 	 *  Base Directory links <b>http://localhost:8080/adempiere</b>
-	 *  to the physical <i>%adempiere_HOME%/tomcat/webroot/adempiere</i> directory
+	 *  to the physical <i>%adempiere_HOME%/jetty/webroot/adempiere</i> directory
 	 */
 	public static final String   	DIR_BASE    = "/adempiere";      //  /adempiere
 	/** Image Sub-Directory under BASE          */
diff --git a/org.adempiere.base/src/org/idempiere/distributed/IClusterService.java b/org.adempiere.base/src/org/idempiere/distributed/IClusterService.java
index 7d154acb50..b38a9aa357 100644
--- a/org.adempiere.base/src/org/idempiere/distributed/IClusterService.java
+++ b/org.adempiere.base/src/org/idempiere/distributed/IClusterService.java
@@ -1,14 +1,41 @@
 package org.idempiere.distributed;
 
 import java.util.Collection;
+import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
 
+/**
+ * 
+ * @author hengsin
+ *
+ */
 public interface IClusterService {
 
+	/**
+	 * 
+	 * @return Collection of cluster member
+	 */
 	public Collection<IClusterMember> getMembers();
+	
+	/**
+	 * @return Local node
+	 */
 	public IClusterMember getLocalMember();
 	
+	/**
+	 * 
+	 * @param task
+	 * @param member
+	 * @return Future
+	 */
 	public <V>Future<V> execute(Callable<V> task, IClusterMember member);
-	public <V>Future<Collection<V>> execute(Callable<V> task, Collection<IClusterMember> members);
+	
+	/**
+	 * 
+	 * @param task
+	 * @param members
+	 * @return Map of IClusterMember and Future
+	 */
+	public <V> Map<IClusterMember, Future<V>> execute(Callable<V> task, Collection<IClusterMember> members);
 }
diff --git a/org.adempiere.bundles.external-feature/feature.xml b/org.adempiere.bundles.external-feature/feature.xml
index 63658ca594..baa809e790 100644
--- a/org.adempiere.bundles.external-feature/feature.xml
+++ b/org.adempiere.bundles.external-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.bundles.external"
       label="External bundles"
-      version="2.0.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="Adempiere.org">
 
    <description url="http://www.example.com/description">
@@ -25,7 +25,7 @@
          unpack="false"/>
 
    <plugin
-         id="javax.servlet.jsp.jstl"
+         id="org.apache.taglibs.taglibs-standard-spec"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -39,14 +39,7 @@
          unpack="false"/>
 
    <plugin
-         id="com.springsource.net.sf.cglib"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.springsource.org.apache.activemq"
+         id="org.apache.servicemix.bundles.cglib"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -59,13 +52,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.springsource.org.apache.kahadb"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.apache.poi"
          download-size="0"
@@ -73,13 +59,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.apache.taglibs.standard.glassfish"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.apache.xerces"
          download-size="0"
diff --git a/org.adempiere.eclipse.equinox.http.servlet/.classpath b/org.adempiere.eclipse.equinox.http.servlet/.classpath
index ad32c83a78..098194ca4b 100644
--- a/org.adempiere.eclipse.equinox.http.servlet/.classpath
+++ b/org.adempiere.eclipse.equinox.http.servlet/.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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
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
index c537b63063..f42de363af 100644
--- 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
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
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 a0f373e7cf..894493c659 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.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 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.servlet/src/org/eclipse/equinox/http/servlet/internal/ServletContextAdaptor.java b/org.adempiere.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/ServletContextAdaptor.java
index b0e7040691..edec8e377d 100644
--- a/org.adempiere.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/ServletContextAdaptor.java
+++ b/org.adempiere.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/ServletContextAdaptor.java
@@ -295,6 +295,11 @@ public class ServletContextAdaptor implements ServletContext {
 	}
 
 	public void setSessionTrackingModes(Set<SessionTrackingMode> arg0) {
-		servletContext.setSessionTrackingModes(arg0);		
+		servletContext.setSessionTrackingModes(arg0);
+	}
+
+	@Override
+	public String getVirtualServerName() {
+		return servletContext.getVirtualServerName();
 	}
 }
diff --git a/org.adempiere.eclipse.equinox.http.servletbridge/.classpath b/org.adempiere.eclipse.equinox.http.servletbridge/.classpath
index ad32c83a78..098194ca4b 100644
--- a/org.adempiere.eclipse.equinox.http.servletbridge/.classpath
+++ b/org.adempiere.eclipse.equinox.http.servletbridge/.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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
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
index c537b63063..f42de363af 100644
--- 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
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
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 f8508e3647..9ffeaf1f54 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.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 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/.classpath b/org.adempiere.eclipse.equinox.servletbridge/.classpath
index ad32c83a78..098194ca4b 100644
--- a/org.adempiere.eclipse.equinox.servletbridge/.classpath
+++ b/org.adempiere.eclipse.equinox.servletbridge/.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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
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
index c537b63063..f42de363af 100644
--- a/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF b/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF
index e9cb5247fb..ee48be2020 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.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 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/.classpath b/org.adempiere.extend/.classpath
index aec6ab1f7d..6fe0ea9fc3 100644
--- a/org.adempiere.extend/.classpath
+++ b/org.adempiere.extend/.classpath
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="spiffy-with_source-all-0.05.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="/org.adempiere.base/super-csv-2.0.0-beta-1.jar" sourcepath="/home/carlos/libsources/super-csv-2.0.0-beta-1-sources.jar"/>
-	<classpathentry kind="output" path="build"/>
+	<classpathentry exported="true" kind="lib" path="spiffy-with_source-all-0.05.jar"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.adempiere.extend/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.extend/.settings/org.eclipse.jdt.core.prefs
index 427807001b..f42de363af 100644
--- a/org.adempiere.extend/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.extend/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Wed Jul 14 15:37:43 MYT 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.extend/META-INF/MANIFEST.MF b/org.adempiere.extend/META-INF/MANIFEST.MF
index c6af8b471c..3f2d7e4810 100644
--- a/org.adempiere.extend/META-INF/MANIFEST.MF
+++ b/org.adempiere.extend/META-INF/MANIFEST.MF
@@ -1,15 +1,15 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: org.adempiere.extend
+Bundle-Name: iDempiere extend
 Bundle-SymbolicName: org.adempiere.extend;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-ClassPath: extend.jar,
  spiffy-with_source-all-0.05.jar
 Eclipse-RegisterBuddy: org.adempiere.tools
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: compiere.model,
  test
-Fragment-Host: org.adempiere.base;bundle-version="2.0.0"
+Fragment-Host: org.adempiere.base;bundle-version="3.0.0"
 Eclipse-PatchFragment: true
 Import-Package: junit.framework;version="3.8.2",
  org.junit;version="4.8.2",
diff --git a/org.adempiere.extend/build.properties b/org.adempiere.extend/build.properties
index 41403dca88..fb0e40410a 100644
--- a/org.adempiere.extend/build.properties
+++ b/org.adempiere.extend/build.properties
@@ -1,4 +1,4 @@
-output.extend.jar = build/
+output.extend.jar = bin/
 bin.includes = META-INF/,\
                extend.jar,\
                spiffy-with_source-all-0.05.jar
diff --git a/org.adempiere.install/.classpath b/org.adempiere.install/.classpath
index 5995863c3b..4194d6e884 100644
--- a/org.adempiere.install/.classpath
+++ b/org.adempiere.install/.classpath
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="ant-contrib-1.0b3.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<accessrules>
+			<accessrule kind="accessible" pattern="sun/security/tools/*"/>
+		</accessrules>
+	</classpathentry>
 	<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="output" path="build"/>
+	<classpathentry exported="true" kind="lib" path="ant-contrib-1.0b3.jar"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.adempiere.install/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.install/.settings/org.eclipse.jdt.core.prefs
index d8e524f5e2..f42de363af 100644
--- a/org.adempiere.install/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.install/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Wed Jul 14 16:17:19 MYT 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.install/META-INF/MANIFEST.MF b/org.adempiere.install/META-INF/MANIFEST.MF
index b1d04c0c4d..28ba0f2be7 100644
--- a/org.adempiere.install/META-INF/MANIFEST.MF
+++ b/org.adempiere.install/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: install
+Bundle-Name: iDempiere Setup
 Bundle-SymbolicName: org.adempiere.install;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-ClassPath: install.jar,
  ant-contrib-1.0b3.jar
 Export-Package: org.adempiere.install,
  org.compiere.install
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.adempiere.base;bundle-version="3.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: javax.mail;version="1.5",
  javax.mail.internet;version="1.5",
  org.apache.tools.ant,
diff --git a/org.adempiere.install/build.properties b/org.adempiere.install/build.properties
index c77134375d..92cfb8317f 100644
--- a/org.adempiere.install/build.properties
+++ b/org.adempiere.install/build.properties
@@ -1,5 +1,5 @@
 source.install.jar = src/
-output.install.jar = build/
+output.install.jar = bin/
 bin.includes = META-INF/,\
                install.jar,\
                plugin.xml,\
diff --git a/org.adempiere.install/build.xml b/org.adempiere.install/build.xml
index 1a09a8d37a..2bc738f9d9 100644
--- a/org.adempiere.install/build.xml
+++ b/org.adempiere.install/build.xml
@@ -1,11 +1,11 @@
 <!-- ====================================================== -->
-<!-- Setup Tomcat For Development Environment               -->
+<!-- Setup Jetty For Development Environment               -->
 <!-- ====================================================== -->
 
 <project name="setup" default="setup" basedir=".">
 
 	<description>
-	This buildfile is used to setup the Adempiere Environment.
+	This buildfile is used to setup the idempiere Environment.
 	</description>
 
 	<property environment="env" />
@@ -14,10 +14,10 @@
 	<!-- ==================================================== -->
 	<!-- Init                                                 -->
 	<!-- ==================================================== -->
-	<target name="setupTomcat"
-		description="setup tomcat">
+	<target name="setupJetty"
+		description="setup jetty">
 
-		<echo message="Setup Tomcat ===================" />
+		<echo message="Setup Jetty ===================" />
 		<echo message="IDEMPIERE_HOME = ${env.IDEMPIERE_HOME}" />
 
 		<!-- create the time stamp and environment -->
@@ -27,15 +27,24 @@
 		<property file="${envFile}"/>
 		<filter filtersfile="${envFile}" />
 
-		<copy file="../org.adempiere.tomcat.config/META-INF/tomcat/serverTemplate.xml"
-			tofile="../org.adempiere.tomcat.config/META-INF/tomcat/server.xml" filtering="yes" overwrite="yes"/>
-
+		<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"/>
+		<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/hazelcast-template.xml"
+					tofile="../hazelcast.xml" filtering="yes" overwrite="yes"/>
 	</target>
 
 	<!-- ==================================================== -->
 	<!-- Setup (Main)                                         -->
 	<!-- ==================================================== -->
-	<target name="setup" depends="setupTomcat"
-		description="Setup Adempiere">
+	<target name="setup" depends="setupJetty"
+		description="Setup iDempiere">
 	</target>
-</project>
\ No newline at end of file
+</project>
diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch
index 800132222d..1983d4dc7e 100644
--- a/org.adempiere.install/install.app.launch
+++ b/org.adempiere.install/install.app.launch
@@ -14,13 +14,14 @@
 <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.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.7"/>
 <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"/>
 <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.springsource.javax.activation@default:default,com.springsource.javax.management.j2ee@default:default,com.springsource.net.sf.cglib@default:default,com.springsource.org.apache.activemq@default:default,com.springsource.org.apache.kahadb@default:default,com.sun.mail.javax.mail@default:default,javax.ejb@default:default,javax.el@default:default,javax.jms@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.transaction@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.ant@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.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.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.restlet@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: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.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"/>
 <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 ef84460bc3..68cb18d360 100644
--- a/org.adempiere.install/install.console.app.launch
+++ b/org.adempiere.install/install.console.app.launch
@@ -14,13 +14,13 @@
 <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.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.7"/>
 <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.springsource.javax.activation@default:default,com.springsource.javax.management.j2ee@default:default,com.springsource.net.sf.cglib@default:default,com.springsource.org.apache.activemq@default:default,com.springsource.org.apache.kahadb@default:default,javax.ejb@default:default,javax.jms@default:default,javax.servlet@2:default,javax.transaction@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,org.apache.ant@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.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.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.restlet@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.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.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"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
diff --git a/org.adempiere.install/src/org/compiere/install/ConfigVM.java b/org.adempiere.install/src/org/compiere/install/ConfigVM.java
index d2c4044d8e..c503a2b079 100644
--- a/org.adempiere.install/src/org/compiere/install/ConfigVM.java
+++ b/org.adempiere.install/src/org/compiere/install/ConfigVM.java
@@ -75,17 +75,20 @@ public class ConfigVM extends Config
 		System.setProperty(ConfigurationData.JAVA_HOME, javaHome.getAbsolutePath());
 
 		//	Java Version
-		final String VERSION = "1.6.0";
-		final String VERSION2 = "1.7.0";	//	The real one
+		final String[] versions = new String[]{"1.7.0", "1.8.0"};
 		pass = false;
 		String thisJV = System.getProperty("java.version");
-		pass = thisJV.indexOf(VERSION) != -1;
-		if (!pass && thisJV.indexOf(VERSION2) != -1)
-			pass = true;
-		if (pass)
-		  if (log.isLoggable(Level.INFO)) log.info("OK: Version=" + thisJV);
-
-		error = "Wrong Java Version: Should be " + VERSION + " and above.";
+		for(String version : versions) 
+		{
+			pass = thisJV.indexOf(version) != -1;
+			if (pass)
+			{
+				if (log.isLoggable(Level.INFO)) log.info("OK: Version=" + thisJV);
+				break;
+			}			
+		}
+		
+		error = "Wrong Java Version: Should be " + versions[0] + " and above.";
 		if (getPanel() != null)
 			signalOK(getPanel().okJavaHome, "ErrorJavaHome",
 					pass, true, error);
diff --git a/org.adempiere.install/src/org/compiere/install/ConfigurationData.java b/org.adempiere.install/src/org/compiere/install/ConfigurationData.java
index 0c9d98f2b1..8765c6815e 100644
--- a/org.adempiere.install/src/org/compiere/install/ConfigurationData.java
+++ b/org.adempiere.install/src/org/compiere/install/ConfigurationData.java
@@ -290,6 +290,10 @@ public class ConfigurationData
 				p_panel.fAdminEMail.setText((String)p_properties.get(ADEMPIERE_ADMIN_EMAIL));
 			}
 		}
+		else
+		{
+			setDatabaseType(DBTYPE_POSTGRESQL);
+		}
 
 		InetAddress localhost = null;
 		String hostName = "unknown";
@@ -355,9 +359,9 @@ public class ConfigurationData
 
 		//	Keystore Alias
 		if (!p_properties.containsKey(ADEMPIERE_KEYSTORECODEALIAS))
-			p_properties.setProperty(ADEMPIERE_KEYSTORECODEALIAS, "adempiere");
+			p_properties.setProperty(ADEMPIERE_KEYSTORECODEALIAS, "idempiere");
 		if (!p_properties.containsKey(ADEMPIERE_KEYSTOREWEBALIAS))
-			p_properties.setProperty(ADEMPIERE_KEYSTOREWEBALIAS, "adempiere");
+			p_properties.setProperty(ADEMPIERE_KEYSTOREWEBALIAS, "idempiere");
 
 		return true;
 	}	//	load
@@ -470,8 +474,8 @@ public class ConfigurationData
 		ks.setState((String)p_properties.getProperty(ADEMPIERE_CERT_STATE));
 		ks.setCountry((String)p_properties.getProperty(ADEMPIERE_CERT_COUNTRY));
 		error = p_panel != null
-			? ks.verify((JFrame)SwingUtilities.getWindowAncestor(p_panel))
-			: ks.verify(null);
+			? ks.verify((JFrame)SwingUtilities.getWindowAncestor(p_panel), p_properties.getProperty(ADEMPIERE_KEYSTOREWEBALIAS))
+			: ks.verify(null, p_properties.getProperty(ADEMPIERE_KEYSTOREWEBALIAS));
 		pass = error == null;
 		if (p_panel != null)
 			p_panel.signalOK(p_panel.okKeyStore, "KeyStorePassword",
@@ -862,9 +866,9 @@ public class ConfigurationData
 		Ini.setAdempiereHome(m_adempiereHome.getAbsolutePath());
 
 		//	Create Connection
-		String ccType = Database.DB_ORACLE;
-		if (getDatabaseType().equals(DBTYPE_POSTGRESQL))
-			ccType = Database.DB_POSTGRESQL;
+		String ccType = Database.DB_POSTGRESQL;
+		if (getDatabaseType().equals(DBTYPE_ORACLE))
+			ccType = Database.DB_ORACLE;
 		CConnection cc = null;
 		try
 		{
@@ -1124,10 +1128,10 @@ public class ConfigurationData
 	 *************************************************************************/
 
 	/** Oracle directory	*/
-	//private static String	DBTYPE_ORACLE = "Oracle";
+	private static String	DBTYPE_ORACLE = "Oracle";
 
 	/** PostgreSQL          */
-	private static String	DBTYPE_POSTGRESQL = "PostgreSQL";
+	private static String	DBTYPE_POSTGRESQL = "PostgreSQL";	
 
 	/** Database Types		*/
 	public static String[]	DBTYPE = null;
diff --git a/org.adempiere.install/src/org/compiere/install/InstallApplication.java b/org.adempiere.install/src/org/compiere/install/InstallApplication.java
index 88946296c5..0f5c79eef4 100644
--- a/org.adempiere.install/src/org/compiere/install/InstallApplication.java
+++ b/org.adempiere.install/src/org/compiere/install/InstallApplication.java
@@ -36,7 +36,7 @@ public class InstallApplication implements IApplication {
 		}
 		String path = System.getProperty("user.dir") + "/org.adempiere.install/build.xml";
 		File file = new File(path);
-		System.out.println("file="+path+" exists="+file.exists());
+//		System.out.println("file="+path+" exists="+file.exists());
 		//only exists if it is running from development environment
 		if (file.exists()) {
 			AntRunner runner = new AntRunner();
@@ -46,7 +46,7 @@ public class InstallApplication implements IApplication {
 			runner.run();
 			runner.stop();
 		}
-		return null;
+		return EXIT_OK;
 	}
 
 	public void stop() {
diff --git a/org.adempiere.install/src/org/compiere/install/KeyStoreMgt.java b/org.adempiere.install/src/org/compiere/install/KeyStoreMgt.java
index ecacf20b3a..d99a32396b 100644
--- a/org.adempiere.install/src/org/compiere/install/KeyStoreMgt.java
+++ b/org.adempiere.install/src/org/compiere/install/KeyStoreMgt.java
@@ -73,19 +73,16 @@ public class KeyStoreMgt
 	
 	
 	/**	Directory below IDEMPIERE_HOME	*/
-	public static String		KEYSTORE_DIRECTORY = "keystore";
+	public static String		KEYSTORE_DIRECTORY = "jettyhome/etc";
 	/** Name of KeyStore				*/
-	public static String		KEYSTORE_NAME = "myKeystore";
-	/** Certificate Alias				*/
-	public static String		CERTIFICATE_ALIAS = "idempiere";
-	
+	public static String		KEYSTORE_NAME = "keystore";	
 
 	/**
 	 * 	Verify/Create Key Store
 	 * 	@param parent frame
 	 *	@return null or error message
 	 */
-	public String verify (JFrame parent)
+	public String verify (JFrame parent, String alias)
 	{
 		KeyStore ks = null;
 		try
@@ -100,7 +97,7 @@ public class KeyStoreMgt
 		//	No KeyStore
 		if (ks == null)
 		{
-			createCertificate(CERTIFICATE_ALIAS, parent);
+			createCertificate(alias, parent);
 			try
 			{
 				ks = getKeyStore();
@@ -120,7 +117,7 @@ public class KeyStoreMgt
 		Certificate cert = null;
 		try
 		{
-			cert = getCertificate(CERTIFICATE_ALIAS);
+			cert = getCertificate(alias);
 		}
 		catch (Exception e)
 		{
@@ -226,7 +223,7 @@ public class KeyStoreMgt
 		{
 			File dir = m_file.getParentFile();
 			if (!dir.exists())
-				dir.mkdir();
+				dir.mkdirs();
 		}
 		catch (Exception e)
 		{
@@ -496,7 +493,7 @@ public class KeyStoreMgt
 	{
 		Adempiere.startupEnvironment(true);
 		System.out.println(new KeyStoreMgt (
-			"C:/Adempiere/keystore/myKeystore2", "myPassword".toCharArray()).verify(null));
+			"C:/Adempiere/keystore/myKeystore2", "myPassword".toCharArray()).verify(null, "idempiere"));
 	}	//	main
 	
 }	//	MyKeyStore
diff --git a/org.adempiere.payment.processor-feature/feature.xml b/org.adempiere.payment.processor-feature/feature.xml
index 183b6d2450..38a229fb60 100644
--- a/org.adempiere.payment.processor-feature/feature.xml
+++ b/org.adempiere.payment.processor-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.payment.processor"
       label="Payment Processor"
-      version="2.0.0.qualifier">
+      version="3.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,14 +17,14 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="2.0.0.qualifier"/>
+      <import feature="org.adempiere.base" version="3.0.0.qualifier"/>
    </requires>
 
    <plugin
          id="org.adempiere.payment.processor"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="3.0.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/org.adempiere.payment.processor/.classpath b/org.adempiere.payment.processor/.classpath
index 49087bf65e..d056d9cc16 100644
--- a/org.adempiere.payment.processor/.classpath
+++ b/org.adempiere.payment.processor/.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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="jpayment.jar"/>
diff --git a/org.adempiere.payment.processor/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.payment.processor/.settings/org.eclipse.jdt.core.prefs
index 57e9da9f2f..f42de363af 100644
--- a/org.adempiere.payment.processor/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.payment.processor/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Sat Sep 25 06:49:38 MYT 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.payment.processor/META-INF/MANIFEST.MF b/org.adempiere.payment.processor/META-INF/MANIFEST.MF
index 7fcfd809d1..6ffbffa0f6 100644
--- a/org.adempiere.payment.processor/META-INF/MANIFEST.MF
+++ b/org.adempiere.payment.processor/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Processor
+Bundle-Name: iDempiere Payment Processor
 Bundle-SymbolicName: org.adempiere.payment.processor;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
+Bundle-Version: 3.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Require-Bundle: org.adempiere.base;bundle-version="3.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 c4ef91aacd..163d053096 100644
--- a/org.adempiere.pipo-feature/feature.xml
+++ b/org.adempiere.pipo-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.pipo"
       label="Pipo-feature"
-      version="2.0.0.qualifier">
+      version="3.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,28 +17,28 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="2.0.0.qualifier"/>
+      <import feature="org.adempiere.base" version="3.0.0.qualifier"/>
    </requires>
 
    <plugin
          id="org.adempiere.pipo"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="3.0.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.pipo.handlers"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="3.0.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.plugin.utils"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="3.0.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/org.adempiere.pipo.handlers/.classpath b/org.adempiere.pipo.handlers/.classpath
index ad32c83a78..098194ca4b 100644
--- a/org.adempiere.pipo.handlers/.classpath
+++ b/org.adempiere.pipo.handlers/.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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.pipo.handlers/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.pipo.handlers/.settings/org.eclipse.jdt.core.prefs
index bb618cfae4..f42de363af 100644
--- a/org.adempiere.pipo.handlers/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.pipo.handlers/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Fri Aug 06 19:56:31 MYT 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF
index bb377b05c1..7f19612a66 100644
--- a/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF
+++ b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: PipoHandlers
+Bundle-Name: iDempiere 2Pack Handlers
 Bundle-SymbolicName: org.adempiere.pipo.handlers;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.pipo;bundle-version="2.0.0",
- org.adempiere.base;bundle-version="2.0.0"
+Bundle-Version: 3.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Require-Bundle: org.adempiere.pipo;bundle-version="3.0.0",
+ org.adempiere.base;bundle-version="3.0.0"
diff --git a/org.adempiere.pipo/.classpath b/org.adempiere.pipo/.classpath
index ad32c83a78..098194ca4b 100644
--- a/org.adempiere.pipo/.classpath
+++ b/org.adempiere.pipo/.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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.pipo/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.pipo/.settings/org.eclipse.jdt.core.prefs
index ceb61221f1..f42de363af 100644
--- a/org.adempiere.pipo/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.pipo/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Fri Mar 12 08:48:46 CET 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.pipo/META-INF/MANIFEST.MF b/org.adempiere.pipo/META-INF/MANIFEST.MF
index 7a53212437..4fdf37be14 100644
--- a/org.adempiere.pipo/META-INF/MANIFEST.MF
+++ b/org.adempiere.pipo/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: PiPo
+Bundle-Name: iDempiere 2Pack Core
 Bundle-SymbolicName: org.adempiere.pipo;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Version: 3.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: org.apache.commons.codec,
  org.apache.commons.codec.binary,
  org.apache.tools.ant,
@@ -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="2.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="3.0.0"
 Service-Component: OSGI-INF/dictionaryservice.xml
diff --git a/org.adempiere.plugin.utils/.classpath b/org.adempiere.plugin.utils/.classpath
index ad32c83a78..098194ca4b 100644
--- a/org.adempiere.plugin.utils/.classpath
+++ b/org.adempiere.plugin.utils/.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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs
index ef6af465ad..f42de363af 100644
--- a/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Fri Mar 12 08:32:19 CET 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF
index 402749e2af..5a6fa776da 100644
--- a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF
+++ b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Plugin Utils
+Bundle-Name: iDempiere Plugin Utils
 Bundle-SymbolicName: org.adempiere.plugin.utils
-Bundle-Version: 2.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Version: 3.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: org.adempiere.base,
  org.adempiere.util,
  org.apache.xerces.dom;version="2.9.0",
diff --git a/org.adempiere.replication-feature/feature.xml b/org.adempiere.replication-feature/feature.xml
index bf857bb9f6..39f35b6cfc 100644
--- a/org.adempiere.replication-feature/feature.xml
+++ b/org.adempiere.replication-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.replication"
       label="Replication-feature"
-      version="2.0.0.qualifier">
+      version="3.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,14 +17,14 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="2.0.0.qualifier"/>
+      <import feature="org.adempiere.base" version="3.0.0.qualifier"/>
    </requires>
 
    <plugin
          id="org.adempiere.replication"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="3.0.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/org.adempiere.replication.server-feature/feature.xml b/org.adempiere.replication.server-feature/feature.xml
index 07f41e7312..d1ad2900e1 100644
--- a/org.adempiere.replication.server-feature/feature.xml
+++ b/org.adempiere.replication.server-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.replication.server"
       label="Replication Server-feature"
-      version="2.0.0.qualifier">
+      version="3.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,16 +17,16 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="2.0.0.qualifier"/>
-      <import feature="org.adempiere.replication" version="2.0.0.qualifier"/>
-      <import plugin="org.adempiere.server" version="2.0.0.qualifier" />
+      <import feature="org.adempiere.base" version="3.0.0.qualifier"/>
+      <import feature="org.adempiere.replication" version="3.0.0.qualifier"/>
+      <import plugin="org.adempiere.server" version="3.0.0.qualifier"/>
    </requires>
 
    <plugin
          id="org.adempiere.replication.server"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="3.0.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/org.adempiere.replication.server/.classpath b/org.adempiere.replication.server/.classpath
index ad32c83a78..098194ca4b 100644
--- a/org.adempiere.replication.server/.classpath
+++ b/org.adempiere.replication.server/.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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.replication.server/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.replication.server/.settings/org.eclipse.jdt.core.prefs
index 6f33eef4d2..f42de363af 100644
--- a/org.adempiere.replication.server/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.replication.server/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Mon Sep 27 18:13:48 MYT 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.replication.server/META-INF/MANIFEST.MF b/org.adempiere.replication.server/META-INF/MANIFEST.MF
index 57fe6d1942..3245166e04 100644
--- a/org.adempiere.replication.server/META-INF/MANIFEST.MF
+++ b/org.adempiere.replication.server/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Server
+Bundle-Name: iDempiere Replication Server
 Bundle-SymbolicName: org.adempiere.replication.server;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.server;bundle-version="2.0.0",
- org.adempiere.replication;bundle-version="2.0.0",
- org.adempiere.base;bundle-version="2.0.0"
+Bundle-Version: 3.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Require-Bundle: org.adempiere.server;bundle-version="3.0.0",
+ org.adempiere.replication;bundle-version="3.0.0",
+ org.adempiere.base;bundle-version="3.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/.classpath b/org.adempiere.replication/.classpath
index ad32c83a78..098194ca4b 100644
--- a/org.adempiere.replication/.classpath
+++ b/org.adempiere.replication/.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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs
index 1b7e71d034..f42de363af 100644
--- a/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Mon Sep 27 13:20:21 MYT 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.replication/META-INF/MANIFEST.MF b/org.adempiere.replication/META-INF/MANIFEST.MF
index d9fd41635e..094669f3c6 100644
--- a/org.adempiere.replication/META-INF/MANIFEST.MF
+++ b/org.adempiere.replication/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Replication
+Bundle-Name: iDempiere Replication
 Bundle-SymbolicName: org.adempiere.replication;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
+Bundle-Version: 3.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Require-Bundle: org.adempiere.base;bundle-version="3.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 dddd07f627..d9550433e8 100644
--- a/org.adempiere.report.jasper-feature/feature.xml
+++ b/org.adempiere.report.jasper-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.report.jasper"
       label="JasperReport-feature"
-      version="2.0.0.qualifier">
+      version="3.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,20 +17,20 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="2.0.0.qualifier"/>
+      <import feature="org.adempiere.base" version="3.0.0.qualifier"/>
    </requires>
 
    <plugin
          id="org.adempiere.report.jasper"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"/>
+         version="3.0.0.qualifier"/>
 
    <plugin
          id="org.adempiere.report.jasper.library"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"/>
+         version="3.0.0.qualifier"/>
 
    <plugin
          id="org.apache.batik.bridge"
diff --git a/org.adempiere.report.jasper.fonts/.classpath b/org.adempiere.report.jasper.fonts/.classpath
index ad32c83a78..098194ca4b 100644
--- a/org.adempiere.report.jasper.fonts/.classpath
+++ b/org.adempiere.report.jasper.fonts/.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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.report.jasper.fonts/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper.fonts/.settings/org.eclipse.jdt.core.prefs
index e7516fa388..f42de363af 100644
--- a/org.adempiere.report.jasper.fonts/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.report.jasper.fonts/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Tue Jun 19 21:29:53 MYT 2012
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.report.jasper.fonts/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.fonts/META-INF/MANIFEST.MF
index 1aca7b488d..00837007a7 100644
--- a/org.adempiere.report.jasper.fonts/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.fonts/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: JasperReport Font Demo
 Bundle-SymbolicName: org.adempiere.report.jasper.fonts
 Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: org.adempiere.report.jasper.fonts
 Fragment-Host: org.adempiere.report.jasper.library
 
diff --git a/org.adempiere.report.jasper.fragment.test/.classpath b/org.adempiere.report.jasper.fragment.test/.classpath
index ad32c83a78..098194ca4b 100644
--- a/org.adempiere.report.jasper.fragment.test/.classpath
+++ b/org.adempiere.report.jasper.fragment.test/.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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.report.jasper.fragment.test/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper.fragment.test/.settings/org.eclipse.jdt.core.prefs
index c537b63063..f42de363af 100644
--- a/org.adempiere.report.jasper.fragment.test/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.report.jasper.fragment.test/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.report.jasper.fragment.test/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.fragment.test/META-INF/MANIFEST.MF
index 3605072956..192faea16f 100644
--- a/org.adempiere.report.jasper.fragment.test/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.fragment.test/META-INF/MANIFEST.MF
@@ -4,4 +4,6 @@ Bundle-Name: Test
 Bundle-SymbolicName: org.adempiere.report.jasper.fragment.test
 Bundle-Version: 1.0.0.qualifier
 Fragment-Host: org.adempiere.report.jasper.webapp;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Jetty-WarPatchFragmentFolderPath: /
+
diff --git a/org.adempiere.report.jasper.library/.classpath b/org.adempiere.report.jasper.library/.classpath
index bf4c774983..045479f6b7 100644
--- a/org.adempiere.report.jasper.library/.classpath
+++ b/org.adempiere.report.jasper.library/.classpath
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/xalan-2.7.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jackson-core-2.0.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jasperreports-fonts-5.1.2.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/commons-digester-2.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jasperreports-5.1.2.jar" sourcepath="lib/jasperreports-5.1.2-sources.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry exported="true" kind="lib" path="lib/jasperreports-fonts-5.1.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jackson-core-2.0.5.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.7">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
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
index 3e4d76cde5..f42de363af 100644
--- a/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Wed Jul 14 15:43:54 MYT 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+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 d0e0b2d1bf..81c1656497 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
@@ -2,6 +2,6 @@
 <faceted-project>
   <fixed facet="jst.java"/>
   <fixed facet="jst.utility"/>
-  <installed facet="jst.java" version="6.0"/>
   <installed facet="jst.utility" version="1.0"/>
+  <installed facet="jst.java" version="1.7"/>
 </faceted-project>
diff --git a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
index 69989f5a23..9a532f4b03 100644
--- a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: JasperReports Dependency
+Bundle-Name: iDempiere JasperReports Dependency
 Bundle-SymbolicName: org.adempiere.report.jasper.library
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-ClassPath: lib/commons-beanutils-1.8.0.jar,
  lib/commons-digester-2.1.jar,
  lib/jasperreports-5.1.2.jar,
@@ -222,7 +222,7 @@ Export-Package: .,
  org.apache.xpath.patterns,
  org.apache.xpath.res,
  org.w3c.tools.codec
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: com.lowagie.text,
  com.lowagie.text.pdf,
  groovy.inspect,
@@ -416,11 +416,7 @@ Import-Package: com.lowagie.text,
  org.codehaus.groovy.vmplugin.v5,
  org.eclipse.jdt.core,
  org.eclipse.jdt.core.compiler,
- org.eclipse.jdt.internal.antadapter,
  org.eclipse.jdt.internal.compiler,
- org.eclipse.jdt.internal.compiler.apt.dispatch,
- org.eclipse.jdt.internal.compiler.apt.model,
- org.eclipse.jdt.internal.compiler.apt.util,
  org.eclipse.jdt.internal.compiler.ast,
  org.eclipse.jdt.internal.compiler.batch,
  org.eclipse.jdt.internal.compiler.classfmt,
@@ -432,7 +428,6 @@ Import-Package: com.lowagie.text,
  org.eclipse.jdt.internal.compiler.parser,
  org.eclipse.jdt.internal.compiler.parser.diagnose,
  org.eclipse.jdt.internal.compiler.problem,
- org.eclipse.jdt.internal.compiler.tool,
  org.eclipse.jdt.internal.compiler.util,
  org.krysalis.barcode4j,
  org.krysalis.barcode4j.ant,
diff --git a/org.adempiere.report.jasper.swing/.classpath b/org.adempiere.report.jasper.swing/.classpath
index ad32c83a78..098194ca4b 100644
--- a/org.adempiere.report.jasper.swing/.classpath
+++ b/org.adempiere.report.jasper.swing/.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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
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
index 36d6e191a4..f42de363af 100644
--- a/org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Thu Aug 19 17:50:42 MYT 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
index a3c23f3e9f..a015f4ea8f 100644
--- a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JasperReports Swing Client
 Bundle-SymbolicName: org.adempiere.report.jasper.swing;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
- org.adempiere.ui.swing;bundle-version="2.0.0"
+Bundle-Version: 3.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Require-Bundle: org.adempiere.base;bundle-version="3.0.0",
+ org.adempiere.ui.swing;bundle-version="3.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/.classpath b/org.adempiere.report.jasper.webapp/.classpath
index 6046c7a0d1..098194ca4b 100644
--- a/org.adempiere.report.jasper.webapp/.classpath
+++ b/org.adempiere.report.jasper.webapp/.classpath
@@ -1,7 +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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="build"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
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
index 6c0ac151a0..f42de363af 100644
--- a/org.adempiere.report.jasper.webapp/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.report.jasper.webapp/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Wed Jul 14 15:44:46 MYT 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF
index 744f431b2c..cd09400d72 100644
--- a/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Jasper Report Web App
+Bundle-Name: iDempiere JasperReport Web App
 Bundle-SymbolicName: org.adempiere.report.jasper.webapp;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Version: 3.0.0.qualifier
+Require-Bundle: org.adempiere.base;bundle-version="3.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Web-ContextPath: JasperReportFiles
 Bundle-ClassPath: .
 Import-Package: javax.servlet;version="2.5.0",
@@ -12,3 +12,5 @@ Import-Package: javax.servlet;version="2.5.0",
  javax.servlet.jsp;version="2.1.0",
  org.apache.commons.codec,
  org.apache.commons.codec.binary
+
+
diff --git a/org.adempiere.report.jasper.webapp/build.properties b/org.adempiere.report.jasper.webapp/build.properties
index 598106c60b..d1b29a5002 100644
--- a/org.adempiere.report.jasper.webapp/build.properties
+++ b/org.adempiere.report.jasper.webapp/build.properties
@@ -8,4 +8,4 @@ bin.excludes = src/**,\
 			   .project,\
 			   build.properties
 source.. = src/
-output.. = build/
+output.. = bin/
diff --git a/org.adempiere.report.jasper.webapp/src/org/compiere/utils/MD5Impl.java b/org.adempiere.report.jasper.webapp/src/org/compiere/utils/MD5Impl.java
index 834126dd6e..ed1fb8c39b 100644
--- a/org.adempiere.report.jasper.webapp/src/org/compiere/utils/MD5Impl.java
+++ b/org.adempiere.report.jasper.webapp/src/org/compiere/utils/MD5Impl.java
@@ -37,7 +37,7 @@ public class MD5Impl {
 			//Thread.currentThread().getContextClassLoader().getResource("");
 			if ( FileName.startsWith("http://") )
 			{
-				//extract absolute path by requesting jboss/tomcat
+				//extract absolute path
 				String[] filePathParts = FileName.split("/");
 				filepartOnly = filePathParts[filePathParts.length-1];
 				URL currentFile = Thread.currentThread().getContextClassLoader().getResource(filepartOnly);
diff --git a/org.adempiere.report.jasper.webapp/src/org/compiere/web/MD5OutputStream.java b/org.adempiere.report.jasper.webapp/src/org/compiere/web/MD5OutputStream.java
index 3ef21f7383..274100ca76 100644
--- a/org.adempiere.report.jasper.webapp/src/org/compiere/web/MD5OutputStream.java
+++ b/org.adempiere.report.jasper.webapp/src/org/compiere/web/MD5OutputStream.java
@@ -9,6 +9,7 @@ import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 
 import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
 
 import org.apache.commons.codec.binary.Base64;
 
@@ -50,4 +51,13 @@ public class MD5OutputStream extends ServletOutputStream {
 		String digestAsBase64 = new String(base64.encode(digest));
 		return digestAsBase64;
 	}
+
+	@Override
+	public boolean isReady() {
+		return true;
+	}
+
+	@Override
+	public void setWriteListener(WriteListener arg0) {
+	}
 }
diff --git a/org.adempiere.report.jasper/.classpath b/org.adempiere.report.jasper/.classpath
index 77574626cf..30a61b009f 100644
--- a/org.adempiere.report.jasper/.classpath
+++ b/org.adempiere.report.jasper/.classpath
@@ -1,7 +1,11 @@
 <?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.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry excluding="org/compiere/report/ReportExporter.java" kind="src" path="src"/>
-	<classpathentry kind="output" path="build"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs
index dc008494f4..f42de363af 100644
--- a/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Wed Jul 14 15:38:16 MYT 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+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 d0e0b2d1bf..81c1656497 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
@@ -2,6 +2,6 @@
 <faceted-project>
   <fixed facet="jst.java"/>
   <fixed facet="jst.utility"/>
-  <installed facet="jst.java" version="6.0"/>
   <installed facet="jst.utility" version="1.0"/>
+  <installed facet="jst.java" version="1.7"/>
 </faceted-project>
diff --git a/org.adempiere.report.jasper/META-INF/MANIFEST.MF b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
index a49cb3b47f..2fb78482fd 100644
--- a/org.adempiere.report.jasper/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: JasperReport integration
+Bundle-Name: iDempiere JasperReport integration
 Bundle-SymbolicName: org.adempiere.report.jasper;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-ClassPath: JasperReports.jar
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 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="2.0.0",
- org.adempiere.report.jasper.library;bundle-version="2.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="3.0.0",
+ org.adempiere.report.jasper.library;bundle-version="3.0.0"
 Service-Component: OSGI-INF/processfactory.xml
 Export-Package: org.adempiere.report.jasper
 Bundle-ActivationPolicy: lazy
diff --git a/org.adempiere.report.jasper/build.properties b/org.adempiere.report.jasper/build.properties
index adfe22c4eb..93728dfcc2 100644
--- a/org.adempiere.report.jasper/build.properties
+++ b/org.adempiere.report.jasper/build.properties
@@ -2,4 +2,4 @@ bin.includes = META-INF/,\
                JasperReports.jar,\
                OSGI-INF/
 source.JasperReports.jar = src/
-output.JasperReports.jar = build/
+output.JasperReports.jar = bin/
diff --git a/org.adempiere.sdk-feature/adempiere.cquery b/org.adempiere.sdk-feature/adempiere.cquery
index cc1ea69d04..0c39bb7d82 100644
--- a/org.adempiere.sdk-feature/adempiere.cquery
+++ b/org.adempiere.sdk-feature/adempiere.cquery
@@ -1,29 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?><cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="adempiere.rmap">
     <cq:rootRequest name="org.adempiere.sdk" componentType="eclipse.feature"/>
+    <cq:property key="buckminster.download.source" value="true"/>
     <cq:property key="target.arch" value="*"/>
     <cq:property key="target.os" value="*"/>
     <cq:property key="target.ws" value="*"/>
-    <cq:advisorNode namePattern="^org\.restlet(\..+)?" componentType="osgi.bundle" versionOverride="[2.1.0,2.2.0)"/>
-    <cq:advisorNode namePattern="^org\.apache\.poi$" componentType="osgi.bundle" versionOverride="[3.9.0,4.0.0)"/>
-    <cq:advisorNode namePattern="^org\.apache\.ant$" componentType="osgi.bundle" versionOverride="[1.8.4,1.8.5)"/>
     <cq:advisorNode namePattern="^com\.sun\.mail\.javax\.mail$" componentType="osgi.bundle" versionOverride="[1.5.1,1.5.2)"/>
-    <cq:advisorNode namePattern="^com\.springsource\.javax\.activation$" componentType="osgi.bundle" versionOverride="[1.1.1,1.1.2)"/>
-    <cq:advisorNode namePattern="^javax\.jms$" componentType="osgi.bundle" versionOverride="[1.1.0,1.1.1)"/>
-    <cq:advisorNode namePattern="^org\.junit$" componentType="osgi.bundle" versionOverride="[4.8.2,4.9.0)"/>
-    <cq:advisorNode namePattern="^com\.springsource\.net\.sf\.cglib$" componentType="osgi.bundle" versionOverride="[2.2.0,2.2.1)"/>
-    <cq:advisorNode namePattern="^com\.springsource\.org\.apache\.activemq$" componentType="osgi.bundle" versionOverride="[5.3.0,5.4.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="^com\.springsource\.javax\.management\.j2ee$" componentType="osgi.bundle" versionOverride="[1.0.1,1.0.2)"/>
     <cq:advisorNode namePattern="^org\.apache\.commons\.logging$" componentType="osgi.bundle" versionOverride="[1.1.1,1.1.2)"/>
-    <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="^org\.apache\.commons\.codec$" componentType="osgi.bundle" versionOverride="[1.4.0,1.5.0)"/>
+    <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.2.2]"/>
+    <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="[2.2.0,2.2.1)"/>
-    <cq:advisorNode namePattern="^org\.hamcrest\.core$" componentType="osgi.bundle" versionOverride="[1.1.0,1.2.0)"/>
+    <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:componentQuery>
diff --git a/org.adempiere.sdk-feature/adempiere.rmap b/org.adempiere.sdk-feature/adempiere.rmap
index 9828de9ae5..b9b7e5a565 100644
--- a/org.adempiere.sdk-feature/adempiere.rmap
+++ b/org.adempiere.sdk-feature/adempiere.rmap
@@ -1,30 +1,43 @@
 <?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\.apache\.felix\.webconsole\.plugins\.packageadmin$" searchPathRef="workspace.bundle"/>
+  <rm:locator pattern="^org\.idempiere\.hazelcast\.service$" searchPathRef="workspace.feature" failOnError="false"/>
+  <rm:locator pattern="^org\.idempiere\.hazelcast\.service$" searchPathRef="workspace.project"/>
   <rm:locator pattern="^org\.apache\.poi$" searchPathRef="orbit"/>
-  <rm:locator searchPathRef="workspace.bundle.jar" failOnError="false"/>
-  <rm:locator pattern="^org\.eclipse\.jdt\.core\.compiler\.batch$" searchPathRef="gemini" failOnError="false"/>
+  <rm:locator pattern="^org\.eclipse\.jdt\.core\.compiler\.batch$" 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\.apache\.felix\.webconsole(\..+)?" 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"/>
+  <rm:locator pattern="^com\.sun\.mail\.javax\.mail$" searchPathRef="bundles.maven"/>
+  <rm:locator pattern="^org\.objectweb\.asm(\..+)?" searchPathRef="bundles.maven"/>
+  <rm:locator pattern="^org\.apache\.taglibs(\..+)?" searchPathRef="bundles.maven"/>
+  <rm:locator pattern="^org\.apache\.aries(\..+)?" searchPathRef="bundles.maven"/>
+  <rm:locator pattern="^org\.apache\.servicemix\.bundles\.cglib$" searchPathRef="bundles.maven"/>
+  <rm:locator pattern="^org\.apache\.activemq(\..+)?" searchPathRef="bundles.maven"/>
+  <rm:locator pattern="^org\.eclipse\.jetty(\..+)?" searchPathRef="jetty"/>
+  <rm:locator pattern="^javax\.security\.auth\.message$" searchPathRef="jetty"/>
   <rm:locator pattern="^org\.eclipse(\..+)?" searchPathRef="equinox" failOnError="false"/>
   <rm:locator pattern="^org\.sat4j(\..+)?" searchPathRef="equinox"/>
+  <rm:locator pattern="^org\.slf4j\.jdk14$" searchPathRef="workspace.project"/>
   <rm:locator pattern="^org\.slf4j(\..+)?" searchPathRef="orbit"/>
   <rm:locator pattern="^org\.apache\.ant(\..+)?" searchPathRef="orbit"/>
-  <rm:locator pattern="^org\.apache\.commons(\..+)?" searchPathRef="orbit" failOnError="false"/>
-  <rm:locator pattern="^org\.eclipse\.gemini(\..+)?" searchPathRef="gemini" failOnError="false"/>
-  <rm:locator pattern="^org\.eclipse\.virgo(\..+)?" searchPathRef="gemini" failOnError="false"/>
-  <rm:locator pattern="^com\.springsource(\..+)?" searchPathRef="gemini" failOnError="false"/>
-  <rm:locator pattern="^javax(\..+)?" searchPathRef="gemini" failOnError="false"/>
-  <rm:locator pattern="^org\.restlet(\..+)?" searchPathRef="restlet.maven" failOnError="false"/>
-  <rm:locator pattern="^com\.springsource(\..+)?" searchPathRef="spring.external.maven" failOnError="false"/>
+  <rm:locator pattern="^org\.apache\.commons(\..+)?" searchPathRef="orbit"/>
+  <rm:locator pattern="^org\.restlet(\..+)?" searchPathRef="restlet.maven"/>
   <rm:locator searchPathRef="orbit" failOnError="false"/>
-  <rm:locator searchPathRef="workspace.bundle.project" failOnError="false"/>
-  <rm:locator searchPathRef="workspace.feature.project"/>
+  <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/releases/kepler"/>
+      <rm:uri format="http://download.eclipse.org/eclipse/updates/4.4/"/>
     </rm:provider>
   </rm:searchPath>
-  <rm:searchPath name="workspace.bundle.project">
+  <rm:searchPath name="workspace.project">
     <rm:provider componentTypes="osgi.bundle" readerType="local">
       <rm:uri format="{0}/{1}">
         <bc:propertyRef key="workspace.root"/>
@@ -32,7 +45,7 @@
       </rm:uri>
     </rm:provider>
   </rm:searchPath>
-  <rm:searchPath name="workspace.bundle.jar">
+  <rm:searchPath name="workspace.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"/>
@@ -44,7 +57,7 @@
       </rm:uri>
     </rm:provider>
   </rm:searchPath>
-  <rm:searchPath name="workspace.feature.project">
+  <rm:searchPath name="workspace.feature">
     <rm:provider componentTypes="eclipse.feature" readerType="local">
       <rm:uri format="{0}/{1}-feature">
         <bc:propertyRef key="workspace.root"/>
@@ -52,20 +65,20 @@
       </rm:uri>
     </rm:provider>
   </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: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/R20140114142710/repository/"/>
-    </rm:provider>
-  </rm:searchPath>
-  <rm:searchPath name="gemini">
-    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="p2">
-      <rm:uri format="http://download.eclipse.org/gemini/updates/web/2.2.2/"/>
+      <rm:uri format="http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/"/>
     </rm:provider>
   </rm:searchPath>
   <rm:searchPath name="restlet.maven">
-    <rm:provider xsi:type="maven:MavenProvider" componentTypes="osgi.bundle,eclipse.feature" readerType="maven2" source="false" mutable="false">
+    <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"/>
@@ -77,18 +90,35 @@
       </maven:mappings>
     </rm:provider>
   </rm:searchPath>
-  <rm:searchPath name="spring.external.maven">
-    <rm:provider xsi:type="maven:MavenProvider" componentTypes="osgi.bundle,eclipse.feature" readerType="maven2" source="false" mutable="false">
+  <rm:searchPath name="bundles.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://repository.springsource.com/maven/bundles/external"/>
+      <rm:uri format="http://repo1.maven.org/maven2"/>
       <maven:mappings>
-        <maven:entry artifactId="com.springsource.net.sf.cglib" groupId="net.sourceforge.cglib" name="com.springsource.net.sf.cglib"/>
-        <maven:entry artifactId="com.springsource.org.apache.xmlcommons" groupId="org.apache.xmlcommons" name="com.springsource.org.apache.xmlcommons"/>
-        <maven:entry artifactId="com.springsource.javax.jms" groupId="javax.jms" name="com.springsource.javax.jms"/>
-        <maven:entry artifactId="com.springsource.org.apache.activemq" groupId="org.apache.activemq" name="com.springsource.org.apache.activemq"/>
-        <maven:entry artifactId="com.springsource.org.apache.kahadb" groupId="org.apache.activemq" name="com.springsource.org.apache.kahadb"/>
-        <maven:entry artifactId="com.springsource.javax.management.j2ee" groupId="org.apache.geronimo.specs" name="com.springsource.javax.management.j2ee"/>
+        <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"/>
+        <maven:entry artifactId="apache-jsp" groupId="org.eclipse.jetty" name="org.eclipse.jetty.apache-jsp"/>
+        <maven:entry artifactId="jetty-osgi-servlet-api" groupId="org.eclipse.jetty.toolchain" name="org.eclipse.jetty.osgi-servlet-api"/>
+        <maven:entry artifactId="org.eclipse.jdt.core" groupId="org.eclipse.jetty.orbit" name="org.eclipse.jdt.core.compiler.batch"/>
+        <maven:entry artifactId="javax.websocket-api" groupId="javax.websocket" name="javax.websocket-api"/>
+        <maven:entry artifactId="javax.annotation-api" groupId="javax.annotation" name="javax.annotation-api"/>
+        <maven:entry artifactId="javax.management.j2ee-api" groupId="javax.management.j2ee" name="javax.management.j2ee-api"/>
+        <maven:entry artifactId="javax.mail" groupId="com.sun.mail" name="com.sun.mail.javax.mail"/>
+        <maven:entry artifactId="asm-commons" groupId="org.ow2.asm" name="org.objectweb.asm.commons"/>
+        <maven:entry artifactId="asm-tree" groupId="org.ow2.asm" name="org.objectweb.asm.tree"/>
+        <maven:entry artifactId="asm" groupId="org.ow2.asm" name="org.objectweb.asm"/>
+        <maven:entry artifactId="taglibs-standard-impl" groupId="org.apache.taglibs" name="org.apache.taglibs.standard-impl"/>
+        <maven:entry artifactId="taglibs-standard-spec" groupId="org.apache.taglibs" name="org.apache.taglibs.taglibs-standard-spec"/>
+        <maven:entry artifactId="taglibs-standard-jstlel" groupId="org.apache.taglibs" name="org.apache.taglibs.standard-jstlel"/>
+        <maven:entry artifactId="org.apache.aries.spifly.dynamic.bundle" groupId="org.apache.aries.spifly" name="org.apache.aries.spifly.dynamic.bundle"/>
+        <maven:entry artifactId="org.apache.aries.util" groupId="org.apache.aries" name="org.apache.aries.util"/>
+        <maven:entry artifactId="org.apache.servicemix.bundles.cglib" groupId="org.apache.servicemix.bundles" name="org.apache.servicemix.bundles.cglib"/>
+        <maven:entry artifactId="activemq-core" groupId="org.apache.activemq" name="org.apache.activemq.activemq-core"/>
+        <maven:entry artifactId="kahadb" groupId="org.apache.activemq" name="org.apache.activemq.kahadb"/>
+        <maven:entry artifactId="org.apache.felix.webconsole" groupId="org.apache.felix" name="org.apache.felix.webconsole"/>
+        <maven:entry artifactId="org.apache.felix.webconsole.plugins.ds" groupId="org.apache.felix" name="org.apache.felix.webconsole.plugins.ds"/>
+        <maven:entry artifactId="org.apache.felix.webconsole.plugins.memoryusage" groupId="org.apache.felix" name="org.apache.felix.webconsole.plugins.memoryusage"/>
       </maven:mappings>
     </rm:provider>
   </rm:searchPath>
diff --git a/org.adempiere.sdk-feature/feature.xml b/org.adempiere.sdk-feature/feature.xml
index a6ee9bd5aa..5f58c11d3f 100644
--- a/org.adempiere.sdk-feature/feature.xml
+++ b/org.adempiere.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.sdk"
       label="Adempiere SDK"
-      version="2.0.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="Adempiere.org">
 
    <description url="http://www.example.com/description">
diff --git a/org.adempiere.sdk-feature/idempiere-tomcat.rmap b/org.adempiere.sdk-feature/idempiere-tomcat.rmap
new file mode 100644
index 0000000000..edcbfd9c93
--- /dev/null
+++ b/org.adempiere.sdk-feature/idempiere-tomcat.rmap
@@ -0,0 +1,96 @@
+<?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\.apache\.poi$" searchPathRef="orbit"/>
+  <rm:locator searchPathRef="workspace.bundle.jar" failOnError="false"/>
+  <rm:locator pattern="^org\.eclipse\.jdt\.core\.compiler\.batch$" searchPathRef="gemini" failOnError="false"/>
+  <rm:locator pattern="^org\.eclipse(\..+)?" searchPathRef="equinox" failOnError="false"/>
+  <rm:locator pattern="^org\.sat4j(\..+)?" searchPathRef="equinox"/>
+  <rm:locator pattern="^org\.slf4j(\..+)?" searchPathRef="orbit"/>
+  <rm:locator pattern="^org\.apache\.ant(\..+)?" searchPathRef="orbit"/>
+  <rm:locator pattern="^org\.apache\.commons(\..+)?" searchPathRef="orbit" failOnError="false"/>
+  <rm:locator pattern="^org\.eclipse\.gemini(\..+)?" searchPathRef="gemini" failOnError="false"/>
+  <rm:locator pattern="^org\.eclipse\.virgo(\..+)?" searchPathRef="gemini" failOnError="false"/>
+  <rm:locator pattern="^com\.springsource(\..+)?" searchPathRef="gemini" failOnError="false"/>
+  <rm:locator pattern="^javax(\..+)?" searchPathRef="gemini" failOnError="false"/>
+  <rm:locator pattern="^org\.restlet(\..+)?" searchPathRef="restlet.maven" failOnError="false"/>
+  <rm:locator pattern="^com\.springsource(\..+)?" searchPathRef="spring.external.maven" failOnError="false"/>
+  <rm:locator searchPathRef="gemini" failOnError="false"/>
+  <rm:locator searchPathRef="orbit" failOnError="false"/>
+  <rm:locator searchPathRef="workspace.bundle.project" failOnError="false"/>
+  <rm:locator searchPathRef="workspace.feature.project"/>
+  <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/releases/luna"/>
+    </rm:provider>
+  </rm:searchPath>
+  <rm:searchPath name="workspace.bundle.project">
+    <rm:provider componentTypes="osgi.bundle" readerType="local">
+      <rm:uri format="{0}/{1}">
+        <bc:propertyRef key="workspace.root"/>
+        <bc:propertyRef key="buckminster.component"/>
+      </rm:uri>
+    </rm:provider>
+  </rm:searchPath>
+  <rm:searchPath name="workspace.bundle.jar">
+    <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="file:///{0}/lib">
+        <bc:replace>
+          <bc:propertyRef key="workspace.root"/>
+          <bc:match pattern="\s" replacement="%20"/>
+        </bc:replace>
+      </rm:uri>
+    </rm:provider>
+  </rm:searchPath>
+  <rm:searchPath name="workspace.feature.project">
+    <rm:provider componentTypes="eclipse.feature" readerType="local">
+      <rm:uri format="{0}/{1}-feature">
+        <bc:propertyRef key="workspace.root"/>
+        <bc:propertyRef key="buckminster.component"/>
+      </rm:uri>
+    </rm:provider>
+  </rm:searchPath>
+  <rm:searchPath name="gemini">
+    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="p2">
+      <rm:uri format="http://download.eclipse.org/gemini/updates/web/2.2.3/"/>
+    </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/R20140525021250/repository/"/>
+    </rm:provider>
+  </rm:searchPath>
+  <rm:searchPath name="restlet.maven">
+    <rm:provider xsi:type="maven:MavenProvider" componentTypes="osgi.bundle,eclipse.feature" 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"/>
+      <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:provider>
+  </rm:searchPath>
+  <rm:searchPath name="spring.external.maven">
+    <rm:provider xsi:type="maven:MavenProvider" componentTypes="osgi.bundle,eclipse.feature" readerType="maven2" source="false" mutable="false">
+      <rm:property key="buckminster.source" value="false"/>
+      <rm:property key="buckminster.mutable" value="false"/>
+      <rm:uri format="http://repository.springsource.com/maven/bundles/external"/>
+      <maven:mappings>
+        <maven:entry artifactId="com.springsource.net.sf.cglib" groupId="net.sourceforge.cglib" name="com.springsource.net.sf.cglib"/>
+        <maven:entry artifactId="com.springsource.org.apache.xmlcommons" groupId="org.apache.xmlcommons" name="com.springsource.org.apache.xmlcommons"/>
+        <maven:entry artifactId="com.springsource.javax.jms" groupId="javax.jms" name="com.springsource.javax.jms"/>
+        <maven:entry artifactId="com.springsource.org.apache.activemq" groupId="org.apache.activemq" name="com.springsource.org.apache.activemq"/>
+        <maven:entry artifactId="com.springsource.org.apache.kahadb" groupId="org.apache.activemq" name="com.springsource.org.apache.kahadb"/>
+        <maven:entry artifactId="com.springsource.javax.management.j2ee" groupId="org.apache.geronimo.specs" name="com.springsource.javax.management.j2ee"/>
+      </maven:mappings>
+    </rm:provider>
+  </rm:searchPath>
+</rm:rmap>
diff --git a/org.adempiere.server-feature/build.properties b/org.adempiere.server-feature/build.properties
index 7a15d5de1d..d6df610bf7 100644
--- a/org.adempiere.server-feature/build.properties
+++ b/org.adempiere.server-feature/build.properties
@@ -1,7 +1,8 @@
 bin.includes = feature.xml
-root=file:build.xml,file:setup.ini,file:extensions-priorty.properties
+root=file:build.xml,file:setup.ini,file:extensions-priorty.properties,file:hazelcast-template.xml
 root.folder.data=data
 root.folder.setup=setup
+root.folder.jettyhome=jettyhome
 
 #linux 64 bits
 root.linux.gtk.x86_64=file:setup.sh,file:console-setup.sh,file:idempiere-server.sh,file:setup-alt.sh,file:console-setup-alt.sh,file:sign-database-build.sh,file:idempiereEnvTemplate.properties
diff --git a/org.adempiere.server-feature/build.xml b/org.adempiere.server-feature/build.xml
index 2574c8cc76..bad2bc0cb3 100644
--- a/org.adempiere.server-feature/build.xml
+++ b/org.adempiere.server-feature/build.xml
@@ -39,8 +39,14 @@
 		</condition>
 		<echo message="Windows=${isWindows}" />
 
-		<copy file="plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/serverTemplate.xml"
-			tofile="plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/server.xml" filtering="yes" overwrite="yes"/>
+		<copy file="jettyhome/etc/jetty-template.xml"
+			tofile="jettyhome/etc/jetty.xml" filtering="yes" overwrite="yes"/>
+		<copy file="jettyhome/etc/jetty-ssl-template.xml"
+					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="hazelcast-template.xml"
+							tofile="hazelcast.xml" filtering="yes" overwrite="yes"/>
 
 	</target>
 
diff --git a/org.adempiere.server-feature/console-setup-alt.bat b/org.adempiere.server-feature/console-setup-alt.bat
index 43a2bf1ba5..e94df67f3f 100644
--- a/org.adempiere.server-feature/console-setup-alt.bat
+++ b/org.adempiere.server-feature/console-setup-alt.bat
@@ -18,7 +18,7 @@ goto START
 
 :START
 @REM Setup idempiere.properties and idempiereEnv.properties
-@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.9.*.jar -application org.adempiere.install.console-application
+@"%JAVA%" -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install setup -configuration setup/configuration -application org.adempiere.install.console-application
 
 @Echo ErrorLevel = %ERRORLEVEL%
 @IF NOT ERRORLEVEL = 1 GOTO NEXT
@@ -29,8 +29,8 @@ goto START
 @Exit
 
 :NEXT
-@REM setup tomcat
-@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.9.*.jar -application org.eclipse.ant.core.antRunner -buildfile build.xml
+@REM setup jetty
+@"%JAVA%" -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install setup -configuration setup/configuration -application org.eclipse.ant.core.antRunner -buildfile build.xml
 
 @Echo .
 @Echo For problems, check log file in base directory
diff --git a/org.adempiere.server-feature/console-setup-alt.sh b/org.adempiere.server-feature/console-setup-alt.sh
index bdeedd8df0..e5f20da6c7 100644
--- a/org.adempiere.server-feature/console-setup-alt.sh
+++ b/org.adempiere.server-feature/console-setup-alt.sh
@@ -16,10 +16,10 @@ fi
 
 
 # Setup idempiere.properties and idempiereEnv.properties
-$JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.9.*.jar -application org.adempiere.install.console-application
+$JAVA -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install setup -configuration setup/configuration -application org.adempiere.install.console-application
 
-# Setup Tomcat
-$JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.9.*.jar -application org.eclipse.ant.core.antRunner -buildfile build.xml
+# Setup Jetty
+$JAVA -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install setup -configuration setup/configuration -application org.eclipse.ant.core.antRunner -buildfile build.xml
 
 echo ===================================
 echo Make .sh executable & set Env
diff --git a/org.adempiere.server-feature/console-setup.bat b/org.adempiere.server-feature/console-setup.bat
index 5a1b0b4584..971959bf1c 100644
--- a/org.adempiere.server-feature/console-setup.bat
+++ b/org.adempiere.server-feature/console-setup.bat
@@ -14,7 +14,7 @@ idempiere --launcher.ini setup.ini -application org.adempiere.install.console-ap
 @Exit
 
 :NEXT
-@REM Setup Tomcat
+@REM Setup Jetty
 idempiere --launcher.ini setup.ini -application org.eclipse.ant.core.antRunner -buildfile build.xml
 
 @Echo .
diff --git a/org.adempiere.server-feature/console-setup.sh b/org.adempiere.server-feature/console-setup.sh
index d48795ed44..e534eb3512 100644
--- a/org.adempiere.server-feature/console-setup.sh
+++ b/org.adempiere.server-feature/console-setup.sh
@@ -5,7 +5,7 @@ echo Setup idempiere Server
 # Setup idempiere.properties and idempiereEnv.properties
 ./idempiere --launcher.ini setup.ini -application org.adempiere.install.console-application
 
-# Setup Tomcat
+# Setup Jetty
 ./idempiere --launcher.ini setup.ini -application org.eclipse.ant.core.antRunner -buildfile build.xml
 
 echo .
diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml
index ef1b34f3a4..77ac26bea7 100644
--- a/org.adempiere.server-feature/feature.xml
+++ b/org.adempiere.server-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.server"
       label="iDempiere Server-feature"
-      version="2.0.0.qualifier">
+      version="3.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -18,65 +18,61 @@
 
    <includes
          id="org.adempiere.replication.server"
-         version="2.0.0.qualifier"
+         version="3.0.0.qualifier"
          optional="true"/>
 
    <includes
          id="org.adempiere.ui.zk"
-         version="2.0.0.qualifier"/>
+         version="3.0.0.qualifier"/>
 
    <includes
          id="org.adempiere.webstore"
-         version="2.0.0.qualifier"
+         version="3.0.0.qualifier"
          optional="true"/>
 
-   <includes
-         id="org.eclipse.gemini.web.feature"
-         version="0.0.0"/>
-
    <includes
          id="org.idempiere.felix.webconsole"
-         version="2.0.0.qualifier"/>
+         version="3.0.0.qualifier"/>
 
    <includes
          id="org.adempiere.report.jasper"
          version="0.0.0"/>
 
-   <requires>
-      <import feature="org.adempiere.base" version="2.0.0" match="compatible"/>
-   </requires>
+   <includes
+         id="org.adempiere.pipo"
+         version="0.0.0"/>
+
+   <includes
+         id="org.idempiere.hazelcast.service"
+         version="0.0.0"/>
+
+   <includes
+         id="org.adempiere.base"
+         version="0.0.0"/>
 
    <plugin
-         id="javax.servlet.jsp"
+         id="org.apache.taglibs.taglibs-standard-spec"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="javax.servlet.jsp.jstl"
+         id="org.apache.taglibs.standard-impl"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.apache.catalina"
+         id="org.apache.taglibs.standard-jstlel"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.apache.coyote"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.el"
+         id="javax.websocket-api"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -89,28 +85,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.apache.jasper"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.juli.extras"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.taglibs.standard.glassfish"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.slf4j.api"
          download-size="0"
@@ -122,56 +96,14 @@
          id="org.adempiere.report.jasper.webapp"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="3.0.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.server"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
-         unpack="false"/>
-
-   <plugin
-         id="org.adempiere.tomcat.config"
-         download-size="0"
-         install-size="0"
-         version="2.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="org.eclipse.virgo.util.common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.virgo.util.io"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.virgo.util.math"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.virgo.util.osgi"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.virgo.util.parser.manifest"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
+         version="3.0.0.qualifier"
          unpack="false"/>
 
    <plugin
@@ -182,10 +114,10 @@
          unpack="false"/>
 
    <plugin
-         id="javax.annotation"
+         id="javax.annotation-api"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.2.0"
          unpack="false"/>
 
    <plugin
@@ -202,27 +134,11 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.apache.catalina.ha"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.catalina.tribes"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
    <plugin
          id="org.adempiere.install"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"/>
+         version="3.0.0.qualifier"/>
 
    <plugin
          id="org.adempiere.eclipse.equinox.http.servlet"
@@ -256,7 +172,7 @@
          id="org.idempiere.webservices"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="3.0.0.qualifier"
          unpack="false"/>
 
    <plugin
@@ -280,4 +196,292 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.objectweb.asm"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.aries.spifly.dynamic.bundle"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.aries.util"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.objectweb.asm.commons"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.objectweb.asm.tree"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.mortbay.jasper.apache-jsp"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.mortbay.jasper.apache-el"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.apache-jsp"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.felix.webconsole"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.felix.webconsole.plugins.ds"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.felix.webconsole.plugins.memoryusage"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.felix.webconsole.plugins.packageadmin"
+         download-size="0"
+         install-size="0"
+         version="1.0.0.1"
+         unpack="false"/>
+
+   <plugin
+         id="org.json"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.annotations"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.client"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.deploy"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.http"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.io"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.jaas"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.jmx"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.jndi"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.osgi.boot"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.osgi.boot.jsp"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.osgi.httpservice"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.plus"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.security"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.server"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.servlet"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.servlets"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.util"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.util.ajax"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.webapp"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.websocket.api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.websocket.client"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.websocket.common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.websocket.javax.websocket.server"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.websocket.javax.websocket"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.websocket.server"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.websocket.servlet"
+         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.slf4j.jdk14"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
 </feature>
diff --git a/org.adempiere.server-feature/hazelcast-template.xml b/org.adempiere.server-feature/hazelcast-template.xml
new file mode 100644
index 0000000000..8af5685b9c
--- /dev/null
+++ b/org.adempiere.server-feature/hazelcast-template.xml
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2008-2013, Hazelcast, Inc. All Rights Reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<!--
+    The default Hazelcast configuration. This is used when:
+
+    - no hazelcast.xml if present
+
+-->
+<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.3.xsd"
+           xmlns="http://www.hazelcast.com/schema/config"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <group>
+        <name>@ADEMPIERE_DB_USER@.@ADEMPIERE_DB_NAME@/@ADEMPIERE_DB_SERVER@</name>
+        <password>@ADEMPIERE_DB_PASSWORD@</password>
+    </group>
+    <management-center enabled="false">http://localhost:8080/mancenter</management-center>
+    <network>
+        <port auto-increment="true" port-count="100">5701</port>
+        <outbound-ports>
+            <!--
+            Allowed port range when connecting to other nodes.
+            0 or * means use system provided port.
+            -->
+            <ports>0</ports>
+        </outbound-ports>
+        <join>
+            <multicast enabled="true">
+                <multicast-group>224.2.2.3</multicast-group>
+                <multicast-port>54327</multicast-port>
+            </multicast>
+            <tcp-ip enabled="false">
+                <interface>127.0.0.1</interface>
+            </tcp-ip>
+            <aws enabled="false">
+                <access-key>my-access-key</access-key>
+                <secret-key>my-secret-key</secret-key>
+                <!--optional, default is us-east-1 -->
+                <region>us-west-1</region>
+                <!--optional, default is ec2.amazonaws.com. If set, region shouldn't be set as it will override this property -->
+                <host-header>ec2.amazonaws.com</host-header>
+                <!-- optional, only instances belonging to this group will be discovered, default will try all running instances -->
+                <security-group-name>hazelcast-sg</security-group-name>
+                <tag-key>type</tag-key>
+                <tag-value>hz-nodes</tag-value>
+            </aws>
+        </join>
+        <interfaces enabled="false">
+            <interface>10.10.1.*</interface>
+        </interfaces>
+        <ssl enabled="false"/>
+        <socket-interceptor enabled="false"/>
+        <symmetric-encryption enabled="false">
+            <!--
+               encryption algorithm such as
+               DES/ECB/PKCS5Padding,
+               PBEWithMD5AndDES,
+               AES/CBC/PKCS5Padding,
+               Blowfish,
+               DESede
+            -->
+            <algorithm>PBEWithMD5AndDES</algorithm>
+            <!-- salt value to use when generating the secret key -->
+            <salt>thesalt</salt>
+            <!-- pass phrase to use when generating the secret key -->
+            <password>thepass</password>
+            <!-- iteration count to use when generating the secret key -->
+            <iteration-count>19</iteration-count>
+        </symmetric-encryption>
+    </network>
+    <partition-group enabled="false"/>
+    <executor-service name="default">
+        <pool-size>16</pool-size>
+        <!--Queue capacity. 0 means Integer.MAX_VALUE.-->
+        <queue-capacity>0</queue-capacity>
+    </executor-service>
+    <queue name="default">
+        <!--
+            Maximum size of the queue. When a JVM's local queue size reaches the maximum,
+            all put/offer operations will get blocked until the queue size
+            of the JVM goes down below the maximum.
+            Any integer between 0 and Integer.MAX_VALUE. 0 means
+            Integer.MAX_VALUE. Default is 0.
+        -->
+        <max-size>0</max-size>
+        <!--
+            Number of backups. If 1 is set as the backup-count for example,
+            then all entries of the map will be copied to another JVM for
+            fail-safety. 0 means no backup.
+        -->
+        <backup-count>1</backup-count>
+
+        <!--
+            Number of async backups. 0 means no backup.
+        -->
+        <async-backup-count>0</async-backup-count>
+
+        <empty-queue-ttl>-1</empty-queue-ttl>
+    </queue>
+    <map name="default">
+        <!--
+           Data type that will be used for storing recordMap.
+           Possible values:
+           BINARY (default): keys and values will be stored as binary data
+           OBJECT : values will be stored in their object forms
+           OFFHEAP : values will be stored in non-heap region of JVM
+        -->
+        <in-memory-format>BINARY</in-memory-format>
+
+        <!--
+            Number of backups. If 1 is set as the backup-count for example,
+            then all entries of the map will be copied to another JVM for
+            fail-safety. 0 means no backup.
+        -->
+        <backup-count>1</backup-count>
+        <!--
+            Number of async backups. 0 means no backup.
+        -->
+        <async-backup-count>0</async-backup-count>
+        <!--
+			Maximum number of seconds for each entry to stay in the map. Entries that are
+			older than <time-to-live-seconds> and not updated for <time-to-live-seconds>
+			will get automatically evicted from the map.
+			Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0.
+		-->
+        <time-to-live-seconds>0</time-to-live-seconds>
+        <!--
+			Maximum number of seconds for each entry to stay idle in the map. Entries that are
+			idle(not touched) for more than <max-idle-seconds> will get
+			automatically evicted from the map. Entry is touched if get, put or containsKey is called.
+			Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0.
+		-->
+        <max-idle-seconds>0</max-idle-seconds>
+        <!--
+            Valid values are:
+            NONE (no eviction),
+            LRU (Least Recently Used),
+            LFU (Least Frequently Used).
+            NONE is the default.
+        -->
+        <eviction-policy>NONE</eviction-policy>
+        <!--
+            Maximum size of the map. When max size is reached,
+            map is evicted based on the policy defined.
+            Any integer between 0 and Integer.MAX_VALUE. 0 means
+            Integer.MAX_VALUE. Default is 0.
+        -->
+        <max-size policy="PER_NODE">0</max-size>
+        <!--
+            When max. size is reached, specified percentage of
+            the map will be evicted. Any integer between 0 and 100.
+            If 25 is set for example, 25% of the entries will
+            get evicted.
+        -->
+        <eviction-percentage>25</eviction-percentage>
+        <!--
+            Minimum time in milliseconds which should pass before checking
+            if a partition of this map is evictable or not.
+            Default value is 100 millis.
+        -->
+        <min-eviction-check-millis>100</min-eviction-check-millis>
+        <!--
+            While recovering from split-brain (network partitioning),
+            map entries in the small cluster will merge into the bigger cluster
+            based on the policy set here. When an entry merge into the
+            cluster, there might an existing entry with the same key already.
+            Values of these entries might be different for that same key.
+            Which value should be set for the key? Conflict is resolved by
+            the policy set here. Default policy is PutIfAbsentMapMergePolicy
+
+            There are built-in merge policies such as
+            com.hazelcast.map.merge.PassThroughMergePolicy; entry will be added if there is no existing entry for the key.
+            com.hazelcast.map.merge.PutIfAbsentMapMergePolicy ; entry will be added if the merging entry doesn't exist in the cluster.
+            com.hazelcast.map.merge.HigherHitsMapMergePolicy ; entry with the higher hits wins.
+            com.hazelcast.map.merge.LatestUpdateMapMergePolicy ; entry with the latest update wins.
+        -->
+        <merge-policy>com.hazelcast.map.merge.PassThroughMergePolicy</merge-policy>
+
+    </map>
+
+    <multimap name="default">
+        <backup-count>1</backup-count>
+        <value-collection-type>SET</value-collection-type>
+    </multimap>
+
+    <multimap name="default">
+        <backup-count>1</backup-count>
+        <value-collection-type>SET</value-collection-type>
+    </multimap>
+
+    <list name="default">
+        <backup-count>1</backup-count>
+    </list>
+
+    <set name="default">
+        <backup-count>1</backup-count>
+    </set>
+
+    <jobtracker name="default">
+        <max-thread-size>0</max-thread-size>
+        <!-- Queue size 0 means number of partitions * 2 -->
+        <queue-size>0</queue-size>
+        <retry-count>0</retry-count>
+        <chunk-size>1000</chunk-size>
+        <communicate-stats>true</communicate-stats>
+        <topology-changed-strategy>CANCEL_RUNNING_OPERATION</topology-changed-strategy>
+    </jobtracker>
+
+    <semaphore name="default">
+        <initial-permits>0</initial-permits>
+        <backup-count>1</backup-count>
+        <async-backup-count>0</async-backup-count>
+    </semaphore>
+
+    <serialization>
+        <portable-version>0</portable-version>
+    </serialization>
+
+    <services enable-defaults="true"/>
+
+</hazelcast>
diff --git a/org.adempiere.server-feature/idempiere-server.bat b/org.adempiere.server-feature/idempiere-server.bat
index b87feb61ff..93a61dde49 100644
--- a/org.adempiere.server-feature/idempiere-server.bat
+++ b/org.adempiere.server-feature/idempiere-server.bat
@@ -17,4 +17,4 @@ goto START
 @Echo Starting iDempiere Server ...
 @Echo =======================================
 
-@"%JAVA%" -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -XX:MaxPermSize=192m -jar plugins/org.eclipse.equinox.launcher_1.*.jar -console 12612 -application org.adempiere.server.application
+@"%JAVA%" -Dosgi.console=localhost:12612 -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 -XX:MaxPermSize=192m -jar plugins/org.eclipse.equinox.launcher_1.*.jar -application org.adempiere.server.application
diff --git a/org.adempiere.server-feature/idempiere-server.sh b/org.adempiere.server-feature/idempiere-server.sh
index d5ef51556a..bbbf484018 100644
--- a/org.adempiere.server-feature/idempiere-server.sh
+++ b/org.adempiere.server-feature/idempiere-server.sh
@@ -15,4 +15,4 @@ echo ===================================
 
 unset DISPLAY
 BASE=`dirname $( readlink -f idempiere-server.sh )`
-$JAVA -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -XX:MaxPermSize=192m -jar $BASE/plugins/org.eclipse.equinox.launcher_1.*.jar -console 12612 -application org.adempiere.server.application
+$JAVA -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 -jar $BASE/plugins/org.eclipse.equinox.launcher_1.*.jar -application org.adempiere.server.application
diff --git a/org.adempiere.server-feature/jettyhome/etc/README b/org.adempiere.server-feature/jettyhome/etc/README
new file mode 100644
index 0000000000..b16905d5cc
--- /dev/null
+++ b/org.adempiere.server-feature/jettyhome/etc/README
@@ -0,0 +1,4 @@
+To Setup SSL:
+
+1) Copy your keystore file here.
+2) Replace the password and certAlias values in jetty-ssl.xml
diff --git a/org.adempiere.server-feature/jettyhome/etc/jetty-deployer.xml b/org.adempiere.server-feature/jettyhome/etc/jetty-deployer.xml
new file mode 100644
index 0000000000..b03a648e3d
--- /dev/null
+++ b/org.adempiere.server-feature/jettyhome/etc/jetty-deployer.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
+
+<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>
+
+</Configure>
diff --git a/org.adempiere.server-feature/jettyhome/etc/jetty-https.xml b/org.adempiere.server-feature/jettyhome/etc/jetty-https.xml
new file mode 100644
index 0000000000..ad838cb864
--- /dev/null
+++ b/org.adempiere.server-feature/jettyhome/etc/jetty-https.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
+
+<!-- ============================================================= -->
+<!-- Configure a HTTPS connector.                                  -->
+<!-- This configuration must be used in conjunction with jetty.xml -->
+<!-- and jetty-ssl.xml.                                            -->
+<!-- ============================================================= -->
+<Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
+
+  <Call name="addConnectionFactory">
+    <Arg>
+      <New class="org.eclipse.jetty.server.SslConnectionFactory">
+        <Arg name="next">http/1.1</Arg>
+        <Arg name="sslContextFactory"><Ref refid="sslContextFactory"/></Arg>
+      </New>
+    </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-selector-template.xml b/org.adempiere.server-feature/jettyhome/etc/jetty-selector-template.xml
new file mode 100644
index 0000000000..85e7502cf0
--- /dev/null
+++ b/org.adempiere.server-feature/jettyhome/etc/jetty-selector-template.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
+
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+
+
+    <!-- =========================================================== -->
+    <!-- Add connector                                               -->
+    <!-- =========================================================== -->
+
+    <Call name="addConnector">
+      <Arg>
+          <New class="org.eclipse.jetty.server.ServerConnector">
+            <Arg><Ref refid="Server" /></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>
+              </Array>
+             </Arg>
+            <Set name="host"><Property name="jetty.host" default="@ADEMPIERE_APPS_SERVER@" /></Set>
+            <Set name="port"><Property name="jetty.port" default="@ADEMPIERE_WEB_PORT@"/></Set>
+            <Set name="idleTimeout">300000</Set>
+          </New>
+      </Arg>
+    </Call>
+
+</Configure>
diff --git a/org.adempiere.server-feature/jettyhome/etc/jetty-ssl-template.xml b/org.adempiere.server-feature/jettyhome/etc/jetty-ssl-template.xml
new file mode 100644
index 0000000000..13f6f29b02
--- /dev/null
+++ b/org.adempiere.server-feature/jettyhome/etc/jetty-ssl-template.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.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     --> 
+<!-- ============================================================= -->
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+
+  <!-- =========================================================== -->
+  <!-- Add a SSL Connector with no protocol factories              -->
+  <!-- =========================================================== -->
+  <Call  name="addConnector">
+    <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="factories">
+          <Array type="org.eclipse.jetty.server.ConnectionFactory">
+          </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="30000"/></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>
+      </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="myPassword"/></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               -->
+  <!-- Add a SecureRequestCustomizer to extract certificate and    -->
+  <!-- session information                                         -->
+  <!-- =========================================================== -->
+  <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>
+    </Call>
+  </New>
+
+</Configure>
diff --git a/org.adempiere.server-feature/jettyhome/etc/jetty-template.xml b/org.adempiere.server-feature/jettyhome/etc/jetty-template.xml
new file mode 100644
index 0000000000..95bdd5f2c9
--- /dev/null
+++ b/org.adempiere.server-feature/jettyhome/etc/jetty-template.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
+
+
+<!-- =============================================================== -->
+<!-- Configure the Jetty Server                                      -->
+<!--                                                                 -->
+<!-- Documentation of this file format can be found at:              -->
+<!-- http://wiki.eclipse.org/Jetty/Reference/jetty.xml_syntax        -->
+<!-- =============================================================== -->
+
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+
+    <!-- =========================================================== -->
+    <!-- Server Thread Pool                                          -->
+    <!-- =========================================================== -->
+    <Get name="ThreadPool">
+      <Set name="minThreads">10</Set>
+      <Set name="maxThreads">200</Set>
+    </Get>
+
+
+    <!-- =========================================================== -->
+    <!-- Set handler Collection Structure                            -->
+    <!-- =========================================================== -->
+    <Set name="handler">
+      <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
+        <Set name="handlers">
+         <Array type="org.eclipse.jetty.server.Handler">
+           <Item>
+             <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
+           </Item>
+           <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                                               -->
+    <!-- =========================================================== -->
+    <Set name="stopAtShutdown">true</Set>
+    <Set name="stopTimeout">1000</Set>
+    <Set name="dumpAfterStart">false</Set>
+    <Set name="dumpBeforeStop">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>
+    <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>
+    </Call>
+    <Call class="java.lang.System" name="setProperty">
+      <Arg>java.naming.factory.url.pkgs</Arg>
+      <Arg><Property name="java.naming.factory.url.pkgs" default="org.eclipse.jetty.jndi"/></Arg>
+    </Call>
+
+	<!-- Call class="org.eclipse.jetty.util.log.Log" name="getRootLogger">
+	  <Call name="setDebugEnabled">
+	    <Arg type="boolean">true</Arg>
+	  </Call>
+	</Call -->
+
+</Configure>
diff --git a/org.adempiere.server-feature/server.product b/org.adempiere.server-feature/server.product
index d4c6ecc2a8..e655a41916 100644
--- a/org.adempiere.server-feature/server.product
+++ b/org.adempiere.server-feature/server.product
@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="iDempiere Server" uid="org.adempiere.server.product" id="org.adempiere.server.server_product" application="org.adempiere.server.application" version="2.0.0" useFeatures="true" includeLaunchers="true">
+<product name="iDempiere Server" uid="org.adempiere.server.product" id="org.eclipse.equinox.p2.director.product" application="org.adempiere.server.application" version="3.0.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
 
    <launcherArgs>
-      <programArgs>-console 12612 --launcher.XXMaxPermSize 192m</programArgs>
-      <vmArgs>-Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dosgi.compatibility.bootdelegation=true</vmArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+      <programArgs>--launcher.XXMaxPermSize 192m
+         <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
+         <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
+      </vmArgsMac>
    </launcherArgs>
 
    <windowImages/>
@@ -28,10 +33,7 @@
    </plugins>
 
    <features>
-      <feature id="org.adempiere.base" version="2.0.0.qualifier"/>
-      <feature id="org.adempiere.server" version="2.0.0.qualifier"/>
-      <feature id="org.idempiere.hazelcast.service" version="2.0.0.qualifier"/>
-      <feature id="org.adempiere.pipo" version="2.0.0.qualifier"/>
+      <feature id="org.adempiere.server" version="3.0.0.qualifier"/>
    </features>
 
    <configurations>
@@ -47,7 +49,9 @@
       <plugin id="org.adempiere.server" autoStart="true" startLevel="4" />
       <plugin id="org.adempiere.ui.zk" autoStart="true" startLevel="4" />
       <plugin id="org.adempiere.webstore" autoStart="true" startLevel="4" />
+      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
       <plugin id="org.apache.felix.webconsole" autoStart="true" startLevel="0" />
+      <plugin id="org.apache.felix.webconsole.plugins.packageadmin" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
       <plugin id="org.eclipse.equinox.cm" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
@@ -55,15 +59,26 @@
       <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="3" />
       <plugin id="org.eclipse.equinox.http.registry" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.equinox.metatype" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.gemini.web.core" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.gemini.web.extender" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.gemini.web.tomcat" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <plugin id="org.eclipse.jetty.apache-jsp" autoStart="true" startLevel="3" />
+      <plugin id="org.eclipse.jetty.osgi.boot" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.jetty.osgi.httpservice" autoStart="false" startLevel="0" />
+      <plugin id="org.eclipse.jetty.websocket.javax.websocket.server" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.osgi.services" autoStart="true" startLevel="3" />
       <plugin id="org.idempiere.felix.webconsole" autoStart="true" startLevel="0" />
       <plugin id="org.idempiere.hazelcast.service" autoStart="true" startLevel="0" />
       <plugin id="org.idempiere.webservices" autoStart="true" startLevel="0" />
+      <plugin id="org.objectweb.asm" autoStart="true" startLevel="0" />
+      <plugin id="org.objectweb.asm.commons" autoStart="true" startLevel="0" />
+      <plugin id="org.objectweb.asm.tree" autoStart="true" startLevel="0" />
       <plugin id="org.restlet" autoStart="true" startLevel="3" />
       <property name="org.eclipse.update.reconcile" value="false" />
+      <property name="osgi.compatibility.bootdelegation" value="true" />
+      <property name="osgi.console.enable.builtin" value="false" />
+      <property name="osgi.framework.activeThreadType" value="normal" />
+      <property name="osgi.instance.area.default" value="@config.dir/../workspace" />
+      <property name="osgi.noShutdown" value="true" />
    </configurations>
 
 </product>
diff --git a/org.adempiere.server-feature/server.product.eventtest.launch b/org.adempiere.server-feature/server.product.eventtest.launch
index 7b9f619071..7997de4e44 100644
--- a/org.adempiere.server-feature/server.product.eventtest.launch
+++ b/org.adempiere.server-feature/server.product.eventtest.launch
@@ -4,7 +4,7 @@
 <stringAttribute key="application" value="org.adempiere.server.application"/>
 <booleanAttribute key="askclear" value="true"/>
 <booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
+<booleanAttribute key="automaticValidate" value="true"/>
 <stringAttribute key="bootstrap" value=""/>
 <stringAttribute key="checked" value="[NONE]"/>
 <booleanAttribute key="clearConfig" value="true"/>
@@ -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.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.7"/>
 <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.springsource.javax.activation@default:default,com.springsource.javax.management.j2ee@default:default,com.springsource.net.sf.cglib@default:default,com.springsource.org.apache.activemq@default:default,com.springsource.org.apache.kahadb@default:default,javax.annotation@default:default,javax.ejb@default:default,javax.el@default:default,javax.jms@default:default,javax.persistence@default:default,javax.servlet.jsp.jstl@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.transaction@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@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.catalina.ha@default:false,org.apache.catalina.tribes@default:false,org.apache.catalina@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.coyote@default:false,org.apache.el@default:default,org.apache.jasper@default:false,org.apache.juli.extras@default:default,org.apache.poi@default:default,org.apache.taglibs.standard.glassfish@default:default,org.apache.tomcat.api@default:default,org.apache.tomcat.util@default:false,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.compatibility.auth@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@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@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.gemini.web.core@4:true,org.eclipse.gemini.web.extender@4:true,org.eclipse.gemini.web.tomcat@4:true,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.eclipse.virgo.util.common@default:default,org.eclipse.virgo.util.io@default:default,org.eclipse.virgo.util.math@default:default,org.eclipse.virgo.util.osgi.manifest@default:default,org.eclipse.virgo.util.osgi@default:default,org.eclipse.virgo.util.parser.manifest@default:default,org.hamcrest.core@default:default,org.junit@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.slf4j.nop@default:false,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.tomcat.config@default:false,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:default,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.w3c.dom.fragment@default:false,org.zkoss.zk.library@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.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.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.runtime.compatibility.auth@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@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@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.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.w3c.dom.fragment@default:false,org.zkoss.zk.library@default:default"/>
 <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 a8a5ec7524..3df038c65b 100644
--- a/org.adempiere.server-feature/server.product.functionaltest.launch
+++ b/org.adempiere.server-feature/server.product.functionaltest.launch
@@ -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.springsource.javax.activation@default:default,com.springsource.javax.management.j2ee@default:default,com.springsource.net.sf.cglib@default:default,com.springsource.org.apache.activemq@default:default,com.springsource.org.apache.kahadb@default:default,javax.annotation@default:default,javax.ejb@default:default,javax.el@default:default,javax.jms@default:default,javax.persistence@default:default,javax.servlet.jsp.jstl@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.transaction@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@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.catalina.ha@default:false,org.apache.catalina.tribes@default:false,org.apache.catalina@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.coyote@default:false,org.apache.el@default:default,org.apache.felix.webconsole.plugins.memoryusage@default:default,org.apache.felix.webconsole.plugins.packageadmin@default:default,org.apache.felix.webconsole@default:default,org.apache.jasper@default:false,org.apache.juli.extras@default:default,org.apache.poi@default:default,org.apache.taglibs.standard.glassfish@default:default,org.apache.tomcat.api@default:default,org.apache.tomcat.util@default:false,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.compatibility.auth@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@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@2:true,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: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.gemini.web.core@4:true,org.eclipse.gemini.web.extender@4:true,org.eclipse.gemini.web.tomcat@4:true,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.eclipse.virgo.util.common@default:default,org.eclipse.virgo.util.io@default:default,org.eclipse.virgo.util.math@default:default,org.eclipse.virgo.util.osgi.manifest@default:default,org.eclipse.virgo.util.osgi@default:default,org.eclipse.virgo.util.parser.manifest@default:default,org.hamcrest.core@default:default,org.junit@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.slf4j.nop@default:false,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.tomcat.config@default:false,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:default,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.w3c.dom.fragment@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.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.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.plugins.ds@default:default,org.apache.felix.webconsole.plugins.memoryusage@default:default,org.apache.felix.webconsole.plugins.packageadmin@default:true,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.compatibility.auth@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@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.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"/>
 <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 575dd1d9d6..b9372579a2 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -14,16 +14,18 @@
 <booleanAttribute key="default" value="false"/>
 <booleanAttribute key="includeOptional" value="false"/>
 <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.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.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.osgi.service.http.port=8888 -Dosgi.compatibility.bootdelegation=true -XX:MaxPermSize=128M"/>
+<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"/>
 <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="com.springsource.javax.activation@default:default,com.springsource.javax.management.j2ee@default:default,com.springsource.net.sf.cglib@default:default,com.springsource.org.apache.activemq@default:default,com.springsource.org.apache.kahadb@default:default,com.sun.mail.javax.mail@default:default,javax.annotation@default:default,javax.ejb@default:default,javax.el@default:default,javax.jms@default:default,javax.persistence@default:default,javax.servlet.jsp.jstl@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.transaction@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@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.catalina.ha@default:false,org.apache.catalina.tribes@default:false,org.apache.catalina@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.coyote@default:false,org.apache.el@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.plugins.memoryusage@default:default,org.apache.felix.webconsole.plugins.packageadmin@default:default,org.apache.felix.webconsole@default:true,org.apache.jasper@default:false,org.apache.juli.extras@default:default,org.apache.poi@default:default,org.apache.taglibs.standard.glassfish@default:default,org.apache.tomcat.api@default:default,org.apache.tomcat.util@default:false,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.compatibility.auth@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@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@2:true,org.eclipse.equinox.common@2:true,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.gemini.web.core@4:true,org.eclipse.gemini.web.extender@4:true,org.eclipse.gemini.web.tomcat@4:true,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.eclipse.virgo.util.common@default:default,org.eclipse.virgo.util.io@default:default,org.eclipse.virgo.util.math@default:default,org.eclipse.virgo.util.osgi.manifest@default:default,org.eclipse.virgo.util.osgi@default:default,org.eclipse.virgo.util.parser.manifest@default:default,org.hamcrest.core@default:default,org.junit@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.slf4j.nop@default:false,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: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.tomcat.config@default:false,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:default,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.w3c.dom.fragment@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.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.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.plugins.ds@default:default,org.apache.felix.webconsole.plugins.memoryusage@default:default,org.apache.felix.webconsole.plugins.packageadmin@default:true,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.compatibility.auth@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@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.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: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.slf4j.jdk14@default:false,org.w3c.dom.fragment@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/setup-alt.bat b/org.adempiere.server-feature/setup-alt.bat
index da38b404d1..4751024ddd 100644
--- a/org.adempiere.server-feature/setup-alt.bat
+++ b/org.adempiere.server-feature/setup-alt.bat
@@ -18,7 +18,7 @@ goto START
 
 :START
 @REM Setup idempiere.properties and idempiereEnv.properties
-@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.9.*.jar -application org.adempiere.install.application -consoleLog
+@"%JAVA%" -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install setup -configuration setup/configuration -application org.adempiere.install.application -consoleLog
 
 @Echo ErrorLevel = %ERRORLEVEL%
 @IF NOT ERRORLEVEL = 1 GOTO NEXT
@@ -29,9 +29,9 @@ goto START
 @Exit
 
 :NEXT
-@REM setup tomcat
-@Echo ... Setup Tomcat
-@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.9.*.jar -application org.eclipse.ant.core.antRunner -buildfile build.xml
+@REM setup jetty
+@Echo ... Setup Jetty
+@"%JAVA%" -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install setup -configuration setup/configuration -application org.eclipse.ant.core.antRunner -buildfile build.xml
 
 @Echo ...
 @Echo For problems, check log file in base directory
diff --git a/org.adempiere.server-feature/setup-alt.sh b/org.adempiere.server-feature/setup-alt.sh
index 752238c677..ad6cb4cb0d 100644
--- a/org.adempiere.server-feature/setup-alt.sh
+++ b/org.adempiere.server-feature/setup-alt.sh
@@ -15,15 +15,15 @@ else
 fi
 
 #setup idempiere.properties and idempiereEnv.propertiess
-$JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.9.*.jar -application org.adempiere.install.application -consoleLog
+$JAVA -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install setup -configuration setup/configuration -application org.adempiere.install.application
 
-echo ... Setup Tomcat
-#setup tomcat
-$JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.9.*.jar -application org.eclipse.ant.core.antRunner -buildfile build.xml
+echo ... Setup Jetty
+#setup jetty
+$JAVA -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install setup -configuration setup/configuration -application org.eclipse.ant.core.antRunner -buildfile build.xml
 
 echo ... Make .sh executable
 chmod -R a+x *.sh
 find . -name '*.sh' -exec chmod a+x '{}' \;
 
 echo ...
-echo For problems, check log file in base directory
+echo For problems, check log file in base directory
\ No newline at end of file
diff --git a/org.adempiere.server-feature/setup.bat b/org.adempiere.server-feature/setup.bat
index 459a28ec4e..5f4caaa0e6 100644
--- a/org.adempiere.server-feature/setup.bat
+++ b/org.adempiere.server-feature/setup.bat
@@ -13,8 +13,8 @@ idempiere --launcher.ini setup.ini -application org.adempiere.install.applicatio
 @Exit
 
 :NEXT
-@REM Setup Tomcat
-@Echo ... Setup Tomcat
+@REM Setup Jetty
+@Echo ... Setup Jetty
 idempiere --launcher.ini setup.ini -application org.eclipse.ant.core.antRunner -buildfile build.xml
 
 @Echo ...
diff --git a/org.adempiere.server-feature/setup.ini b/org.adempiere.server-feature/setup.ini
index 2004c7f8c8..15a3006159 100644
--- a/org.adempiere.server-feature/setup.ini
+++ b/org.adempiere.server-feature/setup.ini
@@ -1,5 +1,5 @@
 -startup
-plugins/org.eclipse.equinox.launcher_1.3.0.v20130327-1440.jar
+plugins/org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar
 -install
 setup
 --launcher.XXMaxPermSize
diff --git a/org.adempiere.server-feature/setup.sh b/org.adempiere.server-feature/setup.sh
index 115e3e083e..f3da0ae6cb 100644
--- a/org.adempiere.server-feature/setup.sh
+++ b/org.adempiere.server-feature/setup.sh
@@ -5,8 +5,8 @@ echo ... Setup iDempiere Server
 # Setup idempiere.properties and iDempiereEnv.properties
 ./idempiere --launcher.ini setup.ini -application org.adempiere.install.application
 
-echo ... Setup Tomcat
-# Setup Tomcat
+echo ... Setup Jetty
+# Setup Jetty
 ./idempiere --launcher.ini setup.ini -application org.eclipse.ant.core.antRunner -buildfile build.xml
 
 echo ... Make .sh executable
diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini
index 9cc5475650..5a7c8a6f9e 100644
--- a/org.adempiere.server-feature/setup/configuration/config.ini
+++ b/org.adempiere.server-feature/setup/configuration/config.ini
@@ -1,5 +1,53 @@
-osgi.framework=file\:../plugins/org.eclipse.osgi_3.9.1.v20140110-1610.jar
+osgi.framework=file\:../plugins/org.eclipse.osgi_3.10.1.v20140909-1633.jar
+osgi.install.area=setup
 equinox.use.ds=true
-osgi.bundles=org.eclipse.equinox.ds@1:start,org.eclipse.equinox.util,org.eclipse.core.variables,org.eclipse.ant.core,org.eclipse.core.runtime@start,org.adempiere.base@start,org.compiere.db.oracle.provider,org.compiere.db.postgresql.provider,org.hamcrest.core,org.junit,org.adempiere.install,org.restlet,com.springsource.net.sf.cglib,com.sun.mail.javax.mail,com.springsource.org.apache.activemq,com.springsource.org.apache.kahadb,org.apache.commons.collections,org.apache.ant,javax.servlet,javax.jms,org.apache.ecs,org.apache.commons.net,org.eclipse.equinox.app,org.eclipse.equinox.registry,org.eclipse.equinox.common@2:start,org.eclipse.core.contenttype,org.apache.poi,org.eclipse.core.jobs,org.eclipse.equinox.preferences,org.apache.commons.logging,org.apache.commons.logging,com.springsource.javax.management.j2ee,org.eclipse.osgi.services,javax.ejb,javax.xml.rpc,javax.xml.soap,javax.xml,com.springsource.javax.activation,com.springsource.org.apache.activemq,com.springsource.org.apache.kahadb,javax.transaction
+osgi.bundles=org.eclipse.equinox.ds@1:start,\
+ org.eclipse.equinox.util,\
+ org.eclipse.core.variables,\
+ org.eclipse.ant.core,\
+ org.eclipse.core.runtime@start,\
+ org.adempiere.base@start,\
+ org.compiere.db.oracle.provider,\
+ org.compiere.db.postgresql.provider,\
+ org.hamcrest.core,\
+ org.junit,\
+ org.adempiere.install,\
+ org.restlet,\
+ org.apache.servicemix.bundles.cglib,\
+ com.sun.mail.javax.mail,\
+ org.apache.commons.collections,\
+ org.apache.ant,\
+ javax.jms,\
+ org.apache.ecs,\
+ org.apache.commons.net,\
+ org.eclipse.equinox.app,\
+ org.eclipse.equinox.registry,\
+ org.eclipse.equinox.common@2:start,\
+ org.eclipse.core.contenttype,\
+ org.apache.poi,\
+ org.eclipse.core.jobs,\
+ org.eclipse.equinox.preferences,\
+ org.apache.commons.logging,\
+ javax.management.j2ee-api,\
+ org.eclipse.osgi,\
+ org.eclipse.osgi.services,\
+ javax.ejb,\
+ javax.xml.rpc,\
+ javax.xml.soap,\
+ javax.xml,\
+ javax.activation,\
+ org.apache.activemq.activemq-core,\
+ org.apache.activemq.kahadb,\
+ javax.transaction,\
+ org.eclipse.jetty.osgi-servlet-api,\
+ javax.annotation-api,\
+ org.slf4j.api,\
+ org.slf4j.jcl,\
+ org.apache.commons.codec,\
+ org.eclipse.osgi.compatibility.state,\
+ org.eclipse.osgi.compatibility.plugins,\
+ org.eclipse.osgi@start
 osgi.framework.extensions=
 osgi.bundles.defaultStartLevel=4
+osgi.compatibility.bootdelegation=true
+osgi.noShutdown=false
diff --git a/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/etc/init.d/idempiere b/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/etc/init.d/idempiere
index e3371ef1fb..3d70e4362f 100755
--- a/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/etc/init.d/idempiere
+++ b/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/etc/init.d/idempiere
@@ -244,7 +244,7 @@ configure_perform()
 !
 	echo "Done"
     fi
-    grep ${ADEMPIERE_WEB_PORT} ${IDEMPIERE_HOME}/plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/server.xml > /dev/null 2>&1
+    grep ${ADEMPIERE_WEB_PORT} ${IDEMPIERE_HOME}/jettyhome/etc/jetty.xml > /dev/null 2>&1
     if [ $? -ne 0 ]
     then
         echo "Error deploying iDempiere, please verify and try again"
@@ -318,17 +318,6 @@ EOF
     # TODO: ask for mail server settings
     # TODO: ask for postgres port (and perhaps machine if it's remote)
 
-    # Check not configurable tomcat ports (i.e. 8005, 8009)
-    for TOMCATPORT in 8005 8009
-    do
-        if checkportused "$TOMCATPORT"
-        then
-            echo Port $TOMCATPORT is required by iDempiere ERP server and it appears to be in use by another application.\
-            Please fix the problem and try again.
-            exit 1
-        fi
-    done
-
     #get the http port value
     while :
     do
diff --git a/org.adempiere.server/.classpath b/org.adempiere.server/.classpath
index d2c78c38ec..42b261bceb 100644
--- a/org.adempiere.server/.classpath
+++ b/org.adempiere.server/.classpath
@@ -1,15 +1,15 @@
 <?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.7">
+		<accessrules>
+			<accessrule kind="accessible" pattern="com/sun/jndi/ldap/*"/>
+		</accessrules>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/main/server"/>
 	<classpathentry kind="src" path="src/main/servlet"/>
 	<classpathentry kind="src" path="src/main/home"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/jardiff.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/jnlp-servlet.jar"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<accessrules>
-			<accessrule kind="accessible" pattern="com/sun/jndi/ldap/*"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="build/classes"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.adempiere.server/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.server/.settings/org.eclipse.jdt.core.prefs
index 9aa6cf54f0..f42de363af 100644
--- a/org.adempiere.server/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.server/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Wed Jul 14 15:53:43 MYT 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.server/META-INF/MANIFEST.MF b/org.adempiere.server/META-INF/MANIFEST.MF
index db79da8f8b..538607204c 100644
--- a/org.adempiere.server/META-INF/MANIFEST.MF
+++ b/org.adempiere.server/META-INF/MANIFEST.MF
@@ -1,19 +1,20 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: org.adempiere.server
+Bundle-Name: iDempiere Server
 Bundle-SymbolicName: org.adempiere.server;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
- org.eclipse.equinox.app;bundle-version="1.3.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Version: 3.0.0.qualifier
+Require-Bundle: org.adempiere.base;bundle-version="3.0.0",
+ org.eclipse.equinox.app;bundle-version="1.3.0",
+ org.eclipse.jetty.apache-jsp;bundle-version="9.2.3.v20140905"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Web-ContextPath: /
 Bundle-ClassPath: WEB-INF/lib/jardiff.jar,
  WEB-INF/lib/jnlp-servlet.jar,
  .
 Import-Package: javax.jms;version="1.1.0",
  javax.mail;version="1.5",
- javax.servlet;version="2.5.0",
- javax.servlet.http;version="2.5.0",
+ javax.servlet;version="3.0.0",
+ javax.servlet.http;version="3.0.0",
  org.apache.activemq;version="5.3.0",
  org.apache.commons.codec,
  org.apache.commons.codec.binary,
diff --git a/org.adempiere.server/WEB-INF/web.xml b/org.adempiere.server/WEB-INF/web.xml
index 07f7877113..a119f82681 100644
--- a/org.adempiere.server/WEB-INF/web.xml
+++ b/org.adempiere.server/WEB-INF/web.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 4 U (http://www.xmlspy.com) by Jorg Janke (ComPiere, Inc.) -->
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-   version="2.4">
+<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"
+         version="3.1">
 	<display-name>iDempiere Root</display-name>
 	<description></description>
 	<context-param>
@@ -42,16 +41,16 @@
 		<servlet-class>org.compiere.web.AdempiereMonitor</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
-	<!-- Restlet adapter -->  
-   <servlet>  
-      <servlet-name>RestletServlet</servlet-name>  
+	<!-- Restlet adapter -->
+    <servlet>
+      <servlet-name>RestletServlet</servlet-name>
       <servlet-class>org.restlet.ext.servlet.ServerServlet</servlet-class>
       <init-param>
             <!-- Application class name -->
             <param-name>org.restlet.application</param-name>
             <param-value>org.adempiere.web.server.ServerApplication</param-value>
       </init-param>
-   </servlet>
+    </servlet>
 	<servlet-mapping>
 		<servlet-name>JnlpDownloadServlet</servlet-name>
 		<url-pattern>*.jnlp</url-pattern>
@@ -64,9 +63,9 @@
 		<servlet-name>idempiereMonitor</servlet-name>
 		<url-pattern>/idempiereMonitor/*</url-pattern>
 	</servlet-mapping>
-	<servlet-mapping>  
-      <servlet-name>RestletServlet</servlet-name>  
-      <url-pattern>/server/*</url-pattern>  
+	<servlet-mapping>
+      <servlet-name>RestletServlet</servlet-name>
+      <url-pattern>/server/*</url-pattern>
    </servlet-mapping>
 	<session-config>
 		<session-timeout>15</session-timeout>
diff --git a/org.adempiere.server/build.properties b/org.adempiere.server/build.properties
index 0a790cf66a..14d131a174 100644
--- a/org.adempiere.server/build.properties
+++ b/org.adempiere.server/build.properties
@@ -30,7 +30,7 @@ bin.includes = META-INF/,\
                OSGI-INF/,\
                resources/,\
                idempiere.jsp
-output.. = build/classes/
+output.. = bin/
 source.. = src/main/server/,\
            src/main/servlet/,\
            src/main/home/
diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml
index a64ef6499f..793bed9786 100644
--- a/org.adempiere.target.platform-feature/feature.xml
+++ b/org.adempiere.target.platform-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.target.platform"
       label="Adempiere Target Platform"
-      version="2.0.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="Adempiere.org">
 
    <description url="http://www.example.com/description">
@@ -19,25 +19,33 @@
 
    <includes
          id="org.eclipse.equinox.executable"
-         version="0.0.0"
+         version="3.6.100.v20140819-1617"
          os="linux,macosx,win32"
          ws="cocoa,gtk,win32"
          arch="x86,x86_64"/>
 
    <includes
          id="org.eclipse.equinox.server.core"
-         version="0.0.0"/>
+         version="1.3.0.v20140909-1633"/>
 
    <includes
          id="org.eclipse.equinox.server.p2"
-         version="0.0.0"/>
+         version="1.2.100.v20140606-1602"/>
 
    <includes
          id="org.adempiere.bundles.external"
-         version="2.0.0.qualifier"/>
+         version="3.0.0.qualifier"/>
 
    <includes
-         id="org.eclipse.gemini.web.feature"
+         id="org.eclipse.ecf.core.feature"
+         version="1.1.0.v20140827-1444"/>
+
+   <includes
+         id="org.eclipse.ecf.core.ssl.feature"
+         version="1.0.0.v20140827-1444"/>
+
+   <includes
+         id="org.eclipse.osgi.compatibility.plugins.feature"
          version="0.0.0"/>
 
    <plugin
@@ -51,180 +59,76 @@
          id="org.apache.ant"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="1.9.2.v201404171502"/>
 
    <plugin
          id="org.eclipse.core.contenttype"
          download-size="0"
          install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.contenttype.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.jobs.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
+         version="3.4.200.v20140207-1251"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.core.runtime"
          download-size="0"
          install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.runtime.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.app.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.common.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.ds.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.event.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
+         version="3.10.0.v20140318-2214"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.equinox.p2.director.app"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.0.300.v20140228-1829"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.equinox.p2.publisher"
          download-size="0"
          install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.preferences.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.registry.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.security.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.util.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.http.registry.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.osgi.services.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.osgi.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.osgi.util.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
+         version="1.3.0.v20140911-0143"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.ant.core"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="3.3.0.v20140518-0042"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.core.variables"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="3.2.800.v20130819-1716"
          unpack="false"/>
-   
+
    <plugin
          id="org.apache.felix.gogo.command"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="0.10.0.v201209301215"
          unpack="false"/>
-         
+
    <plugin
          id="org.apache.felix.gogo.runtime"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="0.10.0.v201209301036"
          unpack="false"/>
-   
+
    <plugin
          id="org.apache.felix.gogo.shell"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="0.10.0.v201212101605"
          unpack="false"/>
-         
+
    <plugin
          id="org.eclipse.equinox.console"
          download-size="0"
          install-size="0"
-         version="0.0.0"
-         unpack="false"/> 
+         version="1.1.0.v20140131-1639"
+         unpack="false"/>
+
 </feature>
diff --git a/org.adempiere.ui.swing-feature/feature.xml b/org.adempiere.ui.swing-feature/feature.xml
index 5173ed79c3..20df2214f1 100644
--- a/org.adempiere.ui.swing-feature/feature.xml
+++ b/org.adempiere.ui.swing-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.ui.swing"
       label="Swing Client-feature"
-      version="2.0.0.qualifier">
+      version="3.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,21 +17,21 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="2.0.0.qualifier"/>
+      <import feature="org.adempiere.base" version="3.0.0.qualifier"/>
    </requires>
 
    <plugin
          id="org.adempiere.report.jasper.swing"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="3.0.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.ui.swing"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"/>
+         version="3.0.0.qualifier"/>
 
    <plugin
          id="org.restlet.ext.net"
@@ -59,6 +59,7 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
+         fragment="true"
          unpack="false"/>
 
    <plugin
diff --git a/org.adempiere.ui.swing-feature/swingclient.product b/org.adempiere.ui.swing-feature/swingclient.product
index c5d8d909c6..9d6e30fa82 100644
--- a/org.adempiere.ui.swing-feature/swingclient.product
+++ b/org.adempiere.ui.swing-feature/swingclient.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Adempiere Swing Client" uid="org.adempiere.ui.swing.product" id="org.adempiere.ui.swing.client_product" application="org.adempiere.ui.swing.client" version="2.0.0" useFeatures="true" includeLaunchers="true">
+<product name="Adempiere Swing Client" uid="org.adempiere.ui.swing.product" id="org.adempiere.ui.swing.client_product" application="org.adempiere.ui.swing.client" version="3.0.0" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -26,10 +26,10 @@
    </plugins>
 
    <features>
-      <feature id="org.adempiere.base" version="2.0.0.qualifier"/>
-      <feature id="org.adempiere.ui.swing" version="2.0.0.qualifier"/>
-      <feature id="org.idempiere.hazelcast.service" version="2.0.0.qualifier"/>
-      <feature id="org.adempiere.pipo" version="2.0.0.qualifier"/>
+      <feature id="org.adempiere.base" version="3.0.0.qualifier"/>
+      <feature id="org.adempiere.ui.swing" version="3.0.0.qualifier"/>
+      <feature id="org.idempiere.hazelcast.service" version="3.0.0.qualifier"/>
+      <feature id="org.adempiere.pipo" version="3.0.0.qualifier"/>
    </features>
 
    <configurations>
diff --git a/org.adempiere.ui.swing-feature/swingclient.product.launch b/org.adempiere.ui.swing-feature/swingclient.product.launch
index ea4594a385..ab2274760f 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.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.7"/>
 <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,7 +22,7 @@
 <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.springsource.javax.activation@default:default,com.springsource.javax.management.j2ee@default:default,com.springsource.net.sf.cglib@default:default,com.springsource.org.apache.activemq@default:default,com.springsource.org.apache.kahadb@default:default,com.sun.mail.javax.mail@default:default,javax.ejb@default:default,javax.el@default:default,javax.jms@default:default,javax.servlet@default:default,javax.transaction@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@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.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.compatibility.auth@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@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.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_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.compatibility.auth@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@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.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.w3c.dom.fragment@default:false"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
diff --git a/org.adempiere.ui.swing/.classpath b/org.adempiere.ui.swing/.classpath
index 8822724374..82c46a0ba0 100644
--- a/org.adempiere.ui.swing/.classpath
+++ b/org.adempiere.ui.swing/.classpath
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="jpedal.jar"/>
-	<classpathentry exported="true" kind="lib" path="miglayout-3.7.1-swing.jar"/>
-	<classpathentry exported="true" kind="lib" path="looks-2.0.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="swingx-1.6.jar"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="build"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry exported="true" kind="lib" path="swingx-1.6.jar"/>
+	<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.7">
+		<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
index ee6ba6eb35..f42de363af 100644
--- a/org.adempiere.ui.swing/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.ui.swing/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Wed Jul 14 15:37:06 MYT 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+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 d0e0b2d1bf..81c1656497 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
@@ -2,6 +2,6 @@
 <faceted-project>
   <fixed facet="jst.java"/>
   <fixed facet="jst.utility"/>
-  <installed facet="jst.java" version="6.0"/>
   <installed facet="jst.utility" version="1.0"/>
+  <installed facet="jst.java" version="1.7"/>
 </faceted-project>
diff --git a/org.adempiere.ui.swing/META-INF/MANIFEST.MF b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
index 2667429f3b..ed130faefb 100644
--- a/org.adempiere.ui.swing/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Swing Client
+Bundle-Name: iDempiere Swing Client
 Bundle-SymbolicName: org.adempiere.ui.swing;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-ClassPath: client.jar,
  swingx-1.6.jar,
  looks-2.0.4.jar,
@@ -68,15 +68,15 @@ Export-Package: com.jgoodies.looks,
  org.jdesktop.swingx.tree,
  org.jdesktop.swingx.treetable,
  org.jdesktop.swingx.util
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
- org.adempiere.ui;bundle-version="2.0.0",
+Require-Bundle: org.adempiere.base;bundle-version="3.0.0",
+ org.adempiere.ui;bundle-version="3.0.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"
 Eclipse-ExtensibleAPI: true
 Eclipse-RegisterBuddy: org.adempiere.base
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: javax.net.ssl,
  net.sf.jasperreports.engine,
  org.apache.ecs,
diff --git a/org.adempiere.ui.swing/build.properties b/org.adempiere.ui.swing/build.properties
index 3d5f086139..0944263797 100644
--- a/org.adempiere.ui.swing/build.properties
+++ b/org.adempiere.ui.swing/build.properties
@@ -15,4 +15,4 @@ bin.includes = META-INF/,\
                OSGI-INF/reportviewerprovider.xml,\
                OSGI-INF/defaultformfactory.xml
 source.client.jar = src/
-output.client.jar = build/
+output.client.jar = bin/
diff --git a/org.adempiere.ui.zk-feature/feature.xml b/org.adempiere.ui.zk-feature/feature.xml
index a4a0b0ed76..4856cd72e5 100644
--- a/org.adempiere.ui.zk-feature/feature.xml
+++ b/org.adempiere.ui.zk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.ui.zk"
       label="Zk Client-feature"
-      version="2.0.0.qualifier">
+      version="3.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,20 +17,20 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="2.0.0.qualifier"/>
+      <import feature="org.adempiere.base" version="3.0.0.qualifier"/>
    </requires>
 
    <plugin
          id="org.adempiere.ui.zk"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"/>
+         version="3.0.0.qualifier"/>
 
    <plugin
          id="org.zkoss.zk.library"
          download-size="0"
          install-size="0"
-         version="6.0.0.qualifier"
+         version="7.0.3.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/org.adempiere.ui.zk.example/.classpath b/org.adempiere.ui.zk.example/.classpath
index ad32c83a78..098194ca4b 100644
--- a/org.adempiere.ui.zk.example/.classpath
+++ b/org.adempiere.ui.zk.example/.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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.ui.zk.example/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.ui.zk.example/.settings/org.eclipse.jdt.core.prefs
index c537b63063..f42de363af 100644
--- a/org.adempiere.ui.zk.example/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.ui.zk.example/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.ui.zk.example/META-INF/MANIFEST.MF b/org.adempiere.ui.zk.example/META-INF/MANIFEST.MF
index f6edfc3db7..56cfd134f6 100644
--- a/org.adempiere.ui.zk.example/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.zk.example/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.adempiere.ui.zk.example
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.adempiere.ui.zk.example.Activator
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: org.adempiere.base,
  org.adempiere.base.equinox,
  org.adempiere.exceptions,
diff --git a/org.adempiere.ui.zk/.classpath b/org.adempiere.ui.zk/.classpath
index c487edbc9e..a0e282e983 100644
--- a/org.adempiere.ui.zk/.classpath
+++ b/org.adempiere.ui.zk/.classpath
@@ -1,11 +1,11 @@
 <?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.7"/>
+	<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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="WEB-INF/src"/>
-	<classpathentry kind="output" path="WEB-INF/classes"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs
index 790a7bc887..7341ab1683 100644
--- a/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,11 @@
-#Fri Nov 27 23:38:58 CET 2009
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.ui.zk/.tomcatplugin b/org.adempiere.ui.zk/.tomcatplugin
deleted file mode 100644
index a3938844e2..0000000000
--- a/org.adempiere.ui.zk/.tomcatplugin
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tomcatProjectProperties>
-    <rootDir>/</rootDir>
-    <exportSource>false</exportSource>
-    <reloadable>true</reloadable>
-    <redirectLogger>false</redirectLogger>
-    <updateXml>true</updateXml>
-    <warLocation></warLocation>
-    <extraInfo></extraInfo>
-    <webPath>webui</webPath>
-    <webClassPathEntries>
-        <webClassPathEntry>/JasperReports/build</webClassPathEntry>
-        <webClassPathEntry>/JasperReportsTools/bin</webClassPathEntry>
-        <webClassPathEntry>/JasperReportsTools/lib/commons-beanutils-1.7.jar</webClassPathEntry>
-        <webClassPathEntry>/JasperReportsTools/lib/commons-digester-1.7.jar</webClassPathEntry>
-        <webClassPathEntry>/JasperReportsTools/lib/iReport.jar</webClassPathEntry>
-        <webClassPathEntry>/JasperReportsTools/lib/jasperreports-1.3.0.jar</webClassPathEntry>
-        <webClassPathEntry>/JasperReportsTools/lib/jfreechart-1.0.2.jar</webClassPathEntry>
-        <webClassPathEntry>/base/build</webClassPathEntry>
-        <webClassPathEntry>/client/build</webClassPathEntry>
-        <webClassPathEntry>/extend/build</webClassPathEntry>
-        <webClassPathEntry>/jboss/client/jbossall-client.jar</webClassPathEntry>
-        <webClassPathEntry>/looks/build</webClassPathEntry>
-        <webClassPathEntry>/tools/build</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/Verisign.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/activation.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/ant.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/barbecue-1.1.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/bsh-2.0b5.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/bsh-engine.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/c3p0-0.9.1.2.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/commons-net-1.4.0.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/groovy-all-1.5.1.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/groovy-engine.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/iText-2.1.7.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/jcommon-1.0.5.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/jfreechart-1.0.2.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/jnlp.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/jpayment.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/jpedal.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/jstl.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/junit.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/jython-engine.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/jython.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/log4j.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/looks-2.0.4.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/mail.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/ocrs12.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/ojdbc14.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/poi-2.0-final-20040126.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/postgresql.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/script-api.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/standard.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/swingx-0.9.0.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/xdoclet-1.2.3.jar</webClassPathEntry>
-        <webClassPathEntry>/tools/lib/xercesImpl.jar</webClassPathEntry>
-        <webClassPathEntry>/zkwebui/WEB-INF/classes</webClassPathEntry>
-        <webClassPathEntry>/zkwebui/WEB-INF/lib/junit.jar</webClassPathEntry>
-        <webClassPathEntry>/zkwebui/WEB-INF/lib/timelinez.jar</webClassPathEntry>
-        <webClassPathEntry>/zkwebui/WEB-INF/lib/zcommon.jar</webClassPathEntry>
-        <webClassPathEntry>/zkwebui/WEB-INF/lib/zhtml.jar</webClassPathEntry>
-        <webClassPathEntry>/zkwebui/WEB-INF/lib/zk.jar</webClassPathEntry>
-        <webClassPathEntry>/zkwebui/WEB-INF/lib/zkex.jar</webClassPathEntry>
-        <webClassPathEntry>/zkwebui/WEB-INF/lib/zkmax.jar</webClassPathEntry>
-        <webClassPathEntry>/zkwebui/WEB-INF/lib/zkplus.jar</webClassPathEntry>
-        <webClassPathEntry>/zkwebui/WEB-INF/lib/zul.jar</webClassPathEntry>
-        <webClassPathEntry>org.eclipse.jdt.junit.JUNIT_CONTAINER/3</webClassPathEntry>
-        <webClassPathEntry>org.eclipse.jst.j2ee.internal.module.container</webClassPathEntry>
-        <webClassPathEntry>org.eclipse.jst.j2ee.internal.web.container</webClassPathEntry>
-        <webClassPathEntry>org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/C-_applications_apache-tomcat-5.5.26</webClassPathEntry>
-    </webClassPathEntries>
-</tomcatProjectProperties>
diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
index 68bfe07fe4..96fa5d74fe 100644
--- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
@@ -1,13 +1,19 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Zk Web Client
+Bundle-Name: iDempiere Web Client
 Bundle-SymbolicName: org.adempiere.ui.zk;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: javax.activation;version="1.1.1",
+Bundle-Version: 3.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Import-Package: javax.activation,
+ javax.annotation;version="1.2.0",
+ javax.annotation.processing,
+ javax.annotation.security;version="1.2.0",
+ javax.annotation.sql;version="1.2.0",
  javax.servlet,
+ javax.servlet.annotation;version="3.1.0",
  javax.servlet.http,
- metainfo.zk,
+ javax.servlet.jsp.resources;version="2.3.0",
+ javax.servlet.resources;version="3.1.0",
  net.sf.jasperreports.engine,
  net.sf.jasperreports.engine.export,
  net.sf.jasperreports.engine.util,
@@ -83,10 +89,9 @@ 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="2.0.0",
- org.adempiere.ui;bundle-version="2.0.0",
- org.zkoss.zk.library;bundle-version="6.0.0",
- org.apache.catalina;bundle-version="7.0.35"
+Require-Bundle: org.adempiere.base;bundle-version="3.0.0",
+ org.adempiere.ui;bundle-version="3.0.0",
+ org.zkoss.zk.library;bundle-version="6.0.0"
 Bundle-Activator: org.adempiere.webui.WebUIActivator
 Eclipse-ExtensibleAPI: true
 Eclipse-RegisterBuddy: org.zkoss.zk.library
diff --git a/org.adempiere.ui.zk/WEB-INF/web.xml b/org.adempiere.ui.zk/WEB-INF/web.xml
index a8b88f4b95..ee9e763c1c 100644
--- a/org.adempiere.ui.zk/WEB-INF/web.xml
+++ b/org.adempiere.ui.zk/WEB-INF/web.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app id="iDempiere" xmlns="http://java.sun.com/xml/ns/javaee"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-      version="3.0"> 
+<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"
+         version="3.1">
 	<display-name>iDempiere Web Client</display-name>
-	
 	<servlet>
       <servlet-name>AtmosphereServlet</servlet-name>
       <servlet-class>org.atmosphere.cpr.AtmosphereServlet</servlet-class>
@@ -32,7 +31,7 @@
       <servlet-name>AtmosphereServlet</servlet-name>
       <url-pattern>/zkau/comet</url-pattern>
     </servlet-mapping>
-	
+
 	<!-- /// -->
 	<!-- DSP -->
 	<servlet>
@@ -84,9 +83,9 @@
 			<param-name>update-uri</param-name>
 			<param-value>/zkau</param-value>
 		</init-param>
-		<init-param> 
+		<init-param>
 			<param-name>compress</param-name>
-			<param-value>false</param-value> 
+			<param-value>false</param-value>
 		</init-param>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
@@ -104,10 +103,10 @@
 		<servlet-class>
 			org.zkoss.zk.au.http.DHtmlUpdateServlet
 		</servlet-class>
-		<init-param> 
+		<init-param>
 			<param-name>compress</param-name>
-			<param-value>false</param-value> 
-		</init-param> 
+			<param-value>false</param-value>
+		</init-param>
 	</servlet>
 	<servlet-mapping>
 		<servlet-name>auEngine</servlet-name>
@@ -207,7 +206,7 @@
 <!-- 			<transport-guarantee>CONFIDENTIAL</transport-guarantee> -->
 <!-- 		</user-data-constraint> -->
 <!-- 	</security-constraint> -->
-			
+
 	<!--env-entry>
 		<env-entry-name>IDEMPIERE_HOME</env-entry-name>
 		<env-entry-type>java.lang.String</env-entry-type>
diff --git a/org.adempiere.ui.zk/build.properties b/org.adempiere.ui.zk/build.properties
index d5f688490c..aeb31e7006 100644
--- a/org.adempiere.ui.zk/build.properties
+++ b/org.adempiere.ui.zk/build.properties
@@ -1,4 +1,4 @@
-output.. = WEB-INF/classes/
+output.. = bin/
 bin.includes = META-INF/,\
                WEB-INF/,\
                css/,\
@@ -54,5 +54,4 @@ src.includes = WEB-INF/classes/,\
                theme/default/zul/calendar/divtab.zul
 source.. = WEB-INF/src/
 bin.excludes = WEB-INF/src/,\
-               WEB-INF/web-2.5.xml,\
-               WEB-INF/classes/
+               WEB-INF/web-2.5.xml
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/application-menu.css.dsp b/org.adempiere.ui.zk/theme/default/css/fragment/application-menu.css.dsp
index ee0e3a8b91..f825779245 100644
--- a/org.adempiere.ui.zk/theme/default/css/fragment/application-menu.css.dsp
+++ b/org.adempiere.ui.zk/theme/default/css/fragment/application-menu.css.dsp
@@ -1,3 +1,5 @@
+<%@ taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c" %>
+
 .menu-href {
 	font-size: 11px;
 	font-weight: normal;
diff --git a/org.adempiere.ui/.classpath b/org.adempiere.ui/.classpath
index 74dea4d489..bb1d4e5cc8 100644
--- a/org.adempiere.ui/.classpath
+++ b/org.adempiere.ui/.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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="org-netbeans-api-visual.jar"/>
diff --git a/org.adempiere.ui/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.ui/.settings/org.eclipse.jdt.core.prefs
index d43f98f30f..f42de363af 100644
--- a/org.adempiere.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Mon Aug 09 17:35:10 MYT 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.ui/META-INF/MANIFEST.MF b/org.adempiere.ui/META-INF/MANIFEST.MF
index d99ef4f659..030ec55315 100644
--- a/org.adempiere.ui/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: UI base
+Bundle-Name: iDempiere UI base
 Bundle-SymbolicName: org.adempiere.ui;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
+Bundle-Version: 3.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Require-Bundle: org.adempiere.base;bundle-version="3.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 cac22e4377..b4e2e4455b 100644
--- a/org.adempiere.webstore-feature/feature.xml
+++ b/org.adempiere.webstore-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.webstore"
       label="Webstore-feature"
-      version="2.0.0.qualifier">
+      version="3.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,29 +17,30 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="2.0.0.qualifier"/>
-      <import plugin="org.adempiere.report.jasper.webapp" version="2.0.0.qualifer"/>
-      <import plugin="javax.servlet.jsp"/>
-      <import plugin="javax.servlet.jsp.jstl"/>
+      <import feature="org.adempiere.base" version="3.0.0.qualifier"/>
+      <import plugin="org.adempiere.report.jasper.webapp" version="3.0.0.qualifer"/>
+      <import plugin="org.mortbay.jasper.apache-jsp"/>
+      <import plugin="org.apache.taglibs.taglibs-standard-spec"/>
    </requires>
 
    <plugin
          id="org.adempiere.webstore"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"/>
+         version="3.0.0.qualifier"/>
 
    <plugin
          id="org.adempiere.webstore.resource"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="3.0.0.qualifier"
          fragment="true"/>
 
    <plugin
          id="org.adempiere.webstore.servlet"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"/>
+         version="3.0.0.qualifier"
+         fragment="true"/>
 
 </feature>
diff --git a/org.adempiere.webstore.resource/.classpath b/org.adempiere.webstore.resource/.classpath
index ad32c83a78..098194ca4b 100644
--- a/org.adempiere.webstore.resource/.classpath
+++ b/org.adempiere.webstore.resource/.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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs
index 4854712ad7..f42de363af 100644
--- a/org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Thu Dec 23 08:01:11 MYT 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.webstore.resource/META-INF/MANIFEST.MF b/org.adempiere.webstore.resource/META-INF/MANIFEST.MF
index 6ca476b538..4da1b6e79d 100644
--- a/org.adempiere.webstore.resource/META-INF/MANIFEST.MF
+++ b/org.adempiere.webstore.resource/META-INF/MANIFEST.MF
@@ -1,9 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Webstore Resource
+Bundle-Name: iDempiere Web Store Resources
 Bundle-SymbolicName: org.adempiere.webstore.resource
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Vendor: Adempiere.org
-Fragment-Host: org.adempiere.webstore;bundle-version="2.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Fragment-Host: org.adempiere.webstore;bundle-version="3.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: org.compiere.wstore
+Jetty-WarPatchFragmentFolderPath: /
diff --git a/org.adempiere.webstore.resource/build.properties b/org.adempiere.webstore.resource/build.properties
index 04d426b80d..84d71a2110 100644
--- a/org.adempiere.webstore.resource/build.properties
+++ b/org.adempiere.webstore.resource/build.properties
@@ -2,6 +2,5 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               *.*,\
-               WEB-INF/
+               *.*
 
diff --git a/org.adempiere.webstore.servlet/.classpath b/org.adempiere.webstore.servlet/.classpath
index ad32c83a78..098194ca4b 100644
--- a/org.adempiere.webstore.servlet/.classpath
+++ b/org.adempiere.webstore.servlet/.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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs
index b79a851439..f42de363af 100644
--- a/org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Mon Jan 10 12:12:37 MYT 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF b/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF
index c2cf4d9431..f57d9ac27d 100644
--- a/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF
+++ b/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Servlet
-Bundle-SymbolicName: org.adempiere.webstore.servlet;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Name: iDempiere Web Store Servlets
+Bundle-SymbolicName: org.adempiere.webstore.servlet
+Bundle-Version: 3.0.0.qualifier
 Bundle-Vendor: Adempiere.org
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: org.compiere.wstore
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
- org.eclipse.equinox.http.registry
+Require-Bundle: org.adempiere.base;bundle-version="3.0.0"
 Import-Package: javax.servlet,
+ javax.servlet.annotation;version="3.1.0",
  javax.servlet.http,
  javax.servlet.jsp,
  javax.servlet.jsp.jstl.core,
@@ -16,3 +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.0.0"
diff --git a/org.adempiere.webstore.servlet/build.properties b/org.adempiere.webstore.servlet/build.properties
index e9863e281e..34d2e4d2da 100644
--- a/org.adempiere.webstore.servlet/build.properties
+++ b/org.adempiere.webstore.servlet/build.properties
@@ -1,5 +1,4 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .,\
-               plugin.xml
+               .
diff --git a/org.adempiere.webstore.servlet/plugin.xml b/org.adempiere.webstore.servlet/plugin.xml
deleted file mode 100644
index 70b4c6d3e4..0000000000
--- a/org.adempiere.webstore.servlet/plugin.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.equinox.http.registry.servlets">
-      <servlet
-            alias="/advertisementServlet"
-            class="org.compiere.wstore.AdvertisementServlet"
-            httpcontextId="org.adempiere.webstore">
-      </servlet>
-      <servlet
-            alias="/assetServlet"
-            class="org.compiere.wstore.AssetServlet"
-            httpcontextId="org.adempiere.webstore">
-      </servlet>
-      <servlet
-            alias="/basketServlet"
-            class="org.compiere.wstore.BasketServlet"
-            httpcontextId="org.adempiere.webstore">
-      </servlet>
-      <servlet
-            alias="/checkOutServlet"
-            class="org.compiere.wstore.CheckOutServlet"
-            httpcontextId="org.adempiere.webstore">
-      </servlet>
-      <servlet
-            alias="/click"
-            class="org.compiere.wstore.Click"
-            httpcontextId="org.adempiere.webstore">
-      </servlet>
-      <servlet
-            alias="/expenseServlet"
-            class="org.compiere.wstore.ExpenseServlet"
-            httpcontextId="org.adempiere.webstore">
-      </servlet>
-      <servlet
-            alias="/counter"
-            class="org.compiere.wstore.Counter"
-            httpcontextId="org.adempiere.webstore">
-      </servlet>
-      <servlet
-            alias="/infoServlet"
-            class="org.compiere.wstore.InfoServlet"
-            httpcontextId="org.adempiere.webstore">
-      </servlet>
-      <servlet
-            alias="/invoiceServlet"
-            class="org.compiere.wstore.InvoiceServlet"
-            httpcontextId="org.adempiere.webstore">
-      </servlet>
-      <servlet
-            alias="/locationServlet"
-            class="org.compiere.wstore.LocationServlet"
-            httpcontextId="org.adempiere.webstore">
-      </servlet>
-      <servlet
-            alias="/loginServlet"
-            class="org.compiere.wstore.LoginServlet"
-            httpcontextId="org.adempiere.webstore">
-      </servlet>
-      <servlet
-            alias="/noteServlet"
-            class="org.compiere.wstore.NoteServlet"
-            httpcontextId="org.adempiere.webstore">
-      </servlet>
-      <servlet
-            alias="/orderServlet"
-            class="org.compiere.wstore.OrderServlet"
-            httpcontextId="org.adempiere.webstore">
-      </servlet>
-      <servlet
-            alias="/paymentServlet"
-            class="org.compiere.wstore.PaymentServlet"
-            httpcontextId="org.adempiere.webstore">
-      </servlet>
-      <servlet
-            alias="/productServlet"
-            class="org.compiere.wstore.ProductServlet"
-            httpcontextId="org.adempiere.webstore">
-      </servlet>
-      <servlet
-            alias="/registrationServlet"
-            class="org.compiere.wstore.RegistrationServlet"
-            httpcontextId="org.adempiere.webstore">
-      </servlet>
-      <servlet
-            alias="/requestServlet"
-            class="org.compiere.wstore.RequestServlet"
-            httpcontextId="org.adempiere.webstore">
-      </servlet>
-      <servlet
-            alias="/rfqServlet"
-            class="org.compiere.wstore.RfQServlet"
-            httpcontextId="org.adempiere.webstore">
-      </servlet>
-      <servlet
-            alias="/searchServlet"
-            class="org.compiere.wstore.SearchServlet"
-            httpcontextId="org.adempiere.webstore">
-      </servlet>
-      <servlet
-            alias="/updateServlet"
-            class="org.compiere.wstore.UpdateServlet"
-            httpcontextId="org.adempiere.webstore">
-      </servlet>
-      <servlet
-            alias="/workflowServlet"
-            class="org.compiere.wstore.WorkflowServlet"
-            httpcontextId="org.adempiere.webstore">
-      </servlet>
-      <servlet
-            alias="/emailServlet"
-            class="org.compiere.wstore.EMailServlet"
-            httpcontextId="org.adempiere.webstore">
-      </servlet>
-      <servlet
-            alias="/issueReportServlet"
-            class="org.compiere.wstore.IssueReportServlet"
-            httpcontextId="org.adempiere.webstore">
-      </servlet>
-   </extension>
-
-</plugin>
diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/AdvertisementServlet.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/AdvertisementServlet.java
index 293e61efe4..1ff288ac10 100644
--- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/AdvertisementServlet.java
+++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/AdvertisementServlet.java
@@ -22,6 +22,7 @@ import java.util.logging.Level;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -40,6 +41,10 @@ import org.compiere.util.WebUtil;
  *  @author     Jorg Janke
  *  @version    $Id: AdvertisementServlet.java,v 1.2 2006/07/30 00:53:21 jjanke Exp $
  */
+@WebServlet(
+		name="advertisementServlet",
+        urlPatterns = "/advertisementServlet"
+)
 public class AdvertisementServlet extends HttpServlet
 {
 	/**
diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/AssetServlet.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/AssetServlet.java
index 9b29896aa0..7e9a94e581 100644
--- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/AssetServlet.java
+++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/AssetServlet.java
@@ -28,6 +28,7 @@ import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -50,6 +51,10 @@ import org.compiere.util.WebUtil;
  *  @author Jorg Janke
  *  @version $Id: AssetServlet.java,v 1.3 2006/09/16 08:32:33 comdivision Exp $
  */
+@WebServlet(
+		name="assetServlet",
+        urlPatterns = "/assetServlet"
+)
 public class AssetServlet extends HttpServlet
 {
 	/**
diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/BasketServlet.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/BasketServlet.java
index cf086ff438..f239166280 100644
--- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/BasketServlet.java
+++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/BasketServlet.java
@@ -25,6 +25,7 @@ import java.util.logging.Level;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -45,6 +46,10 @@ import org.compiere.util.WebUtil;
  *  @author Jorg Janke
  *  @version  $Id: BasketServlet.java,v 1.2 2006/07/30 00:53:21 jjanke Exp $
  */
+@WebServlet(
+		name="basketServlet",
+        urlPatterns = "/basketServlet"
+)
 public class BasketServlet extends HttpServlet
 {
 	/**
diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/CheckOutServlet.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/CheckOutServlet.java
index 63893547d0..4fd5e0b882 100644
--- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/CheckOutServlet.java
+++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/CheckOutServlet.java
@@ -22,6 +22,7 @@ import java.util.logging.Level;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -39,6 +40,10 @@ import org.compiere.util.WebUser;
  *  @author Jorg Janke
  *  @version $Id: CheckOutServlet.java,v 1.2 2006/07/30 00:53:21 jjanke Exp $
  */
+@WebServlet(
+		name="checkOutServlet",
+        urlPatterns = "/checkOutServlet"
+)
 public class CheckOutServlet extends HttpServlet
 {
 	/**
diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/Click.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/Click.java
index 61ca7e48db..0de4a1ac76 100644
--- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/Click.java
+++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/Click.java
@@ -23,6 +23,7 @@ import java.util.logging.Level;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -46,6 +47,10 @@ import org.compiere.util.WebUtil;
  *  @author Jorg Janke
  *  @version $Id: Click.java,v 1.2 2006/07/30 00:53:21 jjanke Exp $
  */
+@WebServlet(
+		name="clickServlet",
+        urlPatterns = "/click"
+)
 public class Click  extends HttpServlet
 {
 	/**
diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/Counter.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/Counter.java
index 6a3ad9c0bf..f3242865e7 100644
--- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/Counter.java
+++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/Counter.java
@@ -25,6 +25,7 @@ import java.util.logging.Level;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -41,6 +42,10 @@ import org.compiere.util.WebEnv;
  *  @author     Jorg Janke
  *  @version    $Id: Counter.java,v 1.2 2006/07/30 00:53:21 jjanke Exp $
  */
+@WebServlet(
+		name="counterServlet",
+        urlPatterns = "/counter"
+)
 public class Counter extends HttpServlet implements Runnable
 {
 	/**
diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/EMailServlet.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/EMailServlet.java
index ac0dfafc7f..a8b0097f4e 100644
--- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/EMailServlet.java
+++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/EMailServlet.java
@@ -23,6 +23,7 @@ import java.util.logging.Level;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -39,6 +40,10 @@ import org.compiere.util.WebUtil;
  *  @author Jorg Janke
  *  @version $Id: EMailServlet.java,v 1.4 2006/09/24 12:11:16 comdivision Exp $
  */
+@WebServlet(
+		name="emailServlet",
+        urlPatterns = "/emailServlet"
+)
 public class EMailServlet extends HttpServlet
 {
 	/**
diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/ExpenseServlet.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/ExpenseServlet.java
index d63596340f..38ae6ac6ba 100644
--- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/ExpenseServlet.java
+++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/ExpenseServlet.java
@@ -22,6 +22,7 @@ import java.util.logging.Level;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -39,6 +40,10 @@ import org.compiere.util.WebUtil;
  *  @author     Jorg Janke
  *  @version    $Id: ExpenseServlet.java,v 1.3 2006/07/30 00:53:21 jjanke Exp $
  */
+@WebServlet(
+		name="expenseServlet",
+        urlPatterns = "/expenseServlet"
+)
 public class ExpenseServlet extends HttpServlet
 {
 	/**
diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/InfoServlet.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/InfoServlet.java
index 06adccf5cf..1fcde0da1b 100644
--- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/InfoServlet.java
+++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/InfoServlet.java
@@ -23,6 +23,7 @@ import java.util.logging.Level;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -44,6 +45,10 @@ import org.compiere.util.WebUtil;
  * 	@author 	Jorg Janke
  * 	@version 	$Id: InfoServlet.java,v 1.2 2006/07/30 00:53:21 jjanke Exp $
  */
+@WebServlet(
+		name="infoServlet",
+        urlPatterns = "/infoServlet"
+)
 public class InfoServlet  extends HttpServlet
 {
 	/**
diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/InvoiceServlet.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/InvoiceServlet.java
index b9ae5eb270..606155e960 100644
--- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/InvoiceServlet.java
+++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/InvoiceServlet.java
@@ -27,6 +27,7 @@ import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -47,6 +48,10 @@ import org.compiere.util.WebUtil;
  *  @author Jorg Janke
  *  @version $Id: InvoiceServlet.java,v 1.3 2006/09/16 08:32:34 comdivision Exp $
  */
+@WebServlet(
+		name="invoiceServlet",
+        urlPatterns = "/invoiceServlet"
+)
 public class InvoiceServlet extends HttpServlet
 {
 	/**
diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/IssueReportServlet.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/IssueReportServlet.java
index 27a64751f4..6f6e2df6a8 100644
--- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/IssueReportServlet.java
+++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/IssueReportServlet.java
@@ -25,6 +25,7 @@ import java.util.logging.Level;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -41,6 +42,10 @@ import org.compiere.util.WebUtil;
  *  @author Jorg Janke
  *  @version $Id: IssueReportServlet.java,v 1.2 2006/07/30 00:53:21 jjanke Exp $
  */
+@WebServlet(
+		name="issueReportServlet",
+        urlPatterns = "/issueReportServlet"
+)
 public class IssueReportServlet extends HttpServlet
 {
 	/**
diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/LocationServlet.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/LocationServlet.java
index 2bf06f040f..6b3aa08af4 100644
--- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/LocationServlet.java
+++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/LocationServlet.java
@@ -23,6 +23,7 @@ import java.util.logging.Level;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -42,6 +43,10 @@ import org.compiere.util.Util;
  *  @version $Id: LocationServlet.java,v 1.5 2006/07/30 00:53:21 jjanke Exp $
  *  @author Michael Judd BF [2728388] - fix potential CSS velnerability
  */
+@WebServlet(
+		name="locationServlet",
+        urlPatterns = "/locationServlet"
+)
 public class LocationServlet extends HttpServlet
 {
     /**
diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/LoginServlet.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/LoginServlet.java
index 4277c9db77..3cf7d38ae9 100644
--- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/LoginServlet.java
+++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/LoginServlet.java
@@ -23,6 +23,7 @@ import java.util.logging.Level;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -45,6 +46,10 @@ import org.compiere.util.WebUtil;
  *  @author     Jorg Janke
  *  @version    $Id: LoginServlet.java,v 1.6 2006/10/08 18:17:43 comdivision Exp $
  */
+@WebServlet(
+		name="loginServlet",
+        urlPatterns = "/loginServlet"
+)
 public class LoginServlet extends HttpServlet
 {
 	/**
diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/NoteServlet.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/NoteServlet.java
index 5f5fd239ed..fcc5acb49b 100644
--- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/NoteServlet.java
+++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/NoteServlet.java
@@ -23,6 +23,7 @@ import java.util.logging.Level;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -43,6 +44,10 @@ import org.compiere.util.WebUtil;
  *  @author     Jorg Janke
  *  @version    $Id: NoteServlet.java,v 1.3 2006/09/16 08:32:34 comdivision Exp $
  */
+@WebServlet(
+		name="noteServlet",
+        urlPatterns = "/noteServlet"
+)
 public class NoteServlet extends HttpServlet
 {
 	/**
diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/OrderServlet.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/OrderServlet.java
index 94a3a4c619..1f5b642be9 100644
--- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/OrderServlet.java
+++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/OrderServlet.java
@@ -23,6 +23,7 @@ import java.util.logging.Level;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -48,6 +49,10 @@ import org.compiere.util.WebUtil;
  *  @author Jorg Janke
  *  @version $Id: OrderServlet.java,v 1.2 2006/07/30 00:53:21 jjanke Exp $
  */
+@WebServlet(
+		name="orderServlet",
+        urlPatterns = "/orderServlet"
+)
 public class OrderServlet extends HttpServlet
 {
 	/**
diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/PaymentServlet.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/PaymentServlet.java
index b96c94bef9..1db1d725b7 100644
--- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/PaymentServlet.java
+++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/PaymentServlet.java
@@ -24,6 +24,7 @@ import java.util.logging.Level;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -49,6 +50,10 @@ import org.compiere.util.WebUtil;
  * 	@author 	Jorg Janke
  * 	@version 	$Id: PaymentServlet.java,v 1.2 2006/07/30 00:53:21 jjanke Exp $
  */
+@WebServlet(
+		name="paymentServlet",
+        urlPatterns = "/paymentServlet"
+)
 public class PaymentServlet  extends HttpServlet
 {
 	/**
diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/ProductServlet.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/ProductServlet.java
index 0bac7b5c6a..def6b7bb3c 100644
--- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/ProductServlet.java
+++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/ProductServlet.java
@@ -23,6 +23,7 @@ import java.util.logging.Level;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -39,6 +40,10 @@ import org.compiere.util.WebUtil;
  * 	@author 	Jorg Janke
  * 	@version 	$Id: ProductServlet.java,v 1.2 2006/07/30 00:53:21 jjanke Exp $
  */
+@WebServlet(
+		name="productServlet",
+        urlPatterns = "/productServlet"
+)
 public class ProductServlet  extends HttpServlet
 {
 	/**
diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/RegistrationServlet.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/RegistrationServlet.java
index 1c5996f562..23fdb789c7 100644
--- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/RegistrationServlet.java
+++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/RegistrationServlet.java
@@ -24,6 +24,7 @@ import java.util.logging.Level;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -44,6 +45,10 @@ import org.compiere.util.WebUtil;
  *  @author     Jorg Janke
  *  @version    $Id: RegistrationServlet.java,v 1.2 2006/07/30 00:53:21 jjanke Exp $
  */
+@WebServlet(
+		name="registrationServlet",
+        urlPatterns = "/registrationServlet"
+)
 public class RegistrationServlet extends HttpServlet
 {
 	/**
diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/RequestServlet.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/RequestServlet.java
index d9b8af435c..eb761cbe78 100644
--- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/RequestServlet.java
+++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/RequestServlet.java
@@ -23,6 +23,7 @@ import java.util.logging.Level;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -48,6 +49,10 @@ import org.compiere.util.WebUtil;
  *  @author     Jorg Janke
  *  @version    $Id: RequestServlet.java,v 1.3 2006/09/16 08:32:34 comdivision Exp $
  */
+@WebServlet(
+		name="requestServlet",
+        urlPatterns = "/requestServlet"
+)
 public class RequestServlet extends HttpServlet
 {
 	/**
diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/RfQServlet.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/RfQServlet.java
index 85bea4f42d..f31b7b0106 100644
--- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/RfQServlet.java
+++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/RfQServlet.java
@@ -25,6 +25,7 @@ import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -47,6 +48,10 @@ import org.compiere.util.WebUtil;
  *  @author     Jorg Janke
  *  @version    $Id: RfQServlet.java,v 1.3 2006/09/16 08:32:34 comdivision Exp $
  */
+@WebServlet(
+		name="rfqServlet",
+        urlPatterns = "/rfqServlet"
+)
 public class RfQServlet extends HttpServlet
 {
 	/**
diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/SearchServlet.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/SearchServlet.java
index 48fd9ae0aa..45c82300c5 100644
--- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/SearchServlet.java
+++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/SearchServlet.java
@@ -26,6 +26,7 @@ import java.util.logging.Level;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -48,6 +49,10 @@ import org.compiere.util.WebUtil;
  *  @version $Id$
  *  @author Michael Judd BF [2728388]  - fix potential CSS velnerability
  */
+@WebServlet(
+		name="searchServlet",
+        urlPatterns = "/searchServlet"
+)
 public class SearchServlet extends HttpServlet
 {
     /**
diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/UpdateServlet.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/UpdateServlet.java
index 42e97a3cc6..a15dc6ed36 100644
--- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/UpdateServlet.java
+++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/UpdateServlet.java
@@ -23,6 +23,7 @@ import java.util.logging.Level;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -39,6 +40,10 @@ import org.compiere.util.WebUtil;
  *  @author     Malachi de AElfweald
  *  @version    $Id: UpdateServlet.java,v 1.6 2006/09/23 19:38:46 comdivision Exp $
  */
+@WebServlet(
+		name="updateServlet",
+        urlPatterns = "/updateServlet"
+)
 public class UpdateServlet
     extends HttpServlet
 {
diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/WorkflowServlet.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/WorkflowServlet.java
index 9d8f7d7882..de81c36315 100644
--- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/WorkflowServlet.java
+++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/WorkflowServlet.java
@@ -23,6 +23,7 @@ import java.util.logging.Level;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -44,6 +45,10 @@ import org.compiere.wf.MWFActivity;
  *  @author     Jorg Janke
  *  @version    $Id: WorkflowServlet.java,v 1.3 2006/09/16 08:32:34 comdivision Exp $
  */
+@WebServlet(
+		name="workflowServlet",
+        urlPatterns = "/workflowServlet"
+)
 public class WorkflowServlet extends HttpServlet
 {
 	/**
diff --git a/org.adempiere.webstore/.classpath b/org.adempiere.webstore/.classpath
index 6046c7a0d1..098194ca4b 100644
--- a/org.adempiere.webstore/.classpath
+++ b/org.adempiere.webstore/.classpath
@@ -1,7 +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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="build"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs
index 2b9a3705b5..f42de363af 100644
--- a/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Wed Jul 14 15:58:26 MYT 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.adempiere.webstore/META-INF/MANIFEST.MF b/org.adempiere.webstore/META-INF/MANIFEST.MF
index 0b044e227f..7c7b0d4ed5 100644
--- a/org.adempiere.webstore/META-INF/MANIFEST.MF
+++ b/org.adempiere.webstore/META-INF/MANIFEST.MF
@@ -1,52 +1,49 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: org.adempiere.webstore
+Bundle-Name: iDempiere Web Store
 Bundle-SymbolicName: org.adempiere.webstore;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
- org.adempiere.report.jasper.webapp;bundle-version="2.0.0",
- org.eclipse.jdt.core.compiler.batch;bundle-version="3.8.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Version: 3.0.0.qualifier
+Require-Bundle: org.adempiere.base;bundle-version="3.0.0",
+ org.adempiere.report.jasper.webapp;bundle-version="3.0.0",
+ org.eclipse.jdt.core.compiler.batch;bundle-version="3.8.2"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Web-ContextPath: wstore
-Import-Package: javax.servlet;version="2.5.0",
- javax.servlet.http;version="2.5.0",
- javax.servlet.jsp;version="2.1.0",
- javax.servlet.jsp.el;version="2.1.0",
- javax.servlet.jsp.jstl.core;version="1.1.2",
- javax.servlet.jsp.jstl.fmt;version="1.1.2",
- javax.servlet.jsp.jstl.sql;version="1.1.2",
- javax.servlet.jsp.jstl.tlv;version="1.1.2",
- javax.servlet.jsp.resources;version="2.1.0",
+Import-Package: javax.servlet;version="3.0.0",
+ javax.servlet.http;version="3.0.0",
+ javax.servlet.jsp;version="2.2.0",
+ javax.servlet.jsp.el;version="2.2.0",
+ javax.servlet.jsp.jstl.core;version="1.2.0",
+ javax.servlet.jsp.jstl.fmt;version="1.2.0",
+ javax.servlet.jsp.jstl.sql;version="1.2.0",
+ javax.servlet.jsp.jstl.tlv;version="1.2.0",
+ javax.servlet.jsp.resources;version="2.2.0",
  javax.servlet.jsp.tagext;version="2.1.0",
- javax.servlet.resources;version="2.5.0",
+ javax.servlet.resources;version="3.0.0",
  org.apache.ecs,
  org.apache.ecs.filter,
  org.apache.ecs.storage,
  org.apache.ecs.xhtml,
  org.apache.ecs.xml,
- org.apache.taglibs.standard;version="1.1.2",
- org.apache.taglibs.standard.extra.spath;version="1.1.2",
- org.apache.taglibs.standard.functions;version="1.1.2",
- org.apache.taglibs.standard.lang.jstl;version="1.1.2",
- org.apache.taglibs.standard.lang.jstl.parser;version="1.1.2",
- org.apache.taglibs.standard.lang.jstl.test;version="1.1.2",
- org.apache.taglibs.standard.lang.jstl.test.beans;version="1.1.2",
- org.apache.taglibs.standard.lang.support;version="1.1.2",
- org.apache.taglibs.standard.resources;version="1.1.2",
- org.apache.taglibs.standard.tag.common.core;version="1.1.2",
- org.apache.taglibs.standard.tag.common.fmt;version="1.1.2",
- org.apache.taglibs.standard.tag.common.sql;version="1.1.2",
- org.apache.taglibs.standard.tag.common.xml;version="1.1.2",
- org.apache.taglibs.standard.tag.el.core;version="1.1.2",
- org.apache.taglibs.standard.tag.el.fmt;version="1.1.2",
- org.apache.taglibs.standard.tag.el.sql;version="1.1.2",
- org.apache.taglibs.standard.tag.el.xml;version="1.1.2",
- org.apache.taglibs.standard.tag.rt.core;version="1.1.2",
- org.apache.taglibs.standard.tag.rt.fmt;version="1.1.2",
- org.apache.taglibs.standard.tag.rt.sql;version="1.1.2",
- org.apache.taglibs.standard.tag.rt.xml;version="1.1.2",
- org.apache.taglibs.standard.tei;version="1.1.2",
- org.apache.taglibs.standard.tlv;version="1.1.2",
+ org.apache.taglibs.standard;version="1.2.0",
+ org.apache.taglibs.standard.functions;version="1.2.0",
+ org.apache.taglibs.standard.lang.jstl;version="1.2.0",
+ org.apache.taglibs.standard.lang.jstl.parser;version="1.2.0",
+ org.apache.taglibs.standard.lang.support;version="1.2.0",
+ org.apache.taglibs.standard.resources;version="1.2.0",
+ org.apache.taglibs.standard.tag.common.core;version="1.2.0",
+ org.apache.taglibs.standard.tag.common.fmt;version="1.2.0",
+ org.apache.taglibs.standard.tag.common.sql;version="1.2.0",
+ org.apache.taglibs.standard.tag.common.xml;version="1.2.0",
+ org.apache.taglibs.standard.tag.el.core;version="1.2.0",
+ org.apache.taglibs.standard.tag.el.fmt;version="1.2.0",
+ org.apache.taglibs.standard.tag.el.sql;version="1.2.0",
+ org.apache.taglibs.standard.tag.el.xml;version="1.2.0",
+ org.apache.taglibs.standard.tag.rt.core;version="1.2.0",
+ org.apache.taglibs.standard.tag.rt.fmt;version="1.2.0",
+ org.apache.taglibs.standard.tag.rt.sql;version="1.2.0",
+ org.apache.taglibs.standard.tag.rt.xml;version="1.2.0",
+ org.apache.taglibs.standard.tei;version="1.2.0",
+ org.apache.taglibs.standard.tlv;version="1.2.0",
  org.apache.xerces.dom;version="2.9.0",
  org.apache.xerces.dom.events;version="2.9.0",
  org.apache.xerces.dom3.as;version="2.9.0",
@@ -81,9 +78,12 @@ Import-Package: javax.servlet;version="2.5.0",
  org.apache.xerces.xs;version="2.9.0",
  org.apache.xerces.xs.datatypes;version="2.9.0",
  org.apache.xml.serialize;version="2.9.0",
- org.eclipse.equinox.http.registry;version="1.0.0",
- org.eclipse.equinox.http.servlet;version="1.1.0",
- org.eclipse.equinox.servletbridge;version="1.1.0",
+ org.compiere.wstore,
  org.osgi.framework;version="1.7.0",
  org.osgi.service.http;version="1.2.1"
 Bundle-Activator: org.adempiere.webstore.Activator
+
+
+
+
+
diff --git a/org.adempiere.webstore/WEB-INF/web.xml b/org.adempiere.webstore/WEB-INF/web.xml
index c7c3688d8a..48088c21de 100644
--- a/org.adempiere.webstore/WEB-INF/web.xml
+++ b/org.adempiere.webstore/WEB-INF/web.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-    version="2.4">
+<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"
+         version="3.1">
 	<icon>
 		<large-icon>/iD32.gif</large-icon>
 	</icon>
@@ -17,27 +17,10 @@
 		<param-name>#AD_Client_ID</param-name>
 		<param-value>1000000</param-value>
 	</context-param>
-	<filter id="bridge">
-		<filter-name>equinoxBridgeFilter</filter-name>
-		<filter-class>org.eclipse.equinox.servletbridge.BridgeFilter</filter-class>
-		<init-param>
-			<param-name>HttpContext.ClassName</param-name>
-			<param-value>org.adempiere.webstore.DefaultHttpContext</param-value>
-		</init-param>
-	</filter>
-	<filter-mapping>
-		<filter-name>equinoxBridgeFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
 	<!--
 		This is required if your application bundles expose JSPs.
 	-->
 
-	<filter-mapping>
-		<filter-name>equinoxBridgeFilter</filter-name>
-		<url-pattern>*.jsp</url-pattern>
-	</filter-mapping>
-
 	<!-- Force SSL connection for login and checkout -->
 	<security-constraint>
 		<web-resource-collection>
diff --git a/org.adempiere.webstore/bin/.hgignore b/org.adempiere.webstore/bin/.hgignore
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/org.adempiere.webstore/build.properties b/org.adempiere.webstore/build.properties
index 02ed860ca2..bfe6b1ee82 100644
--- a/org.adempiere.webstore/build.properties
+++ b/org.adempiere.webstore/build.properties
@@ -1,10 +1,8 @@
-output.. = build/
 bin.includes = META-INF/,\
                *.*,\
-               WEB-INF/,\
-               plugin.xml
+               WEB-INF/
 bin.excludes = src/**,\
-			   build/**,\
+			   bin/**,\
 			   .settings/**,\
 			   .classpath,\
 			   .project,\
diff --git a/org.adempiere.webstore/plugin.xml b/org.adempiere.webstore/plugin.xml
deleted file mode 100644
index 6189a10cdd..0000000000
--- a/org.adempiere.webstore/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.equinox.http.registry.httpcontexts">
-      <httpcontext
-            class="org.adempiere.webstore.DefaultHttpContext"
-            id="org.adempiere.webstore">
-      </httpcontext>
-   </extension>
-
-</plugin>
diff --git a/org.adempiere.webstore/src/org/adempiere/webstore/DefaultHttpContext.java b/org.adempiere.webstore/src/org/adempiere/webstore/DefaultHttpContext.java
deleted file mode 100644
index 9c2c491d87..0000000000
--- a/org.adempiere.webstore/src/org/adempiere/webstore/DefaultHttpContext.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.adempiere.webstore;
-
-import java.io.IOException;
-import java.net.URL;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.osgi.service.http.HttpContext;
-
-public class DefaultHttpContext implements HttpContext {
-
-	public DefaultHttpContext() {
-	}
-	
-	@Override
-	public boolean handleSecurity(HttpServletRequest request,
-			HttpServletResponse response) throws IOException {
-		// default behaviour assumes the container has already performed authentication
-		return true;
-	}
-
-	@Override
-	public URL getResource(String name) {
-		return Activator.bundleContext.getBundle().getResource(name);
-	}
-
-	@Override
-	public String getMimeType(String name) {
-		return null;
-	}
-
-}
diff --git a/org.apache.ecs/.classpath b/org.apache.ecs/.classpath
index ad32c83a78..098194ca4b 100644
--- a/org.apache.ecs/.classpath
+++ b/org.apache.ecs/.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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs b/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs
index a6abaa2b46..f42de363af 100644
--- a/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs
+++ b/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Mon Sep 27 12:11:10 MYT 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.apache.ecs/META-INF/MANIFEST.MF b/org.apache.ecs/META-INF/MANIFEST.MF
index f57fa4ef11..730989a2cb 100644
--- a/org.apache.ecs/META-INF/MANIFEST.MF
+++ b/org.apache.ecs/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Apache ECS
+Bundle-Name: Apache ECS Library
 Bundle-SymbolicName: org.apache.ecs
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.apache.ecs.Activator
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 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/.classpath b/org.compiere.db.oracle.provider/.classpath
index c40f083e0a..6ff053d680 100644
--- a/org.compiere.db.oracle.provider/.classpath
+++ b/org.compiere.db.oracle.provider/.classpath
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="mchange-commons-java-0.2.3.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="c3p0-oracle-thin-extras-0.9.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="c3p0-0.9.2.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="ojdbc6.jar"/>
+	<classpathentry exported="true" kind="lib" path="c3p0-0.9.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="c3p0-oracle-thin-extras-0.9.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="mchange-commons-java-0.2.3.3.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
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
index ef47a5f5a7..f42de363af 100644
--- a/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs
+++ b/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Mon Aug 23 18:48:06 MYT 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
index 232e613ffd..8ccb4ad7a3 100644
--- a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
+++ b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: OracleProvider
+Bundle-Name: iDempiere Oracle Provider
 Bundle-SymbolicName: org.compiere.db.oracle.provider;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
- org.adempiere.install;bundle-version="2.0.0"
+Bundle-Version: 3.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Require-Bundle: org.adempiere.base;bundle-version="3.0.0",
+ org.adempiere.install;bundle-version="3.0.0"
 Bundle-ClassPath: .,
  ojdbc6.jar,
  c3p0-0.9.2.jar,
diff --git a/org.compiere.db.postgresql.provider/.classpath b/org.compiere.db.postgresql.provider/.classpath
index bb3bdddae8..133e2029a5 100644
--- a/org.compiere.db.postgresql.provider/.classpath
+++ b/org.compiere.db.postgresql.provider/.classpath
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="postgresql-9.2-1004.jdbc4.jar"/>
-	<classpathentry exported="true" kind="lib" path="mchange-commons-java-0.2.3.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="c3p0-0.9.2.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry exported="true" kind="lib" path="postgresql-9.2-1004.jdbc4.jar"/>
+	<classpathentry exported="true" kind="lib" path="c3p0-0.9.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="mchange-commons-java-0.2.3.3.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
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
index a7464d29fe..f42de363af 100644
--- a/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs
+++ b/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Mon Aug 23 18:53:29 MYT 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
index 69d2a7518f..4a8c459f33 100644
--- a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
+++ b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
@@ -1,15 +1,15 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: PostgresqlProvider
+Bundle-Name: iDempiere Postgresql Provider
 Bundle-SymbolicName: org.compiere.db.postgresql.provider;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Version: 3.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ClassPath: .,
  postgresql-9.2-1004.jdbc4.jar,
  c3p0-0.9.2.jar,
  mchange-commons-java-0.2.3.3.jar
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
- org.adempiere.install;bundle-version="2.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="3.0.0",
+ org.adempiere.install;bundle-version="3.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 ed5bc9b406..c10d8093ce 100644
--- a/org.compiere.db.provider-feature/feature.xml
+++ b/org.compiere.db.provider-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.compiere.db.provider"
       label="Database Provider-feature"
-      version="2.0.0.qualifier">
+      version="3.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,21 +17,21 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="2.0.0.qualifier"/>
+      <import feature="org.adempiere.base" version="3.0.0.qualifier"/>
    </requires>
 
    <plugin
          id="org.compiere.db.oracle.provider"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="3.0.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.compiere.db.postgresql.provider"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="3.0.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/org.idempiere.eclipse.platform-feature/director.bat b/org.idempiere.eclipse.platform-feature/director.bat
index 3b426e50f1..bd9b3b5228 100644
--- a/org.idempiere.eclipse.platform-feature/director.bat
+++ b/org.idempiere.eclipse.platform-feature/director.bat
@@ -1,4 +1,4 @@
 @Title ... p2 director
 @Echo off
 
-java -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=director -jar plugins/org.eclipse.osgi_3.9.*.jar -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true %1
+java -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true %1
diff --git a/org.idempiere.eclipse.platform-feature/director.sh b/org.idempiere.eclipse.platform-feature/director.sh
index b5afbddc77..23f74c6046 100644
--- a/org.idempiere.eclipse.platform-feature/director.sh
+++ b/org.idempiere.eclipse.platform-feature/director.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 #
 
-java -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=director -jar plugins/org.eclipse.osgi_3.9.*.jar -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true $*
+java -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true $*
 
diff --git a/org.idempiere.eclipse.platform-feature/director/configuration/config.ini b/org.idempiere.eclipse.platform-feature/director/configuration/config.ini
index 36e0eb311b..7ff5db4119 100644
--- a/org.idempiere.eclipse.platform-feature/director/configuration/config.ini
+++ b/org.idempiere.eclipse.platform-feature/director/configuration/config.ini
@@ -1,7 +1,67 @@
-osgi.framework=file\:../plugins/org.eclipse.osgi_3.9.1.v20140110-1610.jar
+osgi.framework=file\:../plugins/org.eclipse.osgi_3.10.1.v20140909-1633.jar
+osgi.install.area=director
 equinox.use.ds=true
-osgi.bundles=org.eclipse.core.net@start,org.eclipse.core.variables,org.eclipse.ant.core,org.eclipse.core.runtime@start,org.hamcrest.core,org.junit,org.apache.commons.collections,org.apache.ant,org.apache.commons.net,org.eclipse.equinox.app,org.eclipse.equinox.registry,org.eclipse.equinox.common@2:start,org.eclipse.core.contenttype,org.eclipse.core.jobs,org.eclipse.equinox.preferences,org.apache.commons.logging,org.eclipse.osgi.services,org.sat4j.core,org.sat4j.pb,org.eclipse.ecf,org.eclipse.ecf.filetransfer,org.eclipse.ecf.identity,org.eclipse.ecf.provider.filetransfer,org.eclipse.ecf.provider.filetransfer.httpclient4,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl,org.eclipse.ecf.provider.filetransfer.ssl,org.eclipse.equinox.ds@start,org.eclipse.equinox.event,org.eclipse.equinox.frameworkadmin,org.eclipse.equinox.frameworkadmin.equinox,org.eclipse.equinox.http.registry,org.eclipse.equinox.launcher,org.eclipse.equinox.p2.artifact.repository,org.eclipse.equinox.p2.console,org.eclipse.equinox.p2.core,org.eclipse.equinox.p2.director,org.eclipse.equinox.p2.director.app,org.eclipse.equinox.p2.engine,org.eclipse.equinox.p2.garbagecollector,org.eclipse.equinox.p2.jarprocessor,org.eclipse.equinox.p2.metadata,org.eclipse.equinox.p2.metadata.repository,org.eclipse.equinox.p2.ql,org.eclipse.equinox.p2.repository,org.eclipse.equinox.p2.touchpoint.eclipse,org.eclipse.equinox.p2.touchpoint.natives,org.eclipse.equinox.p2.transport.ecf,org.eclipse.equinox.security,org.eclipse.equinox.util,org.eclipse.equinox.simpleconfigurator.manipulator,org.apache.commons.codec,org.eclipse.equinox.simpleconfigurator
+osgi.bundles=org.eclipse.core.net@start,\
+ org.eclipse.core.variables,\
+ org.eclipse.core.runtime@start,\
+ org.eclipse.core.contenttype,\
+ org.eclipse.core.jobs,\
+ org.eclipse.ant.core,\
+ org.eclipse.osgi.services,\
+ org.eclipse.equinox.app,\
+ org.eclipse.equinox.registry,\
+ org.eclipse.equinox.common@2:start,\
+ org.eclipse.equinox.preferences,\
+ org.eclipse.equinox.ds@start,\
+ org.eclipse.equinox.event,\
+ org.eclipse.equinox.frameworkadmin@start,\
+ org.eclipse.equinox.frameworkadmin.equinox,\
+ org.eclipse.equinox.http.registry,\
+ org.eclipse.equinox.launcher,\
+ org.eclipse.equinox.security,\
+ org.eclipse.equinox.util,\
+ org.eclipse.equinox.simpleconfigurator.manipulator,\
+ org.eclipse.equinox.simpleconfigurator@1\:start,\
+ org.eclipse.equinox.p2.artifact.repository,\
+ org.eclipse.equinox.p2.console,\
+ org.eclipse.equinox.p2.core,\
+ org.eclipse.equinox.p2.director,\
+ org.eclipse.equinox.p2.director.app,\
+ org.eclipse.equinox.p2.engine,\
+ org.eclipse.equinox.p2.garbagecollector,\
+ org.eclipse.equinox.p2.jarprocessor,\
+ org.eclipse.equinox.p2.metadata,\
+ org.eclipse.equinox.p2.metadata.repository,\
+ org.eclipse.equinox.p2.ql,\
+ org.eclipse.equinox.p2.repository,\
+ org.eclipse.equinox.p2.touchpoint.eclipse,\
+ org.eclipse.equinox.p2.touchpoint.natives,\
+ org.eclipse.equinox.p2.transport.ecf,\
+ org.eclipse.ecf,\
+ org.eclipse.ecf.filetransfer,\
+ org.eclipse.ecf.identity,\
+ org.eclipse.ecf.provider.filetransfer,\
+ org.eclipse.ecf.provider.filetransfer.httpclient4,\
+ org.eclipse.ecf.provider.filetransfer.httpclient4.ssl,\
+ org.eclipse.ecf.provider.filetransfer.ssl,\
+ org.eclipse.ecf.provider.filetransfer.httpclient4,\
+ org.sat4j.core,\
+ org.sat4j.pb,\
+ org.apache.commons.collections,\
+ org.apache.commons.net,\
+ org.apache.commons.codec,\
+ org.apache.commons.logging,\
+ org.apache.httpcomponents.httpclient,\
+ org.apache.httpcomponents.httpcore,\
+ org.apache.ant,\
+ org.hamcrest.core,\
+ org.junit,\
+ org.eclipse.osgi.compatibility.state,\
+ org.eclipse.osgi.compatibility.plugins,\
+ org.eclipse.osgi@start
 osgi.framework.extensions=
 osgi.bundles.defaultStartLevel=4
 eclipse.p2.profile=DefaultProfile
 eclipse.p2.data.area=@config.dir/../../p2/
+osgi.compatibility.bootdelegation=true
+osgi.noShutdown=false
diff --git a/org.idempiere.eclipse.platform-feature/feature.xml b/org.idempiere.eclipse.platform-feature/feature.xml
index 3f2e907d01..859a517383 100644
--- a/org.idempiere.eclipse.platform-feature/feature.xml
+++ b/org.idempiere.eclipse.platform-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.idempiere.eclipse.platform"
       label="Eclipse Platform for iDempiere"
-      version="2.0.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="www.idempiere.org">
 
    <description url="http://www.example.com/description">
@@ -29,6 +29,34 @@
          id="org.eclipse.equinox.executable"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.ecf.core.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.core.ssl.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.filetransfer.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.filetransfer.httpclient4.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.filetransfer.ssl.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.osgi.compatibility.plugins.feature"
+         version="0.0.0"/>
+         
    <plugin
          id="org.eclipse.core.runtime"
          download-size="0"
@@ -102,4 +130,53 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.equinox.concurrent"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.httpcomponents.httpclient.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.httpcomponents.httpcore.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.console"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.felix.gogo.command"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.felix.gogo.runtime"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.felix.gogo.shell"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/org.idempiere.eclipse.platform-feature/update.bat b/org.idempiere.eclipse.platform-feature/update.bat
index 4162257158..d4c933b160 100644
--- a/org.idempiere.eclipse.platform-feature/update.bat
+++ b/org.idempiere.eclipse.platform-feature/update.bat
@@ -4,21 +4,38 @@
 cd %~dp0
 
 cp idempiere.ini idempiere.ini.sav
-if exist server.xml.sav del /q server.xml.sav
-if exist plugins/org.adempiere.tomcat.config_1.0.0/META-INF/tomcat/server.xml (
-   copy plugins/org.adempiere.tomcat.config_1.0.0/META-INF/tomcat/server.xml server.xml.sav
-   del /q plugins/org.adempiere.tomcat.config_1.0.0/META-INF/tomcat/server.xml
-)
-if exist plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/server.xml (
-   copy plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/server.xml server.xml.sav
+
+if exist jetty.xml.sav del /q jetty.xml.sav
+if exist jettyhome/etc/jetty.xml (
+   copy jettyhome/etc/jetty.xml jetty.xml.sav
 )
 
-java -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=director -jar plugins/org.eclipse.osgi_3.9.*.jar -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination %~dp0 -repository %1 -u org.adempiere.server.product
+if exist jetty-ssl.xml.sav del /q jetty-ssl.xml.sav
+if exist jettyhome/etc/jetty-ssl.xml (
+   copy jettyhome/etc/jetty-ssl.xml jetty-ssl.xml.sav
+)
 
-java -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=director -jar plugins/org.eclipse.osgi_3.9.*.jar -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination %~dp0 -repository %1 -i org.adempiere.server.product
+if exist jetty-selector.xml.sav del /q jetty-selector.xml.sav
+if exist jettyhome/etc/jetty-selector.xml (
+   copy jettyhome/etc/jetty-selector.xml jetty-selector.xml.sav
+)
+
+java -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -u org.adempiere.server.product -i org.adempiere.server.product
 
 cp idempiere.ini.sav idempiere.ini
-if exist server.xml.sav (
-   copy server.xml.sav plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/server.xml 
-   del /q server.xml.sav
+
+if exist jetty.xml.sav (
+   copy jetty.xml.sav jettyhome/etc/jetty.xml 
+   del /q jetty.xml.sav
 )
+
+if exist jetty-ssl.xml.sav (
+   copy jetty-ssl.xml.sav jettyhome/etc/jetty-ssl.xml 
+   del /q jetty-ssl.xml.sav
+)
+
+if exist jetty-selector.xml.sav (
+   copy jetty-selector.xml.sav jettyhome/etc/jetty-selector.xml 
+   del /q jetty-selector.xml.sav
+)
+
diff --git a/org.idempiere.eclipse.platform-feature/update.sh b/org.idempiere.eclipse.platform-feature/update.sh
index baf2b96783..bdc4855c4c 100644
--- a/org.idempiere.eclipse.platform-feature/update.sh
+++ b/org.idempiere.eclipse.platform-feature/update.sh
@@ -6,27 +6,51 @@ DESTINATION=$(pwd)
 
 cp idempiere.ini idempiere.ini.sav
 
-if [ -f server.xml.sav ];
+if [ -f jetty.xml.sav ];
 then
-   rm -f server.xml.sav
+   rm -f jetty.xml.sav
 fi
-if [ -f plugins/org.adempiere.tomcat.config_1.0.0/META-INF/tomcat/server.xml ]
+if [ -f jettyhome/etc/jetty.xml ]
 then
-   cp plugins/org.adempiere.tomcat.config_1.0.0/META-INF/tomcat/server.xml server.xml.sav
-   rm plugins/org.adempiere.tomcat.config_1.0.0/META-INF/tomcat/server.xml
+   cp jettyhome/etc/jetty.xml jetty.xml.sav
 fi
-if [ -f plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/server.xml ]
-then
-   cp plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/server.xml server.xml.sav
-fi
-java -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=director -jar plugins/org.eclipse.osgi_3.9.*.jar -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -u org.adempiere.server.product
 
-java -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=director -jar plugins/org.eclipse.osgi_3.9.*.jar -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -i org.adempiere.server.product
+if [ -f jetty-ssl.xml.sav ];
+then
+   rm -f jetty-ssl.xml.sav
+fi
+if [ -f jettyhome/etc/jetty-ssl.xml ]
+then
+   cp jettyhome/etc/jetty-ssl.xml jetty-ssl.xml.sav
+fi
+
+if [ -f jetty-selector.xml.sav ];
+then
+   rm -f jetty-selector.xml.sav
+fi
+if [ -f jettyhome/etc/jetty-selector.xml ]
+then
+   cp jettyhome/etc/jetty-selector.xml jetty-selector.xml.sav
+fi
+
+java -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -u org.adempiere.server.product -i org.adempiere.server.product 
 
 cp idempiere.ini.sav idempiere.ini
-if [ -f server.xml.sav ]
+
+if [ -f jetty.xml.sav ]
 then
-   cp server.xml.sav plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/server.xml 
-   rm -f server.xml.sav
+   cp jetty.xml.sav jettyhome/etc/jetty.xml 
+   rm -f jetty.xml.sav
 fi
 
+if [ -f jetty-ssl.xml.sav ]
+then
+   cp jetty-ssl.xml.sav jettyhome/etc/jetty-ssl.xml 
+   rm -f jetty-ssl.xml.sav
+fi
+
+if [ -f jetty-selector.xml.sav ]
+then
+   cp jetty-selector.xml.sav jettyhome/etc/jetty-selector.xml 
+   rm -f jetty-selector.xml.sav
+fi
diff --git a/org.idempiere.felix.webconsole-feature/feature.xml b/org.idempiere.felix.webconsole-feature/feature.xml
index 1da425cb74..815cac71a2 100644
--- a/org.idempiere.felix.webconsole-feature/feature.xml
+++ b/org.idempiere.felix.webconsole-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.idempiere.felix.webconsole"
       label="Felix Web Console Feature"
-      version="2.0.0.qualifier">
+      version="3.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
diff --git a/org.idempiere.felix.webconsole/.classpath b/org.idempiere.felix.webconsole/.classpath
index ad32c83a78..098194ca4b 100644
--- a/org.idempiere.felix.webconsole/.classpath
+++ b/org.idempiere.felix.webconsole/.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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs
index c537b63063..f42de363af 100644
--- a/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs
+++ b/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF b/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF
index 7fec536b0f..1f77088eb9 100644
--- a/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF
+++ b/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Web Console
+Bundle-Name: iDempiere Felix Web Console
 Bundle-SymbolicName: org.idempiere.felix.webconsole
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.idempiere.felix.webconsole.Activator
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 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-feature/feature.xml b/org.idempiere.fitnesse-feature/feature.xml
index 5acf324e31..e60d430e91 100644
--- a/org.idempiere.fitnesse-feature/feature.xml
+++ b/org.idempiere.fitnesse-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.idempiere.fitnesse"
       label="Fitnesse Feature"
-      version="2.0.0.qualifier">
+      version="3.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -20,28 +20,28 @@
          id="org.idempiere.fitnesse.fixture"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="3.0.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.idempiere.fitnesse.server"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="3.0.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.idempiere.ui.zk.selenium"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="3.0.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.idempiere.fitrecorder"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="3.0.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/org.idempiere.fitnesse.fixture/.classpath b/org.idempiere.fitnesse.fixture/.classpath
index ad32c83a78..098194ca4b 100644
--- a/org.idempiere.fitnesse.fixture/.classpath
+++ b/org.idempiere.fitnesse.fixture/.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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.idempiere.fitnesse.fixture/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.fitnesse.fixture/.settings/org.eclipse.jdt.core.prefs
index c537b63063..f42de363af 100644
--- a/org.idempiere.fitnesse.fixture/.settings/org.eclipse.jdt.core.prefs
+++ b/org.idempiere.fitnesse.fixture/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF b/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF
index 3099d40d7f..70511912ae 100644
--- a/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF
+++ b/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Fixture
+Bundle-Name: iDempiere Fitnesse Fixture
 Bundle-SymbolicName: org.idempiere.fitnesse.fixture
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.idempiere.fitnesse.fixture.Activator
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: fit,
  fit.decorator,
  fit.decorator.exceptions,
diff --git a/org.idempiere.fitnesse.server/.classpath b/org.idempiere.fitnesse.server/.classpath
index 0403b114dc..1dd1665bee 100644
--- a/org.idempiere.fitnesse.server/.classpath
+++ b/org.idempiere.fitnesse.server/.classpath
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="lib/selenium-server-standalone-2.35.0.jar" sourcepath="lib/selenium-server-2.35.0-srcs.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/phantomjsdriver-1.0.3.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/log4j-1.2.16.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/fitnesse.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/fitlibrary-2.0.jar" sourcepath="lib/fitlibrary-2.0-sources.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry exported="true" kind="lib" path="lib/fitlibrary-2.0.jar" sourcepath="lib/fitlibrary-2.0-sources.jar"/>
+	<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/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.fitnesse.server/.settings/org.eclipse.jdt.core.prefs
index c537b63063..f42de363af 100644
--- a/org.idempiere.fitnesse.server/.settings/org.eclipse.jdt.core.prefs
+++ b/org.idempiere.fitnesse.server/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF b/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF
index 5794140128..5ff2242a02 100644
--- a/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF
+++ b/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Fitnesse Server
+Bundle-Name: iDempiere Fitnesse Server
 Bundle-SymbolicName: org.idempiere.fitnesse.server
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.idempiere.fitnesse.server.Activator
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: javax.servlet;version="3.0.0",
  javax.servlet.http;version="3.0.0",
  org.adempiere.base,
diff --git a/org.idempiere.fitrecorder/.classpath b/org.idempiere.fitrecorder/.classpath
index ad32c83a78..098194ca4b 100644
--- a/org.idempiere.fitrecorder/.classpath
+++ b/org.idempiere.fitrecorder/.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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.idempiere.fitrecorder/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.fitrecorder/.settings/org.eclipse.jdt.core.prefs
index 2101193455..f42de363af 100644
--- a/org.idempiere.fitrecorder/.settings/org.eclipse.jdt.core.prefs
+++ b/org.idempiere.fitrecorder/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Tue Jan 08 16:47:28 COT 2013
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.idempiere.fitrecorder/META-INF/MANIFEST.MF b/org.idempiere.fitrecorder/META-INF/MANIFEST.MF
index 6cf1c5b608..cc9f48a6c8 100644
--- a/org.idempiere.fitrecorder/META-INF/MANIFEST.MF
+++ b/org.idempiere.fitrecorder/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Fitrecorder
+Bundle-Name: iDempiere Fitnesse Recorder
 Bundle-SymbolicName: org.idempiere.fitrecorder;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.adempiere.plugin.utils.AdempiereActivator
 Import-Package: org.adempiere.base,
  org.adempiere.plugin.utils,
  org.compiere.model,
  org.osgi.framework;version="1.3.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Service-Component: plugin.xml
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="3.0.0"
diff --git a/org.idempiere.hazelcast.service-feature/feature.xml b/org.idempiere.hazelcast.service-feature/feature.xml
index f859836372..d2aa0dff95 100644
--- a/org.idempiere.hazelcast.service-feature/feature.xml
+++ b/org.idempiere.hazelcast.service-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.idempiere.hazelcast.service"
       label="Hazelcast Service Feature"
-      version="2.0.0.qualifier">
+      version="3.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -20,7 +20,7 @@
          id="org.idempiere.hazelcast.service"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="3.0.0.qualifier"
          unpack="false"/>
 
    <plugin
@@ -35,14 +35,13 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         fragment="true"
          unpack="false"/>
 
    <plugin
          id="org.idempiere.hazelcast.service.config"
          download-size="0"
          install-size="0"
-         version="2.0.0"
+         version="3.0.0"
          fragment="true"/>
 
 </feature>
diff --git a/org.idempiere.hazelcast.service.config/.classpath b/org.idempiere.hazelcast.service.config/.classpath
index ad32c83a78..098194ca4b 100644
--- a/org.idempiere.hazelcast.service.config/.classpath
+++ b/org.idempiere.hazelcast.service.config/.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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
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
index c537b63063..f42de363af 100644
--- a/org.idempiere.hazelcast.service.config/.settings/org.eclipse.jdt.core.prefs
+++ b/org.idempiere.hazelcast.service.config/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF b/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF
index a590584389..b1bf97ca44 100644
--- a/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF
+++ b/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Hazelcast Service Configuration
+Bundle-Name: iDempiere Hazelcast Service Configuration
 Bundle-SymbolicName: org.idempiere.hazelcast.service.config
-Bundle-Version: 2.0.0
-Fragment-Host: org.idempiere.hazelcast.service;bundle-version="2.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Version: 3.0.0
+Fragment-Host: org.idempiere.hazelcast.service;bundle-version="3.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/org.idempiere.hazelcast.service/.classpath b/org.idempiere.hazelcast.service/.classpath
index 6fe134c47c..36616bd447 100644
--- a/org.idempiere.hazelcast.service/.classpath
+++ b/org.idempiere.hazelcast.service/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="hazelcast-cloud-2.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="hazelcast-2.4.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry exported="true" kind="lib" path="hazelcast-3.3.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="hazelcast-cloud-3.3.1.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.idempiere.hazelcast.service/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.hazelcast.service/.settings/org.eclipse.jdt.core.prefs
index c537b63063..f42de363af 100644
--- a/org.idempiere.hazelcast.service/.settings/org.eclipse.jdt.core.prefs
+++ b/org.idempiere.hazelcast.service/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
index b2a2fa22ae..1d6bea5aa8 100644
--- a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
+++ b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Hazelcast Service
 Bundle-SymbolicName: org.idempiere.hazelcast.service
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.idempiere.hazelcast.service.Activator
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.crypto,
@@ -26,7 +26,7 @@ Import-Package: javax.crypto,
  org.w3c.dom
 DynamicImport-Package: *
 Bundle-ClassPath: .,
- hazelcast-2.4.jar,
- hazelcast-cloud-2.4.jar
+ hazelcast-3.3.1.jar,
+ hazelcast-cloud-3.3.1.jar
 Service-Component: OSGI-INF/clusterservice.xml, OSGI-INF/cacheservice.xml, OSGI-INF/messageservice.xml
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/org.idempiere.hazelcast.service/build.properties b/org.idempiere.hazelcast.service/build.properties
index 8a0e604b69..bfe1e34e8b 100644
--- a/org.idempiere.hazelcast.service/build.properties
+++ b/org.idempiere.hazelcast.service/build.properties
@@ -1,10 +1,10 @@
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               hazelcast-2.4.jar,\
-               hazelcast-cloud-2.4.jar,\
                OSGI-INF/clusterservice.xml,\
                OSGI-INF/cacheservice.xml,\
                OSGI-INF/messageservice.xml,\
-               OSGI-INF/
+               OSGI-INF/,\
+               hazelcast-3.3.1.jar,\
+               hazelcast-cloud-3.3.1.jar
 source.. = src/
diff --git a/org.idempiere.hazelcast.service/src/org/idempiere/hazelcast/service/ClusterServiceImpl.java b/org.idempiere.hazelcast.service/src/org/idempiere/hazelcast/service/ClusterServiceImpl.java
index 42988b5b28..4b7f48b1be 100644
--- a/org.idempiere.hazelcast.service/src/org/idempiere/hazelcast/service/ClusterServiceImpl.java
+++ b/org.idempiere.hazelcast.service/src/org/idempiere/hazelcast/service/ClusterServiceImpl.java
@@ -14,7 +14,9 @@
 package org.idempiere.hazelcast.service;
 
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
@@ -22,10 +24,8 @@ import java.util.concurrent.Future;
 import org.idempiere.distributed.IClusterMember;
 import org.idempiere.distributed.IClusterService;
 
-import com.hazelcast.core.DistributedTask;
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.core.Member;
-import com.hazelcast.core.MultiTask;
 
 /**
  * @author hengsin
@@ -43,7 +43,7 @@ public class ClusterServiceImpl implements IClusterService {
 		if (instance != null) {
 			Set<Member> members = instance.getCluster().getMembers();
 			for(Member member : members) {
-				clusterMembers.add(new ClusterMember(member.getUuid(), member.getInetSocketAddress().getAddress(), member.getInetSocketAddress().getPort()));
+				clusterMembers.add(new ClusterMember(member.getUuid(), member.getSocketAddress().getAddress(), member.getSocketAddress().getPort()));
 			}
 		}
 		return clusterMembers;
@@ -57,7 +57,7 @@ public class ClusterServiceImpl implements IClusterService {
 		HazelcastInstance instance = Activator.getHazelcastInstance();
 		if (instance != null) {
 			Member member = instance.getCluster().getLocalMember();
-			return new ClusterMember(member.getUuid(), member.getInetSocketAddress().getAddress(), member.getInetSocketAddress().getPort());
+			return new ClusterMember(member.getUuid(), member.getSocketAddress().getAddress(), member.getSocketAddress().getPort());
 		} else {
 			return null;
 		}
@@ -73,9 +73,7 @@ public class ClusterServiceImpl implements IClusterService {
 			Set<Member> members = instance.getCluster().getMembers();
 			for(Member member : members) {
 				if (member.getUuid().equals(clusterMember.getId())) {
-					DistributedTask<V> distributedTask = new DistributedTask<V>(task, member);
-					Activator.getHazelcastInstance().getExecutorService().execute(distributedTask);
-					return distributedTask;
+					return Activator.getHazelcastInstance().getExecutorService("default").submitToMember(task, member);
 				}
 			}
 		}
@@ -85,9 +83,8 @@ public class ClusterServiceImpl implements IClusterService {
 	/* (non-Javadoc)
 	 * @see org.idempiere.distributed.IClusterService#execute(java.util.concurrent.Callable, java.util.Collection)
 	 */
-	@SuppressWarnings("unchecked")
 	@Override
-	public <V> Future<Collection<V>> execute(Callable<V> task,
+	public <V> Map<IClusterMember, Future<V>> execute(Callable<V> task,
 			Collection<IClusterMember> clusterMembers) {
 		Set<String> selectedIds = new HashSet<String>();
 		for(IClusterMember clusterMember : clusterMembers) {
@@ -103,9 +100,13 @@ public class ClusterServiceImpl implements IClusterService {
 				}
 			}
 			if (selectedMembers.size() > 0) {
-				MultiTask<V> multiTask = new MultiTask<V>(task, selectedMembers);
-				Activator.getHazelcastInstance().getExecutorService().execute(multiTask);
-				return multiTask;
+				Map<Member, Future<V>> maps = Activator.getHazelcastInstance().getExecutorService("default").submitToMembers(task, selectedMembers);
+				Map<IClusterMember, Future<V>> result = new HashMap<IClusterMember, Future<V>>();
+				for(Member m : maps.keySet()) {
+					ClusterMember cm = new ClusterMember(m.getUuid(), m.getSocketAddress().getAddress(), m.getSocketAddress().getPort());
+					result.put(cm, maps.get(m));
+				}
+				return result;
 			}
 		}
 		return null;
diff --git a/org.idempiere.hazelcast.service/src/org/idempiere/hazelcast/service/TopicImpl.java b/org.idempiere.hazelcast.service/src/org/idempiere/hazelcast/service/TopicImpl.java
index 8f77d59794..c0918d16f4 100644
--- a/org.idempiere.hazelcast.service/src/org/idempiere/hazelcast/service/TopicImpl.java
+++ b/org.idempiere.hazelcast.service/src/org/idempiere/hazelcast/service/TopicImpl.java
@@ -48,7 +48,7 @@ public class TopicImpl<E> implements ITopic<E> {
 	@Override
 	public void subscribe(final ITopicSubscriber<E> subscriber) {
 		TopicSubscriberAdapter<E> adapter = new TopicSubscriberAdapter<E>(subscriber);
-		topic.addMessageListener(adapter);
+		adapter.setListenerId(topic.addMessageListener(adapter));
 		adapters.add(adapter);
 	}
 
@@ -58,7 +58,7 @@ public class TopicImpl<E> implements ITopic<E> {
 		for(TopicSubscriberAdapter<E> adapter : adapters) {
 			if (adapter.subscriber == subscriber) {
 				found = adapter;
-				topic.removeMessageListener(adapter); 
+				topic.removeMessageListener(adapter.getListenerId()); 
 				break;
 			}
 		}
@@ -73,11 +73,20 @@ public class TopicImpl<E> implements ITopic<E> {
 
 	class TopicSubscriberAdapter<T> implements MessageListener<T> {
 		protected ITopicSubscriber<T> subscriber;
+		private String listenerId;
 
 		protected TopicSubscriberAdapter(ITopicSubscriber<T> subscriber) {
 			this.subscriber = subscriber;
 		}
 
+		public void setListenerId(String listenerId) {
+			this.listenerId = listenerId;
+		}
+		
+		public String getListenerId() {
+			return listenerId;
+		}
+
 		@Override
 		public void onMessage(Message<T> message) {
 			subscriber.onMessage(message.getMessageObject());
diff --git a/org.idempiere.ui.zk.selenium/.classpath b/org.idempiere.ui.zk.selenium/.classpath
index 121e527a93..ed37f7a1c6 100644
--- a/org.idempiere.ui.zk.selenium/.classpath
+++ b/org.idempiere.ui.zk.selenium/.classpath
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<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.6"/>
 	<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.7">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
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
index 8000cd6ca6..7341ab1683 100644
--- a/org.idempiere.ui.zk.selenium/.settings/org.eclipse.jdt.core.prefs
+++ b/org.idempiere.ui.zk.selenium/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+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 bcfc325033..bc0009a455 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.6"/>
+  <installed facet="java" version="1.7"/>
 </faceted-project>
diff --git a/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF b/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF
index 6530f90c65..8f665334b9 100644
--- a/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF
+++ b/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Zk Selenium
+Bundle-Name: iDempiere Selenium Integration
 Bundle-SymbolicName: org.idempiere.ui.zk.selenium
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.idempiere.ui.zk.selenium.fitnesse.Activator
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: fit,
  fit.decorator,
  fit.decorator.exceptions,
diff --git a/org.idempiere.webservices/.classpath b/org.idempiere.webservices/.classpath
index 60efa061eb..7b9d62b3ad 100644
--- a/org.idempiere.webservices/.classpath
+++ b/org.idempiere.webservices/.classpath
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/axis.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/commons-discovery-0.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/idempiere-xmlbeans-1.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-osgi-extender-1.2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-aop-3.0.7.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/aopalliance-1.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/xmlbeans-2.5.0.jar" sourcepath="E:/spring/xmlbeans-2.5.0-source.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/cxf-rt-frontend-jaxws-2.6.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/stax2-api-3.1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/xmlschema-core-2.0.3.jar" sourcepath="E:/spring/xmlschema-core-2.0.3-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/cxf-2.6.2.jar" sourcepath="WEB-INF/lib/src/apache-cxf-2.6.2-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/neethi-3.0.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/wsdl4j-1.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-expression-3.0.7.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-asm-3.0.7.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-core-3.0.7.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-beans-3.0.7.RELEASE.jar" sourcepath="WEB-INF/lib/src/spring-beans-3.0.7.RELEASE-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-context-3.0.7.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-web-3.0.7.RELEASE.jar" sourcepath="WEB-INF/lib/src/spring-web-3.0.7.RELEASE-sources.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="WEB-INF/src"/>
-	<classpathentry kind="lib" path="WEB-INF/lib/jsr311-api-1.1.jar"/>
-	<classpathentry kind="output" path="WEB-INF/classes/"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-osgi-extender-1.2.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-aop-3.0.7.RELEASE.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/stax2-api-3.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-web-3.0.7.RELEASE.jar" sourcepath="WEB-INF/lib/src/spring-web-3.0.7.RELEASE-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-context-3.0.7.RELEASE.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-beans-3.0.7.RELEASE.jar" sourcepath="WEB-INF/lib/src/spring-beans-3.0.7.RELEASE-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-core-3.0.7.RELEASE.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-asm-3.0.7.RELEASE.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-expression-3.0.7.RELEASE.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/wsdl4j-1.6.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/cxf-2.6.2.jar" sourcepath="WEB-INF/lib/src/apache-cxf-2.6.2-src.zip"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/neethi-3.0.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/xmlschema-core-2.0.3.jar" sourcepath="E:/spring/xmlschema-core-2.0.3-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/cxf-rt-frontend-jaxws-2.6.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/xmlbeans-2.5.0.jar" sourcepath="E:/spring/xmlbeans-2.5.0-source.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/aopalliance-1.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/idempiere-xmlbeans-1.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/axis.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/commons-discovery-0.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/jsr311-api-1.1.jar"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.idempiere.webservices/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.webservices/.settings/org.eclipse.jdt.core.prefs
index f287d53cf4..11f6e462df 100644
--- a/org.idempiere.webservices/.settings/org.eclipse.jdt.core.prefs
+++ b/org.idempiere.webservices/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF
index b2233a1996..0324633664 100644
--- a/org.idempiere.webservices/META-INF/MANIFEST.MF
+++ b/org.idempiere.webservices/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Webservices
+Bundle-Name: iDempiere Webservices
 Bundle-SymbolicName: org.idempiere.webservices;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.idempiere.webservices.Activator
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Service-Component: OSGI-INF/ws_modelfactory.xml
-Import-Package: javax.activation;version="1.1.1",
+Import-Package: javax.activation,
  javax.mail.internet;version="1.5",
  javax.servlet;version="3.0.0",
  javax.servlet.http;version="3.0.0",
@@ -59,8 +59,8 @@ Import-Package: javax.activation;version="1.1.1",
  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="2.0.0",
- org.adempiere.ui;bundle-version="2.0.0",
+Require-Bundle: org.adempiere.base;bundle-version="3.0.0",
+ org.adempiere.ui;bundle-version="3.0.0",
  org.apache.ecs;bundle-version="1.0.0"
 Bundle-ClassPath: .,
  WEB-INF/lib/spring-osgi-extender-1.2.1.jar,
diff --git a/org.idempiere.webservices/build.properties b/org.idempiere.webservices/build.properties
index 065af45c6f..cdc72867c1 100644
--- a/org.idempiere.webservices/build.properties
+++ b/org.idempiere.webservices/build.properties
@@ -1,5 +1,5 @@
 source.. = WEB-INF/src/
-output.. = WEB-INF/classes/
+output.. = bin/
 bin.includes = META-INF/,\
                .,\
                WEB-INF/classes/,\
diff --git a/org.slf4j.jdk14/.classpath b/org.slf4j.jdk14/.classpath
new file mode 100644
index 0000000000..3f22e67b98
--- /dev/null
+++ b/org.slf4j.jdk14/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry exported="true" kind="lib" path="slf4j-jdk14-1.7.2.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.slf4j.jdk14/.project b/org.slf4j.jdk14/.project
new file mode 100644
index 0000000000..1c4df45d9d
--- /dev/null
+++ b/org.slf4j.jdk14/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.slf4j.jdk14</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</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.slf4j.jdk14/.settings/org.eclipse.pde.core.prefs b/org.slf4j.jdk14/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000000..f29e940a00
--- /dev/null
+++ b/org.slf4j.jdk14/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/org.slf4j.jdk14/META-INF/MANIFEST.MF b/org.slf4j.jdk14/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..0f115b1331
--- /dev/null
+++ b/org.slf4j.jdk14/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+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"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+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
+Bundle-ClassPath: slf4j-jdk14-1.7.2.jar
diff --git a/org.slf4j.jdk14/bin/.hgignore b/org.slf4j.jdk14/bin/.hgignore
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/org.slf4j.jdk14/build.properties b/org.slf4j.jdk14/build.properties
new file mode 100644
index 0000000000..815488f78a
--- /dev/null
+++ b/org.slf4j.jdk14/build.properties
@@ -0,0 +1,2 @@
+bin.includes = META-INF/,\
+               slf4j-jdk14-1.7.2.jar
diff --git a/org.slf4j.jdk14/readme.txt b/org.slf4j.jdk14/readme.txt
new file mode 100644
index 0000000000..88b8741f09
--- /dev/null
+++ b/org.slf4j.jdk14/readme.txt
@@ -0,0 +1,2 @@
+Need to repackage the slf4j-jdk14 bundle from maven here since the slf4j api bundle from orbit is with the org.slf4j.api 
+symbolic name but the slf4j-jdk14 expect the slf4j.api symbolic name.
diff --git a/org.slf4j.jdk14/src/.hgignore b/org.slf4j.jdk14/src/.hgignore
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/org.w3c.dom.fragment/.classpath b/org.w3c.dom.fragment/.classpath
index 88f2aa7215..501c04ff3b 100644
--- a/org.w3c.dom.fragment/.classpath
+++ b/org.w3c.dom.fragment/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="batik-ext.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry exported="true" kind="lib" path="batik-ext.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.w3c.dom.fragment/.settings/org.eclipse.jdt.core.prefs b/org.w3c.dom.fragment/.settings/org.eclipse.jdt.core.prefs
index c537b63063..f42de363af 100644
--- a/org.w3c.dom.fragment/.settings/org.eclipse.jdt.core.prefs
+++ b/org.w3c.dom.fragment/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.w3c.dom.fragment/META-INF/MANIFEST.MF b/org.w3c.dom.fragment/META-INF/MANIFEST.MF
index 12dc5246d7..d3fb8ee3e9 100644
--- a/org.w3c.dom.fragment/META-INF/MANIFEST.MF
+++ b/org.w3c.dom.fragment/META-INF/MANIFEST.MF
@@ -1,11 +1,12 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Fragment
+Bundle-Name: W3c DOM Fragment
 Bundle-SymbolicName: org.w3c.dom.fragment
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Fragment-Host: system.bundle; extension:=framework
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ClassPath: batik-ext.jar,
  .
 Export-Package: org.w3c.dom,
  org.w3c.dom.events;version="3.0.0"
+
diff --git a/org.w3c.dom.fragment/bin/.hgignore b/org.w3c.dom.fragment/bin/.hgignore
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/org.zkoss.zk.library/.classpath b/org.zkoss.zk.library/.classpath
index 0b93562e30..2b349bcea0 100644
--- a/org.zkoss.zk.library/.classpath
+++ b/org.zkoss.zk.library/.classpath
@@ -1,35 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="lib/timelinez-2.3.1_50.jar" sourcepath="lib/src/timelinez-2.3.1_50-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/timeplotz-1.1_50.jar" sourcepath="lib/src/timeplotz-1.1_50-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/calendar-2.1.4.jar" sourcepath="lib/src/calendar-2.1.4-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/gmapsz-3.0.3.jar" sourcepath="lib/src/gmapsz-3.0.3-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/ckez-4.3.3.0.jar" sourcepath="lib/src/ckez-4.3.3.0-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jruby-complete-1.7.15.jar" sourcepath="lib/src/jruby-complete-1.7.15-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/zcommon-7.0.3.jar" sourcepath="lib/src/zcommon-7.0.3-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/zel-7.0.3.jar" sourcepath="lib/src/zel-7.0.3-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/zhtml-7.0.3.jar" sourcepath="lib/src/zhtml-7.0.3-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/zk-7.0.3.jar" sourcepath="lib/src/zk-7.0.3-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/zkbind-7.0.3.jar" sourcepath="lib/src/zkbind-7.0.3-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/zkplus-7.0.3.jar" sourcepath="lib/src/zkplus-7.0.3-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/zul-7.0.3.jar" sourcepath="lib/src/zul-7.0.3-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/zweb-7.0.3.jar" sourcepath="lib/src/zweb-7.0.3-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jython-2.5.3.jar" sourcepath="lib/src/jython-2.5.3-sources.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="lib/ckez.jar" sourcepath="lib/src/ckez-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/calendar.jar" sourcepath="lib/src/calendar-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/asm.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cglib.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-el.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-fileupload.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-io.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/Filters.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/gmapsz.jar" sourcepath="lib/src/gmapsz-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jruby.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/js.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/json_simple.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/junit.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jxl.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jython.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/mvel.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/ognl.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/timelinez.jar" sourcepath="lib/src/timelinez-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/timeplotz.jar" sourcepath="lib/src/timeplotz-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xercesImpl.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/zcommon.jar" sourcepath="lib/src/zcommon-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/zhtml.jar" sourcepath="lib/src/zhtml-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/zk.jar" sourcepath="lib/src/zk-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/zkplus.jar" sourcepath="lib/src/zkplus-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/zul.jar" sourcepath="lib/src/zul-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/zweb.jar" sourcepath="lib/src/zweb-sources.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="lib/zel.jar" sourcepath="lib/src/zel-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/zkbind.jar" sourcepath="lib/src/zkbind-sources.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.zkoss.zk.library/.settings/org.eclipse.jdt.core.prefs b/org.zkoss.zk.library/.settings/org.eclipse.jdt.core.prefs
index cdae894b95..f42de363af 100644
--- a/org.zkoss.zk.library/.settings/org.eclipse.jdt.core.prefs
+++ b/org.zkoss.zk.library/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Wed Feb 15 15:47:05 MYT 2012
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.zkoss.zk.library/META-INF/MANIFEST.MF b/org.zkoss.zk.library/META-INF/MANIFEST.MF
index a9bb0436b8..89caf6d652 100644
--- a/org.zkoss.zk.library/META-INF/MANIFEST.MF
+++ b/org.zkoss.zk.library/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Library
+Bundle-Name: iDempiere Zk Library
 Bundle-SymbolicName: org.zkoss.zk.library
-Bundle-Version: 6.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Version: 7.0.3.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: bsh,
  bsh.classpath,
  bsh.collection,
@@ -65,6 +65,52 @@ Import-Package: bsh,
  javax.servlet.jsp.resources;version="2.2.0",
  javax.servlet.jsp.tagext;version="2.2.0",
  javax.servlet.resources;version="3.0.0",
+ net.sf.cglib.asm;version="3.1.0",
+ net.sf.cglib.asm.signature;version="3.1.0",
+ net.sf.cglib.beans;version="3.1.0",
+ net.sf.cglib.core;version="3.1.0",
+ net.sf.cglib.proxy;version="3.1.0",
+ net.sf.cglib.reflect;version="3.1.0",
+ net.sf.cglib.transform;version="3.1.0",
+ net.sf.cglib.transform.impl;version="3.1.0",
+ net.sf.cglib.util;version="3.1.0",
+ org.apache.html.dom;version="2.9.0",
+ org.apache.wml;version="2.9.0",
+ org.apache.wml.dom;version="2.9.0",
+ org.apache.xerces.dom;version="2.9.0",
+ org.apache.xerces.dom.events;version="2.9.0",
+ org.apache.xerces.dom3.as;version="2.9.0",
+ org.apache.xerces.impl;version="2.9.0",
+ org.apache.xerces.impl.dtd;version="2.9.0",
+ org.apache.xerces.impl.dtd.models;version="2.9.0",
+ org.apache.xerces.impl.dv;version="2.9.0",
+ org.apache.xerces.impl.dv.dtd;version="2.9.0",
+ org.apache.xerces.impl.dv.util;version="2.9.0",
+ org.apache.xerces.impl.dv.xs;version="2.9.0",
+ org.apache.xerces.impl.io;version="2.9.0",
+ org.apache.xerces.impl.msg;version="2.9.0",
+ org.apache.xerces.impl.validation;version="2.9.0",
+ org.apache.xerces.impl.xpath;version="2.9.0",
+ org.apache.xerces.impl.xpath.regex;version="2.9.0",
+ org.apache.xerces.impl.xs;version="2.9.0",
+ org.apache.xerces.impl.xs.identity;version="2.9.0",
+ org.apache.xerces.impl.xs.models;version="2.9.0",
+ org.apache.xerces.impl.xs.opti;version="2.9.0",
+ org.apache.xerces.impl.xs.traversers;version="2.9.0",
+ org.apache.xerces.impl.xs.util;version="2.9.0",
+ org.apache.xerces.jaxp;version="2.9.0",
+ org.apache.xerces.jaxp.datatype;version="2.9.0",
+ org.apache.xerces.jaxp.validation;version="2.9.0",
+ org.apache.xerces.parsers;version="2.9.0",
+ org.apache.xerces.util;version="2.9.0",
+ org.apache.xerces.xinclude;version="2.9.0",
+ org.apache.xerces.xni;version="2.9.0",
+ org.apache.xerces.xni.grammars;version="2.9.0",
+ org.apache.xerces.xni.parser;version="2.9.0",
+ org.apache.xerces.xpointer;version="2.9.0",
+ org.apache.xerces.xs;version="2.9.0",
+ org.apache.xerces.xs.datatypes;version="2.9.0",
+ org.apache.xml.serialize;version="2.9.0",
  org.codehaus.groovy,
  org.codehaus.groovy.ant,
  org.codehaus.groovy.antlr,
@@ -97,84 +143,44 @@ Import-Package: bsh,
  org.codehaus.groovy.vmplugin,
  org.codehaus.groovy.vmplugin.v4,
  org.codehaus.groovy.vmplugin.v5,
+ org.objectweb.asm;version="5.0.1",
+ org.objectweb.asm.commons;version="5.0.1",
+ org.objectweb.asm.signature;version="5.0.1",
+ org.objectweb.asm.tree;version="5.0.1",
  org.osgi.framework;version="1.3.0",
  org.osgi.service.component;version="1.1.0",
  org.slf4j;version="1.6.1",
  org.slf4j.helpers;version="1.6.1",
  org.slf4j.spi;version="1.6.1"
 Bundle-ClassPath: .,
- lib/asm.jar,
- lib/cglib.jar,
  lib/commons-el.jar,
  lib/commons-fileupload.jar,
  lib/commons-io.jar,
  lib/Filters.jar,
- lib/gmapsz.jar,
- lib/jruby.jar,
  lib/js.jar,
  lib/json_simple.jar,
  lib/junit.jar,
  lib/jxl.jar,
- lib/jython.jar,
  lib/mvel.jar,
  lib/ognl.jar,
- lib/timelinez.jar,
- lib/timeplotz.jar,
- lib/xercesImpl.jar,
- lib/zcommon.jar,
- lib/zhtml.jar,
- lib/zk.jar,
- lib/zkplus.jar,
- lib/zul.jar,
- lib/zweb.jar,
- lib/zel.jar,
- lib/zkbind.jar,
- lib/calendar.jar,
- lib/ckez.jar
-Export-Package: Lib,
- Lib.collections,
- Lib.compiler,
- Lib.distutils,
- Lib.distutils.command,
- Lib.distutils.tests,
- Lib.email,
- Lib.email.mime,
- Lib.encodings,
- Lib.logging,
- Lib.modjy,
- Lib.pawt,
- Lib.wsgiref,
- Lib.xml,
- Lib.xml.dom,
- Lib.xml.etree,
- Lib.xml.parsers,
- Lib.xml.sax,
- Lib.xml.sax.drivers2,
- bigdecimal,
- builtin,
- builtin.core_ext,
- builtin.java,
- builtin.javasupport,
- builtin.javasupport.core_ext,
- builtin.javasupport.proxy,
- builtin.javasupport.utilities,
- builtin.yaml,
- cgi,
- cgi.session,
- com.jhlabs.composite,
- com.jhlabs.image,
+ lib/jython-2.5.3.jar,
+ lib/zcommon-7.0.3.jar,
+ lib/zel-7.0.3.jar,
+ lib/zhtml-7.0.3.jar,
+ lib/zk-7.0.3.jar,
+ lib/zkbind-7.0.3.jar,
+ lib/zkplus-7.0.3.jar,
+ lib/zul-7.0.3.jar,
+ lib/zweb-7.0.3.jar,
+ lib/jruby-complete-1.7.15.jar,
+ lib/ckez-4.3.3.0.jar,
+ lib/gmapsz-3.0.3.jar,
+ lib/calendar-2.1.4.jar,
+ lib/timelinez-2.3.1_50.jar,
+ lib/timeplotz-1.1_50.jar
+Export-Package: com.jhlabs.image,
  com.jhlabs.math,
  com.jhlabs.vecmath,
- com.kenai.constantine,
- com.kenai.constantine.platform,
- com.kenai.constantine.platform.darwin,
- com.kenai.constantine.platform.freebsd,
- com.kenai.constantine.platform.linux,
- com.kenai.constantine.platform.openbsd,
- com.sun.jna,
- com.sun.jna.darwin,
- com.sun.jna.ptr,
- com.sun.jna.win32,
  com.xhaus.modjy,
  com.ziclix.python.sql,
  com.ziclix.python.sql.connect,
@@ -187,24 +193,8 @@ Export-Package: Lib,
  com.ziclix.python.sql.util,
  common,
  common.log,
- date,
- doc,
- drb,
- io,
- irb,
- irb.cmd,
- irb.ext,
- irb.lc,
- irb.lc.ja,
  javatests,
  jline,
- jruby,
- jruby.objectweb.asm,
- jruby.objectweb.asm.commons,
- jruby.objectweb.asm.signature,
- jruby.objectweb.asm.tree,
- jruby.objectweb.asm.tree.analysis,
- jruby.objectweb.asm.util,
  junit.extensions,
  junit.framework,
  junit.runner,
@@ -224,18 +214,7 @@ Export-Package: Lib,
  metainfo.xel,
  metainfo.xml,
  metainfo.zk,
- net,
- net.sf.cglib.asm,
- net.sf.cglib.asm.signature,
- net.sf.cglib.beans,
- net.sf.cglib.core,
- net.sf.cglib.proxy,
- net.sf.cglib.reflect,
- net.sf.cglib.transform,
- net.sf.cglib.transform.impl,
- net.sf.cglib.util,
  ognl,
- optparse,
  org.apache.commons.el,
  org.apache.commons.el.parser,
  org.apache.commons.fileupload;version="1.2.2",
@@ -249,81 +228,6 @@ Export-Package: Lib,
  org.apache.commons.io.input;version="2.1.0",
  org.apache.commons.io.monitor,
  org.apache.commons.io.output;version="2.1.0",
- org.apache.html.dom,
- org.apache.wml,
- org.apache.wml.dom,
- org.apache.xerces.dom,
- org.apache.xerces.dom.events,
- org.apache.xerces.dom3.as,
- org.apache.xerces.impl,
- org.apache.xerces.impl.dtd,
- org.apache.xerces.impl.dtd.models,
- org.apache.xerces.impl.dv,
- org.apache.xerces.impl.dv.dtd,
- org.apache.xerces.impl.dv.util,
- org.apache.xerces.impl.dv.xs,
- org.apache.xerces.impl.io,
- org.apache.xerces.impl.msg,
- org.apache.xerces.impl.validation,
- org.apache.xerces.impl.xpath,
- org.apache.xerces.impl.xpath.regex,
- org.apache.xerces.impl.xs,
- org.apache.xerces.impl.xs.identity,
- org.apache.xerces.impl.xs.models,
- org.apache.xerces.impl.xs.opti,
- org.apache.xerces.impl.xs.traversers,
- org.apache.xerces.impl.xs.util,
- org.apache.xerces.jaxp,
- org.apache.xerces.jaxp.datatype,
- org.apache.xerces.jaxp.validation,
- org.apache.xerces.parsers,
- org.apache.xerces.util,
- org.apache.xerces.xinclude,
- org.apache.xerces.xni,
- org.apache.xerces.xni.grammars,
- org.apache.xerces.xni.parser,
- org.apache.xerces.xpointer,
- org.apache.xerces.xs,
- org.apache.xerces.xs.datatypes,
- org.apache.xml.serialize,
- org.dynalang.mop,
- org.dynalang.mop.beans,
- org.dynalang.mop.collections,
- org.dynalang.mop.impl,
- org.jcodings,
- org.jcodings.ascii,
- org.jcodings.constants,
- org.jcodings.exception,
- org.jcodings.specific,
- org.jcodings.unicode,
- org.jcodings.util,
- 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.joda.time.tz.data,
- org.joda.time.tz.data.Africa,
- org.joda.time.tz.data.America,
- org.joda.time.tz.data.America.Argentina,
- org.joda.time.tz.data.America.Indiana,
- org.joda.time.tz.data.America.Kentucky,
- org.joda.time.tz.data.America.North_Dakota,
- org.joda.time.tz.data.Antarctica,
- org.joda.time.tz.data.Asia,
- org.joda.time.tz.data.Atlantic,
- org.joda.time.tz.data.Australia,
- org.joda.time.tz.data.Etc,
- org.joda.time.tz.data.Europe,
- org.joda.time.tz.data.Indian,
- org.joda.time.tz.data.Pacific,
- org.joni,
- org.joni.ast,
- org.joni.bench,
- org.joni.constants,
- org.joni.exception,
  org.jruby,
  org.jruby.anno,
  org.jruby.ast,
@@ -331,28 +235,20 @@ Export-Package: Lib,
  org.jruby.ast.types,
  org.jruby.ast.util,
  org.jruby.ast.visitor,
- org.jruby.ast.visitor.rewriter,
- org.jruby.ast.visitor.rewriter.utils,
  org.jruby.common,
  org.jruby.compiler,
  org.jruby.compiler.impl,
  org.jruby.compiler.util,
- org.jruby.compiler.yarv,
- org.jruby.demo,
  org.jruby.environment,
  org.jruby.evaluator,
  org.jruby.exceptions,
  org.jruby.ext,
  org.jruby.ext.ffi,
  org.jruby.ext.ffi.io,
- org.jruby.ext.ffi.jna,
- org.jruby.ext.posix,
- org.jruby.ext.posix.util,
  org.jruby.ext.socket,
  org.jruby.gen,
  org.jruby.internal.runtime,
  org.jruby.internal.runtime.methods,
- org.jruby.java,
  org.jruby.java.addons,
  org.jruby.java.invokers,
  org.jruby.java.proxies,
@@ -361,7 +257,6 @@ Export-Package: Lib,
  org.jruby.javasupport.proxy,
  org.jruby.javasupport.util,
  org.jruby.lexer.yacc,
- org.jruby.libraries,
  org.jruby.management,
  org.jruby.parser,
  org.jruby.platform,
@@ -379,7 +274,6 @@ Export-Package: Lib,
  org.jruby.util.io,
  org.jruby.util.string,
  org.jruby.util.unsafe,
- org.jruby.yaml,
  org.json.simple,
  org.json.simple.parser,
  org.junit,
@@ -390,12 +284,6 @@ Export-Package: Lib,
  org.junit.runner.manipulation,
  org.junit.runner.notification,
  org.junit.runners,
- org.jvyamlb,
- org.jvyamlb.events,
- org.jvyamlb.exceptions,
- org.jvyamlb.nodes,
- org.jvyamlb.tokens,
- org.jvyamlb.util,
  org.mozilla.classfile,
  org.mozilla.javascript,
  org.mozilla.javascript.continuations,
@@ -411,7 +299,6 @@ Export-Package: Lib,
  org.mozilla.javascript.tools.idswitch,
  org.mozilla.javascript.tools.jsc,
  org.mozilla.javascript.tools.resources,
- org.mozilla.javascript.tools.shell,
  org.mozilla.javascript.xml,
  org.mozilla.javascript.xml.impl.xmlbeans,
  org.mozilla.javascript.xmlimpl,
@@ -434,8 +321,6 @@ Export-Package: Lib,
  org.mvel.tests.perftests,
  org.mvel.tests.special,
  org.mvel.util,
- org.objectweb.asm,
- org.objectweb.asm.signature,
  org.python,
  org.python.antlr,
  org.python.antlr.adapter,
@@ -658,48 +543,6 @@ Export-Package: Lib,
  org.zkoss.zul.impl,
  org.zkoss.zul.mesg,
  org.zkoss.zul.theme,
- racc,
- rdoc,
- rdoc.dot,
- rdoc.generators,
- rdoc.generators.template.chm,
- rdoc.generators.template.html,
- rdoc.generators.template.xml,
- rdoc.markup,
- rdoc.markup.sample,
- rdoc.markup.simple_markup,
- rdoc.markup.test,
- rdoc.parsers,
- rdoc.ri,
- rexml,
- rexml.dtd,
- rexml.encodings,
- rexml.formatters,
- rexml.light,
- rexml.parsers,
- rexml.validation,
- rinda,
- rss,
- rss.maker,
- runit,
- runit.cui,
- shell,
- soap,
- soap.encodingstyle,
- soap.header,
- soap.mapping,
- soap.rpc,
- test,
- test.unit,
- test.unit.collector,
- test.unit.ui,
- test.unit.ui.console,
- test.unit.ui.fox,
- test.unit.ui.gtk,
- test.unit.ui.gtk2,
- test.unit.ui.tk,
- test.unit.util,
- uri,
  web,
  web.aud,
  web.ckez.html,
@@ -874,17 +717,7 @@ Export-Package: Lib,
  web.zul.img.tree,
  web.zul.img.wnd,
  web.zul.less,
- web.zul.less.font,
- webrick,
- webrick.httpauth,
- webrick.httpservlet,
- wsdl,
- wsdl.soap,
- wsdl.xmlSchema,
- xmlrpc,
- xsd,
- xsd.codegen,
- xsd.xmlparser
+ web.zul.less.font
 Bundle-Activator: org.zkoss.zk.library.Activator
 Bundle-ActivationPolicy: lazy
 Eclipse-BuddyPolicy: registered
diff --git a/org.zkoss.zk.library/buckminster.cspex b/org.zkoss.zk.library/buckminster.cspex
new file mode 100644
index 0000000000..b254c4a602
--- /dev/null
+++ b/org.zkoss.zk.library/buckminster.cspex
@@ -0,0 +1,26 @@
+<cspecExtension xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"
+	xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
+	<actions>
+		<!-- public action with ant actor to do the actual copying -->
+		<cs:public name="fetch.dependency.jars" actor="ant">
+			<cs:actorProperties>
+				<cs:property key="buildFile" value="copyjars.xml" />
+				<cs:property key="targets" value="copy" />
+			</cs:actorProperties>
+		</cs:public>
+		<cs:public name="fetch.sources.jars" actor="ant">
+			<cs:actorProperties>
+				<cs:property key="buildFile" value="copysources.xml" />
+				<cs:property key="targets" value="copy" />
+			</cs:actorProperties>
+		</cs:public>		
+	</actions>
+	<groups>
+		<!-- buckminster.prebind the prebind group will be executed during materialization -->
+		<cs:private name="buckminster.postbind">
+			<cs:attribute name="fetch.dependency.jars" alias="action.requirements" />			
+			<cs:attribute name="fetch.sources.jars" alias="action.requirements" />
+		</cs:private>
+	</groups>
+</cspecExtension>
diff --git a/org.zkoss.zk.library/build.properties b/org.zkoss.zk.library/build.properties
index a7896fa7f4..a55cd96547 100644
--- a/org.zkoss.zk.library/build.properties
+++ b/org.zkoss.zk.library/build.properties
@@ -1,32 +1,29 @@
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               lib/asm.jar,\
-               lib/cglib.jar,\
                lib/commons-el.jar,\
                lib/commons-fileupload.jar,\
                lib/commons-io.jar,\
                lib/Filters.jar,\
-               lib/gmapsz.jar,\
-               lib/jruby.jar,\
                lib/js.jar,\
                lib/json_simple.jar,\
                lib/junit.jar,\
                lib/jxl.jar,\
-               lib/jython.jar,\
                lib/mvel.jar,\
                lib/ognl.jar,\
-               lib/timelinez.jar,\
-               lib/timeplotz.jar,\
-               lib/xercesImpl.jar,\
-               lib/zcommon.jar,\
-               lib/zhtml.jar,\
-               lib/zk.jar,\
-               lib/zkplus.jar,\
-               lib/zul.jar,\
-               lib/zweb.jar,\
-               lib/zel.jar,\
-               lib/zkbind.jar,\
-               lib/calendar.jar,\
-               lib/ckez.jar
+               lib/jython-2.5.3.jar,\
+               lib/zcommon-7.0.3.jar,\
+               lib/zel-7.0.3.jar,\
+               lib/zhtml-7.0.3.jar,\
+               lib/zk-7.0.3.jar,\
+               lib/zkbind-7.0.3.jar,\
+               lib/zkplus-7.0.3.jar,\
+               lib/zul-7.0.3.jar,\
+               lib/zweb-7.0.3.jar,\
+               lib/jruby-complete-1.7.15.jar,\
+               lib/ckez-4.3.3.0.jar,\
+               lib/gmapsz-3.0.3.jar,\
+               lib/calendar-2.1.4.jar,\
+               lib/timelinez-2.3.1_50.jar,\
+               lib/timeplotz-1.1_50.jar
 source.. = src/
diff --git a/org.zkoss.zk.library/copyjars.xml b/org.zkoss.zk.library/copyjars.xml
new file mode 100644
index 0000000000..013ce3c28f
--- /dev/null
+++ b/org.zkoss.zk.library/copyjars.xml
@@ -0,0 +1,19 @@
+<project name="zklibrary" basedir=".." default="copy">
+	<target name="copy">
+	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/zk/zk/7.0.3/zk-7.0.3.jar" dest="lib" usetimestamp="true"/>
+	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/zk/zul/7.0.3/zul-7.0.3.jar" dest="lib" usetimestamp="true"/>
+	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/zk/zhtml/7.0.3/zhtml-7.0.3.jar" dest="lib" usetimestamp="true"/>
+	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/zk/zkplus/7.0.3/zkplus-7.0.3.jar" dest="lib" usetimestamp="true"/>
+	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/zk/zkbind/7.0.3/zkbind-7.0.3.jar" dest="lib" usetimestamp="true"/>
+	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/common/zcommon/7.0.3/zcommon-7.0.3.jar" dest="lib" usetimestamp="true"/>
+	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/common/zel/7.0.3/zel-7.0.3.jar" dest="lib" usetimestamp="true"/>
+	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/common/zweb/7.0.3/zweb-7.0.3.jar" dest="lib" usetimestamp="true"/>
+	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/zkforge/ckez/4.3.3.0/ckez-4.3.3.0.jar" dest="lib" usetimestamp="true"/>
+	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/zkforge/gmapsz/3.0.3/gmapsz-3.0.3.jar" dest="lib" usetimestamp="true"/>
+	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/zkforge/timelinez/2.3.1_50/timelinez-2.3.1_50.jar" dest="lib" usetimestamp="true"/>
+	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/zkforge/timeplotz/1.1_50/timeplotz-1.1_50.jar" dest="lib" usetimestamp="true"/>
+	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/calendar/calendar/2.1.4/calendar-2.1.4.jar" dest="lib" usetimestamp="true"/>
+	      <get src="http://repo1.maven.org/maven2/org/python/jython/2.5.3/jython-2.5.3.jar" dest="lib" usetimestamp="true"/>
+	      <get src="http://repo1.maven.org/maven2/org/jruby/jruby-complete/1.7.15/jruby-complete-1.7.15.jar" dest="lib" usetimestamp="true"/>
+	</target>
+</project>
diff --git a/org.zkoss.zk.library/copysources.xml b/org.zkoss.zk.library/copysources.xml
new file mode 100644
index 0000000000..15d1a632a8
--- /dev/null
+++ b/org.zkoss.zk.library/copysources.xml
@@ -0,0 +1,19 @@
+<project name="zklibrary" basedir=".." default="copy">
+	<target name="copy">
+	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/zk/zk/7.0.3/zk-7.0.3-sources.jar" dest="lib/src" usetimestamp="true"/>
+	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/zk/zul/7.0.3/zul-7.0.3-sources.jar" dest="lib/src" usetimestamp="true"/>
+	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/zk/zhtml/7.0.3/zhtml-7.0.3-sources.jar" dest="lib/src" usetimestamp="true"/>
+	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/zk/zkplus/7.0.3/zkplus-7.0.3-sources.jar" dest="lib/src" usetimestamp="true"/>
+	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/zk/zkbind/7.0.3/zkbind-7.0.3-sources.jar" dest="lib/src" usetimestamp="true"/>
+	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/common/zcommon/7.0.3/zcommon-7.0.3-sources.jar" dest="lib/src" usetimestamp="true"/>
+	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/common/zel/7.0.3/zel-7.0.3-sources.jar" dest="lib/src" usetimestamp="true"/>
+	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/common/zweb/7.0.3/zweb-7.0.3-sources.jar" dest="lib/src" usetimestamp="true"/>
+	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/zkforge/ckez/4.3.3.0/ckez-4.3.3.0-sources.jar" dest="lib/src" usetimestamp="true"/>
+	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/zkforge/gmapsz/3.0.3/gmapsz-3.0.3-sources.jar" dest="lib/src" usetimestamp="true"/>
+	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/zkforge/timelinez/2.3.1_50/timelinez-2.3.1_50-sources.jar" dest="lib/src" usetimestamp="true"/>
+	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/zkforge/timeplotz/1.1_50/timeplotz-1.1_50-sources.jar" dest="lib/src" usetimestamp="true"/>
+	      <get src="http://mavensync.zkoss.org/maven2/org/zkoss/calendar/calendar/2.1.4/calendar-2.1.4-sources.jar" dest="lib/src" usetimestamp="true"/>
+	      <get src="http://repo1.maven.org/maven2/org/python/jython/2.5.3/jython-2.5.3-sources.jar" dest="lib/src" usetimestamp="true"/>
+	      <get src="http://repo1.maven.org/maven2/org/jruby/jruby-complete/1.7.15/jruby-complete-1.7.15-sources.jar" dest="lib/src" usetimestamp="true"/>
+	</target>
+</project>