midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-461 error to send reports (Mail) in ZK Web Client (loader constraint violation). 

- Merge javax.mail and javax.activation bundle into one to resolve class loader issue.
This commit is contained in:
Heng Sin Low 2012-10-23 05:41:41 +08:00
parent ed20b4c6b5
commit 221934a56b
8 changed files with 383 additions and 369 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
org.adempiere.base-feature/feature.xml
View File

@ -40,28 +40,28 @@
id="org.adempiere.base"
download-size="0"
install-size="0"
version="0.0.0"
version="1.0.0.qualifier"
unpack="false"/>
<plugin
id="org.adempiere.base.callout"
download-size="0"
install-size="0"
version="0.0.0"
version="1.0.0.qualifier"
unpack="false"/>
<plugin
id="org.adempiere.base.process"
download-size="0"
install-size="0"
version="0.0.0"
version="1.0.0.qualifier"
unpack="false"/>
<plugin
id="org.adempiere.extend"
download-size="0"
install-size="0"
version="0.0.0"
version="1.0.0.qualifier"
fragment="true"
unpack="false"/>
@ -69,208 +69,201 @@
id="org.adempiere.ui"
download-size="0"
install-size="0"
version="0.0.0"
version="1.0.0.qualifier"
unpack="false"/>
<plugin
id="org.apache.ecs"
download-size="0"
install-size="0"
version="0.0.0"
version="1.0.0.qualifier"
unpack="false"/>
<plugin
id="org.restlet"
download-size="0"
install-size="0"
version="0.0.0"
version="2.0.15.0"
unpack="false"/>
<plugin
id="org.apache.ant"
download-size="0"
install-size="0"
version="0.0.0"/>
version="1.7.1.v20100518-1145"/>
<plugin
id="com.springsource.javax.mail"
download-size="0"
install-size="0"
version="0.0.0"
version="1.4.5"
unpack="false"/>
<plugin
id="com.springsource.javax.jms"
download-size="0"
install-size="0"
version="0.0.0"
version="1.1.0"
unpack="false"/>
<plugin
id="javax.servlet"
download-size="0"
install-size="0"
version="0.0.0"
version="3.0.0.v201103241009"
unpack="false"/>
<plugin
id="org.junit"
download-size="0"
install-size="0"
version="0.0.0"
version="4.8.2.v4_8_2_v20110321-1705"
unpack="false"/>
<plugin
id="com.springsource.net.sf.cglib"
download-size="0"
install-size="0"
version="0.0.0"
version="2.2.0"
unpack="false"/>
<plugin
id="com.springsource.org.apache.activemq"
download-size="0"
install-size="0"
version="0.0.0"
version="5.3.0"
unpack="false"/>
<plugin
id="org.apache.commons.collections"
download-size="0"
install-size="0"
version="0.0.0"
version="3.2.0.v201005080500"
unpack="false"/>
<plugin
id="org.apache.commons.net"
download-size="0"
install-size="0"
version="0.0.0"
version="2.2.0.v201101241833"
unpack="false"/>
<plugin
id="org.apache.poi"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.springsource.javax.activation"
download-size="0"
install-size="0"
version="0.0.0"
version="3.7.0"
unpack="false"/>
<plugin
id="com.springsource.org.apache.kahadb"
download-size="0"
install-size="0"
version="0.0.0"
version="5.3.0"
unpack="false"/>
<plugin
id="com.springsource.javax.management.j2ee"
download-size="0"
install-size="0"
version="0.0.0"
version="1.0.1"
unpack="false"/>
<plugin
id="com.springsource.org.apache.commons.logging"
download-size="0"
install-size="0"
version="0.0.0"
version="1.1.1"
unpack="false"/>
<plugin
id="com.springsource.javax.ejb"
download-size="0"
install-size="0"
version="0.0.0"
version="3.0.0"
unpack="false"/>
<plugin
id="com.springsource.javax.xml.rpc"
download-size="0"
install-size="0"
version="0.0.0"
version="1.1.0.v20110517"
unpack="false"/>
<plugin
id="com.springsource.javax.xml.soap"
download-size="0"
install-size="0"
version="0.0.0"
version="1.3.0"
unpack="false"/>
<plugin
id="org.apache.commons.codec"
download-size="0"
install-size="0"
version="0.0.0"
version="1.3.0.v201101211617"
unpack="false"/>
<plugin
id="org.apache.xml.resolver"
download-size="0"
install-size="0"
version="0.0.0"
version="1.2.0.v201005080400"
unpack="false"/>
<plugin
id="org.apache.xerces"
download-size="0"
install-size="0"
version="0.0.0"
version="2.9.0.v201101211617"
unpack="false"/>
<plugin
id="org.apache.xml.serializer"
download-size="0"
install-size="0"
version="0.0.0"
version="2.7.1.v201005080400"
unpack="false"/>
<plugin
id="com.springsource.org.apache.xmlcommons"
download-size="0"
install-size="0"
version="0.0.0"
version="1.3.4"
unpack="false"/>
<plugin
id="javax.xml"
download-size="0"
install-size="0"
version="0.0.0"
version="1.3.4.v201005080400"
unpack="false"/>
<plugin
id="javax.el"
download-size="0"
install-size="0"
version="0.0.0"
version="2.2.0.v201105051105"
unpack="false"/>
<plugin
id="org.adempiere.install"
download-size="0"
install-size="0"
version="0.0.0"/>
version="1.0.0.qualifier"/>
<plugin
id="org.eclipse.osgi.services"
download-size="0"
install-size="0"
version="0.0.0"
version="3.3.0.v20110513"
unpack="false"/>
<plugin
id="org.hamcrest.core"
download-size="0"
install-size="0"
version="0.0.0"
version="1.1.0.v20090501071000"
unpack="false"/>
</feature>

