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

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Jan 12 17:11:52 EST 2010


Author: mark.proctor at jboss.com
Date: 2010-01-12 17:11:50 -0500 (Tue, 12 Jan 2010)
New Revision: 31043

Added:
   labs/jbossrules/trunk/bundle-repository/
   labs/jbossrules/trunk/bundle-repository/.classpath
   labs/jbossrules/trunk/bundle-repository/.project
   labs/jbossrules/trunk/bundle-repository/META-INF/
   labs/jbossrules/trunk/bundle-repository/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/bundle-repository/build.properties
   labs/jbossrules/trunk/bundle-repository/jxls/
   labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/
   labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/.classpath
   labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/.project
   labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/META-INF/
   labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/build.properties
   labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/lib/
   labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/maven-eclipse.xml
   labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/pom.xml
   labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/src/
   labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/src/main/
   labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/src/main/java/
   labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/src/main/java/org/
   labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/src/main/java/org/drools/
   labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/src/main/java/org/drools/osgi/
   labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/src/main/java/org/drools/osgi/impl/
   labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/src/main/resources/
   labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/src/main/resources/META-INF/
   labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/src/test/
   labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/src/test/java/
   labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/src/test/resources/
   labs/jbossrules/trunk/bundle-repository/org.milyn/
   labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/
   labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/.classpath
   labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/.project
   labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/META-INF/
   labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/build.properties
   labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/lib/
   labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/maven-eclipse.xml
   labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/pom.xml
   labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/src/
   labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/src/main/
   labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/src/main/java/
   labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/src/main/java/org/
   labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/src/main/java/org/drools/
   labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/src/main/java/org/drools/osgi/
   labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/src/main/java/org/drools/osgi/impl/
   labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/src/main/resources/
   labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/src/main/resources/META-INF/
   labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/src/test/
   labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/src/test/java/
   labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/src/test/resources/
   labs/jbossrules/trunk/bundle-repository/org.mvel/
   labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/
   labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/.classpath
   labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/.project
   labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/META-INF/
   labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/build.properties
   labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/lib/
   labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/maven-eclipse.xml
   labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/pom.xml
   labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/src/
   labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/src/main/
   labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/src/main/java/
   labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/src/main/java/org/
   labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/src/main/java/org/drools/
   labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/src/main/java/org/drools/osgi/
   labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/src/main/java/org/drools/osgi/impl/
   labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/src/main/resources/
   labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/src/main/resources/META-INF/
   labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/src/test/
   labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/src/test/java/
   labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/src/test/resources/
   labs/jbossrules/trunk/bundle-repository/plugins/
   labs/jbossrules/trunk/bundle-repository/pom.xml
   labs/jbossrules/trunk/bundle-repository/src/
   labs/jbossrules/trunk/bundle-repository/src/main/
   labs/jbossrules/trunk/bundle-repository/src/main/java/
   labs/jbossrules/trunk/bundle-repository/src/main/resources/
   labs/jbossrules/trunk/bundle-repository/src/test/
   labs/jbossrules/trunk/bundle-repository/src/test/java/
   labs/jbossrules/trunk/bundle-repository/src/test/resources/
   labs/jbossrules/trunk/drools-api/META-INF/
   labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/drools-api/build.properties
   labs/jbossrules/trunk/drools-compiler/META-INF/
   labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/drools-compiler/build.properties
   labs/jbossrules/trunk/drools-core/META-INF/
   labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/builder/conf/
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/builder/conf/impl/
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/builder/conf/impl/DecisionTableConfigurationImpl.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/internal/
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/internal/InternalResource.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/type/
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/type/DateFormats.java
Removed:
   labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/DateFormats.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/builder/impl/
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/InternalResource.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/type/DecisionTableConfigurationImpl.java
Modified:
   labs/jbossrules/trunk/drools-api/.classpath
   labs/jbossrules/trunk/drools-api/.project
   labs/jbossrules/trunk/drools-api/pom.xml
   labs/jbossrules/trunk/drools-compiler/.classpath
   labs/jbossrules/trunk/drools-compiler/.project
   labs/jbossrules/trunk/drools-compiler/pom.xml
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderProviderImpl.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MVELTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/RuleBuilderTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java
   labs/jbossrules/trunk/drools-container/drools-spring/.classpath
   labs/jbossrules/trunk/drools-container/drools-spring/.project
   labs/jbossrules/trunk/drools-core/.classpath
   labs/jbossrules/trunk/drools-core/.project
   labs/jbossrules/trunk/drools-core/build.properties
   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/base/FieldFactory.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCalendarCoercion.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELDateCoercion.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/BaseResource.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/ByteArrayResource.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/io/impl/EncodedResource.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/FileSystemResource.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/InputStreamResource.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/ReaderResource.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/ResourceChangeScannerImpl.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/UrlResource.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CollectNode.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/type/DateFormatsImpl.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/DateUtils.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/xml/changeset/DecisionTableConfigurationHandler.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/xml/changeset/ResourceHandler.java
   labs/jbossrules/trunk/drools-core/src/test/java/org/drools/base/FieldFactoryTest.java
   labs/jbossrules/trunk/drools-core/src/test/java/org/drools/base/mvel/MVELCalendarCoercionTest.java
   labs/jbossrules/trunk/drools-core/src/test/java/org/drools/base/mvel/MVELDateCoercionTest.java
   labs/jbossrules/trunk/pom.xml
Log:
JBRULES-2351 OSGi Ready
-api, core and compiler should now be individual bundles.
-bundle--repo handles setting up the target platform dependencies.

