[jboss-svn-commits] JBL Code SVN: r31054 - in labs/jbossrules/trunk: bundle-repository and 48 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Jan 13 06:42:33 EST 2010


Author: mark.proctor at jboss.com
Date: 2010-01-13 06:42:31 -0500 (Wed, 13 Jan 2010)
New Revision: 31054

Added:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/osgi/
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/osgi/core/
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/osgi/core/Activator.java
   labs/jbossrules/trunk/drools-decisiontables/META-INF/
   labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/drools-decisiontables/build.properties
   labs/jbossrules/trunk/drools-decisiontables/src/main/java/org/drools/osgi/
   labs/jbossrules/trunk/drools-decisiontables/src/main/java/org/drools/osgi/decisiontables/
   labs/jbossrules/trunk/drools-decisiontables/src/main/java/org/drools/osgi/decisiontables/Activator.java
   labs/jbossrules/trunk/drools-templates/META-INF/
   labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF
Modified:
   labs/jbossrules/trunk/bundle-repository/
   labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/
   labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/pom.xml
   labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/
   labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/pom.xml
   labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/
   labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/pom.xml
   labs/jbossrules/trunk/bundle-repository/plugins/
   labs/jbossrules/trunk/drools-ant/pom.xml
   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/util/ClassLoaderUtil.java
   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/DecisionTableFactory.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialectConfiguration.java
   labs/jbossrules/trunk/drools-container/drools-spring/
   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/agent/impl/KnowledgeAgentImpl.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/xml/ExtensibleXmlParser.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/xml/XmlChangeSetReader.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/xml/changeset/ResourceHandler.java
   labs/jbossrules/trunk/drools-decisiontables/.classpath
   labs/jbossrules/trunk/drools-decisiontables/pom.xml
   labs/jbossrules/trunk/drools-guvnor/.classpath
   labs/jbossrules/trunk/drools-guvnor/.project
   labs/jbossrules/trunk/drools-guvnor/Guvnor.launch
   labs/jbossrules/trunk/drools-guvnor/pom.xml
   labs/jbossrules/trunk/drools-pipeline/drools-messenger-jms/.classpath
   labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/.classpath
   labs/jbossrules/trunk/drools-pipeline/drools-transformer-jxls/.classpath
   labs/jbossrules/trunk/drools-pipeline/drools-transformer-smooks/.classpath
   labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/.classpath
   labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/.project
   labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/pom.xml
   labs/jbossrules/trunk/drools-planner/drools-planner-core/.classpath
   labs/jbossrules/trunk/drools-planner/drools-planner-core/.project
   labs/jbossrules/trunk/drools-planner/drools-planner-core/pom.xml
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/.classpath
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/.project
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/pom.xml
   labs/jbossrules/trunk/drools-process/drools-bpmn2/.classpath
   labs/jbossrules/trunk/drools-process/drools-bpmn2/.project
   labs/jbossrules/trunk/drools-process/drools-gwt-console/.classpath
   labs/jbossrules/trunk/drools-process/drools-gwt-console/.project
   labs/jbossrules/trunk/drools-process/drools-process-task/.classpath
   labs/jbossrules/trunk/drools-process/drools-process-task/pom.xml
   labs/jbossrules/trunk/drools-process/drools-workitems/.classpath
   labs/jbossrules/trunk/drools-repository/.classpath
   labs/jbossrules/trunk/drools-repository/pom.xml
   labs/jbossrules/trunk/drools-server/pom.xml
   labs/jbossrules/trunk/drools-templates/pom.xml
   labs/jbossrules/trunk/drools-verifier/.classpath
   labs/jbossrules/trunk/drools-verifier/pom.xml
   labs/jbossrules/trunk/drools-vsm/.classpath
   labs/jbossrules/trunk/drools-vsm/.project
   labs/jbossrules/trunk/pom.xml
Log:
JBRULES-2351 OSGi Ready
-api, core, compiler and decision tables are now their own bundles with their own Activators


Property changes on: labs/jbossrules/trunk/bundle-repository
___________________________________________________________________
Name: svn:ignore
   + .settings



Property changes on: labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader
___________________________________________________________________
Name: svn:ignore
   + target


Modified: labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/META-INF/MANIFEST.MF	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/META-INF/MANIFEST.MF	2010-01-13 11:42:31 UTC (rev 31054)
@@ -6,7 +6,6 @@
 Bundle-Vendor: JBoss
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: lib/commons-jexl.jar,
- lib/jxls-reader.jar,
  .
 Export-Package: 
  net.sf.jxls.reader

Modified: labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/pom.xml
===================================================================
--- labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/pom.xml	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/pom.xml	2010-01-13 11:42:31 UTC (rev 31054)
@@ -51,7 +51,7 @@
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
-            <id>copy-dependencies</id>
+            <id>copy-tran-dependencies</id>
             <phase>generate-resources</phase>
             <goals>
               <goal>copy-dependencies</goal>
@@ -62,11 +62,35 @@
               <overWriteSnapshots>true</overWriteSnapshots>
               <overWriteIfNewer>true</overWriteIfNewer>
               <stripVersion>true</stripVersion>
-              <includeScope>runtime</includeScope>                    
+              <includeScope>runtime</includeScope> 
+              <excludeGroupIds>net.sf.jxls</excludeGroupIds>
             </configuration>
           </execution>
         </executions>
-      </plugin>   
+      </plugin> 
+
+     <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>unpack-dependency</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>unpack-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>target/classes</outputDirectory>
+              <overWriteReleases>true</overWriteReleases>
+              <overWriteSnapshots>true</overWriteSnapshots>
+              <overWriteIfNewer>true</overWriteIfNewer>
+              <stripVersion>true</stripVersion>
+              <includeScope>runtime</includeScope> 
+              <includeGroupIds>net.sf.jxls</includeGroupIds>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>       
     </plugins>
      
               <resources>          


Property changes on: labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean
___________________________________________________________________
Name: svn:ignore
   + target


Modified: labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/META-INF/MANIFEST.MF	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/META-INF/MANIFEST.MF	2010-01-13 11:42:31 UTC (rev 31054)
@@ -5,18 +5,15 @@
 Bundle-Version: 1.2
 Bundle-Vendor: JBoss
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ClassPath: .,
- lib/milyn-smooks-core.jar,
- lib/milyn-smooks-javabean.jar,
- lib/milyn-commons.jar,
- lib/mvel2.jar
+Bundle-ClassPath: .
 Require-Bundle: com.springsource.org.apache.log4j;bundle-version="1.2.15",
  com.springsource.org.apache.commons.lang;bundle-version="2.4.0",
  com.springsource.org.apache.commons.logging;bundle-version="1.1.1",
  com.springsource.org.apache.xmlcommons;bundle-version="1.3.4",
  com.springsource.com.thoughtworks.xstream;bundle-version="1.3.1",
  com.springsource.freemarker;bundle-version="2.3.15",
- com.springsource.javassist;bundle-version="3.9.0"
+ com.springsource.javassist;bundle-version="3.9.0",
+ org.drools.osgi.wrapper.mvel2="2.0.12"
 Export-Package: org.milyn,
  org.milyn.annotation,
  org.milyn.assertion,

Modified: labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/pom.xml
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/pom.xml	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/pom.xml	2010-01-13 11:42:31 UTC (rev 31054)
@@ -24,45 +24,25 @@
                 </archive> 
               </configuration>
             </plugin>    
-  
+      
      <plugin>
-       <artifactId>maven-antrun-plugin</artifactId>
-       <inherited>false</inherited>
-       <executions>
-         <execution>
-           <id>clean lib</id>
-           <phase>clean</phase>
-           <configuration>
-             <tasks>                              
-                <delete>
-                  <fileset dir="lib" includes="**/*.jar" excludes="**/.svn" />                 
-                </delete>  
-             </tasks>
-           </configuration>
-           <goals>
-             <goal>run</goal>
-           </goals>
-         </execution>        
-       </executions>
-     </plugin>    
-    
-     <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
-            <id>copy-dependencies</id>
+            <id>unpack-dependencies</id>
             <phase>generate-resources</phase>
             <goals>
-              <goal>copy-dependencies</goal>
+              <goal>unpack-dependencies</goal>
             </goals>
             <configuration>
-              <outputDirectory>lib</outputDirectory>
+              <outputDirectory>target/classes</outputDirectory>
               <overWriteReleases>true</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
               <overWriteIfNewer>true</overWriteIfNewer>
               <stripVersion>true</stripVersion>
-              <includeScope>runtime</includeScope>                    
+              <includeScope>runtime</includeScope> 
+              <includeGroupIds>org.milyn</includeGroupIds>
             </configuration>
           </execution>
         </executions>
@@ -120,9 +100,13 @@
                     <exclusion>  
                         <groupId>xerces</groupId>  
                         <artifactId>xercesImpl</artifactId>  
-                    </exclusion>                      
-               </exclusions>               
-            </dependency>      
+                    </exclusion>  
+                    <exclusion>  
+                        <groupId>org.mvel</groupId>  
+                        <artifactId>mvel2</artifactId>  
+                    </exclusion>                    
+               </exclusions>   
+        </dependency>               
   </dependencies>
 
 </project>


Property changes on: labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2
___________________________________________________________________
Name: svn:ignore
   + target


Modified: labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/META-INF/MANIFEST.MF	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/META-INF/MANIFEST.MF	2010-01-13 11:42:31 UTC (rev 31054)
@@ -6,8 +6,7 @@
 Bundle-Vendor: JBoss
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: 
- .,
- lib/mvel2.jar
+ .
 Export-Package: 
  org.mvel2,
  org.mvel2.asm,

Modified: labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/pom.xml
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/pom.xml	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/pom.xml	2010-01-13 11:42:31 UTC (rev 31054)
@@ -23,28 +23,7 @@
                   <manifestFile>META-INF/MANIFEST.MF</manifestFile>
                 </archive> 
               </configuration>
-            </plugin>      
-  
-     <plugin>
-       <artifactId>maven-antrun-plugin</artifactId>
-       <inherited>false</inherited>
-       <executions>
-         <execution>
-           <id>clean lib</id>
-           <phase>clean</phase>
-           <configuration>
-             <tasks>                              
-                <delete>
-                  <fileset dir="lib" includes="**/*.jar" excludes="**/.svn" />                 
-                </delete>  
-             </tasks>
-           </configuration>
-           <goals>
-             <goal>run</goal>
-           </goals>
-         </execution>        
-       </executions>
-     </plugin>    
+            </plugin>         
     
      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -54,15 +33,16 @@
             <id>copy-dependencies</id>
             <phase>generate-resources</phase>
             <goals>
-              <goal>copy-dependencies</goal>
+              <goal>unpack-dependencies</goal>
             </goals>
             <configuration>
-              <outputDirectory>lib</outputDirectory>
+              <outputDirectory>target/classes</outputDirectory>
               <overWriteReleases>true</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
               <overWriteIfNewer>true</overWriteIfNewer>
               <stripVersion>true</stripVersion>
-              <includeScope>runtime</includeScope>                    
+              <includeScope>runtime</includeScope>    
+              <includeGroupIds>org.mvel</includeGroupIds>              
             </configuration>
           </execution>
         </executions>
@@ -73,14 +53,7 @@
                 <resource>
                   <targetPath>META-INF</targetPath>                
                   <directory>META-INF</directory>
-                </resource>  
-                <resource>
-                  <targetPath>lib</targetPath>                
-                  <directory>lib</directory>
-                    <includes>
-                      <include>*.jar</include>
-                    </includes>                
-                </resource>                      
+                </resource>                       
               </resources>       
   </build>
 


Property changes on: labs/jbossrules/trunk/bundle-repository/plugins
___________________________________________________________________
Name: svn:ignore
   + *.jar


Modified: labs/jbossrules/trunk/drools-ant/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-ant/pom.xml	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-ant/pom.xml	2010-01-13 11:42:31 UTC (rev 31054)
@@ -43,8 +43,8 @@
       <version>1.6.5</version>
     </dependency>
     <dependency>
-      <groupId>com.thoughtworks.xstream</groupId>
-      <artifactId>xstream</artifactId>
+        <groupId>com.thoughtworks.xstream</groupId>  
+        <artifactId>com.springsource.com.thoughtworks.xstream</artifactId> 
       <scope>runtime</scope>
     </dependency>
            

Modified: labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF	2010-01-13 11:42:31 UTC (rev 31054)
@@ -23,7 +23,7 @@
  org.drools.time;version="5.1",org.drools.util;version="5.1",org.drool
  s.vsm;version="5.1",org.milyn;resolution:=optional,org.quartz;resolut
  ion:=optional;version="1.6"
-Bnd-LastModified: 1263331618765
+Bnd-LastModified: 1263355482785
 Export-Package: org.drools.logger;uses:="org.drools.event,org.drools";
  version="5.1.0.SNAPSHOT",org.drools.runtime;uses:="org.drools.command
  ,org.drools.time,org.drools.event,org.drools,org.drools.runtime.proce

Modified: labs/jbossrules/trunk/drools-api/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-api/pom.xml	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-api/pom.xml	2010-01-13 11:42:31 UTC (rev 31054)
@@ -12,14 +12,8 @@
   <packaging>jar</packaging>
   <name>Drools :: API</name>
 
-  <dependencies>  
+  <dependencies>    
          <dependency>  
-            <groupId>org.drools</groupId>  
-            <artifactId>bundle-repository</artifactId>  
-            <scope>optional</scope> 
-         </dependency>    
-  
-         <dependency>  
             <groupId>com.sun.xml</groupId>  
             <artifactId>com.springsource.com.sun.tools.xjc</artifactId>  
             <scope>provided</scope> 

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-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/util/ClassLoaderUtil.java	2010-01-13 11:42:31 UTC (rev 31054)
@@ -1,35 +1,34 @@
 package org.drools.util;
 
 import java.util.ArrayList;
+import java.util.IdentityHashMap;
 import java.util.List;
