From bb6607d553558bf5fa363d501d9f1398444a69b3 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Thu, 21 Nov 2013 14:32:17 +0800 Subject: [PATCH 1/4] IDEMPIERE-1561 Update product version to 2.0.0. --- org.adempiere.base-feature/feature.xml | 25 +-- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 4 +- org.adempiere.base/META-INF/MANIFEST.MF | 2 +- .../feature.xml | 5 +- org.adempiere.extend/META-INF/MANIFEST.MF | 4 +- org.adempiere.install/META-INF/MANIFEST.MF | 4 +- .../feature.xml | 6 +- .../META-INF/MANIFEST.MF | 4 +- org.adempiere.pipo-feature/feature.xml | 10 +- .../META-INF/MANIFEST.MF | 6 +- org.adempiere.pipo/META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 2 +- org.adempiere.replication-feature/feature.xml | 6 +- .../feature.xml | 10 +- .../META-INF/MANIFEST.MF | 8 +- .../META-INF/MANIFEST.MF | 4 +- .../feature.xml | 8 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 10 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 6 +- org.adempiere.sdk-feature/feature.xml | 2 +- org.adempiere.server-feature/feature.xml | 22 +-- org.adempiere.server-feature/server.product | 142 +++++++++--------- org.adempiere.server/META-INF/MANIFEST.MF | 8 +- .../feature.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- org.adempiere.ui.swing-feature/feature.xml | 8 +- .../swingclient.product | 10 +- org.adempiere.ui.swing/META-INF/MANIFEST.MF | 10 +- org.adempiere.ui.zk-feature/feature.xml | 8 +- org.adempiere.ui.zk/META-INF/MANIFEST.MF | 10 +- org.adempiere.ui/META-INF/MANIFEST.MF | 4 +- org.adempiere.webstore-feature/feature.xml | 12 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 6 +- .../META-INF/MANIFEST.MF | 6 +- org.compiere.db.provider-feature/feature.xml | 8 +- .../feature.xml | 11 +- .../feature.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.idempiere.fitnesse-feature/feature.xml | 10 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 +- org.idempiere.fitrecorder/bin/MANIFEST.MF | 13 -- .../feature.xml | 6 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 8 +- 53 files changed, 231 insertions(+), 245 deletions(-) delete mode 100644 org.idempiere.fitrecorder/bin/MANIFEST.MF diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml index 4263bec49d..b5ec28b8ea 100644 --- a/org.adempiere.base-feature/feature.xml +++ b/org.adempiere.base-feature/feature.xml @@ -2,7 +2,7 @@ + version="2.0.0.qualifier"> [Enter Feature Description here.] @@ -18,50 +18,50 @@ + version="2.0.0.qualifier"/> + version="2.0.0.qualifier"/> + version="2.0.0.qualifier"/> + version="2.0.0.qualifier"/> + version="2.0.0.qualifier"/> @@ -69,7 +69,7 @@ id="org.adempiere.ui" download-size="0" install-size="0" - version="1.0.0.qualifier" + version="2.0.0.qualifier" unpack="false"/> + + version="2.0.0.qualifier"/> @@ -134,5 +134,6 @@ download-size="0" install-size="0" version="0.0.0" - unpack="false"/> + unpack="false"/> + diff --git a/org.adempiere.extend/META-INF/MANIFEST.MF b/org.adempiere.extend/META-INF/MANIFEST.MF index 581b042b01..c6af8b471c 100644 --- a/org.adempiere.extend/META-INF/MANIFEST.MF +++ b/org.adempiere.extend/META-INF/MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.adempiere.extend Bundle-SymbolicName: org.adempiere.extend;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-ClassPath: extend.jar, spiffy-with_source-all-0.05.jar Eclipse-RegisterBuddy: org.adempiere.tools Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: compiere.model, test -Fragment-Host: org.adempiere.base;bundle-version="0.0.0" +Fragment-Host: org.adempiere.base;bundle-version="2.0.0" Eclipse-PatchFragment: true Import-Package: junit.framework;version="3.8.2", org.junit;version="4.8.2", diff --git a/org.adempiere.install/META-INF/MANIFEST.MF b/org.adempiere.install/META-INF/MANIFEST.MF index 0725c4f438..e903563c72 100644 --- a/org.adempiere.install/META-INF/MANIFEST.MF +++ b/org.adempiere.install/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: install Bundle-SymbolicName: org.adempiere.install;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.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="1.0.0" +Require-Bundle: org.adempiere.base;bundle-version="2.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: javax.mail;version="1.4.5", javax.mail.internet;version="1.4.5", diff --git a/org.adempiere.payment.processor-feature/feature.xml b/org.adempiere.payment.processor-feature/feature.xml index 10a4df49aa..183b6d2450 100644 --- a/org.adempiere.payment.processor-feature/feature.xml +++ b/org.adempiere.payment.processor-feature/feature.xml @@ -2,7 +2,7 @@ + version="2.0.0.qualifier"> [Enter Feature Description here.] @@ -17,14 +17,14 @@ - + diff --git a/org.adempiere.payment.processor/META-INF/MANIFEST.MF b/org.adempiere.payment.processor/META-INF/MANIFEST.MF index 97ed415d56..7fcfd809d1 100644 --- a/org.adempiere.payment.processor/META-INF/MANIFEST.MF +++ b/org.adempiere.payment.processor/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Processor Bundle-SymbolicName: org.adempiere.payment.processor;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.adempiere.base;bundle-version="1.0.0" +Require-Bundle: org.adempiere.base;bundle-version="2.0.0" Bundle-ClassPath: jpayment.jar, payflow.jar, Verisign.jar, diff --git a/org.adempiere.pipo-feature/feature.xml b/org.adempiere.pipo-feature/feature.xml index 2bb3c21d6c..c4ef91aacd 100644 --- a/org.adempiere.pipo-feature/feature.xml +++ b/org.adempiere.pipo-feature/feature.xml @@ -2,7 +2,7 @@ + version="2.0.0.qualifier"> [Enter Feature Description here.] @@ -17,28 +17,28 @@ - + diff --git a/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF index 520af55f6b..bb377b05c1 100644 --- a/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF +++ b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: PipoHandlers Bundle-SymbolicName: org.adempiere.pipo.handlers;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.adempiere.pipo;bundle-version="1.0.0", - org.adempiere.base;bundle-version="1.0.0" +Require-Bundle: org.adempiere.pipo;bundle-version="2.0.0", + org.adempiere.base;bundle-version="2.0.0" diff --git a/org.adempiere.pipo/META-INF/MANIFEST.MF b/org.adempiere.pipo/META-INF/MANIFEST.MF index b8f40bec8e..12f62f2572 100644 --- a/org.adempiere.pipo/META-INF/MANIFEST.MF +++ b/org.adempiere.pipo/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: PiPo Bundle-SymbolicName: org.adempiere.pipo;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.apache.commons.codec;version="1.3.0", org.apache.commons.codec.binary;version="1.3.0", @@ -13,5 +13,5 @@ Import-Package: org.apache.commons.codec;version="1.3.0", Export-Package: org.adempiere.pipo.srv, org.adempiere.pipo2, org.adempiere.pipo2.exception -Require-Bundle: org.adempiere.base;bundle-version="1.0.0" +Require-Bundle: org.adempiere.base;bundle-version="2.0.0" Service-Component: OSGI-INF/dictionaryservice.xml diff --git a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF index 2e65d7dd48..402749e2af 100644 --- a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF +++ b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Plugin Utils Bundle-SymbolicName: org.adempiere.plugin.utils -Bundle-Version: 0.0.0.1 +Bundle-Version: 2.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.adempiere.base, org.adempiere.util, diff --git a/org.adempiere.replication-feature/feature.xml b/org.adempiere.replication-feature/feature.xml index 7a3860a117..bf857bb9f6 100644 --- a/org.adempiere.replication-feature/feature.xml +++ b/org.adempiere.replication-feature/feature.xml @@ -2,7 +2,7 @@ + version="2.0.0.qualifier"> [Enter Feature Description here.] @@ -17,14 +17,14 @@ - + diff --git a/org.adempiere.replication.server-feature/feature.xml b/org.adempiere.replication.server-feature/feature.xml index 39b5d11d8e..07f41e7312 100644 --- a/org.adempiere.replication.server-feature/feature.xml +++ b/org.adempiere.replication.server-feature/feature.xml @@ -2,7 +2,7 @@ + version="2.0.0.qualifier"> [Enter Feature Description here.] @@ -17,16 +17,16 @@ - - - + + + diff --git a/org.adempiere.replication.server/META-INF/MANIFEST.MF b/org.adempiere.replication.server/META-INF/MANIFEST.MF index f5c56cb0d3..57fe6d1942 100644 --- a/org.adempiere.replication.server/META-INF/MANIFEST.MF +++ b/org.adempiere.replication.server/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Server Bundle-SymbolicName: org.adempiere.replication.server;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.adempiere.server;bundle-version="1.0.0", - org.adempiere.replication;bundle-version="1.0.0", - org.adempiere.base;bundle-version="1.0.0" +Require-Bundle: org.adempiere.server;bundle-version="2.0.0", + org.adempiere.replication;bundle-version="2.0.0", + org.adempiere.base;bundle-version="2.0.0" Import-Package: javax.jms;version="1.1.0", org.apache.activemq Service-Component: OSGI-INF/serverfactory.xml diff --git a/org.adempiere.replication/META-INF/MANIFEST.MF b/org.adempiere.replication/META-INF/MANIFEST.MF index 3352fc232b..d9fd41635e 100644 --- a/org.adempiere.replication/META-INF/MANIFEST.MF +++ b/org.adempiere.replication/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Replication Bundle-SymbolicName: org.adempiere.replication;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.adempiere.base;bundle-version="1.0.0" +Require-Bundle: org.adempiere.base;bundle-version="2.0.0" Export-Package: org.adempiere.process.rpl, org.adempiere.process.rpl.exp, org.adempiere.process.rpl.imp diff --git a/org.adempiere.report.jasper-feature/feature.xml b/org.adempiere.report.jasper-feature/feature.xml index e8a63c3176..dddd07f627 100644 --- a/org.adempiere.report.jasper-feature/feature.xml +++ b/org.adempiere.report.jasper-feature/feature.xml @@ -2,7 +2,7 @@ + version="2.0.0.qualifier"> [Enter Feature Description here.] @@ -17,20 +17,20 @@ - + + version="2.0.0.qualifier"/> + version="2.0.0.qualifier"/> diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml index c56f21780b..ebaafce5b0 100644 --- a/org.adempiere.server-feature/feature.xml +++ b/org.adempiere.server-feature/feature.xml @@ -2,7 +2,7 @@ + version="2.0.0.qualifier"> [Enter Feature Description here.] @@ -18,16 +18,16 @@ + version="2.0.0.qualifier"/> + version="2.0.0.qualifier"/> - + + version="2.0.0.qualifier"/> - - - - - - - - - - -console 12612 --launcher.XXMaxPermSize 192m - -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dosgi.compatibility.bootdelegation=true - -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + -console 12612 --launcher.XXMaxPermSize 192m + -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dosgi.compatibility.bootdelegation=true + -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.adempiere.server/META-INF/MANIFEST.MF b/org.adempiere.server/META-INF/MANIFEST.MF index e2c9fac0f2..642d429654 100644 --- a/org.adempiere.server/META-INF/MANIFEST.MF +++ b/org.adempiere.server/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.adempiere.server Bundle-SymbolicName: org.adempiere.server;singleton:=true -Bundle-Version: 1.0.0.qualifier -Require-Bundle: org.adempiere.base;bundle-version="1.0.0", +Bundle-Version: 2.0.0.qualifier +Require-Bundle: org.adempiere.base;bundle-version="2.0.0", org.eclipse.equinox.app;bundle-version="1.3.0", - org.adempiere.report.jasper;bundle-version="1.0.0", - org.adempiere.report.jasper.library;bundle-version="1.0.0" + org.adempiere.report.jasper;bundle-version="2.0.0", + org.adempiere.report.jasper.library;bundle-version="2.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Web-ContextPath: / Bundle-ClassPath: WEB-INF/lib/jardiff.jar, diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml index 857b81d0e4..841a153869 100644 --- a/org.adempiere.target.platform-feature/feature.xml +++ b/org.adempiere.target.platform-feature/feature.xml @@ -2,7 +2,7 @@ @@ -34,7 +34,7 @@ + version="2.0.0.qualifier"/> + version="2.0.0.qualifier"> [Enter Feature Description here.] @@ -17,21 +17,21 @@ - + + version="2.0.0.qualifier"/> - + @@ -26,10 +26,10 @@ - - - - + + + + diff --git a/org.adempiere.ui.swing/META-INF/MANIFEST.MF b/org.adempiere.ui.swing/META-INF/MANIFEST.MF index 144a81a347..8564bbb6a4 100644 --- a/org.adempiere.ui.swing/META-INF/MANIFEST.MF +++ b/org.adempiere.ui.swing/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Swing Client Bundle-SymbolicName: org.adempiere.ui.swing;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-ClassPath: client.jar, swingx-1.6.jar, looks-2.0.4.jar, @@ -67,10 +67,10 @@ Export-Package: com.jgoodies.looks, org.jdesktop.swingx.tree, org.jdesktop.swingx.treetable, org.jdesktop.swingx.util -Require-Bundle: org.adempiere.base;bundle-version="1.0.0", - org.adempiere.ui;bundle-version="1.0.0", - org.adempiere.report.jasper;bundle-version="1.0.0", - org.adempiere.report.jasper.library;bundle-version="1.0.0", +Require-Bundle: org.adempiere.base;bundle-version="2.0.0", + org.adempiere.ui;bundle-version="2.0.0", + org.adempiere.report.jasper;bundle-version="2.0.0", + org.adempiere.report.jasper.library;bundle-version="2.0.0", org.restlet;bundle-version="2.1.0", org.restlet.ext.net;bundle-version="2.1.0", org.restlet.ext.servlet;bundle-version="2.1.0", diff --git a/org.adempiere.ui.zk-feature/feature.xml b/org.adempiere.ui.zk-feature/feature.xml index 2ac09a8995..a4a0b0ed76 100644 --- a/org.adempiere.ui.zk-feature/feature.xml +++ b/org.adempiere.ui.zk-feature/feature.xml @@ -2,7 +2,7 @@ + version="2.0.0.qualifier"> [Enter Feature Description here.] @@ -17,20 +17,20 @@ - + + version="2.0.0.qualifier"/> diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF index c0fa3f75e2..ce53c62b71 100644 --- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF +++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Zk Web Client Bundle-SymbolicName: org.adempiere.ui.zk;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: javax.activation;version="1.1.1", javax.servlet, @@ -76,10 +76,10 @@ Export-Package: fi.jawsy.jawwa.zk.atmosphere, web.js.jawwa.atmosphere, web.js.zkforge, web.js.zkforge.mold -Require-Bundle: org.adempiere.report.jasper;bundle-version="1.0.0", - org.adempiere.base;bundle-version="1.0.0", - org.adempiere.report.jasper.library;bundle-version="1.0.0", - org.adempiere.ui;bundle-version="1.0.0", +Require-Bundle: org.adempiere.report.jasper;bundle-version="2.0.0", + org.adempiere.base;bundle-version="2.0.0", + org.adempiere.report.jasper.library;bundle-version="2.0.0", + org.adempiere.ui;bundle-version="2.0.0", org.zkoss.zk.library;bundle-version="6.0.0" Bundle-Activator: org.adempiere.webui.WebUIActivator Eclipse-ExtensibleAPI: true diff --git a/org.adempiere.ui/META-INF/MANIFEST.MF b/org.adempiere.ui/META-INF/MANIFEST.MF index 14da27cc86..d99ef4f659 100644 --- a/org.adempiere.ui/META-INF/MANIFEST.MF +++ b/org.adempiere.ui/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: UI base Bundle-SymbolicName: org.adempiere.ui;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.adempiere.base;bundle-version="1.0.0" +Require-Bundle: org.adempiere.base;bundle-version="2.0.0" Export-Package: org.compiere.apps, org.compiere.apps.form, org.compiere.apps.wf, diff --git a/org.adempiere.webstore-feature/feature.xml b/org.adempiere.webstore-feature/feature.xml index 00560cc368..423e78b050 100644 --- a/org.adempiere.webstore-feature/feature.xml +++ b/org.adempiere.webstore-feature/feature.xml @@ -2,7 +2,7 @@ + version="2.0.0.qualifier"> [Enter Feature Description here.] @@ -17,8 +17,8 @@ - - + + @@ -27,14 +27,14 @@ id="org.adempiere.webstore" download-size="0" install-size="0" - version="0.0.0" + version="2.0.0.qualifier" unpack="false"/> @@ -42,7 +42,7 @@ id="org.adempiere.webstore.servlet" download-size="0" install-size="0" - version="0.0.0" + version="2.0.0.qualifier" unpack="false"/> diff --git a/org.adempiere.webstore.resource/META-INF/MANIFEST.MF b/org.adempiere.webstore.resource/META-INF/MANIFEST.MF index fc1899c54d..6ca476b538 100644 --- a/org.adempiere.webstore.resource/META-INF/MANIFEST.MF +++ b/org.adempiere.webstore.resource/META-INF/MANIFEST.MF @@ -2,8 +2,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Webstore Resource Bundle-SymbolicName: org.adempiere.webstore.resource -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Vendor: Adempiere.org -Fragment-Host: org.adempiere.webstore;bundle-version="1.0.0" +Fragment-Host: org.adempiere.webstore;bundle-version="2.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.compiere.wstore diff --git a/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF b/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF index d1563eb784..c2cf4d9431 100644 --- a/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF +++ b/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Servlet Bundle-SymbolicName: org.adempiere.webstore.servlet;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Vendor: Adempiere.org Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.compiere.wstore -Require-Bundle: org.adempiere.base;bundle-version="1.0.0", +Require-Bundle: org.adempiere.base;bundle-version="2.0.0", org.eclipse.equinox.http.registry Import-Package: javax.servlet, javax.servlet.http, diff --git a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF index 74c9f0972b..232e613ffd 100644 --- a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF +++ b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: OracleProvider Bundle-SymbolicName: org.compiere.db.oracle.provider;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.adempiere.base;bundle-version="1.0.0", - org.adempiere.install;bundle-version="1.0.0" +Require-Bundle: org.adempiere.base;bundle-version="2.0.0", + org.adempiere.install;bundle-version="2.0.0" Bundle-ClassPath: ., ojdbc6.jar, c3p0-0.9.2.jar, diff --git a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF index 9280909704..69d2a7518f 100644 --- a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF +++ b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: PostgresqlProvider Bundle-SymbolicName: org.compiere.db.postgresql.provider;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ClassPath: ., postgresql-9.2-1004.jdbc4.jar, c3p0-0.9.2.jar, mchange-commons-java-0.2.3.3.jar -Require-Bundle: org.adempiere.base;bundle-version="1.0.0", - org.adempiere.install;bundle-version="1.0.0" +Require-Bundle: org.adempiere.base;bundle-version="2.0.0", + org.adempiere.install;bundle-version="2.0.0" Import-Package: junit.framework;version="3.8.2", org.junit;version="4.8.1", org.osgi.framework diff --git a/org.compiere.db.provider-feature/feature.xml b/org.compiere.db.provider-feature/feature.xml index 8f97935cb6..ed5bc9b406 100644 --- a/org.compiere.db.provider-feature/feature.xml +++ b/org.compiere.db.provider-feature/feature.xml @@ -2,7 +2,7 @@ + version="2.0.0.qualifier"> [Enter Feature Description here.] @@ -17,21 +17,21 @@ - + diff --git a/org.idempiere.eclipse.platform-feature/feature.xml b/org.idempiere.eclipse.platform-feature/feature.xml index d35ed2ebae..3f2e907d01 100644 --- a/org.idempiere.eclipse.platform-feature/feature.xml +++ b/org.idempiere.eclipse.platform-feature/feature.xml @@ -2,7 +2,7 @@ @@ -77,14 +77,14 @@ install-size="0" version="0.0.0" unpack="false"/> - - - + + unpack="false"/> + diff --git a/org.idempiere.felix.webconsole-feature/feature.xml b/org.idempiere.felix.webconsole-feature/feature.xml index 2f1bc80dbd..1da425cb74 100644 --- a/org.idempiere.felix.webconsole-feature/feature.xml +++ b/org.idempiere.felix.webconsole-feature/feature.xml @@ -2,7 +2,7 @@ + version="2.0.0.qualifier"> [Enter Feature Description here.] diff --git a/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF b/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF index 68a87c4cdc..7fec536b0f 100644 --- a/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF +++ b/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Web Console Bundle-SymbolicName: org.idempiere.felix.webconsole -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Activator: org.idempiere.felix.webconsole.Activator Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/org.idempiere.fitnesse-feature/feature.xml b/org.idempiere.fitnesse-feature/feature.xml index 0ae2311729..5acf324e31 100644 --- a/org.idempiere.fitnesse-feature/feature.xml +++ b/org.idempiere.fitnesse-feature/feature.xml @@ -2,7 +2,7 @@ + version="2.0.0.qualifier"> [Enter Feature Description here.] @@ -20,28 +20,28 @@ id="org.idempiere.fitnesse.fixture" download-size="0" install-size="0" - version="0.0.0" + version="2.0.0.qualifier" unpack="false"/> diff --git a/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF b/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF index 438a592de7..3099d40d7f 100644 --- a/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF +++ b/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Fixture Bundle-SymbolicName: org.idempiere.fitnesse.fixture -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Activator: org.idempiere.fitnesse.fixture.Activator Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF b/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF index a64e0a4432..5794140128 100644 --- a/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF +++ b/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Fitnesse Server Bundle-SymbolicName: org.idempiere.fitnesse.server -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Activator: org.idempiere.fitnesse.server.Activator Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/org.idempiere.fitrecorder/META-INF/MANIFEST.MF b/org.idempiere.fitrecorder/META-INF/MANIFEST.MF index 550b27252b..6cf1c5b608 100644 --- a/org.idempiere.fitrecorder/META-INF/MANIFEST.MF +++ b/org.idempiere.fitrecorder/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Fitrecorder Bundle-SymbolicName: org.idempiere.fitrecorder;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Activator: org.adempiere.plugin.utils.AdempiereActivator Import-Package: org.adempiere.base, org.adempiere.plugin.utils, @@ -10,4 +10,4 @@ Import-Package: org.adempiere.base, org.osgi.framework;version="1.3.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Service-Component: plugin.xml -Require-Bundle: org.adempiere.base +Require-Bundle: org.adempiere.base;bundle-version="2.0.0" diff --git a/org.idempiere.fitrecorder/bin/MANIFEST.MF b/org.idempiere.fitrecorder/bin/MANIFEST.MF deleted file mode 100644 index 550b27252b..0000000000 --- a/org.idempiere.fitrecorder/bin/MANIFEST.MF +++ /dev/null @@ -1,13 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Fitrecorder -Bundle-SymbolicName: org.idempiere.fitrecorder;singleton:=true -Bundle-Version: 1.0.0.qualifier -Bundle-Activator: org.adempiere.plugin.utils.AdempiereActivator -Import-Package: org.adempiere.base, - org.adempiere.plugin.utils, - org.compiere.model, - org.osgi.framework;version="1.3.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Service-Component: plugin.xml -Require-Bundle: org.adempiere.base diff --git a/org.idempiere.hazelcast.service-feature/feature.xml b/org.idempiere.hazelcast.service-feature/feature.xml index ef5e144f2e..c02f3c994c 100644 --- a/org.idempiere.hazelcast.service-feature/feature.xml +++ b/org.idempiere.hazelcast.service-feature/feature.xml @@ -2,7 +2,7 @@ + version="2.0.0.qualifier"> [Enter Feature Description here.] @@ -20,7 +20,7 @@ id="org.idempiere.hazelcast.service" download-size="0" install-size="0" - version="0.0.0" + version="2.0.0.qualifier" unpack="false"/> diff --git a/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF b/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF index db55a3114f..a590584389 100644 --- a/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF +++ b/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF @@ -2,6 +2,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Hazelcast Service Configuration Bundle-SymbolicName: org.idempiere.hazelcast.service.config -Bundle-Version: 1.0.0 -Fragment-Host: org.idempiere.hazelcast.service;bundle-version="1.0.0" +Bundle-Version: 2.0.0 +Fragment-Host: org.idempiere.hazelcast.service;bundle-version="2.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF index 9854dbee51..b2a2fa22ae 100644 --- a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF +++ b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Hazelcast Service Bundle-SymbolicName: org.idempiere.hazelcast.service -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Activator: org.idempiere.hazelcast.service.Activator Bundle-ActivationPolicy: lazy Import-Package: javax.crypto, diff --git a/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF b/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF index 71fc8d6085..6530f90c65 100644 --- a/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF +++ b/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Zk Selenium Bundle-SymbolicName: org.idempiere.ui.zk.selenium -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Activator: org.idempiere.ui.zk.selenium.fitnesse.Activator Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF index 65a502b98d..5e220afd19 100644 --- a/org.idempiere.webservices/META-INF/MANIFEST.MF +++ b/org.idempiere.webservices/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Webservices Bundle-SymbolicName: org.idempiere.webservices;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Activator: org.idempiere.webservices.Activator Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: javax.activation;version="1.1.1", @@ -55,9 +55,9 @@ Import-Package: javax.activation;version="1.1.1", org.apache.xerces.xs.datatypes;version="2.9.0", org.apache.xml.serialize;version="2.9.0", org.osgi.framework;version="1.6.0" -Require-Bundle: org.adempiere.base;bundle-version="1.0.0", - org.adempiere.report.jasper.library;bundle-version="1.0.0", - org.adempiere.ui;bundle-version="1.0.0", +Require-Bundle: org.adempiere.base;bundle-version="2.0.0", + org.adempiere.report.jasper.library;bundle-version="2.0.0", + org.adempiere.ui;bundle-version="2.0.0", org.apache.ecs;bundle-version="1.0.0" Bundle-ClassPath: ., WEB-INF/lib/spring-osgi-extender-1.2.1.jar, From 2e80b2a9db38c5036f670e206f04a98329f2c09d Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Thu, 21 Nov 2013 14:34:40 +0800 Subject: [PATCH 2/4] IDEMPIERE-1561 Update product version to 2.0.0 --- org.adempiere.webstore/META-INF/MANIFEST.MF | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/org.adempiere.webstore/META-INF/MANIFEST.MF b/org.adempiere.webstore/META-INF/MANIFEST.MF index 43b066c33e..efaa8f4e0e 100644 --- a/org.adempiere.webstore/META-INF/MANIFEST.MF +++ b/org.adempiere.webstore/META-INF/MANIFEST.MF @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.adempiere.webstore Bundle-SymbolicName: org.adempiere.webstore;singleton:=true -Bundle-Version: 1.0.0.qualifier -Require-Bundle: org.adempiere.report.jasper;bundle-version="1.0.0", - org.adempiere.base;bundle-version="1.0.0", - org.adempiere.report.jasper.webapp;bundle-version="1.0.0" +Bundle-Version: 2.0.0.qualifier +Require-Bundle: org.adempiere.report.jasper;bundle-version="2.0.0", + org.adempiere.base;bundle-version="2.0.0", + org.adempiere.report.jasper.webapp;bundle-version="2.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Web-ContextPath: wstore Import-Package: javax.servlet;version="2.5.0", From 163c779c8b5eff53189f450a0c8f3e1184a4a35b Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Thu, 21 Nov 2013 18:24:08 +0800 Subject: [PATCH 3/4] Update core product version to 2.0.0. Fixed lost tomcat configuration upgrading from 1.0 to 2.0 instance. --- org.idempiere.eclipse.platform-feature/update.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/org.idempiere.eclipse.platform-feature/update.sh b/org.idempiere.eclipse.platform-feature/update.sh index 32a677d9c0..cea34fc074 100644 --- a/org.idempiere.eclipse.platform-feature/update.sh +++ b/org.idempiere.eclipse.platform-feature/update.sh @@ -13,8 +13,12 @@ fi if [ -f plugins/org.adempiere.tomcat.config_1.0.0/META-INF/tomcat/server.xml ] then cp plugins/org.adempiere.tomcat.config_1.0.0/META-INF/tomcat/server.xml server.xml.sav + rm plugins/org.adempiere.tomcat.config_1.0.0/META-INF/tomcat/server.xml +fi +if [ -f plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/server.xml ] +then + cp plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/server.xml server.xml.sav fi - java -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=director -jar plugins/org.eclipse.osgi_3.7.*.jar -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -u org.adempiere.server.product java -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=director -jar plugins/org.eclipse.osgi_3.7.*.jar -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -i org.adempiere.server.product @@ -22,7 +26,7 @@ java -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.ins cp idempiere.ini.sav idempiere.ini if [ -f server.xml.sav ] then - cp server.xml.sav plugins/org.adempiere.tomcat.config_1.0.0/META-INF/tomcat/server.xml + cp server.xml.sav plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/server.xml rm -f server.xml.sav fi From c8f9f36295d4f8f48f2d4afe854e83aa81f6f040 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Thu, 21 Nov 2013 20:35:21 +0800 Subject: [PATCH 4/4] IDEMPIERE-1510 Exception when closing Report Wizard ( ticket #1003516 ) --- .../src/org/compiere/print/DataEngine.java | 10 ++++++-- .../src/org/compiere/print/ReportEngine.java | 5 ++-- .../src/org/compiere/util/DB.java | 24 +++++++++++++++++++ 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/print/DataEngine.java b/org.adempiere.base/src/org/compiere/print/DataEngine.java index 00c82ca7b4..9a09e332b9 100644 --- a/org.adempiere.base/src/org/compiere/print/DataEngine.java +++ b/org.adempiere.base/src/org/compiere/print/DataEngine.java @@ -191,8 +191,14 @@ public class DataEngine return null; } if (format.isTranslationView() && tableName.toLowerCase().endsWith("_v")) // _vt not just _v - tableName += "t"; - format.setTranslationViewQuery (query); + { + boolean hasVT = DB.isTableOrViewExists(tableName+"t"); + if (hasVT) + { + tableName += "t"; + format.setTranslationViewQuery (query); + } + } // PrintData pd = getPrintDataInfo (ctx, format, query, reportName, tableName); if (pd == null) diff --git a/org.adempiere.base/src/org/compiere/print/ReportEngine.java b/org.adempiere.base/src/org/compiere/print/ReportEngine.java index 5b24b3d986..e6d95f23a0 100644 --- a/org.adempiere.base/src/org/compiere/print/ReportEngine.java +++ b/org.adempiere.base/src/org/compiere/print/ReportEngine.java @@ -1244,6 +1244,8 @@ queued-job-count = 0 (class javax.print.attribute.standard.QueuedJobCount) if (format == null) return null; // + format.setTranslationLanguage(format.getLanguage()); + // PrintInfo info = new PrintInfo (pi); info.setAD_Table_ID(AD_Table_ID); @@ -1507,8 +1509,7 @@ queued-job-count = 0 (class javax.print.attribute.standard.QueuedJobCount) // Get Format & Data MPrintFormat format = MPrintFormat.get (ctx, AD_PrintFormat_ID, false); format.setLanguage(language); // BP Language if Multi-Lingual - // if (!Env.isBaseLanguage(language, DOC_TABLES[type])) - format.setTranslationLanguage(language); + format.setTranslationLanguage(language); // query MQuery query = new MQuery(format.getAD_Table_ID()); query.addRestriction(DOC_IDS[type], MQuery.EQUAL, Record_ID); diff --git a/org.adempiere.base/src/org/compiere/util/DB.java b/org.adempiere.base/src/org/compiere/util/DB.java index 1dd97303d1..67b82790de 100644 --- a/org.adempiere.base/src/org/compiere/util/DB.java +++ b/org.adempiere.base/src/org/compiere/util/DB.java @@ -22,6 +22,7 @@ import java.io.FileOutputStream; import java.math.BigDecimal; import java.sql.CallableStatement; import java.sql.Connection; +import java.sql.DatabaseMetaData; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -2319,4 +2320,27 @@ public final class DB } } + /** + * @param tableName + * @return true if table or view with name=tableName exists in db + */ + public static boolean isTableOrViewExists(String tableName) { + Connection conn = getConnectionRO(); + ResultSet rs = null; + try { + DatabaseMetaData metadata = conn.getMetaData(); + rs = metadata.getTables(null, null, (DB.isPostgreSQL() ? tableName.toLowerCase() : tableName.toUpperCase()), null); + if (rs.next()) { + return true; + } + } catch (SQLException e) { + e.printStackTrace(); + } finally { + DB.close(rs); + try { + conn.close(); + } catch (SQLException e) {} + } + return false; + } } // DB