Author: mriou
Date: Fri Apr 6 15:42:08 2007
New Revision: 526306
URL: http://svn.apache.org/viewvc?view=rev&rev=526306
Log:
Fixed DAO JPA tests and a few bugs on DAO JPA as well.
Modified:
incubator/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ProcessDAO.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessDaoImpl.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
incubator/ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java
incubator/ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrSetProperty.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/MessageExchangeDAOImpl.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java
Modified:
incubator/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ProcessDAO.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ProcessDAO.java?view=diff&rev=526306&r1=526305&r2=526306
==============================================================================
---
incubator/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ProcessDAO.java
(original)
+++
incubator/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ProcessDAO.java
Fri Apr 6 15:42:08 2007
@@ -106,7 +106,7 @@
*/
void delete();
- void addCorrelator(String correlator);
+ CorrelatorDAO addCorrelator(String correlator);
String getGuid();
Modified:
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessDaoImpl.java?view=diff&rev=526306&r1=526305&r2=526306
==============================================================================
---
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessDaoImpl.java
(original)
+++
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessDaoImpl.java
Fri Apr 6 15:42:08 2007
@@ -148,9 +148,10 @@
return _type;
}
- public void addCorrelator(String correlator) {
+ public CorrelatorDAO addCorrelator(String correlator) {
CorrelatorDaoImpl corr = new CorrelatorDaoImpl(correlator, _conn);
_correlators.put(corr.getCorrelatorId(), corr);
+ return corr;
}
/**
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java?view=diff&rev=526306&r1=526305&r2=526306
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
Fri Apr 6 15:42:08 2007
@@ -130,7 +130,7 @@
return _process.getVersion();
}
- public void addCorrelator(String corrid) {
+ public CorrelatorDAO addCorrelator(String corrid) {
HCorrelator correlator = new HCorrelator();
correlator.setCorrelatorId(corrid);
correlator.setProcess(_process);
@@ -138,6 +138,7 @@
_process.getCorrelators().add(correlator);
getSession().save(correlator);
getSession().saveOrUpdate(_process);
+ return correlator;
}
public int getNumInstances() {
Modified:
incubator/ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java?view=diff&rev=526306&r1=526305&r2=526306
==============================================================================
---
incubator/ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java
(original)
+++
incubator/ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java
Fri Apr 6 15:42:08 2007
@@ -57,6 +57,7 @@
TransactionManager _txm;
DataSource _ds;
BPELDAOConnectionFactoryImpl factory;
+ ProcessDAO _process;
@Override
protected void setUp() throws Exception {
@@ -85,8 +86,8 @@
void createStuff(BPELDAOConnectionFactoryImpl factory) throws Exception {
BpelDAOConnection conn = factory.getConnection();
- ProcessDAO p1 = createProcess(conn,"testPID1","testType");
- ProcessInstanceDAO pi1 = createProcessInstance(p1,
CORRELATOR_ID1);
+ CorrelatorDAO corr = createProcess(conn,"testPID1","testType");
+ ProcessInstanceDAO pi1 = createProcessInstance(_process, corr);
}
@Override
@@ -131,15 +132,14 @@
return m;
}
- private ProcessDAO createProcess(BpelDAOConnection conn, String pid,
String type) {
- ProcessDAO p = null;
- p = conn.createProcess(new QName(TEST_NS,pid), new
QName(TEST_NS,type),"GUID1",1);
- p.addCorrelator(CORRELATOR_ID1);
- p.addCorrelator(CORRELATOR_ID2);
- return p;
+ private CorrelatorDAO createProcess(BpelDAOConnection conn, String pid,
String type) {
+ _process = conn.createProcess(new QName(TEST_NS,pid), new
QName(TEST_NS,type),"GUID1",1);
+ CorrelatorDAO corr = _process.addCorrelator(CORRELATOR_ID1);
+ _process.addCorrelator(CORRELATOR_ID2);
+ return corr;
}
- private ProcessInstanceDAO createProcessInstance(ProcessDAO process,
String correlator_id) throws SAXException, IOException {
+ private ProcessInstanceDAO createProcessInstance(ProcessDAO process,
CorrelatorDAO corr) throws SAXException, IOException {
ProcessInstanceDAO pi = null;
String[] actions = { "action1","action2" };
String[] correlationKeys = { "key1", "key2" };
@@ -147,8 +147,8 @@
CorrelationKey key2 = new CorrelationKey(2,correlationKeys);
CorrelationKey[] corrkeys = {key1,key2};
QName[] names = { new QName(TEST_NS,"name1"), new
QName(TEST_NS,"name2") };
-
- pi =
process.createInstance(process.getCorrelator(correlator_id));
+
+ pi = process.createInstance(corr);
pi.setExecutionState(new String("test execution
state").getBytes());
pi.setFault(new QName(TEST_NS,"testFault"), "testExplanation",
1, 1, DOMUtils.stringToDOM("<testFaultMessage>testMessage</testFaultMessage>"));
@@ -183,9 +183,8 @@
MessageExchangeDAO mex = createMessageExchange(process,pi,pl1);
- CorrelatorDAO corr1 = process.getCorrelator(CORRELATOR_ID1);
- corr1.addRoute("testRoute", pi, 1, key1);
- corr1.enqueueMessage(mex, corrkeys);
+ corr.addRoute("testRoute", pi, 1, key1);
+ corr.enqueueMessage(mex, corrkeys);
return pi;
}
Modified:
incubator/ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java?view=diff&rev=526306&r1=526305&r2=526306
==============================================================================
---
incubator/ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java
(original)
+++
incubator/ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java
Fri Apr 6 15:42:08 2007
@@ -75,6 +75,7 @@
factory.setDataSource(_ds);
factory.setTransactionManager(_txm);
Properties props = new Properties();
+ props.put("openjpa.Log", "DefaultLevel=TRACE");
props.put("openjpa.jdbc.SynchronizeMappings",
"buildSchema(ForeignKeys=false)");
factory.init(props);
@@ -206,7 +207,7 @@
//assertNotNull(me.getCreateTime());
assertEquals(me.getDirection(),'0');
assertNotNull(me.getEPR());
- assertEquals(me.getFault(),"testFault");
+ assertEquals(me.getFault().toString(),"testFault");
assertEquals(me.getFaultExplanation(),"testFaultExplanation");
assertSame(me.getInstance(),inst);
assertEquals(me.getOperation(),"testOperation");
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrSetProperty.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrSetProperty.java?view=diff&rev=526306&r1=526305&r2=526306
==============================================================================
---
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrSetProperty.java
(original)
+++
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrSetProperty.java
Fri Apr 6 15:42:08 2007
@@ -69,4 +69,12 @@
public void setPropertyValue(String propertyValue) {
this.propertyValue = propertyValue;
}
+
+ public CorrelationSetDAOImpl getCorrSet() {
+ return _corrSet;
+ }
+
+ public void setCorrSet(CorrelationSetDAOImpl corrSet) {
+ _corrSet = corrSet;
+ }
}
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=526306&r1=526305&r2=526306
==============================================================================
---
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
Fri Apr 6 15:42:08 2007
@@ -91,7 +91,9 @@
public void setValue(QName[] names, CorrelationKey values) {
_correlationKey = values.toCanonicalString();
for (int m = 0; m < names.length; m++) {
- _props.add(new CorrSetProperty(names[m].toString(),
values.getValues()[m]));
+ CorrSetProperty prop = new CorrSetProperty(names[m].toString(),
values.getValues()[m]);
+ _props.add(prop);
+ prop.setCorrSet(this);
}
}
}
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=526306&r1=526305&r2=526306
==============================================================================
---
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
Fri Apr 6 15:42:08 2007
@@ -80,10 +80,12 @@
public void enqueueMessage(MessageExchangeDAO mex,
CorrelationKey[] correlationKeys) {
+ MessageExchangeDAOImpl mexImpl = (MessageExchangeDAOImpl) mex;
for (CorrelationKey key : correlationKeys ) {
- ((MessageExchangeDAOImpl)mex).addCorrelationKey(key);
+ mexImpl.addCorrelationKey(key);
}
- _exchanges.add((MessageExchangeDAOImpl)mex);
+ _exchanges.add(mexImpl);
+ mexImpl.setCorrelator(this);
}
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=526306&r1=526305&r2=526306
==============================================================================
---
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
Fri Apr 6 15:42:08 2007
@@ -318,7 +318,7 @@
public Collection<CorrelationKey> getCorrelationKeys() {
ArrayList<CorrelationKey> correlationKeys = new
ArrayList<CorrelationKey>();
if (_correlationKeys.indexOf("^") > 0) {
- for (StringTokenizer tokenizer = new
StringTokenizer(_correlationId, "^"); tokenizer.hasMoreTokens();) {
+ for (StringTokenizer tokenizer = new
StringTokenizer(_correlationKeys, "^"); tokenizer.hasMoreTokens();) {
String corrStr = tokenizer.nextToken();
correlationKeys.add(new CorrelationKey(corrStr));
}
@@ -330,5 +330,13 @@
public void release() {
// no-op for now, could be used to do some cleanup
+ }
+
+ public CorrelatorDAOImpl getCorrelator() {
+ return _correlator;
+ }
+
+ public void setCorrelator(CorrelatorDAOImpl correlator) {
+ _correlator = correlator;
}
}
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=526306&r1=526305&r2=526306
==============================================================================
---
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
Fri Apr 6 15:42:08 2007
@@ -79,10 +79,11 @@
_version = version;
}
- public void addCorrelator(String correlator) {
+ public CorrelatorDAO addCorrelator(String correlator) {
CorrelatorDAOImpl corr = new CorrelatorDAOImpl(correlator);
_correlators.add(corr);
- }
+ return corr;
+ }
public CorrelatorDAO getCorrelator(String correlatorId) {
Query qry = getEM().createNamedQuery("CorrelatorByKey");