15
org.adempiere.base/META-INF/MANIFEST.MF
View File

@ -247,10 +247,19 @@ Export-Package: bsh,
org.supercsv.prefs,
org.supercsv.util
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: com.sun.mail.smtp;version="1.4.0",
Import-Package: com.sun.mail.auth;version="1.4.5",
com.sun.mail.handlers;version="1.4.5",
com.sun.mail.iap;version="1.4.5",
com.sun.mail.imap;version="1.4.5",
com.sun.mail.imap.protocol;version="1.4.5",
com.sun.mail.pop3;version="1.4.5",
com.sun.mail.smtp;version="1.4.5",
com.sun.mail.util;version="1.4.5",
com.sun.mail.util.logging;version="1.4.5",
javax.activation;version="1.1.1",
javax.jms;version="1.1.0",
javax.mail;version="1.4.0",
javax.mail.internet;version="1.4.0",
javax.mail;version="1.4.5",
javax.mail.internet;version="1.4.5",
javax.servlet;version="2.5.0",
javax.servlet.http;version="2.5.0",
junit.framework;version="3.8.2",

4
org.adempiere.install/META-INF/MANIFEST.MF
View File

@ -9,8 +9,8 @@ Export-Package: org.adempiere.install,
org.compiere.install
Require-Bundle: org.adempiere.base;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.mail;version="1.4.0",
javax.mail.internet;version="1.4.0",
Import-Package: javax.mail;version="1.4.5",
javax.mail.internet;version="1.4.5",
org.apache.tools.ant,
org.eclipse.ant.core,
org.eclipse.core.runtime;version="3.4.0",

4
org.adempiere.sdk-feature/adempiere.cquery
View File

@ -9,4 +9,8 @@
<cq:advisorNode namePattern="^org\.apache\.poi$" componentType="osgi.bundle" versionOverride="[3.7.0,4.0.0)">
<cq:property key="jar.version" value="3.7.0"/>
</cq:advisorNode>
<cq:advisorNode namePattern="^com\.springsource\.javax\.mail$" componentType="osgi.bundle" versionOverride="[1.4.5,1.4.5]">
<cq:property key="jar.version" value="1.4.5"/>
</cq:advisorNode>
<cq:advisorNode namePattern="^com\.springsource\.javax\.activation$" componentType="osgi.bundle" skipComponent="true"/>
</cq:componentQuery>

