Author: jeff.yuchang Date: 2010-05-26 04:21:22 -0400 (Wed, 26 May 2010) New Revision: 669 Modified: branches/ODE/ODE-1.x-jpa/jbi-bundle/pom.xml branches/ODE/ODE-1.x-jpa/jbi-bundle/src/main/resources/META-INF/persistence.xml branches/ODE/ODE-1.x-jpa/jbi/src/main/assembly/bin.xml branches/ODE/ODE-1.x-jpa/jbi/src/test/jbi/ode-jbi.properties branches/ODE/ODE-1.x-jpa/pom.xml Log: * fix the error for jbi module, not running the axis2-war testing module. Modified: branches/ODE/ODE-1.x-jpa/jbi/src/main/assembly/bin.xml =================================================================== --- branches/ODE/ODE-1.x-jpa/jbi/src/main/assembly/bin.xml 2010-05-25 18:58:21 UTC (rev 668) +++ branches/ODE/ODE-1.x-jpa/jbi/src/main/assembly/bin.xml 2010-05-26 08:21:22 UTC (rev 669) @@ -44,12 +44,12 @@ </fileSet> <fileSet> - <directory>${basedir}/../dao-jpa-ojpa-derby/target/derby</directory> + <directory>${basedir}/../dao-jpa-db/target/ode-db</directory> <outputDirectory>/</outputDirectory> </fileSet> <fileSet> - <directory>${basedir}/../dao-hibernate-db/target/derby</directory> + <directory>${basedir}/../dao-hibernate-db/target/ode-db-hib</directory> <outputDirectory>/</outputDirectory> </fileSet> Modified: branches/ODE/ODE-1.x-jpa/jbi/src/test/jbi/ode-jbi.properties =================================================================== --- branches/ODE/ODE-1.x-jpa/jbi/src/test/jbi/ode-jbi.properties 2010-05-25 18:58:21 UTC (rev 668) +++ branches/ODE/ODE-1.x-jpa/jbi/src/test/jbi/ode-jbi.properties 2010-05-26 08:21:22 UTC (rev 669) @@ -62,7 +62,7 @@ # DAO Connection Factory class. # uncomment the following for hibernate. -ode-jbi.dao.factory=org.apache.ode.daohib.bpel.BpelDAOConnectionFactoryImpl +ode-jbi.dao.factory=org.apache.ode.dao.hib.bpel.BpelDAOConnectionFactoryImpl # Class name of the message mapper that should be used to convert message # between ODE / NMS. Modified: branches/ODE/ODE-1.x-jpa/jbi-bundle/pom.xml =================================================================== --- branches/ODE/ODE-1.x-jpa/jbi-bundle/pom.xml 2010-05-25 18:58:21 UTC (rev 668) +++ branches/ODE/ODE-1.x-jpa/jbi-bundle/pom.xml 2010-05-26 08:21:22 UTC (rev 669) @@ -76,8 +76,8 @@ <DynamicImport-Package>*</DynamicImport-Package> <Include-Resource> src/main/resources, -@../dao-jpa-ojpa-derby/target/riftsaw-dao-jpa-ojpa-derby-${project.version}.zip, -@../dao-hibernate-db/target/riftsaw-dao-hibernate-db-${project.version}.zip, +@../dao-jpa-db/target/ode-db-derby-ojpa-${project.version}.zip, +@../dao-hibernate-db/target/ode-db-derby-hib-${project.version}.zip, </Include-Resource> </instructions> @@ -104,6 +104,18 @@ </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> + <artifactId>riftsaw-dao-jpa-db</artifactId> + <version>${project.version}</version> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.soa.bpel</groupId> + <artifactId>riftsaw-dao-hib-db</artifactId> + <version>${project.version}</version> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-dao-jpa</artifactId> <version>${project.version}</version> </dependency> Modified: branches/ODE/ODE-1.x-jpa/jbi-bundle/src/main/resources/META-INF/persistence.xml =================================================================== --- branches/ODE/ODE-1.x-jpa/jbi-bundle/src/main/resources/META-INF/persistence.xml 2010-05-25 18:58:21 UTC (rev 668) +++ branches/ODE/ODE-1.x-jpa/jbi-bundle/src/main/resources/META-INF/persistence.xml 2010-05-26 08:21:22 UTC (rev 669) @@ -20,38 +20,38 @@ <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0"> - <persistence-unit name="ode-dao"> + <persistence-unit name="ode-bpel" transaction-type="JTA"> <!-- This properties file is used specifically by the OpenJPA Enhancer. --> <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider> - <class>org.apache.ode.dao.jpa.ActivityRecoveryDAOImpl</class> - <class>org.apache.ode.dao.jpa.CorrelationSetDAOImpl</class> - <class>org.apache.ode.dao.jpa.CorrelatorDAOImpl</class> - <class>org.apache.ode.dao.jpa.EventDAOImpl</class> - <class>org.apache.ode.dao.jpa.FaultDAOImpl</class> - <class>org.apache.ode.dao.jpa.MessageDAOImpl</class> - <class>org.apache.ode.dao.jpa.MessageExchangeDAOImpl</class> - <class>org.apache.ode.dao.jpa.MessageRouteDAOImpl</class> - <class>org.apache.ode.dao.jpa.PartnerLinkDAOImpl</class> - <class>org.apache.ode.dao.jpa.ProcessDAOImpl</class> - <class>org.apache.ode.dao.jpa.ProcessInstanceDAOImpl</class> - <class>org.apache.ode.dao.jpa.ScopeDAOImpl</class> - <class>org.apache.ode.dao.jpa.XmlDataDAOImpl</class> - <class>org.apache.ode.dao.jpa.CorrSetProperty</class> - <class>org.apache.ode.dao.jpa.MexProperty</class> - <class>org.apache.ode.dao.jpa.XmlDataProperty</class> + <class>org.apache.ode.dao.jpa.bpel.ActivityRecoveryDAOImpl</class> + <class>org.apache.ode.dao.jpa.bpel.CorrelationSetDAOImpl</class> + <class>org.apache.ode.dao.jpa.bpel.CorrelatorDAOImpl</class> + <class>org.apache.ode.dao.jpa.bpel.EventDAOImpl</class> + <class>org.apache.ode.dao.jpa.bpel.FaultDAOImpl</class> + <class>org.apache.ode.dao.jpa.bpel.MessageDAOImpl</class> + <class>org.apache.ode.dao.jpa.bpel.MessageExchangeDAOImpl</class> + <class>org.apache.ode.dao.jpa.bpel.MessageRouteDAOImpl</class> + <class>org.apache.ode.dao.jpa.bpel.PartnerLinkDAOImpl</class> + <class>org.apache.ode.dao.jpa.bpel.ProcessDAOImpl</class> + <class>org.apache.ode.dao.jpa.bpel.ProcessInstanceDAOImpl</class> + <class>org.apache.ode.dao.jpa.bpel.ScopeDAOImpl</class> + <class>org.apache.ode.dao.jpa.bpel.XmlDataDAOImpl</class> + <class>org.apache.ode.dao.jpa.bpel.CorrSetProperty</class> + <class>org.apache.ode.dao.jpa.bpel.MexProperty</class> + <class>org.apache.ode.dao.jpa.bpel.XmlDataProperty</class> </persistence-unit> - <persistence-unit name="ode-store"> + <persistence-unit name="ode-store" transaction-type="JTA"> <!-- This properties file is used specifically by the OpenJPA Enhancer. --> <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider> - <class>org.apache.ode.store.jpa.ProcessConfDaoImpl</class> - <class>org.apache.ode.store.jpa.ProcessConfPropertyDaoImpl</class> - <class>org.apache.ode.store.jpa.DeploymentUnitDaoImpl</class> - <class>org.apache.ode.store.jpa.VersionTrackerDAOImpl</class> + <class>org.apache.ode.dao.jpa.store.ProcessConfDaoImpl</class> + <class>org.apache.ode.dao.jpa.store.ProcessConfPropertyDaoImpl</class> + <class>org.apache.ode.dao.jpa.store.DeploymentUnitDaoImpl</class> + <class>org.apache.ode.dao.jpa.store.VersionTrackerDAOImpl</class> </persistence-unit> </persistence> Modified: branches/ODE/ODE-1.x-jpa/pom.xml =================================================================== --- branches/ODE/ODE-1.x-jpa/pom.xml 2010-05-25 18:58:21 UTC (rev 668) +++ branches/ODE/ODE-1.x-jpa/pom.xml 2010-05-26 08:21:22 UTC (rev 669) @@ -137,7 +137,7 @@ <module>jbi</module> <module>jbi-bundle</module> <module>jbi-karaf</module> - <module>axis2-war</module> + <!--module>axis2-war</module--> <module>distro</module> </modules>