[jboss-svn-commits] JBL Code SVN: r31665 - in labs/jbossrules/trunk/osgi-bundles: org.drools.osgi.test and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Feb 15 01:42:30 EST 2010
Author: mark.proctor at jboss.com
Date: 2010-02-15 01:42:30 -0500 (Mon, 15 Feb 2010)
New Revision: 31665
Modified:
labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/.classpath
labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/.project
labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/boot-bundles.properties
labs/jbossrules/trunk/osgi-bundles/pom.xml
Log:
JBRULES-2351 OSGi Ready
-integration tests should work for maven and eclipse
-drools-persistence-jpa now resolves
Modified: labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/.classpath
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/.classpath 2010-02-14 23:56:21 UTC (rev 31664)
+++ labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/.classpath 2010-02-15 06:42:30 UTC (rev 31665)
@@ -59,10 +59,10 @@
<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="src" path="/drools-api"/>
- <classpathentry kind="src" path="/drools-compiler"/>
+ <classpathentry kind="var" path="M2_REPO/org/drools/drools-compiler/5.1.0.SNAPSHOT/drools-compiler-5.1.0.SNAPSHOT.jar"/>
<classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="src" path="/drools-decisiontables"/>
- <classpathentry kind="src" path="/drools-templates"/>
+ <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"/>
Modified: labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/.project
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/.project 2010-02-14 23:56:21 UTC (rev 31664)
+++ labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/.project 2010-02-15 06:42:30 UTC (rev 31665)
@@ -3,10 +3,7 @@
<comment>A rule production system</comment>
<projects>
<project>drools-api</project>
- <project>drools-compiler</project>
<project>drools-core</project>
- <project>drools-decisiontables</project>
- <project>drools-templates</project>
</projects>
<buildSpec>
<buildCommand>
Modified: labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/boot-bundles.properties
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/boot-bundles.properties 2010-02-14 23:56:21 UTC (rev 31664)
+++ labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/boot-bundles.properties 2010-02-15 06:42:30 UTC (rev 31665)
@@ -48,26 +48,35 @@
#commons
-#org.apache.commons,com.springsource.org.apache.commons.lang,2.4.0
+org.apache.commons,com.springsource.org.apache.commons.lang,2.4.0
+org.apache.commons,com.springsource.org.apache.commons.io,1.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.apache.log4j,com.springsource.org.apache.log4j,1.2.15
+org.apache.commons,com.springsource.org.apache.commons.logging,1.1.1
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.persistence,com.springsource.javax.persistence,1.99.0
+javax.activation,com.springsource.javax.activation,1.1.1
+javax.servlet,com.springsource.javax.servlet,2.5.0
+javax.transaction,com.springsource.javax.transaction,1.1.0
+javax.xml.stream,com.springsource.javax.xml.stream,1.0.1
+javax.xml.bind,com.springsource.javax.xml.bind,2.1.7
+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.antlr,com.springsource.antlr,2.7.6
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
@@ -77,7 +86,6 @@
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
@@ -85,23 +93,50 @@
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
+
+#dom4j
org.dom4j,com.springsource.org.dom4j,1.6.1
+#jaxb
+com.sun.xml,com.springsource.com.sun.xml.bind,2.1.7
+com.sun.xml,com.springsource.com.sun.xml.bind.jaxb1,2.1.7
+
+com.sun.msv,com.springsource.com.sun.msv.datatype,0.0.0.20060615
+org.relaxng,com.springsource.org.relaxng.datatype,1.0.0
+net.sourceforge.iso-relax,com.springsource.org.iso_relax.verifier,0.0.0.20041111
+com.sun.xml,com.springsource.com.sun.tools.xjc,2.1.7
+com.sun.xml,com.springsource.com.sun.xml.fastinfoset,1.2.2
+org.jvnet.staxex,com.springsource.org.jvnet.staxex,1.0.0
+
# aop alliance
org.aopalliance,com.springsource.org.aopalliance,1.0.0=
# asm
-org.objectweb.asm,com.springsource.org.objectweb.asm,${ignore.asm.version}=
+org.objectweb.asm,com.springsource.org.objectweb.asm,2.2.3=
+org.objectweb.asm,com.springsource.org.objectweb.asm,1.5.3=
org.springframework,org.springframework.asm,${ignore.spring.version}=
#persistence
-javax.persistence,com.springsource.javax.persistence,2.0.0
org.jboss.util,com.springsource.org.jboss.util,2.2.13.GA
org.jboss.logging,com.springsource.org.jboss.logging,2.0.5.GA
+org.hibernate,com.springsource.org.hibernate,3.3.2.GA
org.hibernate,com.springsource.org.hibernate.ejb,3.4.0.GA
org.hibernate,com.springsource.org.hibernate.annotations.common,3.3.0.ga
org.hibernate,com.springsource.org.hibernate.annotations,3.4.0.GA
+org.hibernate,com.springsource.org.hibernate.cache,3.3.2.GA
+com.mchange.c3p0,com.springsource.com.mchange.v2.c3p0,0.9.1.2
+org.jboss.javassist,com.springsource.javassist,3.9.0.GA
+net.sourceforge.cglib,com.springsource.net.sf.cglib,2.2.0
+org.jgroups,com.springsource.org.jgroups,2.5.1
+org.jboss.cache,com.springsource.org.jboss.cache,3.2.0.GA
+org.apache.ant,com.springsource.org.apache.tools.ant,1.7.1
+
+org.logicalcobwebs,com.springsource.org.logicalcobwebs.proxool,0.9.1
+org.logicalcobwebs,com.springsource.org.logicalcobwebs.cglib.core,0.9.1
+org.bouncycastle,com.springsource.org.bouncycastle.jce,1.39.0
+
+
# spring libs
${ignore.spring.groupId},org.springframework.aop,${ignore.spring.version}=
#${ignore.spring.groupId},org.springframework.aspects,${ignore.spring.version}=
@@ -129,12 +164,7 @@
${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}
Modified: labs/jbossrules/trunk/osgi-bundles/pom.xml
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/pom.xml 2010-02-14 23:56:21 UTC (rev 31664)
+++ labs/jbossrules/trunk/osgi-bundles/pom.xml 2010-02-15 06:42:30 UTC (rev 31665)
@@ -78,6 +78,35 @@
<excludeTransitive>true</excludeTransitive>
</configuration>
</execution>
+
+ <execution>
+ <id>copy earlier version of asm</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.objectweb.asm</groupId>
+ <artifactId>com.springsource.org.objectweb.asm</artifactId>
+ <version>1.5.3</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jgroups</groupId>
+ <artifactId>com.springsource.org.jgroups</artifactId>
+ <version>2.2.8</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ </artifactItem>
+
+ </artifactItems>
+ <outputDirectory>plugins</outputDirectory>
+ <overWriteReleases>true</overWriteReleases>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
@@ -225,11 +254,14 @@
</exclusion>
</exclusions>
</dependency>
- <!--dependency>
+
+
+ <dependency>
<groupId>org.antlr</groupId>
- <artifactId>gunit</artifactId>
- <version>3.1.3</version>
- </dependency-->
+ <artifactId>com.springsource.antlr</artifactId>
+ <version>2.7.6</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.jasper.springsource</groupId>
<artifactId>com.springsource.org.apache.jasper.org.eclipse.jdt.springsource</artifactId>
@@ -455,7 +487,8 @@
<version>${equinox.ver}</version>
<type>jar</type>
<scope>test</scope>
- </dependency>
+ </dependency>
+
<dependency>
<groupId>org.junit</groupId>
<artifactId>com.springsource.junit</artifactId>
More information about the jboss-svn-commits
mailing list