3
org.adempiere.sdk-feature/adempiere.rmap
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<rm:rmap xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns:maven="http://www.eclipse.org/buckminster/MavenProvider-1.0" xmlns:rm="http://www.eclipse.org/buckminster/RMap-1.0">
<rm:locator pattern="^org\.apache\.poi$" searchPathRef="workspace.bundle.jar"/>
<rm:locator pattern="^com\.springsource\.javax\.mail$" searchPathRef="workspace.bundle.jar"/>
<rm:locator pattern="^org\.eclipse(\..+)?" searchPathRef="equinox" failOnError="false"/>
<rm:locator pattern="^org\.sat4j(\..+)?" searchPathRef="equinox"/>
<rm:locator pattern="^org\.slf4j(\..+)?" searchPathRef="orbit"/>
@ -39,7 +40,7 @@
<rm:uri format="file:///{0}/lib/plugins/{1}_{2}.jar">
<bc:replace>
<bc:propertyRef key="workspace.root"/>
<bc:match pattern="\s" replacement="%20" />
<bc:match pattern="\s" replacement="%20"/>
</bc:replace>
<bc:propertyRef key="buckminster.component"/>
<bc:propertyRef key="jar.version"/>

7
org.adempiere.server-feature/feature.xml
View File

@ -315,4 +315,11 @@
version="0.0.0"
unpack="false"/>
<plugin
id="com.springsource.javax.mail"
download-size="0"
install-size="0"
version="1.4.5"
unpack="false"/>
</feature>

2
org.adempiere.server-feature/setup/configuration/config.ini
View File

@ -1,5 +1,5 @@
osgi.framework=file\:../plugins/org.eclipse.osgi_3.7.2.v20120110-1415.jar
equinox.use.ds=true
osgi.bundles=org.eclipse.core.variables,org.eclipse.ant.core,org.eclipse.core.runtime@start,org.adempiere.base@start,org.compiere.db.oracle.provider,org.compiere.db.postgresql.provider,org.hamcrest.core,org.junit,org.adempiere.install,org.restlet,com.springsource.net.sf.cglib,com.springsource.javax.mail,com.springsource.org.apache.activemq,com.springsource.org.apache.kahadb,org.apache.commons.collections,org.apache.ant,javax.servlet,com.springsource.javax.jms,org.apache.ecs,org.apache.commons.net,org.eclipse.equinox.app,org.eclipse.equinox.registry,org.eclipse.equinox.common@2:start,org.eclipse.core.contenttype,org.apache.poi,org.eclipse.core.jobs,org.eclipse.equinox.preferences,org.apache.commons.logging,com.springsource.org.apache.commons.logging,com.springsource.javax.management.j2ee,org.eclipse.osgi.services,com.springsource.javax.ejb,com.springsource.javax.xml.rpc,com.springsource.javax.xml.soap,com.springsource.javax.activation,javax.xml
osgi.bundles=org.eclipse.core.variables,org.eclipse.ant.core,org.eclipse.core.runtime@start,org.adempiere.base@start,org.compiere.db.oracle.provider,org.compiere.db.postgresql.provider,org.hamcrest.core,org.junit,org.adempiere.install,org.restlet,com.springsource.net.sf.cglib,com.springsource.javax.mail,com.springsource.org.apache.activemq,com.springsource.org.apache.kahadb,org.apache.commons.collections,org.apache.ant,javax.servlet,com.springsource.javax.jms,org.apache.ecs,org.apache.commons.net,org.eclipse.equinox.app,org.eclipse.equinox.registry,org.eclipse.equinox.common@2:start,org.eclipse.core.contenttype,org.apache.poi,org.eclipse.core.jobs,org.eclipse.equinox.preferences,org.apache.commons.logging,com.springsource.org.apache.commons.logging,com.springsource.javax.management.j2ee,org.eclipse.osgi.services,com.springsource.javax.ejb,com.springsource.javax.xml.rpc,com.springsource.javax.xml.soap,javax.xml
osgi.framework.extensions=
osgi.bundles.defaultStartLevel=4

2
org.adempiere.server/META-INF/MANIFEST.MF
View File

@ -13,7 +13,7 @@ Bundle-ClassPath: WEB-INF/lib/jardiff.jar,
WEB-INF/lib/jnlp-servlet.jar,
.
Import-Package: javax.jms;version="1.1.0",
javax.mail;version="1.4.0",
javax.mail;version="1.4.5",
javax.servlet;version="2.5.0",
javax.servlet.http;version="2.5.0",
org.apache.activemq;version="5.3.0",