diff --git a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF index 55daf48363..2e65d7dd48 100644 --- a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF +++ b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF @@ -6,6 +6,40 @@ Bundle-Version: 0.0.0.1 Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.adempiere.base, org.adempiere.util, + org.apache.xerces.dom;version="2.9.0", + org.apache.xerces.dom.events;version="2.9.0", + org.apache.xerces.dom3.as;version="2.9.0", + org.apache.xerces.impl;version="2.9.0", + org.apache.xerces.impl.dtd;version="2.9.0", + org.apache.xerces.impl.dtd.models;version="2.9.0", + org.apache.xerces.impl.dv;version="2.9.0", + org.apache.xerces.impl.dv.dtd;version="2.9.0", + org.apache.xerces.impl.dv.util;version="2.9.0", + org.apache.xerces.impl.dv.xs;version="2.9.0", + org.apache.xerces.impl.io;version="2.9.0", + org.apache.xerces.impl.msg;version="2.9.0", + org.apache.xerces.impl.validation;version="2.9.0", + org.apache.xerces.impl.xpath;version="2.9.0", + org.apache.xerces.impl.xpath.regex;version="2.9.0", + org.apache.xerces.impl.xs;version="2.9.0", + org.apache.xerces.impl.xs.identity;version="2.9.0", + org.apache.xerces.impl.xs.models;version="2.9.0", + org.apache.xerces.impl.xs.opti;version="2.9.0", + org.apache.xerces.impl.xs.traversers;version="2.9.0", + org.apache.xerces.impl.xs.util;version="2.9.0", + org.apache.xerces.jaxp;version="2.9.0", + org.apache.xerces.jaxp.datatype;version="2.9.0", + org.apache.xerces.jaxp.validation;version="2.9.0", + org.apache.xerces.parsers;version="2.9.0", + org.apache.xerces.util;version="2.9.0", + org.apache.xerces.xinclude;version="2.9.0", + org.apache.xerces.xni;version="2.9.0", + org.apache.xerces.xni.grammars;version="2.9.0", + org.apache.xerces.xni.parser;version="2.9.0", + org.apache.xerces.xpointer;version="2.9.0", + org.apache.xerces.xs;version="2.9.0", + org.apache.xerces.xs.datatypes;version="2.9.0", + org.apache.xml.serialize;version="2.9.0", org.compiere, org.compiere.model, org.compiere.util, diff --git a/org.adempiere.plugin.utils/src/org/adempiere/plugin/utils/AdempiereActivator.java b/org.adempiere.plugin.utils/src/org/adempiere/plugin/utils/AdempiereActivator.java index b0ebb792a2..eeed7a0aff 100644 --- a/org.adempiere.plugin.utils/src/org/adempiere/plugin/utils/AdempiereActivator.java +++ b/org.adempiere.plugin.utils/src/org/adempiere/plugin/utils/AdempiereActivator.java @@ -164,12 +164,15 @@ public class AdempiereActivator implements BundleActivator, ServiceTrackerCustom Adempiere.getThreadPoolExecutor().execute(new Runnable() { @Override public void run() { + ClassLoader cl = Thread.currentThread().getContextClassLoader(); try { + Thread.currentThread().setContextClassLoader(AdempiereActivator.class.getClassLoader()); setupPackInContext(); installPackage(); } finally { ServerContext.dispose(); service = null; + Thread.currentThread().setContextClassLoader(cl); } } }); @@ -178,12 +181,15 @@ public class AdempiereActivator implements BundleActivator, ServiceTrackerCustom @Override public void stateChange(ServerStateChangeEvent event) { if (event.getEventType() == ServerStateChangeEvent.SERVER_START && service != null) { + ClassLoader cl = Thread.currentThread().getContextClassLoader(); try { + Thread.currentThread().setContextClassLoader(AdempiereActivator.class.getClassLoader()); setupPackInContext(); installPackage(); } finally { ServerContext.dispose(); service = null; + Thread.currentThread().setContextClassLoader(cl); } } }