Author: jeff.yuchang
Date: 2011-02-03 02:20:21 -0500 (Thu, 03 Feb 2011)
New Revision: 1294
Added:
workspace/jeffyu/ODE-AS6/dao-jpa/src/main/riftsaw/riftsaw-ode-store.xml
Modified:
workspace/jeffyu/ODE-AS6/dao-jpa/pom.xml
workspace/jeffyu/ODE-AS6/dao-jpa/src/main/riftsaw/riftsaw-orm.xml
workspace/jeffyu/ODE-AS6/dao-jpa/src/main/riftsaw/riftsaw-persistence.xml
Log:
*RIFTSAW-334, fixed the 'unable to configure EntityManagerFactory'.
seems that JPA 2.0 is more strict than JPA 1.0 validation on orm.xml.
Modified: workspace/jeffyu/ODE-AS6/dao-jpa/pom.xml
===================================================================
--- workspace/jeffyu/ODE-AS6/dao-jpa/pom.xml 2011-02-02 20:45:38 UTC (rev 1293)
+++ workspace/jeffyu/ODE-AS6/dao-jpa/pom.xml 2011-02-03 07:20:21 UTC (rev 1294)
@@ -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: workspace/jeffyu/ODE-AS6/dao-jpa/src/main/riftsaw/riftsaw-ode-store.xml
===================================================================
--- workspace/jeffyu/ODE-AS6/dao-jpa/src/main/riftsaw/riftsaw-ode-store.xml
(rev 0)
+++ workspace/jeffyu/ODE-AS6/dao-jpa/src/main/riftsaw/riftsaw-ode-store.xml 2011-02-03
07:20:21 UTC (rev 1294)
@@ -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: workspace/jeffyu/ODE-AS6/dao-jpa/src/main/riftsaw/riftsaw-orm.xml
===================================================================
--- workspace/jeffyu/ODE-AS6/dao-jpa/src/main/riftsaw/riftsaw-orm.xml 2011-02-02 20:45:38
UTC (rev 1293)
+++ workspace/jeffyu/ODE-AS6/dao-jpa/src/main/riftsaw/riftsaw-orm.xml 2011-02-03 07:20:21
UTC (rev 1294)
@@ -141,42 +141,5 @@
</id>
</attributes>
</entity>
-
- <entity class="org.jboss.bpm.monitor.model.bpaf.Event">
- <attributes>
- <id name="eventID">
- <column name="EID"/>
- <generated-value generator="bpel_sequence"
strategy="AUTO"/>
- </id>
- </attributes>
- </entity>
- <entity class="org.jboss.bpm.monitor.model.bpaf.Tuple">
- <attributes>
- <id name="id">
- <column name="TID"/>
- <generated-value generator="bpel_sequence"
strategy="AUTO"/>
- </id>
- </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: workspace/jeffyu/ODE-AS6/dao-jpa/src/main/riftsaw/riftsaw-persistence.xml
===================================================================
--- workspace/jeffyu/ODE-AS6/dao-jpa/src/main/riftsaw/riftsaw-persistence.xml 2011-02-02
20:45:38 UTC (rev 1293)
+++ workspace/jeffyu/ODE-AS6/dao-jpa/src/main/riftsaw/riftsaw-persistence.xml 2011-02-03
07:20:21 UTC (rev 1294)
@@ -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>