[riftsaw-commits] riftsaw SVN: r861 - in branches/RiftSaw-ODE-2.1.x: dao-jpa/src/main and 7 other directories.

Author: jeff.yuchang Date: 2010-07-14 05:26:34 -0400 (Wed, 14 Jul 2010) New Revision: 861 Added: branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/resources/META-INF/riftsaw-orm.xml branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/riftsaw/ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/riftsaw/riftsaw-orm.xml branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/riftsaw/riftsaw-persistence.xml Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa-db/pom.xml branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/build.xml branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/pom.xml branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/descriptors/persistence.db.xml branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml branches/RiftSaw-ODE-2.1.x/dao-jpa/pom.xml branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ActivityRecoveryDAOImpl.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrSetProperty.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrelationSetDAOImpl.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrelatorDAOImpl.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/EventDAOImpl.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/FaultDAOImpl.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageDAOImpl.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageRouteDAOImpl.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MexProperty.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/PartnerLinkDAOImpl.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessDAOImpl.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessInstanceDAOImpl.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ScopeDAOImpl.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/XmlDataDAOImpl.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/XmlDataProperty.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/store/ProcessConfPropertyDaoImpl.java branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/store/VersionTrackerDAOImpl.java Log: * add custom sequence (riftsaw_sequence) for the ddl. Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/pom.xml =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/pom.xml 2010-07-14 08:52:40 UTC (rev 860) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/pom.xml 2010-07-14 09:26:34 UTC (rev 861) @@ -99,7 +99,9 @@ <configuration> <tasks> <copy todir="${basedir}/target/classes-openjpa"> - <fileset dir="${basedir}/target/classes" includes="**/*"/> + <fileset dir="${basedir}/target/classes"> + <include name="**/*" /> + </fileset> </copy> <property name="maven.compile.classpath" refid="maven.compile.classpath"/> <path id="classpath"> @@ -118,10 +120,33 @@ </execution> </executions> </plugin> + + <!-- copy orm.xml to classes folder for using custom sequence --> <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>copy-orm-file</id> + <phase>process-classes</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <copy file="src/main/riftsaw/riftsaw-orm.xml" + tofile="target/classes/META-INF/riftsaw-orm.xml" overwrite="true" /> + <copy file="src/main/riftsaw/riftsaw-persistence.xml" + tofile="target/classes/META-INF/persistence.xml" overwrite="true" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <executions> + <executions> <execution> <id>openjpa-enhancer-package</id> <phase>package</phase> @@ -134,7 +159,8 @@ </goals> </execution> </executions> - </plugin> + </plugin> + </plugins> </build> Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ActivityRecoveryDAOImpl.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ActivityRecoveryDAOImpl.java 2010-07-14 08:52:40 UTC (rev 860) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ActivityRecoveryDAOImpl.java 2010-07-14 09:26:34 UTC (rev 861) @@ -54,7 +54,6 @@ @Id @Column(name="ID") @GeneratedValue(strategy= GenerationType.AUTO) - @SuppressWarnings("unused") private Long _id; @Basic @Column(name="ACTIVITY_ID") @@ -148,4 +147,25 @@ public void setInstance(ProcessInstanceDAOImpl instance) { _instance = instance; } + + + /** + * this is only for hibernate custom sequence usage. + */ + @Deprecated + public Long get_id() { + return _id; + } + + /** + * @deprecated, this is only for hibernate custom sequence usage. + */ + @Deprecated + public void set_id(Long id) { + _id = id; + } + + + + } Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrSetProperty.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrSetProperty.java 2010-07-14 08:52:40 UTC (rev 860) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrSetProperty.java 2010-07-14 09:26:34 UTC (rev 861) @@ -45,7 +45,6 @@ @Id @Column(name="ID") @GeneratedValue(strategy=GenerationType.AUTO) - @SuppressWarnings("unused") private Long _id; @Basic @Column(name="PROP_KEY") private String propertyKey; @@ -89,4 +88,25 @@ public void setCorrSet(CorrelationSetDAOImpl corrSet) { _corrSet = corrSet; } + + + /** + *this is only for hibernate custom sequence usage. + */ + @Deprecated + public Long get_id() { + return _id; + } + + /** + * this is only for hibernate custom sequence usage. + * @param id + */ + @Deprecated + public void set_id(Long id) { + _id = id; + } + + + } Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrelationSetDAOImpl.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrelationSetDAOImpl.java 2010-07-14 08:52:40 UTC (rev 860) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrelationSetDAOImpl.java 2010-07-14 09:26:34 UTC (rev 861) @@ -121,4 +121,22 @@ public ProcessInstanceDAO getInstance() { return _scope.getProcessInstance(); } + + /** + * this is only for hibernate custom sequence usage. + */ + @Deprecated + public Long get_correlationSetId() { + return _correlationSetId; + } + + /** + * this is only for hibernate custom sequence usage. + */ + @Deprecated + public void set_correlationSetId(Long correlationSetId) { + _correlationSetId = correlationSetId; + } + + } Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrelatorDAOImpl.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrelatorDAOImpl.java 2010-07-14 08:52:40 UTC (rev 860) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/CorrelatorDAOImpl.java 2010-07-14 09:26:34 UTC (rev 861) @@ -42,7 +42,6 @@ @Id @Column(name = "CORRELATOR_ID") @GeneratedValue(strategy = GenerationType.AUTO) - @SuppressWarnings("unused") private Long _correlatorId; @Basic @Column(name = "CORRELATOR_KEY") @@ -196,4 +195,26 @@ // TODO Auto-generated method stub return true; } + + + + /** + * this is only for hibernate custom sequence usage. + * @param correlatorId + */ + @Deprecated + public Long get_correlatorId() { + return _correlatorId; + } + + /** + * this is only for hibernate custom sequence usage. + * @param correlatorId + */ + @Deprecated + public void set_correlatorId(Long correlatorId) { + this._correlatorId = correlatorId; + } + + } Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/EventDAOImpl.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/EventDAOImpl.java 2010-07-14 08:52:40 UTC (rev 860) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/EventDAOImpl.java 2010-07-14 09:26:34 UTC (rev 861) @@ -89,14 +89,6 @@ _detail = detail; } - public Long getId() { - return _id; - } - - public void setId(Long id) { - _id = id; - } - public ProcessInstanceDAOImpl getInstance() { return _instance; } @@ -136,4 +128,28 @@ public void setScopeId(Long scopeId) { _scopeId = scopeId; } + + public Long getId() { + return _id; + } + + public void setId(Long id) { + _id = id; + } + + /** + * this is only for hibernate custom sequence usage. + */ + @Deprecated + public Long get_id() { + return _id; + } + + /** + * @deprecated, this is only for hibernate custom sequence usage. + */ + @Deprecated + public void set_id(Long id) { + _id = id; + } } Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/FaultDAOImpl.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/FaultDAOImpl.java 2010-07-14 08:52:40 UTC (rev 860) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/FaultDAOImpl.java 2010-07-14 09:26:34 UTC (rev 861) @@ -46,7 +46,6 @@ @Id @Column(name="FAULT_ID") @GeneratedValue(strategy=GenerationType.AUTO) - @SuppressWarnings("unused") private Long _id; @Basic @Column(name="NAME") private String _name; @@ -96,5 +95,21 @@ public QName getName() { return _name == null ? null : QName.valueOf(_name); } + + /** + * this is only for hibernate custom sequence usage. + */ + @Deprecated + public Long get_id() { + return _id; + } + + /** + * @deprecated, this is only for hibernate custom sequence usage. + */ + @Deprecated + public void set_id(Long id) { + _id = id; + } } Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageDAOImpl.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageDAOImpl.java 2010-07-14 08:52:40 UTC (rev 860) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageDAOImpl.java 2010-07-14 09:26:34 UTC (rev 861) @@ -53,7 +53,6 @@ @Id @Column(name = "MESSAGE_ID") @GeneratedValue(strategy = GenerationType.AUTO) - @SuppressWarnings("unused") private Long _id; @Basic @Column(name = "TYPE") @@ -128,4 +127,22 @@ _type = type.toString(); } + /** + * this is only for hibernate custom sequence usage. + */ + @Deprecated + public Long get_id() { + return _id; + } + + /** + * @deprecated, this is only for hibernate custom sequence usage. + */ + @Deprecated + public void set_id(Long id) { + _id = id; + } + + + } Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageRouteDAOImpl.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageRouteDAOImpl.java 2010-07-14 08:52:40 UTC (rev 860) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageRouteDAOImpl.java 2010-07-14 09:26:34 UTC (rev 861) @@ -81,11 +81,7 @@ _routePolicy = routePolicy; } - public Long getId() { - return _id; - } - - public CorrelationKey getCorrelationKey() { + public CorrelationKey getCorrelationKey() { return new CorrelationKey(_correlationKey); } @@ -116,4 +112,24 @@ public void setCorrelationKeySet(CorrelationKeySet keySet) { _correlationKey = keySet.toCanonicalString(); } + + public Long getId() { + return _id; + } + + /** + * this is only for hibernate custom sequence usage. + */ + @Deprecated + public Long get_id() { + return _id; + } + + /** + * @deprecated, this is only for hibernate custom sequence usage. + */ + @Deprecated + public void set_id(Long id) { + _id = id; + } } Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MexProperty.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MexProperty.java 2010-07-14 08:52:40 UTC (rev 860) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MexProperty.java 2010-07-14 09:26:34 UTC (rev 861) @@ -46,7 +46,6 @@ @Id @Column(name="ID") @GeneratedValue(strategy=GenerationType.AUTO) - @SuppressWarnings("unused") private Long _id; @Basic @Column(name="PROP_KEY") private String propertyKey; @@ -84,4 +83,21 @@ public void setPropertyValue(String propertyValue) { this.propertyValue = propertyValue; } + + /** + * this is only for hibernate custom sequence usage. + */ + @Deprecated + public Long get_id() { + return _id; + } + + /** + * @deprecated, this is only for hibernate custom sequence usage. + */ + @Deprecated + public void set_id(Long id) { + _id = id; + } + } Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/PartnerLinkDAOImpl.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/PartnerLinkDAOImpl.java 2010-07-14 08:52:40 UTC (rev 860) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/PartnerLinkDAOImpl.java 2010-07-14 09:26:34 UTC (rev 861) @@ -51,7 +51,6 @@ @Id @Column(name="PARTNER_LINK_ID") @GeneratedValue(strategy=GenerationType.AUTO) - @SuppressWarnings("unused") private Long _id; @Lob @Column(name="MY_EPR") private String _myEPR; @@ -172,4 +171,21 @@ public void setScope(ScopeDAOImpl scope) { _scope = scope; } + + /** + * this is only for hibernate custom sequence usage. + */ + @Deprecated + public Long get_id() { + return _id; + } + + /** + * @deprecated, this is only for hibernate custom sequence usage. + */ + @Deprecated + public void set_id(Long id) { + _id = id; + } + } Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessDAOImpl.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessDAOImpl.java 2010-07-14 08:52:40 UTC (rev 860) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessDAOImpl.java 2010-07-14 09:26:34 UTC (rev 861) @@ -227,4 +227,20 @@ qry.setParameter("state", ProcessState.STATE_ACTIVE); return qry.getResultList(); } + + /** + * this is only for hibernate custom sequence usage. + */ + @Deprecated + public Long get_id() { + return _id; + } + + /** + * @deprecated, this is only for hibernate custom sequence usage. + */ + @Deprecated + public void set_id(Long id) { + _id = id; + } } \ No newline at end of file Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessInstanceDAOImpl.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessInstanceDAOImpl.java 2010-07-14 08:52:40 UTC (rev 860) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessInstanceDAOImpl.java 2010-07-14 09:26:34 UTC (rev 861) @@ -404,5 +404,25 @@ c.add(m.getMessageExchangeId()); } return c; - } + } + + /** + * this is only for hibernate custom sequence usage. + * @return + */ + @Deprecated + public Long get_instanceId() { + return _instanceId; + } + + /** + * this is only for hibernate custom sequence usage. + * @param instanceId + */ + @Deprecated + public void set_instanceId(Long instanceId) { + _instanceId = instanceId; + } + + } Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ScopeDAOImpl.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ScopeDAOImpl.java 2010-07-14 08:52:40 UTC (rev 860) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ScopeDAOImpl.java 2010-07-14 09:26:34 UTC (rev 861) @@ -197,5 +197,24 @@ public void setState(ScopeStateEnum state) { _scopeState = state.toString(); } + + /** + * this is only for hibernate custom sequence usage. + * @return + */ + @Deprecated + public Long get_scopeInstanceId() { + return _scopeInstanceId; + } + + /** + * this is only for hibernate custom sequence usage. + * @param scopeInstanceId + */ + @Deprecated + public void set_scopeInstanceId(Long scopeInstanceId) { + _scopeInstanceId = scopeInstanceId; + } + } Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/XmlDataDAOImpl.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/XmlDataDAOImpl.java 2010-07-14 08:52:40 UTC (rev 860) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/XmlDataDAOImpl.java 2010-07-14 09:26:34 UTC (rev 861) @@ -63,7 +63,6 @@ @Id @Column(name="XML_DATA_ID") @GeneratedValue(strategy=GenerationType.AUTO) - @SuppressWarnings("unused") private Long _id; @Lob @Column(name="DATA") private String _data; @@ -162,5 +161,23 @@ prop.setPropertyValue(pvalue); } } + + /** + * this is only for hibernate custom sequence usage. + */ + @Deprecated + public Long get_id() { + return _id; + } + + /** + * @deprecated, this is only for hibernate custom sequence usage. + */ + @Deprecated + public void set_id(Long id) { + _id = id; + } + + } Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/XmlDataProperty.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/XmlDataProperty.java 2010-07-14 08:52:40 UTC (rev 860) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/XmlDataProperty.java 2010-07-14 09:26:34 UTC (rev 861) @@ -46,7 +46,6 @@ @Id @Column(name="ID") @GeneratedValue(strategy= GenerationType.AUTO) - @SuppressWarnings("unused") private Long _id; @Basic @Column(name="PROP_KEY") private String propertyKey; @@ -85,4 +84,21 @@ this.propertyValue = propertyValue; } + /** + * this is only for hibernate custom sequence usage. + */ + @Deprecated + public Long get_id() { + return _id; + } + + /** + * @deprecated, this is only for hibernate custom sequence usage. + */ + @Deprecated + public void set_id(Long id) { + _id = id; + } + + } Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/store/ProcessConfPropertyDaoImpl.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/store/ProcessConfPropertyDaoImpl.java 2010-07-14 08:52:40 UTC (rev 860) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/store/ProcessConfPropertyDaoImpl.java 2010-07-14 09:26:34 UTC (rev 861) @@ -23,6 +23,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; @@ -34,7 +35,7 @@ public class ProcessConfPropertyDaoImpl { @Id @Column(name="ID") - @GeneratedValue + @GeneratedValue(strategy=GenerationType.AUTO) private Long _id; @Basic @Column(name="PROP_KEY") @@ -58,11 +59,19 @@ _value = value; } - public Long getId() { + /** + * this is only for hibernate custom sequence usage. + */ + @Deprecated + public Long get_id() { return _id; } - - public void setId(Long id) { - this._id = id; + + /** + * @deprecated, this is only for hibernate custom sequence usage. + */ + @Deprecated + public void set_id(Long id) { + _id = id; } } Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/store/VersionTrackerDAOImpl.java =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/store/VersionTrackerDAOImpl.java 2010-07-14 08:52:40 UTC (rev 860) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/java/org/apache/ode/dao/jpa/store/VersionTrackerDAOImpl.java 2010-07-14 09:26:34 UTC (rev 861) @@ -23,6 +23,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; @@ -34,7 +35,7 @@ public class VersionTrackerDAOImpl { @Id @Column(name="ID") - @GeneratedValue + @GeneratedValue(strategy=GenerationType.AUTO) private Long _id; @Basic @Column(name="VERSION") @@ -48,11 +49,20 @@ _version = version; } - public Long getId() { + + /** + * this is only for hibernate custom sequence usage. + */ + @Deprecated + public Long get_id() { return _id; } - - public void setId(Long id) { - this._id = id; + + /** + * @deprecated, this is only for hibernate custom sequence usage. + */ + @Deprecated + public void set_id(Long id) { + _id = id; } } Added: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/riftsaw/riftsaw-orm.xml =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/riftsaw/riftsaw-orm.xml (rev 0) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/riftsaw/riftsaw-orm.xml 2010-07-14 09:26:34 UTC (rev 861) @@ -0,0 +1,164 @@ +<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="riftsaw_sequence"/> + + <!-- ode-bpel persistence unit --> + <entity class="org.apache.ode.dao.jpa.bpel.ActivityRecoveryDAOImpl"> + <attributes> + <id name="_id" > + <column name="ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.CorrelationSetDAOImpl"> + <attributes> + <id name="_correlationSetId"> + <column name="CORRELATION_SET_ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.CorrelatorDAOImpl"> + <attributes> + <id name="_correlatorId"> + <column name="CORRELATOR_ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.EventDAOImpl"> + <attributes> + <id name="_id"> + <column name="EVENT_ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.FaultDAOImpl"> + <attributes> + <id name="_id"> + <column name="FAULT_ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.MessageDAOImpl"> + <attributes> + <id name="_id"> + <column name="MESSAGE_ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.MessageRouteDAOImpl"> + <attributes> + <id name="_id"> + <column name="MESSAGE_ROUTE_ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.PartnerLinkDAOImpl"> + <attributes> + <id name="_id"> + <column name="PARTNER_LINK_ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.ProcessDAOImpl"> + <attributes> + <id name="_id"> + <column name="ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.ProcessInstanceDAOImpl"> + <attributes> + <id name="_instanceId"> + <column name="ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.ScopeDAOImpl"> + <attributes> + <id name="_scopeInstanceId"> + <column name="SCOPE_ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.XmlDataDAOImpl"> + <attributes> + <id name="_id"> + <column name="XML_DATA_ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.CorrSetProperty"> + <attributes> + <id name="_id"> + <column name="ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.MexProperty"> + <attributes> + <id name="_id"> + <column name="ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.XmlDataProperty"> + <attributes> + <id name="_id"> + <column name="ID"/> + <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> Added: branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/riftsaw/riftsaw-persistence.xml =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/riftsaw/riftsaw-persistence.xml (rev 0) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa/src/main/riftsaw/riftsaw-persistence.xml 2010-07-14 09:26:34 UTC (rev 861) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> +<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-bpel" transaction-type="JTA"> + <mapping-file>META-INF/riftsaw-orm.xml</mapping-file> + <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" transaction-type="JTA"> + <mapping-file>META-INF/riftsaw-orm.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> \ No newline at end of file Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa-db/pom.xml =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa-db/pom.xml 2010-07-14 08:52:40 UTC (rev 860) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa-db/pom.xml 2010-07-14 09:26:34 UTC (rev 861) @@ -86,10 +86,6 @@ </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> - <artifactId>riftsaw-dao-jpa</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-store</artifactId> </dependency> <dependency> Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/build.xml =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/build.xml 2010-07-14 08:52:40 UTC (rev 860) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/build.xml 2010-07-14 09:26:34 UTC (rev 861) @@ -16,11 +16,12 @@ <path id="classpath"> <pathelement path="${maven.runtime.classpath}"/> + <pathelement path="target/classes"/> </path> <!-- ================================================================== --> - <!-- jbossidm Database schema --> + <!-- ODE Database schema --> <!-- ================================================================== --> <target name="create-schema"> @@ -32,7 +33,7 @@ <mkdir dir="target/db" /> <mkdir dir="${db.scripts.dir}" /> - <create-ddl db="hsql"/> + <create-ddl db="postgres"/> </target> Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/pom.xml =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/pom.xml 2010-07-14 08:52:40 UTC (rev 860) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/pom.xml 2010-07-14 09:26:34 UTC (rev 861) @@ -98,6 +98,16 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/persistence.xml</exclude> + <exclude>**/riftsaw-orm.xml</exclude> + </excludes> + </configuration> + </plugin> </plugins> </build> Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/descriptors/persistence.db.xml =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/descriptors/persistence.db.xml 2010-07-14 08:52:40 UTC (rev 860) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/descriptors/persistence.db.xml 2010-07-14 09:26:34 UTC (rev 861) @@ -21,6 +21,8 @@ <persistence-unit name="ode-unit-test-embedded"> <provider>org.hibernate.ejb.HibernatePersistence</provider> + <mapping-file>META-INF/riftsaw-orm.xml</mapping-file> + <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> Modified: branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml 2010-07-14 08:52:40 UTC (rev 860) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml 2010-07-14 09:26:34 UTC (rev 861) @@ -21,6 +21,8 @@ <persistence-unit name="ode-unit-test-embedded"> <provider>org.hibernate.ejb.HibernatePersistence</provider> + <mapping-file>META-INF/riftsaw-orm.xml</mapping-file> + <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> @@ -45,7 +47,7 @@ <properties> <property name="hibernate.show_sql" value="false" /> - <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" /> + <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect" /> <property name="hibernate.connection.datasource" value="java:BPELDB" /> <property name="hibernate.transaction.factory_class" value="org.hibernate.transaction.JTATransactionFactory" /> <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup" /> Added: branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/resources/META-INF/riftsaw-orm.xml =================================================================== --- branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/resources/META-INF/riftsaw-orm.xml (rev 0) +++ branches/RiftSaw-ODE-2.1.x/dao-jpa-hibernate/src/main/resources/META-INF/riftsaw-orm.xml 2010-07-14 09:26:34 UTC (rev 861) @@ -0,0 +1,164 @@ +<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="riftsaw_sequence"/> + + <!-- ode-bpel persistence unit --> + <entity class="org.apache.ode.dao.jpa.bpel.ActivityRecoveryDAOImpl"> + <attributes> + <id name="_id" > + <column name="ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.CorrelationSetDAOImpl"> + <attributes> + <id name="_correlationSetId"> + <column name="CORRELATION_SET_ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.CorrelatorDAOImpl"> + <attributes> + <id name="_correlatorId"> + <column name="CORRELATOR_ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.EventDAOImpl"> + <attributes> + <id name="_id"> + <column name="EVENT_ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.FaultDAOImpl"> + <attributes> + <id name="_id"> + <column name="FAULT_ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.MessageDAOImpl"> + <attributes> + <id name="_id"> + <column name="MESSAGE_ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.MessageRouteDAOImpl"> + <attributes> + <id name="_id"> + <column name="MESSAGE_ROUTE_ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.PartnerLinkDAOImpl"> + <attributes> + <id name="_id"> + <column name="PARTNER_LINK_ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.ProcessDAOImpl"> + <attributes> + <id name="_id"> + <column name="ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.ProcessInstanceDAOImpl"> + <attributes> + <id name="_instanceId"> + <column name="ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.ScopeDAOImpl"> + <attributes> + <id name="_scopeInstanceId"> + <column name="SCOPE_ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.XmlDataDAOImpl"> + <attributes> + <id name="_id"> + <column name="XML_DATA_ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.CorrSetProperty"> + <attributes> + <id name="_id"> + <column name="ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.MexProperty"> + <attributes> + <id name="_id"> + <column name="ID"/> + <generated-value generator="bpel_sequence" strategy="AUTO"/> + </id> + </attributes> + </entity> + + <entity class="org.apache.ode.dao.jpa.bpel.XmlDataProperty"> + <attributes> + <id name="_id"> + <column name="ID"/> + <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>