+import java.util.Map.Entry;
 
 public class ClassLoaderUtil {
     public static ClassLoader getClassLoader(final ClassLoader classLoader, Class cls) {
         ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
-        ClassLoader currentClassLoader = cls.getClassLoader();
-        List<ClassLoader> list = new ArrayList<ClassLoader>();
-        if ( classLoader != null) {
-            list.add( classLoader );
-        }
+        ClassLoader currentClassLoader = ( cls != null ) ? cls.getClassLoader() : ClassLoaderUtil.class.getClassLoader();
+        ClassLoader systemClassLoader = Class.class.getClassLoader().getSystemClassLoader();
         
-        if ( contextClassLoader != null && contextClassLoader != classLoader ) {
-            list.add( contextClassLoader );
-        }
+        IdentityHashMap<ClassLoader, Object> map = new IdentityHashMap<ClassLoader, Object>();
+        map.put( classLoader, null );
+        map.put( contextClassLoader, null );
+        map.put( currentClassLoader, null );
+        map.put( systemClassLoader, null );
         
-        if ( currentClassLoader != null && ( currentClassLoader != classLoader || currentClassLoader != contextClassLoader ) ) {
-            list.add( currentClassLoader );
-        }
-        
-        if ( list.size() > 0 ) {
+        if ( map.size() > 0 ) {
             CompositeClassLoader cl = new CompositeClassLoader( null );
-            for ( ClassLoader entry : list ) {
-                cl.addClassLoader( entry );
+            for ( ClassLoader entry : map.keySet() ) {
+                if ( entry != null ) {
+                    cl.addClassLoader( entry );
+                }
             }
             
             return cl;
             
         } else {
-            return list.get(0);
+            return map.keySet().iterator().next();
         }
                
     } 

Modified: labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF	2010-01-13 11:42:31 UTC (rev 31054)
@@ -1,82 +1,76 @@
 Manifest-Version: 1.0
-Created-By: 1.5.0_16 (Sun Microsystems Inc.)
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bnd-LastModified: 1263331856328
-Export-Package: org.drools.builder.impl;version="5.1.0.SNAPSHOT",org.d
- rools.rule.builder;uses:="org.drools.rule.builder.dialect.mvel";versi
- on="5.1.0.SNAPSHOT",org.drools.guvnor.client.modeldriven.testing;uses
- :="org.drools.guvnor.client.modeldriven.brl";version="5.1.0.SNAPSHOT"
- ,org.drools.guvnor.server.util;uses:="org.drools.guvnor.client.modeld
- riven.brl,org.drools.guvnor.client.modeldriven,org.drools.guvnor.clie
- nt.modeldriven.dt,org.drools.guvnor.client.modeldriven.testing";versi
- on="5.1.0.SNAPSHOT",org.drools.guvnor.client.modeldriven.dt;uses:="or
- g.drools.guvnor.client.modeldriven.brl,org.drools.guvnor.client.model
- driven";version="5.1.0.SNAPSHOT",org.drools.process.builder;uses:="or
- g.drools.rule.builder";version="5.1.0.SNAPSHOT",org.drools.testframew
- ork;uses:="org.drools.guvnor.client.modeldriven.testing,org.drools.gu
- vnor.server.util";version="5.1.0.SNAPSHOT",org.drools.guvnor.client.m
- odeldriven.ui;version="5.1.0.SNAPSHOT",org.drools.xml.rules;uses:="or
- g.drools.xml";version="5.1.0.SNAPSHOT",org.drools.guvnor.client.model
- driven;uses:="org.drools.guvnor.client.modeldriven.brl";version="5.1.
- 0.SNAPSHOT",org.drools.reteoo.compiled;uses:="org.drools.rule.builder
- .dialect.java";version="5.1.0.SNAPSHOT",org.drools.xml.processes;uses
- :="org.drools.xml";version="5.1.0.SNAPSHOT",org.drools.rule.builder.d
- ialect.java.parser;version="5.1.0.SNAPSHOT",org.drools.semantics.java
- .parser;version="5.1.0.SNAPSHOT",org.drools.rule.builder.dialect.java
- ;uses:="org.drools.rule.builder,org.drools.rule.builder.dialect.mvel,
- org.drools.rule.builder.dialect.java.parser";version="5.1.0.SNAPSHOT"
- ,org.drools.xml;uses:="org.drools.xml.processes,org.drools.xml.rules"
- ;version="5.1.0.SNAPSHOT",org.drools.rule.builder.dialect.mvel;uses:=
- "org.drools.rule.builder,org.drools.rule.builder.dialect.java";versio
- n="5.1.0.SNAPSHOT",org.drools.guvnor.server.rules;uses:="org.drools.g
- uvnor.server.util,org.drools.guvnor.client.modeldriven";version="5.1.
- 0.SNAPSHOT",org.drools.guvnor.client.modeldriven.brl;version="5.1.0.S
- NAPSHOT"
-Bundle-Version: 5.1.0.SNAPSHOT
-Ignore-Package: java.lang,org.eclipse.jdt.internal.compiler.env,java.n
- et,org.mvel2.compiler,org.drools.process.core.timer,java.text,org.dro
- ols.workflow.core.node,org.drools.guvnor.server.util,org.codehaus.jan
- ino.util,org.drools.io.internal,org.drools.process.builder,org.antlr.
- runtime.tree,javax.xml.parsers,org.drools.process.core.context.except
- ion,javax.xml.transform.stream,org.drools.guvnor.client.modeldriven,o
- rg.drools.base.extractors,com.thoughtworks.xstream.io,org.drools.buil
- der.conf,org.drools.process.core.context.variable,org.drools.base.acc
- umulators,java.lang.reflect,org.drools.xml,org.mvel2.ast,org.drools.b
- ase.field,org.drools.facttemplates,org.drools.guvnor.server.rules,org
- .drools.ruleflow.core,org.drools.util,org.drools.type,org.drools.defi
- nition.process,org.drools.agent,org.drools.workflow.instance.impl,org
- .drools.builder.impl,org.drools.base.evaluators,org.drools.impl,org.d
- rools.definitions.impl,org.drools.process.core.datatype,org.eclipse.j
- dt.internal.compiler,org.drools.guvnor.client.modeldriven.dt,org.mvel
- 2,com.thoughtworks.xstream.io.xml,java.util,org.drools.guvnor.client.
- modeldriven.ui,org.drools.runtime.process,org.drools.workflow.core,or
- g.drools.builder.conf.impl,org.mvel2.integration,org.drools.process.c
- ore.validation,org.drools.rule.builder.dialect.java.parser,org.mvel2.
- optimizers,org.drools.base.dataproviders,org.mvel2.templates,org.droo
- ls.rule.builder.dialect.mvel,org.drools.builder,org.drools.guvnor.cli
- ent.modeldriven.brl,com.thoughtworks.xstream,org.drools.base.mvel,org
- .drools.reteoo,org.drools.factmodel,org.drools.process.core,org.eclip
- se.jdt.core.compiler,org.drools.ruleflow.core.validation,org.codehaus
- .janino.util.enumerator,org.drools.runtime.rule,org.mvel2.integration
- .impl,org.codehaus.janino,javax.xml.transform,org.drools.time,org.dro
- ols.workflow.core.impl,org.drools.testframework,org.eclipse.jdt.inter
- nal.compiler.problem,org.drools.rule,org.drools.process.core.event,or
- g.drools.xml.rules,org.drools.reteoo.compiled,org.codehaus.janino.uti
- l.resource,org.drools.util.asm,org.drools.definition,java.beans,org.e
- clipse.jdt.internal.compiler.classfmt,org.drools.semantics.java.parse
- r,org.drools.rule.builder.dialect.java,org.drools.event,org.drools.io
- ,org.drools.process.core.context.swimlane,org.drools.time.impl,org.dr
- ools.common,org.drools.rule.builder,org.drools.guvnor.client.modeldri
- ven.testing,org.mvel2.util,org.drools.base,org.drools,org.drools.spi,
- org.drools.process.core.impl,java.util.jar,org.drools.xml.processes,o
- rg.xml.sax,org.w3c.dom,java.util.regex,java.io,org.drools.io.impl,org
- .drools.process.core.datatype.impl.type,org.antlr.runtime
+Export-Package: org.drools.builder.impl;version="5.1.0.SNAPSHOT";
+  uses:="org.drools.io,
+   org.drools,
+   org.drools.builder,
+   org.drools.compiler",
+ org.drools.compiler;version="5.1.0.SNAPSHOT",
+ org.drools.guvnor.client;version="5.1.0.SNAPSHOT",
+ org.drools.guvnor.client.modeldriven;version="5.1.0.SNAPSHOT";uses:="junit.framework",
+ 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;version="5.1.0.SNAPSHOT",
+ org.drools.guvnor.server.rules;version="5.1.0.SNAPSHOT";uses:="junit.framework,org.drools",
+ org.drools.guvnor.server.util;version="5.1.0.SNAPSHOT",
+ org.drools.process.builder;version="5.1.0.SNAPSHOT";uses:="org.drools.lang.descr,org.drools.definition.process,org.drools.rule.builder",
+ org.drools.reteoo.compiled;version="5.1.0.SNAPSHOT";uses:="org.drools.reteoo,org.drools.compiler",
+ org.drools.rule.builder;version="5.1.0.SNAPSHOT",
+ org.drools.rule.builder.dialect.java;version="5.1.0.SNAPSHOT",
+ org.drools.rule.builder.dialect.java.parser;version="5.1.0.SNAPSHOT",
+ org.drools.rule.builder.dialect.mvel;version="5.1.0.SNAPSHOT",
+ org.drools.semantics.java.parser;version="5.1.0.SNAPSHOT",
+ org.drools.testframework;version="5.1.0.SNAPSHOT",
+ org.drools.xml;version="5.1.0.SNAPSHOT",
+ org.drools.xml.processes;version="5.1.0.SNAPSHOT",
+ org.drools.xml.rules;version="5.1.0.SNAPSHOT"
+Private-Package: org.drools.lang.descr;version="5.1.0.SNAPSHOT",org.dr
+ ools.commons.jci.compilers;version="5.1.0.SNAPSHOT",org.drools.lang.d
+ sl;version="5.1.0.SNAPSHOT",org.drools.commons.jci.problems;version="
+ 5.1.0.SNAPSHOT",org.drools.commons.jci.readers;version="5.1.0.SNAPSHO
+ T",org.drools.commons.jci.stores;version="5.1.0.SNAPSHOT",org.drools.lang;version="5.1.0.SNAP
+ SHOT"
+Tool: Bnd-0.0.357
 Bundle-Name: Drools :: Compiler
-Bundle-Description: A rule production system
-Bundle-DocURL: http://www.jboss.org/
+Created-By: 1.6.0_10 (Sun Microsystems Inc.)
+Require-Bundle: org.drools.core;bundle-version="5.1.0.SNAPSHOT"
 Bundle-Vendor: JBoss Inc.
+DynamicImport-Package: org.drools.*
+Bundle-Version: 5.1.0.SNAPSHOT
+Bnd-LastModified: 1263361002859
 Bundle-ManifestVersion: 2
+Bundle-Description: A rule production system
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Import-Package: com.thoughtworks.xstream;version="1.3",
+ com.thoughtworks.xstream.io;version="1.3",
+ com.thoughtworks.xstream.io.xml;version="1.3",
+ javax.xml.parsers,
+ javax.xml.transform,
+ javax.xml.transform.stream,
+ org.antlr.runtime;version="3.1",
+ org.antlr.runtime.tree;version="3.1",
+ org.codehaus.janino;version="2.5",
+ org.codehaus.janino.util;version="2.5",
+ org.codehaus.janino.util.enumerator;version="2.5",
+ org.codehaus.janino.util.resource;version="2.5",
+ org.eclipse.jdt.core.compiler;provider=jasper;version="3.3",
+ org.eclipse.jdt.internal.compiler;provider=jasper;version="3.3",
+ org.eclipse.jdt.internal.compiler.classfmt;provider=jasper;version="3.3",
+ org.eclipse.jdt.internal.compiler.env;provider=jasper;version="3.3",
+ org.eclipse.jdt.internal.compiler.problem;provider=jasper;version="3.3",
+ org.mvel2,
+ org.mvel2.ast,
+ org.mvel2.compiler,
+ org.mvel2.integration,
+ org.mvel2.integration.impl,
+ org.mvel2.optimizers,
+ org.mvel2.templates,
+ org.mvel2.util,
+ org.osgi.framework,
+ org.w3c.dom,
+ org.xml.sax
 Bundle-SymbolicName: org.drools.compiler
-Tool: Bnd-0.0.357
-Require-Bundle: org.drools.core;bundle-version="5.1.0.SNAPSHOT"
+Bundle-DocURL: http://www.jboss.org/
+Bundle-Activator: org.drools.osgi.compiler.Activator
 

Modified: labs/jbossrules/trunk/drools-compiler/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-compiler/pom.xml	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-compiler/pom.xml	2010-01-13 11:42:31 UTC (rev 31054)
@@ -22,6 +22,12 @@
 			<artifactId>drools-core</artifactId>
 		</dependency>
 		<!-- External dependencies -->
+            <dependency>  
+               <groupId>org.osgi</groupId>  
+               <artifactId>org.osgi.core</artifactId>  
+               <scope>optional</scope>
+            </dependency>
+            
 		<dependency>
             <groupId>org.antlr</groupId>  
             <artifactId>com.springsource.org.antlr.runtime</artifactId>  
@@ -34,6 +40,7 @@
         <dependency>
             <groupId>org.antlr</groupId>
             <artifactId>gunit</artifactId>
+            <scope>test</scope>
         </dependency>         
 		<dependency>
              <groupId>org.apache.jasper.springsource</groupId>  
@@ -187,13 +194,15 @@
 				<configuration>
                     <manifestLocation>META-INF</manifestLocation>
 					<instructions>
+                        <_removeheaders>Ignore-Package</_removeheaders>                    
                         <Require-Bundle>org.drools.core;bundle-version="${pom.version}"</Require-Bundle>                    
-						<Import-Package>!*</Import-Package>
+						<Import-Package>!org.drools.*, *</Import-Package>
 						<Export-Package>!org.drools.commons.*, 
                                         !org.drools.lang.*, 
-                                        !org.drools.compiler,
                                         org.drools.builder.impl, <!-- add this one manually as BND seems to miss it out -->
-                                        org.drools.*</Export-Package>                     
+                                        org.drools.*</Export-Package>   
+                        <DynamicImport-Package>org.drools.*</DynamicImport-Package> 
+                        <Bundle-Activator>org.drools.osgi.core.Activator</Bundle-Activator>                                                               
 					</instructions>
 				</configuration>
 			</plugin>   

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/DecisionTableFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/DecisionTableFactory.java	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/DecisionTableFactory.java	2010-01-13 11:42:31 UTC (rev 31054)
@@ -5,6 +5,7 @@
 
 import org.drools.ProviderInitializationException;
 import org.drools.builder.DecisionTableConfiguration;
+import org.drools.osgi.compiler.Activator;
 
 public class DecisionTableFactory {
     private static DecisionTableProvider provider;
@@ -30,8 +31,8 @@
     private static void loadProvider() {
         try {
             // we didn't find anything in properties so lets try and us reflection
-            Class<DecisionTableProvider> cls = ( Class<DecisionTableProvider> ) Class.forName( "org.drools.decisiontable.DecisionTableProviderImpl" );
-            setDecisionTableProvider( cls.newInstance() );
+            //Class<DecisionTableProvider> cls = ( Class<DecisionTableProvider> ) Class.forName( "org.drools.decisiontable.DecisionTableProviderImpl" );            
+            setDecisionTableProvider( ( DecisionTableProvider ) Activator.bc.getService( Activator.bc.getServiceReference( DecisionTableProvider.class.getName() ) ) );
         } catch ( Exception e2 ) {
             throw new ProviderInitializationException( "Provider org.drools.decisiontable.DecisionTableProviderImpl could not be set.", e2);
         }

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-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java	2010-01-13 11:42:31 UTC (rev 31054)
@@ -494,9 +494,9 @@
                 ((InternalResource) resource).setResourceType( type );
                 XmlChangeSetReader reader = new XmlChangeSetReader( this.configuration.getSemanticModules() );
                 if ( resource instanceof ClassPathResource ) {
-                    reader.setClassLoader( ((ClassPathResource) resource).getClassLoader() );
+                    reader.setClassLoader( ((ClassPathResource) resource).getClassLoader(),  ((ClassPathResource) resource).getClazz() );
                 } else {
-                    reader.setClassLoader( this.configuration.getClassLoader() );
+                    reader.setClassLoader( this.configuration.getClassLoader() , null);
                 }
                 ChangeSet changeSet = reader.read( resource.getReader() );
                 if ( changeSet == null ) {

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialectConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialectConfiguration.java	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialectConfiguration.java	2010-01-13 11:42:31 UTC (rev 31054)
@@ -89,13 +89,13 @@
         // check that the jar for the specified compiler are present
         if ( compiler == ECLIPSE ) {
             try {
-                getClass().getClassLoader().loadClass( "org.eclipse.jdt.internal.compiler.Compiler" );
+            	Class.forName( "org.eclipse.jdt.internal.compiler.Compiler", true, this.conf.getClassLoader() );
             } catch ( ClassNotFoundException e ) {
                 throw new RuntimeException( "The Eclipse JDT Core jar is not in the classpath" );
             }
         } else if ( compiler == JANINO ){
             try {
-                getClass().getClassLoader().loadClass( "org.codehaus.janino.Parser" );
+            	Class.forName( "org.codehaus.janino.Parser", true, this.conf.getClassLoader() );
             } catch ( ClassNotFoundException e ) {
                 throw new RuntimeException( "The Janino jar is not in the classpath" );
             }


Property changes on: labs/jbossrules/trunk/drools-container/drools-spring
___________________________________________________________________
Name: svn:ignore
   - target
local

.metadata
.settings
.wtpmodules

nbproject

*.ipr
*.iws
*.iml


   + target
local

.metadata
.settings
.wtpmodules

nbproject

*.ipr
*.iws
*.iml
*.db


Modified: labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF	2010-01-13 11:42:31 UTC (rev 31054)
@@ -1,305 +1,297 @@
 Manifest-Version: 1.0
 Created-By: 1.5.0_16 (Sun Microsystems Inc.)
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bnd-LastModified: 1263331791445
+Import-Package: com.thoughtworks.xstream;version="1.3",
+ com.thoughtworks.xstream.converters;version="1.3",
+ com.thoughtworks.xstream.converters.collections;version="1.3",
+ com.thoughtworks.xstream.io;version="1.3",
+ com.thoughtworks.xstream.io.xml;version="1.3",
+ com.thoughtworks.xstream.mapper;version="1.3",
+ javax.management,
+ javax.management.openmbean,
+ javax.swing,
+ javax.swing.border,
+ javax.swing.event,
+ javax.xml.parsers,
+ org.mvel2,
+ org.mvel2.asm,
+ org.mvel2.asm.util,
+ org.mvel2.ast,
+ org.mvel2.compiler,
+ org.mvel2.debug,
+ org.mvel2.integration,
+ org.mvel2.integration.impl,
+ org.mvel2.optimizers,
+ org.mvel2.templates,
+ org.mvel2.util,
+ org.osgi.framework,
+ org.w3c.dom,
+ org.xml.sax,
+ org.xml.sax.helpers
+Bnd-LastModified: 1263355539598
 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
  ocess.core.timer;version="5.1.0.SNAPSHOT",org.drools.ruleflow.core.va
- lidation;uses:="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,org.drools.workflow.co
- re.impl,org.drools.time,org.drools.process.core.validation.impl,org.d
- rools,org.drools.ruleflow.core,org.drools.process.core,org.drools.wor
- kflow.core";version="5.1.0.SNAPSHOT",org.drools.ruleflow.instance;use
- s:="org.drools.workflow.instance.impl,org.drools.workflow.instance,or
- g.drools.ruleflow.core,org.drools.workflow.core.node,org.drools.proce
- ss.instance";version="5.1.0.SNAPSHOT",org.drools.workflow.core.node;u
- ses:="org.drools.workflow.core.impl,org.drools.workflow.core,org.droo
- ls.process.core.context,org.drools.process.core,org.drools.process.co
- re.impl,org.drools.process.core.event,org.drools.process.core.datatyp
- e,org.drools.process.core.context.variable,org.drools.process.core.da
- tatype.impl.type,org.drools.process.core.timer";version="5.1.0.SNAPSH
- OT",org.drools.command.runtime.process;uses:="org.drools.command,org.
- drools.command.impl,org.drools.process.instance";version="5.1.0.SNAPS
- HOT",org.drools.process.instance.event;uses:="org.drools.marshalling.
- impl,org.drools.process.instance,org.drools.common,org.drools";versio
- n="5.1.0.SNAPSHOT",org.drools.ruleflow.core.factory;uses:="org.drools
- .workflow.core.impl,org.drools.ruleflow.core,org.drools.workflow.core
- .node,org.drools.workflow.core,org.drools.process.core.datatype,org.d
- rools.process.core,org.drools.process.core.context.exception,org.droo
- ls.process.core.context.variable,org.drools.process.core.event,org.dr
- ools.process.core.timer,org.drools.process.core.impl";version="5.1.0.
- SNAPSHOT",org.drools.marshalling.impl;uses:="org.drools.workflow.inst
- ance.impl,org.drools.process.instance.context.swimlane,org.drools.pro
- cess.instance,org.drools.workflow.instance.node,org.drools.workflow.i
- nstance,org.drools.process.core,org.drools.process.instance.context.v
- ariable,org.drools.common,org.drools.util,org.drools.impl,org.drools,
- org.drools.concurrent,org.drools.spi,org.drools.process.instance.time
- r,org.drools.base,org.drools.rule,org.drools.process.instance.impl,or
- g.drools.process.instance.event,org.drools.ruleflow.instance";version
- ="5.1.0.SNAPSHOT",org.drools.time;uses:="org.drools.rule,org.drools,o
- rg.drools.time.impl";version="5.1.0.SNAPSHOT",org.drools.workflow.cor
- e.impl;uses:="org.drools.workflow.core,org.drools.process.core,org.dr
- ools.workflow.core.node,org.drools.process.core.impl";version="5.1.0.
- SNAPSHOT",org.drools.io.internal;version="5.1.0.SNAPSHOT",org.drools.
- process.instance.impl.demo;uses:="org.drools.process.instance";versio
- n="5.1.0.SNAPSHOT",org.drools.rule;uses:="org.drools.spi,org.drools.c
- ommon,org.drools,org.drools.util,org.drools.base,org.drools.base.mvel
- ,org.drools.facttemplates,org.drools.factmodel,org.drools.time.impl,o
- rg.drools.marshalling.impl,org.drools.time";version="5.1.0.SNAPSHOT",
- org.drools.process.core.event;version="5.1.0.SNAPSHOT",org.drools.eve
- nt.knowlegebase.impl;uses:="org.drools";version="5.1.0.SNAPSHOT",org.
- drools.conflict;uses:="org.drools.spi,org.drools.rule,org.drools.comm
- on";version="5.1.0.SNAPSHOT",org.drools.process.core.context.exceptio
- n;uses:="org.drools.workflow.core,org.drools.process.core.context,org
- .drools.process.core";version="5.1.0.SNAPSHOT",org.drools.runtime.dat
- aloader;version="5.1.0.SNAPSHOT",org.drools.process.instance.context.
- variable;uses:="org.drools.event,org.drools,org.drools.process.core,o
- rg.drools.process.instance,org.drools.process.core.context.variable,o
- rg.drools.process.instance.context,org.drools.common";version="5.1.0.
- SNAPSHOT",org.drools.audit;uses:="org.drools.event,org.drools,org.dro
- ols.audit.event,org.drools.impl,org.drools.workflow.core.node,org.dro
- ols.command,org.drools.workflow.instance,org.drools.workflow.instance
- .node,org.drools.rule,org.drools.spi,org.drools.command.impl,org.droo
- ls.common";version="5.1.0.SNAPSHOT",org.drools.base.extractors;uses:=
- "org.drools.base,org.drools.util,org.drools.spi,org.drools.common,org
- .drools";version="5.1.0.SNAPSHOT",org.drools.process.core.context;use
- s:="org.drools.process.core";version="5.1.0.SNAPSHOT",org.drools.util
- .asm;uses:="org.drools";version="5.1.0.SNAPSHOT",org.drools.workflow.
- instance.impl.factory;uses:="org.drools.workflow.instance.impl,org.dr
- ools.workflow.instance";version="5.1.0.SNAPSHOT",org.drools.process.i
- nstance;uses:="org.drools,org.drools.process.core,org.drools.process.
- core.context.variable,org.drools.process.instance.context.variable,or
- g.drools.common,org.drools.ruleflow.instance,org.drools.ruleflow.core
- ";version="5.1.0.SNAPSHOT",org.drools.process.core.context.variable;u
- ses:="org.drools.process.core,org.drools.process.core.datatype,org.dr
- ools.process.core.datatype.impl.type,org.drools.process.core.context"
- ;version="5.1.0.SNAPSHOT",org.drools.event.rule.impl;uses:="org.drool
- s.event,org.drools,org.drools.spi,org.drools.common,org.drools.impl";
- version="5.1.0.SNAPSHOT",org.drools.command.builder;uses:="org.drools
- .command,org.drools.command.impl,org.drools.runtime.impl";version="5.
- 1.0.SNAPSHOT",org.drools.runtime.pipeline;version="5.1.0.SNAPSHOT",or
- g.drools.base.accumulators;uses:="org.drools,org.drools.rule,org.droo
- ls.spi,org.drools.common,org.drools.base.mvel";version="5.1.0.SNAPSHO
- T",org.drools.event;uses:="org.drools.rule,org.drools.spi,org.drools,
- org.drools.common,org.drools.process.instance";version="5.1.0.SNAPSHO
- T",org.drools.definitions.rule.impl;uses:="org.drools.rule";version="
- 5.1.0.SNAPSHOT",org.drools.xml;uses:="org.drools.xml.changeset,org.dr
- ools";version="5.1.0.SNAPSHOT",org.drools.facttemplates;uses:="org.dr
- ools.rule,org.drools.base,org.drools,org.drools.spi,org.drools.util,o
- rg.drools.common";version="5.1.0.SNAPSHOT",org.drools.base.field;uses
- :="org.drools,org.drools.spi,org.drools.util,org.drools.common";versi
- on="5.1.0.SNAPSHOT",org.drools.runtime.rule.impl;uses:="org.drools.sp
- i,org.drools.common,org.drools,org.drools.rule";version="5.1.0.SNAPSH
- OT",org.drools.process.core.context.swimlane;uses:="org.drools.proces
- s.core.context,org.drools.process.core";version="5.1.0.SNAPSHOT",org.
- drools.concurrent;uses:="org.drools,org.drools.spi";version="5.1.0.SN
- APSHOT",org.drools.ruleflow.core;uses:="org.drools.workflow.core.impl
- ,org.drools.workflow.core,org.drools.ruleflow.core.factory,org.drools
- .workflow.core.node,org.drools.process.core.context.swimlane,org.droo
- ls.process.core,org.drools.process.core.context.exception,org.drools.
- process.core.context.variable,org.drools.ruleflow.core.validation,org
- .drools.process.core.validation,org.drools.process.core.datatype";ver
- sion="5.1.0.SNAPSHOT",org.drools.util;uses:="org.drools.rule,org.droo
- ls.spi,org.drools.common,org.drools,org.drools.type";version="5.1.0.S
- NAPSHOT",org.drools.type;version="5.1.0.SNAPSHOT",org.drools.agent;us
- es:="org.drools,org.drools.rule,org.drools.definitions.impl,org.drool
- s.util,org.drools.agent.impl,org.drools.common";version="5.1.0.SNAPSH
- OT",org.drools.time.impl;uses:="org.drools.time,org.drools,org.drools
- .common";version="5.1.0.SNAPSHOT",org.drools.event.process.impl;uses:
- ="org.drools.event,org.drools,org.drools.common";version="5.1.0.SNAPS
- HOT",org.drools.common;uses:="org.drools.spi,org.drools.rule,org.droo
- ls.impl,org.drools.event,org.drools.management,org.drools.base,org.dr
- ools,org.drools.util,org.drools.process.core,org.drools.process.insta
- nce.event,org.drools.process.core.event,org.drools.process.instance,o
- rg.drools.workflow.core.node,org.drools.time,org.drools.runtime.impl,
- org.drools.process.instance.timer,org.drools.concurrent,org.drools.ru
- leflow.core,org.drools.type,org.drools.base.evaluators,org.drools.fac
- ttemplates,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.process.in
- stance.context.exception,org.drools.process.instance,org.drools.workf
- low.core.impl,org.drools.base,org.drools.workflow.instance,org.drools
- ,org.drools.spi,org.drools.common,org.drools.workflow.instance.impl.f
- actory,org.drools.workflow.core.node,org.drools.event,org.drools.proc
- ess.core,org.drools.process.instance.context.variable,org.drools.proc
- ess.instance.event,org.drools.process.instance.impl";version="5.1.0.S
- NAPSHOT",org.drools.base.evaluators;uses:="org.drools.time,org.drools
- .base,org.drools,org.drools.rule,org.drools.spi,org.drools.common,org
- .drools.util,org.drools.type";version="5.1.0.SNAPSHOT",org.drools.imp
- l;uses:="org.drools.event,org.drools.definitions.rule.impl,org.drools
- ,org.drools.rule,org.drools.definitions.impl,org.drools.event.knowleg
- ebase.impl,org.drools.command,org.drools.command.impl,org.drools.agen
- t,org.drools.common,org.drools.spi,org.drools.event.rule.impl,org.dro
- ols.event.process.impl,org.drools.runtime.impl,org.drools.process.ins
- tance,org.drools.process.instance.event,org.drools.time,org.drools.ru
- ntime.rule.impl,org.drools.base,org.drools.command.runtime.rule,org.d
- rools.agent.impl,org.drools.util";version="5.1.0.SNAPSHOT",org.drools
- .definitions.impl;uses:="org.drools.definitions.rule.impl,org.drools.
- 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",o
- rg.drools.process.instance.context;uses:="org.drools.process.core,org
- .drools.process.instance";version="5.1.0.SNAPSHOT",org.drools.command
- ;uses:="org.drools.command.impl,org.drools.runtime.impl,org.drools.ti
- me,org.drools";version="5.1.0.SNAPSHOT",org.drools.management;uses:="
- org.drools.common,org.drools,org.drools.base,org.drools.spi,org.drool
- s.event,org.drools.rule";version="5.1.0.SNAPSHOT",org.drools.base;use
- s:="org.drools.event,org.drools.concurrent,org.drools,org.drools.spi,
- org.drools.util.asm,org.drools.util,org.drools.common,org.drools.time
- ,org.drools.base.evaluators,org.drools.base.extractors,org.drools.rul
- e,org.drools.impl,org.drools.base.field,org.drools.type,org.drools.ba
- se.mvel,org.drools.facttemplates";version="5.1.0.SNAPSHOT",org.drools
- ;uses:="org.drools.spi,org.drools.time,org.drools.time.impl,org.drool
- s.rule,org.drools.common,org.drools.workflow.instance.impl,org.drools
- .process.core.datatype,org.drools.process.instance,org.drools.runtime
- .rule.impl,org.drools.concurrent,org.drools.util,org.drools.process.c
- ore,org.drools.conflict,org.drools.process.core.impl,org.drools.proce
- ss.instance.impl,org.drools.event,org.drools.process.instance.event,o
- rg.drools.command,org.drools.process.instance.timer";version="5.1.0.S
- NAPSHOT",org.drools.command.assertion;uses:="org.drools.command,org.d
- rools.util,org.drools.command.impl";version="5.1.0.SNAPSHOT",org.droo
- ls.agent.impl;uses:="org.drools.rule,org.drools.definitions.impl,org.
- drools.util,org.drools.agent,org.drools,org.drools.impl,org.drools.io
- .internal,org.drools.xml,org.drools.process.core,org.drools.io.impl,o
- rg.drools.common";version="5.1.0.SNAPSHOT",org.drools.spi;uses:="org.
- drools.base,org.drools,org.drools.rule,org.drools.common,org.drools.u
- til,org.drools.time,org.drools.concurrent,org.drools.facttemplates,or
- g.drools.workflow.instance,org.drools.impl,org.drools.process.instanc
- e,org.drools.process.core.context.variable,org.drools.process.instanc
- e.context.variable,org.drools.event";version="5.1.0.SNAPSHOT",org.dro
- ols.process.core.impl;uses:="org.drools.process.core,org.drools.proce
- ss.core.datatype,org.drools.process.core.context";version="5.1.0.SNAP
- SHOT",org.drools.process.instance.impl.humantask;version="5.1.0.SNAPS
- HOT",org.drools.workflow.core;uses:="org.drools.spi,org.drools.proces
- s.core";version="5.1.0.SNAPSHOT",org.drools.visualize;version="5.1.0.
- SNAPSHOT",org.drools.runtime.impl;uses:="org.drools.command,org.drool
- s.command.impl";version="5.1.0.SNAPSHOT",org.drools.builder.conf.impl
- ;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.inst
- ance.context";version="5.1.0.SNAPSHOT",org.drools.util.debug;uses:="o
- rg.drools.common,org.drools.util,org.drools.rule,org.drools,org.drool
- s.impl";version="5.1.0.SNAPSHOT",org.drools.process.core.validation;v
- ersion="5.1.0.SNAPSHOT",org.drools.process.instance.context.exception
- ;uses:="org.drools.base,org.drools.workflow.instance,org.drools,org.d
- rools.spi,org.drools.process.instance,org.drools.workflow.core,org.dr
- ools.process.core.context.exception,org.drools.common,org.drools.proc
- ess.core,org.drools.process.instance.context";version="5.1.0.SNAPSHOT
- ",org.drools.xml.changeset;uses:="org.drools.xml,org.drools,org.drool
- s.io.impl,org.drools.io.internal,org.drools.builder.conf.impl,org.dro
- ols.util";version="5.1.0.SNAPSHOT",org.drools.process.instance.timer;
- uses:="org.drools.time,org.drools,org.drools.process.instance.event,o
- rg.drools.process.instance,org.drools.time.impl";version="5.1.0.SNAPS
- HOT",org.drools.base.dataproviders;uses:="org.drools,org.drools.rule,
- org.drools.util,org.drools.base.mvel,org.drools.spi";version="5.1.0.S
- NAPSHOT",org.drools.process.instance.impl.factory;uses:="org.drools.p
- rocess.core,org.drools.process.instance,org.drools.process.instance.i
- mpl,org.drools.process.instance.context";version="5.1.0.SNAPSHOT",org
- .drools.workflow.instance;uses:="org.drools.process.instance,org.droo
- ls.workflow.instance.impl,org.drools.impl,org.drools.workflow.core.im
- pl,org.drools,org.drools.process.core,org.drools.common";version="5.1
- .0.SNAPSHOT",org.drools.workflow.instance.node;uses:="org.drools.work
- flow.instance.impl,org.drools.workflow.core.node,org.drools.process.i
- nstance,org.drools.base,org.drools.workflow.instance,org.drools,org.d
- rools.spi,org.drools.workflow.core,org.drools.common,org.drools.proce
- ss.core,org.drools.process.instance.impl,org.drools.event,org.drools.
- process.core.event,org.drools.process.instance.context.variable,org.d
- rools.process.instance.context.exception,org.drools.process.instance.
- context.swimlane,org.drools.rule,org.drools.process.core.timer,org.dr
- ools.process.instance.timer,org.drools.time";version="5.1.0.SNAPSHOT"
- ,org.drools.process.core.validation.impl;uses:="org.drools.process.co
- re.validation";version="5.1.0.SNAPSHOT",org.drools.factmodel;uses:="o
- rg.drools.base";version="5.1.0.SNAPSHOT",org.drools.base.mvel;uses:="
- org.drools,org.drools.rule,org.drools.spi,org.drools.common,org.drool
- s.util,org.drools.type,org.drools.base";version="5.1.0.SNAPSHOT",org.
- drools.process.core;uses:="org.drools.process.core.datatype";version=
- "5.1.0.SNAPSHOT",org.drools.command.impl;uses:="org.drools.command,or
- g.drools.command.runtime.process,org.drools.command.runtime.rule,org.
- drools.impl,org.drools.time,org.drools,org.drools.rule,org.drools.com
- mand.runtime,org.drools.runtime.impl";version="5.1.0.SNAPSHOT",org.dr
- ools.io.impl;uses:="org.drools.io.internal,org.drools,org.drools.util
- ";version="5.1.0.SNAPSHOT",org.drools.runtime.help.impl;uses:="org.dr
- ools.command,org.drools.command.runtime.process,org.drools.runtime.im
- pl,org.drools.common,org.drools.command.runtime.rule,org.drools.comma
- nd.runtime,org.drools.base,org.drools.runtime.rule.impl,org.drools.ru
- le,org.drools.spi";version="5.1.0.SNAPSHOT",org.drools.process.core.d
- atatype.impl;uses:="org.drools.process.core.datatype";version="5.1.0.
- SNAPSHOT",org.drools.process.core.datatype.impl.type;uses:="org.drool
- s.process.core.datatype,org.drools.process.core";version="5.1.0.SNAPS
- HOT",org.drools.process.instance.impl;uses:="org.drools.process.core,
- org.drools.process.instance,org.drools.process.instance.context.swiml
- ane,org.drools.process.core.context.swimlane,org.drools.process.insta
- nce.context.exception,org.drools.process.instance.impl.factory,org.dr
- ools.process.core.context.exception,org.drools.process.core.context.v
- ariable,org.drools.process.instance.context.variable,org.drools,org.d
- rools.common";version="5.1.0.SNAPSHOT",org.drools.runtime.pipeline.im
- pl;uses:="org.drools.runtime.pipeline,org.drools.command,org.drools.c
- ommand.runtime.rule,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,or
- g.drools,org.drools.spi,org.drools.runtime.impl,org.drools.common";ve
- rsion="5.1.0.SNAPSHOT",org.drools.command.runtime;uses:="org.drools.c
- ommand,org.drools.command.impl,org.drools.runtime.impl,org.drools.imp
- l,org.drools";version="5.1.0.SNAPSHOT"
+ 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
+ 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
+ g.drools.workflow.instance,org.drools.ruleflow.core,org.drools.workfl
+ ow.core.node,org.drools.process.instance";version="5.1.0.SNAPSHOT",or
+ g.drools.workflow.core.node;uses:="org.drools.workflow.core.impl,org.
+ drools.workflow.core,org.drools.process.core.context,org.drools.proce
+ ss.core,org.drools.process.core.impl,org.drools.process.core.event,or
+ g.drools.process.core.datatype,org.drools.process.core.context.variab
+ le,org.drools.process.core.datatype.impl.type,org.drools.process.core
+ .timer";version="5.1.0.SNAPSHOT",org.drools.command.runtime.process;u
+ ses:="org.drools.command,org.drools.command.impl,org.drools.process.i
+ 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.ruleflow.c
+ ore.factory;uses:="org.drools.workflow.core.impl,org.drools.ruleflow.
+ core,org.drools.workflow.core.node,org.drools.workflow.core,org.drool
+ s.process.core.datatype,org.drools.process.core,org.drools.process.co
+ re.context.exception,org.drools.process.core.context.variable,org.dro
+ ols.process.core.event,org.drools.process.core.timer,org.drools.proce
+ ss.core.impl";version="5.1.0.SNAPSHOT",org.drools.marshalling.impl;us
+ es:="org.drools.workflow.instance.impl,org.drools.process.instance.co
+ ntext.swimlane,org.drools.process.instance,org.drools.workflow.instan
+ ce.node,org.drools.workflow.instance,org.drools.process.core,org.droo
+ ls.process.instance.context.variable,org.drools.common,org.drools.uti
+ l,org.drools.impl,org.drools,org.drools.concurrent,org.drools.spi,org
+ .drools.process.instance.timer,org.drools.base,org.drools.rule,org.dr
+ ools.process.instance.impl,org.drools.process.instance.event,org.droo
+ ls.ruleflow.instance";version="5.1.0.SNAPSHOT",org.drools.time;uses:=
+ "org.drools.rule,org.drools,org.drools.time.impl";version="5.1.0.SNAP
+ SHOT",org.drools.workflow.core.impl;uses:="org.drools.workflow.core,o
+ rg.drools.process.core,org.drools.workflow.core.node,org.drools.proce
+ ss.core.impl";version="5.1.0.SNAPSHOT",org.drools.io.internal;version
+ ="5.1.0.SNAPSHOT",org.drools.process.instance.impl.demo;uses:="org.dr
+ ools.process.instance,javax.swing.event,javax.swing";version="5.1.0.S
+ NAPSHOT",org.drools.rule;uses:="org.drools.spi,org.drools.common,org.
+ drools,org.drools.util,org.drools.base,org.mvel2.ast,org.mvel2.integr
+ ation,org.mvel2.integration.impl,org.drools.base.mvel,org.drools.fact
+ templates,org.drools.factmodel,org.drools.time.impl,org.drools.marsha
+ lling.impl,org.drools.time";version="5.1.0.SNAPSHOT",org.drools.proce
+ ss.core.event;version="5.1.0.SNAPSHOT",org.drools.event.knowlegebase.
+ impl;uses:="org.drools";version="5.1.0.SNAPSHOT",org.drools.conflict;
+ uses:="org.drools.spi,org.drools.rule,org.drools.common";version="5.1
+ .0.SNAPSHOT",org.drools.process.core.context.exception;uses:="org.dro
+ ols.workflow.core,org.drools.process.core.context,org.drools.process.
+ core";version="5.1.0.SNAPSHOT",org.drools.runtime.dataloader;version=
+ "5.1.0.SNAPSHOT",org.drools.process.instance.context.variable;uses:="
+ org.drools.event,org.drools,org.drools.process.core,org.drools.proces
+ s.instance,org.drools.process.core.context.variable,org.drools.proces
+ s.instance.context,org.drools.common";version="5.1.0.SNAPSHOT",org.dr
+ ools.audit;uses:="org.drools.event,org.drools,org.drools.audit.event,
+ com.thoughtworks.xstream,org.drools.impl,org.drools.workflow.core.nod
+ e,org.drools.command,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.extracto
+ rs;uses:="org.drools.base,org.drools.util,org.drools.spi,org.drools.c
+ ommon,org.drools,org.mvel2,org.mvel2.compiler";version="5.1.0.SNAPSHO
+ T",org.drools.process.core.context;uses:="org.drools.process.core";ve
+ rsion="5.1.0.SNAPSHOT",org.drools.util.asm;uses:="org.mvel2.asm,org.d
+ rools,org.mvel2.asm.util";version="5.1.0.SNAPSHOT",org.drools.workflo
+ w.instance.impl.factory;uses:="org.drools.workflow.instance.impl,org.
+ drools.workflow.instance";version="5.1.0.SNAPSHOT",org.drools.process
+ .instance;uses:="org.drools,org.drools.process.core,org.drools.proces
+ s.core.context.variable,org.drools.process.instance.context.variable,
+ org.drools.common,org.drools.ruleflow.instance,org.drools.ruleflow.co
+ re";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.contex
+ t";version="5.1.0.SNAPSHOT",org.drools.event.rule.impl;uses:="org.dro
+ ols.event,org.drools,org.drools.spi,org.drools.common,org.drools.impl
+ ";version="5.1.0.SNAPSHOT",org.drools.command.builder;uses:="org.droo
+ ls.command,org.drools.command.impl,org.drools.runtime.impl";version="
+ 5.1.0.SNAPSHOT",org.drools.runtime.pipeline;version="5.1.0.SNAPSHOT",
+ org.drools.base.accumulators;uses:="org.drools,org.drools.rule,org.dr
+ ools.spi,org.drools.common,org.mvel2,org.mvel2.integration,org.drools
+ .base.mvel";version="5.1.0.SNAPSHOT",org.drools.event;uses:="org.droo
+ ls.rule,org.drools.spi,org.drools,org.drools.common,org.drools.proces
+ s.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.dom,org.drools";version="5.1.0.SNAPSHOT",org.drools.
+ facttemplates;uses:="org.drools.rule,org.drools.base,org.drools,org.d
+ rools.spi,org.drools.util,org.drools.common";version="5.1.0.SNAPSHOT"
+ ,org.drools.base.field;uses:="org.drools,org.drools.spi,org.drools.ut
+ il,org.drools.common";version="5.1.0.SNAPSHOT",org.drools.runtime.rul
+ e.impl;uses:="org.drools.spi,org.drools.common,org.drools,org.drools.
+ rule";version="5.1.0.SNAPSHOT",org.drools.process.core.context.swimla
+ ne;uses:="org.drools.process.core.context,org.drools.process.core";ve
+ rsion="5.1.0.SNAPSHOT",org.drools.concurrent;uses:="org.drools,org.dr
+ ools.spi";version="5.1.0.SNAPSHOT",org.drools.ruleflow.core;uses:="or
+ g.drools.workflow.core.impl,org.drools.workflow.core,org.drools.rulef
+ low.core.factory,org.drools.workflow.core.node,org.drools.process.cor
+ e.context.swimlane,org.drools.process.core,org.drools.process.core.co
+ ntext.exception,org.drools.process.core.context.variable,org.drools.r
+ uleflow.core.validation,org.drools.process.core.validation,org.drools
+ .process.core.datatype";version="5.1.0.SNAPSHOT",org.drools.util;uses
+ :="org.drools.rule,org.drools.spi,org.drools.common,org.drools,org.dr
+ ools.type";version="5.1.0.SNAPSHOT",org.drools.type;version="5.1.0.SN
+ APSHOT",org.drools.agent;uses:="org.drools,org.drools.rule,org.drools
+ .definitions.impl,org.drools.util,org.drools.agent.impl,org.drools.co
+ mmon";version="5.1.0.SNAPSHOT",org.drools.time.impl;uses:="org.drools
+ .time,org.drools,org.drools.common";version="5.1.0.SNAPSHOT",org.droo
+ ls.event.process.impl;uses:="org.drools.event,org.drools,org.drools.c
+ ommon";version="5.1.0.SNAPSHOT",org.drools.common;uses:="org.drools.s
+ pi,org.drools.rule,org.drools.impl,org.drools.event,org.drools.manage
+ ment,org.drools.base,org.drools,org.drools.util,org.drools.process.co
+ re,org.drools.process.instance.event,org.drools.process.core.event,or
+ g.drools.process.instance,org.drools.workflow.core.node,org.drools.ti
+ me,org.drools.runtime.impl,org.drools.process.instance.timer,org.droo
+ ls.concurrent,org.drools.ruleflow.core,org.drools.type,org.drools.bas
+ e.evaluators,org.drools.facttemplates,org.drools.marshalling.impl,org
+ .drools.time.impl";version="5.1.0.SNAPSHOT",org.drools.workflow.insta
+ nce.impl;uses:="org.drools.workflow.instance.node,org.drools.workflow
+ .core,org.drools.process.instance.context.exception,org.drools.proces
+ s.instance,org.drools.workflow.core.impl,org.drools.base,org.drools.w
+ orkflow.instance,org.drools,org.drools.spi,org.drools.common,org.droo
+ ls.workflow.instance.impl.factory,org.drools.workflow.core.node,org.d
+ rools.event,org.drools.process.core,org.mvel2.integration,org.mvel2.i
+ ntegration.impl,org.drools.process.instance.context.variable,org.droo
+ ls.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.drools,org.drools.rule,org.drools.spi,org.drools.com
+ mon,org.drools.util,org.drools.type,org.mvel2.util";version="5.1.0.SN
+ APSHOT",org.drools.impl;uses:="org.drools.event,org.drools.definition
+ s.rule.impl,org.drools,org.drools.rule,org.drools.definitions.impl,or
+ g.drools.event.knowlegebase.impl,org.drools.command,org.drools.comman
+ d.impl,org.drools.agent,org.drools.common,org.drools.spi,org.drools.e
+ vent.rule.impl,org.drools.event.process.impl,org.drools.runtime.impl,
+ org.drools.process.instance,org.drools.process.instance.event,org.dro
+ ols.time,org.drools.runtime.rule.impl,org.drools.base,org.drools.comm
+ and.runtime.rule,org.drools.agent.impl,org.drools.util";version="5.1.
+ 0.SNAPSHOT",org.drools.definitions.impl;uses:="org.drools.definitions
+ .rule.impl,org.drools.rule";version="5.1.0.SNAPSHOT",org.drools.audit
+ .event;version="5.1.0.SNAPSHOT",org.drools.process.core.datatype;vers
+ ion="5.1.0.SNAPSHOT",org.drools.process.instance.context;uses:="org.d
+ rools.process.core,org.drools.process.instance";version="5.1.0.SNAPSH
+ OT",org.drools.command;uses:="org.drools.command.impl,org.drools.runt
+ ime.impl,org.drools.time,org.drools";version="5.1.0.SNAPSHOT",org.dro
+ ols.management;uses:="javax.management,org.drools.common,org.drools,o
+ rg.drools.base,org.drools.spi,javax.management.openmbean,org.drools.e
+ vent,org.drools.rule";version="5.1.0.SNAPSHOT",org.drools.base;uses:=
+ "org.drools.event,org.drools.concurrent,org.drools,org.drools.spi,org
+ .drools.util.asm,org.drools.util,org.drools.common,org.drools.time,or
+ g.drools.base.evaluators,org.drools.base.extractors,org.mvel2.asm,org
+ .drools.rule,org.drools.impl,org.drools.base.field,org.drools.type,or
+ g.mvel2.ast,org.mvel2.integration,org.mvel2.compiler,org.drools.base.
+ mvel,org.drools.facttemplates";version="5.1.0.SNAPSHOT",org.drools;us
+ es:="org.drools.spi,org.drools.time,org.drools.time.impl,org.drools.r
+ ule,org.drools.common,org.drools.workflow.instance.impl,org.drools.pr
+ ocess.core.datatype,org.drools.process.instance,org.mvel2,org.drools.
+ runtime.rule.impl,org.drools.concurrent,org.drools.util,org.drools.pr
+ ocess.core,org.drools.conflict,org.drools.process.core.impl,org.drool
+ s.process.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.comman
+ d,org.mvel2,org.drools.util,org.drools.command.impl";version="5.1.0.S
+ NAPSHOT",org.drools.agent.impl;uses:="org.drools,org.drools.spi,org.d
+ rools.rule,org.drools.definitions.impl,org.drools.util,org.drools.age
+ nt,org.drools.impl,org.drools.io.internal,org.drools.xml,org.drools.p
+ rocess.core,org.drools.io.impl,org.drools.common";version="5.1.0.SNAP
+ SHOT",org.drools.spi;uses:="org.drools.base,org.drools,org.drools.rul
+ e,org.drools.common,org.drools.util,org.drools.time,org.drools.concur
+ rent,org.drools.facttemplates,org.drools.workflow.instance,org.drools
+ .impl,org.drools.process.instance,org.drools.process.core.context.var
+ iable,org.drools.process.instance.context.variable,org.drools.event";
+ version="5.1.0.SNAPSHOT",org.drools.process.core.impl;uses:="org.droo
+ ls.process.core,org.drools.process.core.datatype,org.drools.process.c
+ ore.context";version="5.1.0.SNAPSHOT",org.drools.process.instance.imp
+ l.humantask;uses:="javax.swing.event,javax.swing,javax.swing.border";
+ version="5.1.0.SNAPSHOT",org.drools.workflow.core;uses:="org.drools.s
+ pi,org.drools.process.core";version="5.1.0.SNAPSHOT",org.drools.visua
+ lize;version="5.1.0.SNAPSHOT",org.drools.runtime.impl;uses:="org.droo
+ ls.command,org.drools.command.impl";version="5.1.0.SNAPSHOT",org.droo
+ ls.builder.conf.impl;version="5.1.0.SNAPSHOT",org.drools.workflow.ins
+ tance.context;uses:="org.drools.workflow.instance,org.drools.process.
+ instance,org.drools.process.core,org.drools.process.instance.impl,org
+ .drools.process.instance.context";version="5.1.0.SNAPSHOT",org.drools
+ .util.debug;uses:="org.drools.common,org.drools.util,org.drools.rule,
+ org.drools,org.drools.impl,org.mvel2.integration,org.mvel2.compiler,o
+ rg.mvel2.optimizers,org.mvel2.integration.impl,org.mvel2.templates";v
+ ersion="5.1.0.SNAPSHOT",org.drools.process.core.validation;version="5
+ .1.0.SNAPSHOT",org.drools.process.instance.context.exception;uses:="o
+ rg.drools.base,org.drools.workflow.instance,org.drools,org.drools.spi
+ ,org.drools.process.instance,org.drools.workflow.core,org.drools.proc
+ ess.core.context.exception,org.drools.common,org.drools.process.core,
+ org.drools.process.instance.context";version="5.1.0.SNAPSHOT",org.dro
+ ols.xml.changeset;uses:="org.drools.xml,org.xml.sax,org.drools,org.w3
+ c.dom,org.drools.io.impl,org.drools.io.internal,org.drools.builder.co
+ nf.impl,org.drools.util";version="5.1.0.SNAPSHOT",org.drools.process.
+ instance.timer;uses:="org.drools.time,org.drools,org.drools.process.i
+ nstance.event,org.drools.process.instance,org.drools.time.impl";versi
+ on="5.1.0.SNAPSHOT",org.drools.base.dataproviders;uses:="org.mvel2,or
+ g.mvel2.integration,org.drools,org.drools.rule,org.drools.util,org.dr
+ ools.base.mvel,org.drools.spi";version="5.1.0.SNAPSHOT",org.drools.pr
+ ocess.instance.impl.factory;uses:="org.drools.process.core,org.drools
+ .process.instance,org.drools.process.instance.impl,org.drools.process
+ .instance.context";version="5.1.0.SNAPSHOT",org.drools.workflow.insta
+ nce;uses:="org.drools.process.instance,org.drools.workflow.instance.i
+ mpl,org.drools.impl,org.drools.workflow.core.impl,org.drools,org.droo
+ ls.process.core,org.drools.common";version="5.1.0.SNAPSHOT",org.drool
+ s.workflow.instance.node;uses:="org.drools.workflow.instance.impl,org
+ .drools.workflow.core.node,org.drools.process.instance,org.drools.bas
+ e,org.drools.workflow.instance,org.drools,org.drools.spi,org.drools.w
+ orkflow.core,org.drools.common,org.drools.process.core,org.drools.pro
+ cess.instance.impl,org.drools.event,org.drools.process.core.event,org
+ .drools.process.instance.context.variable,org.drools.process.instance
+ .context.exception,org.mvel2,org.mvel2.integration,org.drools.process
+ .instance.context.swimlane,org.drools.rule,org.drools.process.core.ti
+ mer,org.drools.process.instance.timer,org.drools.time";version="5.1.0
+ .SNAPSHOT",org.drools.process.core.validation.impl;uses:="org.drools.
+ process.core.validation";version="5.1.0.SNAPSHOT",org.drools.factmode
+ l;uses:="org.mvel2.asm,org.drools.base,com.thoughtworks.xstream.io,co
+ m.thoughtworks.xstream.io.xml,com.thoughtworks.xstream";version="5.1.
+ 0.SNAPSHOT",org.drools.base.mvel;uses:="org.mvel2.integration,org.mve
+ l2.integration.impl,org.mvel2,org.drools,org.drools.rule,org.drools.s
+ pi,org.drools.common,org.mvel2.compiler,org.drools.util,org.drools.ty
+ pe,org.drools.base,org.mvel2.debug";version="5.1.0.SNAPSHOT",org.droo
+ ls.process.core;uses:="org.drools.process.core.datatype";version="5.1
+ .0.SNAPSHOT",org.drools.command.impl;uses:="org.drools.command,org.dr
+ ools.command.runtime.process,org.drools.command.runtime.rule,org.droo
+ ls.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";ve
+ rsion="5.1.0.SNAPSHOT",org.drools.runtime.help.impl;uses:="org.drools
+ .command,com.thoughtworks.xstream.io,com.thoughtworks.xstream.mapper,
+ com.thoughtworks.xstream.converters.collections,org.drools.command.ru
+ ntime.process,com.thoughtworks.xstream.converters,org.drools.runtime.
+ impl,org.drools.common,org.drools.command.runtime.rule,org.drools.com
+ mand.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.cor
+ e.datatype";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.p
+ rocess.instance.impl;uses:="org.drools.process.core,org.drools.proces
+ s.instance,org.drools.process.instance.context.swimlane,org.drools.pr
+ ocess.core.context.swimlane,org.drools.process.instance.context.excep
+ tion,org.drools.process.instance.impl.factory,org.drools.process.core
+ .context.exception,org.drools.process.core.context.variable,org.drool
+ s.process.instance.context.variable,org.drools,org.drools.common";ver
+ sion="5.1.0.SNAPSHOT",org.drools.runtime.pipeline.impl;uses:="org.dro
+ ols.runtime.pipeline,org.drools.command,org.drools.command.runtime.ru
+ le,org.mvel2,org.mvel2.compiler,org.drools.common,org.drools,org.droo
+ ls.impl,org.drools.rule";version="5.1.0.SNAPSHOT",org.drools.command.
+ runtime.rule;uses:="org.drools.command,org.drools.command.impl,org.dr
+ ools.impl,org.drools,org.drools.spi,org.drools.runtime.impl,org.drool
+ s.common,org.mvel2";version="5.1.0.SNAPSHOT",org.drools.command.runti
+ me;uses:="org.drools.command,org.drools.command.impl,org.drools.runti
+ me.impl,org.drools.impl,org.drools";version="5.1.0.SNAPSHOT"
 Bundle-Version: 5.1.0.SNAPSHOT
-Ignore-Package: java.lang,java.net,org.mvel2.compiler,org.drools.proce
- ss.core.timer,org.drools.ruleflow.instance,java.text,org.drools.workf
- low.core.node,org.drools.process.instance.event,java.sql,org.drools.i
- o.internal,java.util.concurrent.atomic,org.drools.process.instance.im
- pl.demo,javax.xml.parsers,org.drools.runtime.conf,org.drools.process.
- core.context.exception,org.drools.audit,org.drools.base.extractors,or
- g.drools.event.rule,com.thoughtworks.xstream.io,org.drools.process.co
- re.context,java.awt,javax.management,org.drools.process.core.context.
- variable,org.drools.base.accumulators,java.lang.reflect,javax.swing.e
- vent,org.drools.definitions.rule.impl,org.drools.xml,org.mvel2.ast,or
- g.drools.facttemplates,org.drools.base.field,org.drools.runtime.rule.
- impl,org.drools.concurrent,org.xml.sax.helpers,org.drools.ruleflow.co
- re,org.drools.util,org.drools.definition.process,org.drools.type,org.
- drools.agent,org.drools.event.process.impl,org.drools.logger,org.droo
- ls.runtime,org.drools.workflow.instance.impl,org.drools.base.evaluato
- rs,org.mvel2.debug,org.drools.impl,org.drools.definitions.impl,com.th
- oughtworks.xstream.mapper,org.drools.process.core.datatype,org.drools
- .marshalling,javax.management.openmbean,org.drools.process.instance.c
- ontext,org.drools.command,org.mvel2,org.drools.event.process,org.droo
- ls.conf,com.thoughtworks.xstream.io.xml,java.util.concurrent.locks,ja
- va.util,org.drools.command.assertion,org.drools.agent.impl,org.drools
- .runtime.process,org.drools.process.instance.impl.humantask,org.drool
- s.workflow.core,org.drools.builder.conf.impl,org.mvel2.integration,or
- g.mvel2.asm.util,org.drools.process.core.validation,org.drools.proces
- s.instance.timer,org.mvel2.optimizers,org.drools.base.dataproviders,j
- ava.util.concurrent,org.mvel2.templates,org.drools.workflow.instance.
- node,org.drools.builder,com.thoughtworks.xstream,org.drools.factmodel
- ,org.drools.base.mvel,com.thoughtworks.xstream.converters.collections
- ,org.drools.process.core,org.drools.definition.type,org.drools.runtim
- e.help.impl,org.drools.process.instance.impl,org.drools.runtime.pipel
- ine.impl,org.drools.command.runtime,org.mvel2.asm,org.drools.process.
- instance.context.swimlane,org.drools.ruleflow.core.validation,org.dro
- ols.command.runtime.process,org.drools.runtime.rule,com.thoughtworks.
- xstream.converters,org.drools.ruleflow.core.factory,org.mvel2.integra
- tion.impl,org.drools.workflow.core.impl,org.drools.time,org.drools.ma
- rshalling.impl,org.drools.event.io,org.drools.rule,org.drools.conflic
- t,org.drools.event.knowlegebase.impl,org.drools.process.core.event,or
- g.drools.runtime.dataloader,javax.swing,org.drools.process.instance.c
- ontext.variable,org.drools.util.asm,org.drools.workflow.instance.impl
- .factory,java.awt.event,org.drools.definition,java.beans,org.drools.p
- rocess.instance,javax.swing.border,org.drools.event.rule.impl,org.dro
- ols.command.builder,org.drools.runtime.pipeline,org.drools.runtime.he
- lp,org.drools.event,org.drools.io,org.drools.process.core.context.swi
- mlane,java.math,org.drools.time.impl,org.drools.common,org.drools.aud
- it.event,org.mvel2.util,org.drools.management,org.drools.base,org.dro
- ols,org.drools.spi,java.util.zip,org.drools.process.core.impl,org.dro
- ols.visualize,java.util.jar,org.drools.runtime.impl,java.lang.managem
- ent,org.xml.sax,java.security,org.drools.vsm,org.drools.workflow.inst
- ance.context,org.drools.util.debug,org.drools.xml.changeset,org.drool
- s.process.instance.context.exception,org.w3c.dom,org.drools.definitio
- n.rule,org.drools.process.instance.impl.factory,java.util.regex,org.d
- rools.event.knowledgebase,org.drools.workflow.instance,org.drools.pro
- cess.core.validation.impl,java.io,org.drools.command.impl,org.drools.
- io.impl,org.drools.process.core.datatype.impl,org.drools.process.core
- .datatype.impl.type,org.drools.command.runtime.rule
 Bundle-Name: Drools :: Core
 Bundle-Description: A rule production system
+Private-Package: org.drools.reteoo.builder;version="5.1.0.SNAPSHOT",or
+ g.drools.reteoo.compiled;version="5.1.0.SNAPSHOT",org.drools.reteoo;v
+ ersion="5.1.0.SNAPSHOT",.;version="5.1.0.SNAPSHOT"
 Bundle-DocURL: http://www.jboss.org/
 Bundle-Vendor: JBoss Inc.
 Bundle-ManifestVersion: 2
@@ -307,4 +299,6 @@
 Tool: Bnd-0.0.357
 Require-Bundle: org.drools.api;visibility:=reexport;bundle-version="5.
  1.0.SNAPSHOT"
+DynamicImport-Package: org.drools.*
+Bundle-Activator: org.drools.osgi.core.Activator
 

Modified: labs/jbossrules/trunk/drools-core/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-core/pom.xml	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-core/pom.xml	2010-01-13 11:42:31 UTC (rev 31054)
@@ -13,6 +13,12 @@
   <name>Drools :: Core</name>
 
   <dependencies>  
+      <dependency>  
+         <groupId>org.osgi</groupId>  
+         <artifactId>org.osgi.core</artifactId>  
+         <scope>optional</scope>
+       </dependency>
+              
     <!-- following are required for parser (lang). May be refactored out of core module. -->    
       <dependency>  
           <groupId>com.thoughtworks.xstream</groupId>  
@@ -65,10 +71,13 @@
 				<configuration>
                     <manifestLocation>META-INF</manifestLocation>
 					<instructions>
+                        <_removeheaders>Ignore-Package</_removeheaders>                    
                         <Require-Bundle>org.drools.api;visibility:=reexport;bundle-version="${pom.version}"</Require-Bundle>
-						<Import-Package>!*</Import-Package>
+						<Import-Package>!org.drools.*, *</Import-Package>
 						<Export-Package>!org.drools.reteoo.*,
-                                        org.drools.*</Export-Package>                      
+                                        org.drools.*</Export-Package>     
+                        <DynamicImport-Package>org.drools.*</DynamicImport-Package>
+                        <Bundle-Activator>org.drools.osgi.core.Activator</Bundle-Activator>
 					</instructions>
 				</configuration>
 			</plugin> 

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/impl/KnowledgeAgentImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/impl/KnowledgeAgentImpl.java	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/impl/KnowledgeAgentImpl.java	2010-01-13 11:42:31 UTC (rev 31054)
@@ -310,9 +310,9 @@
 
         XmlChangeSetReader reader = new XmlChangeSetReader(this.semanticModules);
         if (resource instanceof ClassPathResource) {
-            reader.setClassLoader(((ClassPathResource) resource).getClassLoader());
+            reader.setClassLoader(((ClassPathResource) resource).getClassLoader(), null);
         } else {
-            reader.setClassLoader(((AbstractRuleBase) (((KnowledgeBaseImpl) this.kbase).ruleBase)).getConfiguration().getClassLoader());
+            reader.setClassLoader(((AbstractRuleBase) (((KnowledgeBaseImpl) this.kbase).ruleBase)).getConfiguration().getClassLoader(), null);
         }
 
         ChangeSet changeSet = null;

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-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/ClassPathResource.java	2010-01-13 11:42:31 UTC (rev 31054)
@@ -19,6 +19,8 @@
 
 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;
 
 /**
@@ -67,7 +69,7 @@
         }
         this.path = path;
         this.clazz = clazz;
-        this.classLoader = classLoader;
+        this.classLoader =  ClassLoaderUtil.getClassLoader( classLoader, clazz );        
     }
     
     public void writeExternal(ObjectOutput out) throws IOException {
@@ -88,19 +90,13 @@
         InputStream is = null;
         if ( this.clazz != null ) {
             is = this.clazz.getResourceAsStream( this.path );
-        } else if ( this.classLoader != null ) {
+        } 
+        
+        if ( is == null ) {
             is = this.classLoader.getResourceAsStream( this.path );
         }
 
         if ( is == null ) {
-            is = Thread.currentThread().getContextClassLoader().getResourceAsStream( this.path );
-        }
-
-        if ( is == null ) {
-            is = Class.class.getClassLoader().getSystemClassLoader().getResourceAsStream( this.path );
-        }
-
-        if ( is == null ) {
             throw new FileNotFoundException( "'" + this.path + "' cannot be opened because it does not exist" );
         }
         this.lastRead = getLastModified();
@@ -116,19 +112,13 @@
         URL url = null;
         if ( this.clazz != null ) {
             url = this.clazz.getResource( this.path );
-        } else if ( this.classLoader != null ) {
+        } 
+        
+        if ( url == null ) {
             url = this.classLoader.getResource( this.path );
         }
 
         if ( url == null ) {
-            url = Thread.currentThread().getContextClassLoader().getResource( this.path );
-        }
-
-        if ( url == null ) {
-            url = Class.class.getClassLoader().getSystemClassLoader().getResource( this.path );
-        }
-
-        if ( url == null ) {
             throw new FileNotFoundException( "'" + this.path + "' cannot be opened because it does not exist" );
         }
         return url;
@@ -199,6 +189,10 @@
         return this.classLoader;
     }
     
+    public Class getClazz() {
+        return this.clazz;
+    }
+    
     public boolean equals(Object object) {
         if ( object == null || !(object instanceof ClassPathResource) ) {
             return false;

Added: 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	                        (rev 0)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/osgi/core/Activator.java	2010-01-13 11:42:31 UTC (rev 31054)
@@ -0,0 +1,34 @@
+package org.drools.osgi.core;
+
+import java.util.Hashtable;
+
+import org.drools.KnowledgeBaseProvider;
+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;
+
+public class Activator
+    implements
+    BundleActivator {
+    private ServiceRegistration resourceReg;
+    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" );
+    }
+
+    public void stop(BundleContext bc) throws Exception {
+        this.resourceReg.unregister();
+        this.kbaseReg.unregister();
+    }
+}

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/xml/ExtensibleXmlParser.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/xml/ExtensibleXmlParser.java	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/xml/ExtensibleXmlParser.java	2010-01-13 11:42:31 UTC (rev 31054)
@@ -112,6 +112,8 @@
     private DocumentFragment    docFragment;
     
     private ClassLoader         classLoader;
+    
+    private Map                 metaData                       = new HashMap();
 
     // ----------------------------------------------------------------------
     // Constructors
@@ -273,6 +275,10 @@
     public void setClassLoader(ClassLoader classLoader) {
         this.classLoader = classLoader;
     }
+    
+    public Map getMetaData() {
+        return this.metaData;
+    }
 
     /**
      * @see org.xml.sax.ContentHandler

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/xml/XmlChangeSetReader.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/xml/XmlChangeSetReader.java	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/xml/XmlChangeSetReader.java	2010-01-13 11:42:31 UTC (rev 31054)
@@ -27,8 +27,9 @@
         this.parser.setSemanticModules( modules );
     }
     
-    public void setClassLoader(ClassLoader classLoader) {
+    public void setClassLoader(ClassLoader classLoader, Class clazz ) {
         this.parser.setClassLoader( classLoader );
+        this.parser.getMetaData().put( "clazz", clazz );
     }
     
     public ExtensibleXmlParser getParser() {

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/xml/changeset/ResourceHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/xml/changeset/ResourceHandler.java	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/xml/changeset/ResourceHandler.java	2010-01-13 11:42:31 UTC (rev 31054)
@@ -57,7 +57,7 @@
         InternalResource resource = null;
         
         if ( src.trim().startsWith( "classpath:" ) ) {
-            resource = new ClassPathResource( src.substring( src.indexOf( ':' ) + 1 ), parser.getClassLoader() );
+            resource = new ClassPathResource( src.substring( src.indexOf( ':' ) + 1 ), ( Class ) parser.getMetaData().get( "clazz" ), parser.getClassLoader() );
         } else {
             resource = new UrlResource( src );
         }

Modified: labs/jbossrules/trunk/drools-decisiontables/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/.classpath	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-decisiontables/.classpath	2010-01-13 11:42:31 UTC (rev 31054)
@@ -1,25 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-  <classpathentry kind="src" path="src/main/java"/>
-  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
-  <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
-  <classpathentry kind="src" path="src/test/resources" output="target/test-classes" including="**" excluding="**/*.java"/>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.1.1/antlr-runtime-3.1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
-  <classpathentry kind="src" path="/drools-api"/>
-  <classpathentry kind="src" path="/drools-compiler"/>
-  <classpathentry kind="src" path="/drools-core"/>
-  <classpathentry kind="src" path="/drools-templates"/>
-  <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock-legacy/2.5.1/jmock-legacy-2.5.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6/joda-time-1.6.jar"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
-  <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.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"/>
-</classpath>
\ No newline at end of file
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry excluding="**/*.java" including="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.1.1/antlr-runtime-3.1.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
+	<classpathentry kind="src" path="/drools-api"/>
+	<classpathentry kind="src" path="/drools-compiler"/>
+	<classpathentry kind="src" path="/drools-core"/>
+	<classpathentry kind="src" path="/drools-templates"/>
+	<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jmock/jmock-legacy/2.5.1/jmock-legacy-2.5.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6/joda-time-1.6.jar"/>
+	<classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
+	<classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.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="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

Added: labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF	                        (rev 0)
+++ labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF	2010-01-13 11:42:31 UTC (rev 31054)
@@ -0,0 +1,21 @@
+Manifest-Version: 1.0
+Private-Package: python-dt;version="5.1.0.SNAPSHOT"
+Tool: Bnd-0.0.357
+Bundle-Name: Drools :: Decision Tables
+Created-By: 1.6.0_10 (Sun Microsystems Inc.)
+Require-Bundle: org.drools.core;bundle-version="5.1.0.SNAPSHOT",
+ org.drools.compiler;bundle-version="5.1.0"
+Bundle-Vendor: JBoss Inc.
+DynamicImport-Package: org.drools.*
+Bundle-Version: 5.1.0.SNAPSHOT
+Bnd-LastModified: 1263361084615
+Bundle-ManifestVersion: 2
+Bundle-Description: A rule production system
+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
+Bundle-SymbolicName: org.drools.decisiontables
+Bundle-DocURL: http://www.jboss.org/
+Bundle-Activator: org.drools.osgi.decisiontables.Activator
+

Added: labs/jbossrules/trunk/drools-decisiontables/build.properties
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/build.properties	                        (rev 0)
+++ labs/jbossrules/trunk/drools-decisiontables/build.properties	2010-01-13 11:42:31 UTC (rev 31054)
@@ -0,0 +1,12 @@
+src.includes = .,\
+               build.properties,\
+               META-INF/,\
+               src/,\
+               pom.xml
+bin.includes = .,\
+               META-INF/,\
+               build.properties               
+source.. = src/main/java/,\
+           src/main/resources/
+output.. = target/classes/     
+jars.compile.order = .          

Modified: labs/jbossrules/trunk/drools-decisiontables/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/pom.xml	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-decisiontables/pom.xml	2010-01-13 11:42:31 UTC (rev 31054)
@@ -28,10 +28,56 @@
     </dependency>
 
     <!-- External dependencies -->
-    <dependency>
-      <groupId>jexcelapi</groupId>
-      <artifactId>jxl</artifactId>
+    <dependency>  
+       <groupId>org.osgi</groupId>  
+       <artifactId>org.osgi.core</artifactId>  
+       <scope>optional</scope>
     </dependency>
+                
+    <dependency>  
+        <groupId>net.sourceforge.jexcelapi</groupId>  
+        <artifactId>com.springsource.jxl</artifactId>  
+    </dependency>
   </dependencies>
+  
+  <build>
+    <plugins> 
+            <plugin>
+              <artifactId>maven-jar-plugin</artifactId>
+              <configuration>
+                <archive>  
+                  <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                </archive> 
+              </configuration>
+            </plugin>  
+            
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>2.0.1</version>
+				<extensions>true</extensions>
+				<executions>
+					<execution>
+						<id>manifest</id>
+						<phase>process-classes</phase>
+						<goals>
+							<goal>manifest</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+                    <manifestLocation>META-INF</manifestLocation>
+					<instructions>
+                        <_removeheaders>Ignore-Package</_removeheaders>                    
+                        <Require-Bundle>org.drools.core;bundle-version="${pom.version}"</Require-Bundle>                    
+						<Import-Package>!org.drools.*, *</Import-Package>
+						<Export-Package>org.drools.*</Export-Package>   
+                        <DynamicImport-Package>org.drools.*</DynamicImport-Package>      
+                        <Bundle-Activator>org.drools.osgi.decisiontables.Activator</Bundle-Activator>                                      
+					</instructions>
+				</configuration>
+			</plugin>   
+    </plugins>
+  </build>    
 
 </project>

Added: labs/jbossrules/trunk/drools-decisiontables/src/main/java/org/drools/osgi/decisiontables/Activator.java
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/src/main/java/org/drools/osgi/decisiontables/Activator.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-decisiontables/src/main/java/org/drools/osgi/decisiontables/Activator.java	2010-01-13 11:42:31 UTC (rev 31054)
@@ -0,0 +1,34 @@
+package org.drools.osgi.decisiontables;
+
+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.drools.compiler.DecisionTableProvider;
+import org.drools.decisiontable.DecisionTableProviderImpl;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+
+public class Activator
+    implements
+    BundleActivator {
+    private ServiceRegistration kdtableReg;
+
+    public void start(BundleContext bc) throws Exception {
+    	System.out.println( "registering decision tables drools services" );
+        this.kdtableReg = bc.registerService( DecisionTableProvider.class.getName(),
+                                               new DecisionTableProviderImpl(),
+                                               new Hashtable() );
+        System.out.println( "drools decision tables services registered" );
+    }
+
+    public void stop(BundleContext bc) throws Exception {
+        this.kdtableReg.unregister();
+    }
+}

Modified: labs/jbossrules/trunk/drools-guvnor/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/.classpath	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-guvnor/.classpath	2010-01-13 11:42:31 UTC (rev 31054)
@@ -12,7 +12,7 @@
   <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/cobogw/gwt/cobogw/1.0/cobogw-1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar"/>
@@ -21,15 +21,15 @@
   <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar"/>
   <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1-brew/dom4j-1.6.1-brew.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/drools/drools-api/5.1.0.SNAPSHOT/drools-api-5.1.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-api/5.1.0.SNAPSHOT/drools-api-5.1.0.SNAPSHOT-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/drools/drools-bpmn2/5.1.0.SNAPSHOT/drools-bpmn2-5.1.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-bpmn2/5.1.0.SNAPSHOT/drools-bpmn2-5.1.0.SNAPSHOT-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/drools/drools-decisiontables/5.1.0.SNAPSHOT/drools-decisiontables-5.1.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-decisiontables/5.1.0.SNAPSHOT/drools-decisiontables-5.1.0.SNAPSHOT-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/drools/drools-doc/5.1.0.SNAPSHOT/drools-doc-5.1.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-doc/5.1.0.SNAPSHOT/drools-doc-5.1.0.SNAPSHOT-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/drools/drools-repository/5.1.0.SNAPSHOT/drools-repository-5.1.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-repository/5.1.0.SNAPSHOT/drools-repository-5.1.0.SNAPSHOT-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/drools/drools-templates/5.1.0.SNAPSHOT/drools-templates-5.1.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-templates/5.1.0.SNAPSHOT/drools-templates-5.1.0.SNAPSHOT-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/drools/drools-verifier/5.1.0.SNAPSHOT/drools-verifier-5.1.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-verifier/5.1.0.SNAPSHOT/drools-verifier-5.1.0.SNAPSHOT-sources.jar"/>
+  <classpathentry kind="src" path="/drools-api"/>
+  <classpathentry kind="src" path="/drools-bpmn2"/>
+  <classpathentry kind="src" path="/drools-compiler"/>
+  <classpathentry kind="src" path="/drools-core"/>
+  <classpathentry kind="src" path="/drools-decisiontables"/>
+  <classpathentry kind="src" path="/drools-doc"/>
+  <classpathentry kind="src" path="/drools-repository"/>
+  <classpathentry kind="src" path="/drools-templates"/>
+  <classpathentry kind="src" path="/drools-verifier"/>
   <classpathentry kind="var" path="M2_REPO/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/el/el-api/1.2/el-api-1.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/el/el-ri/1.2/el-ri-1.2.jar"/>
@@ -54,7 +54,7 @@
   <classpathentry kind="var" path="M2_REPO/org/jboss/seam/jboss-seam/2.1.0.GA/jboss-seam-2.1.0.GA.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jboss/seam/jboss-seam-remoting/2.1.0.GA/jboss-seam-remoting-2.1.0.GA.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty/6.1.15/jetty-6.1.15.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty/6.1.15/jetty-6.1.15.jar" sourcepath="M2_REPO/org/mortbay/jetty/jetty/6.1.15/jetty-6.1.15-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty-embedded/6.1.15/jetty-embedded-6.1.15.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty-util/6.1.15/jetty-util-6.1.15.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar"/>
@@ -85,5 +85,5 @@
   <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/2.0.2/xml-apis-2.0.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
-  <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3.1/xstream-1.3.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3.1/xstream-1.3.1.jar" sourcepath="M2_REPO/com/thoughtworks/xstream/xstream/1.3.1/xstream-1.3.1-sources.jar"/>
 </classpath>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-guvnor/.project
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/.project	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-guvnor/.project	2010-01-13 11:42:31 UTC (rev 31054)
@@ -1,7 +1,17 @@
 <projectDescription>
   <name>drools-guvnor</name>
   <comment>A rule production system</comment>
-  <projects/>
+  <projects>
+    <project>drools-api</project>
+    <project>drools-bpmn2</project>
+    <project>drools-compiler</project>
+    <project>drools-core</project>
+    <project>drools-decisiontables</project>
+    <project>drools-doc</project>
+    <project>drools-repository</project>
+    <project>drools-templates</project>
+    <project>drools-verifier</project>
+  </projects>
   <buildSpec>
     <buildCommand>
       <name>org.maven.ide.eclipse.maven2Builder</name>

Modified: labs/jbossrules/trunk/drools-guvnor/Guvnor.launch
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/Guvnor.launch	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-guvnor/Guvnor.launch	2010-01-13 11:42:31 UTC (rev 31054)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/drools-guvnor"/>
@@ -82,9 +82,11 @@
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;drools-persistence-jpa&quot; type=&quot;1&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;drools-api&quot; type=&quot;1&quot;/&gt;&#10;"/>
 </listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.classpathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTShell"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-out www org.drools.guvnor.Guvnor/Guvnor.html"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="drools-guvnor"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512M"/>
 </launchConfiguration>

Modified: labs/jbossrules/trunk/drools-guvnor/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/pom.xml	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-guvnor/pom.xml	2010-01-13 11:42:31 UTC (rev 31054)
@@ -241,8 +241,8 @@
       <artifactId>gwtext</artifactId>
     </dependency>
     <dependency>
-     <groupId>com.thoughtworks.xstream</groupId>
-     <artifactId>xstream</artifactId>
+        <groupId>com.thoughtworks.xstream</groupId>  
+        <artifactId>com.springsource.com.thoughtworks.xstream</artifactId> 
     </dependency>
    <dependency>
      <groupId>commons-fileupload</groupId>
@@ -250,8 +250,8 @@
    </dependency>
 
    <dependency>
-     <groupId>commons-io</groupId>
-     <artifactId>commons-io</artifactId>
+     <groupId>org.apache.commons</groupId>
+     <artifactId>com.springsource.org.apache.commons.io</artifactId>
    </dependency>
 
 

Modified: labs/jbossrules/trunk/drools-pipeline/drools-messenger-jms/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-messenger-jms/.classpath	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-pipeline/drools-messenger-jms/.classpath	2010-01-13 11:42:31 UTC (rev 31054)
@@ -7,35 +7,38 @@
   <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/activemq/activeio-core/3.1.0/activeio-core-3.1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/activemq/activemq-core/5.2.0/activemq-core-5.2.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.1.1/antlr-runtime-3.1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.1.1/antlr-3.1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
   <classpathentry kind="var" path="M2_REPO/backport-util-concurrent/backport-util-concurrent/2.1/backport-util-concurrent-2.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/camel/camel-core/1.5.0/camel-core-1.5.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/camel/camel-core/1.5.0/camel-core-1.5.0.jar" sourcepath="M2_REPO/org/apache/camel/camel-core/1.5.0/camel-core-1.5.0-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/com.springsource.org.antlr.runtime/3.1.3/com.springsource.org.antlr.runtime-3.1.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/jasper/springsource/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource/6.0.20.S2-r5956/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource-6.0.20.S2-r5956.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/janino/com.springsource.org.codehaus.janino/2.5.15/com.springsource.org.codehaus.janino-2.5.15.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
   <classpathentry kind="src" path="/drools-api"/>
   <classpathentry kind="src" path="/drools-compiler"/>
   <classpathentry kind="src" path="/drools-core"/>
   <classpathentry kind="src" path="/drools-transformer-jaxb"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-j2ee-management_1.0_spec/1.0/geronimo-j2ee-management_1.0_spec-1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jms_1.1_spec/1.1.1/geronimo-jms_1.1_spec-1.1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/gunit/3.2/gunit-3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.0.3/jaxb-impl-2.0.3.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-xjc/2.0.3/jaxb-xjc-2.0.3.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar" sourcepath="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jmock/jmock-legacy/2.5.1/jmock-legacy-2.5.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6/joda-time-1.6.jar"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
-  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.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/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
   <classpathentry kind="var" path="M2_REPO/simple-jndi/simple-jndi/0.11.4/simple-jndi-0.11.4.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2.1/stringtemplate-3.2.1.jar"/>
 </classpath>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/.classpath	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/.classpath	2010-01-13 11:42:31 UTC (rev 31054)
@@ -6,23 +6,26 @@
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.1.1/antlr-runtime-3.1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.1.1/antlr-3.1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/com.springsource.org.antlr.runtime/3.1.3/com.springsource.org.antlr.runtime-3.1.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/jasper/springsource/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource/6.0.20.S2-r5956/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource-6.0.20.S2-r5956.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/janino/com.springsource.org.codehaus.janino/2.5.15/com.springsource.org.codehaus.janino-2.5.15.jar"/>
   <classpathentry kind="src" path="/drools-api"/>
   <classpathentry kind="src" path="/drools-compiler"/>
   <classpathentry kind="src" path="/drools-core"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/gunit/3.2/gunit-3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.0.3/jaxb-impl-2.0.3.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-xjc/2.0.3/jaxb-xjc-2.0.3.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar" sourcepath="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jmock/jmock-legacy/2.5.1/jmock-legacy-2.5.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6/joda-time-1.6.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar"/>
   <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/antlr/stringtemplate/3.2.1/stringtemplate-3.2.1.jar"/>
 </classpath>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-pipeline/drools-transformer-jxls/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-jxls/.classpath	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-jxls/.classpath	2010-01-13 11:42:31 UTC (rev 31054)
@@ -5,27 +5,30 @@
   <classpathentry kind="src" path="src/test/resources" output="target/test-classes" including="**" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.1.1/antlr-runtime-3.1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.1.1/antlr-3.1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/com.springsource.org.antlr.runtime/3.1.3/com.springsource.org.antlr.runtime-3.1.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/jasper/springsource/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource/6.0.20.S2-r5956/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource-6.0.20.S2-r5956.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/janino/com.springsource.org.codehaus.janino/2.5.15/com.springsource.org.codehaus.janino-2.5.15.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-digester/commons-digester/1.8/commons-digester-1.8.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-jexl/commons-jexl/1.1/commons-jexl-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
   <classpathentry kind="src" path="/drools-api"/>
   <classpathentry kind="src" path="/drools-compiler"/>
   <classpathentry kind="src" path="/drools-core"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/gunit/3.2/gunit-3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar" sourcepath="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jmock/jmock-legacy/2.5.1/jmock-legacy-2.5.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6/joda-time-1.6.jar"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
   <classpathentry kind="var" path="M2_REPO/net/sf/jxls/jxls-reader/0.9.6/jxls-reader-0.9.6.jar"/>
-  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.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/apache/poi/poi/3.0.2-FINAL/poi-3.0.2-FINAL.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2.1/stringtemplate-3.2.1.jar"/>
 </classpath>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-pipeline/drools-transformer-smooks/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-smooks/.classpath	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-smooks/.classpath	2010-01-13 11:42:31 UTC (rev 31054)
@@ -5,29 +5,32 @@
   <classpathentry kind="src" path="src/test/resources" output="target/test-classes" including="**" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.1.1/antlr-runtime-3.1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.1.1/antlr-3.1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/com.springsource.org.antlr.runtime/3.1.3/com.springsource.org.antlr.runtime-3.1.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/jasper/springsource/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource/6.0.20.S2-r5956/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource-6.0.20.S2-r5956.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/janino/com.springsource.org.codehaus.janino/2.5.15/com.springsource.org.codehaus.janino-2.5.15.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
   <classpathentry kind="src" path="/drools-api"/>
   <classpathentry kind="src" path="/drools-compiler"/>
   <classpathentry kind="src" path="/drools-core"/>
   <classpathentry kind="var" path="M2_REPO/org/freemarker/freemarker/2.3.9/freemarker-2.3.9.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/gunit/3.2/gunit-3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar" sourcepath="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jmock/jmock-legacy/2.5.1/jmock-legacy-2.5.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6/joda-time-1.6.jar"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
-  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/milyn/milyn-commons/1.1/milyn-commons-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/milyn/milyn-smooks-core/1.1/milyn-smooks-core-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/milyn/milyn-smooks-javabean/1.1/milyn-smooks-javabean-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/1.3.12-java1.5/mvel-1.3.12-java1.5.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/antlr/stringtemplate/3.2.1/stringtemplate-3.2.1.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/2.0.2/xml-apis-2.0.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/xmlunit/xmlunit/1.2/xmlunit-1.2.jar"/>

Modified: labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/.classpath	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/.classpath	2010-01-13 11:42:31 UTC (rev 31054)
@@ -5,25 +5,68 @@
   <classpathentry kind="src" path="src/test/resources" output="target/test-classes" including="**" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.1.1/antlr-runtime-3.1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.1/ant-1.7.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.1.1/antlr-3.1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/rioproject/boot/4.0-M3-SNAPSHOT/boot-4.0-M3-SNAPSHOT.jar"/>
   <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/rioproject/tools/cli/4.0-M3-SNAPSHOT/cli-4.0-M3-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/com.springsource.org.antlr.runtime/3.1.3/com.springsource.org.antlr.runtime-3.1.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/jasper/springsource/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource/6.0.20.S2-r5956/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource-6.0.20.S2-r5956.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/janino/com.springsource.org.codehaus.janino/2.5.15/com.springsource.org.codehaus.janino-2.5.15.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-cli/2.0-SNAPSHOT/commons-cli-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-compress/1.0-SNAPSHOT/commons-compress-1.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-exec/1.0.0-SNAPSHOT/commons-exec-1.0.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-finder/1.0-SNAPSHOT/commons-finder-1.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-net/commons-net/2.0/commons-net-2.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/rioproject/cybernode/4.0-M3-SNAPSHOT/cybernode-4.0-M3-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
   <classpathentry kind="src" path="/drools-api"/>
   <classpathentry kind="src" path="/drools-compiler"/>
   <classpathentry kind="src" path="/drools-core"/>
+  <classpathentry kind="src" path="/drools-persistence-jpa"/>
+  <classpathentry kind="src" path="/drools-process-task"/>
   <classpathentry kind="src" path="/drools-vsm"/>
+  <classpathentry kind="src" path="/drools-workitems"/>
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/el/el-api/1.0/el-api-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/groovy/groovy-all/1.6.2/groovy-all-1.6.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/gunit/3.2/gunit-3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/el/jboss-el/1.0_02.CR2/jboss-el-1.0_02.CR2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/seam/jboss-seam/2.1.1.GA/jboss-seam-2.1.1.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jline/jline/0.9.94/jline-0.9.94.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar" sourcepath="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jmock/jmock-legacy/2.5.1/jmock-legacy-2.5.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6/joda-time-1.6.jar"/>
+  <classpathentry kind="var" path="M2_REPO/net/jini/jsk-lib/2.1/jsk-lib-2.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/net/jini/jsk-platform/2.1/jsk-platform-2.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/mina/mina-core/2.0.0-M6/mina-core-2.0.0-M6.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/rioproject/monitor/4.0-M3-SNAPSHOT/monitor-4.0-M3-SNAPSHOT.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/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/rioproject/rio/4.0-M3-SNAPSHOT/rio-4.0-M3-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/rome/rome/0.9/rome-0.9.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.0/slf4j-api-1.5.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-jdk14/1.5.2/slf4j-jdk14-1.5.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jivesoftware/smack/3.0.4/smack-3.0.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2.1/stringtemplate-3.2.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/sun/jini/tools/2.1/tools-2.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/xmlunit/xmlunit/1.2/xmlunit-1.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3.1/xstream-1.3.1.jar" sourcepath="M2_REPO/com/thoughtworks/xstream/xstream/1.3.1/xstream-1.3.1-sources.jar"/>

Modified: labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/.project
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/.project	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/.project	2010-01-13 11:42:31 UTC (rev 31054)
@@ -5,7 +5,10 @@
     <project>drools-api</project>
     <project>drools-compiler</project>
     <project>drools-core</project>
+    <project>drools-persistence-jpa</project>
+    <project>drools-process-task</project>
     <project>drools-vsm</project>
+    <project>drools-workitems</project>
   </projects>
   <buildSpec>
     <buildCommand>

Modified: labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/pom.xml	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/pom.xml	2010-01-13 11:42:31 UTC (rev 31054)
@@ -33,10 +33,10 @@
             <scope>test</scope>
          </dependency>          
 
-        <dependency>
-          <groupId>com.thoughtworks.xstream</groupId>
-          <artifactId>xstream</artifactId>
-        </dependency>         
+          <dependency>  
+              <groupId>com.thoughtworks.xstream</groupId>  
+              <artifactId>com.springsource.com.thoughtworks.xstream</artifactId>  
+          </dependency>    
 
         <dependency>
           <groupId>xmlunit</groupId>

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/.classpath	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/.classpath	2010-01-13 11:42:31 UTC (rev 31054)
@@ -10,9 +10,9 @@
   <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-io/1.3.2/commons-io-1.3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/drools/drools-api/5.0.1/drools-api-5.0.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/drools/drools-compiler/5.0.1/drools-compiler-5.0.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/drools/drools-core/5.0.1/drools-core-5.0.1.jar"/>
+  <classpathentry kind="src" path="/drools-api"/>
+  <classpathentry kind="src" path="/drools-compiler"/>
+  <classpathentry kind="src" path="/drools-core"/>
   <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/.project
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/.project	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/.project	2010-01-13 11:42:31 UTC (rev 31054)
@@ -1,8 +1,15 @@
 <projectDescription>
   <name>drools-planner-core</name>
-  <comment>Drools solver solves planning problems by combining a search algorithm with the power of the drools rule engine.
-        This is the drools-planner-core module which contains the search algorithms.</comment>
-  <projects/>
+  <comment>Drools Planner optimizes automated planning
+        by combining metaheuristic search algorithms
+        with rule engine powered score calculation.
+        This is the drools-planner-core module
+        which contains metaheuristic algorithms.</comment>
+  <projects>
+    <project>drools-api</project>
+    <project>drools-compiler</project>
+    <project>drools-core</project>
+  </projects>
   <buildSpec>
     <buildCommand>
       <name>org.eclipse.jdt.core.javabuilder</name>
@@ -11,4 +18,4 @@
   <natures>
     <nature>org.eclipse.jdt.core.javanature</nature>
   </natures>
-</projectDescription>
+</projectDescription>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/pom.xml	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/pom.xml	2010-01-13 11:42:31 UTC (rev 31054)
@@ -38,34 +38,40 @@
         <!-- External dependencies -->
         <!-- Commons -->
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>com.springsource.org.apache.commons.lang</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-io</artifactId>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>com.springsource.org.apache.commons.io</artifactId>
         </dependency>
 
         <!-- Logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <scope>test</scope>
-        </dependency>
+            <dependency>  
+             <groupId>org.slf4j</groupId>  
+             <artifactId>com.springsource.slf4j.api</artifactId>  
+             <version>1.5.10</version>
+            </dependency>    
+          
+            <dependency>  
+             <groupId>org.slf4j</groupId>  
+             <artifactId>com.springsource.slf4j.log4j</artifactId>  
+             <version>1.5.3</version> 
+             <scope>test</scope>
+            </dependency>      
+          
+            <dependency>  
+             <groupId>org.apache.log4j</groupId>  
+             <artifactId>com.springsource.org.apache.log4j</artifactId>  
+             <version>1.2.15</version> 
+             <scope>test</scope>
+             <!-- Because of direct use for the namespaced logging config -->
+            </dependency>  
 
         <!-- Xstream -->
         <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
+              <groupId>com.thoughtworks.xstream</groupId>  
+              <artifactId>com.springsource.com.thoughtworks.xstream</artifactId> 
         </dependency>
 
         <!-- Benchmarker statistic graphs -->

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/.classpath	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/.classpath	2010-01-13 11:42:31 UTC (rev 31054)
@@ -10,9 +10,9 @@
   <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-io/1.3.2/commons-io-1.3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/drools/drools-api/5.0.1/drools-api-5.0.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/drools/drools-compiler/5.0.1/drools-compiler-5.0.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/drools/drools-core/5.0.1/drools-core-5.0.1.jar"/>
+  <classpathentry kind="src" path="/drools-api"/>
+  <classpathentry kind="src" path="/drools-compiler"/>
+  <classpathentry kind="src" path="/drools-core"/>
   <classpathentry kind="src" path="/drools-planner-core"/>
   <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
@@ -30,4 +30,4 @@
   <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.5.0/slf4j-log4j12-1.5.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3.1/xstream-1.3.1.jar" sourcepath="M2_REPO/com/thoughtworks/xstream/xstream/1.3.1/xstream-1.3.1-sources.jar"/>
-</classpath>
+</classpath>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/.project
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/.project	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/.project	2010-01-13 11:42:31 UTC (rev 31054)
@@ -1,8 +1,14 @@
 <projectDescription>
   <name>drools-planner-examples</name>
-  <comment>Drools solver solves planning problems by combining a search algorithm with the power of the drools rule engine.
-        This is the drools-planner-examples module which contains the examples which show how to use drools-planner.</comment>
+  <comment>Drools Planner optimizes automated planning
+        by combining metaheuristic search algorithms
+        with rule engine powered score calculation.
+        This is the drools-planner-examples module
+        which contains examples on how to use Drools Planner.</comment>
   <projects>
+    <project>drools-api</project>
+    <project>drools-compiler</project>
+    <project>drools-core</project>
     <project>drools-planner-core</project>
   </projects>
   <buildSpec>
@@ -13,4 +19,4 @@
   <natures>
     <nature>org.eclipse.jdt.core.javanature</nature>
   </natures>
-</projectDescription>
+</projectDescription>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/pom.xml	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/pom.xml	2010-01-13 11:42:31 UTC (rev 31054)
@@ -70,35 +70,40 @@
         <!-- External dependencies -->
         <!-- Commons -->
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
+           <groupId>org.apache.commons</groupId>
+           <artifactId>com.springsource.org.apache.commons.lang</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-io</artifactId>
+           <groupId>org.apache.commons</groupId>
+           <artifactId>com.springsource.org.apache.commons.io</artifactId>
         </dependency>
 
         <!-- Logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <scope>compile</scope>
-            <!-- Because of direct use for the namespaced logging config -->
-        </dependency>
+            <dependency>  
+             <groupId>org.slf4j</groupId>  
+             <artifactId>com.springsource.slf4j.api</artifactId>  
+             <version>1.5.10</version>
+            </dependency>    
+          
+            <dependency>  
+             <groupId>org.slf4j</groupId>  
+             <artifactId>com.springsource.slf4j.log4j</artifactId>  
+             <version>1.5.3</version> 
+             <scope>runtime</scope>
+            </dependency>      
+          
+            <dependency>  
+             <groupId>org.apache.log4j</groupId>  
+             <artifactId>com.springsource.org.apache.log4j</artifactId>  
+             <version>1.2.15</version> 
+             <scope>compile</scope>
+             <!-- Because of direct use for the namespaced logging config -->
+            </dependency>  
 
         <!-- Xstream -->
         <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
+              <groupId>com.thoughtworks.xstream</groupId>  
+              <artifactId>com.springsource.com.thoughtworks.xstream</artifactId> 
         </dependency>
 
         <!-- Benchmarker statistic graphs -->

Modified: labs/jbossrules/trunk/drools-process/drools-bpmn2/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpmn2/.classpath	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-process/drools-bpmn2/.classpath	2010-01-13 11:42:31 UTC (rev 31054)
@@ -1,47 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry excluding="**/*.java" including="**" kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_14"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/drools-api"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/drools-compiler"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/drools-core"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/drools-persistence-jpa"/>
-	<classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.1.1/antlr-runtime-3.1.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/codehaus/btm/btm/1.3.2/btm-1.3.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
-	<classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/drools/drools-api/5.1.0.SNAPSHOT/drools-api-5.1.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-api/5.1.0.SNAPSHOT/drools-api-5.1.0.SNAPSHOT-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/drools/drools-persistence-jpa/5.1.0.SNAPSHOT/drools-persistence-jpa-5.1.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-persistence-jpa/5.1.0.SNAPSHOT/drools-persistence-jpa-5.1.0.SNAPSHOT-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jms_1.1_spec/1.0.1/geronimo-jms_1.1_spec-1.0.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.0.1B_spec/1.0.1/geronimo-jta_1.0.1B_spec-1.0.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/h2database/h2/1.1.117/h2-1.1.117.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar"/>
-	<classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
-	<classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jmock/jmock-legacy/2.5.1/jmock-legacy-2.5.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6/joda-time-1.6.jar"/>
-	<classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
-	<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/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.0/slf4j-api-1.5.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-jdk14/1.5.2/slf4j-jdk14-1.5.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+  <classpathentry kind="src" path="src/main/java"/>
+  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+  <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
+  <classpathentry kind="src" path="src/test/resources" output="target/test-classes" including="**" excluding="**/*.java"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.1.1/antlr-runtime-3.1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/btm/btm/1.3.2/btm-1.3.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
+  <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
+  <classpathentry kind="src" path="/drools-api"/>
+  <classpathentry kind="src" path="/drools-compiler"/>
+  <classpathentry kind="src" path="/drools-core"/>
+  <classpathentry kind="src" path="/drools-persistence-jpa"/>
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jms_1.1_spec/1.0.1/geronimo-jms_1.1_spec-1.0.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.0.1B_spec/1.0.1/geronimo-jta_1.0.1B_spec-1.0.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/h2database/h2/1.1.117/h2-1.1.117.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock-legacy/2.5.1/jmock-legacy-2.5.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6/joda-time-1.6.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
+  <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/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.0/slf4j-api-1.5.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-jdk14/1.5.2/slf4j-jdk14-1.5.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar"/>
+</classpath>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-process/drools-bpmn2/.project
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpmn2/.project	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-process/drools-bpmn2/.project	2010-01-13 11:42:31 UTC (rev 31054)
@@ -1,7 +1,12 @@
 <projectDescription>
   <name>drools-bpmn2</name>
   <comment>A rule production system</comment>
-  <projects/>
+  <projects>
+    <project>drools-api</project>
+    <project>drools-compiler</project>
+    <project>drools-core</project>
+    <project>drools-persistence-jpa</project>
+  </projects>
   <buildSpec>
     <buildCommand>
       <name>org.eclipse.jdt.core.javabuilder</name>

Modified: labs/jbossrules/trunk/drools-process/drools-gwt-console/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-gwt-console/.classpath	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-process/drools-gwt-console/.classpath	2010-01-13 11:42:31 UTC (rev 31054)
@@ -18,6 +18,7 @@
   <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
   <classpathentry kind="src" path="/drools-api"/>
   <classpathentry kind="src" path="/drools-bam"/>
+  <classpathentry kind="src" path="/drools-bpmn2"/>
   <classpathentry kind="src" path="/drools-compiler"/>
   <classpathentry kind="src" path="/drools-core"/>
   <classpathentry kind="src" path="/drools-process-task"/>

Modified: labs/jbossrules/trunk/drools-process/drools-gwt-console/.project
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-gwt-console/.project	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-process/drools-gwt-console/.project	2010-01-13 11:42:31 UTC (rev 31054)
@@ -4,6 +4,7 @@
   <projects>
     <project>drools-api</project>
     <project>drools-bam</project>
+    <project>drools-bpmn2</project>
     <project>drools-compiler</project>
     <project>drools-core</project>
     <project>drools-process-task</project>

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/.classpath	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/.classpath	2010-01-13 11:42:31 UTC (rev 31054)
@@ -7,9 +7,12 @@
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.1.1/antlr-runtime-3.1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.1.1/antlr-3.1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
   <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/com.springsource.org.antlr.runtime/3.1.3/com.springsource.org.antlr.runtime-3.1.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/jasper/springsource/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource/6.0.20.S2-r5956/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource-6.0.20.S2-r5956.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/janino/com.springsource.org.codehaus.janino/2.5.15/com.springsource.org.codehaus.janino-2.5.15.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-cli/2.0-SNAPSHOT/commons-cli-2.0-SNAPSHOT.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-compress/1.0-SNAPSHOT/commons-compress-1.0-SNAPSHOT.jar"/>
@@ -18,7 +21,6 @@
   <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-net/commons-net/2.0/commons-net-2.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
   <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
   <classpathentry kind="src" path="/drools-api"/>
   <classpathentry kind="src" path="/drools-compiler"/>
@@ -26,6 +28,7 @@
   <classpathentry kind="src" path="/drools-workitems"/>
   <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/el/el-api/1.0/el-api-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/gunit/3.2/gunit-3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/h2database/h2/1.0.77/h2-1.0.77.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
@@ -33,17 +36,15 @@
   <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar"/>
-  <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
   <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jboss/el/jboss-el/1.0_02.CR2/jboss-el-1.0_02.CR2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jboss/seam/jboss-seam/2.1.1.GA/jboss-seam-2.1.1.GA.jar"/>
   <classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar" sourcepath="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jmock/jmock-legacy/2.5.1/jmock-legacy-2.5.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6/joda-time-1.6.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
-  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/mina/mina-core/2.0.0-M6/mina-core-2.0.0-M6.jar"/>
@@ -55,6 +56,7 @@
   <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-jdk14/1.5.2/slf4j-jdk14-1.5.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/jivesoftware/smack/3.0.4/smack-3.0.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2.1/stringtemplate-3.2.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/subethamail/subethasmtp-smtp/1.2/subethasmtp-smtp-1.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/subethamail/subethasmtp-wiser/1.2/subethasmtp-wiser-1.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar"/>

Modified: labs/jbossrules/trunk/drools-process/drools-process-task/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/pom.xml	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/pom.xml	2010-01-13 11:42:31 UTC (rev 31054)
@@ -91,8 +91,8 @@
     	</dependency>      	
     	  
         <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
+              <groupId>com.thoughtworks.xstream</groupId>  
+              <artifactId>com.springsource.com.thoughtworks.xstream</artifactId>   
             <scope>test</scope>
         </dependency>    
         

Modified: labs/jbossrules/trunk/drools-process/drools-workitems/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-workitems/.classpath	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-process/drools-workitems/.classpath	2010-01-13 11:42:31 UTC (rev 31054)
@@ -6,9 +6,13 @@
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.1.1/antlr-runtime-3.1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.1.1/antlr-3.1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
   <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/com.springsource.org.antlr.runtime/3.1.3/com.springsource.org.antlr.runtime-3.1.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/jasper/springsource/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource/6.0.20.S2-r5956/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource-6.0.20.S2-r5956.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/janino/com.springsource.org.codehaus.janino/2.5.15/com.springsource.org.codehaus.janino-2.5.15.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-cli/2.0-SNAPSHOT/commons-cli-2.0-SNAPSHOT.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-compress/1.0-SNAPSHOT/commons-compress-1.0-SNAPSHOT.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-exec/1.0.0-SNAPSHOT/commons-exec-1.0.0-SNAPSHOT.jar"/>
@@ -16,21 +20,19 @@
   <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-net/commons-net/2.0/commons-net-2.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
   <classpathentry kind="src" path="/drools-api"/>
   <classpathentry kind="src" path="/drools-compiler"/>
   <classpathentry kind="src" path="/drools-core"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/ftpserver/ftplet-api/1.0.0-RC2/ftplet-api-1.0.0-RC2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/ftpserver/ftpserver-core/1.0.0-RC2/ftpserver-core-1.0.0-RC2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/gunit/3.2/gunit-3.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
   <classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar" sourcepath="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jmock/jmock-legacy/2.5.1/jmock-legacy-2.5.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6/joda-time-1.6.jar"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
-  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/mina/mina-core/2.0.0-M4/mina-core-2.0.0-M4.jar"/>
@@ -41,6 +43,7 @@
   <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.5.6/slf4j-log4j12-1.5.6.jar"/>
   <classpathentry kind="var" path="M2_REPO/jivesoftware/smack/3.0.4/smack-3.0.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2.1/stringtemplate-3.2.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/subethamail/subethasmtp-smtp/1.2/subethasmtp-smtp-1.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/subethamail/subethasmtp-wiser/1.2/subethasmtp-wiser-1.2.jar"/>
 </classpath>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-repository/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-repository/.classpath	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-repository/.classpath	2010-01-13 11:42:31 UTC (rev 31054)
@@ -6,7 +6,7 @@
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>

Modified: labs/jbossrules/trunk/drools-repository/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-repository/pom.xml	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-repository/pom.xml	2010-01-13 11:42:31 UTC (rev 31054)
@@ -51,18 +51,26 @@
 			<groupId>org.tmatesoft</groupId>
 			<artifactId>svnkit</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-		</dependency>
+            <dependency>  
+             <groupId>org.slf4j</groupId>  
+             <artifactId>com.springsource.slf4j.api</artifactId>  
+            </dependency>    
+          
+            <dependency>  
+             <groupId>org.slf4j</groupId>  
+             <artifactId>com.springsource.slf4j.log4j</artifactId>  
+             <scope>runtime</scope>
+            </dependency>      
+          
+            <dependency>  
+             <groupId>org.apache.log4j</groupId>  
+             <artifactId>com.springsource.org.apache.log4j</artifactId>  
+             <scope>runtime</scope>
+            </dependency>  
 		
       <dependency>
-         <groupId>hsqldb</groupId>
-         <artifactId>hsqldb</artifactId>
+        <groupId>org.hsqldb</groupId>  
+        <artifactId>com.springsource.org.hsqldb</artifactId> 
       </dependency>
 
 		

Modified: labs/jbossrules/trunk/drools-server/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-server/pom.xml	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-server/pom.xml	2010-01-13 11:42:31 UTC (rev 31054)
@@ -33,8 +33,8 @@
 
  	<!-- we are using the most excellent XStream library for fast XML and JSON streaming -->
     <dependency>
-     <groupId>com.thoughtworks.xstream</groupId>
-     <artifactId>xstream</artifactId>
+        <groupId>com.thoughtworks.xstream</groupId>  
+        <artifactId>com.springsource.com.thoughtworks.xstream</artifactId> 
     </dependency>
 
     <dependency>

Added: labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF	                        (rev 0)
+++ labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF	2010-01-13 11:42:31 UTC (rev 31054)
@@ -0,0 +1,23 @@
+Manifest-Version: 1.0
+Export-Package: org.drools.template.model;version="5.1.0.SNAPSHOT",org
+ .drools.template.objects;uses:="org.drools.template.parser,org.drools
+ .template";version="5.1.0.SNAPSHOT",org.drools.template.parser;uses:=
+ "org.mvel2.templates,org.drools.template.model";version="5.1.0.SNAPSH
+ OT",org.drools.template.jdbc;uses:="org.drools.template.parser";versi
+ on="5.1.0.SNAPSHOT",org.drools.template;uses:="org.drools.template.pa
+ rser,org.drools.template.objects";version="5.1.0.SNAPSHOT"
+Tool: Bnd-0.0.357
+Bundle-Name: Drools :: Templates
+Created-By: 1.6.0_10 (Sun Microsystems Inc.)
+Require-Bundle: org.drools.core;bundle-version="5.1.0.SNAPSHOT"
+Bundle-Vendor: JBoss Inc.
+DynamicImport-Package: org.drools.*
+Bundle-Version: 5.1.0.SNAPSHOT
+Bnd-LastModified: 1263361051637
+Bundle-ManifestVersion: 2
+Bundle-Description: A rule production system
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Import-Package: org.mvel2.templates
+Bundle-SymbolicName: org.drools.templates
+Bundle-DocURL: http://www.jboss.org/
+

Modified: labs/jbossrules/trunk/drools-templates/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-templates/pom.xml	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-templates/pom.xml	2010-01-13 11:42:31 UTC (rev 31054)
@@ -31,10 +31,49 @@
     </dependency>
 
     <dependency>
-        <groupId>hsqldb</groupId>
-        <artifactId>hsqldb</artifactId>
+        <groupId>org.hsqldb</groupId>  
+        <artifactId>com.springsource.org.hsqldb</artifactId> 
         <scope>test</scope>
     </dependency>
   </dependencies>
+  
+  <build>
+    <plugins> 
+            <plugin>
+              <artifactId>maven-jar-plugin</artifactId>
+              <configuration>
+                <archive>  
+                  <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                </archive> 
+              </configuration>
+            </plugin>  
+            
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>2.0.1</version>
+				<extensions>true</extensions>
+				<executions>
+					<execution>
+						<id>manifest</id>
+						<phase>process-classes</phase>
+						<goals>
+							<goal>manifest</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+                    <manifestLocation>META-INF</manifestLocation>
+					<instructions>
+                        <_removeheaders>Ignore-Package</_removeheaders>                    
+                        <Require-Bundle>org.drools.core;bundle-version="${pom.version}"</Require-Bundle>                    
+						<Import-Package>!org.drools.*, *</Import-Package>
+						<Export-Package>org.drools.*</Export-Package>   
+                        <DynamicImport-Package>org.drools.*</DynamicImport-Package>                                        
+					</instructions>
+				</configuration>
+			</plugin>   
+    </plugins>
+  </build>     
 
 </project>

Modified: labs/jbossrules/trunk/drools-verifier/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-verifier/.classpath	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-verifier/.classpath	2010-01-13 11:42:31 UTC (rev 31054)
@@ -22,5 +22,5 @@
   <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/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
-  <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3.1/xstream-1.3.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3.1/xstream-1.3.1.jar" sourcepath="M2_REPO/com/thoughtworks/xstream/xstream/1.3.1/xstream-1.3.1-sources.jar"/>
 </classpath>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-verifier/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-verifier/pom.xml	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-verifier/pom.xml	2010-01-13 11:42:31 UTC (rev 31054)
@@ -50,8 +50,8 @@
     </dependency>
 
     <dependency>
-     <groupId>com.thoughtworks.xstream</groupId>
-     <artifactId>xstream</artifactId>
+        <groupId>com.thoughtworks.xstream</groupId>  
+        <artifactId>com.springsource.com.thoughtworks.xstream</artifactId> 
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-vsm/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-vsm/.classpath	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-vsm/.classpath	2010-01-13 11:42:31 UTC (rev 31054)
@@ -5,34 +5,66 @@
   <classpathentry kind="src" path="src/test/resources" output="target/test-classes" including="**" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.1/ant-1.7.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.1.1/antlr-runtime-3.1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.1.1/antlr-3.1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/rioproject/boot/4.0-M3-SNAPSHOT/boot-4.0-M3-SNAPSHOT.jar"/>
   <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/rioproject/tools/cli/4.0-M3-SNAPSHOT/cli-4.0-M3-SNAPSHOT.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/com.springsource.org.antlr.runtime/3.1.3/com.springsource.org.antlr.runtime-3.1.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/jasper/springsource/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource/6.0.20.S2-r5956/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource-6.0.20.S2-r5956.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/janino/com.springsource.org.codehaus.janino/2.5.15/com.springsource.org.codehaus.janino-2.5.15.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-cli/2.0-SNAPSHOT/commons-cli-2.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-compress/1.0-SNAPSHOT/commons-compress-1.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-exec/1.0.0-SNAPSHOT/commons-exec-1.0.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-finder/1.0-SNAPSHOT/commons-finder-1.0-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-net/commons-net/2.0/commons-net-2.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/rioproject/cybernode/4.0-M3-SNAPSHOT/cybernode-4.0-M3-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
   <classpathentry kind="src" path="/drools-api"/>
   <classpathentry kind="src" path="/drools-compiler"/>
   <classpathentry kind="src" path="/drools-core"/>
+  <classpathentry kind="src" path="/drools-persistence-jpa"/>
+  <classpathentry kind="src" path="/drools-process-task"/>
+  <classpathentry kind="src" path="/drools-workitems"/>
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/el/el-api/1.0/el-api-1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/codehaus/groovy/groovy-all/1.6.2/groovy-all-1.6.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/gunit/3.2/gunit-3.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/h2database/h2/1.0.77/h2-1.0.77.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/el/jboss-el/1.0_02.CR2/jboss-el-1.0_02.CR2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/seam/jboss-seam/2.1.1.GA/jboss-seam-2.1.1.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/jline/jline/0.9.94/jline-0.9.94.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar" sourcepath="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jmock/jmock-legacy/2.5.1/jmock-legacy-2.5.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6/joda-time-1.6.jar"/>
   <classpathentry kind="var" path="M2_REPO/net/jini/jsk-lib/2.1/jsk-lib-2.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/net/jini/jsk-platform/2.1/jsk-platform-2.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/mina/mina-core/2.0.0-M6/mina-core-2.0.0-M6.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/rioproject/monitor/4.0-M3-SNAPSHOT/monitor-4.0-M3-SNAPSHOT.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/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/rioproject/rio/4.0-M3-SNAPSHOT/rio-4.0-M3-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/rome/rome/0.9/rome-0.9.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-jdk14/1.5.2/slf4j-jdk14-1.5.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jivesoftware/smack/3.0.4/smack-3.0.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2.1/stringtemplate-3.2.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/sun/jini/tools/2.1/tools-2.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar"/>
 </classpath>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-vsm/.project
===================================================================
--- labs/jbossrules/trunk/drools-vsm/.project	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/drools-vsm/.project	2010-01-13 11:42:31 UTC (rev 31054)
@@ -5,6 +5,9 @@
     <project>drools-api</project>
     <project>drools-compiler</project>
     <project>drools-core</project>
+    <project>drools-persistence-jpa</project>
+    <project>drools-process-task</project>
+    <project>drools-workitems</project>
   </projects>
   <buildSpec>
     <buildCommand>

Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml	2010-01-13 11:01:38 UTC (rev 31053)
+++ labs/jbossrules/trunk/pom.xml	2010-01-13 11:42:31 UTC (rev 31054)
@@ -1088,48 +1088,49 @@
             </dependency>
 
             <!-- External dependencies -->
+            <dependency>  
+               <groupId>org.osgi</groupId>  
+               <artifactId>org.osgi.core</artifactId>  
+               <version>4.1.0.build-200702212030</version> 
+            </dependency>
+            
             <!-- drools-core -->
+           <dependency>  
+              <groupId>com.thoughtworks.xstream</groupId>  
+              <artifactId>com.springsource.com.thoughtworks.xstream</artifactId>  
+              <version>1.3.1</version> 
+           </dependency>
             <dependency>
-                <groupId>com.thoughtworks.xstream</groupId>
-                <artifactId>xstream</artifactId>
-                <version>1.3.1</version>
-            </dependency>
-            <dependency><!-- TODO remove me as xstream brings in xpp3_min -->
-                <groupId>xpp3</groupId>
-                <artifactId>xpp3</artifactId>
-                <version>1.1.3.4.O</version>
-            </dependency>
-            <dependency>
                 <groupId>org.mvel</groupId>
                 <artifactId>mvel2</artifactId>
                 <version>${mvel.dep.version}</version>
             </dependency>
-            <dependency>
-                <groupId>joda-time</groupId>
-                <artifactId>joda-time</artifactId>
-                <version>1.6</version>
-            </dependency>
+            <dependency>  
+              <groupId>org.joda</groupId>  
+              <artifactId>com.springsource.org.joda.time</artifactId>  
+              <version>1.6.0</version> 
+            </dependency>  
 
             <!-- drools-compiler -->
             <dependency>
-                <groupId>org.antlr</groupId>
-                <artifactId>antlr-runtime</artifactId>
-                <version>3.1.1</version>        
+               <groupId>org.antlr</groupId>  
+               <artifactId>com.springsource.org.antlr.runtime</artifactId> 
+                <version>3.1.3</version>        
                 <exclusions>
                   <exclusion>
-                    <groupId>org.antlr</groupId>
-                    <artifactId>stringtemplate</artifactId>
+                   <groupId>org.antlr</groupId>  
+                   <artifactId>com.springsource.org.antlr.stringtemplate</artifactId> 
                   </exclusion>                                  
                 </exclusions>                        
             </dependency>
             <dependency>
-                <groupId>org.antlr</groupId>
-                <artifactId>antlr</artifactId>
-                <version>3.1.1</version>
+               <groupId>org.antlr</groupId>  
+               <artifactId>com.springsource.org.antlr</artifactId> 
+                <version>3.1.3</version>
                 <exclusions>
                   <exclusion>
                     <groupId>org.antlr</groupId>
-                    <artifactId>stringtemplate</artifactId>
+                    <artifactId>com.springsource.org.antlr.stringtemplate</artifactId>
                   </exclusion>      
                   <exclusion>
                     <groupId>org.apache.maven</groupId>
@@ -1142,27 +1143,34 @@
                 <artifactId>gunit</artifactId>
                 <version>3.2</version>
             </dependency>              
-            <dependency>
-                <groupId>org.eclipse.jdt</groupId>
-                <artifactId>core</artifactId>
-                <version>3.4.2.v_883_R34x</version>
-            </dependency>
-            <dependency>
-                <groupId>janino</groupId>
-                <artifactId>janino</artifactId>
-                <version>2.5.15</version>
-            </dependency>
-            <dependency>
-                <groupId>xerces</groupId>
-                <artifactId>xercesImpl</artifactId>
-                <version>2.9.1</version>
-            </dependency>
-            <dependency>
-                <groupId>xml-apis</groupId>
-                <artifactId>xml-apis</artifactId>
-                <version>2.0.2</version>
-            </dependency>
+           <dependency>  
+              <groupId>org.apache.jasper.springsource</groupId>  
+              <artifactId>com.springsource.org.apache.jasper.org.eclipse.jdt.springsource</artifactId>  
+              <version>6.0.20.S2-r5956</version> 
+           </dependency>
+          <dependency>  
+              <groupId>org.codehaus.janino</groupId>  
+              <artifactId>com.springsource.org.codehaus.janino</artifactId>  
+              <version>2.5.15</version> 
+          </dependency>  
+          <dependency>  
+              <groupId>javax.xml.stream</groupId>  
+              <artifactId>com.springsource.javax.xml.stream</artifactId>  
+              <version>1.0.1</version> 
+          </dependency>      
 
+          <dependency>  
+             <groupId>org.apache.xerces</groupId>  
+             <artifactId>com.springsource.org.apache.xerces</artifactId>  
+             <version>2.9.1</version>
+          </dependency>      
+          
+          <dependency>  
+             <groupId>org.apache.xmlcommons</groupId>  
+             <artifactId>com.springsource.org.apache.xmlcommons</artifactId>  
+             <version>1.3.4</version> 
+          </dependency> 
+
             <!-- drools-jsr94 -->
             <dependency>
                 <groupId>jsr94</groupId>
@@ -1181,12 +1189,11 @@
             </dependency>
 
             <!-- drools-decisiontables -->
-            <dependency>
-                <groupId>jexcelapi</groupId>
-                <artifactId>jxl</artifactId>
-                <version>2.4.2</version>
-
-            </dependency>
+            <dependency>  
+              <groupId>net.sourceforge.jexcelapi</groupId>  
+              <artifactId>com.springsource.jxl</artifactId>  
+              <version>2.6.6</version> 
+            </dependency>  
             
             <dependency>
               <groupId>net.sf.jxls</groupId>
@@ -1208,23 +1215,23 @@
             </dependency>
 
             <!-- Logging for drools-repository and drools-planner -->
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>1.5.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-log4j12</artifactId>
-                <version>1.5.0</version>
-                <!--<scope>runtime</scope> TODO default me on runtime-->
-            </dependency>
-            <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-                <version>1.2.14</version>
-                <!--<scope>runtime</scope> TODO default me on runtime-->
-            </dependency>
+            <dependency>  
+             <groupId>org.slf4j</groupId>  
+             <artifactId>com.springsource.slf4j.api</artifactId>  
+             <version>1.5.10</version>
+            </dependency>    
+          
+            <dependency>  
+             <groupId>org.slf4j</groupId>  
+             <artifactId>com.springsource.slf4j.log4j</artifactId>  
+             <version>1.5.3</version> 
+            </dependency>      
+          
+            <dependency>  
+             <groupId>org.apache.log4j</groupId>  
+             <artifactId>com.springsource.org.apache.log4j</artifactId>  
+             <version>1.2.15</version> 
+            </dependency>  
 
             <!-- drools-repository -->
             <dependency>
@@ -1268,10 +1275,10 @@
                 <version>1.1.2</version>
             </dependency>
 
-            <dependency>
-                <groupId>hsqldb</groupId>
-                <artifactId>hsqldb</artifactId>
-                <version>1.8.0.2</version>
+            <dependency>  
+                <groupId>org.hsqldb</groupId>  
+                <artifactId>com.springsource.org.hsqldb</artifactId>  
+                <version>1.8.0.10</version> 
             </dependency>
 
             <!-- drools-guvnor -->
@@ -1291,12 +1298,12 @@
                 <artifactId>commons-fileupload</artifactId>
                 <version>1.2.1</version>
             </dependency>
+            <dependency>  
+             <groupId>org.apache.commons</groupId>  
+             <artifactId>com.springsource.org.apache.commons.io</artifactId>  
+             <version>1.4.0</version> 
+            </dependency>             
             <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>1.4</version>
-            </dependency>            
-            <dependency>
                 <groupId>com.gwtext</groupId>
                 <artifactId>gwtext</artifactId>
                 <version>2.0.5</version>
@@ -1321,17 +1328,17 @@
             </dependency>
 
             <!-- drools-planner -->
+            <dependency>  
+              <groupId>org.apache.commons</groupId>  
+              <artifactId>com.springsource.org.apache.commons.lang</artifactId>  
+              <version>2.4.0</version> 
+            </dependency>   
+            <dependency>  
+              <groupId>org.apache.commons</groupId>  
+              <artifactId>com.springsource.org.apache.commons.io</artifactId>  
+              <version>1.4.0</version> 
+            </dependency> 
             <dependency>
-                <groupId>commons-lang</groupId>
-                <artifactId>commons-lang</artifactId>
-                <version>2.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>1.3.2</version>
-            </dependency>
-            <dependency>
                 <groupId>jfree</groupId>
                 <artifactId>jfreechart</artifactId>
                 <version>1.0.13</version>
@@ -1344,98 +1351,13 @@
                 <version>2.0.0.GA</version>
             </dependency>
             
-          <!-- spring bundle dependencies -->  
+          <!-- spring bundle dependencies -->           
           <dependency>  
-              <groupId>org.antlr</groupId>  
-              <artifactId>com.springsource.org.antlr.runtime</artifactId>  
-              <version>3.1.3</version> 
-          </dependency>
-          <dependency>  
-             <groupId>org.antlr</groupId>  
-             <artifactId>com.springsource.org.antlr</artifactId>  
-             <version>3.1.3</version> 
-          </dependency>          
-          <dependency>  
               <groupId>com.opensymphony.quartz</groupId>  
               <artifactId>com.springsource.org.quartz</artifactId>  
               <version>1.6.2</version>
-          </dependency>          
-          <dependency>  
-              <groupId>net.sourceforge.jexcelapi</groupId>  
-              <artifactId>com.springsource.jxl</artifactId>  
-              <version>2.4.2</version> 
-          </dependency>  
-          <dependency>  
-              <groupId>org.joda</groupId>  
-              <artifactId>com.springsource.org.joda.time</artifactId>  
-              <version>1.6.0</version> 
-          </dependency>      
-          <dependency>  
-              <groupId>com.thoughtworks.xstream</groupId>  
-              <artifactId>com.springsource.com.thoughtworks.xstream</artifactId>  
-              <version>1.3.1</version> 
-          </dependency>  
-          <dependency>  
-              <groupId>javax.xml.stream</groupId>  
-              <artifactId>com.springsource.javax.xml.stream</artifactId>  
-              <version>1.0.1</version> 
-          </dependency>      
-          <!-- missing xpp3 and xpp3_min-->      
+          </dependency>              
           
-          <!-- Apache Jasper JDT bundle 6.0.20.S2-r5956 -->
-          <dependency>  
-             <groupId>org.apache.jasper.springsource</groupId>  
-             <artifactId>com.springsource.org.apache.jasper.org.eclipse.jdt.springsource</artifactId>  
-             <version>6.0.20.S2-r5956</version> 
-          </dependency>
-          
-          <dependency>  
-              <groupId>org.codehaus.janino</groupId>  
-              <artifactId>com.springsource.org.codehaus.janino</artifactId>  
-              <version>2.5.15</version> 
-          </dependency>  
-
-          <dependency>  
-             <groupId>org.apache.xerces</groupId>  
-             <artifactId>com.springsource.org.apache.xerces</artifactId>  
-             <version>2.9.1</version>
-          </dependency>      
-          
-          <dependency>  
-             <groupId>org.apache.xmlcommons</groupId>  
-             <artifactId>com.springsource.org.apache.xmlcommons</artifactId>  
-             <version>1.3.4</version> 
-          </dependency>    
-          
-          <dependency>  
-             <groupId>org.slf4j</groupId>  
-             <artifactId>com.springsource.slf4j.api</artifactId>  
-             <version>1.5.10</version>
-          </dependency>    
-          
-          <dependency>  
-             <groupId>org.slf4j</groupId>  
-             <artifactId>com.springsource.slf4j.log4j</artifactId>  
-             <version>1.5.3</version> 
-          </dependency>      
-          
-          <dependency>  
-             <groupId>org.apache.log4j</groupId>  
-             <artifactId>com.springsource.org.apache.log4j</artifactId>  
-             <version>1.2.15</version> 
-          </dependency>  
-
-          <dependency>  
-             <groupId>org.apache.commons</groupId>  
-             <artifactId>com.springsource.org.apache.commons.lang</artifactId>  
-             <version>2.4.0</version> 
-          </dependency>   
-          <dependency>  
-             <groupId>org.apache.commons</groupId>  
-             <artifactId>com.springsource.org.apache.commons.io</artifactId>  
-             <version>1.4.0</version> 
-          </dependency>  
-          
         <dependency>  
            <groupId>org.apache.commons</groupId>  
            <artifactId>com.springsource.org.apache.commons.digester</artifactId>  



More information about the jboss-svn-commits mailing list