Added: labs/jbossrules/trunk/bundle-repository/.classpath
===================================================================
--- labs/jbossrules/trunk/bundle-repository/.classpath	                        (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/.classpath	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,29 @@
+<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/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/com.springsource.com.thoughtworks.xstream/1.3.1/com.springsource.com.thoughtworks.xstream-1.3.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/net/sourceforge/jexcelapi/com.springsource.jxl/2.4.2/com.springsource.jxl-2.4.2.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/commons/com.springsource.org.apache.commons.io/1.4.0/com.springsource.org.apache.commons.io-1.4.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/commons/com.springsource.org.apache.commons.lang/2.4.0/com.springsource.org.apache.commons.lang-2.4.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-1.2.15.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/xerces/com.springsource.org.apache.xerces/2.9.1/com.springsource.org.apache.xerces-2.9.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/xml/com.springsource.org.apache.xml.resolver/1.2.0/com.springsource.org.apache.xml.resolver-1.2.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/xmlcommons/com.springsource.org.apache.xmlcommons/1.3.4/com.springsource.org.apache.xmlcommons-1.3.4.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/joda/com.springsource.org.joda.time/1.6.0/com.springsource.org.joda.time-1.6.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/xmlpull/com.springsource.org.xmlpull/1.1.4.c/com.springsource.org.xmlpull-1.1.4.c.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/com.springsource.slf4j.api/1.5.10/com.springsource.slf4j.api-1.5.10.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/com.springsource.slf4j.log4j/1.5.3/com.springsource.slf4j.log4j-1.5.3.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/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/junit/junit/4.6/junit-4.6.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
+</classpath>
\ No newline at end of file

Added: labs/jbossrules/trunk/bundle-repository/.project
===================================================================
--- labs/jbossrules/trunk/bundle-repository/.project	                        (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/.project	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,20 @@
+<projectDescription>
+  <name>bundle-repo</name>
+  <comment>A rule production system</comment>
+  <projects/>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.pde.ManifestBuilder</name>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.pde.SchemaBuilder</name>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.pde.PluginNature</nature>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+  </natures>
+</projectDescription>
\ No newline at end of file

Added: labs/jbossrules/trunk/bundle-repository/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/bundle-repository/META-INF/MANIFEST.MF	                        (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/META-INF/MANIFEST.MF	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Bundles Repo
+Bundle-SymbolicName: org.drools.osgi.bundles
+Bundle-Version: 5.1.0.SNAPSHOT
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ClassPath: .
+Bundle-Vendor: JBoss, a division of Red Hat

Added: labs/jbossrules/trunk/bundle-repository/build.properties
===================================================================
--- labs/jbossrules/trunk/bundle-repository/build.properties	                        (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/build.properties	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,14 @@
+src.includes = .,\
+               build.properties,\
+               lib/,\
+               META-INF/,\
+               src/,\
+               pom.xml
+bin.includes = .,\
+               lib/,\
+               META-INF/,\
+               build.properties,\
+source.. = src/main/java/,\
+           src/main/resources/
+output.. = target/classes/     
+jars.compile.order = .          

Added: labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/.classpath
===================================================================
--- labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/.classpath	                        (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/.classpath	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<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 exported="true" kind="lib" path="lib/commons-jexl.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jxls-reader.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

Added: labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/.project
===================================================================
--- labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/.project	                        (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/.project	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.drools.osgi.wrapper.jxls-reader</name>
+	<comment>A rule production system</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

Added: labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/META-INF/MANIFEST.MF	                        (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/META-INF/MANIFEST.MF	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: JXLS Reader
+Bundle-SymbolicName: org.drools.osgi.wrapper.jxls-reader
+Bundle-Version: 0.9.8
+Bundle-Vendor: JBoss
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ClassPath: lib/commons-jexl.jar,
+ lib/jxls-reader.jar,
+ .
+Export-Package: 
+ net.sf.jxls.reader
+Require-Bundle: com.springsource.org.apache.commons.collections;bundle-version="3.2.0",
+ com.springsource.org.apache.commons.logging;bundle-version="1.1.1",
+ com.springsource.org.apache.log4j;bundle-version="1.2.15",
+ com.springsource.org.apache.poi;bundle-version="3.0.2",
+ com.springsource.org.apache.commons.beanutils;bundle-version="1.8.0",
+ com.springsource.org.apache.commons.digester;bundle-version="1.8.1"
+DynamicImport-Package: *
+

Added: labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/build.properties
===================================================================
--- labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/build.properties	                        (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/build.properties	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,14 @@
+src.includes = .,\
+               build.properties,\
+               META-INF/,\
+               src/,\
+               pom.xml,\
+               lib/
+bin.includes = .,\
+               META-INF/,\
+               build.properties,\
+               lib/
+source.. = src/main/java/,\
+           src/main/resources/
+output.. = target/classes/     
+jars.compile.order = .          

Added: labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/maven-eclipse.xml
===================================================================
--- labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/maven-eclipse.xml	                        (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/maven-eclipse.xml	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,11 @@
+<project default="copy-resources">
+  <target name="init"/>
+  <target name="copy-resources" depends="init">
+    <copy todir="target/classes/META-INF" filtering="false">
+      <fileset dir="META-INF"/>
+    </copy>
+    <copy todir="target/classes/lib" filtering="false">
+      <fileset dir="lib" includes="*.jar"/>
+    </copy>
+  </target>
+</project>
\ No newline at end of file

Added: labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/pom.xml
===================================================================
--- labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/pom.xml	                        (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/jxls/jxls-reader/pom.xml	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <parent>
+    <artifactId>drools</artifactId>
+    <groupId>org.drools</groupId>
+    <version>5.1.0.SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>org.drools.osgi.wrapper.jxls-reader</artifactId>
+  <version>0.9.8</version>
+  <packaging>jar</packaging>
+
+  <name>Drools :: OSGi :: Wrapper :: jxls-reader</name>
+  <build>
+    <plugins>    
+    
+            <plugin>
+              <artifactId>maven-jar-plugin</artifactId>
+              <configuration>
+                <archive>  
+                  <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>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>lib</outputDirectory>
+              <overWriteReleases>true</overWriteReleases>
+              <overWriteSnapshots>true</overWriteSnapshots>
+              <overWriteIfNewer>true</overWriteIfNewer>
+              <stripVersion>true</stripVersion>
+              <includeScope>runtime</includeScope>                    
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>   
+    </plugins>
+     
+              <resources>          
+                <resource>
+                  <targetPath>META-INF</targetPath>                
+                  <directory>META-INF</directory>
+                </resource>  
+                <resource>
+                  <targetPath>lib</targetPath>                
+                  <directory>lib</directory>
+                    <includes>
+                      <include>*.jar</include>
+                    </includes>                
+                </resource>                      
+              </resources>       
+  </build>
+
+  <dependencies>
+        <dependency>
+          <groupId>net.sf.jxls</groupId>
+          <artifactId>jxls-reader</artifactId>  
+               <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>  
+                    <exclusion>
+                        <groupId>commons-collections</groupId>
+                        <artifactId>commons-collections</artifactId>
+                    </exclusion> 
+                    <exclusion>
+                        <groupId>commons-beanutils</groupId>
+                        <artifactId>commons-beanutils</artifactId>
+                    </exclusion>     
+                    <exclusion>
+                        <groupId>commons-digester</groupId>
+                        <artifactId>commons-digester</artifactId>
+                    </exclusion>                    
+                    <exclusion>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
+                    </exclusion> 
+                    <exclusion>  
+                        <groupId>org.apache.poi</groupId>  
+                        <artifactId>poi</artifactId>  
+                    </exclusion>                     
+               </exclusions>               
+          
+        </dependency>   
+  </dependencies>
+
+</project>

Added: labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/.classpath
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/.classpath	                        (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/.classpath	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<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 exported="true" kind="lib" path="lib/mvel2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/milyn-commons.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/milyn-smooks-core.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/milyn-smooks-javabean.jar"/>
+	<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-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/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/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/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" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.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="output" path="target/classes"/>
+</classpath>

Added: labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/.project
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/.project	                        (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/.project	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.drools.osgi.wrapper.milyn-smooks-javabean</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

Added: 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	                        (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/META-INF/MANIFEST.MF	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,67 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Smooks
+Bundle-SymbolicName: org.drools.osgi.wrapper.milyn-smooks-javabean
+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
+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"
+Export-Package: org.milyn,
+ org.milyn.annotation,
+ org.milyn.assertion,
+ org.milyn.cdr,
+ org.milyn.cdr.annotation,
+ org.milyn.cdr.extension,
+ org.milyn.classpath,
+ org.milyn.config,
+ org.milyn.container,
+ org.milyn.container.plugin,
+ org.milyn.container.standalone,
+ org.milyn.db,
+ org.milyn.delivery,
+ org.milyn.delivery.annotation,
+ org.milyn.delivery.dom,
+ org.milyn.delivery.dom.serialize,
+ org.milyn.delivery.java,
+ org.milyn.delivery.ordering,
+ org.milyn.delivery.sax,
+ org.milyn.event,
+ org.milyn.event.report,
+ org.milyn.event.report.annotation,
+ org.milyn.event.report.model,
+ org.milyn.event.types,
+ org.milyn.expression,
+ org.milyn.io,
+ org.milyn.javabean,
+ org.milyn.javabean.context,
+ org.milyn.javabean.decoders,
+ org.milyn.javabean.expression,
+ org.milyn.javabean.ext,
+ org.milyn.javabean.gen,
+ org.milyn.javabean.gen.model,
+ org.milyn.javabean.lifecycle,
+ org.milyn.javabean.pojogen,
+ org.milyn.javabean.repository,
+ org.milyn.net,
+ org.milyn.payload,
+ org.milyn.profile,
+ org.milyn.reflect,
+ org.milyn.resource,
+ org.milyn.servlet,
+ org.milyn.useragent,
+ org.milyn.useragent.request,
+ org.milyn.util,
+ org.milyn.xml
+DynamicImport-Package: *
+

Added: labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/build.properties
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/build.properties	                        (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/build.properties	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,14 @@
+src.includes = .,\
+               build.properties,\
+               META-INF/,\
+               src/,\
+               pom.xml,\
+               lib/
+bin.includes = .,\
+               META-INF/,\
+               build.properties,\
+               lib/
+source.. = src/main/java/,\
+           src/main/resources/
+output.. = target/classes/     
+jars.compile.order = .          

Added: labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/maven-eclipse.xml
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/maven-eclipse.xml	                        (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/maven-eclipse.xml	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,11 @@
+<project default="copy-resources">
+  <target name="init"/>
+  <target name="copy-resources" depends="init">
+    <copy todir="target/classes/META-INF" filtering="false">
+      <fileset dir="META-INF"/>
+    </copy>
+    <copy todir="target/classes/lib" filtering="false">
+      <fileset dir="lib" includes="*.jar"/>
+    </copy>
+  </target>
+</project>
\ No newline at end of file

Added: labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/pom.xml
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/pom.xml	                        (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.milyn/milyn-smooks-javabean/pom.xml	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <parent>
+    <artifactId>drools</artifactId>
+    <groupId>org.drools</groupId>
+    <version>5.1.0.SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>org.drools.osgi.wrapper.milyn-smooks-javabean</artifactId>
+  <version>1.2</version>
+  <packaging>jar</packaging>
+
+  <name>Drools :: OSGi :: Wrapper :: milyn-smooks-javabean</name>
+  <build>
+    <plugins>  
+
+            <plugin>
+              <artifactId>maven-jar-plugin</artifactId>
+              <configuration>
+                <archive>  
+                  <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>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>lib</outputDirectory>
+              <overWriteReleases>true</overWriteReleases>
+              <overWriteSnapshots>true</overWriteSnapshots>
+              <overWriteIfNewer>true</overWriteIfNewer>
+              <stripVersion>true</stripVersion>
+              <includeScope>runtime</includeScope>                    
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>   
+    </plugins>
+     
+              <resources>          
+                <resource>
+                  <targetPath>META-INF</targetPath>                
+                  <directory>META-INF</directory>
+                </resource>  
+                <resource>
+                  <targetPath>lib</targetPath>                
+                  <directory>lib</directory>
+                    <includes>
+                      <include>*.jar</include>
+                    </includes>                
+                </resource>                      
+              </resources>       
+  </build>
+
+  <dependencies>
+            <dependency>
+              <groupId>org.milyn</groupId>
+              <artifactId>milyn-smooks-javabean</artifactId>    
+               <exclusions>
+                    <exclusion>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
+                    </exclusion>                
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>  
+                    <exclusion>
+                        <groupId>commons-lang</groupId>
+                        <artifactId>commons-lang</artifactId>
+                    </exclusion> 
+                    <exclusion>
+                        <groupId>com.thoughtworks.xstream</groupId>
+                        <artifactId>xstream</artifactId>
+                    </exclusion>     
+                    <exclusion>
+                        <groupId>org.freemarker</groupId>
+                        <artifactId>freemarker</artifactId>
+                    </exclusion>                    
+                    <exclusion>  
+                        <groupId>javassist</groupId>  
+                        <artifactId>javassist</artifactId>  
+                    </exclusion>   
+                    <exclusion>
+                        <groupId>xml-apis</groupId>
+                        <artifactId>xml-apis</artifactId>
+                    </exclusion>                    
+                    <exclusion>  
+                        <groupId>xerces</groupId>  
+                        <artifactId>xercesImpl</artifactId>  
+                    </exclusion>                      
+               </exclusions>               
+            </dependency>      
+  </dependencies>
+
+</project>

Added: labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/.classpath
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/.classpath	                        (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/.classpath	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<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 exported="true" kind="lib" path="lib/mvel2.jar"/>
+	<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/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/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/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="output" path="target/classes"/>
+</classpath>

Added: labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/.project
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/.project	                        (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/.project	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.drools.osgi.wrapper.mvel2</name>
+	<comment>A rule production system</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

Added: labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/META-INF/MANIFEST.MF	                        (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/META-INF/MANIFEST.MF	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,39 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: mvel2
+Bundle-SymbolicName: org.drools.osgi.wrapper.mvel2
+Bundle-Version: 2.0.12
+Bundle-Vendor: JBoss
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ClassPath: 
+ .,
+ lib/mvel2.jar
+Export-Package: 
+ org.mvel2,
+ org.mvel2.asm,
+ org.mvel2.asm.signature,
+ org.mvel2.asm.util,
+ org.mvel2.ast,
+ org.mvel2.compiler,
+ org.mvel2.conversion,
+ org.mvel2.debug,
+ org.mvel2.integration,
+ org.mvel2.integration.impl,
+ org.mvel2.math,
+ org.mvel2.optimizers,
+ org.mvel2.optimizers.dynamic,
+ org.mvel2.optimizers.impl.asm,
+ org.mvel2.optimizers.impl.refl,
+ org.mvel2.optimizers.impl.refl.collection,
+ org.mvel2.optimizers.impl.refl.nodes,
+ org.mvel2.sh,
+ org.mvel2.sh.command.basic,
+ org.mvel2.sh.command.file,
+ org.mvel2.sh.text,
+ org.mvel2.templates,
+ org.mvel2.templates.res,
+ org.mvel2.templates.util,
+ org.mvel2.templates.util.io,
+ org.mvel2.util
+DynamicImport-Package: *
+

Added: labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/build.properties
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/build.properties	                        (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/build.properties	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,18 @@
+src.includes = .,\
+               build.properties,\
+               lib/,\
+               META-INF/,\
+               src/,\
+               pom.xml
+bin.includes = .,\
+               lib/,\
+               META-INF/,\
+               lib/,\
+               lib/commons-jexl.jar,\
+               lib/jxls-reader.jar,\
+               build.properties,\
+               lib/mvel2.jar
+source.. = src/main/java/,\
+           src/main/resources/
+output.. = target/classes/     
+jars.compile.order = .          

Added: labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/maven-eclipse.xml
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/maven-eclipse.xml	                        (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/maven-eclipse.xml	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,11 @@
+<project default="copy-resources">
+  <target name="init"/>
+  <target name="copy-resources" depends="init">
+    <copy todir="target/classes/META-INF" filtering="false">
+      <fileset dir="META-INF"/>
+    </copy>
+    <copy todir="target/classes/lib" filtering="false">
+      <fileset dir="lib" includes="*.jar"/>
+    </copy>
+  </target>
+</project>
\ No newline at end of file

Added: labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/pom.xml
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/pom.xml	                        (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/pom.xml	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <parent>
+    <artifactId>drools</artifactId>
+    <groupId>org.drools</groupId>
+    <version>5.1.0.SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>org.drools.osgi.wrapper.mvel2</artifactId>
+  <version>2.0.12</version>
+  <packaging>jar</packaging>
+
+  <name>Drools :: OSGi :: Wrapper :: MVEL2</name>
+  <build>
+    <plugins> 
+
+            <plugin>
+              <artifactId>maven-jar-plugin</artifactId>
+              <configuration>
+                <archive>  
+                  <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>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>lib</outputDirectory>
+              <overWriteReleases>true</overWriteReleases>
+              <overWriteSnapshots>true</overWriteSnapshots>
+              <overWriteIfNewer>true</overWriteIfNewer>
+              <stripVersion>true</stripVersion>
+              <includeScope>runtime</includeScope>                    
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>   
+    </plugins>
+     
+              <resources>          
+                <resource>
+                  <targetPath>META-INF</targetPath>                
+                  <directory>META-INF</directory>
+                </resource>  
+                <resource>
+                  <targetPath>lib</targetPath>                
+                  <directory>lib</directory>
+                    <includes>
+                      <include>*.jar</include>
+                    </includes>                
+                </resource>                      
+              </resources>       
+  </build>
+
+  <dependencies>
+        <dependency>
+          <groupId>org.mvel</groupId>
+          <artifactId>mvel2</artifactId>                         
+        </dependency>   
+  </dependencies>
+
+</project>

Added: labs/jbossrules/trunk/bundle-repository/pom.xml
===================================================================
--- labs/jbossrules/trunk/bundle-repository/pom.xml	                        (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/pom.xml	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <parent>
+    <artifactId>drools</artifactId>
+    <groupId>org.drools</groupId>
+    <version>5.1.0.SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>bundle-repository</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Drools :: Bundle Repository</name>
+  
+  <!--repositories>
+    <repository>  
+      <id>com.springsource.repository.bundles.release</id>  
+      <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name> 
+      <url>http://repository.springsource.com/maven/bundles/release</url> 
+    </repository>
+    <repository>
+      <id>com.springsource.repository.bundles.external</id>
+      <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>  
+      <url>http://repository.springsource.com/maven/bundles/external</url> 
+    </repository>   
+  </repositories-->  
+ 
+  <modules>
+      <module>jxls/jxls-reader</module>
+      <module>org.milyn/milyn-smooks-javabean</module>
+      <module>org.mvel/mvel2</module>
+  </modules>
+  
+  <build>
+    <plugins>    
+    
+     <plugin>
+       <artifactId>maven-antrun-plugin</artifactId>
+       <inherited>false</inherited>
+       <executions>
+         <execution>
+           <id>clean plugins</id>
+           <phase>clean</phase>
+           <configuration>
+             <tasks>                              
+                <delete>
+                  <fileset dir="plugins" 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>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>plugins</outputDirectory>
+              <overWriteReleases>true</overWriteReleases>
+              <overWriteSnapshots>true</overWriteSnapshots>
+              <overWriteIfNewer>true</overWriteIfNewer>
+              <stripVersion>false</stripVersion>
+              <includeScope>runtime</includeScope>  
+              <excludeTransitive>false</excludeTransitive>           
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>  
+
+    </plugins>
+  </build>
+
+  <dependencies>
+      <!-- wrapped -->
+      <dependency>  
+          <groupId>org.drools</groupId>  
+          <artifactId>org.drools.osgi.wrapper.jxls-reader</artifactId>  
+          <version>0.9.8</version>
+           <exclusions>
+                <exclusion>
+                  <groupId>net.sf.jxls</groupId>
+                  <artifactId>jxls-reader</artifactId>
+                </exclusion>           
+           </exclusions>          
+      </dependency>
+      
+      <dependency>  
+          <groupId>org.drools</groupId>  
+          <artifactId>org.drools.osgi.wrapper.milyn-smooks-javabean</artifactId>  
+          <version>1.2</version>
+          <exclusions>
+             <exclusion>
+                <groupId>org.milyn</groupId>
+                <artifactId>milyn-smooks-javabean</artifactId> 
+             </exclusion>           
+           </exclusions>          
+      </dependency>    
+
+      <dependency>  
+          <groupId>org.drools</groupId>  
+          <artifactId>org.drools.osgi.wrapper.mvel2</artifactId>  
+          <version>2.0.12</version>
+          <exclusions>
+             <exclusion>
+                <groupId>org.mvel</groupId>
+                <artifactId>mvel2</artifactId> 
+             </exclusion>           
+           </exclusions>          
+      </dependency>      
+
+      <!-- from springsource -->      
+      <dependency>  
+          <groupId>org.antlr</groupId>  
+          <artifactId>com.springsource.org.antlr.runtime</artifactId>  
+      </dependency>
+      <dependency>
+          <groupId>org.antlr</groupId>  
+          <artifactId>com.springsource.org.antlr</artifactId>  
+      </dependency>             
+      <dependency>  
+          <groupId>com.opensymphony.quartz</groupId>  
+          <artifactId>com.springsource.org.quartz</artifactId>  
+      </dependency>       
+      <dependency>  
+          <groupId>net.sourceforge.jexcelapi</groupId>  
+          <artifactId>com.springsource.jxl</artifactId>  
+      </dependency>  
+      <dependency>  
+          <groupId>org.joda</groupId>  
+          <artifactId>com.springsource.org.joda.time</artifactId>  
+      </dependency>      
+      <dependency>  
+          <groupId>com.thoughtworks.xstream</groupId>  
+          <artifactId>com.springsource.com.thoughtworks.xstream</artifactId>  
+      </dependency>  
+      <dependency>  
+          <groupId>javax.xml.stream</groupId>  
+          <artifactId>com.springsource.javax.xml.stream</artifactId>  
+      </dependency>      
+      <!-- missing xpp3 and xpp3_min-->      
+      
+      <!-- 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>  
+          </dependency>
+          
+      <dependency>  
+          <groupId>org.codehaus.janino</groupId>  
+          <artifactId>com.springsource.org.codehaus.janino</artifactId>  
+      </dependency>  
+
+      <dependency>  
+         <groupId>org.apache.xerces</groupId>  
+         <artifactId>com.springsource.org.apache.xerces</artifactId>  
+      </dependency>      
+      
+      <dependency>  
+         <groupId>org.apache.xmlcommons</groupId>  
+         <artifactId>com.springsource.org.apache.xmlcommons</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>  
+      </dependency>      
+      
+      <dependency>  
+         <groupId>org.apache.log4j</groupId>  
+         <artifactId>com.springsource.org.apache.log4j</artifactId>  
+      </dependency>  
+
+      <dependency>  
+         <groupId>org.apache.commons</groupId>  
+         <artifactId>com.springsource.org.apache.commons.lang</artifactId>  
+      </dependency>   
+      <dependency>  
+         <groupId>org.apache.commons</groupId>  
+         <artifactId>com.springsource.org.apache.commons.io</artifactId>  
+      </dependency>    
+      
+        <dependency>  
+           <groupId>org.apache.commons</groupId>  
+           <artifactId>com.springsource.org.apache.commons.digester</artifactId>  
+        </dependency>      
+
+        <dependency>  
+            <groupId>org.apache.commons</groupId>  
+            <artifactId>com.springsource.org.apache.commons.beanutils</artifactId>  
+        </dependency>       
+        
+          <dependency>  
+              <groupId>org.apache.commons</groupId>  
+              <artifactId>com.springsource.org.apache.commons.collections</artifactId>  
+              <version>3.2.1</version> 
+          </dependency>        
+
+         <dependency>
+            <groupId>javax.jms</groupId>  
+            <artifactId>com.springsource.javax.jms</artifactId>  
+         </dependency> 
+
+         <dependency>  
+            <groupId>com.sun.xml</groupId>  
+            <artifactId>com.springsource.com.sun.tools.xjc</artifactId>  
+         </dependency>         
+
+         <dependency>  
+            <groupId>com.sun.xml</groupId>  
+            <artifactId>com.springsource.com.sun.xml.bind</artifactId>  
+        </dependency>   
+
+        <dependency>  
+            <groupId>org.apache.poi</groupId>  
+            <artifactId>com.springsource.org.apache.poi</artifactId>  
+            <version>3.0.2.FINAL</version> 
+        </dependency>  
+
+        <dependency>  
+          <groupId>org.freemarker</groupId>  
+          <artifactId>com.springsource.freemarker</artifactId>  
+        </dependency> 
+
+        <dependency>  
+          <groupId>org.jboss.javassist</groupId>  
+          <artifactId>com.springsource.javassist</artifactId>  
+        </dependency>   
+
+        <dependency>  
+            <groupId>com.sun.xml</groupId>  
+            <artifactId>com.springsource.com.sun.tools.xjc</artifactId>  
+        </dependency>  
+
+        <dependency>  
+           <groupId>javax.activation</groupId>  
+           <artifactId>com.springsource.javax.activation</artifactId>  
+        </dependency>          
+  </dependencies>
+  
+  <dependencyManagement>
+  	<dependencies>
+  	</dependencies>
+  </dependencyManagement>
+
+</project>

Modified: labs/jbossrules/trunk/drools-api/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-api/.classpath	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-api/.classpath	2010-01-12 22:11:50 UTC (rev 31043)
@@ -1,40 +1,10 @@
+<?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/javax/activation/activation/1.1/activation-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/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-lang/commons-lang/2.3/commons-lang-2.3.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/freemarker/freemarker/2.3.9/freemarker-2.3.9.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/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.1.9/jaxb-impl-2.1.9.jar"/>
-  <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-xjc/2.1.9/jaxb-xjc-2.1.9.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/javax/jms/jms/1.1/jms-1.1.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/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/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/opensymphony/quartz/quartz/1.6.1/quartz-1.6.1.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/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" sourcepath="M2_REPO/com/thoughtworks/xstream/xstream/1.3.1/xstream-1.3.1-sources.jar"/>
-</classpath>
\ No newline at end of file
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<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="output" path="target/classes"/>
+</classpath>

Modified: labs/jbossrules/trunk/drools-api/.project
===================================================================
--- labs/jbossrules/trunk/drools-api/.project	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-api/.project	2010-01-12 22:11:50 UTC (rev 31043)
@@ -1,20 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name>drools-api</name>
-  <comment>A rule production system</comment>
-  <projects/>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>org.drools.eclipse.droolsbuilder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>org.devzuz.q.maven.jdt.core.mavenIncrementalBuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-    <nature>org.devzuz.q.maven.jdt.core.mavenNature</nature>
-  </natures>
-</projectDescription>
\ No newline at end of file
+	<name>drools-api</name>
+	<comment>A rule production system</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>

Added: labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF	                        (rev 0)
+++ labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,83 @@
+Manifest-Version: 1.0
+Created-By: 1.5.0_16 (Sun Microsystems Inc.)
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Import-Package: com.sun.tools.xjc;resolution:=optional;version="2.1",c
+ om.thoughtworks.xstream;resolution:=optional;version="1.3",javax.mana
+ gement;resolution:=optional,javax.xml.bind;resolution:=optional;versi
+ on="2.1",net.sf.jxls.reader;resolution:=optional,org.drools;version="
+ 5.1",org.drools.agent;version="5.1",org.drools.builder;version="5.1",
+ org.drools.builder.conf;version="5.1",org.drools.builder.help;version
+ ="5.1",org.drools.command;version="5.1",org.drools.command.impl;versi
+ on="5.1",org.drools.conf;version="5.1",org.drools.definition;version=
+ "5.1",org.drools.definition.process;version="5.1",org.drools.definiti
+ on.rule;version="5.1",org.drools.definition.type;version="5.1",org.dr
+ ools.event;version="5.1",org.drools.event.io;version="5.1",org.drools
+ .event.knowledgebase;version="5.1",org.drools.event.process;version="
+ 5.1",org.drools.event.rule;version="5.1",org.drools.io;version="5.1",
+ org.drools.logger;version="5.1",org.drools.management;version="5.1",o
+ rg.drools.marshalling;version="5.1",org.drools.persistence.jpa;versio
+ n="5.1",org.drools.runtime;version="5.1",org.drools.runtime.conf;vers
+ ion="5.1",org.drools.runtime.help;version="5.1",org.drools.runtime.pi
+ peline;version="5.1",org.drools.runtime.process;version="5.1",org.dro
+ ols.runtime.rule;version="5.1",org.drools.task.service;version="5.1",
+ 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
+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
+ ss,org.drools.runtime.rule,org.drools.runtime.conf";version="5.1.0.SN
+ APSHOT",org.drools.task.service;version="5.1.0.SNAPSHOT",org.drools.m
+ arshalling;uses:="org.drools.runtime,org.drools";version="5.1.0.SNAPS
+ HOT",org.drools.runtime.rule;uses:="org.drools.definition.rule,org.dr
+ ools.runtime";version="5.1.0.SNAPSHOT",org.drools.command;uses:="org.
+ drools.runtime,org.drools,org.drools.runtime.rule";version="5.1.0.SNA
+ PSHOT",org.drools.time;version="5.1.0.SNAPSHOT",org.drools.management
+ ;uses:="javax.management";version="5.1.0.SNAPSHOT",org.drools.event.p
+ rocess;uses:="org.drools.event,org.drools.runtime.process";version="5
+ .1.0.SNAPSHOT",org.drools.event.io;uses:="org.drools";version="5.1.0.
+ SNAPSHOT",org.drools.conf;uses:="org.drools.runtime.rule";version="5.
+ 1.0.SNAPSHOT",org.drools;uses:="org.drools.io,org.drools.event.knowle
+ dgebase,org.drools.runtime,org.drools.definition,org.drools.definitio
+ n.rule,org.drools.definition.type,org.drools.definition.process,org.d
+ rools.conf,org.drools.util";version="5.1.0.SNAPSHOT",org.drools.runti
+ me.conf;uses:="org.drools.conf";version="5.1.0.SNAPSHOT",org.drools.r
+ untime.process;uses:="org.drools.runtime";version="5.1.0.SNAPSHOT",or
+ g.drools.event.rule;uses:="org.drools.event,org.drools.runtime.rule";
+ version="5.1.0.SNAPSHOT",org.drools.builder.help;uses:="com.sun.tools
+ .xjc,org.drools.builder,org.drools.io,org.drools,javax.xml.bind";vers
+ ion="5.1.0.SNAPSHOT",org.drools.vsm;uses:="org.drools.command,org.dro
+ ols.runtime,org.drools.persistence.jpa,org.drools.builder,org.drools,
+ org.drools.agent";version="5.1.0.SNAPSHOT",org.drools.builder.conf;us
+ es:="org.drools.runtime.rule,org.drools.conf";version="5.1.0.SNAPSHOT
+ ",org.drools.definition;uses:="org.drools.definition.rule,org.drools.
+ definition.process";version="5.1.0.SNAPSHOT",org.drools.definition.ru
+ le;uses:="org.drools.definition";version="5.1.0.SNAPSHOT",org.drools.
+ runtime.pipeline;uses:="org.drools.runtime,javax.xml.bind,net.sf.jxls
+ .reader,org.milyn,org.drools,com.thoughtworks.xstream";version="5.1.0
+ .SNAPSHOT",org.drools.runtime.help;uses:="org.drools,com.thoughtworks
+ .xstream,org.drools.time,org.quartz";version="5.1.0.SNAPSHOT",org.dro
+ ols.event.knowledgebase;uses:="org.drools.definition.rule,org.drools.
+ definition,org.drools";version="5.1.0.SNAPSHOT",org.drools.event;uses
+ :="org.drools.runtime,org.drools.event.rule,org.drools.event.process"
+ ;version="5.1.0.SNAPSHOT",org.drools.persistence.jpa;uses:="org.drool
+ s.runtime,org.drools,org.drools.util";version="5.1.0.SNAPSHOT",org.dr
+ ools.builder;uses:="org.drools.io,org.drools.definition,org.drools,or
+ g.drools.builder.conf";version="5.1.0.SNAPSHOT",org.drools.io;uses:="
+ org.drools,org.drools.event.io";version="5.1.0.SNAPSHOT",org.drools.u
+ til;uses:="org.drools";version="5.1.0.SNAPSHOT",org.drools.command.im
+ pl;uses:="org.drools.command";version="5.1.0.SNAPSHOT",org.drools.def
+ inition.type;version="5.1.0.SNAPSHOT",org.drools.definition.process;u
+ ses:="org.drools.definition";version="5.1.0.SNAPSHOT",org.drools.agen
+ t;uses:="org.drools.runtime,org.drools,org.drools.io";version="5.1.0.
+ SNAPSHOT"
+Bundle-Version: 5.1.0.SNAPSHOT
+Bundle-Name: Drools :: API
+Bundle-Description: A rule production system
+Bundle-DocURL: http://www.jboss.org/
+Bundle-Vendor: JBoss Inc.
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.drools.api
+Tool: Bnd-0.0.357
+

Added: labs/jbossrules/trunk/drools-api/build.properties
===================================================================
--- labs/jbossrules/trunk/drools-api/build.properties	                        (rev 0)
+++ labs/jbossrules/trunk/drools-api/build.properties	2010-01-12 22:11:50 UTC (rev 31043)
@@ -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-api/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-api/pom.xml	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-api/pom.xml	2010-01-12 22:11:50 UTC (rev 31043)
@@ -13,51 +13,51 @@
   <name>Drools :: API</name>
 
   <dependencies>  
-        <dependency>
-          <groupId>com.sun.xml.bind</groupId>
-          <artifactId>jaxb-impl</artifactId>
-          <version>2.1.9</version>
-          <scope>provided</scope>          
-        </dependency> 
+         <dependency>  
+            <groupId>org.drools</groupId>  
+            <artifactId>bundle-repository</artifactId>  
+            <scope>optional</scope> 
+         </dependency>    
   
-        <dependency>
-          <groupId>com.sun.xml.bind</groupId>
-          <artifactId>jaxb-xjc</artifactId>
-          <version>2.1.9</version>
-          <scope>provided</scope>
-        </dependency>   
+         <dependency>  
+            <groupId>com.sun.xml</groupId>  
+            <artifactId>com.springsource.com.sun.tools.xjc</artifactId>  
+            <scope>provided</scope> 
+         </dependency>         
+
+         <dependency>  
+            <groupId>com.sun.xml</groupId>  
+            <artifactId>com.springsource.com.sun.xml.bind</artifactId>  
+            <scope>provided</scope> 
+        </dependency>
         
         <dependency>
           <groupId>org.milyn</groupId>
           <artifactId>milyn-smooks-javabean</artifactId>
-          <version>1.1</version>
           <scope>provided</scope>          
         </dependency>       
 
         <dependency>
           <groupId>net.sf.jxls</groupId>
           <artifactId>jxls-reader</artifactId>  
-          <version>0.9.6</version>
           <scope>provided</scope> 
         </dependency> 
         
 	    <dependency>
-	      <groupId>com.thoughtworks.xstream</groupId>
-	      <artifactId>xstream</artifactId>
+          <groupId>com.thoughtworks.xstream</groupId>  
+          <artifactId>com.springsource.com.thoughtworks.xstream</artifactId>
 	      <scope>provided</scope>
 	    </dependency>     
 	    
         <dependency>
-		  <groupId>javax.jms</groupId>
-		  <artifactId>jms</artifactId>
-		  <version>1.1</version>
+           <groupId>javax.jms</groupId>  
+           <artifactId>com.springsource.javax.jms</artifactId>  
           <scope>provided</scope>
         </dependency>  	 
         
         <dependency>
-  			<groupId>org.opensymphony.quartz</groupId>
-  			<artifactId>quartz</artifactId>
-  			<version>1.6.1</version>
+            <groupId>com.opensymphony.quartz</groupId>  
+            <artifactId>com.springsource.org.quartz</artifactId>  
             <scope>provided</scope>  			
         </dependency>          
         
@@ -65,6 +65,38 @@
   
   <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>
+						<Import-Package>org.drools.*,*;resolution:=optional</Import-Package>
+						<Export-Package>org.drools.*</Export-Package>                     
+					</instructions>
+				</configuration>
+			</plugin>   
       
     <plugin>
       <groupId>org.apache.maven.plugins</groupId>
@@ -87,7 +119,8 @@
   </build>
   
     <reporting>
-        <plugins>
+        <plugins>        
+        
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>

Deleted: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/DateFormats.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/DateFormats.java	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/DateFormats.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -1,13 +0,0 @@
-package org.drools.builder;
-
-import java.text.DateFormat;
-import java.util.Date;
-
-public interface DateFormats {
-    DateFormat get(String identifier);
-
-    void set(String identifier,
-             DateFormat value);
-    
-    Date parse(String identifer, String date);
-}

Modified: labs/jbossrules/trunk/drools-compiler/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-compiler/.classpath	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-compiler/.classpath	2010-01-12 22:11:50 UTC (rev 31043)
@@ -1,32 +1,38 @@
+<?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/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/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-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"/>
-  <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"/>
-  <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/servlet/jsp/jsp-api/2.1/jsp-api-2.1.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/opensymphony/quartz/quartz/1.6.1/quartz-1.6.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar"/>
-  <classpathentry kind="var" path="M2_REPO/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>
\ 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/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/com/thoughtworks/xstream/com.springsource.com.thoughtworks.xstream/1.3.1/com.springsource.com.thoughtworks.xstream-1.3.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/antlr/com.springsource.org.antlr/3.1.3/com.springsource.org.antlr-3.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/commons/com.springsource.org.apache.commons.collections/3.2.0/com.springsource.org.apache.commons.collections-3.2.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.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/com/opensymphony/quartz/com.springsource.org.quartz/1.6.2/com.springsource.org.quartz-1.6.2.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/xmlpull/com.springsource.org.xmlpull/1.1.4.c/com.springsource.org.xmlpull-1.1.4.c.jar"/>
+	<classpathentry kind="src" path="/drools-api"/>
+	<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/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" 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/javax/servlet/jsp/jsp-api/2.1/jsp-api-2.1.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/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2.1/stringtemplate-3.2.1.jar"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

Modified: labs/jbossrules/trunk/drools-compiler/.project
===================================================================
--- labs/jbossrules/trunk/drools-compiler/.project	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-compiler/.project	2010-01-12 22:11:50 UTC (rev 31043)
@@ -1,16 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name>drools-compiler</name>
-  <comment>A rule production system</comment>
-  <projects>
-    <project>drools-api</project>
-    <project>drools-core</project>
-  </projects>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
-</projectDescription>
\ No newline at end of file
+	<name>drools-compiler</name>
+	<comment>A rule production system</comment>
+	<projects>
+		<project>drools-api</project>
+		<project>drools-core</project>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>

Added: labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF	                        (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,82 @@
+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
+Bundle-Name: Drools :: Compiler
+Bundle-Description: A rule production system
+Bundle-DocURL: http://www.jboss.org/
+Bundle-Vendor: JBoss Inc.
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.drools.compiler
+Tool: Bnd-0.0.357
+Require-Bundle: org.drools.core;bundle-version="5.1.0.SNAPSHOT"
+

Added: labs/jbossrules/trunk/drools-compiler/build.properties
===================================================================
--- labs/jbossrules/trunk/drools-compiler/build.properties	                        (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/build.properties	2010-01-12 22:11:50 UTC (rev 31043)
@@ -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-compiler/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-compiler/pom.xml	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-compiler/pom.xml	2010-01-12 22:11:50 UTC (rev 31043)
@@ -23,28 +23,32 @@
 		</dependency>
 		<!-- External dependencies -->
 		<dependency>
-			<groupId>org.antlr</groupId>
-			<artifactId>antlr-runtime</artifactId>
+            <groupId>org.antlr</groupId>  
+            <artifactId>com.springsource.org.antlr.runtime</artifactId>  
 		</dependency>
+        <dependency>
+           <groupId>org.antlr</groupId>  
+           <artifactId>com.springsource.org.antlr</artifactId>  
+           <scope>test</scope>
+        </dependency>  
+        <dependency>
+            <groupId>org.antlr</groupId>
+            <artifactId>gunit</artifactId>
+        </dependency>         
 		<dependency>
-			<groupId>org.antlr</groupId>
-			<artifactId>antlr</artifactId>
-			<scope>test</scope>
+             <groupId>org.apache.jasper.springsource</groupId>  
+             <artifactId>com.springsource.org.apache.jasper.org.eclipse.jdt.springsource</artifactId> 
 		</dependency>
 		<dependency>
-			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>core</artifactId>
+          <groupId>org.codehaus.janino</groupId>  
+          <artifactId>com.springsource.org.codehaus.janino</artifactId> 
 		</dependency>
 		<dependency>
-			<groupId>janino</groupId>
-			<artifactId>janino</artifactId>
+           <groupId>com.thoughtworks.xstream</groupId>  
+           <artifactId>com.springsource.com.thoughtworks.xstream</artifactId>  
+		   <optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>com.thoughtworks.xstream</groupId>
-			<artifactId>xstream</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
 			<groupId>org.mvel</groupId>
 			<artifactId>mvel2</artifactId>
 		</dependency>
@@ -56,9 +60,8 @@
 		</dependency>	
 		
         <dependency>
-  			<groupId>org.opensymphony.quartz</groupId>
-  			<artifactId>quartz</artifactId>
-  			<version>1.6.1</version>
+            <groupId>com.opensymphony.quartz</groupId>  
+            <artifactId>com.springsource.org.quartz</artifactId>  
 			<scope>test</scope> 			
         </dependency> 						
 	</dependencies>
@@ -155,4 +158,45 @@
 			</build>
 		</profile>
 	</profiles>
+    
+  <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>
+                        <Require-Bundle>org.drools.core;bundle-version="${pom.version}"</Require-Bundle>                    
+						<Import-Package>!*</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>                     
+					</instructions>
+				</configuration>
+			</plugin>   
+    </plugins>
+  </build>    
 </project>

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderProviderImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderProviderImpl.java	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderProviderImpl.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -7,6 +7,7 @@
 import org.drools.builder.KnowledgeBuilder;
 import org.drools.builder.KnowledgeBuilderConfiguration;
 import org.drools.builder.KnowledgeBuilderProvider;
+import org.drools.builder.conf.impl.DecisionTableConfigurationImpl;
 import org.drools.compiler.PackageBuilder;
 import org.drools.compiler.PackageBuilderConfiguration;
 import org.drools.impl.KnowledgeBaseImpl;

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-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -41,11 +41,9 @@
 import org.drools.base.ClassFieldAccessorCache;
 import org.drools.base.ClassFieldAccessorStore;
 import org.drools.base.evaluators.TimeIntervalParser;
-import org.drools.builder.DateFormats;
 import org.drools.builder.DecisionTableConfiguration;
 import org.drools.builder.ResourceConfiguration;
 import org.drools.builder.ResourceType;
-import org.drools.builder.impl.DateFormatsImpl;
 import org.drools.common.InternalRuleBase;
 import org.drools.commons.jci.problems.CompilationProblem;
 import org.drools.definition.process.Process;
@@ -59,10 +57,10 @@
 import org.drools.guvnor.client.modeldriven.brl.RuleModel;
 import org.drools.guvnor.server.util.BRDRLPersistence;
 import org.drools.guvnor.server.util.BRXMLPersistence;
-import org.drools.io.InternalResource;
 import org.drools.io.Resource;
 import org.drools.io.impl.ClassPathResource;
 import org.drools.io.impl.ReaderResource;
+import org.drools.io.internal.InternalResource;
 import org.drools.lang.descr.AttributeDescr;
 import org.drools.lang.descr.BaseDescr;
 import org.drools.lang.descr.FactTemplateDescr;
@@ -90,6 +88,8 @@
 import org.drools.rule.builder.RuleBuilder;
 import org.drools.runtime.EnvironmentName;
 import org.drools.spi.InternalReadAccessor;
+import org.drools.type.DateFormats;
+import org.drools.type.DateFormatsImpl;
 import org.drools.util.DroolsStreamUtils;
 import org.drools.xml.XmlChangeSetReader;
 import org.drools.xml.XmlPackageReader;

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -29,8 +29,8 @@
 import org.drools.definition.process.NodeContainer;
 import org.drools.definition.process.Process;
 import org.drools.definition.process.WorkflowProcess;
-import org.drools.io.InternalResource;
 import org.drools.io.Resource;
+import org.drools.io.internal.InternalResource;
 import org.drools.lang.descr.ActionDescr;
 import org.drools.lang.descr.ProcessDescr;
 import org.drools.process.builder.ProcessNodeBuilder;

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -32,8 +32,8 @@
 import org.drools.compiler.PackageBuilder.RuleInvokerErrorHandler;
 import org.drools.compiler.PackageBuilder.SrcErrorHandler;
 import org.drools.definition.process.Process;
-import org.drools.io.InternalResource;
 import org.drools.io.Resource;
+import org.drools.io.internal.InternalResource;
 import org.drools.lang.descr.AccumulateDescr;
 import org.drools.lang.descr.AndDescr;
 import org.drools.lang.descr.BaseDescr;

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MVELTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MVELTest.java	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MVELTest.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -27,7 +27,6 @@
 import org.drools.builder.KnowledgeBuilder;
 import org.drools.builder.KnowledgeBuilderFactory;
 import org.drools.builder.ResourceType;
-import org.drools.builder.impl.DateFormatsImpl;
 import org.drools.compiler.DrlParser;
 import org.drools.compiler.DroolsParserException;
 import org.drools.compiler.PackageBuilder;
@@ -37,6 +36,7 @@
 import org.drools.rule.Package;
 import org.drools.rule.builder.dialect.mvel.MVELDialect;
 import org.drools.runtime.StatefulKnowledgeSession;
+import org.drools.type.DateFormatsImpl;
 import org.drools.util.DateUtils;
 import org.mvel2.MVEL;
 

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/RuleBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/RuleBuilderTest.java	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/RuleBuilderTest.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -28,7 +28,6 @@
 import org.drools.base.ClassTypeResolver;
 import org.drools.base.EnabledBoolean;
 import org.drools.base.TypeResolver;
-import org.drools.builder.impl.DateFormatsImpl;
 import org.drools.compiler.Dialect;
 import org.drools.compiler.DialectCompiletimeRegistry;
 import org.drools.compiler.DrlParser;
@@ -53,6 +52,7 @@
 import org.drools.time.TimeUtils;
 import org.drools.time.impl.DurationTimer;
 import org.drools.time.impl.IntervalTimer;
+import org.drools.type.DateFormatsImpl;
 import org.drools.util.DateUtils;
 import org.jmock.Expectations;
 import org.jmock.Mockery;

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -18,7 +18,6 @@
 import org.drools.RuleBase;
 import org.drools.SessionConfiguration;
 import org.drools.WorkingMemoryEntryPoint;
-import org.drools.builder.DateFormats;
 import org.drools.common.InternalFactHandle;
 import org.drools.common.InternalRuleBase;
 import org.drools.common.InternalWorkingMemory;
@@ -59,6 +58,7 @@
 import org.drools.spi.PropagationContext;
 import org.drools.time.SessionClock;
 import org.drools.time.TimerService;
+import org.drools.type.DateFormats;
 
 public class MockWorkingMemory implements InternalWorkingMemory {
                 

Modified: labs/jbossrules/trunk/drools-container/drools-spring/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/.classpath	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-container/drools-spring/.classpath	2010-01-12 22:11:50 UTC (rev 31043)
@@ -1,36 +1,82 @@
-<?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"/>
-	<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/aopalliance/aopalliance/1.0/aopalliance-1.0.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-logging/commons-logging/1.1.1/commons-logging-1.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="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/javax/jms/jms/1.1/jms-1.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/3.8.1/junit-3.8.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.9pre2/mvel2-2.0.9pre2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.5.6/spring-beans-2.5.6.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/2.5.6/spring-context-2.5.6.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.5.6/spring-core-2.5.6.jar"/>
-	<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-decisiontables"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/drools-templates"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/drools-vsm"/>
-	<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/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.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/aopalliance/aopalliance/1.0/aopalliance-1.0.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/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-logging/commons-logging/1.1.1/commons-logging-1.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/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-decisiontables"/>
+  <classpathentry kind="src" path="/drools-persistence-jpa"/>
+  <classpathentry kind="src" path="/drools-process-task"/>
+  <classpathentry kind="src" path="/drools-templates"/>
+  <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/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/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-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/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.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/org/slf4j/slf4j-log4j12/1.5.2/slf4j-log4j12-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/springframework/spring-beans/2.5.6/spring-beans-2.5.6.jar" sourcepath="M2_REPO/org/springframework/spring-beans/2.5.6/spring-beans-2.5.6-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/2.5.6/spring-context-2.5.6.jar" sourcepath="M2_REPO/org/springframework/spring-context/2.5.6/spring-context-2.5.6-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.5.6/spring-core-2.5.6.jar" sourcepath="M2_REPO/org/springframework/spring-core/2.5.6/spring-core-2.5.6-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-jdbc/2.5.6/spring-jdbc-2.5.6.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-orm/2.5.6/spring-orm-2.5.6.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-tx/2.5.6/spring-tx-2.5.6.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-container/drools-spring/.project
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/.project	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-container/drools-spring/.project	2010-01-12 22:11:50 UTC (rev 31043)
@@ -1,7 +1,17 @@
 <projectDescription>
   <name>drools-spring</name>
   <comment>A rule production system</comment>
-  <projects/>
+  <projects>
+    <project>drools-api</project>
+    <project>drools-compiler</project>
+    <project>drools-core</project>
+    <project>drools-decisiontables</project>
+    <project>drools-persistence-jpa</project>
+    <project>drools-process-task</project>
+    <project>drools-templates</project>
+    <project>drools-vsm</project>
+    <project>drools-workitems</project>
+  </projects>
   <buildSpec>
     <buildCommand>
       <name>org.eclipse.jdt.core.javabuilder</name>

Modified: labs/jbossrules/trunk/drools-core/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-core/.classpath	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-core/.classpath	2010-01-12 22:11:50 UTC (rev 31043)
@@ -1,20 +1,21 @@
+<?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/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
-  <classpathentry kind="src" path="/drools-api"/>
-  <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/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/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" sourcepath="M2_REPO/com/thoughtworks/xstream/xstream/1.3.1/xstream-1.3.1-sources.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/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
+	<classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/com.springsource.com.thoughtworks.xstream/1.3.1/com.springsource.com.thoughtworks.xstream-1.3.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/xmlpull/com.springsource.org.xmlpull/1.1.4.c/com.springsource.org.xmlpull-1.1.4.c.jar"/>
+	<classpathentry kind="src" path="/drools-api"/>
+	<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/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/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="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

Modified: labs/jbossrules/trunk/drools-core/.project
===================================================================
--- labs/jbossrules/trunk/drools-core/.project	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-core/.project	2010-01-12 22:11:50 UTC (rev 31043)
@@ -1,22 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name>drools-core</name>
-  <comment>A rule production system</comment>
-  <projects>
-    <project>drools-api</project>
-  </projects>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>org.drools.eclipse.droolsbuilder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>org.devzuz.q.maven.jdt.core.mavenIncrementalBuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-    <nature>org.devzuz.q.maven.jdt.core.mavenNature</nature>
-  </natures>
-</projectDescription>
\ No newline at end of file
+	<name>drools-core</name>
+	<comment>A rule production system</comment>
+	<projects>
+		<project>drools-api</project>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>

Added: labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF	                        (rev 0)
+++ labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,310 @@
+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
+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"
+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
+Bundle-DocURL: http://www.jboss.org/
+Bundle-Vendor: JBoss Inc.
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.drools.core
+Tool: Bnd-0.0.357
+Require-Bundle: org.drools.api;visibility:=reexport;bundle-version="5.
+ 1.0.SNAPSHOT"
+

Modified: labs/jbossrules/trunk/drools-core/build.properties
===================================================================
--- labs/jbossrules/trunk/drools-core/build.properties	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-core/build.properties	2010-01-12 22:11:50 UTC (rev 31043)
@@ -1,14 +1,12 @@
-bin.includes = META-INF/,\
-               icons/,\
-               lib/,\
-               drools-core.jar
-src.includes = META-INF/,\
+src.includes = .,\
                build.properties,\
-               .classpath,\
-               .project,\
-               icons/
-jars.compile.order = drools-core.jar
-source.drools-core.jar = src/main/java/
-output.drools-core.jar = target/classes/
-jars.extra.classpath = lib/drools-asm-2.2.1.jar,\
-                       lib/xstream-1.1.3.jar
+               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-core/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-core/pom.xml	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-core/pom.xml	2010-01-12 22:11:50 UTC (rev 31043)
@@ -13,12 +13,12 @@
   <name>Drools :: Core</name>
 
   <dependencies>  
-    <!-- following are required for parser (lang). May be refactored out of core module. -->
-    <dependency>
-      <groupId>com.thoughtworks.xstream</groupId>
-      <artifactId>xstream</artifactId>
-      <optional>true</optional>
-    </dependency>    
+    <!-- following are required for parser (lang). May be refactored out of core module. -->    
+      <dependency>  
+          <groupId>com.thoughtworks.xstream</groupId>  
+          <artifactId>com.springsource.com.thoughtworks.xstream</artifactId>  
+          <optional>true</optional>
+      </dependency>      
         
     <dependency>
       <groupId>org.mvel</groupId>
@@ -30,32 +30,66 @@
       <artifactId>drools-api</artifactId>
     </dependency>         
     
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-    </dependency>       
+    <!--dependency>
+        <groupId>org.joda</groupId>  
+        <artifactId>com.springsource.org.joda.time</artifactId>  
+    </dependency-->
+    
   </dependencies>
   
   <build>
-    <plugins>
-      
-    <plugin>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-surefire-plugin</artifactId>
-      <configuration>
-        <includes>
-          <include>**/*Test.java</include>
-        </includes>
-        <!--excludes>
-          <exclude>**/LogicTransformerTest.java</exclude>
-          <exclude>**/LeapsMannersTest.java</exclude>          
-          <exclude>**/ReteooMannersTest.java</exclude>                    
-          <exclude>**/LeapsWaltzTest.java</exclude>          
-          <exclude>**/ReteooWaltzTest.java</exclude>             
-          <exclude>**/TableTest.java</exclude>                       
-        </excludes-->
-      </configuration>
-    </plugin>      
+    <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>
+                        <Require-Bundle>org.drools.api;visibility:=reexport;bundle-version="${pom.version}"</Require-Bundle>
+						<Import-Package>!*</Import-Package>
+						<Export-Package>!org.drools.reteoo.*,
+                                        org.drools.*</Export-Package>                      
+					</instructions>
+				</configuration>
+			</plugin> 
+    
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <configuration>
+            <includes>
+              <include>**/*Test.java</include>
+            </includes>
+            <!--excludes>
+              <exclude>**/LogicTransformerTest.java</exclude>
+              <exclude>**/LeapsMannersTest.java</exclude>          
+              <exclude>**/ReteooMannersTest.java</exclude>                    
+              <exclude>**/LeapsWaltzTest.java</exclude>          
+              <exclude>**/ReteooWaltzTest.java</exclude>             
+              <exclude>**/TableTest.java</exclude>                       
+            </excludes-->
+          </configuration>
+        </plugin>      
     </plugins>
   </build>
   

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-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/impl/KnowledgeAgentImpl.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -31,11 +31,11 @@
 import org.drools.event.io.ResourceChangeListener;
 import org.drools.impl.KnowledgeBaseImpl;
 import org.drools.impl.StatelessKnowledgeSessionImpl;
-import org.drools.io.InternalResource;
 import org.drools.io.Resource;
 import org.drools.io.ResourceFactory;
 import org.drools.io.impl.ClassPathResource;
 import org.drools.io.impl.ResourceChangeNotifierImpl;
+import org.drools.io.internal.InternalResource;
 import org.drools.agent.ResourceDiffProducer;
 import org.drools.rule.Function;
 import org.drools.rule.Package;

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/FieldFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/FieldFactory.java	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/FieldFactory.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -22,8 +22,8 @@
 import org.drools.base.field.DoubleFieldImpl;
 import org.drools.base.field.LongFieldImpl;
 import org.drools.base.field.ObjectFieldImpl;
-import org.drools.builder.DateFormats;
 import org.drools.spi.FieldValue;
+import org.drools.type.DateFormats;
 import org.drools.util.DateUtils;
 import org.drools.util.MathUtils;
 

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCalendarCoercion.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCalendarCoercion.java	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCalendarCoercion.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -2,7 +2,7 @@
 
 import java.util.Calendar;
 
-import org.drools.builder.impl.DateFormatsImpl;
+import org.drools.type.DateFormatsImpl;
 import org.drools.util.DateUtils;
 import org.mvel2.ConversionHandler;
 

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELDateCoercion.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELDateCoercion.java	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELDateCoercion.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -5,8 +5,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.drools.builder.DateFormats;
-import org.drools.builder.impl.DateFormatsImpl;
+import org.drools.type.DateFormats;
+import org.drools.type.DateFormatsImpl;
 import org.drools.util.DateUtils;
 import org.mvel2.ConversionHandler;
 

Copied: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/builder/conf/impl/DecisionTableConfigurationImpl.java (from rev 30957, labs/jbossrules/trunk/drools-core/src/main/java/org/drools/builder/impl/DecisionTableConfigurationImpl.java)
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/builder/conf/impl/DecisionTableConfigurationImpl.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/builder/conf/impl/DecisionTableConfigurationImpl.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,31 @@
+package org.drools.builder.conf.impl;
+
+import org.drools.builder.DecisionTableConfiguration;
+import org.drools.builder.DecisionTableInputType;
+
+public class DecisionTableConfigurationImpl implements DecisionTableConfiguration {
+    
+    private DecisionTableInputType inputType;
+    
+    private String worksheetName;
+    
+    public DecisionTableConfigurationImpl() {
+        
+    }
+    
+    public void setInputType(DecisionTableInputType inputType) {
+        this.inputType = inputType;
+    }    
+    
+    public DecisionTableInputType getInputType() {
+        return this.inputType;
+    }
+
+    public void setWorksheetName(String worksheetName) {
+        this.worksheetName = worksheetName;
+    }
+
+    public String getWorksheetName() {
+        return this.worksheetName;
+    }
+}

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -52,8 +52,6 @@
 import org.drools.RuleBaseConfiguration.LogicalOverride;
 import org.drools.base.CalendarsImpl;
 import org.drools.base.MapGlobalResolver;
-import org.drools.builder.DateFormats;
-import org.drools.builder.impl.DateFormatsImpl;
 import org.drools.concurrent.ExecutorService;
 import org.drools.concurrent.ExternalExecutorService;
 import org.drools.definition.process.Process;
@@ -110,6 +108,8 @@
 import org.drools.time.SessionClock;
 import org.drools.time.TimerService;
 import org.drools.time.TimerServiceFactory;
+import org.drools.type.DateFormats;
+import org.drools.type.DateFormatsImpl;
 import org.drools.workflow.core.node.EventTrigger;
 import org.drools.workflow.core.node.StartNode;
 import org.drools.workflow.core.node.Trigger;

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -7,7 +7,6 @@
 import org.drools.FactHandle;
 import org.drools.SessionConfiguration;
 import org.drools.WorkingMemory;
-import org.drools.builder.DateFormats;
 import org.drools.concurrent.ExecutorService;
 import org.drools.event.AgendaEventSupport;
 import org.drools.event.RuleFlowEventSupport;
@@ -27,6 +26,7 @@
 import org.drools.spi.FactHandleFactory;
 import org.drools.spi.PropagationContext;
 import org.drools.time.TimerService;
+import org.drools.type.DateFormats;
 
 public interface InternalWorkingMemory
     extends

Deleted: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/InternalResource.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/InternalResource.java	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/InternalResource.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -1,31 +0,0 @@
-package org.drools.io;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Collection;
-
-import org.drools.builder.ResourceType;
-import org.drools.builder.ResourceConfiguration;
-
-public interface InternalResource extends Resource {
-    void setResourceType(ResourceType resourceType);
-    
-    ResourceType getResourceType();
-    
-    ResourceConfiguration getConfiguration();
-
-    void setConfiguration(ResourceConfiguration configuration); 
-    
-    URL getURL() throws IOException;
-    
-    boolean hasURL();
-    
-    boolean isDirectory();
-    
-    Collection<Resource> listResources();    
-    
-    long getLastModified();
-    
-    long getLastRead();    
-
-}

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/BaseResource.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/BaseResource.java	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/BaseResource.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -4,7 +4,7 @@
 
 import org.drools.builder.ResourceType;
 import org.drools.builder.ResourceConfiguration;
-import org.drools.io.InternalResource;
+import org.drools.io.internal.InternalResource;
 
 public abstract class BaseResource
     implements

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/ByteArrayResource.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/ByteArrayResource.java	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/ByteArrayResource.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -15,8 +15,8 @@
 import java.util.List;
 
 import org.drools.builder.ResourceType;
-import org.drools.io.InternalResource;
 import org.drools.io.Resource;
+import org.drools.io.internal.InternalResource;
 import org.drools.util.StringUtils;
 
 public class ByteArrayResource extends BaseResource

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-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/ClassPathResource.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -17,8 +17,8 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.drools.io.InternalResource;
 import org.drools.io.Resource;
+import org.drools.io.internal.InternalResource;
 import org.drools.util.StringUtils;
 
 /**

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/EncodedResource.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/EncodedResource.java	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/EncodedResource.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -7,8 +7,8 @@
 import java.net.URL;
 import java.util.Collection;
 
-import org.drools.io.InternalResource;
 import org.drools.io.Resource;
+import org.drools.io.internal.InternalResource;
 
 public class EncodedResource  extends BaseResource implements InternalResource {
     private final InternalResource resource;

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/FileSystemResource.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/FileSystemResource.java	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/FileSystemResource.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -15,8 +15,8 @@
 import java.util.Date;
 import java.util.List;
 
-import org.drools.io.InternalResource;
 import org.drools.io.Resource;
+import org.drools.io.internal.InternalResource;
 import org.drools.util.StringUtils;
 
 /**

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/InputStreamResource.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/InputStreamResource.java	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/InputStreamResource.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -8,8 +8,8 @@
 import java.net.URL;
 import java.util.Collection;
 
-import org.drools.io.InternalResource;
 import org.drools.io.Resource;
+import org.drools.io.internal.InternalResource;
 
 public class InputStreamResource  extends BaseResource implements InternalResource {
     private InputStream stream;

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/ReaderResource.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/ReaderResource.java	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/ReaderResource.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -9,8 +9,8 @@
 import java.util.Collection;
 import java.util.Date;
 
-import org.drools.io.InternalResource;
 import org.drools.io.Resource;
+import org.drools.io.internal.InternalResource;
 
 public class ReaderResource  extends BaseResource implements InternalResource {
     private Reader reader;

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/ResourceChangeScannerImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/ResourceChangeScannerImpl.java	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/ResourceChangeScannerImpl.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -12,11 +12,11 @@
 import org.drools.ChangeSet;
 import org.drools.SystemEventListener;
 import org.drools.SystemEventListenerFactory;
-import org.drools.io.InternalResource;
 import org.drools.io.Resource;
 import org.drools.io.ResourceChangeNotifier;
 import org.drools.io.ResourceChangeScanner;
 import org.drools.io.ResourceChangeScannerConfiguration;
+import org.drools.io.internal.InternalResource;
 
 public class ResourceChangeScannerImpl implements ResourceChangeScanner {
 

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/UrlResource.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/UrlResource.java	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/UrlResource.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -22,8 +22,8 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.drools.io.InternalResource;
 import org.drools.io.Resource;
+import org.drools.io.internal.InternalResource;
 import org.drools.util.StringUtils;
 
 import com.sun.net.ssl.HttpsURLConnection;

Added: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/internal/InternalResource.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/internal/InternalResource.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/internal/InternalResource.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,32 @@
+package org.drools.io.internal;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Collection;
+
+import org.drools.builder.ResourceType;
+import org.drools.builder.ResourceConfiguration;
+import org.drools.io.Resource;
+
+public interface InternalResource extends Resource {
+    void setResourceType(ResourceType resourceType);
+    
+    ResourceType getResourceType();
+    
+    ResourceConfiguration getConfiguration();
+
+    void setConfiguration(ResourceConfiguration configuration); 
+    
+    URL getURL() throws IOException;
+    
+    boolean hasURL();
+    
+    boolean isDirectory();
+    
+    Collection<Resource> listResources();    
+    
+    long getLastModified();
+    
+    long getLastRead();    
+
+}

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CollectNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CollectNode.java	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CollectNode.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -321,33 +321,33 @@
                             final InternalWorkingMemory workingMemory,
                             final CollectMemory memory) {
 
-        final CollectContext colctx = (CollectContext) memory.betaMemory.getCreatedHandles().get( leftTuple );
+//        final CollectContext colctx = (CollectContext) memory.betaMemory.getCreatedHandles().get( leftTuple );
+//
+//        // if tuple was propagated
+//        if ( colctx.propagated ) {
+//            LeftTuple firstMatch = getFirstMatch( leftTuple, colctx );
+//            
+//            // we may have no matches yet
+//            if( firstMatch != null ) { 
+//                // temporarily break the linked list to avoid wrong retracts
+//                firstMatch.getLeftParentPrevious().setLeftParentNext( null );
+//                firstMatch.setLeftParentPrevious( null );
+//            }
+//            this.sink.propagateRetractLeftTuple( leftTuple,
+//                                                 context,
+//                                                 workingMemory );
+//            // now set the beta children to the first match
+//            leftTuple.setBetaChildren( firstMatch );
+//            colctx.propagated = false;
+//        }
 
-        // if tuple was propagated
-        if ( colctx.propagated ) {
-            LeftTuple firstMatch = getFirstMatch( leftTuple, colctx );
-            
-            // we may have no matches yet
-            if( firstMatch != null ) { 
-                // temporarily break the linked list to avoid wrong retracts
-                firstMatch.getLeftParentPrevious().setLeftParentNext( null );
-                firstMatch.setLeftParentPrevious( null );
-            }
-            this.sink.propagateRetractLeftTuple( leftTuple,
-                                                 context,
-                                                 workingMemory );
-            // now set the beta children to the first match
-            leftTuple.setBetaChildren( firstMatch );
-            colctx.propagated = false;
-        }
-
-        if( isAssert ) {
-            // linking left and right by creating a new left tuple
-            new LeftTuple( leftTuple,
-                           rightTuple,
-                           this,
-                           this.tupleMemoryEnabled );
-        } else {
+//        if( isAssert ) {
+//            // linking left and right by creating a new left tuple
+//            new LeftTuple( leftTuple,
+//                           rightTuple,
+//                           this,
+//                           this.tupleMemoryEnabled );
+//        } else {
             if( leftTuple.getBetaChildren() != null ) {
                 // removing link between left and right
                 LeftTuple match = leftTuple.getBetaChildren();
@@ -357,31 +357,31 @@
                 match.unlinkFromLeftParent();
                 match.unlinkFromRightParent();
             }
-        }
-        
-        // if there is a subnetwork, we need to unwrapp the object from inside the tuple
-        InternalFactHandle handle = rightTuple.getFactHandle();
-        if ( this.unwrapRightObject ) {
-            handle = ((LeftTuple) handle.getObject()).getLastHandle();
-        }
-
-        if ( context.getType() == PropagationContext.ASSERTION ) {
-            ((Collection) colctx.resultTuple.getFactHandle().getObject()).add( handle.getObject() );
-        } else if ( context.getType() == PropagationContext.RETRACTION || context.getType() == PropagationContext.EXPIRATION ) {
-            ((Collection) colctx.resultTuple.getFactHandle().getObject()).remove( handle.getObject() );
-        } else if ( context.getType() == PropagationContext.MODIFICATION || context.getType() == PropagationContext.RULE_ADDITION || context.getType() == PropagationContext.RULE_REMOVAL ) {
-            if ( isAssert ) {
-                ((Collection) colctx.resultTuple.getFactHandle().getObject()).add( handle.getObject() );
-            } else {
-                ((Collection) colctx.resultTuple.getFactHandle().getObject()).remove( handle.getObject() );
-            }
-        }
-        
-        evaluateResultConstraints( leftTuple,
-                                   context,
-                                   workingMemory,
-                                   memory,
-                                   colctx );
+//        }
+//        
+//        // if there is a subnetwork, we need to unwrapp the object from inside the tuple
+//        InternalFactHandle handle = rightTuple.getFactHandle();
+//        if ( this.unwrapRightObject ) {
+//            handle = ((LeftTuple) handle.getObject()).getLastHandle();
+//        }
+//
+//        if ( context.getType() == PropagationContext.ASSERTION ) {
+//            ((Collection) colctx.resultTuple.getFactHandle().getObject()).add( handle.getObject() );
+//        } else if ( context.getType() == PropagationContext.RETRACTION || context.getType() == PropagationContext.EXPIRATION ) {
+//            ((Collection) colctx.resultTuple.getFactHandle().getObject()).remove( handle.getObject() );
+//        } else if ( context.getType() == PropagationContext.MODIFICATION || context.getType() == PropagationContext.RULE_ADDITION || context.getType() == PropagationContext.RULE_REMOVAL ) {
+//            if ( isAssert ) {
+//                ((Collection) colctx.resultTuple.getFactHandle().getObject()).add( handle.getObject() );
+//            } else {
+//                ((Collection) colctx.resultTuple.getFactHandle().getObject()).remove( handle.getObject() );
+//            }
+//        }
+//        
+//        evaluateResultConstraints( leftTuple,
+//                                   context,
+//                                   workingMemory,
+//                                   memory,
+//                                   colctx );
     }
 
     /**

Copied: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/type (from rev 30957, labs/jbossrules/trunk/drools-core/src/main/java/org/drools/builder/impl)

Copied: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/type/DateFormats.java (from rev 30957, labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/DateFormats.java)
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/type/DateFormats.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/type/DateFormats.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -0,0 +1,13 @@
+package org.drools.type;
+
+import java.text.DateFormat;
+import java.util.Date;
+
+public interface DateFormats {
+    DateFormat get(String identifier);
+
+    void set(String identifier,
+             DateFormat value);
+    
+    Date parse(String identifer, String date);
+}

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/type/DateFormatsImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/builder/impl/DateFormatsImpl.java	2010-01-06 17:11:50 UTC (rev 30957)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/type/DateFormatsImpl.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -1,4 +1,4 @@
-package org.drools.builder.impl;
+package org.drools.type;
 
 import java.io.Externalizable;
 import java.io.IOException;
@@ -14,7 +14,6 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.drools.builder.DateFormats;
 
 public class DateFormatsImpl
     implements

Deleted: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/type/DecisionTableConfigurationImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/builder/impl/DecisionTableConfigurationImpl.java	2010-01-06 17:11:50 UTC (rev 30957)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/type/DecisionTableConfigurationImpl.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -1,31 +0,0 @@
-package org.drools.builder.impl;
-
-import org.drools.builder.DecisionTableConfiguration;
-import org.drools.builder.DecisionTableInputType;
-
-public class DecisionTableConfigurationImpl implements DecisionTableConfiguration {
-    
-    private DecisionTableInputType inputType;
-    
-    private String worksheetName;
-    
-    public DecisionTableConfigurationImpl() {
-        
-    }
-    
-    public void setInputType(DecisionTableInputType inputType) {
-        this.inputType = inputType;
-    }    
-    
-    public DecisionTableInputType getInputType() {
-        return this.inputType;
-    }
-
-    public void setWorksheetName(String worksheetName) {
-        this.worksheetName = worksheetName;
-    }
-
-    public String getWorksheetName() {
-        return this.worksheetName;
-    }
-}

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/DateUtils.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/DateUtils.java	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/DateUtils.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -24,7 +24,7 @@
 import java.util.Date;
 import java.util.Locale;
 
-import org.drools.builder.DateFormats;
+import org.drools.type.DateFormats;
 
 /**
  * @author etirelli

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/xml/changeset/DecisionTableConfigurationHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/xml/changeset/DecisionTableConfigurationHandler.java	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/xml/changeset/DecisionTableConfigurationHandler.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -5,10 +5,10 @@
 import org.drools.builder.DecisionTableConfiguration;
 import org.drools.builder.DecisionTableInputType;
 import org.drools.builder.ResourceConfiguration;
-import org.drools.builder.impl.DecisionTableConfigurationImpl;
-import org.drools.io.InternalResource;
+import org.drools.builder.conf.impl.DecisionTableConfigurationImpl;
 import org.drools.io.Resource;
 import org.drools.io.impl.KnowledgeResource;
+import org.drools.io.internal.InternalResource;
 import org.drools.util.StringUtils;
 import org.drools.xml.BaseAbstractHandler;
 import org.drools.xml.ExtensibleXmlParser;

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-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/xml/changeset/ResourceHandler.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -4,11 +4,11 @@
 import java.util.HashSet;
 
 import org.drools.builder.ResourceType;
-import org.drools.io.InternalResource;
 import org.drools.io.Resource;
 import org.drools.io.impl.ClassPathResource;
 import org.drools.io.impl.KnowledgeResource;
 import org.drools.io.impl.UrlResource;
+import org.drools.io.internal.InternalResource;
 import org.drools.xml.BaseAbstractHandler;
 import org.drools.xml.ExtensibleXmlParser;
 import org.drools.xml.Handler;

Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/base/FieldFactoryTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/base/FieldFactoryTest.java	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/base/FieldFactoryTest.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -7,8 +7,8 @@
 
 import junit.framework.TestCase;
 
-import org.drools.builder.impl.DateFormatsImpl;
 import org.drools.spi.FieldValue;
+import org.drools.type.DateFormatsImpl;
 
 public class FieldFactoryTest extends TestCase {
 

Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/base/mvel/MVELCalendarCoercionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/base/mvel/MVELCalendarCoercionTest.java	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/base/mvel/MVELCalendarCoercionTest.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -6,7 +6,7 @@
 
 import junit.framework.TestCase;
 
-import org.drools.builder.impl.DateFormatsImpl;
+import org.drools.type.DateFormatsImpl;
 import org.drools.util.DateUtils;
 
 public class MVELCalendarCoercionTest extends TestCase {

Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/base/mvel/MVELDateCoercionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/base/mvel/MVELDateCoercionTest.java	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/base/mvel/MVELDateCoercionTest.java	2010-01-12 22:11:50 UTC (rev 31043)
@@ -5,7 +5,7 @@
 
 import junit.framework.TestCase;
 
-import org.drools.builder.impl.DateFormatsImpl;
+import org.drools.type.DateFormatsImpl;
 import org.drools.util.DateUtils;
 
 public class MVELDateCoercionTest extends TestCase {

Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml	2010-01-12 21:54:03 UTC (rev 31042)
+++ labs/jbossrules/trunk/pom.xml	2010-01-12 22:11:50 UTC (rev 31043)
@@ -14,7 +14,8 @@
 
     <properties>
         <mvel.dep.version>2.0.12</mvel.dep.version>
-    </properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>        
+    </properties>    
 
     <prerequisites>
         <maven>2.0.9</maven>
@@ -191,38 +192,6 @@
                <enabled>false</enabled>
             </releases> 
         </repository>
-        <repository><!-- TODO dead code, this probably isn't used anymore -->
-            <id>maven-snapshots</id>
-            <url>http://snapshots.maven.codehaus.org/maven2</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-        <repository><!-- TODO dead code, this probably isn't used anymore -->
-            <id>apache.org</id>
-            <name>Maven Snapshots</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-        <repository><!-- TODO dead code, this probably isn't used anymore -->
-            <id>apache.org</id><!-- TODO this id clashes with previous repository: that's bad -->
-            <name>Maven Releases</name>
-            <url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
         <repository>
             <id>codehaus</id>
             <url>http://repository.codehaus.org</url>
@@ -242,11 +211,17 @@
                <enabled>true</enabled>
             </releases>
         </repository>     
+            
+        <repository>  
+          <id>com.springsource.repository.bundles.release</id>  
+          <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name> 
+          <url>http://repository.springsource.com/maven/bundles/release</url> 
+        </repository>
         <repository>
-          <id>java.net</id>
-          <url>http://download.java.net/maven/2</url>
-          <layout>legacy</layout>
-        </repository>
+          <id>com.springsource.repository.bundles.external</id>
+          <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>  
+          <url>http://repository.springsource.com/maven/bundles/external</url> 
+        </repository>          
     </repositories>
 
     <pluginRepositories>
@@ -441,6 +416,7 @@
                 <activeByDefault>true</activeByDefault> 
             </activation>            
             <modules>
+                <module>bundle-repository</module>            
                 <module>drools-api</module>    
                 <module>drools-core</module>
                 <module>drools-compiler</module>
@@ -825,30 +801,6 @@
         </plugins>
     </reporting>
 
-    <modules>
-        <module>drools-api</module>    
-        <module>drools-core</module>
-        <module>drools-compiler</module>
-        <module>drools-vsm</module>  
-        <module>drools-pipeline</module>   
-        <module>drools-container</module>         
-        <module>drools-simulator</module>
-        <module>drools-jsr94</module>
-        <module>drools-templates</module>
-        <module>drools-decisiontables</module>
-        <module>drools-clips</module>
-        <module>drools-process</module>                  
-        <module>drools-persistence-jpa</module>  
-        <module>drools-server</module>
-        <module>drools-verifier</module>        
-        <module>drools-doc</module>        
-        <module>drools-ant</module>
-        <module>drools-repository</module>
-        <module>drools-guvnor</module>
-        <module>drools-planner</module>
-        <module>drools-container/drools-mc</module>
-        <!--module>drools-agent-jini</module-->
-    </modules>
 
     <dependencies>
         <dependency>
@@ -881,6 +833,12 @@
             <!-- Internal dependencies -->
             <dependency>
                 <groupId>org.drools</groupId>
+                <artifactId>bundle-repository</artifactId>
+                <version>${project.version}</version>
+            </dependency>  
+            
+            <dependency>
+                <groupId>org.drools</groupId>
                 <artifactId>drools-api</artifactId>
                 <version>${project.version}</version>
             </dependency>              
@@ -1180,6 +1138,11 @@
                 </exclusions>                                             
             </dependency>
             <dependency>
+                <groupId>org.antlr</groupId>
+                <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>
@@ -1228,7 +1191,13 @@
             <dependency>
               <groupId>net.sf.jxls</groupId>
               <artifactId>jxls-reader</artifactId> 
-              <version>0.9.6</version>              
+              <version>0.9.8</version>              
+            </dependency>    
+
+            <dependency>
+              <groupId>org.milyn</groupId>
+              <artifactId>milyn-smooks-javabean</artifactId>
+              <version>1.2</version>         
             </dependency>             
 
             <!-- drools-server -->
@@ -1374,11 +1343,164 @@
                 <artifactId>jboss-vfs</artifactId>
                 <version>2.0.0.GA</version>
             </dependency>
+            
+          <!-- 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-->      
+          
+          <!-- 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>  
 
-            <!--
-              TODO looks like jsr170:jcr:1.0 isn't used any more, remove it from /repository/jsr170/jcr/1.0
-              It's also in the central repo: http://www.mvnrepository.com/artifact/javax.jcr/jcr
-            -->
+          <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>  
+           <version>1.8.1</version> 
+        </dependency>       
+
+        <dependency>  
+            <groupId>org.apache.commons</groupId>  
+            <artifactId>com.springsource.org.apache.commons.beanutils</artifactId>  
+            <version>1.8.0</version> 
+        </dependency>     
+        
+        <dependency>  
+            <groupId>org.apache.commons</groupId>  
+            <artifactId>com.springsource.org.apache.commons.collections</artifactId>  
+            <version>3.2.1</version> 
+        </dependency>              
+
+        <dependency>  
+            <groupId>org.apache.poi</groupId>  
+            <artifactId>com.springsource.org.apache.poi</artifactId>  
+            <version>3.0.2.FINAL</version> 
+        </dependency>          
+          
+         <dependency>
+            <groupId>javax.jms</groupId>  
+            <artifactId>com.springsource.javax.jms</artifactId>  
+            <version>1.1.0</version> 
+         </dependency>
+         
+         <dependency>  
+            <groupId>com.sun.xml</groupId>  
+            <artifactId>com.springsource.com.sun.tools.xjc</artifactId>  
+            <version>2.1.7</version>
+         </dependency>         
+
+         <dependency>  
+            <groupId>com.sun.xml</groupId>  
+            <artifactId>com.springsource.com.sun.xml.bind</artifactId>  
+            <version>2.1.7</version>
+        </dependency>  
+
+        <dependency>  
+          <groupId>org.freemarker</groupId>  
+          <artifactId>com.springsource.freemarker</artifactId>  
+          <version>2.3.15</version> 
+        </dependency>        
+        
+        <dependency>  
+          <groupId>org.jboss.javassist</groupId>  
+          <artifactId>com.springsource.javassist</artifactId>  
+          <version>3.9.0.GA</version> 
+        </dependency>        
+        
+        <dependency>  
+            <groupId>com.sun.xml</groupId>  
+            <artifactId>com.springsource.com.sun.tools.xjc</artifactId>  
+            <version>2.1.7</version> 
+        </dependency>       
+
+        <dependency>  
+           <groupId>javax.activation</groupId>  
+           <artifactId>com.springsource.javax.activation</artifactId>  
+           <version>1.1.1</version> 
+        </dependency>        
         </dependencies>
     </dependencyManagement>
 



More information about the jboss-svn-commits mailing list