IDEMPIERE-2245 Platform Upgrade for r3.

.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/bin/.*\.*$
-^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\.ui\.zk/dist$
-^org\.adempiere\.ui\.zk/WEB-INF/classes/.*\.class$
+^org\.adempiere\.ui\.zk/bin/.*\.*$
-^org\.adempiere\.ui\.zk/WEB-INF/classes/.*\.xml$
-^org\.adempiere\.ui\.zk/WEB-INF/classes/.*\.js$
-^org\.adempiere\.ui\.zk/WEB-INF/classes/.*\.wpd$
 
 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.*
+
 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
+

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'>
+  <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'>
       <properties size='3'>
-        <property name='artifact.size' value='26195'/>
+        <property name='artifact.size' value='27244'/>
-        <property name='download.size' value='26195'/>
+        <property name='download.size' value='27244'/>
-        <property name='download.md5' value='0d0b1172a4bb948dc62b8fca8310c179'/>
+        <property name='download.md5' value='12db1250ba0e1ee705771d8ce293ce52'/>
-      </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'/>
       </properties>
     </artifact>
   </artifacts>

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'>
+  <units size='1'>
-    <unit id='org.apache.felix.webconsole' version='4.0.0' singleton='false'>
+    <unit id='org.apache.felix.webconsole.plugins.packageadmin' version='1.0.0.1' singleton='false'>
-      <update id='org.apache.felix.webconsole' range='[0.0.0,4.0.0)' severity='0'/>
+      <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 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'/>
       <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='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'/>
