Author: lwaterman
Date: Mon Nov 20 22:41:22 2006
New Revision: 477527
URL: http://svn.apache.org/viewvc?view=rev&rev=477527
Log:
Add ID generator
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelationSetDAOImpl.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/FaultDAOImpl.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageDAOImpl.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageRouteDAOImpl.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/PartnerLinkDAOImpl.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ScopeDAOImpl.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/XmlDataDAOImpl.java
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java?view=diff&rev=477527&r1=477526&r2=477527
==============================================================================
---
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
(original)
+++
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
Mon Nov 20 22:41:22 2006
@@ -9,6 +9,8 @@
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.Table;
@@ -30,6 +32,7 @@
public class BPELDAOConnectionImpl implements BpelDAOConnection {
@Id @Column(name="ROOT_ID")
+ @GeneratedValue(strategy=GenerationType.AUTO)
private Long _id;
@OneToMany(fetch=FetchType.LAZY,mappedBy="_connection",cascade={CascadeType.ALL})
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelationSetDAOImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelationSetDAOImpl.java?view=diff&rev=477527&r1=477526&r2=477527
==============================================================================
---
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelationSetDAOImpl.java
(original)
+++
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelationSetDAOImpl.java
Mon Nov 20 22:41:22 2006
@@ -27,6 +27,8 @@
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
@@ -41,7 +43,9 @@
@Table(name="ODE_CORRELATION_SET")
public class CorrelationSetDAOImpl implements CorrelationSetDAO {
- @Id @Column(name="CORRELATION_SET_ID") private Long _correlationSetId;
+ @Id @Column(name="CORRELATION_SET_ID")
+ @GeneratedValue(strategy=GenerationType.AUTO)
+ private Long _correlationSetId;
@Basic @Column(name="NAME") private String _name;
@Basic @Column(name="PROPERTIES") private HashMap<QName,String> _props
= new HashMap<QName,String>();
@Basic @Column(name="CORRELATION_KEY") private CorrelationKey
_correlationKey;
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java?view=diff&rev=477527&r1=477526&r2=477527
==============================================================================
---
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java
(original)
+++
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java
Mon Nov 20 22:41:22 2006
@@ -28,6 +28,8 @@
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.Table;
@@ -43,7 +45,9 @@
@Table(name="ODE_CORRELATOR")
public class CorrelatorDAOImpl implements CorrelatorDAO {
- @Id @Column(name="CORRELATOR_ID") private Long _correlatorId;
+ @Id @Column(name="CORRELATOR_ID")
+ @GeneratedValue(strategy=GenerationType.AUTO)
+ private Long _correlatorId;
@Basic @Column(name="CORRELATOR_KEY") private String _correlatorKey;
@OneToMany(fetch=FetchType.LAZY,cascade={CascadeType.ALL})
private Collection<MessageRouteDAOImpl> _routes = new
ArrayList<MessageRouteDAOImpl>();
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/FaultDAOImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/FaultDAOImpl.java?view=diff&rev=477527&r1=477526&r2=477527
==============================================================================
---
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/FaultDAOImpl.java
(original)
+++
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/FaultDAOImpl.java
Mon Nov 20 22:41:22 2006
@@ -22,6 +22,8 @@
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Lob;
import javax.persistence.Table;
@@ -37,7 +39,9 @@
@Table(name="ODE_FAULT")
public class FaultDAOImpl implements FaultDAO {
- @Id @Column(name="FAULT_ID") private Long _id;
+ @Id @Column(name="FAULT_ID")
+ @GeneratedValue(strategy=GenerationType.AUTO)
+ private Long _id;
@Basic @Column(name="NAME") private QName _name;
@Basic @Column(name="MESSAGE") private String _explanation;
@Lob @Column(name="DATA") private String _data;
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageDAOImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageDAOImpl.java?view=diff&rev=477527&r1=477526&r2=477527
==============================================================================
---
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageDAOImpl.java
(original)
+++
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageDAOImpl.java
Mon Nov 20 22:41:22 2006
@@ -25,6 +25,8 @@
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Lob;
import javax.persistence.ManyToOne;
@@ -43,7 +45,9 @@
@Table(name="ODE_MESSAGE")
public class MessageDAOImpl implements MessageDAO {
- @Id @Column(name="MESSAGE_ID") private Long _id;
+ @Id @Column(name="MESSAGE_ID")
+ @GeneratedValue(strategy=GenerationType.AUTO)
+ private Long _id;
@Basic @Column(name="TYPE") private QName _type;
@Lob @Column(name="DATA") private String _data;
@Transient private Element _element;
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java?view=diff&rev=477527&r1=477526&r2=477527
==============================================================================
---
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java
(original)
+++
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java
Mon Nov 20 22:41:22 2006
@@ -32,6 +32,8 @@
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Lob;
import javax.persistence.ManyToOne;
@@ -55,7 +57,9 @@
@Table(name="ODE_MESSAGE_EXCHANGE")
public class MessageExchangeDAOImpl implements MessageExchangeDAO {
- @Id @Column(name="MESSAGE_EXCHANGE_ID") private Long _id;
+ @Id @Column(name="MESSAGE_EXCHANGE_ID")
+ @GeneratedValue(strategy=GenerationType.AUTO)
+ private Long _id;
@Basic @Column(name="CALLEE") private QName _callee;
@Basic @Column(name="CHANNEL") private String _channel;
@Basic @Column(name="CORRELATION_ID") private String _correlationId;
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageRouteDAOImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageRouteDAOImpl.java?view=diff&rev=477527&r1=477526&r2=477527
==============================================================================
---
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageRouteDAOImpl.java
(original)
+++
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageRouteDAOImpl.java
Mon Nov 20 22:41:22 2006
@@ -24,6 +24,8 @@
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
@@ -37,7 +39,9 @@
@Table(name="ODE_MESSAGE_ROUTE")
public class MessageRouteDAOImpl implements MessageRouteDAO {
- @Id @Column(name="MESSAGE_ROUTE_ID") private Long _id;
+ @Id @Column(name="MESSAGE_ROUTE_ID")
+ @GeneratedValue(strategy=GenerationType.AUTO)
+ private Long _id;
@Basic @Column(name="GROUP_ID") private String _groupId;
@Basic @Column(name="INDEX") private int _index;
@Basic @Column(name="CORRELATION_KEY") private CorrelationKey
_correlationKey;
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/PartnerLinkDAOImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/PartnerLinkDAOImpl.java?view=diff&rev=477527&r1=477526&r2=477527
==============================================================================
---
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/PartnerLinkDAOImpl.java
(original)
+++
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/PartnerLinkDAOImpl.java
Mon Nov 20 22:41:22 2006
@@ -23,6 +23,8 @@
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Lob;
import javax.persistence.Table;
@@ -38,7 +40,9 @@
@Table(name="ODE_PARTNER_LINK")
public class PartnerLinkDAOImpl implements PartnerLinkDAO {
- @Id @Column(name="PARTNER_LINK_ID") private Long _id;
+ @Id @Column(name="PARTNER_LINK_ID")
+ @GeneratedValue(strategy=GenerationType.AUTO)
+ private Long _id;
@Lob @Column(name="MY_EPR") private String _myEPR;
@Transient private Element _myEPRElement;
@Basic @Column(name="MY_ROLE_NAME") private String _myRoleName;
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java?view=diff&rev=477527&r1=477526&r2=477527
==============================================================================
---
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java
(original)
+++
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java
Mon Nov 20 22:41:22 2006
@@ -8,6 +8,8 @@
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
@@ -26,7 +28,9 @@
@Table(name="ODE_PROCESS")
public class ProcessDAOImpl implements ProcessDAO {
- @Id @Column(name="PROCESS_ID") private Long _id;
+ @Id @Column(name="PROCESS_ID")
+ @GeneratedValue(strategy=GenerationType.AUTO)
+ private Long _id;
@Basic @Column(name="NUMBER_OF_INSTANCES") private int _numInstances;
@Basic @Column(name="PROCESS_KEY") private QName _processKey;
@Basic @Column(name="PROCESS_TYPE") private QName _processType;
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java?view=diff&rev=477527&r1=477526&r2=477527
==============================================================================
---
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java
(original)
+++
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java
Mon Nov 20 22:41:22 2006
@@ -13,6 +13,8 @@
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Lob;
import javax.persistence.ManyToOne;
@@ -40,7 +42,9 @@
@Table(name="ODE_PROCESS_INSTANCE")
public class ProcessInstanceDAOImpl implements ProcessInstanceDAO {
- @Id @Column(name="PROCESS_INSTANCE_ID") private Long _instanceId;
+ @Id @Column(name="PROCESS_INSTANCE_ID")
+ @GeneratedValue(strategy=GenerationType.AUTO)
+ private Long _instanceId;
@Basic @Column(name="LAST_RECOVERY_DATE") private Date _lastRecovery;
@Basic @Column(name="LAST_ACTIVE_TIME") private Date _lastActive;
@Basic @Column(name="INSTANCE_STATE") private short _state;
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ScopeDAOImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ScopeDAOImpl.java?view=diff&rev=477527&r1=477526&r2=477527
==============================================================================
---
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ScopeDAOImpl.java
(original)
+++
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ScopeDAOImpl.java
Mon Nov 20 22:41:22 2006
@@ -28,6 +28,8 @@
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
@@ -48,7 +50,9 @@
@Table(name="ODE_SCOPE")
public class ScopeDAOImpl implements ScopeDAO {
- @Id @Column(name="SCOPE_ID") private Long _scopeInstanceId;
+ @Id @Column(name="SCOPE_ID")
+ @GeneratedValue(strategy=GenerationType.AUTO)
+ private Long _scopeInstanceId;
@Basic @Column(name="MODEL_ID") private int _modelId;
@Basic @Column(name="SCOPE_NAME") private String _name;
@Basic @Column(name="SCOPE_STATE") private String _scopeState;
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/XmlDataDAOImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/XmlDataDAOImpl.java?view=diff&rev=477527&r1=477526&r2=477527
==============================================================================
---
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/XmlDataDAOImpl.java
(original)
+++
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/XmlDataDAOImpl.java
Mon Nov 20 22:41:22 2006
@@ -26,6 +26,8 @@
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Lob;
import javax.persistence.ManyToOne;
@@ -45,7 +47,9 @@
@Table(name="ODE_XML_DATA")
public class XmlDataDAOImpl implements XmlDataDAO {
- @Id @Column(name="XML_DATA_ID") private Long _id;
+ @Id @Column(name="XML_DATA_ID")
+ @GeneratedValue(strategy=GenerationType.AUTO)
+ private Long _id;
@Lob @Column(name="DATA") private String _data;
@Transient private Node _node;
@Basic @Column(name="IS_SIMPLE_TYPE") private boolean _isSimpleType;
