[jboss-svn-commits] JBL Code SVN: r31606 - in labs/jbossrules/trunk: bundle-repository and 62 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Feb 12 08:33:04 EST 2010
Author: mark.proctor at jboss.com
Date: 2010-02-12 08:33:02 -0500 (Fri, 12 Feb 2010)
New Revision: 31606
Added:
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/.classpath
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/.project
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/pom.xml
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/main/
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/main/resources/
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/main/resources/META-INF/
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/main/resources/META-INF/spring/
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/main/resources/META-INF/spring/bundle-context-osgi.xml
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/main/resources/META-INF/spring/bundle-context.xml
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/main/resources/log4j.properties
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/SimpleOsgiTest.java
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/test/
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/test/AbstractDroolsSpringDMTest.java
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/test/utils/
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/test/utils/EclipseArtifactFinder.java
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/test/utils/EclipseWorkspaceArtifactLocator.java
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/test/utils/UnpackedOSGiBundleResource.java
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/test/
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/test/Cheese.java
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/test/Person.java
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/test/decisiontable/
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/test/decisiontable/Test.java
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/resources/
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/resources/boot-bundles.properties
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/resources/log4j.properties
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/resources/org/
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/resources/org/test/
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/resources/org/test/decisiontable/
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/resources/org/test/decisiontable/IntegrationExampleTest.xls
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/resources/org/test/decisiontable/changeset1Test.drl
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/resources/org/test/decisiontable/changeset1Test.xml
labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/resources/org/test/decisiontable/changeset2Test.drl
Removed:
labs/jbossrules/trunk/drools-container/drools-osgi/
Modified:
labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/.classpath
labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/META-INF/MANIFEST.MF
labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/pom.xml
labs/jbossrules/trunk/bundle-repository/pom.xml
labs/jbossrules/trunk/drools-ant/.classpath
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/util/ClassLoaderUtil.java
labs/jbossrules/trunk/drools-clips/.classpath
labs/jbossrules/trunk/drools-compiler/.classpath
labs/jbossrules/trunk/drools-container/drools-mc/.classpath
labs/jbossrules/trunk/drools-container/drools-spring/.classpath
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/SpringSingleSessionCommandService.java
labs/jbossrules/trunk/drools-core/.classpath
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/FireAllRulesCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/InsertObjectCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/help/impl/BatchExecutionHelperProviderImpl.java
labs/jbossrules/trunk/drools-decisiontables/.classpath
labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-decisiontables/pom.xml
labs/jbossrules/trunk/drools-doc/.classpath
labs/jbossrules/trunk/drools-guvnor/.classpath
labs/jbossrules/trunk/drools-jsr94/.classpath
labs/jbossrules/trunk/drools-persistence-jpa/.classpath
labs/jbossrules/trunk/drools-persistence-jpa/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-persistence-jpa/pom.xml
labs/jbossrules/trunk/drools-pipeline/drools-camel/.classpath
labs/jbossrules/trunk/drools-pipeline/drools-camel/.project
labs/jbossrules/trunk/drools-pipeline/drools-messenger-jms/.classpath
labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/.classpath
labs/jbossrules/trunk/drools-pipeline/drools-transformer-jxls/.classpath
labs/jbossrules/trunk/drools-pipeline/drools-transformer-smooks/.classpath
labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/.classpath
labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/.project
labs/jbossrules/trunk/drools-planner/drools-planner-core/.classpath
labs/jbossrules/trunk/drools-planner/drools-planner-examples/.classpath
labs/jbossrules/trunk/drools-process/drools-bam/.classpath
labs/jbossrules/trunk/drools-process/drools-bpmn2/.classpath
labs/jbossrules/trunk/drools-process/drools-bpmn2/.project
labs/jbossrules/trunk/drools-process/drools-bpmn2/pom.xml
labs/jbossrules/trunk/drools-process/drools-gwt-console/.classpath
labs/jbossrules/trunk/drools-process/drools-gwt-form/.classpath
labs/jbossrules/trunk/drools-process/drools-gwt-graph/.classpath
labs/jbossrules/trunk/drools-process/drools-gwt-server-war/.classpath
labs/jbossrules/trunk/drools-process/drools-gwt-server-war/.project
labs/jbossrules/trunk/drools-process/drools-process-task/.classpath
labs/jbossrules/trunk/drools-process/drools-workitems/.classpath
labs/jbossrules/trunk/drools-server/.classpath
labs/jbossrules/trunk/drools-simulator/.classpath
labs/jbossrules/trunk/drools-templates/.classpath
labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-templates/pom.xml
labs/jbossrules/trunk/drools-verifier/.classpath
labs/jbossrules/trunk/drools-vsm/.classpath
labs/jbossrules/trunk/pom.xml
Log:
JBRULES-2351 OSGi Ready
-adding in spring based osgi tests
Added: labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/.classpath
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/.classpath (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -0,0 +1,84 @@
+<classpath>
+ <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="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="var" path="M2_REPO/javax/activation/com.springsource.javax.activation/1.1.1/com.springsource.javax.activation-1.1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/jms/com.springsource.javax.jms/1.1.0/com.springsource.javax.jms-1.1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/xml/bind/com.springsource.javax.xml.bind/2.1.7/com.springsource.javax.xml.bind-2.1.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/xml/stream/com.springsource.javax.xml.stream/1.0.1/com.springsource.javax.xml.stream-1.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.1.3/antlr-runtime-3.1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/msv/com.springsource.com.sun.msv.datatype/0.0.0.20041122/com.springsource.com.sun.msv.datatype-0.0.0.20041122.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/xml/com.springsource.com.sun.tools.xjc/2.1.7/com.springsource.com.sun.tools.xjc-2.1.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/xml/com.springsource.com.sun.xml.bind/2.1.7/com.springsource.com.sun.xml.bind-2.1.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/xml/com.springsource.com.sun.xml.bind.jaxb1/2.1.7/com.springsource.com.sun.xml.bind.jaxb1-2.1.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/xml/com.springsource.com.sun.xml.fastinfoset/1.2.2/com.springsource.com.sun.xml.fastinfoset-1.2.2.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/freemarker/com.springsource.freemarker/2.3.15/com.springsource.freemarker-2.3.15.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/com.springsource.javassist/3.9.0.GA/com.springsource.javassist-3.9.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/junit/com.springsource.junit/3.8.2/com.springsource.junit-3.8.2.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/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/aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/com.springsource.org.apache.commons.beanutils/1.8.0/com.springsource.org.apache.commons.beanutils-1.8.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/com.springsource.org.apache.commons.collections/3.2.1/com.springsource.org.apache.commons.collections-3.2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/com.springsource.org.apache.commons.digester/1.8.1/com.springsource.org.apache.commons.digester-1.8.1.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/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/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/poi/com.springsource.org.apache.poi/3.0.2.FINAL/com.springsource.org.apache.poi-3.0.2.FINAL.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/dom4j/com.springsource.org.dom4j/1.6.1/com.springsource.org.dom4j-1.6.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sourceforge/iso-relax/com.springsource.org.iso_relax.verifier/0.0.0.20041111/com.springsource.org.iso_relax.verifier-0.0.0.20041111.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/jvnet/staxex/com.springsource.org.jvnet.staxex/1.0.0/com.springsource.org.jvnet.staxex-1.0.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/objectweb/asm/com.springsource.org.objectweb.asm/2.2.3/com.springsource.org.objectweb.asm-2.2.3.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/relaxng/com.springsource.org.relaxng.datatype/1.0.0/com.springsource.org.relaxng.datatype-1.0.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.juli/1.5.10/com.springsource.slf4j.juli-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/slf4j/com.springsource.slf4j.org.apache.commons.logging/1.5.10/com.springsource.slf4j.org.apache.commons.logging-1.5.10.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/drools/drools-api/5.1.0.SNAPSHOT/drools-api-5.1.0.SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/drools/drools-core/5.1.0.SNAPSHOT/drools-core-5.1.0.SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/drools/drools-decisiontables/5.1.0.SNAPSHOT/drools-decisiontables-5.1.0.SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/drools/drools-templates/5.1.0.SNAPSHOT/drools-templates-5.1.0.SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/gunit/3.1.3/gunit-3.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/eclipse/equinox/weaving/hook/1.0.0-200905031323/hook-1.0.0-200905031323.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/junit/junit/4.6/junit-4.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/equinox/org.eclipse.osgi/3.5/org.eclipse.osgi-3.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/equinox/org.eclipse.osgi.services/3.5/org.eclipse.osgi.services-3.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/org.springframework.aop/3.0.0.RELEASE/org.springframework.aop-3.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/org.springframework.asm/3.0.0.RELEASE/org.springframework.asm-3.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/org.springframework.aspects/3.0.0.RELEASE/org.springframework.aspects-3.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-3.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-3.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/org.springframework.context.support/3.0.0.RELEASE/org.springframework.context.support-3.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-3.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/org.springframework.expression/3.0.0.RELEASE/org.springframework.expression-3.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/osgi/org.springframework.osgi.core/1.2.1/org.springframework.osgi.core-1.2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/osgi/org.springframework.osgi.extender/1.2.1/org.springframework.osgi.extender-1.2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/osgi/org.springframework.osgi.extensions.annotation/1.2.1/org.springframework.osgi.extensions.annotation-1.2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/osgi/org.springframework.osgi.io/1.2.1/org.springframework.osgi.io-1.2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/osgi/org.springframework.osgi.test/1.2.1/org.springframework.osgi.test-1.2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/org.springframework.test/3.0.0.RELEASE/org.springframework.test-3.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2/stringtemplate-3.2.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+</classpath>
\ No newline at end of file
Added: labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/.project
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/.project (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/.project 2010-02-12 13:33:02 UTC (rev 31606)
@@ -0,0 +1,20 @@
+<projectDescription>
+ <name>org.drools.osgi.test</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/org.drools.osgi.test/pom.xml
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/pom.xml (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/pom.xml 2010-02-12 13:33:02 UTC (rev 31606)
@@ -0,0 +1,54 @@
+<?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>bundle-repository</artifactId>
+ <groupId>org.drools</groupId>
+ <version>5.1.0.SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.drools</groupId>
+ <artifactId>org.drools.osgi.test</artifactId>
+ <packaging>jar</packaging>
+ <name>Spring OSGi Test</name>
+ <version>5.1.0.SNAPSHOT</version>
+ <url>http://drools.org</url>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <systemPropertyVariables>
+ <propertyName>propertyValue</propertyName>
+ <buildDirectory>${project.build.directory}</buildDirectory>
+ <eclipse.target.area>../plugins</eclipse.target.area>
+ <eclipse.workspace.area>../..</eclipse.workspace.area>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org.drools:org.drools.osgi.wrapper.mvel2</exclude>
+ <exclude>org.drools:org.drools.osgi.wrapper.milyn-smooks-javabean</exclude>
+ <exclude>org.drools:org.drools.osgi.wrapper.jxls-reader</exclude>
+ <exclude>org.mvel:mvel2</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+</project>
Added: labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/main/resources/META-INF/spring/bundle-context-osgi.xml (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/main/resources/META-INF/spring/bundle-context-osgi.xml 2010-02-12 13:33:02 UTC (rev 31606)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:osgi="http://www.springframework.org/schema/osgi"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
+
+ <!-- definitions using elements of the osgi namespace can be included
+ in this file. There is no requirement to keep these definitions
+ in a separate file if you do not want to. The rationale for
+ keeping these definitions separate is to facilitate integration
+ testing of the bundle outside of an OSGi container -->
+</beans>
\ No newline at end of file
Added: labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/main/resources/META-INF/spring/bundle-context.xml (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/main/resources/META-INF/spring/bundle-context.xml 2010-02-12 13:33:02 UTC (rev 31606)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <!-- regular spring configuration file defining the beans for this
+ bundle. The configuration of OSGi definitions is kept in a separate
+ configuration file so that this file can easily be used
+ for integration testing outside of an OSGi environment -->
+</beans>
\ No newline at end of file
Added: labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/main/resources/log4j.properties
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/main/resources/log4j.properties (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/main/resources/log4j.properties 2010-02-12 13:33:02 UTC (rev 31606)
@@ -0,0 +1,9 @@
+l
+og4j.rootCategory=INFO, stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
++log4j.appender.stdout.layout.ConversionPattern=%t %p [%c] - %m%n
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.threshold=TRACE
+
+#log4j.logger.org.springframework.osgi=DEBUG
+#log4j.logger.org.springframework=DEBUG
\ No newline at end of file
Added: labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/SimpleOsgiTest.java
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/SimpleOsgiTest.java (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/SimpleOsgiTest.java 2010-02-12 13:33:02 UTC (rev 31606)
@@ -0,0 +1,151 @@
+package org.drools.osgi.integrationtests;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.drools.KnowledgeBase;
+import org.drools.KnowledgeBaseConfiguration;
+import org.drools.KnowledgeBaseFactoryService;
+import org.drools.builder.KnowledgeBuilder;
+import org.drools.builder.KnowledgeBuilderConfiguration;
+import org.drools.builder.KnowledgeBuilderFactoryService;
+import org.drools.builder.ResourceType;
+import org.test.decisiontable.Test;
+import org.drools.io.ResourceFactoryService;
+import org.drools.osgi.test.AbstractDroolsSpringDMTest;
+import org.drools.runtime.StatefulKnowledgeSession;
+import org.drools.util.ServiceRegistry;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
+import org.springframework.osgi.util.OsgiStringUtils;
+import org.test.Cheese;
+import org.test.Person;
+
+public class SimpleOsgiTest extends AbstractDroolsSpringDMTest {
+
+ public void testOsgiPlatformStarts() throws Exception {
+ System.out.println( bundleContext.getProperty( Constants.FRAMEWORK_VENDOR ) );
+ System.out.println( bundleContext.getProperty( Constants.FRAMEWORK_VERSION ) );
+ System.out.println( bundleContext.getProperty( Constants.FRAMEWORK_EXECUTIONENVIRONMENT ) );
+ }
+
+ public void testOsgiEnvironment() throws Exception {
+ Bundle[] bundles = bundleContext.getBundles();
+ System.out.println( "bundles: " );
+ for ( int i = 0; i < bundles.length; i++ ) {
+ System.out.print( OsgiStringUtils.nullSafeName( bundles[i] ) );
+ System.out.print( ", " );
+ }
+ System.out.println();
+ }
+
+ public void testCompiler() {
+ ServiceReference serviceRef = bundleContext.getServiceReference( ServiceRegistry.class.getName() );
+ ServiceRegistry registry = (ServiceRegistry) bundleContext.getService( serviceRef );
+
+ KnowledgeBuilderFactoryService knowledgeBuilderFactoryService = registry.get( KnowledgeBuilderFactoryService.class );
+ KnowledgeBaseFactoryService knowledgeBaseFactoryService = registry.get( KnowledgeBaseFactoryService.class );
+ ResourceFactoryService resourceFactoryService = registry.get( ResourceFactoryService.class );
+
+ String str = "";
+ str += "package org.test\n";
+ str += "import org.test.Person\n";
+ str += "global java.util.List list\n";
+ str += "rule rule1\n";
+ str += "when\n";
+ str += " $p : Person( age > 30 )\n";
+ str += "then\n";
+ str += " list.add($p);\n";
+ str += "end\n";
+
+ KnowledgeBuilderConfiguration kbConf = knowledgeBuilderFactoryService.newKnowledgeBuilderConfiguration( null,
+ getClass().getClassLoader() );
+
+ KnowledgeBuilder kbuilder = knowledgeBuilderFactoryService.newKnowledgeBuilder( kbConf );
+ ResourceFactoryService resource = resourceFactoryService;
+ kbuilder.add( resource.newByteArrayResource( str.getBytes() ),
+ ResourceType.DRL );
+
+ if ( kbuilder.hasErrors() ) {
+ System.out.println( kbuilder.getErrors() );
+ throw new RuntimeException( kbuilder.getErrors().toString() );
+ }
+
+ KnowledgeBaseConfiguration kbaseConf = knowledgeBaseFactoryService.newKnowledgeBaseConfiguration( null,
+ getClass().getClassLoader() );
+
+ KnowledgeBase kbase = knowledgeBaseFactoryService.newKnowledgeBase( kbaseConf );
+ kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
+ StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();
+ List list = new ArrayList();
+ ksession.setGlobal( "list",
+ list );
+
+ ksession.insert( new Person( "name",
+ 34 ) );
+ ksession.fireAllRules();
+ ksession.dispose();
+
+ assertEquals( 1,
+ list.size() );
+ assertEquals( new Person( "name",
+ 34 ),
+ list.get( 0 ) );
+
+ }
+
+ public void testDecisionTable() {
+ ServiceReference serviceRef = bundleContext.getServiceReference( ServiceRegistry.class.getName() );
+ ServiceRegistry registry = (ServiceRegistry) bundleContext.getService( serviceRef );
+
+ KnowledgeBuilderFactoryService knowledgeBuilderFactoryService = registry.get( KnowledgeBuilderFactoryService.class );
+ KnowledgeBaseFactoryService knowledgeBaseFactoryService = registry.get( KnowledgeBaseFactoryService.class );
+ ResourceFactoryService resourceFactoryService = registry.get( ResourceFactoryService.class );
+
+ KnowledgeBaseConfiguration kbaseConf = knowledgeBaseFactoryService.newKnowledgeBaseConfiguration( null,
+ getClass().getClassLoader() );
+
+ System.out.println( "test dtables started" );
+
+ KnowledgeBuilderConfiguration kbConf = knowledgeBuilderFactoryService.newKnowledgeBuilderConfiguration( null,
+ getClass().getClassLoader() );
+ KnowledgeBuilder kbuilder = knowledgeBuilderFactoryService.newKnowledgeBuilder( kbConf );
+ kbuilder.add( resourceFactoryService.newClassPathResource( "changeset1Test.xml",
+ Test.class ),
+ ResourceType.CHANGE_SET );
+
+ kbaseConf = knowledgeBaseFactoryService.newKnowledgeBaseConfiguration( null,
+ getClass().getClassLoader() );
+ KnowledgeBase kbase = knowledgeBaseFactoryService.newKnowledgeBase( kbaseConf );
+ kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
+
+ StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();
+ List list = new ArrayList();
+ ksession.setGlobal( "list",
+ list );
+
+ ksession.insert( new Cheese( "cheddar",
+ 42 ) );
+ ksession.insert( new Person( "michael",
+ "stilton",
+ 25 ) );
+
+ ksession.fireAllRules();
+ ksession.dispose();
+
+ assertEquals( 3,
+ list.size() );
+
+ assertEquals( "Young man cheddar",
+ list.get( 0 ) );
+
+ assertEquals( "rule1",
+ list.get( 1 ) );
+ assertEquals( "rule2",
+ list.get( 2 ) );
+
+ System.out.println( "test dtables ended" );
+ }
+
+}
\ No newline at end of file
Added: labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/test/AbstractDroolsSpringDMTest.java
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/test/AbstractDroolsSpringDMTest.java (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/test/AbstractDroolsSpringDMTest.java 2010-02-12 13:33:02 UTC (rev 31606)
@@ -0,0 +1,91 @@
+package org.drools.osgi.test;
+
+import org.drools.osgi.test.utils.EclipseWorkspaceArtifactLocator;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.core.io.Resource;
+import org.springframework.osgi.test.AbstractConfigurableBundleCreatorTests;
+import org.springframework.osgi.test.platform.OsgiPlatform;
+import org.springframework.osgi.test.provisioning.ArtifactLocator;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+/**
+ * Abstract Base Class for JUnit Tests in a OSGI Environment
+ *
+ * @author Frederic Conrotte
+ * @author Jan Blanckenhorn
+ */
+
+public abstract class AbstractDroolsSpringDMTest extends AbstractConfigurableBundleCreatorTests {
+ private static final String TEST_FRAMEWORK_BUNDLES_CONF_FILE = "/boot-bundles.properties";
+ private ArtifactLocator m_MavenArtifactLocator, m_EclipseArtifactLocator;
+
+ protected void onSetUp() throws Exception
+ {
+
+ }
+
+
+ @Override
+ /*
+ * define OSGI/Equinox Properties which are set while starting up OSGI
+ */
+ protected OsgiPlatform createPlatform() {
+ System.setProperty( "osgi.console",
+ "9000" );
+ System.setProperty( "osgi.framework.extensions",
+ "osgi.framework.extensions" );
+ return super.createPlatform();
+ }
+
+ @Override
+ protected Resource getTestingFrameworkBundlesConfiguration() {
+ return new InputStreamResource( AbstractDroolsSpringDMTest.class.getResourceAsStream( TEST_FRAMEWORK_BUNDLES_CONF_FILE ) );
+ }
+
+ /**
+ * Use Eclipse artifact locator as default, falls back on Maven artifact
+ * locator in artifact is not found.
+ */
+ protected Resource locateBundle(String bundleId) {
+ Assert.hasText( bundleId,
+ "bundleId should not be empty" );
+
+ Resource result = null;
+
+ // parse the String
+ String[] artifactId = StringUtils.commaDelimitedListToStringArray( bundleId );
+
+ Assert.isTrue( artifactId.length >= 3,
+ "the CSV string " + bundleId + " contains too few values" );
+ // TODO: add a smarter mechanism which can handle 1 or 2 values CSVs
+ for ( int i = 0; i < artifactId.length; i++ ) {
+ artifactId[i] = StringUtils.trimWhitespace( artifactId[i] );
+ }
+
+ if ( m_EclipseArtifactLocator == null ) m_EclipseArtifactLocator = new EclipseWorkspaceArtifactLocator();
+
+ result = (artifactId.length == 3 ? m_EclipseArtifactLocator.locateArtifact( artifactId[0],
+ artifactId[1],
+ artifactId[2] ) : m_EclipseArtifactLocator.locateArtifact( artifactId[0],
+ artifactId[1],
+ artifactId[2],
+ artifactId[3] ));
+
+ if ( result == null ) {
+ if ( m_MavenArtifactLocator == null ) m_MavenArtifactLocator = getLocator();
+
+ result = (artifactId.length == 3 ? m_MavenArtifactLocator.locateArtifact( artifactId[0],
+ artifactId[1],
+ artifactId[2] ) : m_MavenArtifactLocator.locateArtifact( artifactId[0],
+ artifactId[1],
+ artifactId[2],
+ artifactId[3] ));
+ }
+
+ if ( result == null ) throw new IllegalStateException( bundleId + " not found" );
+
+ return result;
+ }
+
+}
Added: labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/test/utils/EclipseArtifactFinder.java
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/test/utils/EclipseArtifactFinder.java (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/test/utils/EclipseArtifactFinder.java 2010-02-12 13:33:02 UTC (rev 31606)
@@ -0,0 +1,332 @@
+package org.drools.osgi.test.utils;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileInputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+import java.util.jar.Attributes;
+import java.util.jar.JarFile;
+import java.util.jar.Manifest;
+
+import org.apache.log4j.Logger;
+import org.osgi.framework.Constants;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.core.io.Resource;
+
+/**
+ * Find a packaged and unpackaged artifact from Eclipse Workspace and Eclipse Target areas.
+ * Does not use groupId to resolve bundles.
+ *
+ * @author Frederic Conrotte
+ */
+public class EclipseArtifactFinder {
+
+ private static final Logger log = Logger.getLogger(EclipseArtifactFinder.class);
+
+ private static final String s_PROP_WORKSPACE_AREA = "eclipse.workspace.area";
+ private static final String s_PROP_TARGET_AREA = "eclipse.target.area";
+
+ private Set<Plugin> m_WorkspacePlugins = new HashSet<Plugin>();
+ private Set<Plugin> m_TargetPlugins = new HashSet<Plugin>();
+
+ private static final String FILE_SCHEME = "file:///";
+ private static final String REFERENCE_PROTOCOL = "reference";
+
+ private final FileFilter m_DirectoryFilter = new FileFilter() {
+ public boolean accept(File file) {
+ return file.isDirectory();
+ }
+ };
+
+ private final FileFilter m_JARFileFilter = new FileFilter() {
+ public boolean accept(File file) {
+ String fileExtension = getExtension(file.getName());
+ return file.isFile() && "jar".equals(fileExtension);
+ }
+
+ private String getExtension(String fileName) {
+ String ext;
+
+ int dotPlace = fileName.lastIndexOf('.');
+
+ if (dotPlace >= 0)
+ ext = fileName.substring( dotPlace + 1 );
+ else
+ ext = "";
+
+ return ext;
+ }
+ };
+
+ private final FileFilter m_ManifestDirectoryFilter = new FileFilter() {
+ public boolean accept(File file) {
+ return file.isDirectory() && "META-INF".equalsIgnoreCase(file.getName());
+ }
+ };
+
+ private FilenameFilter m_ManifestFilter = new FilenameFilter(){
+
+ public boolean accept(File file, String aName) {
+ return "MANIFEST.MF".equals(aName);
+ }
+ };
+
+ /**
+ * Quick model for an Eclipse plugin
+ */
+ private class Plugin
+ {
+ private String m_BundleSymbolicName, m_BundleVersion;
+ private Resource m_Path;
+ private boolean m_IsExploded;
+
+ public Plugin(String aBundleSymbolicName, String aVersion, Resource aPath, boolean isExploded)
+ {
+ m_BundleSymbolicName = aBundleSymbolicName;
+ m_BundleVersion = aVersion;
+ m_Path = aPath;
+ m_IsExploded = isExploded;
+ }
+
+ public boolean isExploded() {
+ return m_IsExploded;
+ }
+
+ public boolean match(String artifactId, String version)
+ {
+ return m_BundleSymbolicName.equals(artifactId) && m_BundleVersion.startsWith(version);
+ }
+
+ public String getBundleSymbolicName() {
+ return m_BundleSymbolicName;
+ }
+
+ public void setBundleSymbolicName(String aBundleSymbolicName) {
+ m_BundleSymbolicName = aBundleSymbolicName;
+ }
+
+ public String getBundleVersion() {
+ return m_BundleVersion;
+ }
+
+ public void setBundleVersion(String aBundleVersion) {
+ m_BundleVersion = aBundleVersion;
+ }
+
+ public Resource getPath() {
+ return m_Path;
+ }
+
+ public void setPath(Resource aPath) {
+ m_Path = aPath;
+ }
+
+ @Override
+ public boolean equals(Object aOther) {
+ if (aOther instanceof Plugin == false)
+ return false;
+
+ if (this == aOther)
+ return true;
+
+ Plugin rhs = (Plugin) aOther;
+
+ return m_BundleSymbolicName.equals(rhs.getBundleSymbolicName()) && m_BundleVersion.equals(rhs.getBundleVersion()) && m_Path.equals(rhs.getPath());
+ }
+
+ @Override
+ public int hashCode() {
+ return m_BundleSymbolicName.hashCode() + m_BundleVersion.hashCode() + m_Path.hashCode();
+ }
+
+ @Override
+ public String toString() {
+ return m_BundleSymbolicName + " " + m_BundleVersion;
+ }
+ }
+
+ public Resource findArtifact(String aArtifactId, String aVersion) throws IOException {
+
+ if (m_WorkspacePlugins.isEmpty()) {
+
+ File folder = getEclipseWorkspace();
+ if (folder != null)
+ importPluginFromFolder(folder, m_WorkspacePlugins);
+ }
+
+ if (m_TargetPlugins.isEmpty()) {
+
+ File[] folders = getEclipseTarget();
+
+ for (File folder : folders)
+ importPluginFromFolder(folder, m_TargetPlugins);
+
+ }
+
+ for (Plugin plugin : m_WorkspacePlugins) {
+ if (plugin.match(aArtifactId, aVersion))
+ {
+ if (plugin.isExploded())
+ return getExplodedPluginResource(plugin);
+ else
+ return getJARPluginResource(plugin);
+ }
+ }
+
+ for (Plugin plugin : m_TargetPlugins) {
+ if (plugin.match(aArtifactId, aVersion))
+ {
+ if (plugin.isExploded())
+ return getExplodedPluginResource(plugin);
+ else
+ return getJARPluginResource(plugin);
+ }
+ }
+
+ return null;
+ }
+
+ private void importPluginFromFolder(File folder, Set<Plugin> plugins) throws IOException {
+
+ log.info("Importing plugins from folder " + folder.getAbsolutePath());
+
+ Set<Resource> eclipseProjects = new HashSet<Resource>();
+
+ // Scan plugins exploded as unpacked JAR directories
+ for (File projectFolder : folder.listFiles(m_DirectoryFilter))
+ eclipseProjects.add(new FileSystemResource(projectFolder));
+
+ for (Resource resource : eclipseProjects) {
+ Manifest man = getManifestFromProject(resource);
+ if (man != null)
+ addPlugin(plugins, resource, man, true);
+ }
+
+ Set<Resource> packagedBundles = new HashSet<Resource>();
+
+ // Scan plugins provided as JAR files
+ for (File jarFile : folder.listFiles(m_JARFileFilter))
+ packagedBundles.add(new FileSystemResource(jarFile));
+
+ for (Resource resource : packagedBundles) {
+ Manifest man = getManifestFromJAR(resource);
+ if (man != null)
+ addPlugin(plugins, resource, man, false);
+ }
+ }
+
+ private void addPlugin(Set<Plugin> plugins, Resource resource, Manifest man, boolean isExploded) {
+ // read the manifest
+ Attributes attrs = man.getMainAttributes();
+ String symbolicName = attrs.getValue(Constants.BUNDLE_SYMBOLICNAME);
+
+ if (symbolicName != null)
+ {
+ symbolicName = symbolicName.replace("singleton:=true", "");
+ symbolicName = symbolicName.trim().replace(";", "");
+
+ String version = attrs.getValue(Constants.BUNDLE_VERSION);
+
+ if (symbolicName != null && version != null)
+ plugins.add(new Plugin(symbolicName, version, resource, isExploded));
+ }
+ }
+
+ private Resource getJARPluginResource(Plugin aPlugin) throws IOException {
+ return new FileSystemResource(aPlugin.getPath().getFile());
+ }
+
+ private Resource getExplodedPluginResource(Plugin plugin) throws IOException {
+
+ URL url = new URL(REFERENCE_PROTOCOL, null, FILE_SCHEME + plugin.getPath().getFile().getCanonicalPath() + File.separator + "target" + File.separator + "classes");
+
+ return new UnpackedOSGiBundleResource(url);
+ }
+
+ /**
+ * Return an Eclipse project's Manifest
+ * @param aResource an Eclipse project resource path
+ * @return The project Manifest, null if none exist
+ * @throws IOException
+ */
+ private Manifest getManifestFromProject(Resource aResource) throws IOException {
+
+ try {
+ for (File manifestFolder : aResource.getFile().listFiles(m_ManifestDirectoryFilter)) {
+ for (File manifestFile : manifestFolder.listFiles(m_ManifestFilter))
+ return new Manifest(new FileInputStream(manifestFile));
+ }
+ } catch (IOException aEx) {
+ log.error("Problem reading MANIFEST.MF from resource" + aResource.getFilename());
+ throw aEx;
+ }
+
+ return null;
+ }
+
+ /**
+ * Return an Eclipse bundle's JAR Manifest
+ * @param aResource an Eclipse JAR path
+ * @return The JAR Manifest
+ * @throws IOException
+ */
+ private Manifest getManifestFromJAR(Resource aResource) throws IOException {
+ JarFile jar = new JarFile(aResource.getFile());
+ return jar.getManifest();
+ }
+
+ private File getEclipseWorkspace() {
+
+ String workspaceAreaProp = System.getProperty(s_PROP_WORKSPACE_AREA, "../..");
+
+ System.out.println( "workspace area: " + workspaceAreaProp );
+
+ if (workspaceAreaProp != null)
+ return new File(workspaceAreaProp);
+ else
+ return null;
+
+ }
+
+ private File[] getEclipseTarget() {
+
+ List<File> result = new ArrayList<File>();
+
+ Properties props = System.getProperties();
+
+ for (Iterator<Object> iterator = props.keySet().iterator(); iterator.hasNext();) {
+ String prop = (String) iterator.next();
+ if (prop.startsWith(s_PROP_TARGET_AREA))
+ {
+ System.out.println( "target area: " + System.getProperty(prop) );
+ File f = new File(System.getProperty(prop));
+ if ( !f.isDirectory() ) {
+ throw new IllegalStateException(s_PROP_TARGET_AREA + " not set.");
+ }
+ result.add(f);
+ }
+ }
+
+ if (result.isEmpty()) {
+ File f = new File( "../plugins" );
+ if ( !f.isDirectory() ) {
+ throw new IllegalStateException(s_PROP_TARGET_AREA + " not set.");
+ }
+ result.add( f );
+ }
+
+ if (result.size() == 0)
+ throw new IllegalStateException(s_PROP_TARGET_AREA + " not set.");
+ else
+ return result.toArray(new File[]{});
+
+ }
+
+}
Added: labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/test/utils/EclipseWorkspaceArtifactLocator.java
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/test/utils/EclipseWorkspaceArtifactLocator.java (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/test/utils/EclipseWorkspaceArtifactLocator.java 2010-02-12 13:33:02 UTC (rev 31606)
@@ -0,0 +1,73 @@
+package org.drools.osgi.test.utils;
+import java.io.IOException;
+
+import org.apache.log4j.Logger;
+import org.springframework.core.io.Resource;
+import org.springframework.osgi.test.provisioning.ArtifactLocator;
+
+/**
+ * Locator for artifacts found in the local Eclipse plugins workspace and
+ * target. Does <strong>not</strong> use Eclipse PDE, it rather
+ * uses the Eclipse patterns and conventions to identify the artifacts.
+ *
+ * It gives priority to workspace bundle over target bundles.
+ *
+ * @author Frederic Conrotte
+ *
+ */
+public class EclipseWorkspaceArtifactLocator implements ArtifactLocator {
+
+ private static final Logger log = Logger
+ .getLogger(EclipseWorkspaceArtifactLocator.class);
+
+ private EclipseArtifactFinder m_ArtifactFinder = new EclipseArtifactFinder();
+
+ /**
+ * Find an artifact in the list of bundles from current Eclipse Workspace.
+ *
+ * @param groupId
+ * - not used
+ * @param artifactId
+ * - the artifact id of the bundle (required)
+ * @param version
+ * - the version of the bundle (can be null)
+ * @return the String representing the URL location of this bundle
+ */
+ public Resource locateArtifact(String groupId, String artifactId,
+ String version) {
+ return locateArtifact(groupId, artifactId, version,
+ DEFAULT_ARTIFACT_TYPE);
+ }
+
+ public Resource locateArtifact(String groupId, String artifactId,
+ String version, String type) {
+ return localEclipseWorkspaceArtifact(artifactId, version);
+ }
+
+ /**
+ * Locate an artifact in an Eclipse Workspace
+ *
+ * @param artifactId
+ * - the artifact id of the bundle (required)
+ * @param version
+ * - the version of the bundle (can be null)
+ * @return Resource corresponding to the located Eclipse bundle
+ */
+ private Resource localEclipseWorkspaceArtifact(String aArtifactId,
+ String aVersion) {
+ try {
+ Resource res = m_ArtifactFinder.findArtifact(aArtifactId, aVersion);
+ if (res != null && log.isDebugEnabled()) {
+ log.debug("[" + aArtifactId + "|" + aVersion + "] resolved to "
+ + res.getDescription() + " as a Eclipse artifact");
+ }
+ return res;
+ } catch (IOException ioEx) {
+ throw (RuntimeException) new IllegalStateException("Artifact "
+ + aArtifactId + "-" + aVersion + " could not be found")
+ .initCause(ioEx);
+ }
+
+ }
+
+}
Added: labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/test/utils/UnpackedOSGiBundleResource.java
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/test/utils/UnpackedOSGiBundleResource.java (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/drools/osgi/test/utils/UnpackedOSGiBundleResource.java 2010-02-12 13:33:02 UTC (rev 31606)
@@ -0,0 +1,88 @@
+package org.drools.osgi.test.utils;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+import org.springframework.core.io.UrlResource;
+
+public class UnpackedOSGiBundleResource extends UrlResource {
+
+ public UnpackedOSGiBundleResource(URL aUrl) {
+ super( aUrl );
+ // copy META-INF and build.properties
+ File file = new File( aUrl.getPath().substring( "file:///".length() ));
+
+ File targetMetaInfDir = new File( file,
+ "META-INF" );
+ targetMetaInfDir.mkdir();
+ File targetMetaInf = new File( targetMetaInfDir,
+ "MANIFEST.MF" );
+
+ File sourceMetaInfDir = new File( new File( new File( file.getParent() ).getParent() ),
+ "META-INF" );
+ File sourceMetaInf = new File( sourceMetaInfDir,
+ "MANIFEST.MF" );
+
+ copyfile( sourceMetaInf,
+ targetMetaInf );
+
+ File sourceBuildProperties = new File (new File( file.getParent() ).getParent(), "build.properties" );
+ File targetBuildProperties = new File (file, "build.properties" );
+
+ copyfile( sourceBuildProperties,
+ targetBuildProperties );
+ }
+
+ @Override
+ public InputStream getInputStream() throws IOException {
+ return super.getURL().openStream();
+ }
+
+ private void copyfile(File f1,
+ File f2) {
+ InputStream in = null;
+ OutputStream out = null;
+ try {
+ in = new FileInputStream( f1 );
+
+ //For Overwrite the file.
+ out = new FileOutputStream( f2 );
+
+ byte[] buf = new byte[1024];
+ int len;
+ while ( (len = in.read( buf )) > 0 ) {
+ out.write( buf,
+ 0,
+ len );
+ }
+
+ } catch ( FileNotFoundException ex ) {
+ throw new RuntimeException("Unable to copy file from '" + f1.getAbsolutePath() + " to " + f2.getAbsolutePath(), ex );
+ } catch ( IOException e ) {
+ throw new RuntimeException("Unable to copy file from '" + f1.getAbsolutePath() + " to " + f2.getAbsolutePath(), e );
+ } finally {
+ if ( in != null ) {
+ try {
+ in.close();
+ } catch ( IOException e ) {
+ throw new RuntimeException("Unable to close Input stream", e );
+ } finally {
+ if ( out != null ) {
+ try {
+ out.close();
+ } catch ( IOException e ) {
+ throw new RuntimeException("Unable to close Input stream", e );
+ }
+ }
+ }
+ }
+ }
+ }
+}
Added: labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/test/Cheese.java
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/test/Cheese.java (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/test/Cheese.java 2010-02-12 13:33:02 UTC (rev 31606)
@@ -0,0 +1,45 @@
+package org.test;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public class Cheese {
+ private String type;
+ private int price;
+
+ public Cheese() {
+
+ }
+ public Cheese(final String type,
+ final int price) {
+ super();
+ this.type = type;
+ this.price = price;
+ }
+
+ public int getPrice() {
+ return this.price;
+ }
+
+ public String getType() {
+ return this.type;
+ }
+
+ public void setPrice(final int price) {
+ this.price = price;
+ }
+
+}
\ No newline at end of file
Added: labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/test/Person.java
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/test/Person.java (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/test/Person.java 2010-02-12 13:33:02 UTC (rev 31606)
@@ -0,0 +1,137 @@
+package org.test;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public class Person {
+ private String name;
+ private String likes;
+ private int age;
+
+ private char sex;
+
+ private boolean alive;
+
+ private String status;
+
+ public Person() {
+
+ }
+
+ public Person(final String name) {
+ this( name,
+ "",
+ 0 );
+ }
+
+ public Person(final String name,
+ final int age) {
+ this( name,
+ "",
+ age );
+ }
+
+ public Person(final String name,
+ final String likes) {
+ this( name,
+ likes,
+ 0 );
+ }
+
+ public Person(final String name,
+ final String likes,
+ final int age) {
+ this.name = name;
+ this.likes = likes;
+ this.age = age;
+ }
+
+ public String getStatus() {
+ return this.status;
+ }
+
+ public void setStatus(final String status) {
+ this.status = status;
+ }
+
+ public String getLikes() {
+ return this.likes;
+ }
+
+ public String getName() {
+ return this.name;
+ }
+
+ public int getAge() {
+ return this.age;
+ }
+
+ public boolean isAlive() {
+ return this.alive;
+ }
+
+ public void setAlive(final boolean alive) {
+ this.alive = alive;
+ }
+
+ public char getSex() {
+ return this.sex;
+ }
+
+ public void setSex(final char sex) {
+ this.sex = sex;
+ }
+
+ public String toString() {
+ return "[Person name='" + this.name + "']";
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + age;
+ result = prime * result + (alive ? 1231 : 1237);
+ result = prime * result + ((likes == null) ? 0 : likes.hashCode());
+ result = prime * result + ((name == null) ? 0 : name.hashCode());
+ result = prime * result + sex;
+ result = prime * result + ((status == null) ? 0 : status.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if ( this == obj ) return true;
+ if ( obj == null ) return false;
+ if ( getClass() != obj.getClass() ) return false;
+ Person other = (Person) obj;
+ if ( age != other.age ) return false;
+ if ( alive != other.alive ) return false;
+ if ( likes == null ) {
+ if ( other.likes != null ) return false;
+ } else if ( !likes.equals( other.likes ) ) return false;
+ if ( name == null ) {
+ if ( other.name != null ) return false;
+ } else if ( !name.equals( other.name ) ) return false;
+ if ( sex != other.sex ) return false;
+ if ( status == null ) {
+ if ( other.status != null ) return false;
+ } else if ( !status.equals( other.status ) ) return false;
+ return true;
+ }
+
+
+}
\ No newline at end of file
Added: labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/test/decisiontable/Test.java
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/test/decisiontable/Test.java (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/java/org/test/decisiontable/Test.java 2010-02-12 13:33:02 UTC (rev 31606)
@@ -0,0 +1,5 @@
+package org.test.decisiontable;
+
+public class Test {
+
+}
Added: labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/resources/boot-bundles.properties
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/resources/boot-bundles.properties (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/resources/boot-bundles.properties 2010-02-12 13:33:02 UTC (rev 31606)
@@ -0,0 +1,141 @@
+#
+# Properties file indicating the boot (or mandatory) bundles that are loaded
+# by the testing framework.
+#
+
+#
+# format: <groupId,artifactId,version>=+/-15
+# - the optional value is used to install/remove bundles if running on JDK >= 1.5
+# - see Spring org.springframework.core.JdkVersion for jdk major version codes.
+
+# elements that have to be ignored should star with
+# ignore
+
+# Note: inner placeholders are not supported.
+
+#
+# common properties
+#
+
+
+# versioning
+ignore.drools.version=5.1.0.SNAPSHOT
+
+ignore.junit.version=3.8.2
+
+ignore.spring.version=3.0.0.RELEASE
+ignore.spring.osgi.version=1.2.1
+ignore.asm.version=2.2.3
+
+# groupIds
+ignore.spring.groupId=org.springframework
+ignore.spring.osgi.groupId=org.springframework.osgi
+
+#
+# actual libraries
+#
+
+# dependencies
+
+# Equinox Aspect bundles have to be started first
+org.aspectj,com.springsource.org.aspectj.runtime,1.6.8.RELEASE
+org.aspectj,com.springsource.org.aspectj.weaver,1.6.8.RELEASE
+org.eclipse.equinox.weaving,aspectj,1.0.0-200905031323
+org.eclipse.equinox.weaving,hook,1.0.0-200905031323
+
+# junit
+org.junit,com.springsource.junit,${ignore.junit.version}=
+
+
+
+#xerces
+
+
+
+#commons
+#org.apache.commons,com.springsource.org.apache.commons.lang,2.4.0
+org.apache.commons,com.springsource.org.apache.commons.collections,3.2.1
+org.apache.commons,com.springsource.org.apache.commons.beanutils,1.8.0
+org.apache.commons,com.springsource.org.apache.commons.digester,1.8.1
+net.sourceforge.jexcelapi,com.springsource.jxl,2.4.2
+
+#logging
+org.slf4j,com.springsource.slf4j.api,1.5.10
+org.slf4j,com.springsource.slf4j.log4j,1.5.3
+org.apache.log4j,com.springsource.org.apache.log4j,1.2.15
+org.apache.commons,com.springsource.org.apache.commons.logging,1.1.1
+
+#javax
+#javax.activation,com.springsource.javax.activation,1.1.1
+#javax.servlet,com.springsource.javax.servlet,2.5.0
+#javax.mail,com.springsource.javax.mail,1.4.0
+
+
+# misc
+org.antlr,com.springsource.org.antlr.runtime,3.1.3
+org.mvel,org.mvel2,2.0.16
+net.sf.jxls,org.drools.osgi.wrapper.jxls-reader,0.9.8
+org.apache.poi,com.springsource.org.apache.poi,3.0.2.FINAL
+
+# compilers
+org.apache.jasper.springsource,com.springsource.org.apache.jasper.org.eclipse.jdt.springsource,6.0.20.S2-r5956
+org.codehaus.janino,com.springsource.org.codehaus.janino,2.5.15
+
+# xstream
+javax.xml.stream,com.springsource.javax.xml.stream,1.0.1
+org.xmlpull,com.springsource.org.xmlpull,1.1.4.c
+com.thoughtworks.xstream,com.springsource.com.thoughtworks.xstream,1.3.1
+
+# xerces
+org.apache.xmlcommons,com.springsource.org.apache.xmlcommons,1.3.4
+org.apache.xml,com.springsource.org.apache.xml.resolver,1.2.0
+org.apache.xerces,com.springsource.org.apache.xerces,2.9.1
+
+# aop alliance
+org.aopalliance,com.springsource.org.aopalliance,1.0.0=
+# asm
+org.objectweb.asm,com.springsource.org.objectweb.asm,${ignore.asm.version}=
+org.springframework,org.springframework.asm,${ignore.spring.version}=
+
+
+# spring libs
+${ignore.spring.groupId},org.springframework.aop,${ignore.spring.version}=
+#${ignore.spring.groupId},org.springframework.aspects,${ignore.spring.version}=
+${ignore.spring.groupId},org.springframework.beans,${ignore.spring.version}=
+${ignore.spring.groupId},org.springframework.context,${ignore.spring.version}=
+${ignore.spring.groupId},org.springframework.context.support,${ignore.spring.version}=
+${ignore.spring.groupId},org.springframework.core,${ignore.spring.version}=
+${ignore.spring.groupId},org.springframework.expression,${ignore.spring.version}=
+#${ignore.spring.groupId},org.springframework.jdbc,${ignore.spring.version}=
+#${ignore.spring.groupId},org.springframework.orm,${ignore.spring.version}=
+${ignore.spring.groupId},org.springframework.test,${ignore.spring.version}=
+#${ignore.spring.groupId},org.springframework.transaction,${ignore.spring.version}=
+#${ignore.spring.groupId},org.springframework.web,${ignore.spring.version}=
+
+#Security
+#org.springframework.security,org.springframework.security,2.0.0.A=
+#org.springframework.security,org.springframework.security.annotation,2.0.0.A=
+#org.samba.jcifs,com.springsource.jcifs,1.2.15
+#org.apache.commons,com.springsource.org.apache.commons.codec,1.3.0
+
+# spring osgi libs
+${ignore.spring.osgi.groupId},org.springframework.osgi.io,${ignore.spring.osgi.version}=
+${ignore.spring.osgi.groupId},org.springframework.osgi.core,${ignore.spring.osgi.version}=
+#${ignore.spring.osgi.groupId},org.springframework.osgi.extensions.annotation,${ignore.spring.osgi.version}=+15
+${ignore.spring.osgi.groupId},org.springframework.osgi.extender,${ignore.spring.osgi.version}=
+${ignore.spring.osgi.groupId},org.springframework.osgi.test,${ignore.spring.osgi.version}=
+
+#equinox
+#org.eclipse.equinox,org.eclipse.equinox.http,1.0.200
+#org.eclipse.equinox,org.eclipse.equinox.cm,1.0.0
+
+#osgi
+org.eclipse.equinox,org.eclipse.osgi.services,3.5
+
+
+org.drools,org.drools.api,${ignore.drools.version}
+org.drools,org.drools.core,${ignore.drools.version}
+org.drools,org.drools.compiler,${ignore.drools.version}
+org.drools,org.drools.templates,${ignore.drools.version}
+org.drools,org.drools.decisiontables,${ignore.drools.version}
+
Added: labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/resources/log4j.properties
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/resources/log4j.properties (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/resources/log4j.properties 2010-02-12 13:33:02 UTC (rev 31606)
@@ -0,0 +1,8 @@
+log4j.rootCategory=INFO, stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout.ConversionPattern=%t %p [%c] - %m%n
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.threshold=TRACE
+
+#log4j.logger.org.springframework.osgi=DEBUG
+#log4j.logger.org.springframework=DEBUG
\ No newline at end of file
Added: labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/resources/org/test/decisiontable/IntegrationExampleTest.xls
===================================================================
(Binary files differ)
Property changes on: labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/resources/org/test/decisiontable/IntegrationExampleTest.xls
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/resources/org/test/decisiontable/changeset1Test.drl
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/resources/org/test/decisiontable/changeset1Test.drl (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/resources/org/test/decisiontable/changeset1Test.drl 2010-02-12 13:33:02 UTC (rev 31606)
@@ -0,0 +1,10 @@
+package org.drools.test
+
+global java.util.List list;
+
+rule "rule1"
+ salience 10
+when
+then
+ list.add( "rule1" );
+end
\ No newline at end of file
Added: labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/resources/org/test/decisiontable/changeset1Test.xml
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/resources/org/test/decisiontable/changeset1Test.xml (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/resources/org/test/decisiontable/changeset1Test.xml 2010-02-12 13:33:02 UTC (rev 31606)
@@ -0,0 +1,11 @@
+<change-set xmlns='http://drools.org/drools-5.0/change-set'
+ xmlns:xs='http://www.w3.org/2001/XMLSchema-instance'
+ xs:schemaLocation='http://drools.org/drools-5.0/change-set drools-change-set-5.0.xsd' >
+ <add>
+ <resource source='classpath:org/test/decisiontable/changeset1Test.drl' type='DRL' />
+ <resource source='classpath:org/test/decisiontable/IntegrationExampleTest.xls' type="DTABLE">
+ <decisiontable-conf input-type="XLS" worksheet-name="Tables_2" />
+ </resource>
+ <resource source='classpath:org/test/decisiontable/changeset2Test.drl' type='DRL' />
+ </add>
+</change-set>
\ No newline at end of file
Added: labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/resources/org/test/decisiontable/changeset2Test.drl
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/resources/org/test/decisiontable/changeset2Test.drl (rev 0)
+++ labs/jbossrules/trunk/bundle-repository/org.drools.osgi.test/src/test/resources/org/test/decisiontable/changeset2Test.drl 2010-02-12 13:33:02 UTC (rev 31606)
@@ -0,0 +1,10 @@
+package org.drools.test
+
+global java.util.List list;
+
+rule "rule2"
+ salience 5
+when
+then
+ list.add( "rule2" );
+end
\ No newline at end of file
Modified: labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/.classpath
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -1,6 +1,5 @@
<classpath>
<classpathentry kind="src" path="." including="build.properties" excluding="**/*.java"/>
- <classpathentry kind="src" path="META-INF" excluding="**/*.java"/>
<classpathentry kind="src" path="src/main/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"/>
@@ -12,6 +11,6 @@
<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/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/mvel/mvel2/2.0.16/mvel2-2.0.16.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/META-INF/MANIFEST.MF 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/META-INF/MANIFEST.MF 2010-02-12 13:33:02 UTC (rev 31606)
@@ -1,6 +1,62 @@
Manifest-Version: 1.0
+Export-Package: org.mvel2;uses:="org.mvel2.util,org.mvel2.conversion,o
+ rg.mvel2.integration.impl,org.mvel2.optimizers.impl.refl.nodes,org.mv
+ el2.integration,org.mvel2.compiler,org.mvel2.ast,org.mvel2.debug";ver
+ sion="2.0.16",org.mvel2.asm;version="2.0.16",org.mvel2.asm.signature;
+ version="2.0.16",org.mvel2.asm.util;uses:="org.mvel2.asm,org.mvel2.as
+ m.signature";version="2.0.16",org.mvel2.ast;uses:="org.mvel2.integrat
+ ion,org.mvel2.optimizers,org.mvel2,org.mvel2.debug,org.mvel2.compiler
+ ,org.mvel2.util,org.mvel2.math,org.mvel2.integration.impl";version="2
+ .0.16",org.mvel2.compiler;uses:="org.mvel2.integration,org.mvel2,org.
+ mvel2.ast,org.mvel2.util,org.mvel2.optimizers,org.mvel2.integration.i
+ mpl,org.mvel2.optimizers.impl.refl.nodes";version="2.0.16",org.mvel2.
+ conversion;uses:="org.mvel2,org.mvel2.util,org.mvel2.compiler";versio
+ n="2.0.16",org.mvel2.debug;uses:="org.mvel2.integration,org.mvel2.uti
+ l,org.mvel2.ast,org.mvel2.compiler,org.mvel2";version="2.0.16",org.mv
+ el2.integration;uses:="org.mvel2.ast";version="2.0.16",org.mvel2.inte
+ gration.impl;uses:="org.mvel2.integration,org.mvel2,org.mvel2.ast,org
+ .mvel2.util";version="2.0.16",org.mvel2.math;uses:="org.mvel2,org.mve
+ l2.debug,org.mvel2.util";version="2.0.16",org.mvel2.optimizers;uses:=
+ "org.mvel2,org.mvel2.util,org.mvel2.compiler,org.mvel2.integration,or
+ g.mvel2.optimizers.dynamic,org.mvel2.optimizers.impl.asm,org.mvel2.op
+ timizers.impl.refl";version="2.0.16",org.mvel2.optimizers.dynamic;use
+ s:="org.mvel2.compiler,org.mvel2.util,sun.misc,org.mvel2.integration,
+ org.mvel2.optimizers,org.mvel2,org.mvel2.optimizers.impl.asm";version
+ ="2.0.16",org.mvel2.optimizers.impl.asm;uses:="org.mvel2.integration,
+ org.mvel2.optimizers.impl.refl.nodes,org.mvel2.util,org.mvel2.asm,org
+ .mvel2.optimizers,org.mvel2,org.mvel2.compiler,org.mvel2.ast";version
+ ="2.0.16",org.mvel2.optimizers.impl.refl;uses:="org.mvel2.optimizers.
+ impl.refl.nodes,org.mvel2.integration,org.mvel2.util,org.mvel2.optimi
+ zers.impl.refl.collection,org.mvel2.optimizers,org.mvel2,org.mvel2.co
+ mpiler,org.mvel2.ast";version="2.0.16",org.mvel2.optimizers.impl.refl
+ .collection;uses:="org.mvel2.integration,org.mvel2.compiler,org.mvel2
+ ,org.mvel2.util";version="2.0.16",org.mvel2.optimizers.impl.refl.node
+ s;uses:="org.mvel2.integration,org.mvel2.compiler,org.mvel2,org.mvel2
+ .util,org.mvel2.ast,org.mvel2.optimizers";version="2.0.16",org.mvel2.
+ sh;uses:="org.mvel2,org.mvel2.templates,org.mvel2.integration.impl,or
+ g.mvel2.integration,org.mvel2.util,org.mvel2.sh.command.basic,org.mve
+ l2.sh.command.file";version="2.0.16",org.mvel2.sh.command.basic;uses:
+ ="org.mvel2.sh,org.mvel2.sh.text,org.mvel2.util,org.mvel2";version="2
+ .0.16",org.mvel2.sh.command.file;uses:="org.mvel2.sh";version="2.0.16
+ ",org.mvel2.sh.text;uses:="org.mvel2.util";version="2.0.16",org.mvel2
+ .templates;uses:="org.mvel2.templates.res,org.mvel2.templates.util,or
+ g.mvel2,org.mvel2.util,org.mvel2.integration.impl,org.mvel2.integrati
+ on,org.mvel2.templates.util.io";version="2.0.16",org.mvel2.templates.
+ res;uses:="org.mvel2.templates,org.mvel2.integration,org.mvel2.templa
+ tes.util,org.mvel2,org.mvel2.util,org.mvel2.integration.impl";version
+ ="2.0.16",org.mvel2.templates.util;uses:="org.mvel2.templates.res,org
+ .mvel2.templates,org.mvel2.util";version="2.0.16",org.mvel2.templates
+ .util.io;uses:="org.mvel2.templates.util,org.mvel2.util";version="2.0
+ .16",org.mvel2.util;uses:="org.mvel2.ast,org.mvel2.integration,org.mv
+ el2,org.mvel2.compiler,org.mvel2.integration.impl,org.mvel2.math,sun.
+ misc";version="2.0.16"
+Bundle-Version: 2.0.16
+Tool: Bnd-0.0.357
Bundle-Name: mvel2
-Created-By: 1.5.0_16 (Sun Microsystems Inc.)
+Bnd-LastModified: 1265663885274
+Created-By: 1.6.0_18 (Sun Microsystems Inc.)
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.mvel2
Import-Package: org.mvel2;version="2.0",org.mvel2.asm;version="2.0",or
g.mvel2.asm.signature;version="2.0",org.mvel2.asm.util;version="2.0",
org.mvel2.ast;version="2.0",org.mvel2.compiler;version="2.0",org.mvel
@@ -16,60 +72,5 @@
templates.res;version="2.0",org.mvel2.templates.util;version="2.0",or
g.mvel2.templates.util.io;version="2.0",org.mvel2.util;version="2.0",
sun.misc;resolution:=optional
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.drools.osgi.wrapper.mvel2
-Tool: Bnd-0.0.357
-Bnd-LastModified: 1263853170490
-Export-Package: org.mvel2;uses:="org.mvel2.util,org.mvel2.conversion,o
- rg.mvel2.optimizers.impl.refl.nodes,org.mvel2.compiler,org.mvel2.inte
- gration,org.mvel2.integration.impl,org.mvel2.ast,org.mvel2.debug";ver
- sion="2.0.12",org.mvel2.asm;version="2.0.12",org.mvel2.asm.signature;
- version="2.0.12",org.mvel2.asm.util;uses:="org.mvel2.asm,org.mvel2.as
- m.signature";version="2.0.12",org.mvel2.ast;uses:="org.mvel2,org.mvel
- 2.integration,org.mvel2.compiler,org.mvel2.debug,org.mvel2.util,org.m
- vel2.optimizers,org.mvel2.math,org.mvel2.integration.impl";version="2
- .0.12",org.mvel2.compiler;uses:="org.mvel2,org.mvel2.ast,org.mvel2.in
- tegration,org.mvel2.util,org.mvel2.optimizers,org.mvel2.integration.i
- mpl,org.mvel2.optimizers.impl.refl.nodes";version="2.0.12",org.mvel2.
- conversion;uses:="org.mvel2,org.mvel2.util,org.mvel2.compiler";versio
- n="2.0.12",org.mvel2.debug;uses:="org.mvel2.ast,org.mvel2.compiler,or
- g.mvel2.integration,org.mvel2.util,org.mvel2";version="2.0.12",org.mv
- el2.integration;uses:="org.mvel2.ast";version="2.0.12",org.mvel2.inte
- gration.impl;uses:="org.mvel2,org.mvel2.integration,org.mvel2.ast,org
- .mvel2.util";version="2.0.12",org.mvel2.math;uses:="org.mvel2,org.mve
- l2.debug,org.mvel2.util";version="2.0.12",org.mvel2.optimizers;uses:=
- "org.mvel2,org.mvel2.compiler,org.mvel2.util,org.mvel2.integration,or
- g.mvel2.optimizers.impl.asm,org.mvel2.optimizers.dynamic,org.mvel2.op
- timizers.impl.refl";version="2.0.12",org.mvel2.optimizers.dynamic;use
- s:="org.mvel2.compiler,sun.misc,org.mvel2.util,org.mvel2,org.mvel2.in
- tegration,org.mvel2.optimizers,org.mvel2.optimizers.impl.asm";version
- ="2.0.12",org.mvel2.optimizers.impl.asm;uses:="org.mvel2.asm,org.mvel
- 2.compiler,org.mvel2.integration,org.mvel2.util,org.mvel2.optimizers,
- org.mvel2,org.mvel2.ast,org.mvel2.optimizers.impl.refl.nodes";version
- ="2.0.12",org.mvel2.optimizers.impl.refl;uses:="org.mvel2.compiler,or
- g.mvel2.integration,org.mvel2.optimizers.impl.refl.collection,org.mve
- l2.util,org.mvel2.optimizers,org.mvel2,org.mvel2.ast,org.mvel2.optimi
- zers.impl.refl.nodes";version="2.0.12",org.mvel2.optimizers.impl.refl
- .collection;uses:="org.mvel2.integration,org.mvel2.compiler,org.mvel2
- ,org.mvel2.util";version="2.0.12",org.mvel2.optimizers.impl.refl.node
- s;uses:="org.mvel2.integration,org.mvel2.compiler,org.mvel2,org.mvel2
- .util,org.mvel2.ast,org.mvel2.optimizers";version="2.0.12",org.mvel2.
- sh;uses:="org.mvel2,org.mvel2.templates,org.mvel2.integration,org.mve
- l2.util,org.mvel2.sh.command.basic,org.mvel2.integration.impl,org.mve
- l2.sh.command.file";version="2.0.12",org.mvel2.sh.command.basic;uses:
- ="org.mvel2.sh,org.mvel2.sh.text,org.mvel2.util,org.mvel2";version="2
- .0.12",org.mvel2.sh.command.file;uses:="org.mvel2.sh";version="2.0.12
- ",org.mvel2.sh.text;uses:="org.mvel2.util";version="2.0.12",org.mvel2
- .templates;uses:="org.mvel2.templates.res,org.mvel2,org.mvel2.templat
- es.util,org.mvel2.util,org.mvel2.templates.util.io,org.mvel2.integrat
- ion,org.mvel2.integration.impl";version="2.0.12",org.mvel2.templates.
- res;uses:="org.mvel2,org.mvel2.integration,org.mvel2.templates.util,o
- rg.mvel2.util,org.mvel2.templates,org.mvel2.integration.impl";version
- ="2.0.12",org.mvel2.templates.util;uses:="org.mvel2.util,org.mvel2.te
- mplates.res,org.mvel2.templates";version="2.0.12",org.mvel2.templates
- .util.io;uses:="org.mvel2.templates.util,org.mvel2.util";version="2.0
- .12",org.mvel2.util;uses:="org.mvel2.ast,org.mvel2.integration,org.mv
- el2,org.mvel2.compiler,org.mvel2.integration.impl,org.mvel2.math,sun.
- misc";version="2.0.12"
-Bundle-Version: 2.0.12
+Originally-Created-By: 1.6.0_18 (Sun Microsystems Inc.)
Modified: labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/pom.xml
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/pom.xml 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/pom.xml 2010-02-12 13:33:02 UTC (rev 31606)
@@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.drools</groupId>
<artifactId>org.drools.osgi.wrapper.mvel2</artifactId>
- <version>2.0.12</version>
+ <version>2.0.16</version>
<packaging>jar</packaging>
<name>Drools :: OSGi :: Wrapper :: MVEL2</name>
@@ -43,7 +43,8 @@
<overWriteIfNewer>true</overWriteIfNewer>
<stripVersion>true</stripVersion>
<includeScope>runtime</includeScope>
- <includeGroupIds>org.mvel</includeGroupIds>
+ <includeGroupIds>org.mvel</includeGroupIds>
+ <excludes>META-INF/MANIFEST.MF</excludes>
</configuration>
</execution>
</executions>
@@ -51,10 +52,10 @@
</plugins>
<resources>
- <resource>
+ <!--resource>
<targetPath>META-INF</targetPath>
<directory>META-INF</directory>
- </resource>
+ </resource-->
<resource>
<directory>.</directory>
<includes>
Modified: labs/jbossrules/trunk/bundle-repository/pom.xml
===================================================================
--- labs/jbossrules/trunk/bundle-repository/pom.xml 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/bundle-repository/pom.xml 2010-02-12 13:33:02 UTC (rev 31606)
@@ -22,10 +22,18 @@
<url>http://repository.springsource.com/maven/bundles/external</url>
</repository>
</repositories-->
+ <properties>
+ <slf4j.version>1.5.10</slf4j.version>
+ <spring.maven.artifact.version>3.0.0.RELEASE</spring.maven.artifact.version>
+ <spring.osgi.version>1.2.1</spring.osgi.version>
+ <equinox.ver>3.5</equinox.ver>
+ </properties>
+
<modules>
<module>jxls/jxls-reader</module>
<module>org.milyn/milyn-smooks-javabean</module>
<module>org.mvel/mvel2</module>
+ <module>org.drools.osgi.test</module>
</modules>
<build>
<plugins>
@@ -66,7 +74,7 @@
<overWriteIfNewer>true</overWriteIfNewer>
<stripVersion>false</stripVersion>
<includeScope>runtime</includeScope>
- <excludeTransitive>false</excludeTransitive>
+ <excludeTransitive>true</excludeTransitive>
</configuration>
</execution>
</executions>
@@ -77,6 +85,27 @@
<!-- wrapped -->
<dependency>
<groupId>org.drools</groupId>
+ <artifactId>drools-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-compiler</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-templates</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-decisiontables</artifactId>
+ </dependency>
+ <!-- wrapped -->
+ <dependency>
+ <groupId>org.drools</groupId>
<artifactId>org.drools.osgi.wrapper.jxls-reader</artifactId>
<version>0.9.8</version>
<exclusions>
@@ -101,7 +130,7 @@
<dependency>
<groupId>org.drools</groupId>
<artifactId>org.drools.osgi.wrapper.mvel2</artifactId>
- <version>2.0.12</version>
+ <version>2.0.16</version>
<exclusions>
<exclusion>
<groupId>org.mvel</groupId>
@@ -111,6 +140,44 @@
</dependency>
+ <!-- spring -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.beans</artifactId>
+ <version>${spring.maven.artifact.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.core</artifactId>
+ <version>${spring.maven.artifact.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.aop</artifactId>
+ <version>${spring.maven.artifact.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.aspects</artifactId>
+ <version>${spring.maven.artifact.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.context</artifactId>
+ <version>${spring.maven.artifact.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.context.support</artifactId>
+ <version>${spring.maven.artifact.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.expression</artifactId>
+ <version>3.0.0.RELEASE</version>
+ </dependency>
+
+
<dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
<artifactId>com.springsource.jxl</artifactId>
@@ -172,11 +239,18 @@
<artifactId>com.springsource.org.codehaus.janino</artifactId>
<version>2.5.15</version>
</dependency>
+
+ <!-- XML -->
<dependency>
<groupId>javax.xml.stream</groupId>
<artifactId>com.springsource.javax.xml.stream</artifactId>
<version>1.0.1</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.xml</groupId>
+ <artifactId>com.springsource.org.apache.xml.resolver</artifactId>
+ <version>1.2.0</version>
+ </dependency>
<dependency>
<groupId>org.apache.xerces</groupId>
<artifactId>com.springsource.org.apache.xerces</artifactId>
@@ -188,6 +262,24 @@
<version>1.3.4</version>
</dependency>
<dependency>
+ <groupId>com.sun.xml</groupId>
+ <artifactId>com.springsource.com.sun.xml.bind</artifactId>
+ <version>2.1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml</groupId>
+ <artifactId>com.springsource.com.sun.tools.xjc</artifactId>
+ <version>2.1.7</version>
+ </dependency>
+
+ <!-- Logging -->
+ <!--dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>provided</scope>
+ </dependency-->
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>com.springsource.slf4j.api</artifactId>
<version>1.5.10</version>
@@ -197,16 +289,18 @@
<artifactId>com.springsource.slf4j.log4j</artifactId>
<version>1.5.3</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.slf4j</groupId>
<artifactId>com.springsource.slf4j.juli</artifactId>
<version>1.5.10</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.apache.log4j</groupId>
<artifactId>com.springsource.org.apache.log4j</artifactId>
<version>1.2.15</version>
</dependency>
+
+ <!-- Apache Commons -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>com.springsource.org.apache.commons.lang</artifactId>
@@ -216,13 +310,8 @@
<groupId>org.apache.commons</groupId>
<artifactId>com.springsource.org.apache.commons.io</artifactId>
<version>1.4.0</version>
- </dependency>
+ </dependency>
<dependency>
- <groupId>com.opensymphony.quartz</groupId>
- <artifactId>com.springsource.org.quartz</artifactId>
- <version>1.6.2</version>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>com.springsource.org.apache.commons.digester</artifactId>
<version>1.8.1</version>
@@ -237,7 +326,14 @@
<artifactId>com.springsource.org.apache.commons.collections</artifactId>
<version>3.2.1</version>
</dependency>
+
+ <!-- Misc -->
<dependency>
+ <groupId>com.opensymphony.quartz</groupId>
+ <artifactId>com.springsource.org.quartz</artifactId>
+ <version>1.6.2</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.poi</groupId>
<artifactId>com.springsource.org.apache.poi</artifactId>
<version>3.0.2.FINAL</version>
@@ -246,18 +342,8 @@
<groupId>javax.jms</groupId>
<artifactId>com.springsource.javax.jms</artifactId>
<version>1.1.0</version>
- </dependency>
+ </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>
@@ -268,14 +354,95 @@
<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>
+ <dependency>
+ <groupId>org.aopalliance</groupId>
+ <artifactId>com.springsource.org.aopalliance</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>com.springsource.org.aspectj.runtime</artifactId>
+ <version>1.6.8.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>com.springsource.org.aspectj.weaver</artifactId>
+ <version>1.6.8.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox.weaving</groupId>
+ <artifactId>aspectj</artifactId>
+ <version>1.0.0-200905031323</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox.weaving</groupId>
+ <artifactId>hook</artifactId>
+ <version>1.0.0-200905031323</version>
+ </dependency>
+
+ <!-- Test Scoped -->
+ <!-- Equinox OSGi platform -->
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>${equinox.ver}</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.osgi.services</artifactId>
+ <version>${equinox.ver}</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit</groupId>
+ <artifactId>com.springsource.junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.test</artifactId>
+ <version>${spring.maven.artifact.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>org.springframework.osgi.test</artifactId>
+ <version>${spring.osgi.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>org.springframework.osgi.extensions.annotation</artifactId>
+ <version>${spring.osgi.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>org.springframework.osgi.extender</artifactId>
+ <version>${spring.osgi.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.objectweb.asm</groupId>
+ <artifactId>com.springsource.org.objectweb.asm</artifactId>
+ <version>2.2.3</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
Modified: labs/jbossrules/trunk/drools-ant/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-ant/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-ant/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -25,7 +25,7 @@
<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/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2/stringtemplate-3.2.jar"/>
<classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/util/ClassLoaderUtil.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/util/ClassLoaderUtil.java 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/util/ClassLoaderUtil.java 2010-02-12 13:33:02 UTC (rev 31606)
@@ -12,16 +12,25 @@
ClassLoader systemClassLoader = Class.class.getClassLoader().getSystemClassLoader();
CompositeClassLoader cl = new CompositeClassLoader( null );
+
+ if (currentClassLoader != null ) {
+ // this must come first, so that generated classes use the same classloader for search and execution
+ // as the main drools jars (core and compiler)
+ cl.addClassLoader(currentClassLoader);
+ }
+
if (classLoader != null ) {
+ // the user specified classloader
cl.addClassLoader(classLoader);
}
+
if (contextClassLoader != null ) {
+ // context classloader
cl.addClassLoader(contextClassLoader);
- }
- if (currentClassLoader != null ) {
- cl.addClassLoader(currentClassLoader);
- }
+ }
+
if (systemClassLoader != null ) {
+ // system classloader
cl.addClassLoader(systemClassLoader);
}
Modified: labs/jbossrules/trunk/drools-clips/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-clips/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-clips/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -19,7 +19,7 @@
<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/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/mvel/mvel2/2.0.16/mvel2-2.0.16.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2/stringtemplate-3.2.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-compiler/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-compiler/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-compiler/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -24,7 +24,7 @@
<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.16-SNAPSHOT/mvel2-2.0.16-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.compendium/1.4.0/org.osgi.compendium-1.4.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/>
Modified: labs/jbossrules/trunk/drools-container/drools-mc/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-mc/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-container/drools-mc/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -16,6 +16,6 @@
<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/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/mvel/mvel2/2.0.16/mvel2-2.0.16.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-container/drools-spring/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-container/drools-spring/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -9,21 +9,21 @@
<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/org/antlr/antlr-runtime/3.1.3/antlr-runtime-3.1.3.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/org/rioproject/boot/4.0-M3/boot-4.0-M3.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/rioproject/tools/cli/4.0-M3/cli-4.0-M3.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/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/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-compress/1.0/commons-compress-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-exec/1.0.1/commons-exec-1.0.1.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/org/rioproject/cybernode/4.0-M3/cybernode-4.0-M3.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"/>
@@ -37,6 +37,7 @@
<classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/el/el-api/1.0/el-api-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/codehaus/groovy/groovy-all/1.6.2/groovy-all-1.6.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/gunit/3.1.3/gunit-3.1.3.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"/>
@@ -52,31 +53,35 @@
<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/javax/transaction/jta/1.1/jta-1.1.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
<classpathentry kind="var" path="M2_REPO/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/rioproject/monitor/4.0-M3/monitor-4.0-M3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.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/com/sun/jini/reggie/2.1/reggie-2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/jini/reggie/2.1/reggie-2.1-dl.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/rioproject/resolver/4.0-M3/resolver-4.0-M3.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-api/1.5.10/slf4j-api-1.5.10.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-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 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/net/jini/start/2.1/start-2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2/stringtemplate-3.2.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/src/main/java/org/drools/container/spring/beans/persistence/SpringSingleSessionCommandService.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/SpringSingleSessionCommandService.java 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/SpringSingleSessionCommandService.java 2010-02-12 13:33:02 UTC (rev 31606)
@@ -171,6 +171,8 @@
// sessionInfo = em.find(SessionInfo.class, sessionInfo.getId());
// sessionInfo.setJPASessionMashallingHelper(marshallingHelper);
// marshallingHelper.loadSnapshot(sessionInfo.getData(), ksession);
+ //sessionInfo.setDirty(); // TODO FIXME baunux: this should not be needed now that we use idle time, I think, double check.
+
T result = command.execute(kContext);
em.flush();
env.set(EnvironmentName.ENTITY_MANAGER, null);
Modified: labs/jbossrules/trunk/drools-core/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-core/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-core/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -1,24 +1,23 @@
-<?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/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/apache/felix/javax.servlet/1.0.0/javax.servlet-1.0.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jmock/jmock-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"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.compendium/1.4.0/org.osgi.compendium-1.4.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.foundation/1.2.0/org.osgi.foundation-1.2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3.1/xstream-1.3.1.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/mvel"/>
- <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/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/apache/felix/javax.servlet/1.0.0/javax.servlet-1.0.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jmock/jmock-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.16/mvel2-2.0.16.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.compendium/1.4.0/org.osgi.compendium-1.4.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.foundation/1.2.0/org.osgi.foundation-1.2.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"/>
+</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/FireAllRulesCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/FireAllRulesCommand.java 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/FireAllRulesCommand.java 2010-02-12 13:33:02 UTC (rev 31606)
@@ -42,9 +42,29 @@
}
public int getMax() {
- return this.max;
+ return max;
}
+ public void setMax(int max) {
+ this.max = max;
+ }
+
+ public AgendaFilter getAgendaFilter() {
+ return agendaFilter;
+ }
+
+ public void setAgendaFilter(AgendaFilter agendaFilter) {
+ this.agendaFilter = agendaFilter;
+ }
+
+ public String getOutIdentifier() {
+ return outIdentifier;
+ }
+
+ public void setOutIdentifier(String outIdentifier) {
+ this.outIdentifier = outIdentifier;
+ }
+
public Integer execute(Context context) {
StatefulKnowledgeSession ksession = ((KnowledgeCommandContext) context).getStatefulKnowledgesession();
int fired;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/InsertObjectCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/InsertObjectCommand.java 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/InsertObjectCommand.java 2010-02-12 13:33:02 UTC (rev 31606)
@@ -19,6 +19,10 @@
private boolean returnObject = true;
+ public InsertObjectCommand() {
+
+ }
+
public InsertObjectCommand(Object object) {
this.object = object;
}
@@ -40,7 +44,13 @@
return factHandle;
}
+
+
+ public void setObject(Object object) {
+ this.object = object;
+ }
+
public Object getObject() {
return this.object;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/help/impl/BatchExecutionHelperProviderImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/help/impl/BatchExecutionHelperProviderImpl.java 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/help/impl/BatchExecutionHelperProviderImpl.java 2010-02-12 13:33:02 UTC (rev 31606)
@@ -55,18 +55,22 @@
public class BatchExecutionHelperProviderImpl
implements
BatchExecutionHelperProvider {
+
+ public XStream newXStreamMarshaller() {
+ return newXStreamMarshaller( new XStream());
+ }
- public XStream newXStreamMarshaller() {
+ public XStream newXStreamMarshaller(XStream xstream) {
ElementNames names = new XmlElementNames();
// ElementNames names = new JsonElementNames();
// XStream xstream = new XStream( new JettisonMappedXmlDriver() );
- XStream xstream = new XStream();
+
// xstream.setMode( XStream.NO_REFERENCES );
xstream.processAnnotations( BatchExecutionImpl.class );
xstream.addImplicitCollection( BatchExecutionImpl.class,
"commands" );
-
+
xstream.alias( "batch-execution",
BatchExecutionImpl.class );
xstream.alias( "insert",
@@ -106,23 +110,23 @@
xstream.alias("fact-handle", DefaultFactHandle.class);
- xstream.registerConverter( new InsertConverter( xstream.getMapper() ) );
- xstream.registerConverter( new RetractConverter( xstream.getMapper() ) );
- xstream.registerConverter( new ModifyConverter( xstream.getMapper() ) );
- xstream.registerConverter( new GetObjectConverter( xstream.getMapper() ) );
- xstream.registerConverter( new InsertElementsConverter( xstream.getMapper() ) );
- xstream.registerConverter( new FireAllRulesConverter( xstream.getMapper() ) );
- xstream.registerConverter( new StartProcessConvert( xstream.getMapper() ) );
- xstream.registerConverter( new SignalEventConverter( xstream.getMapper() ) );
- xstream.registerConverter( new CompleteWorkItemConverter( xstream.getMapper() ) );
- xstream.registerConverter( new AbortWorkItemConverter( xstream.getMapper() ) );
- xstream.registerConverter( new QueryConverter( xstream.getMapper() ) );
- xstream.registerConverter( new SetGlobalConverter( xstream.getMapper() ) );
- xstream.registerConverter( new GetGlobalConverter( xstream.getMapper() ) );
- xstream.registerConverter( new GetObjectsConverter( xstream.getMapper() ) );
- xstream.registerConverter( new BatchExecutionResultConverter( xstream.getMapper() ) );
- xstream.registerConverter( new QueryResultsConverter( xstream.getMapper() ) );
- xstream.registerConverter( new FactHandleConverter(xstream.getMapper()));
+// xstream.registerConverter( new InsertConverter( xstream.getMapper() ) );
+// xstream.registerConverter( new RetractConverter( xstream.getMapper() ) );
+// xstream.registerConverter( new ModifyConverter( xstream.getMapper() ) );
+// xstream.registerConverter( new GetObjectConverter( xstream.getMapper() ) );
+// xstream.registerConverter( new InsertElementsConverter( xstream.getMapper() ) );
+// xstream.registerConverter( new FireAllRulesConverter( xstream.getMapper() ) );
+// xstream.registerConverter( new StartProcessConvert( xstream.getMapper() ) );
+// xstream.registerConverter( new SignalEventConverter( xstream.getMapper() ) );
+// xstream.registerConverter( new CompleteWorkItemConverter( xstream.getMapper() ) );
+// xstream.registerConverter( new AbortWorkItemConverter( xstream.getMapper() ) );
+// xstream.registerConverter( new QueryConverter( xstream.getMapper() ) );
+// xstream.registerConverter( new SetGlobalConverter( xstream.getMapper() ) );
+// xstream.registerConverter( new GetGlobalConverter( xstream.getMapper() ) );
+// xstream.registerConverter( new GetObjectsConverter( xstream.getMapper() ) );
+// xstream.registerConverter( new BatchExecutionResultConverter( xstream.getMapper() ) );
+// xstream.registerConverter( new QueryResultsConverter( xstream.getMapper() ) );
+// xstream.registerConverter( new FactHandleConverter(xstream.getMapper()));
return xstream;
}
Modified: labs/jbossrules/trunk/drools-decisiontables/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-decisiontables/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -22,7 +22,7 @@
<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/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.compendium/1.4.0/org.osgi.compendium-1.4.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/>
Modified: labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF 2010-02-12 13:33:02 UTC (rev 31606)
@@ -20,7 +20,7 @@
Bundle-Vendor: JBoss Inc.
DynamicImport-Package: org.drools.*
Bundle-Version: 5.1.0.SNAPSHOT
-Bnd-LastModified: 1264462058252
+Bnd-LastModified: 1264522656654
Bundle-Activator: org.drools.osgi.decisiontables.Activator
Bundle-ManifestVersion: 2
Bundle-Description: A rule production system
Modified: labs/jbossrules/trunk/drools-decisiontables/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/pom.xml 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-decisiontables/pom.xml 2010-02-12 13:33:02 UTC (rev 31606)
@@ -71,12 +71,14 @@
</executions>
<configuration>
<manifestLocation>META-INF</manifestLocation>
- <instructions><_removeheaders>Ignore-Package</_removeheaders>
- <Require-Bundle>org.drools.core;bundle-version="${pom.version}"</Require-Bundle>
- <Import-Package>!org.drools.*, *</Import-Package>
- <Export-Package>org.drools.*</Export-Package>
- <DynamicImport-Package>org.drools.*</DynamicImport-Package>
- <Bundle-Activator>org.drools.osgi.decisiontables.Activator</Bundle-Activator></instructions>
+ <instructions>
+ <_removeheaders>Ignore-Package</_removeheaders>
+ <Require-Bundle>org.drools.core;bundle-version="${pom.version}"</Require-Bundle>
+ <Import-Package>!org.drools.*, *</Import-Package>
+ <Export-Package>org.drools.*</Export-Package>
+ <DynamicImport-Package>org.drools.*</DynamicImport-Package>
+ <Bundle-Activator>org.drools.osgi.decisiontables.Activator</Bundle-Activator>
+ </instructions>
</configuration>
</plugin>
</plugins>
Modified: labs/jbossrules/trunk/drools-doc/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-doc/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-doc/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -24,7 +24,7 @@
<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/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/mvel/mvel2/2.0.16/mvel2-2.0.16.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2/stringtemplate-3.2.jar"/>
<classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
Modified: labs/jbossrules/trunk/drools-guvnor/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-guvnor/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -75,7 +75,7 @@
<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
<classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.4.1/lucene-core-2.4.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16-SNAPSHOT/mvel2-2.0.16-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.jar"/>
<classpathentry kind="var" path="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.7/nekohtml-1.9.7.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"/>
Modified: labs/jbossrules/trunk/drools-jsr94/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-jsr94/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-jsr94/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -25,7 +25,7 @@
<classpathentry kind="var" path="M2_REPO/jsr94/jsr94-tck/1.0.3/jsr94-tck-1.0.3.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
<classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2/stringtemplate-3.2.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-persistence-jpa/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-persistence-jpa/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-persistence-jpa/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -10,7 +10,7 @@
<classpathentry kind="var" path="M2_REPO/org/codehaus/btm/btm/1.3.2/btm-1.3.2.jar"/>
<classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
<classpathentry kind="var" path="M2_REPO/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/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
<classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
<classpathentry kind="src" path="/drools-api"/>
<classpathentry kind="src" path="/drools-compiler"/>
@@ -32,7 +32,7 @@
<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/transaction/jta/1.1/jta-1.1.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16-SNAPSHOT/mvel2-2.0.16-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar"/>
Modified: labs/jbossrules/trunk/drools-persistence-jpa/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-persistence-jpa/META-INF/MANIFEST.MF 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-persistence-jpa/META-INF/MANIFEST.MF 2010-02-12 13:33:02 UTC (rev 31606)
@@ -9,22 +9,22 @@
x.persistence";version="5.1.0.SNAPSHOT",org.drools.persistence.proces
sinstance.variabletypes;uses:="javax.persistence";version="5.1.0.SNAP
SHOT",org.drools.persistence.session;uses:="javax.persistence,org.dro
- ols.persistence.processinstance,javax.transaction,javax.naming,org.ap
- ache.commons.collections.map";version="5.1.0.SNAPSHOT"
+ ols.persistence.processinstance,javax.transaction,javax.naming";versi
+ on="5.1.0.SNAPSHOT"
Tool: Bnd-0.0.357
Bundle-Name: Drools :: Persistence :: JPA
Created-By: 1.6.0_18 (Sun Microsystems Inc.)
-Require-Bundle: org.drools.api;visibility:=reexport;bundle-version="5.
- 1.0.SNAPSHOT"
+Require-Bundle: org.drools.core;bundle-version="5.1.0.SNAPSHOT", org.d
+ rools.compiler;bundle-version="5.1.0.SNAPSHOT"
Bundle-Vendor: JBoss Inc.
DynamicImport-Package: *
Bundle-Version: 5.1.0.SNAPSHOT
-Bnd-LastModified: 1264901969905
+Bnd-LastModified: 1265177336096
Bundle-ManifestVersion: 2
Bundle-Description: A rule production system
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Import-Package: javax.naming,javax.persistence,javax.transaction,
- org.apache.commons.collections.map,org.hibernate.annotations
+Import-Package: javax.naming,javax.persistence,javax.transaction,org.h
+ ibernate.annotations
Bundle-SymbolicName: org.drools.persistence-jpa
Bundle-DocURL: http://www.jboss.org/
Modified: labs/jbossrules/trunk/drools-persistence-jpa/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-persistence-jpa/pom.xml 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-persistence-jpa/pom.xml 2010-02-12 13:33:02 UTC (rev 31606)
@@ -40,7 +40,7 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<_removeheaders>Ignore-Package</_removeheaders>
- <Require-Bundle>org.drools.api;visibility:=reexport;bundle-version="${pom.version}"</Require-Bundle>
+ <Require-Bundle>org.drools.core;bundle-version="${pom.version}", org.drools.compiler;bundle-version="${pom.version}"</Require-Bundle>
<Import-Package>!org.drools.*, *</Import-Package>
<Export-Package> org.drools.*</Export-Package>
<DynamicImport-Package>*</DynamicImport-Package>
Modified: labs/jbossrules/trunk/drools-pipeline/drools-camel/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-camel/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-pipeline/drools-camel/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -11,15 +11,15 @@
<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-runtime/3.1.3/antlr-runtime-3.1.3.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/org/rioproject/boot/4.0-M3/boot-4.0-M3.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/camel/camel-core/2.1.0/camel-core-2.1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/camel/camel-core/2.1.0/camel-core-2.1.0-tests.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/camel/camel-spring/2.1.0/camel-spring-2.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/org/rioproject/tools/cli/4.0-M3-SNAPSHOT/cli-4.0-M3-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/rioproject/tools/cli/4.0-M3/cli-4.0-M3.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/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/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-compress/1.0/commons-compress-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-exec/1.0.1/commons-exec-1.0.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-finder/1.0-SNAPSHOT/commons-finder-1.0-SNAPSHOT.jar"/>
@@ -28,15 +28,15 @@
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/fusesource/commonman/commons-management/1.0/commons-management-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-net/commons-net/2.0/commons-net-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/rioproject/cybernode/4.0-M3-SNAPSHOT/cybernode-4.0-M3-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/rioproject/cybernode/4.0-M3/cybernode-4.0-M3.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="var" path="M2_REPO/org/drools/drools-persistence-jpa/5.1.0.SNAPSHOT/drools-persistence-jpa-5.1.0.SNAPSHOT.jar"/>
+ <classpathentry kind="src" path="/drools-persistence-jpa"/>
<classpathentry kind="src" path="/drools-process-task"/>
<classpathentry kind="src" path="/drools-transformer-xstream"/>
- <classpathentry kind="var" path="M2_REPO/org/drools/drools-vsm/5.1.0.SNAPSHOT/drools-vsm-5.1.0.SNAPSHOT.jar"/>
+ <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"/>
@@ -62,10 +62,13 @@
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/mina/mina-core/2.0.0-M6/mina-core-2.0.0-M6.jar"/>
- <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/rioproject/monitor/4.0-M3/monitor-4.0-M3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.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/com/sun/jini/reggie/2.1/reggie-2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/jini/reggie/2.1/reggie-2.1-dl.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/rioproject/resolver/4.0-M3/resolver-4.0-M3.jar"/>
<classpathentry kind="var" path="M2_REPO/org/rioproject/rio/4.0-M3-SNAPSHOT/rio-4.0-M3-SNAPSHOT.jar"/>
<classpathentry kind="var" path="M2_REPO/rome/rome/0.9/rome-0.9.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar"/>
@@ -77,6 +80,7 @@
<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 kind="var" path="M2_REPO/org/springframework/spring-tx/2.5.6/spring-tx-2.5.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/jini/start/2.1/start-2.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2/stringtemplate-3.2.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"/>
Modified: labs/jbossrules/trunk/drools-pipeline/drools-camel/.project
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-camel/.project 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-pipeline/drools-camel/.project 2010-02-12 13:33:02 UTC (rev 31606)
@@ -5,8 +5,10 @@
<project>drools-api</project>
<project>drools-compiler</project>
<project>drools-core</project>
+ <project>drools-persistence-jpa</project>
<project>drools-process-task</project>
<project>drools-transformer-xstream</project>
+ <project>drools-vsm</project>
<project>drools-workitems</project>
</projects>
<buildSpec>
Modified: labs/jbossrules/trunk/drools-pipeline/drools-messenger-jms/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-messenger-jms/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-pipeline/drools-messenger-jms/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -34,7 +34,7 @@
<classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
<classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
<classpathentry kind="var" path="M2_REPO/simple-jndi/simple-jndi/0.11.4/simple-jndi-0.11.4.jar"/>
Modified: labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -24,7 +24,7 @@
<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/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2/stringtemplate-3.2.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-pipeline/drools-transformer-jxls/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-jxls/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-jxls/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -26,7 +26,7 @@
<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/mvel/mvel2/2.0.12/mvel2-2.0.12.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/poi/poi/3.0.2-FINAL/poi-3.0.2-FINAL.jar"/>
<classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2/stringtemplate-3.2.jar"/>
Modified: labs/jbossrules/trunk/drools-pipeline/drools-transformer-smooks/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-smooks/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-smooks/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -27,7 +27,7 @@
<classpathentry kind="var" path="M2_REPO/org/milyn/milyn-smooks-core/1.1/milyn-smooks-core-1.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/milyn/milyn-smooks-javabean/1.1/milyn-smooks-javabean-1.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/mvel/mvel/1.3.12-java1.5/mvel-1.3.12-java1.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2/stringtemplate-3.2.jar"/>
<classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
Modified: labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -10,25 +10,25 @@
<classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.jar"/>
<classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
<classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.1.3/antlr-runtime-3.1.3.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/org/rioproject/boot/4.0-M3/boot-4.0-M3.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/rioproject/tools/cli/4.0-M3/cli-4.0-M3.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/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/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-compress/1.0/commons-compress-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-exec/1.0.1/commons-exec-1.0.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-finder/1.0-SNAPSHOT/commons-finder-1.0-SNAPSHOT.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-net/commons-net/2.0/commons-net-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/rioproject/cybernode/4.0-M3-SNAPSHOT/cybernode-4.0-M3-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/rioproject/cybernode/4.0-M3/cybernode-4.0-M3.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="var" path="M2_REPO/org/drools/drools-persistence-jpa/5.1.0.SNAPSHOT/drools-persistence-jpa-5.1.0.SNAPSHOT.jar"/>
+ <classpathentry kind="src" path="/drools-persistence-jpa"/>
<classpathentry kind="src" path="/drools-process-task"/>
- <classpathentry kind="var" path="M2_REPO/org/drools/drools-vsm/5.1.0.SNAPSHOT/drools-vsm-5.1.0.SNAPSHOT.jar"/>
+ <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"/>
@@ -54,15 +54,19 @@
<classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/mina/mina-core/2.0.0-M6/mina-core-2.0.0-M6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/rioproject/monitor/4.0-M3-SNAPSHOT/monitor-4.0-M3-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/rioproject/monitor/4.0-M3/monitor-4.0-M3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.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/com/sun/jini/reggie/2.1/reggie-2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/jini/reggie/2.1/reggie-2.1-dl.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/rioproject/resolver/4.0-M3/resolver-4.0-M3.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.10/slf4j-api-1.5.10.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-jdk14/1.5.2/slf4j-jdk14-1.5.2.jar"/>
<classpathentry kind="var" path="M2_REPO/jivesoftware/smack/3.0.4/smack-3.0.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/jini/start/2.1/start-2.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2/stringtemplate-3.2.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"/>
Modified: labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/.project
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/.project 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/.project 2010-02-12 13:33:02 UTC (rev 31606)
@@ -5,7 +5,9 @@
<project>drools-api</project>
<project>drools-compiler</project>
<project>drools-core</project>
+ <project>drools-persistence-jpa</project>
<project>drools-process-task</project>
+ <project>drools-vsm</project>
<project>drools-workitems</project>
</projects>
<buildSpec>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -24,7 +24,7 @@
<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/log4j/log4j/1.2.14/log4j-1.2.14.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/mvel/mvel2/2.0.16/mvel2-2.0.16.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.10/slf4j-api-1.5.10.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.5.10/slf4j-log4j12-1.5.10.jar"/>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -25,7 +25,7 @@
<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/log4j/log4j/1.2.14/log4j-1.2.14.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/mvel/mvel2/2.0.16/mvel2-2.0.16.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.10/slf4j-api-1.5.10.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.5.3/slf4j-log4j12-1.5.3.jar"/>
Modified: labs/jbossrules/trunk/drools-process/drools-bam/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bam/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-process/drools-bam/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -29,7 +29,7 @@
<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/transaction/jta/1.1/jta-1.1.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-jdk14/1.5.2/slf4j-jdk14-1.5.2.jar"/>
Modified: labs/jbossrules/trunk/drools-process/drools-bpmn2/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpmn2/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-process/drools-bpmn2/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -7,15 +7,15 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
<classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.1.3/antlr-runtime-3.1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/codehaus/btm/btm/1.3.2/btm-1.3.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/codehaus/btm/btm/1.3.3/btm-1.3.3.jar"/>
<classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
<classpathentry kind="var" path="M2_REPO/org/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/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
<classpathentry kind="var" path="M2_REPO/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="var" path="M2_REPO/org/drools/drools-persistence-jpa/5.1.0.SNAPSHOT/drools-persistence-jpa-5.1.0.SNAPSHOT.jar"/>
+ <classpathentry kind="src" path="/drools-persistence-jpa"/>
<classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jms_1.1_spec/1.0.1/geronimo-jms_1.1_spec-1.0.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.0.1B_spec/1.0.1/geronimo-jta_1.0.1B_spec-1.0.1.jar"/>
@@ -31,9 +31,9 @@
<classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jmock/jmock-legacy/2.5.1/jmock-legacy-2.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.10/slf4j-api-1.5.10.jar"/>
Modified: labs/jbossrules/trunk/drools-process/drools-bpmn2/.project
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpmn2/.project 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-process/drools-bpmn2/.project 2010-02-12 13:33:02 UTC (rev 31606)
@@ -5,6 +5,7 @@
<project>drools-api</project>
<project>drools-compiler</project>
<project>drools-core</project>
+ <project>drools-persistence-jpa</project>
</projects>
<buildSpec>
<buildCommand>
Modified: labs/jbossrules/trunk/drools-process/drools-bpmn2/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpmn2/pom.xml 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-process/drools-bpmn2/pom.xml 2010-02-12 13:33:02 UTC (rev 31606)
@@ -12,7 +12,44 @@
<packaging>jar</packaging>
<name>Drools :: Process :: BPMN2</name>
- <build/>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.0.1</version>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+ <_removeheaders>Ignore-Package</_removeheaders>
+ <Require-Bundle>org.drools.core;bundle-version="${pom.version}", org.drools.compiler;bundle-version="${pom.version}", org.drools.persistence-jpa;bundle-version="${pom.version}"</Require-Bundle>
+ <Import-Package>!org.drools.*, *</Import-Package>
+ <Export-Package> org.drools.*</Export-Package>
+ <DynamicImport-Package>*</DynamicImport-Package>
+ <!--Bundle-Activator>org.drools.osgi.core.Activator</Bundle-Activator-->
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
Modified: labs/jbossrules/trunk/drools-process/drools-gwt-console/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-gwt-console/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-process/drools-gwt-console/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -47,7 +47,7 @@
<classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/mina/mina-core/2.0.0-M3/mina-core-2.0.0-M3.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/mvel/mvel2/2.0.16/mvel2-2.0.16.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.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.10/slf4j-api-1.5.10.jar"/>
Modified: labs/jbossrules/trunk/drools-process/drools-gwt-form/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-gwt-form/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-process/drools-gwt-form/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -46,7 +46,7 @@
<classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/mina/mina-core/2.0.0-M3/mina-core-2.0.0-M3.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/mvel/mvel2/2.0.16/mvel2-2.0.16.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.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.10/slf4j-api-1.5.10.jar"/>
Modified: labs/jbossrules/trunk/drools-process/drools-gwt-graph/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-gwt-graph/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-process/drools-gwt-graph/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -27,7 +27,7 @@
<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/transaction/jta/1.1/jta-1.1.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.10/slf4j-api-1.5.10.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar"/>
Modified: labs/jbossrules/trunk/drools-process/drools-gwt-server-war/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-gwt-server-war/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-process/drools-gwt-server-war/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -8,7 +8,7 @@
<classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
<classpathentry kind="var" path="M2_REPO/org/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/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/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-compress/1.0/commons-compress-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-exec/1.0.1/commons-exec-1.0.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-finder/1.0-SNAPSHOT/commons-finder-1.0-SNAPSHOT.jar"/>
@@ -23,7 +23,7 @@
<classpathentry kind="src" path="/drools-gwt-console"/>
<classpathentry kind="src" path="/drools-gwt-form"/>
<classpathentry kind="src" path="/drools-gwt-graph"/>
- <classpathentry kind="var" path="M2_REPO/org/drools/drools-persistence-jpa/5.1.0.SNAPSHOT/drools-persistence-jpa-5.1.0.SNAPSHOT.jar"/>
+ <classpathentry kind="src" path="/drools-persistence-jpa"/>
<classpathentry kind="src" path="/drools-process-task"/>
<classpathentry kind="src" path="/drools-workitems"/>
<classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar"/>
@@ -51,7 +51,7 @@
<classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/mina/mina-core/2.0.0-M3/mina-core-2.0.0-M3.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/mvel/mvel2/2.0.16/mvel2-2.0.16.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/rome/rome/0.9/rome-0.9.jar"/>
Modified: labs/jbossrules/trunk/drools-process/drools-gwt-server-war/.project
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-gwt-server-war/.project 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-process/drools-gwt-server-war/.project 2010-02-12 13:33:02 UTC (rev 31606)
@@ -10,6 +10,7 @@
<project>drools-gwt-console</project>
<project>drools-gwt-form</project>
<project>drools-gwt-graph</project>
+ <project>drools-persistence-jpa</project>
<project>drools-process-task</project>
<project>drools-workitems</project>
</projects>
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -47,7 +47,7 @@
<classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/mina/mina-core/2.0.0-M6/mina-core-2.0.0-M6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/postgresql/postgresql/8.3-603.jdbc3/postgresql-8.3-603.jdbc3.jar"/>
<classpathentry kind="var" path="M2_REPO/rome/rome/0.9/rome-0.9.jar"/>
Modified: labs/jbossrules/trunk/drools-process/drools-workitems/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-workitems/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-process/drools-workitems/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -35,7 +35,7 @@
<classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/mina/mina-core/2.0.0-M6/mina-core-2.0.0-M6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/rome/rome/0.9/rome-0.9.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
Modified: labs/jbossrules/trunk/drools-server/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-server/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-server/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -20,7 +20,7 @@
<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/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/mvel/mvel2/2.0.16/mvel2-2.0.16.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
<classpathentry kind="var" path="M2_REPO/stax/stax/1.2.0/stax-1.2.0.jar"/>
Modified: labs/jbossrules/trunk/drools-simulator/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-simulator/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-simulator/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -19,7 +19,7 @@
<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/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/mvel/mvel2/2.0.16/mvel2-2.0.16.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/yaml/snakeyaml/1.4/snakeyaml-1.4.jar"/>
<classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2/stringtemplate-3.2.jar"/>
Modified: labs/jbossrules/trunk/drools-templates/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-templates/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-templates/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -20,7 +20,7 @@
<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/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/mvel/mvel2/2.0.16/mvel2-2.0.16.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2/stringtemplate-3.2.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF 2010-02-12 13:33:02 UTC (rev 31606)
@@ -16,7 +16,7 @@
Bundle-Vendor: JBoss Inc.
DynamicImport-Package: org.drools.*
Bundle-Version: 5.1.0.SNAPSHOT
-Bnd-LastModified: 1264462057824
+Bnd-LastModified: 1264522655309
Bundle-ManifestVersion: 2
Bundle-Description: A rule production system
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Modified: labs/jbossrules/trunk/drools-templates/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-templates/pom.xml 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-templates/pom.xml 2010-02-12 13:33:02 UTC (rev 31606)
@@ -58,11 +58,13 @@
</executions>
<configuration>
<manifestLocation>META-INF</manifestLocation>
- <instructions><_removeheaders>Ignore-Package</_removeheaders>
- <Require-Bundle>org.drools.core;bundle-version="${pom.version}"</Require-Bundle>
- <Import-Package>!org.drools.*, *</Import-Package>
- <Export-Package>org.drools.*</Export-Package>
- <DynamicImport-Package>org.drools.*</DynamicImport-Package></instructions>
+ <instructions>
+ <_removeheaders>Ignore-Package</_removeheaders>
+ <Require-Bundle>org.drools.core;bundle-version="${pom.version}"</Require-Bundle>
+ <Import-Package>!org.drools.*, *</Import-Package>
+ <Export-Package>org.drools.*</Export-Package>
+ <DynamicImport-Package>org.drools.*</DynamicImport-Package>
+ </instructions>
</configuration>
</plugin>
</plugins>
Modified: labs/jbossrules/trunk/drools-verifier/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-verifier/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-verifier/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -20,7 +20,7 @@
<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/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/mvel/mvel2/2.0.16/mvel2-2.0.16.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2/stringtemplate-3.2.jar"/>
<classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
Modified: labs/jbossrules/trunk/drools-vsm/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-vsm/.classpath 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/drools-vsm/.classpath 2010-02-12 13:33:02 UTC (rev 31606)
@@ -6,24 +6,20 @@
<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/3.1.1/antlr-3.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/rioproject/boot/4.0-M3-SNAPSHOT/boot-4.0-M3-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.1.3/antlr-runtime-3.1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/rioproject/boot/4.0-M3/boot-4.0-M3.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/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/rioproject/tools/cli/4.0-M3/cli-4.0-M3.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/jasper/springsource/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource/6.0.20.S2-r5956/com.springsource.org.apache.jasper.org.eclipse.jdt.springsource-6.0.20.S2-r5956.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/codehaus/janino/com.springsource.org.codehaus.janino/2.5.15/com.springsource.org.codehaus.janino-2.5.15.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-cli/2.0-SNAPSHOT/commons-cli-2.0-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-compress/1.0-SNAPSHOT/commons-compress-1.0-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-exec/1.0.0-SNAPSHOT/commons-exec-1.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-compress/1.0/commons-compress-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-exec/1.0.1/commons-exec-1.0.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-finder/1.0-SNAPSHOT/commons-finder-1.0-SNAPSHOT.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-net/commons-net/2.0/commons-net-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/rioproject/cybernode/4.0-M3-SNAPSHOT/cybernode-4.0-M3-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/rioproject/cybernode/4.0-M3/cybernode-4.0-M3.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"/>
@@ -33,8 +29,8 @@
<classpathentry kind="src" path="/drools-workitems"/>
<classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/el/el-api/1.0/el-api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/codehaus/groovy/groovy-all/1.6.2/groovy-all-1.6.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/gunit/3.2/gunit-3.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/codehaus/groovy/groovy-all/1.7.0/groovy-all-1.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/gunit/3.1.3/gunit-3.1.3.jar"/>
<classpathentry kind="var" path="M2_REPO/com/h2database/h2/1.0.77/h2-1.0.77.jar"/>
<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
@@ -42,29 +38,34 @@
<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" sourcepath="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1-sources.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/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/javax/transaction/jta/1.1/jta-1.1.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
<classpathentry kind="var" path="M2_REPO/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/rioproject/monitor/4.0-M3/monitor-4.0-M3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.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/com/sun/jini/reggie/2.1/reggie-2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/jini/reggie/2.1/reggie-2.1-dl.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/rioproject/resolver/4.0-M3/resolver-4.0-M3.jar"/>
<classpathentry kind="var" path="M2_REPO/org/rioproject/rio/4.0-M3-SNAPSHOT/rio-4.0-M3-SNAPSHOT.jar"/>
<classpathentry kind="var" path="M2_REPO/rome/rome/0.9/rome-0.9.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-jdk14/1.5.2/slf4j-jdk14-1.5.2.jar"/>
<classpathentry kind="var" path="M2_REPO/jivesoftware/smack/3.0.4/smack-3.0.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2.1/stringtemplate-3.2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/jini/start/2.1/start-2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2/stringtemplate-3.2.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/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml 2010-02-12 13:11:46 UTC (rev 31605)
+++ labs/jbossrules/trunk/pom.xml 2010-02-12 13:33:02 UTC (rev 31606)
@@ -11,7 +11,7 @@
<description>A rule production system</description>
<url>http://www.jboss.com/products/rules</url>
<properties>
- <mvel.dep.version>2.0.16-SNAPSHOT</mvel.dep.version>
+ <mvel.dep.version>2.0.16</mvel.dep.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<prerequisites>
@@ -206,6 +206,11 @@
<name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
<url>http://repository.springsource.com/maven/bundles/external</url>
</repository>
+ <repository>
+ <id>repo.openehealth.org</id>
+ <name>Open Health (eclipse)</name>
+ <url>http://repo.openehealth.org/maven2/releases</url>
+ </repository>
</repositories>
<pluginRepositories>
<pluginRepository>
@@ -635,7 +640,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.5</version>
+ <version>2.7</version>
<configuration>
<!--<downloadSources>true</downloadSources>-->
</configuration>
More information about the jboss-svn-commits
mailing list