Merged release-2.0 into development
This commit is contained in:
commit
a05c545c98
|
@ -2,7 +2,7 @@
|
||||||
<feature
|
<feature
|
||||||
id="org.adempiere.base"
|
id="org.adempiere.base"
|
||||||
label="Adempiere Base"
|
label="Adempiere Base"
|
||||||
version="1.0.0.qualifier">
|
version="2.0.0.qualifier">
|
||||||
|
|
||||||
<description url="http://www.example.com/description">
|
<description url="http://www.example.com/description">
|
||||||
[Enter Feature Description here.]
|
[Enter Feature Description here.]
|
||||||
|
@ -18,50 +18,50 @@
|
||||||
|
|
||||||
<includes
|
<includes
|
||||||
id="org.compiere.db.provider"
|
id="org.compiere.db.provider"
|
||||||
version="0.0.0"/>
|
version="2.0.0.qualifier"/>
|
||||||
|
|
||||||
<includes
|
<includes
|
||||||
id="org.adempiere.payment.processor"
|
id="org.adempiere.payment.processor"
|
||||||
version="0.0.0"/>
|
version="2.0.0.qualifier"/>
|
||||||
|
|
||||||
<includes
|
<includes
|
||||||
id="org.adempiere.pipo"
|
id="org.adempiere.pipo"
|
||||||
version="0.0.0"/>
|
version="2.0.0.qualifier"/>
|
||||||
|
|
||||||
<includes
|
<includes
|
||||||
id="org.adempiere.replication"
|
id="org.adempiere.replication"
|
||||||
version="0.0.0"/>
|
version="2.0.0.qualifier"/>
|
||||||
|
|
||||||
<includes
|
<includes
|
||||||
id="org.adempiere.report.jasper"
|
id="org.adempiere.report.jasper"
|
||||||
version="0.0.0"/>
|
version="2.0.0.qualifier"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.adempiere.base"
|
id="org.adempiere.base"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="1.0.0.qualifier"
|
version="2.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.adempiere.base.callout"
|
id="org.adempiere.base.callout"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="1.0.0.qualifier"
|
version="2.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.adempiere.base.process"
|
id="org.adempiere.base.process"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="1.0.0.qualifier"
|
version="2.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.adempiere.extend"
|
id="org.adempiere.extend"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="1.0.0.qualifier"
|
version="2.0.0.qualifier"
|
||||||
fragment="true"
|
fragment="true"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
|
@ -69,7 +69,7 @@
|
||||||
id="org.adempiere.ui"
|
id="org.adempiere.ui"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="1.0.0.qualifier"
|
version="2.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
|
@ -98,6 +98,7 @@
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="1.4.5"
|
version="1.4.5"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="com.springsource.javax.activation"
|
id="com.springsource.javax.activation"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
|
@ -249,7 +250,7 @@
|
||||||
id="org.adempiere.install"
|
id="org.adempiere.install"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="1.0.0.qualifier"/>
|
version="2.0.0.qualifier"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.eclipse.osgi.services"
|
id="org.eclipse.osgi.services"
|
||||||
|
|
|
@ -2,9 +2,9 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: Callout
|
Bundle-Name: Callout
|
||||||
Bundle-SymbolicName: org.adempiere.base.callout
|
Bundle-SymbolicName: org.adempiere.base.callout
|
||||||
Bundle-Version: 1.0.0.qualifier
|
Bundle-Version: 2.0.0.qualifier
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
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"
|
||||||
Eclipse-RegisterBuddy: org.adempiere.base
|
Eclipse-RegisterBuddy: org.adempiere.base
|
||||||
Service-Component: OSGI-INF/costadjustmentcalloutfactory.xml
|
Service-Component: OSGI-INF/costadjustmentcalloutfactory.xml
|
||||||
Bundle-ActivationPolicy: lazy
|
Bundle-ActivationPolicy: lazy
|
||||||
|
|
|
@ -2,9 +2,9 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: Adempiere Processes
|
Bundle-Name: Adempiere Processes
|
||||||
Bundle-SymbolicName: org.adempiere.base.process
|
Bundle-SymbolicName: org.adempiere.base.process
|
||||||
Bundle-Version: 1.0.0.qualifier
|
Bundle-Version: 2.0.0.qualifier
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
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,
|
Export-Package: org.adempiere.process,
|
||||||
org.compiere.process,
|
org.compiere.process,
|
||||||
org.idempiere.process
|
org.idempiere.process
|
||||||
|
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: org.adempiere.base
|
Bundle-Name: org.adempiere.base
|
||||||
Bundle-SymbolicName: org.adempiere.base;singleton:=true
|
Bundle-SymbolicName: org.adempiere.base;singleton:=true
|
||||||
Bundle-Version: 1.0.0.qualifier
|
Bundle-Version: 2.0.0.qualifier
|
||||||
Bundle-ClassPath: base.jar,
|
Bundle-ClassPath: base.jar,
|
||||||
bsh-2.0b5.jar,
|
bsh-2.0b5.jar,
|
||||||
bsh-engine.jar,
|
bsh-engine.jar,
|
||||||
|
|
|
@ -191,8 +191,14 @@ public class DataEngine
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
if (format.isTranslationView() && tableName.toLowerCase().endsWith("_v")) // _vt not just _v
|
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);
|
PrintData pd = getPrintDataInfo (ctx, format, query, reportName, tableName);
|
||||||
if (pd == null)
|
if (pd == null)
|
||||||
|
|
|
@ -1244,6 +1244,8 @@ queued-job-count = 0 (class javax.print.attribute.standard.QueuedJobCount)
|
||||||
if (format == null)
|
if (format == null)
|
||||||
return null;
|
return null;
|
||||||
//
|
//
|
||||||
|
format.setTranslationLanguage(format.getLanguage());
|
||||||
|
//
|
||||||
PrintInfo info = new PrintInfo (pi);
|
PrintInfo info = new PrintInfo (pi);
|
||||||
info.setAD_Table_ID(AD_Table_ID);
|
info.setAD_Table_ID(AD_Table_ID);
|
||||||
|
|
||||||
|
@ -1507,8 +1509,7 @@ queued-job-count = 0 (class javax.print.attribute.standard.QueuedJobCount)
|
||||||
// Get Format & Data
|
// Get Format & Data
|
||||||
MPrintFormat format = MPrintFormat.get (ctx, AD_PrintFormat_ID, false);
|
MPrintFormat format = MPrintFormat.get (ctx, AD_PrintFormat_ID, false);
|
||||||
format.setLanguage(language); // BP Language if Multi-Lingual
|
format.setLanguage(language); // BP Language if Multi-Lingual
|
||||||
// if (!Env.isBaseLanguage(language, DOC_TABLES[type]))
|
format.setTranslationLanguage(language);
|
||||||
format.setTranslationLanguage(language);
|
|
||||||
// query
|
// query
|
||||||
MQuery query = new MQuery(format.getAD_Table_ID());
|
MQuery query = new MQuery(format.getAD_Table_ID());
|
||||||
query.addRestriction(DOC_IDS[type], MQuery.EQUAL, Record_ID);
|
query.addRestriction(DOC_IDS[type], MQuery.EQUAL, Record_ID);
|
||||||
|
|
|
@ -22,6 +22,7 @@ import java.io.FileOutputStream;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.sql.CallableStatement;
|
import java.sql.CallableStatement;
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
|
import java.sql.DatabaseMetaData;
|
||||||
import java.sql.PreparedStatement;
|
import java.sql.PreparedStatement;
|
||||||
import java.sql.ResultSet;
|
import java.sql.ResultSet;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
|
@ -2329,4 +2330,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
|
} // DB
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<feature
|
<feature
|
||||||
id="org.adempiere.bundles.external"
|
id="org.adempiere.bundles.external"
|
||||||
label="External bundles"
|
label="External bundles"
|
||||||
version="1.0.0.qualifier"
|
version="2.0.0.qualifier"
|
||||||
provider-name="Adempiere.org">
|
provider-name="Adempiere.org">
|
||||||
|
|
||||||
<description url="http://www.example.com/description">
|
<description url="http://www.example.com/description">
|
||||||
|
@ -135,4 +135,5 @@
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="0.0.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
</feature>
|
</feature>
|
||||||
|
|
|
@ -2,14 +2,14 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: org.adempiere.extend
|
Bundle-Name: org.adempiere.extend
|
||||||
Bundle-SymbolicName: org.adempiere.extend;singleton:=true
|
Bundle-SymbolicName: org.adempiere.extend;singleton:=true
|
||||||
Bundle-Version: 1.0.0.qualifier
|
Bundle-Version: 2.0.0.qualifier
|
||||||
Bundle-ClassPath: extend.jar,
|
Bundle-ClassPath: extend.jar,
|
||||||
spiffy-with_source-all-0.05.jar
|
spiffy-with_source-all-0.05.jar
|
||||||
Eclipse-RegisterBuddy: org.adempiere.tools
|
Eclipse-RegisterBuddy: org.adempiere.tools
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
Export-Package: compiere.model,
|
Export-Package: compiere.model,
|
||||||
test
|
test
|
||||||
Fragment-Host: org.adempiere.base;bundle-version="0.0.0"
|
Fragment-Host: org.adempiere.base;bundle-version="2.0.0"
|
||||||
Eclipse-PatchFragment: true
|
Eclipse-PatchFragment: true
|
||||||
Import-Package: junit.framework;version="3.8.2",
|
Import-Package: junit.framework;version="3.8.2",
|
||||||
org.junit;version="4.8.2",
|
org.junit;version="4.8.2",
|
||||||
|
|
|
@ -2,12 +2,12 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: install
|
Bundle-Name: install
|
||||||
Bundle-SymbolicName: org.adempiere.install;singleton:=true
|
Bundle-SymbolicName: org.adempiere.install;singleton:=true
|
||||||
Bundle-Version: 1.0.0.qualifier
|
Bundle-Version: 2.0.0.qualifier
|
||||||
Bundle-ClassPath: install.jar,
|
Bundle-ClassPath: install.jar,
|
||||||
ant-contrib-1.0b3.jar
|
ant-contrib-1.0b3.jar
|
||||||
Export-Package: org.adempiere.install,
|
Export-Package: org.adempiere.install,
|
||||||
org.compiere.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
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
Import-Package: javax.mail;version="1.4.5",
|
Import-Package: javax.mail;version="1.4.5",
|
||||||
javax.mail.internet;version="1.4.5",
|
javax.mail.internet;version="1.4.5",
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<feature
|
<feature
|
||||||
id="org.adempiere.payment.processor"
|
id="org.adempiere.payment.processor"
|
||||||
label="Payment Processor"
|
label="Payment Processor"
|
||||||
version="1.0.0.qualifier">
|
version="2.0.0.qualifier">
|
||||||
|
|
||||||
<description url="http://www.example.com/description">
|
<description url="http://www.example.com/description">
|
||||||
[Enter Feature Description here.]
|
[Enter Feature Description here.]
|
||||||
|
@ -17,14 +17,14 @@
|
||||||
</license>
|
</license>
|
||||||
|
|
||||||
<requires>
|
<requires>
|
||||||
<import feature="org.adempiere.base" version="1.0.0.qualifier"/>
|
<import feature="org.adempiere.base" version="2.0.0.qualifier"/>
|
||||||
</requires>
|
</requires>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.adempiere.payment.processor"
|
id="org.adempiere.payment.processor"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
</feature>
|
</feature>
|
||||||
|
|
|
@ -2,9 +2,9 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: Processor
|
Bundle-Name: Processor
|
||||||
Bundle-SymbolicName: org.adempiere.payment.processor;singleton:=true
|
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
|
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,
|
Bundle-ClassPath: jpayment.jar,
|
||||||
payflow.jar,
|
payflow.jar,
|
||||||
Verisign.jar,
|
Verisign.jar,
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<feature
|
<feature
|
||||||
id="org.adempiere.pipo"
|
id="org.adempiere.pipo"
|
||||||
label="Pipo-feature"
|
label="Pipo-feature"
|
||||||
version="1.0.0.qualifier">
|
version="2.0.0.qualifier">
|
||||||
|
|
||||||
<description url="http://www.example.com/description">
|
<description url="http://www.example.com/description">
|
||||||
[Enter Feature Description here.]
|
[Enter Feature Description here.]
|
||||||
|
@ -17,28 +17,28 @@
|
||||||
</license>
|
</license>
|
||||||
|
|
||||||
<requires>
|
<requires>
|
||||||
<import feature="org.adempiere.base" version="1.0.0.qualifier"/>
|
<import feature="org.adempiere.base" version="2.0.0.qualifier"/>
|
||||||
</requires>
|
</requires>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.adempiere.pipo"
|
id="org.adempiere.pipo"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.adempiere.pipo.handlers"
|
id="org.adempiere.pipo.handlers"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.adempiere.plugin.utils"
|
id="org.adempiere.plugin.utils"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
</feature>
|
</feature>
|
||||||
|
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: PipoHandlers
|
Bundle-Name: PipoHandlers
|
||||||
Bundle-SymbolicName: org.adempiere.pipo.handlers;singleton:=true
|
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
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
Require-Bundle: org.adempiere.pipo;bundle-version="1.0.0",
|
Require-Bundle: org.adempiere.pipo;bundle-version="2.0.0",
|
||||||
org.adempiere.base;bundle-version="1.0.0"
|
org.adempiere.base;bundle-version="2.0.0"
|
||||||
|
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: PiPo
|
Bundle-Name: PiPo
|
||||||
Bundle-SymbolicName: org.adempiere.pipo;singleton:=true
|
Bundle-SymbolicName: org.adempiere.pipo;singleton:=true
|
||||||
Bundle-Version: 1.0.0.qualifier
|
Bundle-Version: 2.0.0.qualifier
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
Import-Package: org.apache.commons.codec;version="1.3.0",
|
Import-Package: org.apache.commons.codec;version="1.3.0",
|
||||||
org.apache.commons.codec.binary;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,
|
Export-Package: org.adempiere.pipo.srv,
|
||||||
org.adempiere.pipo2,
|
org.adempiere.pipo2,
|
||||||
org.adempiere.pipo2.exception
|
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
|
Service-Component: OSGI-INF/dictionaryservice.xml
|
||||||
|
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: Plugin Utils
|
Bundle-Name: Plugin Utils
|
||||||
Bundle-SymbolicName: org.adempiere.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
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
Import-Package: org.adempiere.base,
|
Import-Package: org.adempiere.base,
|
||||||
org.adempiere.util,
|
org.adempiere.util,
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<feature
|
<feature
|
||||||
id="org.adempiere.replication"
|
id="org.adempiere.replication"
|
||||||
label="Replication-feature"
|
label="Replication-feature"
|
||||||
version="1.0.0.qualifier">
|
version="2.0.0.qualifier">
|
||||||
|
|
||||||
<description url="http://www.example.com/description">
|
<description url="http://www.example.com/description">
|
||||||
[Enter Feature Description here.]
|
[Enter Feature Description here.]
|
||||||
|
@ -17,14 +17,14 @@
|
||||||
</license>
|
</license>
|
||||||
|
|
||||||
<requires>
|
<requires>
|
||||||
<import feature="org.adempiere.base" version="1.0.0.qualifier"/>
|
<import feature="org.adempiere.base" version="2.0.0.qualifier"/>
|
||||||
</requires>
|
</requires>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.adempiere.replication"
|
id="org.adempiere.replication"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
</feature>
|
</feature>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<feature
|
<feature
|
||||||
id="org.adempiere.replication.server"
|
id="org.adempiere.replication.server"
|
||||||
label="Replication Server-feature"
|
label="Replication Server-feature"
|
||||||
version="1.0.0.qualifier">
|
version="2.0.0.qualifier">
|
||||||
|
|
||||||
<description url="http://www.example.com/description">
|
<description url="http://www.example.com/description">
|
||||||
[Enter Feature Description here.]
|
[Enter Feature Description here.]
|
||||||
|
@ -17,16 +17,16 @@
|
||||||
</license>
|
</license>
|
||||||
|
|
||||||
<requires>
|
<requires>
|
||||||
<import feature="org.adempiere.base" version="1.0.0.qualifier"/>
|
<import feature="org.adempiere.base" version="2.0.0.qualifier"/>
|
||||||
<import feature="org.adempiere.replication" version="1.0.0.qualifier"/>
|
<import feature="org.adempiere.replication" version="2.0.0.qualifier"/>
|
||||||
<import plugin="org.adempiere.server" version="1.0.0" match="greaterOrEqual"/>
|
<import plugin="org.adempiere.server" version="2.0.0.qualifier" />
|
||||||
</requires>
|
</requires>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.adempiere.replication.server"
|
id="org.adempiere.replication.server"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
</feature>
|
</feature>
|
||||||
|
|
|
@ -2,11 +2,11 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: Server
|
Bundle-Name: Server
|
||||||
Bundle-SymbolicName: org.adempiere.replication.server;singleton:=true
|
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
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
Require-Bundle: org.adempiere.server;bundle-version="1.0.0",
|
Require-Bundle: org.adempiere.server;bundle-version="2.0.0",
|
||||||
org.adempiere.replication;bundle-version="1.0.0",
|
org.adempiere.replication;bundle-version="2.0.0",
|
||||||
org.adempiere.base;bundle-version="1.0.0"
|
org.adempiere.base;bundle-version="2.0.0"
|
||||||
Import-Package: javax.jms;version="1.1.0",
|
Import-Package: javax.jms;version="1.1.0",
|
||||||
org.apache.activemq
|
org.apache.activemq
|
||||||
Service-Component: OSGI-INF/serverfactory.xml
|
Service-Component: OSGI-INF/serverfactory.xml
|
||||||
|
|
|
@ -2,9 +2,9 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: Replication
|
Bundle-Name: Replication
|
||||||
Bundle-SymbolicName: org.adempiere.replication;singleton:=true
|
Bundle-SymbolicName: org.adempiere.replication;singleton:=true
|
||||||
Bundle-Version: 1.0.0.qualifier
|
Bundle-Version: 2.0.0.qualifier
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
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,
|
Export-Package: org.adempiere.process.rpl,
|
||||||
org.adempiere.process.rpl.exp,
|
org.adempiere.process.rpl.exp,
|
||||||
org.adempiere.process.rpl.imp
|
org.adempiere.process.rpl.imp
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<feature
|
<feature
|
||||||
id="org.adempiere.report.jasper"
|
id="org.adempiere.report.jasper"
|
||||||
label="JasperReport-feature"
|
label="JasperReport-feature"
|
||||||
version="1.0.0.qualifier">
|
version="2.0.0.qualifier">
|
||||||
|
|
||||||
<description url="http://www.example.com/description">
|
<description url="http://www.example.com/description">
|
||||||
[Enter Feature Description here.]
|
[Enter Feature Description here.]
|
||||||
|
@ -17,20 +17,20 @@
|
||||||
</license>
|
</license>
|
||||||
|
|
||||||
<requires>
|
<requires>
|
||||||
<import feature="org.adempiere.base" version="1.0.0.qualifier"/>
|
<import feature="org.adempiere.base" version="2.0.0.qualifier"/>
|
||||||
</requires>
|
</requires>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.adempiere.report.jasper"
|
id="org.adempiere.report.jasper"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"/>
|
version="2.0.0.qualifier"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.adempiere.report.jasper.library"
|
id="org.adempiere.report.jasper.library"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"/>
|
version="2.0.0.qualifier"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.apache.batik.bridge"
|
id="org.apache.batik.bridge"
|
||||||
|
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: JasperReports Dependency
|
Bundle-Name: JasperReports Dependency
|
||||||
Bundle-SymbolicName: org.adempiere.report.jasper.library
|
Bundle-SymbolicName: org.adempiere.report.jasper.library
|
||||||
Bundle-Version: 1.0.0.qualifier
|
Bundle-Version: 2.0.0.qualifier
|
||||||
Bundle-ClassPath: lib/commons-beanutils-1.8.0.jar,
|
Bundle-ClassPath: lib/commons-beanutils-1.8.0.jar,
|
||||||
lib/commons-digester-2.1.jar,
|
lib/commons-digester-2.1.jar,
|
||||||
lib/jasperreports-5.1.2.jar,
|
lib/jasperreports-5.1.2.jar,
|
||||||
|
|
|
@ -2,12 +2,12 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: JasperReports Swing Client
|
Bundle-Name: JasperReports Swing Client
|
||||||
Bundle-SymbolicName: org.adempiere.report.jasper.swing;singleton:=true
|
Bundle-SymbolicName: org.adempiere.report.jasper.swing;singleton:=true
|
||||||
Bundle-Version: 1.0.0.qualifier
|
Bundle-Version: 2.0.0.qualifier
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
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",
|
||||||
org.adempiere.ui.swing;bundle-version="1.0.0",
|
org.adempiere.ui.swing;bundle-version="2.0.0",
|
||||||
org.adempiere.report.jasper;bundle-version="1.0.0",
|
org.adempiere.report.jasper;bundle-version="2.0.0",
|
||||||
org.adempiere.report.jasper.library;bundle-version="1.0.0"
|
org.adempiere.report.jasper.library;bundle-version="2.0.0"
|
||||||
Import-Package: org.osgi.framework
|
Import-Package: org.osgi.framework
|
||||||
Service-Component: OSGI-INF/jrviewerprovider.xml
|
Service-Component: OSGI-INF/jrviewerprovider.xml
|
||||||
Bundle-ActivationPolicy: lazy
|
Bundle-ActivationPolicy: lazy
|
||||||
|
|
|
@ -2,8 +2,8 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: Jasper Report Web App
|
Bundle-Name: Jasper Report Web App
|
||||||
Bundle-SymbolicName: org.adempiere.report.jasper.webapp;singleton:=true
|
Bundle-SymbolicName: org.adempiere.report.jasper.webapp;singleton:=true
|
||||||
Bundle-Version: 1.0.0.qualifier
|
Bundle-Version: 2.0.0.qualifier
|
||||||
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
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
Web-ContextPath: JasperReportFiles
|
Web-ContextPath: JasperReportFiles
|
||||||
Bundle-ClassPath: .
|
Bundle-ClassPath: .
|
||||||
|
|
|
@ -2,12 +2,12 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: JasperReport integration
|
Bundle-Name: JasperReport integration
|
||||||
Bundle-SymbolicName: org.adempiere.report.jasper;singleton:=true
|
Bundle-SymbolicName: org.adempiere.report.jasper;singleton:=true
|
||||||
Bundle-Version: 1.0.0.qualifier
|
Bundle-Version: 2.0.0.qualifier
|
||||||
Bundle-ClassPath: JasperReports.jar
|
Bundle-ClassPath: JasperReports.jar
|
||||||
Export-Package: org.compiere.report,
|
Export-Package: org.compiere.report,
|
||||||
org.compiere.utils
|
org.compiere.utils
|
||||||
Require-Bundle: org.adempiere.base;bundle-version="1.0.0",
|
Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
|
||||||
org.adempiere.report.jasper.library;bundle-version="1.0.0"
|
org.adempiere.report.jasper.library;bundle-version="2.0.0"
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
Import-Package: org.apache.commons.codec;version="1.3.0",
|
Import-Package: org.apache.commons.codec;version="1.3.0",
|
||||||
org.apache.commons.codec.binary;version="1.3.0",
|
org.apache.commons.codec.binary;version="1.3.0",
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<feature
|
<feature
|
||||||
id="org.adempiere.sdk"
|
id="org.adempiere.sdk"
|
||||||
label="Adempiere SDK"
|
label="Adempiere SDK"
|
||||||
version="1.0.0.qualifier"
|
version="2.0.0.qualifier"
|
||||||
provider-name="Adempiere.org">
|
provider-name="Adempiere.org">
|
||||||
|
|
||||||
<description url="http://www.example.com/description">
|
<description url="http://www.example.com/description">
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<feature
|
<feature
|
||||||
id="org.adempiere.server"
|
id="org.adempiere.server"
|
||||||
label="iDempiere Server-feature"
|
label="iDempiere Server-feature"
|
||||||
version="1.0.0.qualifier">
|
version="2.0.0.qualifier">
|
||||||
|
|
||||||
<description url="http://www.example.com/description">
|
<description url="http://www.example.com/description">
|
||||||
[Enter Feature Description here.]
|
[Enter Feature Description here.]
|
||||||
|
@ -18,16 +18,16 @@
|
||||||
|
|
||||||
<includes
|
<includes
|
||||||
id="org.adempiere.replication.server"
|
id="org.adempiere.replication.server"
|
||||||
version="0.0.0"
|
version="2.0.0.qualifier"
|
||||||
optional="true"/>
|
optional="true"/>
|
||||||
|
|
||||||
<includes
|
<includes
|
||||||
id="org.adempiere.ui.zk"
|
id="org.adempiere.ui.zk"
|
||||||
version="0.0.0"/>
|
version="2.0.0.qualifier"/>
|
||||||
|
|
||||||
<includes
|
<includes
|
||||||
id="org.adempiere.webstore"
|
id="org.adempiere.webstore"
|
||||||
version="0.0.0"
|
version="2.0.0.qualifier"
|
||||||
optional="true"/>
|
optional="true"/>
|
||||||
|
|
||||||
<includes
|
<includes
|
||||||
|
@ -36,10 +36,10 @@
|
||||||
|
|
||||||
<includes
|
<includes
|
||||||
id="org.idempiere.felix.webconsole"
|
id="org.idempiere.felix.webconsole"
|
||||||
version="0.0.0"/>
|
version="2.0.0.qualifier"/>
|
||||||
|
|
||||||
<requires>
|
<requires>
|
||||||
<import feature="org.adempiere.base" version="1.0.0" match="compatible"/>
|
<import feature="org.adempiere.base" version="2.0.0" match="compatible"/>
|
||||||
</requires>
|
</requires>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
|
@ -132,21 +132,21 @@
|
||||||
id="org.adempiere.report.jasper.webapp"
|
id="org.adempiere.report.jasper.webapp"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.adempiere.server"
|
id="org.adempiere.server"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.adempiere.tomcat.config"
|
id="org.adempiere.tomcat.config"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.0.0"
|
||||||
fragment="true"/>
|
fragment="true"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
|
@ -282,7 +282,7 @@
|
||||||
id="org.adempiere.install"
|
id="org.adempiere.install"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"/>
|
version="2.0.0.qualifier"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.adempiere.eclipse.equinox.http.servlet"
|
id="org.adempiere.eclipse.equinox.http.servlet"
|
||||||
|
@ -316,7 +316,7 @@
|
||||||
id="org.idempiere.webservices"
|
id="org.idempiere.webservices"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<?pde version="3.5"?>
|
<?pde version="3.5"?>
|
||||||
|
|
||||||
<product name="iDempiere Server" uid="org.adempiere.server.product" id="org.adempiere.server.server_product" application="org.adempiere.server.application" version="1.0.0" useFeatures="true" includeLaunchers="true">
|
<product name="iDempiere Server" uid="org.adempiere.server.product" id="org.adempiere.server.server_product" application="org.adempiere.server.application" version="2.0.0" useFeatures="true" includeLaunchers="true">
|
||||||
|
|
||||||
|
|
||||||
<configIni use="default">
|
<configIni use="default">
|
||||||
</configIni>
|
</configIni>
|
||||||
|
@ -15,7 +14,6 @@
|
||||||
|
|
||||||
<windowImages/>
|
<windowImages/>
|
||||||
|
|
||||||
|
|
||||||
<launcher name="idempiere">
|
<launcher name="idempiere">
|
||||||
<solaris/>
|
<solaris/>
|
||||||
<win useIco="false">
|
<win useIco="false">
|
||||||
|
@ -23,19 +21,17 @@
|
||||||
</win>
|
</win>
|
||||||
</launcher>
|
</launcher>
|
||||||
|
|
||||||
|
|
||||||
<vm>
|
<vm>
|
||||||
</vm>
|
</vm>
|
||||||
|
|
||||||
|
|
||||||
<plugins>
|
<plugins>
|
||||||
</plugins>
|
</plugins>
|
||||||
|
|
||||||
<features>
|
<features>
|
||||||
<feature id="org.adempiere.base" version="1.0.0.qualifier"/>
|
<feature id="org.adempiere.base" version="2.0.0.qualifier"/>
|
||||||
<feature id="org.adempiere.server" version="1.0.0.qualifier"/>
|
<feature id="org.adempiere.server" version="2.0.0.qualifier"/>
|
||||||
<feature id="org.idempiere.hazelcast.service" version="1.0.0.qualifier"/>
|
<feature id="org.idempiere.hazelcast.service" version="2.0.0.qualifier"/>
|
||||||
<feature id="org.adempiere.pipo" version="1.0.0.qualifier"/>
|
<feature id="org.adempiere.pipo" version="2.0.0.qualifier"/>
|
||||||
</features>
|
</features>
|
||||||
|
|
||||||
<configurations>
|
<configurations>
|
||||||
|
|
|
@ -2,11 +2,11 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: org.adempiere.server
|
Bundle-Name: org.adempiere.server
|
||||||
Bundle-SymbolicName: org.adempiere.server;singleton:=true
|
Bundle-SymbolicName: org.adempiere.server;singleton:=true
|
||||||
Bundle-Version: 1.0.0.qualifier
|
Bundle-Version: 2.0.0.qualifier
|
||||||
Require-Bundle: org.adempiere.base;bundle-version="1.0.0",
|
Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
|
||||||
org.eclipse.equinox.app;bundle-version="1.3.0",
|
org.eclipse.equinox.app;bundle-version="1.3.0",
|
||||||
org.adempiere.report.jasper;bundle-version="1.0.0",
|
org.adempiere.report.jasper;bundle-version="2.0.0",
|
||||||
org.adempiere.report.jasper.library;bundle-version="1.0.0"
|
org.adempiere.report.jasper.library;bundle-version="2.0.0"
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
Web-ContextPath: /
|
Web-ContextPath: /
|
||||||
Bundle-ClassPath: WEB-INF/lib/jardiff.jar,
|
Bundle-ClassPath: WEB-INF/lib/jardiff.jar,
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<feature
|
<feature
|
||||||
id="org.adempiere.target.platform"
|
id="org.adempiere.target.platform"
|
||||||
label="Adempiere Target Platform"
|
label="Adempiere Target Platform"
|
||||||
version="1.0.0.qualifier"
|
version="2.0.0.qualifier"
|
||||||
provider-name="Adempiere.org">
|
provider-name="Adempiere.org">
|
||||||
|
|
||||||
<description url="http://www.example.com/description">
|
<description url="http://www.example.com/description">
|
||||||
|
@ -34,7 +34,7 @@
|
||||||
|
|
||||||
<includes
|
<includes
|
||||||
id="org.adempiere.bundles.external"
|
id="org.adempiere.bundles.external"
|
||||||
version="0.0.0"/>
|
version="2.0.0.qualifier"/>
|
||||||
|
|
||||||
<includes
|
<includes
|
||||||
id="org.eclipse.gemini.web.feature"
|
id="org.eclipse.gemini.web.feature"
|
||||||
|
|
|
@ -2,6 +2,6 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: TomcatConfig
|
Bundle-Name: TomcatConfig
|
||||||
Bundle-SymbolicName: org.adempiere.tomcat.config
|
Bundle-SymbolicName: org.adempiere.tomcat.config
|
||||||
Bundle-Version: 1.0.0
|
Bundle-Version: 2.0.0
|
||||||
Fragment-Host: org.eclipse.gemini.web.tomcat;bundle-version="1.1.0"
|
Fragment-Host: org.eclipse.gemini.web.tomcat;bundle-version="1.1.0"
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<feature
|
<feature
|
||||||
id="org.adempiere.ui.swing"
|
id="org.adempiere.ui.swing"
|
||||||
label="Swing Client-feature"
|
label="Swing Client-feature"
|
||||||
version="1.0.0.qualifier">
|
version="2.0.0.qualifier">
|
||||||
|
|
||||||
<description url="http://www.example.com/description">
|
<description url="http://www.example.com/description">
|
||||||
[Enter Feature Description here.]
|
[Enter Feature Description here.]
|
||||||
|
@ -17,21 +17,21 @@
|
||||||
</license>
|
</license>
|
||||||
|
|
||||||
<requires>
|
<requires>
|
||||||
<import feature="org.adempiere.base" version="1.0.0.qualifier"/>
|
<import feature="org.adempiere.base" version="2.0.0.qualifier"/>
|
||||||
</requires>
|
</requires>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.adempiere.report.jasper.swing"
|
id="org.adempiere.report.jasper.swing"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.adempiere.ui.swing"
|
id="org.adempiere.ui.swing"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"/>
|
version="2.0.0.qualifier"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.restlet.ext.net"
|
id="org.restlet.ext.net"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<?pde version="3.5"?>
|
<?pde version="3.5"?>
|
||||||
|
|
||||||
<product name="Adempiere Swing Client" uid="org.adempiere.ui.swing.product" id="org.adempiere.ui.swing.client_product" application="org.adempiere.ui.swing.client" version="1.0.0" useFeatures="true" includeLaunchers="true">
|
<product name="Adempiere Swing Client" uid="org.adempiere.ui.swing.product" id="org.adempiere.ui.swing.client_product" application="org.adempiere.ui.swing.client" version="2.0.0" useFeatures="true" includeLaunchers="true">
|
||||||
|
|
||||||
<configIni use="default">
|
<configIni use="default">
|
||||||
</configIni>
|
</configIni>
|
||||||
|
@ -26,10 +26,10 @@
|
||||||
</plugins>
|
</plugins>
|
||||||
|
|
||||||
<features>
|
<features>
|
||||||
<feature id="org.adempiere.base" version="1.0.0.qualifier"/>
|
<feature id="org.adempiere.base" version="2.0.0.qualifier"/>
|
||||||
<feature id="org.adempiere.ui.swing" version="1.0.0.qualifier"/>
|
<feature id="org.adempiere.ui.swing" version="2.0.0.qualifier"/>
|
||||||
<feature id="org.idempiere.hazelcast.service" version="1.0.0.qualifier"/>
|
<feature id="org.idempiere.hazelcast.service" version="2.0.0.qualifier"/>
|
||||||
<feature id="org.adempiere.pipo" version="1.0.0.qualifier"/>
|
<feature id="org.adempiere.pipo" version="2.0.0.qualifier"/>
|
||||||
</features>
|
</features>
|
||||||
|
|
||||||
<configurations>
|
<configurations>
|
||||||
|
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: Swing Client
|
Bundle-Name: Swing Client
|
||||||
Bundle-SymbolicName: org.adempiere.ui.swing;singleton:=true
|
Bundle-SymbolicName: org.adempiere.ui.swing;singleton:=true
|
||||||
Bundle-Version: 1.0.0.qualifier
|
Bundle-Version: 2.0.0.qualifier
|
||||||
Bundle-ClassPath: client.jar,
|
Bundle-ClassPath: client.jar,
|
||||||
swingx-1.6.jar,
|
swingx-1.6.jar,
|
||||||
looks-2.0.4.jar,
|
looks-2.0.4.jar,
|
||||||
|
@ -67,10 +67,10 @@ Export-Package: com.jgoodies.looks,
|
||||||
org.jdesktop.swingx.tree,
|
org.jdesktop.swingx.tree,
|
||||||
org.jdesktop.swingx.treetable,
|
org.jdesktop.swingx.treetable,
|
||||||
org.jdesktop.swingx.util
|
org.jdesktop.swingx.util
|
||||||
Require-Bundle: org.adempiere.base;bundle-version="1.0.0",
|
Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
|
||||||
org.adempiere.ui;bundle-version="1.0.0",
|
org.adempiere.ui;bundle-version="2.0.0",
|
||||||
org.adempiere.report.jasper;bundle-version="1.0.0",
|
org.adempiere.report.jasper;bundle-version="2.0.0",
|
||||||
org.adempiere.report.jasper.library;bundle-version="1.0.0",
|
org.adempiere.report.jasper.library;bundle-version="2.0.0",
|
||||||
org.restlet;bundle-version="2.1.0",
|
org.restlet;bundle-version="2.1.0",
|
||||||
org.restlet.ext.net;bundle-version="2.1.0",
|
org.restlet.ext.net;bundle-version="2.1.0",
|
||||||
org.restlet.ext.servlet;bundle-version="2.1.0",
|
org.restlet.ext.servlet;bundle-version="2.1.0",
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<feature
|
<feature
|
||||||
id="org.adempiere.ui.zk"
|
id="org.adempiere.ui.zk"
|
||||||
label="Zk Client-feature"
|
label="Zk Client-feature"
|
||||||
version="1.0.0.qualifier">
|
version="2.0.0.qualifier">
|
||||||
|
|
||||||
<description url="http://www.example.com/description">
|
<description url="http://www.example.com/description">
|
||||||
[Enter Feature Description here.]
|
[Enter Feature Description here.]
|
||||||
|
@ -17,20 +17,20 @@
|
||||||
</license>
|
</license>
|
||||||
|
|
||||||
<requires>
|
<requires>
|
||||||
<import feature="org.adempiere.base" version="1.0.0.qualifier"/>
|
<import feature="org.adempiere.base" version="2.0.0.qualifier"/>
|
||||||
</requires>
|
</requires>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.adempiere.ui.zk"
|
id="org.adempiere.ui.zk"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"/>
|
version="2.0.0.qualifier"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.zkoss.zk.library"
|
id="org.zkoss.zk.library"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="6.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
</feature>
|
</feature>
|
||||||
|
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: Zk Web Client
|
Bundle-Name: Zk Web Client
|
||||||
Bundle-SymbolicName: org.adempiere.ui.zk;singleton:=true
|
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
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
Import-Package: javax.activation;version="1.1.1",
|
Import-Package: javax.activation;version="1.1.1",
|
||||||
javax.servlet,
|
javax.servlet,
|
||||||
|
@ -76,10 +76,10 @@ Export-Package: fi.jawsy.jawwa.zk.atmosphere,
|
||||||
web.js.jawwa.atmosphere,
|
web.js.jawwa.atmosphere,
|
||||||
web.js.zkforge,
|
web.js.zkforge,
|
||||||
web.js.zkforge.mold
|
web.js.zkforge.mold
|
||||||
Require-Bundle: org.adempiere.report.jasper;bundle-version="1.0.0",
|
Require-Bundle: org.adempiere.report.jasper;bundle-version="2.0.0",
|
||||||
org.adempiere.base;bundle-version="1.0.0",
|
org.adempiere.base;bundle-version="2.0.0",
|
||||||
org.adempiere.report.jasper.library;bundle-version="1.0.0",
|
org.adempiere.report.jasper.library;bundle-version="2.0.0",
|
||||||
org.adempiere.ui;bundle-version="1.0.0",
|
org.adempiere.ui;bundle-version="2.0.0",
|
||||||
org.zkoss.zk.library;bundle-version="6.0.0"
|
org.zkoss.zk.library;bundle-version="6.0.0"
|
||||||
Bundle-Activator: org.adempiere.webui.WebUIActivator
|
Bundle-Activator: org.adempiere.webui.WebUIActivator
|
||||||
Eclipse-ExtensibleAPI: true
|
Eclipse-ExtensibleAPI: true
|
||||||
|
|
|
@ -2,9 +2,9 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: UI base
|
Bundle-Name: UI base
|
||||||
Bundle-SymbolicName: org.adempiere.ui;singleton:=true
|
Bundle-SymbolicName: org.adempiere.ui;singleton:=true
|
||||||
Bundle-Version: 1.0.0.qualifier
|
Bundle-Version: 2.0.0.qualifier
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
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,
|
Export-Package: org.compiere.apps,
|
||||||
org.compiere.apps.form,
|
org.compiere.apps.form,
|
||||||
org.compiere.apps.wf,
|
org.compiere.apps.wf,
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<feature
|
<feature
|
||||||
id="org.adempiere.webstore"
|
id="org.adempiere.webstore"
|
||||||
label="Webstore-feature"
|
label="Webstore-feature"
|
||||||
version="1.0.0.qualifier">
|
version="2.0.0.qualifier">
|
||||||
|
|
||||||
<description url="http://www.example.com/description">
|
<description url="http://www.example.com/description">
|
||||||
[Enter Feature Description here.]
|
[Enter Feature Description here.]
|
||||||
|
@ -17,8 +17,8 @@
|
||||||
</license>
|
</license>
|
||||||
|
|
||||||
<requires>
|
<requires>
|
||||||
<import feature="org.adempiere.base" version="1.0.0.qualifier"/>
|
<import feature="org.adempiere.base" version="2.0.0.qualifier"/>
|
||||||
<import plugin="org.adempiere.report.jasper.webapp" version="1.0.0" match="greaterOrEqual"/>
|
<import plugin="org.adempiere.report.jasper.webapp" version="2.0.0.qualifer"/>
|
||||||
<import plugin="javax.servlet.jsp"/>
|
<import plugin="javax.servlet.jsp"/>
|
||||||
<import plugin="javax.servlet.jsp.jstl"/>
|
<import plugin="javax.servlet.jsp.jstl"/>
|
||||||
</requires>
|
</requires>
|
||||||
|
@ -27,14 +27,14 @@
|
||||||
id="org.adempiere.webstore"
|
id="org.adempiere.webstore"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.adempiere.webstore.resource"
|
id="org.adempiere.webstore.resource"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.0.0.qualifier"
|
||||||
fragment="true"
|
fragment="true"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
|
@ -42,7 +42,7 @@
|
||||||
id="org.adempiere.webstore.servlet"
|
id="org.adempiere.webstore.servlet"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
</feature>
|
</feature>
|
||||||
|
|
|
@ -2,8 +2,8 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: Webstore Resource
|
Bundle-Name: Webstore Resource
|
||||||
Bundle-SymbolicName: org.adempiere.webstore.resource
|
Bundle-SymbolicName: org.adempiere.webstore.resource
|
||||||
Bundle-Version: 1.0.0.qualifier
|
Bundle-Version: 2.0.0.qualifier
|
||||||
Bundle-Vendor: Adempiere.org
|
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
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
Import-Package: org.compiere.wstore
|
Import-Package: org.compiere.wstore
|
||||||
|
|
|
@ -2,11 +2,11 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: Servlet
|
Bundle-Name: Servlet
|
||||||
Bundle-SymbolicName: org.adempiere.webstore.servlet;singleton:=true
|
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-Vendor: Adempiere.org
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
Export-Package: org.compiere.wstore
|
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
|
org.eclipse.equinox.http.registry
|
||||||
Import-Package: javax.servlet,
|
Import-Package: javax.servlet,
|
||||||
javax.servlet.http,
|
javax.servlet.http,
|
||||||
|
|
|
@ -2,10 +2,10 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: org.adempiere.webstore
|
Bundle-Name: org.adempiere.webstore
|
||||||
Bundle-SymbolicName: org.adempiere.webstore;singleton:=true
|
Bundle-SymbolicName: org.adempiere.webstore;singleton:=true
|
||||||
Bundle-Version: 1.0.0.qualifier
|
Bundle-Version: 2.0.0.qualifier
|
||||||
Require-Bundle: org.adempiere.report.jasper;bundle-version="1.0.0",
|
Require-Bundle: org.adempiere.report.jasper;bundle-version="2.0.0",
|
||||||
org.adempiere.base;bundle-version="1.0.0",
|
org.adempiere.base;bundle-version="2.0.0",
|
||||||
org.adempiere.report.jasper.webapp;bundle-version="1.0.0"
|
org.adempiere.report.jasper.webapp;bundle-version="2.0.0"
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
Web-ContextPath: wstore
|
Web-ContextPath: wstore
|
||||||
Import-Package: javax.servlet;version="2.5.0",
|
Import-Package: javax.servlet;version="2.5.0",
|
||||||
|
|
|
@ -2,10 +2,10 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: OracleProvider
|
Bundle-Name: OracleProvider
|
||||||
Bundle-SymbolicName: org.compiere.db.oracle.provider;singleton:=true
|
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
|
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",
|
||||||
org.adempiere.install;bundle-version="1.0.0"
|
org.adempiere.install;bundle-version="2.0.0"
|
||||||
Bundle-ClassPath: .,
|
Bundle-ClassPath: .,
|
||||||
ojdbc6.jar,
|
ojdbc6.jar,
|
||||||
c3p0-0.9.2.jar,
|
c3p0-0.9.2.jar,
|
||||||
|
|
|
@ -2,14 +2,14 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: PostgresqlProvider
|
Bundle-Name: PostgresqlProvider
|
||||||
Bundle-SymbolicName: org.compiere.db.postgresql.provider;singleton:=true
|
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-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
Bundle-ClassPath: .,
|
Bundle-ClassPath: .,
|
||||||
postgresql-9.2-1004.jdbc4.jar,
|
postgresql-9.2-1004.jdbc4.jar,
|
||||||
c3p0-0.9.2.jar,
|
c3p0-0.9.2.jar,
|
||||||
mchange-commons-java-0.2.3.3.jar
|
mchange-commons-java-0.2.3.3.jar
|
||||||
Require-Bundle: org.adempiere.base;bundle-version="1.0.0",
|
Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
|
||||||
org.adempiere.install;bundle-version="1.0.0"
|
org.adempiere.install;bundle-version="2.0.0"
|
||||||
Import-Package: junit.framework;version="3.8.2",
|
Import-Package: junit.framework;version="3.8.2",
|
||||||
org.junit;version="4.8.1",
|
org.junit;version="4.8.1",
|
||||||
org.osgi.framework
|
org.osgi.framework
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<feature
|
<feature
|
||||||
id="org.compiere.db.provider"
|
id="org.compiere.db.provider"
|
||||||
label="Database Provider-feature"
|
label="Database Provider-feature"
|
||||||
version="1.0.0.qualifier">
|
version="2.0.0.qualifier">
|
||||||
|
|
||||||
<description url="http://www.example.com/description">
|
<description url="http://www.example.com/description">
|
||||||
[Enter Feature Description here.]
|
[Enter Feature Description here.]
|
||||||
|
@ -17,21 +17,21 @@
|
||||||
</license>
|
</license>
|
||||||
|
|
||||||
<requires>
|
<requires>
|
||||||
<import feature="org.adempiere.base" version="1.0.0.qualifier"/>
|
<import feature="org.adempiere.base" version="2.0.0.qualifier"/>
|
||||||
</requires>
|
</requires>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.compiere.db.oracle.provider"
|
id="org.compiere.db.oracle.provider"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.compiere.db.postgresql.provider"
|
id="org.compiere.db.postgresql.provider"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
</feature>
|
</feature>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<feature
|
<feature
|
||||||
id="org.idempiere.eclipse.platform"
|
id="org.idempiere.eclipse.platform"
|
||||||
label="Eclipse Platform for iDempiere"
|
label="Eclipse Platform for iDempiere"
|
||||||
version="1.0.0.qualifier"
|
version="2.0.0.qualifier"
|
||||||
provider-name="www.idempiere.org">
|
provider-name="www.idempiere.org">
|
||||||
|
|
||||||
<description url="http://www.example.com/description">
|
<description url="http://www.example.com/description">
|
||||||
|
@ -78,7 +78,7 @@
|
||||||
version="0.0.0"
|
version="0.0.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.eclipse.core.net"
|
id="org.eclipse.core.net"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
|
@ -101,4 +101,5 @@
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="0.0.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
</feature>
|
</feature>
|
||||||
|
|
|
@ -13,8 +13,12 @@ fi
|
||||||
if [ -f plugins/org.adempiere.tomcat.config_1.0.0/META-INF/tomcat/server.xml ]
|
if [ -f plugins/org.adempiere.tomcat.config_1.0.0/META-INF/tomcat/server.xml ]
|
||||||
then
|
then
|
||||||
cp plugins/org.adempiere.tomcat.config_1.0.0/META-INF/tomcat/server.xml server.xml.sav
|
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
|
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 -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
|
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
|
cp idempiere.ini.sav idempiere.ini
|
||||||
if [ -f server.xml.sav ]
|
if [ -f server.xml.sav ]
|
||||||
then
|
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
|
rm -f server.xml.sav
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<feature
|
<feature
|
||||||
id="org.idempiere.felix.webconsole"
|
id="org.idempiere.felix.webconsole"
|
||||||
label="Felix Web Console Feature"
|
label="Felix Web Console Feature"
|
||||||
version="1.0.0.qualifier">
|
version="2.0.0.qualifier">
|
||||||
|
|
||||||
<description url="http://www.example.com/description">
|
<description url="http://www.example.com/description">
|
||||||
[Enter Feature Description here.]
|
[Enter Feature Description here.]
|
||||||
|
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: Web Console
|
Bundle-Name: Web Console
|
||||||
Bundle-SymbolicName: org.idempiere.felix.webconsole
|
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-Activator: org.idempiere.felix.webconsole.Activator
|
||||||
Bundle-ActivationPolicy: lazy
|
Bundle-ActivationPolicy: lazy
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<feature
|
<feature
|
||||||
id="org.idempiere.fitnesse"
|
id="org.idempiere.fitnesse"
|
||||||
label="Fitnesse Feature"
|
label="Fitnesse Feature"
|
||||||
version="1.0.0.qualifier">
|
version="2.0.0.qualifier">
|
||||||
|
|
||||||
<description url="http://www.example.com/description">
|
<description url="http://www.example.com/description">
|
||||||
[Enter Feature Description here.]
|
[Enter Feature Description here.]
|
||||||
|
@ -20,28 +20,28 @@
|
||||||
id="org.idempiere.fitnesse.fixture"
|
id="org.idempiere.fitnesse.fixture"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.idempiere.fitnesse.server"
|
id="org.idempiere.fitnesse.server"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.idempiere.ui.zk.selenium"
|
id="org.idempiere.ui.zk.selenium"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.idempiere.fitrecorder"
|
id="org.idempiere.fitrecorder"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
</feature>
|
</feature>
|
||||||
|
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: Fixture
|
Bundle-Name: Fixture
|
||||||
Bundle-SymbolicName: org.idempiere.fitnesse.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-Activator: org.idempiere.fitnesse.fixture.Activator
|
||||||
Bundle-ActivationPolicy: lazy
|
Bundle-ActivationPolicy: lazy
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
|
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: Fitnesse Server
|
Bundle-Name: Fitnesse Server
|
||||||
Bundle-SymbolicName: org.idempiere.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-Activator: org.idempiere.fitnesse.server.Activator
|
||||||
Bundle-ActivationPolicy: lazy
|
Bundle-ActivationPolicy: lazy
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
|
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: Fitrecorder
|
Bundle-Name: Fitrecorder
|
||||||
Bundle-SymbolicName: org.idempiere.fitrecorder;singleton:=true
|
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
|
Bundle-Activator: org.adempiere.plugin.utils.AdempiereActivator
|
||||||
Import-Package: org.adempiere.base,
|
Import-Package: org.adempiere.base,
|
||||||
org.adempiere.plugin.utils,
|
org.adempiere.plugin.utils,
|
||||||
|
@ -10,4 +10,4 @@ Import-Package: org.adempiere.base,
|
||||||
org.osgi.framework;version="1.3.0"
|
org.osgi.framework;version="1.3.0"
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
Service-Component: plugin.xml
|
Service-Component: plugin.xml
|
||||||
Require-Bundle: org.adempiere.base
|
Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
|
||||||
|
|
|
@ -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
|
|
|
@ -2,7 +2,7 @@
|
||||||
<feature
|
<feature
|
||||||
id="org.idempiere.hazelcast.service"
|
id="org.idempiere.hazelcast.service"
|
||||||
label="Hazelcast Service Feature"
|
label="Hazelcast Service Feature"
|
||||||
version="1.0.0.qualifier">
|
version="2.0.0.qualifier">
|
||||||
|
|
||||||
<description url="http://www.example.com/description">
|
<description url="http://www.example.com/description">
|
||||||
[Enter Feature Description here.]
|
[Enter Feature Description here.]
|
||||||
|
@ -20,7 +20,7 @@
|
||||||
id="org.idempiere.hazelcast.service"
|
id="org.idempiere.hazelcast.service"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
|
@ -42,7 +42,7 @@
|
||||||
id="org.idempiere.hazelcast.service.config"
|
id="org.idempiere.hazelcast.service.config"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.0.0"
|
||||||
fragment="true"/>
|
fragment="true"/>
|
||||||
|
|
||||||
</feature>
|
</feature>
|
||||||
|
|
|
@ -2,6 +2,6 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: Hazelcast Service Configuration
|
Bundle-Name: Hazelcast Service Configuration
|
||||||
Bundle-SymbolicName: org.idempiere.hazelcast.service.config
|
Bundle-SymbolicName: org.idempiere.hazelcast.service.config
|
||||||
Bundle-Version: 1.0.0
|
Bundle-Version: 2.0.0
|
||||||
Fragment-Host: org.idempiere.hazelcast.service;bundle-version="1.0.0"
|
Fragment-Host: org.idempiere.hazelcast.service;bundle-version="2.0.0"
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
|
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: iDempiere Hazelcast Service
|
Bundle-Name: iDempiere Hazelcast Service
|
||||||
Bundle-SymbolicName: org.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-Activator: org.idempiere.hazelcast.service.Activator
|
||||||
Bundle-ActivationPolicy: lazy
|
Bundle-ActivationPolicy: lazy
|
||||||
Import-Package: javax.crypto,
|
Import-Package: javax.crypto,
|
||||||
|
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: Zk Selenium
|
Bundle-Name: Zk Selenium
|
||||||
Bundle-SymbolicName: org.idempiere.ui.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-Activator: org.idempiere.ui.zk.selenium.fitnesse.Activator
|
||||||
Bundle-ActivationPolicy: lazy
|
Bundle-ActivationPolicy: lazy
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
|
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: Webservices
|
Bundle-Name: Webservices
|
||||||
Bundle-SymbolicName: org.idempiere.webservices;singleton:=true
|
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-Activator: org.idempiere.webservices.Activator
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
Import-Package: javax.activation;version="1.1.1",
|
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.xerces.xs.datatypes;version="2.9.0",
|
||||||
org.apache.xml.serialize;version="2.9.0",
|
org.apache.xml.serialize;version="2.9.0",
|
||||||
org.osgi.framework;version="1.6.0"
|
org.osgi.framework;version="1.6.0"
|
||||||
Require-Bundle: org.adempiere.base;bundle-version="1.0.0",
|
Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
|
||||||
org.adempiere.report.jasper.library;bundle-version="1.0.0",
|
org.adempiere.report.jasper.library;bundle-version="2.0.0",
|
||||||
org.adempiere.ui;bundle-version="1.0.0",
|
org.adempiere.ui;bundle-version="2.0.0",
|
||||||
org.apache.ecs;bundle-version="1.0.0"
|
org.apache.ecs;bundle-version="1.0.0"
|
||||||
Bundle-ClassPath: .,
|
Bundle-ClassPath: .,
|
||||||
WEB-INF/lib/spring-osgi-extender-1.2.1.jar,
|
WEB-INF/lib/spring-osgi-extender-1.2.1.jar,
|
||||||
|
|
Loading…
Reference in New Issue