Author: mriou
Date: Tue Mar 6 16:09:50 2007
New Revision: 515386
URL: http://svn.apache.org/viewvc?view=rev&rev=515386
Log:
Few additional fixes for JPA.
Modified:
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.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/ProcessInstanceDAOImpl.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ScopeDAOImpl.java
Modified:
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java?view=diff&rev=515386&r1=515385&r2=515386
==============================================================================
---
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java
(original)
+++
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java
Tue Mar 6 16:09:50 2007
@@ -303,7 +303,7 @@
// doing any work on its behalf, therefore we will reschedule
the
// events for some time in the future (1 minute).
Date future = new Date(System.currentTimeMillis() + (60 *
1000));
-
__log.info(__msgs.msgReschedulingJobForInactiveProcess(process.getPID(),
jobInfo.jobName, future));
+
__log.info(__msgs.msgReschedulingJobForInactiveProcess(we.getProcessId(),
jobInfo.jobName, future));
_contexts.scheduler.schedulePersistedJob(jobInfo.jobDetail,
future);
return;
}
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java?view=diff&rev=515386&r1=515385&r2=515386
==============================================================================
---
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java
(original)
+++
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java
Tue Mar 6 16:09:50 2007
@@ -71,8 +71,8 @@
public void init(Properties properties) {
HashMap<String, Object> propMap = new HashMap<String,Object>();
-// propMap.put("openjpa.Log", "DefaultLevel=TRACE");
- propMap.put("openjpa.Log", "log4j");
+ propMap.put("openjpa.Log", "DefaultLevel=TRACE");
+// propMap.put("openjpa.Log", "log4j");
propMap.put("openjpa.jdbc.DBDictionary",
"org.apache.openjpa.jdbc.sql.DerbyDictionary");
propMap.put("openjpa.ManagedRuntime", new TxMgrProvider());
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=515386&r1=515385&r2=515386
==============================================================================
---
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
Tue Mar 6 16:09:50 2007
@@ -41,7 +41,7 @@
@Entity
@Table(name="ODE_PARTNER_LINK")
public class PartnerLinkDAOImpl implements PartnerLinkDAO {
-
+
@Id @Column(name="PARTNER_LINK_ID")
@GeneratedValue(strategy=GenerationType.AUTO)
private Long _id;
@@ -69,7 +69,7 @@
private String _partnerSessionId;
@ManyToOne(fetch= FetchType.LAZY,cascade={CascadeType.PERSIST})
@Column(name="SCOPE_ID")
- private ProcessInstanceDAOImpl _scope;
+ private ScopeDAOImpl _scope;
public PartnerLinkDAOImpl() {}
public PartnerLinkDAOImpl(int modelId, String name, String myRole,
String partnerRole) {
@@ -157,4 +157,7 @@
}
+ public void setScope(ScopeDAOImpl scope) {
+ _scope = scope;
+ }
}
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=515386&r1=515385&r2=515386
==============================================================================
---
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
Tue Mar 6 16:09:50 2007
@@ -65,7 +65,7 @@
})
public class ProcessInstanceDAOImpl extends OpenJPADAO implements
ProcessInstanceDAO {
- @Id @Column(name="PROCESS_INSTANCE_ID")
+ @Id @Column(name="ID")
@GeneratedValue(strategy=GenerationType.AUTO)
private Long _instanceId;
@Basic @Column(name="LAST_RECOVERY_DATE")
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=515386&r1=515385&r2=515386
==============================================================================
---
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
Tue Mar 6 16:09:50 2007
@@ -89,10 +89,10 @@
public PartnerLinkDAO createPartnerLink(int plinkModelId, String
pLinkName,
String myRole, String partnerRole) {
- PartnerLinkDAO pl = new PartnerLinkDAOImpl(plinkModelId,
pLinkName, myRole, partnerRole);
-
- _partnerLinks.add(pl);
- return pl;
+ PartnerLinkDAOImpl pl = new PartnerLinkDAOImpl(plinkModelId,
pLinkName, myRole, partnerRole);
+ pl.setScope(this);
+ _partnerLinks.add(pl);
+ return pl;
}
public Collection<ScopeDAO> getChildScopes() {
