Author: jeff.yuchang Date: 2011-02-03 06:15:05 -0500 (Thu, 03 Feb 2011) New Revision: 1296 Added: branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-ode-store.xml Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa/pom.xml branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-orm.xml branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-persistence.xml Log: *RIFTSAW-334, separate the orm.xml into two files to avoid jpa2 strict validation. Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/dao-jpa/pom.xml 2011-02-03 07:54:48 UTC (rev 1295) +++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa/pom.xml 2011-02-03 11:15:05 UTC (rev 1296) @@ -141,7 +141,9 @@ <configuration> <tasks> <copy file="src/main/riftsaw/riftsaw-orm.xml" - tofile="target/classes/META-INF/riftsaw-orm.xml" overwrite="true" /> + tofile="target/classes/META-INF/riftsaw-orm.xml" overwrite="true" /> + <copy file="src/main/riftsaw/riftsaw-ode-store.xml" + tofile="target/classes/META-INF/riftsaw-ode-store.xml" overwrite="true" /> <copy file="src/main/riftsaw/riftsaw-persistence.xml" tofile="target/classes/META-INF/persistence.xml" overwrite="true" /> </tasks> Added: branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-ode-store.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-ode-store.xml (rev 0) +++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-ode-store.xml 2011-02-03 11:15:05 UTC (rev 1296) @@ -0,0 +1,28 @@ +<entity-mappings + xmlns="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/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" + version="1.0"> + + <sequence-generator name="bpel_sequence" sequence-name="bpel_sequence"/> + +<!-- ode-store persistence unit --> +<entity class="org.apache.ode.dao.jpa.store.ProcessConfPropertyDaoImpl"> + <attributes> + <id name="_id"> + <column name="ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> +</entity> + +<entity class="org.apache.ode.dao.jpa.store.VersionTrackerDAOImpl"> + <attributes> + <id name="_id"> + <column name="ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> +</entity> + +</entity-mappings> \ No newline at end of file Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-orm.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-orm.xml 2011-02-03 07:54:48 UTC (rev 1295) +++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-orm.xml 2011-02-03 11:15:05 UTC (rev 1296) @@ -150,7 +150,7 @@ </id> </attributes> </entity> - + <entity class="org.jboss.bpm.monitor.model.bpaf.Tuple"> <attributes> <id name="id"> @@ -160,23 +160,4 @@ </attributes> </entity> - <!-- ode-store persistence unit --> - <entity class="org.apache.ode.dao.jpa.store.ProcessConfPropertyDaoImpl"> - <attributes> - <id name="_id"> - <column name="ID"/> - <generated-value generator="bpel_sequence" strategy="AUTO"/> - </id> - </attributes> - </entity> - - <entity class="org.apache.ode.dao.jpa.store.VersionTrackerDAOImpl"> - <attributes> - <id name="_id"> - <column name="ID"/> - <generated-value generator="bpel_sequence" strategy="AUTO"/> - </id> - </attributes> - </entity> - </entity-mappings> Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-persistence.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-persistence.xml 2011-02-03 07:54:48 UTC (rev 1295) +++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa/src/main/riftsaw/riftsaw-persistence.xml 2011-02-03 11:15:05 UTC (rev 1296) @@ -43,16 +43,15 @@ <class>org.jboss.bpm.monitor.model.bpaf.Tuple</class> </persistence-unit> <persistence-unit name="ode-store" transaction-type="JTA"> - <mapping-file>META-INF/riftsaw-orm.xml</mapping-file> + <mapping-file>META-INF/riftsaw-ode-store.xml</mapping-file> <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-unit name="ode-scheduler" transaction-type="JTA"> - <mapping-file>META-INF/riftsaw-orm.xml</mapping-file> <class>org.apache.ode.dao.jpa.scheduler.JobDAOImpl</class> </persistence-unit> -</persistence> \ No newline at end of file +</persistence>