[jboss-svn-commits] JBL Code SVN: r31688 - in labs/jbossrules/trunk/osgi-bundles: org.drools.osgi.test and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Feb 15 20:10:25 EST 2010
Author: mark.proctor at jboss.com
Date: 2010-02-15 20:10:24 -0500 (Mon, 15 Feb 2010)
New Revision: 31688
Modified:
labs/jbossrules/trunk/osgi-bundles/btm/org.drools.osgi.wrapper.btm/META-INF/MANIFEST.MF
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/java/org/drools/osgi/integrationtests/JpaOsgiTest.java
labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/META-INF/persistence.xml
labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/boot-bundles.properties
Log:
JBRULES-2351 OSGi Ready
-trying to get JPA to work now
Modified: labs/jbossrules/trunk/osgi-bundles/btm/org.drools.osgi.wrapper.btm/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/btm/org.drools.osgi.wrapper.btm/META-INF/MANIFEST.MF 2010-02-16 00:56:17 UTC (rev 31687)
+++ labs/jbossrules/trunk/osgi-bundles/btm/org.drools.osgi.wrapper.btm/META-INF/MANIFEST.MF 2010-02-16 01:10:24 UTC (rev 31688)
@@ -17,7 +17,7 @@
javax.swing.event;resolution:=optional,javax.swing.table;resolution:=
optional,javax.swing.tree;resolution:=optional,javax.transaction,java
x.transaction.xa;resolution:=optional,org.slf4j;version="1.5"
-Bnd-LastModified: 1266280253029
+Bnd-LastModified: 1266282021261
Export-Package: bitronix.tm;uses:="bitronix.tm.resource.common,bitroni
x.tm.twopc,bitronix.tm.resource,javax.transaction.xa,bitronix.tm.util
s,bitronix.tm.twopc.executor,org.slf4j,bitronix.tm.journal,bitronix.t
Modified: labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/.classpath
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/.classpath 2010-02-16 00:56:17 UTC (rev 31687)
+++ labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/.classpath 2010-02-16 01:10:24 UTC (rev 31688)
@@ -5,7 +5,9 @@
<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/persistence/com.springsource.javax.persistence/2.0.0/com.springsource.javax.persistence-2.0.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/persistence/com.springsource.javax.persistence/1.99.0/com.springsource.javax.persistence-1.99.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/transaction/com.springsource.javax.transaction/1.1.0/com.springsource.javax.transaction-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/javax/transaction/jta/1.1/jta-1.1.jar"/>
@@ -17,9 +19,8 @@
<classpathentry kind="var" path="M2_REPO/org/antlr/com.springsource.antlr/2.7.6/com.springsource.antlr-2.7.6.jar"/>
<classpathentry kind="var" path="M2_REPO/org/beanshell/com.springsource.bsh/2.0.0.b4/com.springsource.bsh-2.0.0.b4.jar"/>
<classpathentry kind="var" path="M2_REPO/com/mchange/c3p0/com.springsource.com.mchange.v2.c3p0/0.9.1.2/com.springsource.com.mchange.v2.c3p0-0.9.1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/opensymphony/oscache/com.springsource.com.opensymphony.oscache/2.4.1/com.springsource.com.opensymphony.oscache-2.4.1.jar"/>
<classpathentry kind="var" path="M2_REPO/com/sleepycat/je/com.springsource.com.sleepycat.je/3.3.87/com.springsource.com.sleepycat.je-3.3.87.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/msv/com.springsource.com.sun.msv.datatype/0.0.0.20060615/com.springsource.com.sun.msv.datatype-0.0.0.20060615.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"/>
@@ -31,8 +32,8 @@
<classpathentry kind="var" path="M2_REPO/net/sourceforge/jdbm/com.springsource.jdbm/1.0.0/com.springsource.jdbm-1.0.0.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/net/sourceforge/cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-2.1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/net/sourceforge/ehcache/com.springsource.net.sf.ehcache/1.2.3/com.springsource.net.sf.ehcache-1.2.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sourceforge/cglib/com.springsource.net.sf.cglib/2.2.0/com.springsource.net.sf.cglib-2.2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sourceforge/ehcache/com.springsource.net.sf.ehcache/1.6.2/com.springsource.net.sf.ehcache-1.6.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"/>
@@ -54,7 +55,7 @@
<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/com/h2database/com.springsource.org.h2/1.0.71/com.springsource.org.h2-1.0.71.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/com.springsource.org.hibernate/3.2.6.ga/com.springsource.org.hibernate-3.2.6.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/com.springsource.org.hibernate/3.3.2.GA/com.springsource.org.hibernate-3.3.2.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/org/hibernate/com.springsource.org.hibernate.annotations/3.4.0.GA/com.springsource.org.hibernate.annotations-3.4.0.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/org/hibernate/com.springsource.org.hibernate.annotations.common/3.3.0.ga/com.springsource.org.hibernate.annotations.common-3.3.0.ga.jar"/>
<classpathentry kind="var" path="M2_REPO/org/hibernate/com.springsource.org.hibernate.cache/3.3.2.GA/com.springsource.org.hibernate.cache-3.3.2.GA.jar"/>
Modified: labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/.project
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/.project 2010-02-16 00:56:17 UTC (rev 31687)
+++ labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/.project 2010-02-16 01:10:24 UTC (rev 31688)
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.drools.osgi.test</name>
- <comment>A rule production system</comment>
- <projects>
- <project>drools-api</project>
- <project>drools-compiler</project>
- <project>drools-core</project>
- </projects>
+ <name>org.drools.osgi.test</name>
+ <comment>A rule production system</comment>
+ <projects>
+ <project>drools-api</project>
+ <project>drools-compiler</project>
+ <project>drools-core</project>
+ </projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
Modified: labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/JpaOsgiTest.java
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/JpaOsgiTest.java 2010-02-16 00:56:17 UTC (rev 31687)
+++ labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/JpaOsgiTest.java 2010-02-16 01:10:24 UTC (rev 31688)
@@ -7,6 +7,7 @@
import javax.naming.InitialContext;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
+import javax.persistence.spi.PersistenceProvider;
import javax.transaction.UserTransaction;
import org.drools.KnowledgeBase;
@@ -24,6 +25,7 @@
import org.drools.runtime.EnvironmentName;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.util.ServiceRegistry;
+import org.hibernate.ejb.HibernatePersistence;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
@@ -67,13 +69,17 @@
URL url = getClass().getClassLoader().getResource( "META-INF/persistence.xml" );
System.out.println( url );
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
- try {
- Thread.currentThread().setContextClassLoader( getClass().getClassLoader() );
- emf = Persistence.createEntityManagerFactory( "org.drools.persistence.jpa" );
- } finally {
- Thread.currentThread().setContextClassLoader( cl );
- }
+// ClassLoader cl = Thread.currentThread().getContextClassLoader();
+// try {
+// Thread.currentThread().setContextClassLoader( HibernatePersistence.class.getClassLoader() );
+// emf = Persistence.createEntityManagerFactory( "org.drools.persistence.jpa" );
+// } finally {
+// Thread.currentThread().setContextClassLoader( cl );
+// }
+ //System.out.println( Persistence.getPersistenceUtil().isLoaded( "org.drools.persistence.jpa" ) );
+// for ( PersistenceProvider prov : Persistence.getProviderResolver().findAllProviders() ) {
+// System.out.println( prov );
+// }
emf = Persistence.createEntityManagerFactory( "org.drools.persistence.jpa" );
}
Modified: labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/META-INF/persistence.xml
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/META-INF/persistence.xml 2010-02-16 00:56:17 UTC (rev 31687)
+++ labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/META-INF/persistence.xml 2010-02-16 01:10:24 UTC (rev 31688)
@@ -1,25 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<persistence version="1.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd">
- <!--persistence-unit name="ProcessService">
- <jta-data-source>java:/DefaultDS</jta-data-source>
- <properties>
- <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
- </properties>
- </persistence-unit-->
-
+
<persistence-unit name="org.drools.persistence.jpa" transaction-type="JTA">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
<jta-data-source>jdbc/testDS1</jta-data-source>
<class>org.drools.persistence.session.SessionInfo</class>
- <class>org.drools.persistence.processinstance.ProcessInstanceInfo</class>
- <class>org.drools.persistence.processinstance.EventType</class>
- <class>org.drools.persistence.session.MyEntity</class>
- <class>org.drools.persistence.session.MyEntityMethods</class>
- <class>org.drools.persistence.session.MyEntityOnlyFields</class>
- <class>org.drools.persistence.processinstance.variabletypes.JPAPersistedVariable</class>
- <class>org.drools.persistence.processinstance.variabletypes.VariableInstanceInfo</class>
- <class>org.drools.persistence.processinstance.variabletypes.SerializablePersistedVariable</class>
- <class>org.drools.persistence.processinstance.WorkItemInfo</class>
+ <class>org.drools.persistence.processinstance.ProcessInstanceInfo</class>
+ <class>org.drools.persistence.processinstance.EventType</class>
+ <class>org.drools.persistence.session.MyEntity</class>
+ <class>org.drools.persistence.session.MyEntityMethods</class>
+ <class>org.drools.persistence.session.MyEntityOnlyFields</class>
+ <class>org.drools.persistence.processinstance.variabletypes.JPAPersistedVariable</class>
+ <class>org.drools.persistence.processinstance.variabletypes.VariableInstanceInfo</class>
+ <class>org.drools.persistence.processinstance.variabletypes.SerializablePersistedVariable</class>
+ <class>org.drools.persistence.processinstance.WorkItemInfo</class>
<properties>
<property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
<property name="hibernate.max_fetch_depth" value="3"/>
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-16 00:56:17 UTC (rev 31687)
+++ labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/boot-bundles.properties 2010-02-16 01:10:24 UTC (rev 31688)
@@ -66,7 +66,6 @@
org.jboss.util,com.springsource.org.jboss.util,2.2.13.GA
#javax
-javax.persistence,com.springsource.javax.persistence,2.0.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
More information about the jboss-svn-commits
mailing list