[jboss-svn-commits] JBL Code SVN: r31079 - in labs/jbossrules/trunk: drools-api and 19 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Jan 14 04:24:26 EST 2010


Author: mark.proctor at jboss.com
Date: 2010-01-14 04:24:25 -0500 (Thu, 14 Jan 2010)
New Revision: 31079

Added:
   labs/jbossrules/trunk/drools-api/src/main/java/org/drools/Service.java
Modified:
   labs/jbossrules/trunk/drools-api/.classpath
   labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/drools-api/pom.xml
   labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBaseFactory.java
   labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBaseProvider.java
   labs/jbossrules/trunk/drools-api/src/main/java/org/drools/SystemEventListenerFactory.java
   labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderFactory.java
   labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderProvider.java
   labs/jbossrules/trunk/drools-api/src/main/java/org/drools/io/ResourceFactory.java
   labs/jbossrules/trunk/drools-api/src/main/java/org/drools/io/ResourceProvider.java
   labs/jbossrules/trunk/drools-api/src/main/java/org/drools/osgi/api/Activator.java
   labs/jbossrules/trunk/drools-api/src/main/java/org/drools/persistence/jpa/JPAKnowledgeService.java
   labs/jbossrules/trunk/drools-compiler/.classpath
   labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/drools-compiler/pom.xml
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/osgi/compiler/Activator.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderConfigurationTest.java
   labs/jbossrules/trunk/drools-core/.classpath
   labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/drools-core/pom.xml
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/SessionConfiguration.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/ClassPathResource.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/osgi/core/Activator.java
   labs/jbossrules/trunk/drools-decisiontables/.classpath
   labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/drools-decisiontables/pom.xml
   labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/pom.xml
Log:
JBRULES-2351 OSGi Ready
-fidling around with service tracker

Modified: labs/jbossrules/trunk/drools-api/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-api/.classpath	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-api/.classpath	2010-01-14 09:24:25 UTC (rev 31079)
@@ -45,7 +45,8 @@
   <classpathentry kind="var" path="M2_REPO/org/milyn/milyn-smooks-javabean/1.2/milyn-smooks-javabean-1.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/osgi/org.osgi.core/r4v42/org.osgi.core-r4v42.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/equinox/org.eclipse.osgi/3.5.1/org.eclipse.osgi-3.5.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/equinox/org.eclipse.osgi.util/3.5.1/org.eclipse.osgi.util-3.5.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/poi/poi/3.2-FINAL/poi-3.2-FINAL.jar"/>
   <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar"/>

Modified: labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF	2010-01-14 09:24:25 UTC (rev 31079)
@@ -27,6 +27,7 @@
  org.drools.logger;version="5.1",
  org.drools.management;version="5.1",
  org.drools.marshalling;version="5.1",
+ org.drools.osgi.api;version="5.1",
  org.drools.persistence.jpa;version="5.1",
  org.drools.runtime;version="5.1",
  org.drools.runtime.conf;version="5.1",
@@ -36,28 +37,30 @@
  org.drools.runtime.rule;version="5.1",
  org.drools.task.service;version="5.1",
  org.drools.time;version="5.1",
- org.drools.util.internal;version="5.1",
+ org.drools.util;version="5.1",
  org.drools.vsm;version="5.1",
  org.milyn;resolution:=optional,
- org.osgi.framework,
+ org.osgi.framework;version="1.5";resolution:=optional,
+ org.osgi.util.tracker;version="1.4";resolution:=optional,
  org.quartz;version="1.6";resolution:=optional
-Bnd-LastModified: 1263413779469
+Bnd-LastModified: 1263459104455
 Export-Package: org.drools;version="5.1.0.SNAPSHOT";
   uses:="org.drools.io,
    org.drools.event.knowledgebase,
    org.drools.runtime,
    org.drools.definition,
+   org.drools.definition.type,
    org.drools.definition.rule,
-   org.drools.definition.type,
    org.drools.definition.process,
    org.drools.conf,
-   org.drools.util",
+   org.drools.util.internal",
  org.drools.agent;version="5.1.0.SNAPSHOT";uses:="org.drools.runtime,org.drools,org.drools.io",
  org.drools.builder;version="5.1.0.SNAPSHOT";
   uses:="org.drools.io,
    org.drools.definition,
    org.drools,
-   org.drools.builder.conf",
+   org.drools.builder.conf,
+   org.drools.util.internal",
  org.drools.builder.conf;version="5.1.0.SNAPSHOT";uses:="org.drools.runtime.rule,org.drools.conf",
  org.drools.builder.help;version="5.1.0.SNAPSHOT";
   uses:="com.sun.tools.xjc,
@@ -65,7 +68,7 @@
    org.drools.io,
    org.drools,
    javax.xml.bind",
- org.drools.command;version="5.1.0.SNAPSHOT";uses:="org.drools.runtime,org.drools,org.drools.runtime.rule",
+ org.drools.command;version="5.1.0.SNAPSHOT";uses:="org.drools.runtime,org.drools.runtime.rule",
  org.drools.command.impl;version="5.1.0.SNAPSHOT";uses:="org.drools.command",
  org.drools.conf;version="5.1.0.SNAPSHOT";uses:="org.drools.runtime.rule",
  org.drools.definition;version="5.1.0.SNAPSHOT";uses:="org.drools.definition.rule,org.drools.definition.process",
@@ -77,11 +80,16 @@
  org.drools.event.knowledgebase;version="5.1.0.SNAPSHOT";uses:="org.drools.definition.rule,org.drools.definition,org.drools",
  org.drools.event.process;version="5.1.0.SNAPSHOT";uses:="org.drools.event,org.drools.runtime.process",
  org.drools.event.rule;version="5.1.0.SNAPSHOT";uses:="org.drools.event,org.drools.runtime.rule",
- org.drools.io;version="5.1.0.SNAPSHOT";uses:="org.drools,org.drools.event.io",
- org.drools.logger;version="5.1.0.SNAPSHOT";uses:="org.drools.event,org.drools",
+ org.drools.io;version="5.1.0.SNAPSHOT";uses:="org.drools,org.drools.event.io,org.drools.util.internal",
+ org.drools.logger;version="5.1.0.SNAPSHOT";uses:="org.drools.event",
  org.drools.management;version="5.1.0.SNAPSHOT";uses:="javax.management",
  org.drools.marshalling;version="5.1.0.SNAPSHOT";uses:="org.drools.runtime,org.drools",
- org.drools.persistence.jpa;version="5.1.0.SNAPSHOT";uses:="org.drools.runtime,org.drools,org.drools.util",
+ org.drools.osgi.api;version="5.1.0.SNAPSHOT";
+  uses:="org.drools,
+   org.osgi.framework,
+   org.osgi.util.tracker,
+   org.drools.util.internal",
+ org.drools.persistence.jpa;version="5.1.0.SNAPSHOT";uses:="org.drools.runtime,org.drools",
  org.drools.runtime;version="5.1.0.SNAPSHOT";
   uses:="org.drools.command,
    org.drools.time,
@@ -91,23 +99,17 @@
    org.drools.runtime.rule,
    org.drools.runtime.conf",
  org.drools.runtime.conf;version="5.1.0.SNAPSHOT";uses:="org.drools.conf",
- org.drools.runtime.help;version="5.1.0.SNAPSHOT";
-  uses:="org.drools,
-   com.thoughtworks.xstream,
-   org.drools.time,
-   org.quartz",
+ org.drools.runtime.help;version="5.1.0.SNAPSHOT";uses:="com.thoughtworks.xstream,org.drools.time,org.quartz",
  org.drools.runtime.pipeline;version="5.1.0.SNAPSHOT";
   uses:="org.drools.runtime,
    javax.xml.bind,
    net.sf.jxls.reader,
    org.milyn,
-   org.drools,
    com.thoughtworks.xstream",
  org.drools.runtime.process;version="5.1.0.SNAPSHOT";uses:="org.drools.runtime",
  org.drools.runtime.rule;version="5.1.0.SNAPSHOT";uses:="org.drools.definition.rule,org.drools.runtime",
  org.drools.task.service;version="5.1.0.SNAPSHOT",
  org.drools.time;version="5.1.0.SNAPSHOT",
- org.drools.util.internal;version="5.1.0.SNAPSHOT";uses:="org.drools",
  org.drools.vsm;version="5.1.0.SNAPSHOT";
   uses:="org.drools.command,
    org.drools.runtime,
@@ -123,4 +125,5 @@
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.drools.api
 Tool: Bnd-0.0.357
+Bundle-Activator: org.drools.osgi.api.Activator
 

Modified: labs/jbossrules/trunk/drools-api/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-api/pom.xml	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-api/pom.xml	2010-01-14 09:24:25 UTC (rev 31079)
@@ -13,11 +13,16 @@
   <name>Drools :: API</name>
 
   <dependencies>    
-      <dependency>  
-         <groupId>org.osgi</groupId>  
-         <artifactId>org.osgi.core</artifactId>  
-         <scope>provided</scope>
-       </dependency>
+            <dependency>  
+               <groupId>org.eclipse.equinox</groupId>  
+               <artifactId>org.eclipse.osgi</artifactId>  
+               <scope>provided</scope> 
+            </dependency>            
+            <dependency>  
+               <groupId>org.eclipse.equinox</groupId>  
+               <artifactId>org.eclipse.osgi.util</artifactId>  
+               <scope>provided</scope> 
+            </dependency>
          
          <dependency>  
             <groupId>com.sun.xml</groupId>  
@@ -93,7 +98,8 @@
                     <manifestLocation>META-INF</manifestLocation>
 					<instructions>
 						<Import-Package>org.drools.*,*;resolution:=optional</Import-Package>
-						<Export-Package>org.drools.*</Export-Package>                     
+						<Export-Package>org.drools.*</Export-Package>   
+                        <Bundle-Activator>org.drools.osgi.core.Activator</Bundle-Activator>
 					</instructions>
 				</configuration>
 			</plugin>   

Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBaseFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBaseFactory.java	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBaseFactory.java	2010-01-14 09:24:25 UTC (rev 31079)
@@ -5,7 +5,7 @@
 import org.drools.builder.KnowledgeBuilderProvider;
 import org.drools.runtime.Environment;
 import org.drools.runtime.KnowledgeSessionConfiguration;
