[jboss-svn-commits] JBL Code SVN: r33889 - in labs/jbossrules/trunk: drools-api/META-INF and 16 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jul 14 19:38:12 EDT 2010
Author: mark.proctor at jboss.com
Date: 2010-07-14 19:38:11 -0400 (Wed, 14 Jul 2010)
New Revision: 33889
Added:
labs/jbossrules/trunk/drools-camel/
Removed:
labs/jbossrules/trunk/drools-pipeline/drools-camel/
Modified:
labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-camel/pom.xml
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithMarshallersTest.java
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/DroolsCamelTestSupport.java
labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/log4j.xml
labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-grid/drools-grid-core/
labs/jbossrules/trunk/drools-grid/drools-grid-task/
labs/jbossrules/trunk/drools-persistence-jpa/
labs/jbossrules/trunk/drools-persistence-jpa/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-process/drools-process-task/pom.xml
labs/jbossrules/trunk/drools-process/drools-workitems/pom.xml
labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF
labs/jbossrules/trunk/osgi-bundles/jxls/org.drools.osgi.wrapper.jxls-reader/maven-eclipse.xml
labs/jbossrules/trunk/osgi-bundles/org.milyn/org.drools.osgi.wrapper.milyn-smooks-javabean/maven-eclipse.xml
labs/jbossrules/trunk/pom.xml
Log:
JBRULES-2347 Drools Pipeline integration with Camel
JBRULES-1434 Drools Spring
-just moving some files around
-disable the mina unit tests for task, for stability reasons.
Modified: labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF 2010-07-14 22:48:30 UTC (rev 33888)
+++ labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF 2010-07-14 23:38:11 UTC (rev 33889)
@@ -8,7 +8,7 @@
tional,org.milyn;resolution:=optional,org.osgi.framework;resolution:=
optional;version="1.5",org.osgi.util.tracker;resolution:=optional;ver
sion="1.4",org.quartz;resolution:=optional
-Bnd-LastModified: 1279063366094
+Bnd-LastModified: 1279113493194
Export-Package: org.drools.logger;uses:="org.drools.event";version="5.
1.0.SNAPSHOT",org.drools.runtime;uses:="org.drools.command,org.drools
.time,org.drools.event,org.drools,org.drools.runtime.process,org.droo
Copied: labs/jbossrules/trunk/drools-camel (from rev 33860, labs/jbossrules/trunk/drools-pipeline/drools-camel)
Modified: labs/jbossrules/trunk/drools-camel/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-camel/pom.xml 2010-07-14 03:51:53 UTC (rev 33860)
+++ labs/jbossrules/trunk/drools-camel/pom.xml 2010-07-14 23:38:11 UTC (rev 33889)
@@ -2,13 +2,13 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>drools-pipeline</artifactId>
+ <artifactId>drools</artifactId>
<groupId>org.drools</groupId>
<version>5.1.0.SNAPSHOT</version>
</parent>
<artifactId>drools-camel</artifactId>
- <name>Drools :: Pipeline :: Camel </name>
+ <name>Drools :: Camel </name>
<repositories>
<repository>
@@ -25,6 +25,7 @@
<scope>test</scope>
</dependency>
+ <!-- Drools -->
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-api</artifactId>
@@ -36,18 +37,17 @@
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-compiler</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-spring</artifactId>
- <scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-grid-core</artifactId>
- <version>${project.version}</version>
</dependency>
+
+ <!-- Camel -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
@@ -58,10 +58,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-test</artifactId>
<version>2.4-SNAPSHOT</version>
</dependency>
@@ -72,122 +68,121 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xstream</artifactId>
- <scope>optional</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jaxb</artifactId>
- <scope>optional</scope>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
+ </dependency>
+
+ <!-- Spring -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
</dependency>
+
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>2.5.6</version>
+ <scope>test</scope>
+ </dependency>
- <!-- CXF deps -->
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>2.2.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle-jaxrs</artifactId>
- <version>2.2.6</version>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <!-- CXF deps -->
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>2.2.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-bundle-jaxrs</artifactId>
+ <version>2.2.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>2.5.6</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ <scope>test</scope>
+ </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <version>2.1.3.GA</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <optional>true</optional>
+ </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
-<!-- <optional>true</optional>-->
- </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <optional>true</optional>
+ </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
-<!-- <optional>true</optional>-->
- </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
+
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
- <!-- web app deps -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
+
+
+ <!-- web app deps -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithMarshallersTest.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithMarshallersTest.java 2010-07-14 03:51:53 UTC (rev 33860)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithMarshallersTest.java 2010-07-14 23:38:11 UTC (rev 33889)
@@ -83,8 +83,8 @@
expectedXml += "<fact-handle identifier=\"salaboy\" external-form=\"" + ((InternalFactHandle) result.getFactHandle( "salaboy" )).toExternalForm() + "\"/>";
expectedXml += "</execution-results>";
- assertEquals( expectedXml,
- outXml );
+ assertXMLEqual( expectedXml,
+ outXml );
}
@@ -136,8 +136,8 @@
expectedXml += "<fact-handle identifier=\"salaboy\" external-form=\"" + ((InternalFactHandle) result.getFactHandle( "salaboy" )).toExternalForm() + "\"/>";
expectedXml += "</execution-results>";
- assertEquals( expectedXml,
- outXml );
+ assertXMLEqual( expectedXml,
+ outXml );
}
public void testNoSessionInsertCustomXstream() throws Exception {
@@ -171,8 +171,8 @@
expectedXml += "<fact-handle identifier=\"salaboy\" external-form=\"" + ((InternalFactHandle) result.getFactHandle( "salaboy" )).toExternalForm() + "\"/>";
expectedXml += "</execution-results>";
- assertEquals( expectedXml,
- outXml );
+ assertXMLEqual( expectedXml,
+ outXml );
}
public void testSessionGetObject() throws Exception {
@@ -198,8 +198,8 @@
expectedXml += "</result>";
expectedXml += "</execution-results>";
- assertEquals( expectedXml,
- outXml );
+ assertXMLEqual( expectedXml,
+ outXml );
}
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/DroolsCamelTestSupport.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/DroolsCamelTestSupport.java 2010-07-14 03:51:53 UTC (rev 33860)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/DroolsCamelTestSupport.java 2010-07-14 23:38:11 UTC (rev 33889)
@@ -40,8 +40,7 @@
public abstract class DroolsCamelTestSupport extends ContextTestSupport {
protected static final Logger LOG = LoggerFactory.getLogger(DroolsCamelTestSupport.class);
- protected ExecutionNode node;
-
+ protected ExecutionNode node;
public void setNode(ExecutionNode node) {
this.node = node;
@@ -108,6 +107,8 @@
diff.overrideElementQualifier(new RecursiveElementNameAndTextQualifier());
XMLAssert.assertXMLEqual(diff, true);
}
+
+
protected void configureDroolsContext() {
// TODO Auto-generated method stub
Modified: labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF 2010-07-14 22:48:30 UTC (rev 33888)
+++ labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF 2010-07-14 23:38:11 UTC (rev 33889)
@@ -17,7 +17,7 @@
n="2.0",org.mvel2.optimizers;version="2.0",org.mvel2.templates;versio
n="2.0",org.mvel2.util;version="2.0",org.osgi.framework;version="1.5"
,org.osgi.util.tracker;version="1.4",org.w3c.dom,org.xml.sax
-Bnd-LastModified: 1279063448029
+Bnd-LastModified: 1279113629300
Export-Package: org.drools.builder.impl;uses:="org.drools.compiler,com
.sun.tools.xjc";version="5.1.0.SNAPSHOT",org.drools.rule.builder;uses
:="org.drools.compiler,org.mvel2.compiler,org.mvel2,org.drools.rule.b
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/log4j.xml
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/log4j.xml 2010-07-14 22:48:30 UTC (rev 33888)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/log4j.xml 2010-07-14 23:38:11 UTC (rev 33889)
@@ -28,7 +28,7 @@
<level value="INFO"/>
</logger -->
<root>
- <priority value="DEBUG"/>
+ <priority value="INFO"/>
<appender-ref ref="CONSOLE"/>
</root>
</log4j:configuration>
Modified: labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF 2010-07-14 22:48:30 UTC (rev 33888)
+++ labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF 2010-07-14 23:38:11 UTC (rev 33889)
@@ -17,7 +17,7 @@
g.mvel2.optimizers;version="2.0",org.mvel2.templates;version="2.0",or
g.mvel2.util;version="2.0",org.osgi.framework;version="1.5",org.w3c.d
om,org.xml.sax,org.xml.sax.helpers
-Bnd-LastModified: 1279063392424
+Bnd-LastModified: 1279113530147
Export-Package: org.drools.ruleflow.instance;uses:="org.drools.workflo
w.instance.impl,org.drools.workflow.instance,org.drools.ruleflow.core
,org.drools.workflow.core.node,org.drools.process.instance";version="
Modified: labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF 2010-07-14 22:48:30 UTC (rev 33888)
+++ labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF 2010-07-14 23:38:11 UTC (rev 33889)
@@ -1,27 +1,27 @@
Manifest-Version: 1.0
+Bundle-Activator: org.drools.osgi.decisiontables.Activator
+Created-By: 1.5.0_21 (Sun Microsystems Inc.)
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Import-Package: jxl,jxl.read.biff,org.osgi.framework;version="1.5"
+Bnd-LastModified: 1279117747503
Export-Package: org.drools.decisiontable;uses:="org.drools.decisiontab
- le.parser,org.drools.decisiontable.parser.csv,org.drools.decisiontabl
- e.parser.xls";version="5.1.0.SNAPSHOT",org.drools.osgi.decisiontables
- ;uses:="org.drools.decisiontable,org.osgi.framework";version="5.1.0.S
- NAPSHOT",org.drools.decisiontable.parser;uses:="org.drools.decisionta
- ble.parser.xls";version="5.1.0.SNAPSHOT",org.drools.decisiontable.par
- ser.xls;uses:="jxl,jxl.read.biff,org.drools.decisiontable.parser";ver
- sion="5.1.0.SNAPSHOT",org.drools.decisiontable.parser.csv;uses:="org.
- drools.decisiontable.parser";version="5.1.0.SNAPSHOT"
+ le.parser.csv,org.drools.decisiontable.parser,org.drools.decisiontabl
+ e.parser.xls";version="5.1.0.SNAPSHOT",org.drools.decisiontable.parse
+ r.xls;uses:="jxl.read.biff,org.drools.decisiontable.parser,jxl";versi
+ on="5.1.0.SNAPSHOT",org.drools.decisiontable.parser.csv;uses:="org.dr
+ ools.decisiontable.parser";version="5.1.0.SNAPSHOT",org.drools.decisi
+ ontable.parser;uses:="org.drools.decisiontable.parser.xls";version="5
+ .1.0.SNAPSHOT",org.drools.osgi.decisiontables;uses:="org.drools.decis
+ iontable,org.osgi.framework";version="5.1.0.SNAPSHOT"
+Bundle-Version: 5.1.0.SNAPSHOT
+Bundle-Name: Drools :: Decision Tables
+Bundle-Description: A rule production system
Private-Package: python-dt;version="5.1.0.SNAPSHOT"
+Bundle-DocURL: http://www.jboss.org/
+Bundle-Vendor: JBoss Inc.
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.drools.decisiontables;singleton:=true
Tool: Bnd-0.0.357
-Bundle-Name: Drools :: Decision Tables
-Created-By: 1.6.0_20 (Apple Inc.)
Require-Bundle: org.drools.core;bundle-version="5.1.0.SNAPSHOT"
-Bundle-Vendor: JBoss Inc.
DynamicImport-Package: org.drools.*
-Bundle-Version: 5.1.0.SNAPSHOT
-Bnd-LastModified: 1277898117855
-Bundle-Activator: org.drools.osgi.decisiontables.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: A rule production system
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Import-Package: jxl,jxl.read.biff,org.osgi.framework;version="1.5"
-Bundle-SymbolicName: org.drools.decisiontables;singleton:=true
-Bundle-DocURL: http://www.jboss.org/
Property changes on: labs/jbossrules/trunk/drools-grid/drools-grid-core
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
.settings
target
+ .classpath
.project
.settings
target
*.tlog
Property changes on: labs/jbossrules/trunk/drools-grid/drools-grid-task
___________________________________________________________________
Name: svn:ignore
- target
.classpath
.project
+ target
.classpath
.project
.settings
Property changes on: labs/jbossrules/trunk/drools-persistence-jpa
___________________________________________________________________
Name: svn:ignore
- target
local
.metadata
.settings
.wtpmodules
nbproject
*.ipr
*.iws
*.iml
btm1.tlog
btm2.tlog
.classpath
.project
+ target
local
.metadata
.settings
.wtpmodules
nbproject
*.ipr
*.iws
*.iml
btm1.tlog
btm2.tlog
.classpath
.project
*.db
Modified: labs/jbossrules/trunk/drools-persistence-jpa/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-persistence-jpa/META-INF/MANIFEST.MF 2010-07-14 22:48:30 UTC (rev 33888)
+++ labs/jbossrules/trunk/drools-persistence-jpa/META-INF/MANIFEST.MF 2010-07-14 23:38:11 UTC (rev 33889)
@@ -1,34 +1,34 @@
Manifest-Version: 1.0
-Export-Package: org.drools.persistence.jpa.grid;uses:="org.drools.pers
- istence.processinstance,org.drools.persistence.session";version="5.1.
- 0.SNAPSHOT",org.drools.persistence.processinstance;uses:="javax.persi
- stence,org.drools.persistence.processinstance.variabletypes,org.hiber
- nate.annotations,org.drools.persistence.processinstance.persisters";v
- ersion="5.1.0.SNAPSHOT",org.drools.persistence.jpa.impl;uses:="org.dr
- ools.persistence.processinstance,org.drools.persistence.session";vers
- ion="5.1.0.SNAPSHOT",org.drools.persistence.processinstance.persister
- s;uses:="org.drools.persistence.processinstance.variabletypes,javax.p
- ersistence";version="5.1.0.SNAPSHOT",org.drools.persistence.processin
- stance.variabletypes;uses:="javax.persistence";version="5.1.0.SNAPSHO
- T",org.drools.persistence.osgi;uses:="org.osgi.framework,org.hibernat
- e.ejb";version="5.1.0.SNAPSHOT",org.drools.persistence.session;uses:=
- "javax.persistence,org.drools.persistence.processinstance,javax.trans
- action,javax.naming";version="5.1.0.SNAPSHOT"
+Created-By: 1.5.0_21 (Sun Microsystems Inc.)
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Import-Package: javax.naming,javax.persistence,javax.transaction,org.h
+ ibernate.annotations,org.hibernate.ejb,org.osgi.framework;version="1.
+ 5",org.slf4j;version="1.6"
+Bnd-LastModified: 1279115684329
+Export-Package: org.drools.persistence.processinstance.persisters;uses
+ :="org.drools.persistence.processinstance.variabletypes,javax.persist
+ ence";version="5.1.0.SNAPSHOT",org.drools.persistence.session;uses:="
+ javax.persistence,javax.naming,org.slf4j,javax.transaction,org.drools
+ .persistence.processinstance";version="5.1.0.SNAPSHOT",org.drools.per
+ sistence.processinstance;uses:="javax.persistence,org.hibernate.annot
+ ations,org.drools.persistence.processinstance.variabletypes,org.drool
+ s.persistence.processinstance.persisters";version="5.1.0.SNAPSHOT",or
+ g.drools.persistence.jpa.impl;uses:="org.drools.persistence.session,o
+ rg.drools.persistence.processinstance";version="5.1.0.SNAPSHOT",org.d
+ rools.persistence.processinstance.variabletypes;uses:="javax.persiste
+ nce";version="5.1.0.SNAPSHOT",org.drools.persistence.jpa.grid;uses:="
+ org.drools.persistence.session,org.drools.persistence.processinstance
+ ";version="5.1.0.SNAPSHOT",org.drools.persistence.osgi;uses:="org.osg
+ i.framework,org.hibernate.ejb";version="5.1.0.SNAPSHOT"
+Bundle-Version: 5.1.0.SNAPSHOT
+Bundle-Name: Drools :: Persistence :: JPA
+Bundle-Description: A rule production system
+Bundle-DocURL: http://www.jboss.org/
+Bundle-Vendor: JBoss Inc.
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.drools.persistence-jpa
Tool: Bnd-0.0.357
-Bundle-Name: Drools :: Persistence :: JPA
-Created-By: 1.6.0_20 (Apple Inc.)
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: 1277898078667
-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.h
- ibernate.annotations,org.hibernate.ejb,org.osgi.framework;version="1.
- 5"
-Bundle-SymbolicName: org.drools.persistence-jpa
-Bundle-DocURL: http://www.jboss.org/
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/pom.xml 2010-07-14 22:48:30 UTC (rev 33888)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/pom.xml 2010-07-14 23:38:11 UTC (rev 33889)
@@ -10,18 +10,23 @@
<artifactId>drools-process-task</artifactId>
<packaging>jar</packaging>
<name>Drools :: Process :: Task</name>
- <!--build>
+ <build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ <version>2.5</version>
<configuration>
- <argLine>-Xdebug -Djava.compiler=none -Xnoagent -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address}</argLine>
+ <!--argLine>-Xdebug -Djava.compiler=none -Xnoagent -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address}</argLine-->
+ <excludes>
+ <exclude>**/mina/**</exclude>
+ <exclude>**/SimpleTest.java</exclude>
+ </excludes>
+
</configuration>
</plugin>
</plugins>
- </build-->
+ </build>
<dependencies>
<dependency>
<groupId>org.drools</groupId>
@@ -39,7 +44,7 @@
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>2.0.0-M6</version>
+ <version>2.0.0-RC1</version>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
Modified: labs/jbossrules/trunk/drools-process/drools-workitems/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-workitems/pom.xml 2010-07-14 22:48:30 UTC (rev 33888)
+++ labs/jbossrules/trunk/drools-process/drools-workitems/pom.xml 2010-07-14 23:38:11 UTC (rev 33889)
@@ -15,7 +15,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ <version>2.5</version>
<configuration>
<argLine>-Xdebug -Djava.compiler=none -Xnoagent -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address}</argLine>
</configuration>
Modified: labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF 2010-07-14 22:48:30 UTC (rev 33888)
+++ labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF 2010-07-14 23:38:11 UTC (rev 33889)
@@ -1,23 +1,23 @@
Manifest-Version: 1.0
-Export-Package: org.drools.template.model;version="5.1.0.SNAPSHOT",org
- .drools.template.objects;uses:="org.drools.template,org.drools.templa
- te.parser";version="5.1.0.SNAPSHOT",org.drools.template.parser;uses:=
- "org.mvel2.templates,org.drools.template.model";version="5.1.0.SNAPSH
- OT",org.drools.template.jdbc;uses:="org.drools.template.parser";versi
- on="5.1.0.SNAPSHOT",org.drools.template;uses:="org.drools.template.pa
- rser,org.drools.template.objects";version="5.1.0.SNAPSHOT"
-Tool: Bnd-0.0.357
+Created-By: 1.5.0_21 (Sun Microsystems Inc.)
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Import-Package: org.mvel2.templates;version="2.0"
+Bnd-LastModified: 1279117720429
+Export-Package: org.drools.template.jdbc;uses:="org.drools.template.pa
+ rser";version="5.1.0.SNAPSHOT",org.drools.template;uses:="org.drools.
+ template.parser,org.drools.template.objects";version="5.1.0.SNAPSHOT"
+ ,org.drools.template.parser;uses:="org.mvel2.templates,org.drools.tem
+ plate.model";version="5.1.0.SNAPSHOT",org.drools.template.objects;use
+ s:="org.drools.template,org.drools.template.parser";version="5.1.0.SN
+ APSHOT",org.drools.template.model;version="5.1.0.SNAPSHOT"
+Bundle-Version: 5.1.0.SNAPSHOT
Bundle-Name: Drools :: Templates
-Created-By: 1.6.0_20 (Apple Inc.)
-Require-Bundle: org.drools.core;bundle-version="5.1.0.SNAPSHOT"
+Bundle-Description: A rule production system
+Bundle-DocURL: http://www.jboss.org/
Bundle-Vendor: JBoss Inc.
-DynamicImport-Package: org.drools.*
-Bundle-Version: 5.1.0.SNAPSHOT
-Bnd-LastModified: 1277898115614
Bundle-ManifestVersion: 2
-Bundle-Description: A rule production system
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Import-Package: org.mvel2.templates;version="2.0"
Bundle-SymbolicName: org.drools.templates;singleton:=true
-Bundle-DocURL: http://www.jboss.org/
+Tool: Bnd-0.0.357
+Require-Bundle: org.drools.core;bundle-version="5.1.0.SNAPSHOT"
+DynamicImport-Package: org.drools.*
Modified: labs/jbossrules/trunk/osgi-bundles/jxls/org.drools.osgi.wrapper.jxls-reader/maven-eclipse.xml
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/jxls/org.drools.osgi.wrapper.jxls-reader/maven-eclipse.xml 2010-07-14 22:48:30 UTC (rev 33888)
+++ labs/jbossrules/trunk/osgi-bundles/jxls/org.drools.osgi.wrapper.jxls-reader/maven-eclipse.xml 2010-07-14 23:38:11 UTC (rev 33889)
@@ -1,11 +1,11 @@
-<project default="copy-resources">
- <target name="init"/>
- <target name="copy-resources" depends="init">
- <copy todir="target/classes/META-INF" filtering="false">
- <fileset dir="META-INF" includes="" excludes="**/*.java"/>
- </copy>
- <copy todir="target/classes/lib" filtering="false">
- <fileset dir="lib" includes="*.jar" excludes="**/*.java"/>
- </copy>
- </target>
+<project default="copy-resources">
+ <target name="init"/>
+ <target name="copy-resources" depends="init">
+ <copy todir="target/classes/META-INF" filtering="false">
+ <fileset dir="META-INF" includes="" excludes="**/*.java"/>
+ </copy>
+ <copy todir="target/classes/lib" filtering="false">
+ <fileset dir="lib" includes="*.jar" excludes="**/*.java"/>
+ </copy>
+ </target>
</project>
\ No newline at end of file
Modified: labs/jbossrules/trunk/osgi-bundles/org.milyn/org.drools.osgi.wrapper.milyn-smooks-javabean/maven-eclipse.xml
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/org.milyn/org.drools.osgi.wrapper.milyn-smooks-javabean/maven-eclipse.xml 2010-07-14 22:48:30 UTC (rev 33888)
+++ labs/jbossrules/trunk/osgi-bundles/org.milyn/org.drools.osgi.wrapper.milyn-smooks-javabean/maven-eclipse.xml 2010-07-14 23:38:11 UTC (rev 33889)
@@ -1,11 +1,11 @@
-<project default="copy-resources">
- <target name="init"/>
- <target name="copy-resources" depends="init">
- <copy todir="target/classes/META-INF" filtering="false">
- <fileset dir="META-INF" includes="" excludes="**/*.java"/>
- </copy>
- <copy todir="target/classes/lib" filtering="false">
- <fileset dir="lib" includes="*.jar" excludes="**/*.java"/>
- </copy>
- </target>
+<project default="copy-resources">
+ <target name="init"/>
+ <target name="copy-resources" depends="init">
+ <copy todir="target/classes/META-INF" filtering="false">
+ <fileset dir="META-INF" includes="" excludes="**/*.java"/>
+ </copy>
+ <copy todir="target/classes/lib" filtering="false">
+ <fileset dir="lib" includes="*.jar" excludes="**/*.java"/>
+ </copy>
+ </target>
</project>
\ No newline at end of file
Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml 2010-07-14 22:48:30 UTC (rev 33888)
+++ labs/jbossrules/trunk/pom.xml 2010-07-14 23:38:11 UTC (rev 33889)
@@ -251,6 +251,7 @@
<module>drools-grid</module>
<module>drools-pipeline</module>
<module>drools-container</module>
+<module>drools-camel</module>
<module>drools-simulator</module>
<module>drools-jsr94</module>
<module>drools-templates</module>
@@ -554,7 +555,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.5</version>
<configuration>
<includes>
<include>**/*Test.java</include>
@@ -747,7 +748,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.2</version>
+ <version>2.5</version>
<reportSets>
<reportSet>
<reports>
@@ -864,6 +865,11 @@
</dependency>
<dependency>
<groupId>org.drools</groupId>
+ <artifactId>drools-grid-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
<artifactId>drools-compiler</artifactId>
<version>${project.version}</version>
</dependency>
@@ -947,6 +953,11 @@
</dependency>
<dependency>
<groupId>org.drools</groupId>
+ <artifactId>drools-camel</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
<artifactId>drools-ant</artifactId>
<version>${project.version}</version>
</dependency>
@@ -1464,7 +1475,7 @@
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
- <version>1.2</version>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
More information about the jboss-svn-commits
mailing list