[jboss-svn-commits] JBL Code SVN: r36155 - in labs/jbossrules/trunk: drools-camel/src/test/java/org/drools/camel/component and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Dec 1 23:21:56 EST 2010
Author: mark.proctor at jboss.com
Date: 2010-12-01 23:21:53 -0500 (Wed, 01 Dec 2010)
New Revision: 36155
Added:
labs/jbossrules/trunk/drools-flow-core/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-flow-persistence-jpa/META-INF/MANIFEST.MF
Modified:
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/util/ClassLoaderUtil.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/util/CompositeClassLoader.java
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbXSDModelTest.java
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/XStreamBatchExecutionTest.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java
labs/jbossrules/trunk/drools-flow-core/src/main/java/org/drools/process/instance/ProcessRuntimeFactoryServiceImpl.java
labs/jbossrules/trunk/drools-flow-core/src/main/java/org/drools/process/instance/ProcessRuntimeImpl.java
labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/SimpleOsgiTest.java
labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/test/utils/EclipseArtifactFinder.java
labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/boot-bundles.properties
Log:
JBRULES-2813 OSGi like ClassLoader problem
JBRULES-2795 ProcessRuntimeImpl uses the wrong classpath for instantiante implementations of managers
-These two jiras are related, as we first had to make a unified classloader before it would work.
Then after that each module needs to make sure it's classloader is in the composite classloader.
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/util/ClassLoaderUtil.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/util/ClassLoaderUtil.java 2010-12-02 04:01:50 UTC (rev 36154)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/util/ClassLoaderUtil.java 2010-12-02 04:21:53 UTC (rev 36155)
@@ -26,6 +26,24 @@
CompositeClassLoader cl = new CompositeClassLoader( null );
+ // ClassLoaders are added to the head of the list, so add in reverse
+ if ( systemClassLoader != null ) {
+ // system classloader
+ cl.addClassLoader( systemClassLoader );
+ }
+
+ if ( currentClassLoader != null ) {
+ // the current classloader, typically from a drools-core or drools-compiler class
+ cl.addClassLoader( currentClassLoader );
+ }
+
+
+ if ( contextClassLoader != null ) {
+ // context classloader
+ cl.addClassLoader( contextClassLoader );
+ }
+
+
if ( classLoaders != null && classLoaders.length > 0) {
// the user specified classloaders
for (ClassLoader classLoader : classLoaders ) {
@@ -35,21 +53,6 @@
}
}
- if ( contextClassLoader != null ) {
- // context classloader
- cl.addClassLoader( contextClassLoader );
- }
-
- if ( currentClassLoader != null ) {
- // the current classloader, typically from a drools-core or drools-compiler class
- cl.addClassLoader( currentClassLoader );
- }
-
- if ( systemClassLoader != null ) {
- // system classloader
- cl.addClassLoader( systemClassLoader );
- }
-
cl.setCachingEnabled( enableCache );
return cl;
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/util/CompositeClassLoader.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/util/CompositeClassLoader.java 2010-12-02 04:01:50 UTC (rev 36154)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/util/CompositeClassLoader.java 2010-12-02 04:21:53 UTC (rev 36155)
@@ -62,7 +62,7 @@
return;
}
}
- this.classLoaders.add( classLoader );
+ this.classLoaders.add( 0, classLoader );
this.loader.get().reset();
}
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbXSDModelTest.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbXSDModelTest.java 2010-12-02 04:01:50 UTC (rev 36154)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbXSDModelTest.java 2010-12-02 04:21:53 UTC (rev 36155)
@@ -43,9 +43,9 @@
import org.drools.impl.KnowledgeBaseImpl;
import org.drools.io.ResourceFactory;
import org.drools.reteoo.ReteooRuleBase;
-import org.drools.rule.DroolsCompositeClassLoader;
import org.drools.runtime.ExecutionResults;
import org.drools.runtime.StatefulKnowledgeSession;
+import org.drools.util.CompositeClassLoader;
import com.sun.tools.xjc.Language;
import com.sun.tools.xjc.Options;
@@ -59,7 +59,7 @@
public class CamelEndpointWithJaxbXSDModelTest extends DroolsCamelTestSupport {
private JAXBContext jaxbContext;
- private DroolsCompositeClassLoader classLoader;
+ private CompositeClassLoader classLoader;
public void testSessionInsert() throws Exception {
Class< ? > personClass = classLoader.loadClass( "org.drools.model.Person" );
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/XStreamBatchExecutionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/XStreamBatchExecutionTest.java 2010-12-02 04:01:50 UTC (rev 36154)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/XStreamBatchExecutionTest.java 2010-12-02 04:21:53 UTC (rev 36155)
@@ -1810,7 +1810,7 @@
}
}
- public void FIXMEtestInsertObjectWithDeclaredFact() throws Exception {
+ public void testInsertObjectWithDeclaredFact() throws Exception {
String str = "";
str += "package org.foo \n";
str += "declare Whee \n\ttype: String\n\tprice: Integer\n\toldPrice: Integer\nend\n";
@@ -1863,7 +1863,7 @@
}
- public void FIXMEtestInsertObjectStateful() throws Exception {
+ public void testInsertObjectStateful() throws Exception {
String str = "";
str += "package org.foo \n";
str += "declare Whee \n\ttype: String\n\tprice: Integer\n\toldPrice: Integer\nend\n";
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java 2010-12-02 04:01:50 UTC (rev 36154)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java 2010-12-02 04:21:53 UTC (rev 36155)
@@ -186,6 +186,7 @@
}
this.rootClassLoader = this.configuration.getClassLoader();
+ this.rootClassLoader.addClassLoader( getClass().getClassLoader() );
this.defaultDialect = this.configuration.getDefaultDialect();
@@ -216,6 +217,8 @@
} else {
this.rootClassLoader = this.configuration.getClassLoader();
}
+
+ this.rootClassLoader.addClassLoader( getClass().getClassLoader() );
this.dateFormats = null;//(DateFormats) this.environment.get( EnvironmentName.DATE_FORMATS );
if ( this.dateFormats == null ) {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java 2010-12-02 04:01:50 UTC (rev 36154)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java 2010-12-02 04:21:53 UTC (rev 36155)
@@ -155,6 +155,7 @@
}
this.rootClassLoader = this.config.getClassLoader();
+ this.rootClassLoader.addClassLoader( getClass().getClassLoader() );
this.pkgs = new HashMap<String, Package>();
this.processes = new HashMap();
Added: labs/jbossrules/trunk/drools-flow-core/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-flow-core/META-INF/MANIFEST.MF (rev 0)
+++ labs/jbossrules/trunk/drools-flow-core/META-INF/MANIFEST.MF 2010-12-02 04:21:53 UTC (rev 36155)
@@ -0,0 +1,144 @@
+Manifest-Version: 1.0
+Bundle-Activator: org.drools.osgi.flow.core.Activator
+Created-By: 1.5.0_21 (Sun Microsystems Inc.)
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Import-Package: com.thoughtworks.xstream,javax.swing,javax.swing.borde
+ r,javax.swing.event,org.mvel2;version="2.0",org.mvel2.compiler;versio
+ n="2.0",org.mvel2.integration;version="2.0",org.mvel2.integration.imp
+ l;version="2.0",org.osgi.framework;version="1.5"
+Bnd-LastModified: 1291147199872
+Export-Package: org.drools.process.instance.context.swimlane;uses:="or
+ g.drools.process.core.context.swimlane,org.drools.process.core,org.dr
+ ools.process.instance.context";version="5.2.0.SNAPSHOT",org.drools.pr
+ ocess.core.timer;version="5.2.0.SNAPSHOT",org.drools.process.core.dat
+ atype;version="5.2.0.SNAPSHOT",org.drools.process.instance.event;uses
+ :="org.drools.marshalling.impl,org.drools.process.instance";version="
+ 5.2.0.SNAPSHOT",org.drools.process;uses:="org.drools.process.instance
+ ";version="5.2.0.SNAPSHOT",org.drools.process.instance.context;uses:=
+ "org.drools.process.core,org.drools.process.instance";version="5.2.0.
+ SNAPSHOT",org.drools.process.instance.impl.demo;uses:="org.drools.pro
+ cess.instance,javax.swing.event,javax.swing";version="5.2.0.SNAPSHOT"
+ ,org.drools.process.core.event;version="5.2.0.SNAPSHOT",org.drools.pr
+ ocess.core.impl;uses:="org.drools.process.core,org.drools.process.cor
+ e.datatype,org.drools.process.core.context";version="5.2.0.SNAPSHOT",
+ org.drools.process.core.context.exception;uses:="org.drools.workflow.
+ core,org.drools.process.core.context,org.drools.process.core";version
+ ="5.2.0.SNAPSHOT",org.drools.process.instance.impl.humantask;uses:="j
+ avax.swing.event,javax.swing,javax.swing.border";version="5.2.0.SNAPS
+ HOT",org.drools.process.instance.context.variable;uses:="org.drools.p
+ rocess.core,org.drools.process.instance,org.drools.process.core.conte
+ xt.variable,org.drools.process.instance.context";version="5.2.0.SNAPS
+ HOT",org.drools.process.core.context;uses:="org.drools.process.core";
+ version="5.2.0.SNAPSHOT",org.drools.process.core.validation;version="
+ 5.2.0.SNAPSHOT",org.drools.process.instance.context.exception;uses:="
+ org.drools.workflow.instance,org.drools.process.instance,org.drools.p
+ rocess.core.context.exception,org.drools.workflow.core,org.drools.pro
+ cess.instance.impl,org.drools.process.core,org.drools.process.instanc
+ e.context";version="5.2.0.SNAPSHOT",org.drools.process.instance;uses:
+ ="org.drools.process.core,org.drools.process.core.context.variable,or
+ g.drools.process.instance.context.variable,org.drools.process.instanc
+ e.timer,org.drools.process.instance.event,org.drools.ruleflow.instanc
+ e,org.drools.ruleflow.core,org.drools.process.core.event,org.drools.w
+ orkflow.core.node";version="5.2.0.SNAPSHOT",org.drools.process.instan
+ ce.timer;uses:="org.drools.process.instance,org.drools.process.instan
+ ce.event";version="5.2.0.SNAPSHOT",org.drools.process.instance.impl.f
+ actory;uses:="org.drools.process.core,org.drools.process.instance,org
+ .drools.process.instance.impl,org.drools.process.instance.context";ve
+ rsion="5.2.0.SNAPSHOT",org.drools.process.core.context.variable;uses:
+ ="org.drools.process.core.datatype,org.drools.process.core,org.drools
+ .process.core.datatype.impl.type,org.drools.process.core.context";ver
+ sion="5.2.0.SNAPSHOT",org.drools.process.instance.context.exclusive;u
+ ses:="org.drools.process.instance.context";version="5.2.0.SNAPSHOT",o
+ rg.drools.process.core.validation.impl;uses:="org.drools.process.core
+ .validation";version="5.2.0.SNAPSHOT",org.drools.process.core.context
+ .swimlane;uses:="org.drools.process.core.context,org.drools.process.c
+ ore";version="5.2.0.SNAPSHOT",org.drools.process.core;uses:="org.droo
+ ls.process.core.datatype";version="5.2.0.SNAPSHOT",org.drools.process
+ .core.datatype.impl;uses:="org.drools.process.core.datatype";version=
+ "5.2.0.SNAPSHOT",org.drools.process.instance.impl;uses:="org.drools.w
+ orkflow.instance.node,org.drools.workflow.core,org.drools.process.cor
+ e,org.drools.process.instance,org.drools.process.instance.context.swi
+ mlane,org.drools.process.core.context.swimlane,org.drools.process.ins
+ tance.context.exception,org.drools.process.instance.impl.factory,org.
+ drools.process.core.context.exception,org.drools.process.core.context
+ .variable,org.drools.process.instance.context.variable,org.mvel2.inte
+ gration,org.mvel2.compiler,org.mvel2.integration.impl,org.mvel2,org.d
+ rools.workflow.instance";version="5.2.0.SNAPSHOT",org.drools.process.
+ core.datatype.impl.type;uses:="org.drools.process.core.datatype,org.d
+ rools.process.core,com.thoughtworks.xstream";version="5.2.0.SNAPSHOT"
+ ,org.drools.process.core.context.exclusive;uses:="org.drools.process.
+ core.context,org.drools.process.core";version="5.2.0.SNAPSHOT",org.dr
+ ools.workflow.instance.impl;uses:="org.drools.process.instance.contex
+ t.exception,org.drools.process.instance,org.drools.workflow.core.impl
+ ,org.drools.workflow.instance,org.drools.workflow.core,org.drools.pro
+ cess.instance.impl,org.drools.workflow.instance.impl.factory,org.droo
+ ls.workflow.instance.node,org.drools.workflow.core.node,org.drools.pr
+ ocess.core.context.variable,org.drools.process.instance.context.exclu
+ sive,org.drools.process.core,org.drools.process.instance.context.vari
+ able,org.mvel2.integration,org.mvel2.integration.impl,org.drools.proc
+ ess.instance.event";version="5.2.0.SNAPSHOT",org.drools.workflow.core
+ .node;uses:="org.drools.workflow.core.impl,org.drools.workflow.core,o
+ rg.drools.process.core.context,org.drools.process.core,org.drools.pro
+ cess.core.impl,org.drools.process.core.event,org.drools.process.core.
+ datatype,org.drools.process.core.context.variable,org.drools.process.
+ core.datatype.impl.type,org.drools.process.core.timer";version="5.2.0
+ .SNAPSHOT",org.drools.workflow.core.impl;uses:="org.drools.workflow.c
+ ore,org.drools.process.core,org.drools.workflow.core.node,org.drools.
+ process.core.impl";version="5.2.0.SNAPSHOT",org.drools.workflow.core;
+ uses:="org.drools.process.core";version="5.2.0.SNAPSHOT",org.drools.w
+ orkflow.instance.impl.factory;uses:="org.drools.workflow.instance.imp
+ l,org.drools.workflow.instance";version="5.2.0.SNAPSHOT",org.drools.w
+ orkflow.instance.context;uses:="org.drools.workflow.instance,org.droo
+ ls.process.instance,org.drools.process.core,org.drools.process.instan
+ ce.impl,org.drools.process.instance.context";version="5.2.0.SNAPSHOT"
+ ,org.drools.workflow.instance;uses:="org.drools.process.instance,org.
+ drools.workflow.core.impl,org.drools.workflow.instance.impl";version=
+ "5.2.0.SNAPSHOT",org.drools.workflow.instance.node;uses:="org.drools.
+ workflow.instance.impl,org.drools.workflow.instance,org.drools.workfl
+ ow.core.node,org.drools.workflow.core,org.drools.process.instance.imp
+ l,org.drools.process.core,org.drools.process.instance,org.drools.proc
+ ess.core.event,org.drools.process.instance.context.variable,org.drool
+ s.process.instance.context.exception,org.mvel2,org.mvel2.integration,
+ org.drools.process.instance.context.swimlane,org.drools.process.insta
+ nce.context.exclusive,org.drools.process.core.timer,org.drools.proces
+ s.instance.timer";version="5.2.0.SNAPSHOT",org.drools.ruleflow.core.v
+ alidation;uses:="org.mvel2.compiler,org.drools.process.core.timer,org
+ .drools.process.core.validation,org.drools.process.core.datatype,org.
+ drools.workflow.core.node,org.drools.process.core.context.variable,or
+ g.mvel2,org.drools.workflow.core.impl,org.drools.process.core.validat
+ ion.impl,org.drools.ruleflow.core,org.drools.process.core,org.drools.
+ workflow.core";version="5.2.0.SNAPSHOT",org.drools.ruleflow.instance;
+ uses:="org.drools.workflow.instance.impl,org.drools.workflow.instance
+ ,org.drools.ruleflow.core,org.drools.workflow.core.node,org.drools.pr
+ ocess.instance";version="5.2.0.SNAPSHOT",org.drools.ruleflow.core.fac
+ tory;uses:="org.drools.workflow.core.impl,org.drools.ruleflow.core,or
+ g.drools.workflow.core.node,org.drools.workflow.core,org.drools.proce
+ ss.core.datatype,org.drools.process.core,org.drools.process.core.cont
+ ext.exception,org.drools.process.core.context.variable,org.drools.pro
+ cess.core.event,org.drools.process.core.timer,org.drools.process.core
+ .impl";version="5.2.0.SNAPSHOT",org.drools.ruleflow.core;uses:="org.d
+ rools.workflow.core.impl,org.drools.workflow.core,org.drools.ruleflow
+ .core.factory,org.drools.workflow.core.node,org.drools.process.core.c
+ ontext.swimlane,org.drools.process.core,org.drools.process.core.conte
+ xt.exception,org.drools.process.core.context.variable,org.drools.rule
+ flow.core.validation,org.drools.process.core.validation,org.drools.pr
+ ocess.core.datatype";version="5.2.0.SNAPSHOT",org.drools.marshalling.
+ impl;uses:="org.drools.workflow.instance.impl,org.drools.process.inst
+ ance.context.swimlane,org.drools.process.instance,org.drools.process.
+ instance.context.exclusive,org.drools.workflow.instance,org.drools.wo
+ rkflow.instance.node,org.drools.process.core,org.drools.process.insta
+ nce.context.variable,org.drools.process.instance.timer,org.drools.rul
+ eflow.instance";version="5.2.0.SNAPSHOT",org.drools.osgi.flow.core;us
+ es:="org.drools.marshalling.impl,org.osgi.framework,org.drools.proces
+ s.instance";version="5.2.0.SNAPSHOT"
+Bundle-Version: 5.2.0.SNAPSHOT
+Bundle-Name: Drools :: Flow Core
+Bundle-Description: A rule production system
+Bundle-DocURL: http://www.jboss.org/
+Bundle-Vendor: JBoss Inc.
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.drools.flow.core;singleton:=true
+Tool: Bnd-0.0.357
+Require-Bundle: org.drools.core;bundle-version="5.2.0.SNAPSHOT"
+DynamicImport-Package: *
+
Modified: labs/jbossrules/trunk/drools-flow-core/src/main/java/org/drools/process/instance/ProcessRuntimeFactoryServiceImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-flow-core/src/main/java/org/drools/process/instance/ProcessRuntimeFactoryServiceImpl.java 2010-12-02 04:01:50 UTC (rev 36154)
+++ labs/jbossrules/trunk/drools-flow-core/src/main/java/org/drools/process/instance/ProcessRuntimeFactoryServiceImpl.java 2010-12-02 04:21:53 UTC (rev 36155)
@@ -6,8 +6,7 @@
public class ProcessRuntimeFactoryServiceImpl implements ProcessRuntimeFactoryService {
- public InternalProcessRuntime newProcessRuntime(
- AbstractWorkingMemory workingMemory) {
+ public InternalProcessRuntime newProcessRuntime(AbstractWorkingMemory workingMemory) {
return new ProcessRuntimeImpl(workingMemory);
}
Modified: labs/jbossrules/trunk/drools-flow-core/src/main/java/org/drools/process/instance/ProcessRuntimeImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-flow-core/src/main/java/org/drools/process/instance/ProcessRuntimeImpl.java 2010-12-02 04:01:50 UTC (rev 36154)
+++ labs/jbossrules/trunk/drools-flow-core/src/main/java/org/drools/process/instance/ProcessRuntimeImpl.java 2010-12-02 04:21:53 UTC (rev 36155)
@@ -27,6 +27,7 @@
import org.drools.runtime.process.EventListener;
import org.drools.runtime.process.ProcessInstance;
import org.drools.runtime.process.WorkItemManager;
+import org.drools.util.CompositeClassLoader;
import org.drools.workflow.core.node.EventTrigger;
import org.drools.workflow.core.node.StartNode;
import org.drools.workflow.core.node.Trigger;
@@ -53,6 +54,8 @@
public ProcessRuntimeImpl(AbstractWorkingMemory workingMemory) {
this.workingMemory = workingMemory;
this.kruntime = (InternalKnowledgeRuntime) workingMemory.getKnowledgeRuntime();
+ ((CompositeClassLoader)getRootClassLoader()).addClassLoader( getClass().getClassLoader() );
+
initProcessInstanceManager();
initSignalManager();
timerManager = new TimerManager(kruntime, kruntime.getTimerService());
@@ -61,9 +64,10 @@
initProcessActivationListener();
}
- private void initProcessInstanceManager() {
+ private void initProcessInstanceManager() {
String processInstanceManagerClass = ((SessionConfiguration) kruntime.getSessionConfiguration()).getProcessInstanceManagerFactory();
try {
+ Object o = loadClass(processInstanceManagerClass).newInstance();
processInstanceManager = ((ProcessInstanceManagerFactory) loadClass(processInstanceManagerClass)
.newInstance())
.createProcessInstanceManager(kruntime);
Added: labs/jbossrules/trunk/drools-flow-persistence-jpa/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-flow-persistence-jpa/META-INF/MANIFEST.MF (rev 0)
+++ labs/jbossrules/trunk/drools-flow-persistence-jpa/META-INF/MANIFEST.MF 2010-12-02 04:21:53 UTC (rev 36155)
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+Created-By: 1.5.0_21 (Sun Microsystems Inc.)
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Import-Package: javax.persistence,org.hibernate.annotations
+Bnd-LastModified: 1291147233679
+Export-Package: org.drools.persistence.processinstance;uses:="javax.pe
+ rsistence,org.hibernate.annotations";version="5.2.0.SNAPSHOT"
+Bundle-Version: 5.2.0.SNAPSHOT
+Bundle-Name: Drools Flow :: Persistence :: JPA
+Bundle-Description: A rule production system
+Bundle-DocURL: http://www.jboss.org/
+Bundle-Vendor: JBoss Inc.
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.drools.flow-persistence-jpa
+Tool: Bnd-0.0.357
+Require-Bundle: org.drools.core;bundle-version="5.2.0.SNAPSHOT", org.d
+ rools.compiler;bundle-version="5.2.0.SNAPSHOT"
+DynamicImport-Package: *
+
Modified: labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/SimpleOsgiTest.java
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/SimpleOsgiTest.java 2010-12-02 04:01:50 UTC (rev 36154)
+++ labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/SimpleOsgiTest.java 2010-12-02 04:21:53 UTC (rev 36155)
@@ -42,6 +42,7 @@
protected void onSetUp() throws Exception {
ServiceReference kbuilderRef = bundleContext.getServiceReference( KnowledgeBuilderFactoryService.class.getName() );
Thread.currentThread().setContextClassLoader( bundleContext.getService( kbuilderRef ).getClass().getClassLoader() );
+ System.out.println( "setup" + bundleContext.getService( kbuilderRef ).getClass().getClassLoader() );
}
protected void onTearDown() throws Exception {
Modified: labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/test/utils/EclipseArtifactFinder.java
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/test/utils/EclipseArtifactFinder.java 2010-12-02 04:01:50 UTC (rev 36154)
+++ labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/test/utils/EclipseArtifactFinder.java 2010-12-02 04:21:53 UTC (rev 36155)
@@ -185,7 +185,7 @@
for (File folder : folders)
importPluginFromFolder(folder, m_TargetPlugins);
- }
+ }
for (Plugin plugin : m_WorkspacePlugins) {
if (plugin.match(aArtifactId, aVersion))
@@ -317,7 +317,11 @@
String workspaceAreaProp = System.getProperty(s_PROP_WORKSPACE_AREA, "../..");
- System.out.println( "workspace area: " + workspaceAreaProp );
+ try {
+ System.out.println( "workspace area: " + new File(workspaceAreaProp).getCanonicalPath() );
+ } catch ( IOException e ) {
+ throw new RuntimeException("Unable to set path");
+ }
if (workspaceAreaProp != null)
return new File(workspaceAreaProp);
Modified: labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/boot-bundles.properties
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/boot-bundles.properties 2010-12-02 04:01:50 UTC (rev 36154)
+++ labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/boot-bundles.properties 2010-12-02 04:21:53 UTC (rev 36155)
@@ -19,7 +19,7 @@
# versioning
-ignore.drools.version=5.2.0-SNAPSHOT
+ignore.drools.version=5.2.0.SNAPSHOT
ignore.junit.version=4.8.1
@@ -185,14 +185,14 @@
com.h2database,com.springsource.org.h2,1.0.71
-org.drools,drools-api,${ignore.drools.version}
-org.drools,drools-core,${ignore.drools.version}
-org.drools,drools-flow-core,${ignore.drools.version}
-org.drools,drools-compiler,${ignore.drools.version}
-org.drools,drools-flow-compiler,${ignore.drools.version}
-org.drools,drools-templates,${ignore.drools.version}
-org.drools,drools-decisiontables,${ignore.drools.version}
-org.drools,drools-bpmn2,${ignore.drools.version}
+org.drools,org.drools.api,${ignore.drools.version}
+org.drools,org.drools.core,${ignore.drools.version}
+org.drools,org.drools.flow.core,${ignore.drools.version}
+org.drools,org.drools.compiler,${ignore.drools.version}
+org.drools,org.drools.flow.compiler,${ignore.drools.version}
+org.drools,org.drools.templates,${ignore.drools.version}
+org.drools,org.drools.decisiontables,${ignore.drools.version}
+org.drools,org.drools.bpmn2,${ignore.drools.version}
#org.drools,org.drools.persistence-jpa,${ignore.drools.version}
More information about the jboss-svn-commits
mailing list