-import org.drools.util.internal.ServiceRegistryImpl;
+import org.drools.util.ServiceRegistryImpl;
 
 /**
  * <p>

Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBaseProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBaseProvider.java	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBaseProvider.java	2010-01-14 09:24:25 UTC (rev 31079)
@@ -12,7 +12,7 @@
  * the KnowledgeBaseFactory api, which is considered stable.
  *
  */
-public interface KnowledgeBaseProvider {
+public interface KnowledgeBaseProvider extends Service {
 
     /**
      * Instantiate and return a new KnowledgeBaseConfiguration

Added: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/Service.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/Service.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/Service.java	2010-01-14 09:24:25 UTC (rev 31079)
@@ -0,0 +1,5 @@
+package org.drools;
+
+public interface Service {
+
+}

Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/SystemEventListenerFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/SystemEventListenerFactory.java	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/SystemEventListenerFactory.java	2010-01-14 09:24:25 UTC (rev 31079)
@@ -1,6 +1,6 @@
 package org.drools;
 
-import org.drools.util.internal.ServiceRegistryImpl;
+import org.drools.util.ServiceRegistryImpl;
 
 /**
  * This factory allows you to set the SystemEventListener that will be used by various components of Drools, such

Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderFactory.java	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderFactory.java	2010-01-14 09:24:25 UTC (rev 31079)
@@ -3,7 +3,7 @@
 import java.util.Properties;
 
 import org.drools.KnowledgeBase;
-import org.drools.util.internal.ServiceRegistryImpl;
+import org.drools.util.ServiceRegistryImpl;
 
 /**
  * This factory is used to build the knowledge base definitions that are held collectively in

Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderProvider.java	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderProvider.java	2010-01-14 09:24:25 UTC (rev 31079)
@@ -3,6 +3,7 @@
 import java.util.Properties;
 
 import org.drools.KnowledgeBase;
+import org.drools.Service;
 
 /**
  * KnowledgeBuilderProvider is used by the KnowledgeBuilderFacotry to "provide" it's concrete implementation.
@@ -11,7 +12,7 @@
  * the Factory api, which is considered stable.
  *
  */
-public interface KnowledgeBuilderProvider {
+public interface KnowledgeBuilderProvider  extends Service {
     /**
      * Instantiate and return a new KnowledgeBuilderConfiguration
      * @return

Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/io/ResourceFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/io/ResourceFactory.java	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/io/ResourceFactory.java	2010-01-14 09:24:25 UTC (rev 31079)
@@ -6,7 +6,7 @@
 import java.net.URL;
 
 import org.drools.KnowledgeBaseProvider;
-import org.drools.util.internal.ServiceRegistryImpl;
+import org.drools.util.ServiceRegistryImpl;
 
 /**
  * <p>

Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/io/ResourceProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/io/ResourceProvider.java	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/io/ResourceProvider.java	2010-01-14 09:24:25 UTC (rev 31079)
@@ -5,6 +5,8 @@
 import java.io.Reader;
 import java.net.URL;
 
+import org.drools.Service;
+
 /**
  * ResourceProvider is used by the ResourceFactory to "provide" it's concrete implementation.
  * 
@@ -12,7 +14,7 @@
  * the Factory api, which is considered stable.
  *
  */
-public interface ResourceProvider {
+public interface ResourceProvider extends Service {
     ResourceChangeNotifier getResourceChangeNotifierService();
 
     ResourceChangeScanner getResourceChangeScannerService();

Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/osgi/api/Activator.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/osgi/api/Activator.java	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/osgi/api/Activator.java	2010-01-14 09:24:25 UTC (rev 31079)
@@ -1,29 +1,88 @@
 package org.drools.osgi.api;
 
 import java.util.Hashtable;
+import java.util.concurrent.Callable;
 
+import org.drools.KnowledgeBaseProvider;
+import org.drools.Service;
+import org.drools.io.ResourceProvider;
+import org.drools.util.ServiceRegistry;
+import org.drools.util.ServiceRegistryImpl;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
+import org.osgi.util.tracker.ServiceTracker;
+import org.osgi.util.tracker.ServiceTrackerCustomizer;
 
 public class Activator
     implements
     BundleActivator {
     private ServiceRegistration serviceRegistry;
-//    private ServiceRegistration kbaseReg;
+    private ServiceTracker      registryTracker;
 
+
     public void start(BundleContext bc) throws Exception {
-//        System.out.println( "registering core drools services" );
-//        this.resourceReg = bc.registerService( ResourceProvider.class.getName(),
-//                                               new ResourceProviderImpl(),
-//                                               new Hashtable() );
-//        this.kbaseReg = bc.registerService( KnowledgeBaseProvider.class.getName(),
-//                                            new KnowledgeBaseProviderImpl(),
-//                                            new Hashtable() );
-//        System.out.println( "drools core services registered" );
+        System.out.println( "registering api services" );
+        this.serviceRegistry = bc.registerService( ServiceRegistry.class.getName(),
+                                                   new ServiceRegistryImpl(),
+                                                   new Hashtable() );
+
+        registryTracker = new ServiceTracker( bc,
+                                              Service.class.getName(),
+                                              new DroolsServiceTracker( bc,
+                                                                        this ) );
+        registryTracker.open();
+        System.out.println( "api drools services registered" );
     }
 
     public void stop(BundleContext bc) throws Exception {
-//        this.resourceReg.unregister();
+        this.registryTracker.close();
+        this.serviceRegistry.unregister();
     }
+
+    public static class DroolsServiceTracker
+        implements
+        ServiceTrackerCustomizer {
+        private BundleContext bc;
+        private Activator     activator;
+
+        public DroolsServiceTracker(BundleContext bc,
+                                    Activator activator) {
+            this.bc = bc;
+        }
+
+        public Object addingService(ServiceReference ref) {
+            Service service = (Service) bc.getService( ref );
+            
+            
+            ServiceRegistryImpl.getInstance().registerLocator( service.getClass().getInterfaces()[0], new ReturnInstance( service ) );
+            return service;
+        }
+
+        public void modifiedService(ServiceReference arg0,
+                                    Object arg1) {
+            
+        }
+
+        public void removedService(ServiceReference ref,
+                                   Object arg1) {
+            Service service = (Service) bc.getService( ref );
+            ServiceRegistryImpl.getInstance().unregisterLocator( service.getClass().getInterfaces()[0]);
+        }
+    }
+
+    static class ReturnInstance<V>
+        implements
+        Callable<V> {
+        private Service service;
+
+        public ReturnInstance(Service service) {
+            this.service = service;
+        }
+
+        public V call() throws Exception {
+            return (V) this.service;
+        }
+    }
 }

Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/persistence/jpa/JPAKnowledgeService.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/persistence/jpa/JPAKnowledgeService.java	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/persistence/jpa/JPAKnowledgeService.java	2010-01-14 09:24:25 UTC (rev 31079)
@@ -5,7 +5,7 @@
 import org.drools.runtime.Environment;
 import org.drools.runtime.KnowledgeSessionConfiguration;
 import org.drools.runtime.StatefulKnowledgeSession;
-import org.drools.util.internal.ServiceRegistryImpl;
+import org.drools.util.ServiceRegistryImpl;
 
 /**
  * <p>

Modified: labs/jbossrules/trunk/drools-compiler/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-compiler/.classpath	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-compiler/.classpath	2010-01-14 09:24:25 UTC (rev 31079)
@@ -30,7 +30,8 @@
   <classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/osgi/org.osgi.core/r4v42/org.osgi.core-r4v42.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/equinox/org.eclipse.osgi/3.5.1/org.eclipse.osgi-3.5.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/equinox/org.eclipse.osgi.util/3.5.1/org.eclipse.osgi.util-3.5.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2/stringtemplate-3.2.jar"/>
 </classpath>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF	2010-01-14 09:24:25 UTC (rev 31079)
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Bundle-Activator: org.drools.osgi.core.Activator
+Bundle-Activator: org.drools.osgi.compiler.Activator
 Created-By: 1.5.0_16 (Sun Microsystems Inc.)
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Import-Package: com.thoughtworks.xstream;version="1.3",com.thoughtwork
@@ -17,86 +17,54 @@
  rg.mvel2.integration,org.mvel2.integration.impl,org.mvel2.optimizers,
  org.mvel2.templates,org.mvel2.util,org.osgi.framework;version="1.5",o
  rg.w3c.dom,org.xml.sax
-Bnd-LastModified: 1263413854000
-Export-Package: org.drools.builder.impl;version="5.1.0.SNAPSHOT";uses:="org.drools.compiler",
- org.drools.compiler;version="5.1.0.SNAPSHOT";
-  uses:="org.drools.rule.builder,
-   org.antlr.runtime.tree,
-   org.antlr.runtime,
-   org.drools.guvnor.server.util,
-   org.xml.sax,
-   org.drools.xml,
-   org.drools.guvnor.client.modeldriven.brl,
-   org.mvel2,
-   org.drools.process.builder,
-   org.drools.xml.processes",
- org.drools.guvnor.client.modeldriven;version="5.1.0.SNAPSHOT";uses:="org.drools.guvnor.client.modeldriven.brl",
- org.drools.guvnor.client.modeldriven.brl;version="5.1.0.SNAPSHOT",
- org.drools.guvnor.client.modeldriven.dt;version="5.1.0.SNAPSHOT";uses:="org.drools.guvnor.client.modeldriven.brl,org.drools.guvnor.client.modeldriven",
- org.drools.guvnor.client.modeldriven.testing;version="5.1.0.SNAPSHOT";uses:="org.drools.guvnor.client.modeldriven.brl",
- org.drools.guvnor.client.modeldriven.ui;version="5.1.0.SNAPSHOT",
- org.drools.guvnor.server.rules;version="5.1.0.SNAPSHOT";uses:="org.drools.guvnor.server.util,org.drools.compiler,org.drools.guvnor.client.modeldriven",
- org.drools.guvnor.server.util;version="5.1.0.SNAPSHOT";
-  uses:="org.drools.guvnor.client.modeldriven.brl,
-   com.thoughtworks.xstream.io,
-   com.thoughtworks.xstream.io.xml,
-   com.thoughtworks.xstream,
-   org.drools.guvnor.client.modeldriven,
-   org.mvel2,
-   org.drools.guvnor.client.modeldriven.dt,
-   org.drools.guvnor.client.modeldriven.testing",
- org.drools.osgi.compiler;version="5.1.0.SNAPSHOT";x-internal:=true;uses:="org.drools.builder.impl,org.osgi.framework",
- org.drools.process.builder;version="5.1.0.SNAPSHOT";uses:="org.drools.rule.builder,org.drools.compiler",
- org.drools.reteoo.compiled;version="5.1.0.SNAPSHOT";uses:="org.drools.compiler,org.drools.rule.builder.dialect.java",
- org.drools.rule.builder;version="5.1.0.SNAPSHOT";
-  uses:="org.drools.compiler,
-   org.mvel2.compiler,
-   org.mvel2,
-   org.drools.rule.builder.dialect.mvel",
- org.drools.rule.builder.dialect.java;version="5.1.0.SNAPSHOT";
-  uses:="org.drools.rule.builder,
-   org.mvel2.integration,
-   org.mvel2.integration.impl,
-   org.mvel2.templates,
-   org.mvel2.compiler,
-   org.mvel2.optimizers,
-   org.drools.compiler,
-   org.drools.rule.builder.dialect.mvel,
-   org.drools.rule.builder.dialect.java.parser,
-   org.antlr.runtime,
-   org.mvel2",
- org.drools.rule.builder.dialect.java.parser;version="5.1.0.SNAPSHOT";uses:="org.antlr.runtime",
- org.drools.rule.builder.dialect.mvel;version="5.1.0.SNAPSHOT";
-  uses:="org.drools.compiler,
-   org.drools.rule.builder,
-   org.mvel2,
-   org.mvel2.compiler,
-   org.mvel2.util,
-   org.drools.rule.builder.dialect.java,
-   org.mvel2.ast",
- org.drools.semantics.java.parser;version="5.1.0.SNAPSHOT",
- org.drools.testframework;version="5.1.0.SNAPSHOT";
-  uses:="org.drools.guvnor.client.modeldriven.testing,
-   org.mvel2.compiler,
-   org.drools.guvnor.server.util,
-   org.mvel2",
- org.drools.xml;version="5.1.0.SNAPSHOT";
-  uses:="org.drools.xml.processes,
-   org.drools.xml.rules,
-   org.xml.sax,
-   javax.xml.parsers",
- org.drools.xml.processes;version="5.1.0.SNAPSHOT";
-  uses:="org.drools.xml,
-   org.xml.sax,
-   org.w3c.dom,
-   javax.xml.transform.stream,
-   javax.xml.transform",
- org.drools.xml.rules;version="5.1.0.SNAPSHOT";
-  uses:="org.drools.xml,
-   org.xml.sax,
-   org.w3c.dom,
-   org.antlr.runtime.tree,
-   org.antlr.runtime"
+Bnd-LastModified: 1263459155537
+Export-Package: org.drools.builder.impl;uses:="org.drools.compiler";ve
+ rsion="5.1.0.SNAPSHOT",org.drools.rule.builder;uses:="org.drools.comp
+ iler,org.mvel2.compiler,org.mvel2,org.drools.rule.builder.dialect.mve
+ l";version="5.1.0.SNAPSHOT",org.drools.guvnor.client.modeldriven.test
+ ing;uses:="org.drools.guvnor.client.modeldriven.brl";version="5.1.0.S
+ NAPSHOT",org.drools.guvnor.server.util;uses:="org.drools.guvnor.clien
+ t.modeldriven.brl,com.thoughtworks.xstream.io,com.thoughtworks.xstrea
+ m.io.xml,com.thoughtworks.xstream,org.drools.guvnor.client.modeldrive
+ n,org.mvel2,org.drools.guvnor.client.modeldriven.dt,org.drools.guvnor
+ .client.modeldriven.testing";version="5.1.0.SNAPSHOT",org.drools.osgi
+ .compiler;uses:="org.drools.builder.impl,org.osgi.framework";version=
+ "5.1.0.SNAPSHOT",org.drools.guvnor.client.modeldriven.dt;uses:="org.d
+ rools.guvnor.client.modeldriven.brl,org.drools.guvnor.client.modeldri
+ ven";version="5.1.0.SNAPSHOT",org.drools.process.builder;uses:="org.d
+ rools.rule.builder,org.drools.compiler";version="5.1.0.SNAPSHOT",org.
+ drools.testframework;uses:="org.drools.guvnor.client.modeldriven.test
+ ing,org.mvel2.compiler,org.drools.guvnor.server.util,org.mvel2";versi
+ on="5.1.0.SNAPSHOT",org.drools.guvnor.client.modeldriven.ui;version="
+ 5.1.0.SNAPSHOT",org.drools.xml.rules;uses:="org.drools.xml,org.xml.sa
+ x,org.w3c.dom,org.antlr.runtime.tree,org.antlr.runtime";version="5.1.
+ 0.SNAPSHOT",org.drools.guvnor.client;version="5.1.0.SNAPSHOT",org.dro
+ ols.guvnor.client.modeldriven;uses:="org.drools.guvnor.client.modeldr
+ iven.brl";version="5.1.0.SNAPSHOT",org.drools.reteoo.compiled;uses:="
+ org.drools.compiler,org.drools.rule.builder.dialect.java";version="5.
+ 1.0.SNAPSHOT",org.drools.xml.processes;uses:="org.drools.xml,org.xml.
+ sax,org.w3c.dom,javax.xml.transform.stream,javax.xml.transform";versi
+ on="5.1.0.SNAPSHOT",org.drools.rule.builder.dialect.java.parser;uses:
+ ="org.antlr.runtime";version="5.1.0.SNAPSHOT",org.drools.semantics.ja
+ va.parser;version="5.1.0.SNAPSHOT",org.drools.rule.builder.dialect.ja
+ va;uses:="org.drools.rule.builder,org.mvel2.integration,org.mvel2.int
+ egration.impl,org.mvel2.templates,org.mvel2.compiler,org.mvel2.optimi
+ zers,org.drools.compiler,org.drools.rule.builder.dialect.mvel,org.dro
+ ols.rule.builder.dialect.java.parser,org.antlr.runtime,org.mvel2";ver
+ sion="5.1.0.SNAPSHOT",org.drools.compiler;uses:="org.drools.rule.buil
+ der,org.antlr.runtime.tree,org.antlr.runtime,org.drools.guvnor.server
+ .util,org.xml.sax,org.drools.xml,org.drools.guvnor.client.modeldriven
+ .brl,org.mvel2,org.drools.process.builder,org.drools.xml.processes";v
+ ersion="5.1.0.SNAPSHOT",org.drools.xml;uses:="org.drools.xml.processe
+ s,org.drools.xml.rules,org.xml.sax,javax.xml.parsers";version="5.1.0.
+ SNAPSHOT",org.drools.rule.builder.dialect.mvel;uses:="org.drools.rule
+ .builder,org.drools.compiler,org.mvel2,org.mvel2.compiler,org.mvel2.u
+ til,org.drools.rule.builder.dialect.java,org.mvel2.ast";version="5.1.
+ 0.SNAPSHOT",org.drools.guvnor.server.rules;uses:="org.drools.guvnor.s
+ erver.util,org.drools.compiler,org.drools.guvnor.client.modeldriven";
+ version="5.1.0.SNAPSHOT",org.drools.guvnor.client.modeldriven.brl;ver
+ sion="5.1.0.SNAPSHOT",org.drools.guvnor.server;version="5.1.0.SNAPSHO
+ T"
 Bundle-Version: 5.1.0.SNAPSHOT
 Bundle-Name: Drools :: Compiler
 Bundle-Description: A rule production system

Modified: labs/jbossrules/trunk/drools-compiler/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-compiler/pom.xml	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-compiler/pom.xml	2010-01-14 09:24:25 UTC (rev 31079)
@@ -23,9 +23,14 @@
 		</dependency>
 		<!-- External dependencies -->
             <dependency>  
-               <groupId>org.osgi</groupId>  
-               <artifactId>org.osgi.core</artifactId>  
-               <scope>provided</scope>
+               <groupId>org.eclipse.equinox</groupId>  
+               <artifactId>org.eclipse.osgi</artifactId>  
+               <scope>provided</scope> 
+            </dependency>            
+            <dependency>  
+               <groupId>org.eclipse.equinox</groupId>  
+               <artifactId>org.eclipse.osgi.util</artifactId>  
+               <scope>provided</scope> 
             </dependency>
             
 		<dependency>
@@ -207,7 +212,7 @@
                                         org.drools.builder.impl, <!-- add this one manually as BND seems to miss it out -->
                                         org.drools.*</Export-Package>   
                         <DynamicImport-Package>*</DynamicImport-Package> 
-                        <Bundle-Activator>org.drools.osgi.core.Activator</Bundle-Activator>                                                               
+                        <Bundle-Activator>org.drools.osgi.compiler.Activator</Bundle-Activator>                                                               
 					</instructions>
 				</configuration>
 			</plugin>   

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java	2010-01-14 09:24:25 UTC (rev 31079)
@@ -42,12 +42,12 @@
 import org.drools.process.builder.ProcessNodeBuilderRegistry;
 import org.drools.rule.Package;
 import org.drools.runtime.rule.AccumulateFunction;
+import org.drools.util.ChainedProperties;
+import org.drools.util.ClassLoaderUtil;
 import org.drools.util.ClassUtils;
+import org.drools.util.CompositeClassLoader;
 import org.drools.util.ConfFileUtils;
 import org.drools.util.StringUtils;
-import org.drools.util.internal.ChainedProperties;
-import org.drools.util.internal.ClassLoaderUtil;
-import org.drools.util.internal.CompositeClassLoader;
 import org.drools.workflow.core.Node;
 import org.drools.xml.ChangeSetSemanticModule;
 import org.drools.xml.DefaultSemanticModule;

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/osgi/compiler/Activator.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/osgi/compiler/Activator.java	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/osgi/compiler/Activator.java	2010-01-14 09:24:25 UTC (rev 31079)
@@ -2,13 +2,8 @@
 
 import java.util.Hashtable;
 
-
-import org.drools.KnowledgeBaseProvider;
 import org.drools.builder.KnowledgeBuilderProvider;
 import org.drools.builder.impl.KnowledgeBuilderProviderImpl;
-import org.drools.impl.KnowledgeBaseProviderImpl;
-import org.drools.io.ResourceProvider;
-import org.drools.io.impl.ResourceProviderImpl;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
@@ -17,19 +12,19 @@
     implements
     BundleActivator {
     private ServiceRegistration kbuilderReg;
-    
+
     public static BundleContext bc;
 
     public void start(BundleContext bc) throws Exception {
         this.bc = bc;
-    	System.out.println( "registering compiler  drools services" );
+        System.out.println( "registering compiler services" );
         this.kbuilderReg = bc.registerService( KnowledgeBuilderProvider.class.getName(),
                                                new KnowledgeBuilderProviderImpl(),
                                                new Hashtable() );
-        System.out.println( "drools compiler services registered" );
+        System.out.println( "compiler services registered" );
     }
 
     public void stop(BundleContext bc) throws Exception {
         this.kbuilderReg.unregister();
     }
-}
+}
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderConfigurationTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderConfigurationTest.java	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderConfigurationTest.java	2010-01-14 09:24:25 UTC (rev 31079)
@@ -44,7 +44,7 @@
 import org.drools.rule.builder.RuleConditionBuilder;
 import org.drools.rule.builder.SalienceBuilder;
 import org.drools.rule.builder.dialect.java.JavaDialectConfiguration;
-import org.drools.util.internal.ChainedProperties;
+import org.drools.util.ChainedProperties;
 
 public class PackageBuilderConfigurationTest extends TestCase {
 

Modified: labs/jbossrules/trunk/drools-core/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-core/.classpath	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-core/.classpath	2010-01-14 09:24:25 UTC (rev 31079)
@@ -16,5 +16,6 @@
   <classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/osgi/org.osgi.core/r4v42/org.osgi.core-r4v42.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/equinox/org.eclipse.osgi/3.5.1/org.eclipse.osgi-3.5.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/equinox/org.eclipse.osgi.util/3.5.1/org.eclipse.osgi.util-3.5.1.jar"/>
 </classpath>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF	2010-01-14 09:24:25 UTC (rev 31079)
@@ -12,7 +12,7 @@
  ler,org.mvel2.debug,org.mvel2.integration,org.mvel2.integration.impl,
  org.mvel2.optimizers,org.mvel2.templates,org.mvel2.util,org.osgi.fram
  ework;version="1.5",org.w3c.dom,org.xml.sax,org.xml.sax.helpers
-Bnd-LastModified: 1263413817863
+Bnd-LastModified: 1263459132386
 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.1.0.SNAPSHOT",org.drools.pr
@@ -20,7 +20,7 @@
  lidation;uses:="org.mvel2.compiler,org.drools.process.core.timer,org.
  drools.process.core.validation,org.drools.process.core.datatype,org.d
  rools.workflow.core.node,org.drools.process.core.context.variable,org
- .drools.workflow.core.impl,org.mvel2,org.drools.time,org.drools.proce
+ .drools.time,org.drools.workflow.core.impl,org.mvel2,org.drools.proce
  ss.core.validation.impl,org.drools,org.drools.ruleflow.core,org.drool
  s.process.core,org.drools.workflow.core";version="5.1.0.SNAPSHOT",org
  .drools.ruleflow.instance;uses:="org.drools.workflow.instance.impl,or
@@ -36,11 +36,11 @@
  nstance";version="5.1.0.SNAPSHOT",org.drools.process.instance.event;u
  ses:="org.drools.marshalling.impl,org.drools.process.instance,org.dro
  ols.common,org.drools";version="5.1.0.SNAPSHOT",org.drools.osgi.core;
- uses:="org.drools.impl,org.drools,org.osgi.framework,org.drools.io.im
+ uses:="org.drools,org.drools.impl,org.osgi.framework,org.drools.io.im
  pl";version="5.1.0.SNAPSHOT",org.drools.ruleflow.core.factory;uses:="
  org.drools.workflow.core.impl,org.drools.ruleflow.core,org.drools.wor
- kflow.core.node,org.drools.workflow.core,org.drools.process.core.data
- type,org.drools.process.core,org.drools.process.core.context.exceptio
+ kflow.core.node,org.drools.workflow.core,org.drools.process.core,org.
+ drools.process.core.datatype,org.drools.process.core.context.exceptio
  n,org.drools.process.core.context.variable,org.drools.process.core.ev
  ent,org.drools.process.core.timer,org.drools.process.core.impl";versi
  on="5.1.0.SNAPSHOT",org.drools.marshalling.impl;uses:="org.drools.wor
@@ -48,7 +48,7 @@
  drools.process.instance,org.drools.workflow.instance.node,org.drools.
  workflow.instance,org.drools.process.core,org.drools.process.instance
  .context.variable,org.drools.common,org.drools.util,org.drools.impl,o
- rg.drools,org.drools.concurrent,org.drools.spi,org.drools.process.ins
+ rg.drools.concurrent,org.drools,org.drools.spi,org.drools.process.ins
  tance.timer,org.drools.base,org.drools.rule,org.drools.process.instan
  ce.impl,org.drools.process.instance.event,org.drools.ruleflow.instanc
  e";version="5.1.0.SNAPSHOT",org.drools.time;uses:="org.drools.rule,or
@@ -68,210 +68,209 @@
  pi,org.drools.rule,org.drools.common";version="5.1.0.SNAPSHOT",org.dr
  ools.process.core.context.exception;uses:="org.drools.workflow.core,o
  rg.drools.process.core.context,org.drools.process.core";version="5.1.
- 0.SNAPSHOT",org.drools.runtime.dataloader;version="5.1.0.SNAPSHOT",or
- g.drools.process.instance.context.variable;uses:="org.drools.event,or
- g.drools,org.drools.process.core,org.drools.process.instance,org.droo
- ls.process.core.context.variable,org.drools.process.instance.context,
- org.drools.common";version="5.1.0.SNAPSHOT",org.drools.audit;uses:="o
- rg.drools.event,org.drools,org.drools.audit.event,com.thoughtworks.xs
- tream,org.drools.impl,org.drools.workflow.core.node,org.drools.comman
- d,org.drools.workflow.instance,org.drools.workflow.instance.node,org.
- drools.rule,org.drools.spi,org.drools.command.impl,org.drools.common"
- ;version="5.1.0.SNAPSHOT",org.drools.base.extractors;uses:="org.drool
- s.base,org.drools.util,org.drools.spi,org.drools.common,org.drools,or
- g.mvel2,org.mvel2.compiler";version="5.1.0.SNAPSHOT",org.drools.proce
- ss.core.context;uses:="org.drools.process.core";version="5.1.0.SNAPSH
- OT",org.drools.util.asm;uses:="org.mvel2.asm,org.drools,org.mvel2.asm
- .util";version="5.1.0.SNAPSHOT",org.drools.workflow.instance.impl.fac
- tory;uses:="org.drools.workflow.instance.impl,org.drools.workflow.ins
- tance";version="5.1.0.SNAPSHOT",org.drools.process.instance;uses:="or
- g.drools,org.drools.process.core,org.drools.process.core.context.vari
- able,org.drools.process.instance.context.variable,org.drools.common,o
- rg.drools.ruleflow.instance,org.drools.ruleflow.core";version="5.1.0.
- SNAPSHOT",org.drools.process.core.context.variable;uses:="org.drools.
- process.core,org.drools.process.core.datatype,org.drools.process.core
- .datatype.impl.type,org.drools.process.core.context";version="5.1.0.S
- NAPSHOT",org.drools.event.rule.impl;uses:="org.drools.event,org.drool
- s,org.drools.spi,org.drools.common,org.drools.impl";version="5.1.0.SN
- APSHOT",org.drools.command.builder;uses:="org.drools.command,org.droo
- ls.command.impl,org.drools.runtime.impl";version="5.1.0.SNAPSHOT",org
- .drools.runtime.pipeline;version="5.1.0.SNAPSHOT",org.drools.base.acc
- umulators;uses:="org.drools,org.drools.rule,org.drools.spi,org.drools
- .common,org.mvel2,org.mvel2.integration,org.drools.base.mvel";version
- ="5.1.0.SNAPSHOT",org.drools.event;uses:="org.drools.rule,org.drools.
- spi,org.drools,org.drools.common,org.drools.process.instance";version
- ="5.1.0.SNAPSHOT",org.drools.definitions.rule.impl;uses:="org.drools.
- rule";version="5.1.0.SNAPSHOT",org.drools.xml;uses:="org.xml.sax,org.
- drools.xml.changeset,javax.xml.parsers,org.xml.sax.helpers,org.w3c.do
- m,org.drools";version="5.1.0.SNAPSHOT",org.drools.facttemplates;uses:
- ="org.drools.rule,org.drools.base,org.drools,org.drools.spi,org.drool
- s.util,org.drools.common";version="5.1.0.SNAPSHOT",org.drools.base.fi
- eld;uses:="org.drools,org.drools.spi,org.drools.util,org.drools.commo
- n";version="5.1.0.SNAPSHOT",org.drools.runtime.rule.impl;uses:="org.d
- rools.spi,org.drools.common,org.drools,org.drools.rule";version="5.1.
- 0.SNAPSHOT",org.drools.process.core.context.swimlane;uses:="org.drool
- s.process.core.context,org.drools.process.core";version="5.1.0.SNAPSH
- OT",org.drools.concurrent;uses:="org.drools,org.drools.spi";version="
- 5.1.0.SNAPSHOT",org.drools.ruleflow.core;uses:="org.drools.workflow.c
- ore.impl,org.drools.workflow.core,org.drools.ruleflow.core.factory,or
- g.drools.workflow.core.node,org.drools.process.core.context.swimlane,
- org.drools.process.core,org.drools.process.core.context.exception,org
- .drools.process.core.context.variable,org.drools.ruleflow.core.valida
- tion,org.drools.process.core.validation,org.drools.process.core.datat
- ype";version="5.1.0.SNAPSHOT",org.drools.util;uses:="org.drools.rule,
- org.drools.spi,org.drools.common,org.drools,org.drools.type";version=
- "5.1.0.SNAPSHOT",org.drools.type;version="5.1.0.SNAPSHOT",org.drools.
- agent;uses:="org.drools,org.drools.rule,org.drools.definitions.impl,o
- rg.drools.util,org.drools.agent.impl,org.drools.common";version="5.1.
- 0.SNAPSHOT",org.drools.time.impl;uses:="org.drools.time,org.drools,or
- g.drools.common";version="5.1.0.SNAPSHOT",org.drools.event.process.im
- pl;uses:="org.drools.event,org.drools,org.drools.common";version="5.1
- .0.SNAPSHOT",org.drools.common;uses:="org.drools.spi,org.drools.rule,
- org.drools.impl,org.drools.event,org.drools.management,org.drools.bas
- e,org.drools,org.drools.util,org.drools.process.core,org.drools.proce
- ss.instance.event,org.drools.process.core.event,org.drools.process.in
- stance,org.drools.workflow.core.node,org.drools.time,org.drools.runti
- me.impl,org.drools.process.instance.timer,org.drools.concurrent,org.d
- rools.ruleflow.core,org.drools.type,org.drools.base.evaluators,org.dr
- ools.facttemplates,org.drools.marshalling.impl,org.drools.time.impl";
- version="5.1.0.SNAPSHOT",org.drools.workflow.instance.impl;uses:="org
- .drools.workflow.instance.node,org.drools.workflow.core,org.drools.pr
- ocess.instance.context.exception,org.drools.process.instance,org.droo
- ls.workflow.core.impl,org.drools.base,org.drools.workflow.instance,or
- g.drools,org.drools.spi,org.drools.common,org.drools.workflow.instanc
- e.impl.factory,org.drools.workflow.core.node,org.drools.event,org.dro
- ols.process.core,org.mvel2.integration,org.mvel2.integration.impl,org
- .drools.process.instance.context.variable,org.drools.process.instance
- .event,org.drools.process.instance.impl";version="5.1.0.SNAPSHOT",org
- .drools.base.evaluators;uses:="org.drools.time,org.drools.base,org.dr
- ools,org.drools.rule,org.drools.spi,org.drools.common,org.drools.util
- ,org.drools.type,org.mvel2.util";version="5.1.0.SNAPSHOT",org.drools.
- impl;uses:="org.drools.event,org.drools.definitions.rule.impl,org.dro
- ols,org.drools.rule,org.drools.definitions.impl,org.drools.event.know
- legebase.impl,org.drools.command,org.drools.command.impl,org.drools.a
- gent,org.drools.common,org.drools.spi,org.drools.event.rule.impl,org.
- drools.event.process.impl,org.drools.runtime.impl,org.drools.process.
- instance,org.drools.process.instance.event,org.drools.time,org.drools
- .runtime.rule.impl,org.drools.base,org.drools.command.runtime.rule,or
- g.drools.agent.impl,org.drools.util";version="5.1.0.SNAPSHOT",org.dro
- ols.definitions.impl;uses:="org.drools.definitions.rule.impl,org.droo
- ls.rule";version="5.1.0.SNAPSHOT",org.drools.audit.event;version="5.1
- .0.SNAPSHOT",org.drools.process.core.datatype;version="5.1.0.SNAPSHOT
- ",org.drools.process.instance.context;uses:="org.drools.process.core,
- org.drools.process.instance";version="5.1.0.SNAPSHOT",org.drools.comm
- and;uses:="org.drools.command.impl,org.drools.runtime.impl,org.drools
- .time,org.drools";version="5.1.0.SNAPSHOT",org.drools.management;uses
- :="javax.management,org.drools.common,org.drools,org.drools.base,org.
- drools.spi,javax.management.openmbean,org.drools.event,org.drools.rul
- e";version="5.1.0.SNAPSHOT",org.drools.base;uses:="org.drools.event,o
- rg.drools.concurrent,org.drools,org.drools.spi,org.drools.util.asm,or
- g.drools.util,org.drools.common,org.drools.time,org.drools.base.evalu
- ators,org.drools.base.extractors,org.mvel2.asm,org.drools.rule,org.dr
- ools.impl,org.drools.base.field,org.drools.type,org.mvel2.ast,org.mve
- l2.integration,org.mvel2.compiler,org.drools.base.mvel,org.drools.fac
- ttemplates";version="5.1.0.SNAPSHOT",org.drools;uses:="org.drools.spi
- ,org.drools.time,org.drools.time.impl,org.drools.rule,org.drools.comm
- on,org.drools.workflow.instance.impl,org.drools.process.core.datatype
- ,org.drools.process.instance,org.mvel2,org.drools.runtime.rule.impl,o
- rg.drools.concurrent,org.drools.util,org.drools.process.core,org.droo
- ls.conflict,org.drools.process.core.impl,org.drools.process.instance.
- impl,org.drools.event,org.drools.process.instance.event,org.drools.co
- mmand,org.drools.process.instance.timer";version="5.1.0.SNAPSHOT",org
- .drools.command.assertion;uses:="org.drools.command,org.mvel2,org.dro
- ols.util,org.drools.command.impl";version="5.1.0.SNAPSHOT",org.drools
- .agent.impl;uses:="org.drools,org.drools.spi,org.drools.rule,org.droo
- ls.definitions.impl,org.drools.util,org.drools.agent,org.drools.impl,
- org.drools.io.internal,org.drools.xml,org.drools.process.core,org.dro
- ols.io.impl,org.drools.common";version="5.1.0.SNAPSHOT",org.drools.sp
- i;uses:="org.drools.base,org.drools,org.drools.rule,org.drools.common
- ,org.drools.util,org.drools.time,org.drools.concurrent,org.drools.fac
- ttemplates,org.drools.workflow.instance,org.drools.impl,org.drools.pr
- ocess.instance,org.drools.process.core.context.variable,org.drools.pr
- ocess.instance.context.variable,org.drools.event";version="5.1.0.SNAP
- SHOT",org.drools.process.core.impl;uses:="org.drools.process.core,org
- .drools.process.core.datatype,org.drools.process.core.context";versio
- n="5.1.0.SNAPSHOT",org.drools.process.instance.impl.humantask;uses:="
- javax.swing.event,javax.swing,javax.swing.border";version="5.1.0.SNAP
- SHOT",org.drools.workflow.core;uses:="org.drools.spi,org.drools.proce
- ss.core";version="5.1.0.SNAPSHOT",org.drools.visualize;version="5.1.0
- .SNAPSHOT",org.drools.runtime.impl;uses:="org.drools.command,org.droo
- ls.command.impl";version="5.1.0.SNAPSHOT",org.drools.builder.conf.imp
- l;version="5.1.0.SNAPSHOT",org.drools.workflow.instance.context;uses:
- ="org.drools.workflow.instance,org.drools.process.instance,org.drools
- .process.core,org.drools.process.instance.impl,org.drools.process.ins
- tance.context";version="5.1.0.SNAPSHOT",org.drools.util.debug;uses:="
- org.drools.common,org.drools.util,org.drools.rule,org.drools,org.droo
- ls.impl,org.mvel2.integration,org.mvel2.compiler,org.mvel2.optimizers
- ,org.mvel2.integration.impl,org.mvel2.templates";version="5.1.0.SNAPS
- HOT",org.drools.process.core.validation;version="5.1.0.SNAPSHOT",org.
- drools.process.instance.context.exception;uses:="org.drools.base,org.
- drools.workflow.instance,org.drools,org.drools.spi,org.drools.process
- .instance,org.drools.workflow.core,org.drools.process.core.context.ex
- ception,org.drools.common,org.drools.process.core,org.drools.process.
- instance.context";version="5.1.0.SNAPSHOT",org.drools.xml.changeset;u
- ses:="org.drools.xml,org.xml.sax,org.drools,org.w3c.dom,org.drools.io
- .impl,org.drools.io.internal,org.drools.builder.conf.impl,org.drools.
- util";version="5.1.0.SNAPSHOT",org.drools.process.instance.timer;uses
- :="org.drools.time,org.drools,org.drools.process.instance.event,org.d
- rools.process.instance,org.drools.time.impl";version="5.1.0.SNAPSHOT"
- ,org.drools.base.dataproviders;uses:="org.mvel2,org.mvel2.integration
- ,org.drools,org.drools.rule,org.drools.util,org.drools.base.mvel,org.
- drools.spi";version="5.1.0.SNAPSHOT",org.drools.process.instance.impl
- .factory;uses:="org.drools.process.core,org.drools.process.instance,o
- rg.drools.process.instance.impl,org.drools.process.instance.context";
- version="5.1.0.SNAPSHOT",org.drools.workflow.instance;uses:="org.droo
- ls.process.instance,org.drools.workflow.instance.impl,org.drools.impl
- ,org.drools.workflow.core.impl,org.drools,org.drools.process.core,org
- .drools.common";version="5.1.0.SNAPSHOT",org.drools.workflow.instance
- .node;uses:="org.drools.workflow.instance.impl,org.drools.workflow.co
- re.node,org.drools.process.instance,org.drools.base,org.drools.workfl
- ow.instance,org.drools,org.drools.spi,org.drools.workflow.core,org.dr
- ools.common,org.drools.process.core,org.drools.process.instance.impl,
- org.drools.event,org.drools.process.core.event,org.drools.process.ins
- tance.context.variable,org.drools.process.instance.context.exception,
- org.mvel2,org.mvel2.integration,org.drools.process.instance.context.s
- wimlane,org.drools.rule,org.drools.process.core.timer,org.drools.proc
- ess.instance.timer,org.drools.time";version="5.1.0.SNAPSHOT",org.droo
- ls.process.core.validation.impl;uses:="org.drools.process.core.valida
- tion";version="5.1.0.SNAPSHOT",org.drools.factmodel;uses:="org.mvel2.
- asm,org.drools.base,com.thoughtworks.xstream.io,com.thoughtworks.xstr
- eam.io.xml,com.thoughtworks.xstream";version="5.1.0.SNAPSHOT",org.dro
- ols.base.mvel;uses:="org.mvel2.integration,org.mvel2.integration.impl
- ,org.mvel2,org.drools,org.drools.rule,org.drools.spi,org.drools.commo
- n,org.mvel2.compiler,org.drools.util,org.drools.type,org.drools.base,
- org.mvel2.debug";version="5.1.0.SNAPSHOT",org.drools.process.core;use
- s:="org.drools.process.core.datatype";version="5.1.0.SNAPSHOT",org.dr
- ools.command.impl;uses:="org.drools.command,org.drools.command.runtim
- e.process,org.drools.command.runtime.rule,org.drools.impl,org.drools.
- time,org.drools,org.drools.rule,org.drools.command.runtime,org.drools
- .runtime.impl";version="5.1.0.SNAPSHOT",org.drools.io.impl;uses:="org
- .drools.io.internal,org.drools,org.drools.util";version="5.1.0.SNAPSH
- OT",org.drools.runtime.help.impl;uses:="org.drools.command,com.though
- tworks.xstream.io,com.thoughtworks.xstream.mapper,com.thoughtworks.xs
- tream.converters.collections,org.drools.command.runtime.process,com.t
- houghtworks.xstream.converters,org.drools.runtime.impl,org.drools.com
- mon,org.drools.command.runtime.rule,org.drools.command.runtime,org.dr
- ools.base,org.drools.runtime.rule.impl,org.drools.rule,org.drools.spi
+ 0.SNAPSHOT",org.drools.process.instance.context.variable;uses:="org.d
+ rools.event,org.drools,org.drools.process.core,org.drools.process.ins
+ tance,org.drools.process.core.context.variable,org.drools.process.ins
+ tance.context,org.drools.common";version="5.1.0.SNAPSHOT",org.drools.
+ audit;uses:="org.drools.event,org.drools,org.drools.audit.event,com.t
+ houghtworks.xstream,org.drools.impl,org.drools.workflow.core.node,org
+ .drools.command,org.drools.workflow.instance.node,org.drools.workflow
+ .instance,org.drools.rule,org.drools.spi,org.drools.command.impl,org.
+ drools.common";version="5.1.0.SNAPSHOT",org.drools.base.extractors;us
+ es:="org.drools.base,org.drools.util,org.drools.spi,org.drools.common
+ ,org.drools,org.mvel2,org.mvel2.compiler";version="5.1.0.SNAPSHOT",or
+ g.drools.process.core.context;uses:="org.drools.process.core";version
+ ="5.1.0.SNAPSHOT",org.drools.util.asm;uses:="org.mvel2.asm,org.drools
+ ,org.mvel2.asm.util";version="5.1.0.SNAPSHOT",org.drools.workflow.ins
+ tance.impl.factory;uses:="org.drools.workflow.instance.impl,org.drool
+ s.workflow.instance";version="5.1.0.SNAPSHOT",org.drools.process.inst
+ ance;uses:="org.drools,org.drools.process.core,org.drools.process.cor
+ e.context.variable,org.drools.process.instance.context.variable,org.d
+ rools.common,org.drools.ruleflow.instance,org.drools.ruleflow.core";v
+ ersion="5.1.0.SNAPSHOT",org.drools.process.core.context.variable;uses
+ :="org.drools.process.core.datatype,org.drools.process.core,org.drool
+ s.process.core.datatype.impl.type,org.drools.process.core.context";ve
+ rsion="5.1.0.SNAPSHOT",org.drools.event.rule.impl;uses:="org.drools.e
+ vent,org.drools,org.drools.spi,org.drools.common,org.drools.impl";ver
+ sion="5.1.0.SNAPSHOT",org.drools.command.builder;uses:="org.drools.co
+ mmand,org.drools.command.impl,org.drools.runtime.impl";version="5.1.0
+ .SNAPSHOT",org.drools.runtime.pipeline;version="5.1.0.SNAPSHOT",org.d
+ rools.base.accumulators;uses:="org.drools,org.drools.rule,org.drools.
+ spi,org.drools.common,org.mvel2,org.mvel2.integration,org.drools.base
+ .mvel";version="5.1.0.SNAPSHOT",org.drools.event;uses:="org.drools.ru
+ le,org.drools.spi,org.drools,org.drools.common,org.drools.process.ins
+ tance";version="5.1.0.SNAPSHOT",org.drools.definitions.rule.impl;uses
+ :="org.drools.rule";version="5.1.0.SNAPSHOT",org.drools.xml;uses:="or
+ g.xml.sax,org.drools.xml.changeset,javax.xml.parsers,org.xml.sax.help
+ ers,org.w3c.dom,org.drools";version="5.1.0.SNAPSHOT",org.drools.factt
+ emplates;uses:="org.drools.rule,org.drools.base,org.drools,org.drools
+ .util,org.drools.spi,org.drools.common";version="5.1.0.SNAPSHOT",org.
+ drools.base.field;uses:="org.drools,org.drools.spi,org.drools.util,or
+ g.drools.common";version="5.1.0.SNAPSHOT",org.drools.runtime.rule.imp
+ l;uses:="org.drools.spi,org.drools.common,org.drools,org.drools.rule"
+ ;version="5.1.0.SNAPSHOT",org.drools.process.core.context.swimlane;us
+ es:="org.drools.process.core.context,org.drools.process.core";version
+ ="5.1.0.SNAPSHOT",org.drools.concurrent;uses:="org.drools,org.drools.
+ spi";version="5.1.0.SNAPSHOT",org.drools.ruleflow.core;uses:="org.dro
+ ols.workflow.core.impl,org.drools.workflow.core,org.drools.ruleflow.c
+ ore.factory,org.drools.workflow.core.node,org.drools.process.core.con
+ text.swimlane,org.drools.process.core,org.drools.process.core.context
+ .exception,org.drools.process.core.context.variable,org.drools.rulefl
+ ow.core.validation,org.drools.process.core.validation,org.drools.proc
+ ess.core.datatype";version="5.1.0.SNAPSHOT",org.drools.util;uses:="or
+ g.drools.rule,org.drools.spi,org.drools.common,org.drools,org.drools.
+ type";version="5.1.0.SNAPSHOT",org.drools.type;version="5.1.0.SNAPSHO
+ T",org.drools.agent;uses:="org.drools,org.drools.rule,org.drools.defi
+ nitions.impl,org.drools.util,org.drools.agent.impl,org.drools.common"
+ ;version="5.1.0.SNAPSHOT",org.drools.time.impl;uses:="org.drools.time
+ ,org.drools,org.drools.common";version="5.1.0.SNAPSHOT",org.drools.ev
+ ent.process.impl;uses:="org.drools.event,org.drools,org.drools.common
+ ";version="5.1.0.SNAPSHOT",org.drools.common;uses:="org.drools.spi,or
+ g.drools.rule,org.drools.impl,org.drools.event,org.drools.management,
+ org.drools.base,org.drools,org.drools.util,org.drools.process.core,or
+ g.drools.process.instance.event,org.drools.process.core.event,org.dro
+ ols.process.instance,org.drools.workflow.core.node,org.drools.time,or
+ g.drools.runtime.impl,org.drools.process.instance.timer,org.drools.co
+ ncurrent,org.drools.ruleflow.core,org.drools.type,org.drools.base.eva
+ luators,org.drools.facttemplates,org.drools.marshalling.impl,org.droo
+ ls.time.impl";version="5.1.0.SNAPSHOT",org.drools.workflow.instance.i
+ mpl;uses:="org.drools.workflow.instance.node,org.drools.workflow.core
+ ,org.drools.process.instance.context.exception,org.drools.process.ins
+ tance,org.drools.workflow.core.impl,org.drools.base,org.drools.workfl
+ ow.instance,org.drools,org.drools.spi,org.drools.common,org.drools.wo
+ rkflow.instance.impl.factory,org.drools.workflow.core.node,org.drools
+ .event,org.drools.process.core,org.mvel2.integration,org.mvel2.integr
+ ation.impl,org.drools.process.instance.context.variable,org.drools.pr
+ ocess.instance.event,org.drools.process.instance.impl";version="5.1.0
+ .SNAPSHOT",org.drools.base.evaluators;uses:="org.drools.time,org.droo
+ ls.base,org.drools,org.drools.rule,org.drools.spi,org.drools.common,o
+ rg.drools.util,org.drools.type,org.mvel2.util";version="5.1.0.SNAPSHO
+ T",org.drools.impl;uses:="org.drools.event,org.drools.definitions.rul
+ e.impl,org.drools,org.drools.rule,org.drools.definitions.impl,org.dro
+ ols.event.knowlegebase.impl,org.drools.command,org.drools.command.imp
+ l,org.drools.agent,org.drools.common,org.drools.spi,org.drools.event.
+ rule.impl,org.drools.event.process.impl,org.drools.runtime.impl,org.d
+ rools.process.instance,org.drools.process.instance.event,org.drools.t
+ ime,org.drools.runtime.rule.impl,org.drools.base,org.drools.command.r
+ untime.rule,org.drools.agent.impl,org.drools.util";version="5.1.0.SNA
+ PSHOT",org.drools.definitions.impl;uses:="org.drools.definitions.rule
+ .impl,org.drools.rule";version="5.1.0.SNAPSHOT",org.drools.audit.even
+ t;version="5.1.0.SNAPSHOT",org.drools.process.core.datatype;version="
+ 5.1.0.SNAPSHOT",org.drools.process.instance.context;uses:="org.drools
+ .process.core,org.drools.process.instance";version="5.1.0.SNAPSHOT",o
+ rg.drools.command;uses:="org.drools.command.impl,org.drools.runtime.i
+ mpl,org.drools.time,org.drools";version="5.1.0.SNAPSHOT",org.drools.m
+ anagement;uses:="javax.management,org.drools.common,org.drools,org.dr
+ ools.base,org.drools.spi,javax.management.openmbean,org.drools.event,
+ org.drools.rule";version="5.1.0.SNAPSHOT",org.drools.base;uses:="org.
+ drools.event,org.drools.concurrent,org.drools,org.drools.spi,org.droo
+ ls.util.asm,org.drools.util,org.drools.common,org.drools.time,org.dro
+ ols.base.evaluators,org.drools.base.extractors,org.mvel2.asm,org.droo
+ ls.rule,org.drools.impl,org.drools.base.field,org.drools.type,org.mve
+ l2.ast,org.mvel2.compiler,org.mvel2.integration,org.drools.base.mvel,
+ org.drools.facttemplates";version="5.1.0.SNAPSHOT",org.drools;uses:="
+ org.drools.spi,org.drools.time,org.drools.time.impl,org.drools.rule,o
+ rg.drools.common,org.drools.workflow.instance.impl,org.drools.process
+ .core.datatype,org.drools.process.instance,org.mvel2,org.drools.runti
+ me.rule.impl,org.drools.concurrent,org.drools.util,org.drools.process
+ .core,org.drools.conflict,org.drools.process.core.impl,org.drools.pro
+ cess.instance.impl,org.drools.event,org.drools.process.instance.event
+ ,org.drools.command,org.drools.process.instance.timer";version="5.1.0
+ .SNAPSHOT",org.drools.command.assertion;uses:="org.drools.command,org
+ .mvel2,org.drools.util,org.drools.command.impl";version="5.1.0.SNAPSH
+ OT",org.drools.agent.impl;uses:="org.drools,org.drools.spi,org.drools
+ .rule,org.drools.definitions.impl,org.drools.util,org.drools.agent,or
+ g.drools.impl,org.drools.xml,org.drools.io.internal,org.drools.proces
+ s.core,org.drools.io.impl,org.drools.common";version="5.1.0.SNAPSHOT"
+ ,org.drools.spi;uses:="org.drools.base,org.drools,org.drools.rule,org
+ .drools.common,org.drools.util,org.drools.time,org.drools.concurrent,
+ org.drools.facttemplates,org.drools.workflow.instance,org.drools.impl
+ ,org.drools.process.instance,org.drools.process.core.context.variable
+ ,org.drools.process.instance.context.variable,org.drools.event";versi
+ on="5.1.0.SNAPSHOT",org.drools.process.core.impl;uses:="org.drools.pr
+ ocess.core,org.drools.process.core.datatype,org.drools.process.core.c
+ ontext";version="5.1.0.SNAPSHOT",org.drools.process.instance.impl.hum
+ antask;uses:="javax.swing.event,javax.swing,javax.swing.border";versi
+ on="5.1.0.SNAPSHOT",org.drools.workflow.core;uses:="org.drools.spi,or
+ g.drools.process.core";version="5.1.0.SNAPSHOT",org.drools.visualize;
+ version="5.1.0.SNAPSHOT",org.drools.runtime.impl;uses:="org.drools.co
+ mmand,org.drools.command.impl";version="5.1.0.SNAPSHOT",org.drools.bu
+ ilder.conf.impl;version="5.1.0.SNAPSHOT",org.drools.workflow.instance
+ .context;uses:="org.drools.workflow.instance,org.drools.process.insta
+ nce,org.drools.process.core,org.drools.process.instance.impl,org.droo
+ ls.process.instance.context";version="5.1.0.SNAPSHOT",org.drools.util
+ .debug;uses:="org.drools.common,org.drools.util,org.drools.rule,org.d
+ rools,org.drools.impl,org.mvel2.integration,org.mvel2.compiler,org.mv
+ el2.optimizers,org.mvel2.integration.impl,org.mvel2.templates";versio
+ n="5.1.0.SNAPSHOT",org.drools.process.core.validation;version="5.1.0.
+ SNAPSHOT",org.drools.process.instance.context.exception;uses:="org.dr
+ ools.base,org.drools.workflow.instance,org.drools,org.drools.spi,org.
+ drools.process.instance,org.drools.process.core.context.exception,org
+ .drools.workflow.core,org.drools.common,org.drools.process.core,org.d
+ rools.process.instance.context";version="5.1.0.SNAPSHOT",org.drools.x
+ ml.changeset;uses:="org.drools.xml,org.xml.sax,org.drools,org.w3c.dom
+ ,org.drools.io.impl,org.drools.io.internal,org.drools.builder.conf.im
+ pl,org.drools.util";version="5.1.0.SNAPSHOT",org.drools.process.insta
+ nce.timer;uses:="org.drools.time,org.drools,org.drools.process.instan
+ ce.event,org.drools.process.instance,org.drools.time.impl";version="5
+ .1.0.SNAPSHOT",org.drools.base.dataproviders;uses:="org.mvel2,org.mve
+ l2.integration,org.drools,org.drools.rule,org.drools.spi,org.drools.u
+ til,org.drools.base.mvel";version="5.1.0.SNAPSHOT",org.drools.process
+ .instance.impl.factory;uses:="org.drools.process.core,org.drools.proc
+ ess.instance,org.drools.process.instance.impl,org.drools.process.inst
+ ance.context";version="5.1.0.SNAPSHOT",org.drools.workflow.instance;u
+ ses:="org.drools.process.instance,org.drools.workflow.instance.impl,o
+ rg.drools.impl,org.drools.workflow.core.impl,org.drools,org.drools.pr
+ ocess.core,org.drools.common";version="5.1.0.SNAPSHOT",org.drools.wor
+ kflow.instance.node;uses:="org.drools.workflow.instance.impl,org.droo
+ ls.workflow.core.node,org.drools.process.instance,org.drools.base,org
+ .drools.workflow.instance,org.drools,org.drools.spi,org.drools.workfl
+ ow.core,org.drools.common,org.drools.process.core,org.drools.process.
+ instance.impl,org.drools.event,org.drools.process.core.event,org.droo
+ ls.process.instance.context.variable,org.drools.process.instance.cont
+ ext.exception,org.mvel2,org.mvel2.integration,org.drools.process.inst
+ ance.context.swimlane,org.drools.rule,org.drools.process.core.timer,o
+ rg.drools.process.instance.timer,org.drools.time";version="5.1.0.SNAP
+ SHOT",org.drools.process.core.validation.impl;uses:="org.drools.proce
+ ss.core.validation";version="5.1.0.SNAPSHOT",org.drools.factmodel;use
+ s:="org.mvel2.asm,org.drools.base,com.thoughtworks.xstream.io,com.tho
+ ughtworks.xstream.io.xml,com.thoughtworks.xstream";version="5.1.0.SNA
+ PSHOT",org.drools.base.mvel;uses:="org.mvel2.integration,org.mvel2.in
+ tegration.impl,org.mvel2,org.drools,org.drools.rule,org.drools.spi,or
+ g.drools.common,org.mvel2.compiler,org.drools.util,org.drools.type,or
+ g.drools.base,org.mvel2.debug";version="5.1.0.SNAPSHOT",org.drools.pr
+ ocess.core;uses:="org.drools.process.core.datatype";version="5.1.0.SN
+ APSHOT",org.drools.command.impl;uses:="org.drools.command,org.drools.
+ command.runtime.process,org.drools.command.runtime.rule,org.drools.im
+ pl,org.drools.time,org.drools,org.drools.rule,org.drools.command.runt
+ ime,org.drools.runtime.impl";version="5.1.0.SNAPSHOT",org.drools.io.i
+ mpl;uses:="org.drools.io.internal,org.drools,org.drools.util";version
+ ="5.1.0.SNAPSHOT",org.drools.runtime.help.impl;uses:="org.drools.comm
+ and,com.thoughtworks.xstream.io,com.thoughtworks.xstream.mapper,com.t
+ houghtworks.xstream.converters.collections,org.drools.command.runtime
+ .process,com.thoughtworks.xstream.converters,org.drools.runtime.impl,
+ org.drools.common,org.drools.command.runtime.rule,org.drools.command.
+ runtime,org.drools.base,org.drools.runtime.rule.impl,org.drools.rule,
+ org.drools.spi,com.thoughtworks.xstream";version="5.1.0.SNAPSHOT",org
+ .drools.process.core.datatype.impl;uses:="org.drools.process.core.dat
+ atype";version="5.1.0.SNAPSHOT",org.drools.process.core.datatype.impl
+ .type;uses:="org.drools.process.core.datatype,org.drools.process.core
  ,com.thoughtworks.xstream";version="5.1.0.SNAPSHOT",org.drools.proces
- s.core.datatype.impl;uses:="org.drools.process.core.datatype";version
- ="5.1.0.SNAPSHOT",org.drools.process.core.datatype.impl.type;uses:="o
- rg.drools.process.core.datatype,org.drools.process.core,com.thoughtwo
- rks.xstream";version="5.1.0.SNAPSHOT",org.drools.process.instance.imp
- l;uses:="org.drools.process.core,org.drools.process.instance,org.droo
- ls.process.instance.context.swimlane,org.drools.process.core.context.
- swimlane,org.drools.process.instance.context.exception,org.drools.pro
- cess.instance.impl.factory,org.drools.process.core.context.exception,
- org.drools.process.core.context.variable,org.drools.process.instance.
- context.variable,org.drools,org.drools.common";version="5.1.0.SNAPSHO
- T",org.drools.runtime.pipeline.impl;uses:="org.drools.runtime.pipelin
- e,org.drools.command,org.drools.command.runtime.rule,org.mvel2,org.mv
- el2.compiler,org.drools.common,org.drools,org.drools.impl,org.drools.
- rule";version="5.1.0.SNAPSHOT",org.drools.command.runtime.rule;uses:=
- "org.drools.command,org.drools.command.impl,org.drools.impl,org.drool
- s,org.drools.spi,org.drools.runtime.impl,org.drools.common,org.mvel2"
- ;version="5.1.0.SNAPSHOT",org.drools.command.runtime;uses:="org.drool
- s.command,org.drools.command.impl,org.drools.runtime.impl,org.drools.
- impl,org.drools";version="5.1.0.SNAPSHOT"
+ s.instance.impl;uses:="org.drools.process.core,org.drools.process.ins
+ tance,org.drools.process.instance.context.swimlane,org.drools.process
+ .core.context.swimlane,org.drools.process.instance.context.exception,
+ org.drools.process.instance.impl.factory,org.drools.process.core.cont
+ ext.exception,org.drools.process.core.context.variable,org.drools.pro
+ cess.instance.context.variable,org.drools,org.drools.common";version=
+ "5.1.0.SNAPSHOT",org.drools.runtime.pipeline.impl;uses:="org.drools.r
+ untime.pipeline,org.drools.command,org.drools.command.runtime.rule,or
+ g.mvel2,org.mvel2.compiler,org.drools.common,org.drools,org.drools.im
+ pl,org.drools.rule";version="5.1.0.SNAPSHOT",org.drools.command.runti
+ me.rule;uses:="org.drools.command,org.drools.command.impl,org.drools,
+ org.drools.impl,org.drools.spi,org.drools.runtime.impl,org.drools.com
+ mon,org.mvel2";version="5.1.0.SNAPSHOT",org.drools.command.runtime;us
+ es:="org.drools.command,org.drools.command.impl,org.drools.runtime.im
+ pl,org.drools.impl,org.drools";version="5.1.0.SNAPSHOT"
 Bundle-Version: 5.1.0.SNAPSHOT
 Bundle-Name: Drools :: Core
 Bundle-Description: A rule production system
@@ -285,5 +284,5 @@
 Tool: Bnd-0.0.357
 Require-Bundle: org.drools.api;visibility:=reexport;bundle-version="5.
  1.0.SNAPSHOT"
-DynamicImport-Package: *
+DynamicImport-Package: org.drools.*
 

Modified: labs/jbossrules/trunk/drools-core/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-core/pom.xml	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-core/pom.xml	2010-01-14 09:24:25 UTC (rev 31079)
@@ -13,11 +13,16 @@
   <name>Drools :: Core</name>
 
   <dependencies>  
-      <dependency>  
-         <groupId>org.osgi</groupId>  
-         <artifactId>org.osgi.core</artifactId>  
-         <scope>provided</scope>
-       </dependency>
+            <dependency>  
+               <groupId>org.eclipse.equinox</groupId>  
+               <artifactId>org.eclipse.osgi</artifactId>  
+               <scope>provided</scope> 
+            </dependency>            
+            <dependency>  
+               <groupId>org.eclipse.equinox</groupId>  
+               <artifactId>org.eclipse.osgi.util</artifactId>  
+               <scope>provided</scope> 
+            </dependency>
               
     <!-- following are required for parser (lang). May be refactored out of core module. -->    
       <dependency>  

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java	2010-01-14 09:24:25 UTC (rev 31079)
@@ -67,11 +67,11 @@
 import org.drools.runtime.rule.ConsequenceExceptionHandler;
 import org.drools.runtime.rule.impl.DefaultConsequenceExceptionHandler;
 import org.drools.spi.ConflictResolver;
+import org.drools.util.ChainedProperties;
+import org.drools.util.ClassLoaderUtil;
+import org.drools.util.CompositeClassLoader;
 import org.drools.util.ConfFileUtils;
 import org.drools.util.StringUtils;
-import org.drools.util.internal.ChainedProperties;
-import org.drools.util.internal.ClassLoaderUtil;
-import org.drools.util.internal.CompositeClassLoader;
 import org.drools.workflow.core.Node;
 import org.drools.workflow.instance.impl.NodeInstanceFactory;
 import org.drools.workflow.instance.impl.NodeInstanceFactoryRegistry;

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/SessionConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/SessionConfiguration.java	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/SessionConfiguration.java	2010-01-14 09:24:25 UTC (rev 31079)
@@ -35,10 +35,10 @@
 import org.drools.runtime.conf.MultiValueKnowledgeSessionOption;
 import org.drools.runtime.conf.SingleValueKnowledgeSessionOption;
 import org.drools.runtime.process.WorkItemHandler;
+import org.drools.util.ChainedProperties;
+import org.drools.util.ClassLoaderUtil;
 import org.drools.util.ConfFileUtils;
 import org.drools.util.StringUtils;
-import org.drools.util.internal.ChainedProperties;
-import org.drools.util.internal.ClassLoaderUtil;
 import org.mvel2.MVEL;
 
 /**

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/ClassPathResource.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/ClassPathResource.java	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/ClassPathResource.java	2010-01-14 09:24:25 UTC (rev 31079)
@@ -19,9 +19,9 @@
 
 import org.drools.io.Resource;
 import org.drools.io.internal.InternalResource;
+import org.drools.util.ClassLoaderUtil;
 import org.drools.util.ClassUtils;
 import org.drools.util.StringUtils;
-import org.drools.util.internal.ClassLoaderUtil;
 
 /**
  * Borrowed gratuitously from Spring under ASL2.0.

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/osgi/core/Activator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/osgi/core/Activator.java	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/osgi/core/Activator.java	2010-01-14 09:24:25 UTC (rev 31079)
@@ -17,18 +17,19 @@
     private ServiceRegistration kbaseReg;
 
     public void start(BundleContext bc) throws Exception {
-        System.out.println( "registering core drools services" );
-        this.resourceReg = bc.registerService( ResourceProvider.class.getName(),
-                                               new ResourceProviderImpl(),
-                                               new Hashtable() );
-        this.kbaseReg = bc.registerService( KnowledgeBaseProvider.class.getName(),
-                                            new KnowledgeBaseProviderImpl(),
-                                            new Hashtable() );
-        System.out.println( "drools core services registered" );
+        System.out.println( "registering core  services" );
+//        this.resourceReg = bc.registerService( ResourceProvider.class.getName(),
+//                                               new ResourceProviderImpl(),
+//                                               new Hashtable() );
+//        this.kbaseReg = bc.registerService( KnowledgeBaseProvider.class.getName(),
+//                                            new KnowledgeBaseProviderImpl(),
+//                                            new Hashtable() );
+        System.out.println( "core services registered" );
     }
 
     public void stop(BundleContext bc) throws Exception {
-        this.resourceReg.unregister();
-        this.kbaseReg.unregister();
+//        this.resourceReg.unregister();
+//        this.kbaseReg.unregister();
     }
+
 }

Modified: labs/jbossrules/trunk/drools-decisiontables/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/.classpath	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-decisiontables/.classpath	2010-01-14 09:24:25 UTC (rev 31079)
@@ -23,6 +23,7 @@
   <classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/osgi/org.osgi.core/r4v42/org.osgi.core-r4v42.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/equinox/org.eclipse.osgi/3.5.1/org.eclipse.osgi-3.5.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/equinox/org.eclipse.osgi.util/3.5.1/org.eclipse.osgi.util-3.5.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2/stringtemplate-3.2.jar"/>
 </classpath>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF	2010-01-14 09:24:25 UTC (rev 31079)
@@ -4,7 +4,7 @@
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Import-Package: jxl;version="2.6",jxl.read.biff;version="2.6",org.osgi
  .framework;version="1.5"
-Bnd-LastModified: 1263413871879
+Bnd-LastModified: 1263459169507
 Export-Package: org.drools.decisiontable;uses:="org.drools.decisiontab
  le.parser.csv,org.drools.decisiontable.parser,org.drools.decisiontabl
  e.parser.xls";version="5.1.0.SNAPSHOT",org.drools.decisiontable.parse

Modified: labs/jbossrules/trunk/drools-decisiontables/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/pom.xml	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-decisiontables/pom.xml	2010-01-14 09:24:25 UTC (rev 31079)
@@ -28,11 +28,16 @@
     </dependency>
 
     <!-- External dependencies -->
-    <dependency>  
-       <groupId>org.osgi</groupId>  
-       <artifactId>org.osgi.core</artifactId>  
-       <scope>provided</scope>
-    </dependency>
+            <dependency>  
+               <groupId>org.eclipse.equinox</groupId>  
+               <artifactId>org.eclipse.osgi</artifactId>  
+               <scope>provided</scope> 
+            </dependency>            
+            <dependency>  
+               <groupId>org.eclipse.equinox</groupId>  
+               <artifactId>org.eclipse.osgi.util</artifactId>  
+               <scope>provided</scope> 
+            </dependency>
                 
     <dependency>  
         <groupId>net.sourceforge.jexcelapi</groupId>  

Modified: labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF	2010-01-14 09:24:25 UTC (rev 31079)
@@ -2,7 +2,7 @@
 Created-By: 1.5.0_16 (Sun Microsystems Inc.)
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Import-Package: org.mvel2.templates
-Bnd-LastModified: 1263413869544
+Bnd-LastModified: 1263459166743
 Export-Package: org.drools.template.jdbc;uses:="org.drools.template.pa
  rser";version="5.1.0.SNAPSHOT",org.drools.template;uses:="org.drools.
  template.parser,org.drools.template.objects";version="5.1.0.SNAPSHOT"

Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml	2010-01-14 05:36:13 UTC (rev 31078)
+++ labs/jbossrules/trunk/pom.xml	2010-01-14 09:24:25 UTC (rev 31079)
@@ -1089,9 +1089,14 @@
 
             <!-- External dependencies -->
             <dependency>  
-               <groupId>org.osgi</groupId>  
-               <artifactId>org.osgi.core</artifactId>  
-               <version>r4v42</version> 
+               <groupId>org.eclipse.equinox</groupId>  
+               <artifactId>org.eclipse.osgi</artifactId>  
+               <version>3.5.1</version> 
+            </dependency>            
+            <dependency>  
+               <groupId>org.eclipse.equinox</groupId>  
+               <artifactId>org.eclipse.osgi.util</artifactId>  
+               <version>3.5.1</version> 
             </dependency>
             
             <!-- drools-core -->



More information about the jboss-svn-commits mailing list