+        <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;
+            Bundle-SymbolicName: org.apache.felix.webconsole.plugins.packageadmin&#xA;Bundle-Version: 1.0.0.1&#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;
           </instruction>
         </instructions>
       </touchpointData>

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"
+         id="javax.management.j2ee-api"
-         download-size="0"
-         install-size="0"
-         version="5.3.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.springsource.javax.management.j2ee"
          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"

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"/>

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_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.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_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"/>

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"/>

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.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.6
+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

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-Version: 3.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="3.0.0"
 Eclipse-RegisterBuddy: org.adempiere.base
 Service-Component: OSGI-INF/costadjustmentcalloutfactory.xml
 Bundle-ActivationPolicy: lazy

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"/>

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.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.6
+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

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-Version: 3.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="3.0.0"
 Export-Package: org.adempiere.process,
  org.compiere.process,
  org.idempiere.process

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>

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.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.6
+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

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>

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;version="3.0.0",
- javax.servlet.http;version="2.5.0",
+ javax.servlet.http;version="3.0.0",
- junit.framework;version="3.8.2",
+ junit.framework;version="3.8.2";resolution:=optional,
- junit.textui;version="3.8.2",
+ 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"

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/

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());
+			Map<IClusterMember, Future<Integer>> futureMap = service.execute(callable, service.getMembers());
-			if (future != null) {
+			if (futureMap != null) {
 				int total = 0;
 				try {
-					Collection<Integer> results = future.get();
+					Collection<Future<Integer>> results = futureMap.values();
-					for(Integer i : results) 
+					for(Future<Integer> future : results) {						
-					{
+						Integer i = future.get();
 						total += i.intValue();
 					}
 				} catch (InterruptedException e) {

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          */

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);
 }

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"
+         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"
          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"

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"/>

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.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.6
+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

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:

org.adempiere.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/ServletContextAdaptor.java

@@ -297,4 +297,9 @@ public class ServletContextAdaptor implements ServletContext {
 	public void setSessionTrackingModes(Set<SessionTrackingMode> arg0) {
 		servletContext.setSessionTrackingModes(arg0);
 	}
+
+	@Override
+	public String getVirtualServerName() {
+		return servletContext.getVirtualServerName();
+	}
 }

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"/>

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.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.6
+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

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:

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"/>

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.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.6
+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

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:

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.7"/>
-	<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="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 exported="true" kind="lib" path="spiffy-with_source-all-0.05.jar"/>
-	<classpathentry kind="output" path="build"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>

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.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.6
+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

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",

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

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 exported="true" kind="lib" path="ant-contrib-1.0b3.jar"/>
-	<classpathentry kind="output" path="build"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>

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.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.6
+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

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"
+Require-Bundle: org.adempiere.base;bundle-version="3.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: javax.mail;version="1.5",
  javax.mail.internet;version="1.5",
  org.apache.tools.ant,

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,\

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"
+	<target name="setupJetty"
-		description="setup tomcat">
+		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"
+		<copy file="../org.adempiere.server-feature/jettyhome/etc/jetty-template.xml"
-			tofile="../org.adempiere.tomcat.config/META-INF/tomcat/server.xml" filtering="yes" overwrite="yes"/>
+			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"
+	<target name="setup" depends="setupJetty"
-		description="Setup Adempiere">
+		description="Setup iDempiere">
 	</target>
 </project>

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"/>

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"/>

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[] versions = new String[]{"1.7.0", "1.8.0"};
-		final String VERSION2 = "1.7.0";	//	The real one
 		pass = false;
 		String thisJV = System.getProperty("java.version");
-		pass = thisJV.indexOf(VERSION) != -1;
+		for(String version : versions) 
-		if (!pass && thisJV.indexOf(VERSION2) != -1)
+		{
-			pass = true;
+			pass = thisJV.indexOf(version) != -1;
 			if (pass)
+			{
 				if (log.isLoggable(Level.INFO)) log.info("OK: Version=" + thisJV);
+				break;
+			}			
+		}
 		
-		error = "Wrong Java Version: Should be " + VERSION + " and above.";
+		error = "Wrong Java Version: Should be " + versions[0] + " and above.";
 		if (getPanel() != null)
 			signalOK(getPanel().okJavaHome, "ErrorJavaHome",
 					pass, true, error);

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((JFrame)SwingUtilities.getWindowAncestor(p_panel), p_properties.getProperty(ADEMPIERE_KEYSTOREWEBALIAS))
-			: ks.verify(null);
+			: 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;
+		String ccType = Database.DB_POSTGRESQL;
-		if (getDatabaseType().equals(DBTYPE_POSTGRESQL))
+		if (getDatabaseType().equals(DBTYPE_ORACLE))
-			ccType = Database.DB_POSTGRESQL;
+			ccType = Database.DB_ORACLE;
 		CConnection cc = null;
 		try
 		{
@@ -1124,7 +1128,7 @@ public class ConfigurationData
 	 *************************************************************************/
 
 	/** Oracle directory	*/
-	//private static String	DBTYPE_ORACLE = "Oracle";
+	private static String	DBTYPE_ORACLE = "Oracle";
 
 	/** PostgreSQL          */
 	private static String	DBTYPE_POSTGRESQL = "PostgreSQL";	

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() {

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";
+	public static String		KEYSTORE_NAME = "keystore";	
-	/** Certificate Alias				*/
-	public static String		CERTIFICATE_ALIAS = "idempiere";
-	
 
 	/**
 	 * 	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

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>

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"/>

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.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.6
+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

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-Version: 3.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="3.0.0"
 Bundle-ClassPath: jpayment.jar,
  payflow.jar,
  Verisign.jar,

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>

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"/>

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.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.6
+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

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-Version: 3.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: org.adempiere.pipo;bundle-version="2.0.0",
+Require-Bundle: org.adempiere.pipo;bundle-version="3.0.0",
- org.adempiere.base;bundle-version="2.0.0"
+ org.adempiere.base;bundle-version="3.0.0"

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"/>

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.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.6
+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

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-Version: 3.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+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

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"/>

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.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.6
+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

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-Version: 3.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: org.adempiere.base,
  org.adempiere.util,
  org.apache.xerces.dom;version="2.9.0",

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>

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.base" version="3.0.0.qualifier"/>
-      <import feature="org.adempiere.replication" version="2.0.0.qualifier"/>
+      <import feature="org.adempiere.replication" version="3.0.0.qualifier"/>
-      <import plugin="org.adempiere.server" version="2.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>

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"/>

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.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.6
+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

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-Version: 3.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: org.adempiere.server;bundle-version="2.0.0",
+Require-Bundle: org.adempiere.server;bundle-version="3.0.0",
- org.adempiere.replication;bundle-version="2.0.0",
+ org.adempiere.replication;bundle-version="3.0.0",
- org.adempiere.base;bundle-version="2.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

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"/>

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.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.6
+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

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-Version: 3.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
+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

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"

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"/>

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.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.6
+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

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
 

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"/>

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.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.6
+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

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: /
+

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 kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<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 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 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/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>

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.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.6
+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

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>

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,

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"/>

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.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.6
+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

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-Version: 3.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
+Require-Bundle: org.adempiere.base;bundle-version="3.0.0",
- org.adempiere.ui.swing;bundle-version="2.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,

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>

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.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.6
+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

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
+Bundle-Version: 3.0.0.qualifier
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="3.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+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
+
+

org.adempiere.report.jasper.webapp/build.properties

@@ -8,4 +8,4 @@ bin.excludes = src/**,\
 			   .project,\
 			   build.properties
 source.. = src/
-output.. = build/
+output.. = bin/

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);

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) {
+	}
 }

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>

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.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.6
+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

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>

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",
+Require-Bundle: org.adempiere.base;bundle-version="3.0.0",
- org.adempiere.report.jasper.library;bundle-version="2.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

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/

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="^org\.restlet(\..+)?" componentType="osgi.bundle" versionOverride="[2.1.0,2.2.0)"/>
-    <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.10.0,4.12.0)"/>
-    <cq:advisorNode namePattern="^org\.junit$" componentType="osgi.bundle" versionOverride="[4.8.2,4.9.0)"/>
+    <cq:advisorNode namePattern="^org\.hamcrest\.core$" componentType="osgi.bundle" versionOverride="[1.3.0,1.4.0)"/>
-    <cq:advisorNode namePattern="^com\.springsource\.net\.sf\.cglib$" componentType="osgi.bundle" versionOverride="[2.2.0,2.2.1)"/>
+    <cq:advisorNode namePattern="^org\.apache\.poi$" componentType="osgi.bundle" versionOverride="[3.9.0,4.0.0)"/>
-    <cq:advisorNode namePattern="^com\.springsource\.org\.apache\.activemq$" componentType="osgi.bundle" versionOverride="[5.3.0,5.4.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="^org\.apache\.commons\.codec$" componentType="osgi.bundle" versionOverride="[1.6.0.v201305230611,1.6.0.v201305230611]"/>
-    <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\.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="^javax\.el$" componentType="osgi.bundle" versionOverride="[3.0.0,3.1.0)"/>
-    <cq:advisorNode namePattern="^org\.hamcrest\.core$" componentType="osgi.bundle" versionOverride="[1.1.0,1.2.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>

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="bundles.maven"/>
-  <rm:locator pattern="^org\.eclipse\.jdt\.core\.compiler\.batch$" searchPathRef="gemini" failOnError="false"/>
+  <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\.apache\.commons(\..+)?" searchPathRef="orbit"/>
-  <rm:locator pattern="^org\.eclipse\.gemini(\..+)?" searchPathRef="gemini" failOnError="false"/>
+  <rm:locator pattern="^org\.restlet(\..+)?" searchPathRef="restlet.maven"/>
-  <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="orbit" failOnError="false"/>
-  <rm:locator searchPathRef="workspace.bundle.project" failOnError="false"/>
+  <rm:locator searchPathRef="workspace.project" failOnError="false"/>
-  <rm:locator searchPathRef="workspace.feature.project"/>
+  <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:uri format="http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/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: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:searchPath name="bundles.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://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="apache-jsp" groupId="org.mortbay.jasper" name="org.mortbay.jasper.apache-jsp"/>
-        <maven:entry artifactId="com.springsource.org.apache.xmlcommons" groupId="org.apache.xmlcommons" name="com.springsource.org.apache.xmlcommons"/>
+        <maven:entry artifactId="apache-el" groupId="org.mortbay.jasper" name="org.mortbay.jasper.apache-el"/>
-        <maven:entry artifactId="com.springsource.javax.jms" groupId="javax.jms" name="com.springsource.javax.jms"/>
+        <maven:entry artifactId="apache-jsp" groupId="org.eclipse.jetty" name="org.eclipse.jetty.apache-jsp"/>
-        <maven:entry artifactId="com.springsource.org.apache.activemq" groupId="org.apache.activemq" name="com.springsource.org.apache.activemq"/>
+        <maven:entry artifactId="jetty-osgi-servlet-api" groupId="org.eclipse.jetty.toolchain" name="org.eclipse.jetty.osgi-servlet-api"/>
-        <maven:entry artifactId="com.springsource.org.apache.kahadb" groupId="org.apache.activemq" name="com.springsource.org.apache.kahadb"/>
+        <maven:entry artifactId="org.eclipse.jdt.core" groupId="org.eclipse.jetty.orbit" name="org.eclipse.jdt.core.compiler.batch"/>
-        <maven:entry artifactId="com.springsource.javax.management.j2ee" groupId="org.apache.geronimo.specs" name="com.springsource.javax.management.j2ee"/>
+        <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>

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">

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>

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

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"
+		<copy file="jettyhome/etc/jetty-template.xml"
-			tofile="plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/server.xml" filtering="yes" overwrite="yes"/>
+			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>
 

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
+@REM setup jetty
-@"%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
+@"%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