You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by va...@apache.org on 2010/05/27 17:52:38 UTC
svn commit: r948869 [17/20] - in /ode/trunk: ./
agents/src/main/java/org/apache/ode/agents/memory/ axis2-war/
axis2-war/src/main/assembly/ axis2-war/src/main/webapp/WEB-INF/conf/
axis2-war/src/main/webapp/js/ axis2-war/src/test/java/org/apache/ode/axis...
Modified: ode/trunk/dao-hibernate-db/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/dao-hibernate-db/pom.xml?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/dao-hibernate-db/pom.xml (original)
+++ ode/trunk/dao-hibernate-db/pom.xml Thu May 27 15:52:24 2010
@@ -39,26 +39,26 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-dao-hibernate</artifactId>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-dao-hibernate</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -73,7 +73,7 @@
<phase>generate-sources</phase>
<configuration>
<tasks>
- <property name="maven.runtime.classpath" refid="maven.compile.classpath"/>
+ <property name="maven.runtime.classpath" refid="maven.compile.classpath"/>
<ant antfile="build.xml" target="create-schema" inheritRefs="true"/>
</tasks>
</configuration>
@@ -94,7 +94,7 @@
<goal>execute</goal>
</goals>
<configuration>
- <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
+ <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
<url>jdbc:derby:${basedir}/target/derby/hibdb;create=true</url>
<username>sa</username>
<password />
@@ -118,8 +118,8 @@
</goals>
<configuration>
<tasks>
- <property name="ode.version" value="${project.version}"/>
- <ant antfile="build.xml" target="zip-derby-db" />
+ <property name="ode.version" value="${project.version}"/>
+ <ant antfile="build.xml" target="zip-derby-db" />
</tasks>
</configuration>
</execution>
Modified: ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/HibernateTransactionManagerLookup.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/HibernateTransactionManagerLookup.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/HibernateTransactionManagerLookup.java (original)
+++ ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/HibernateTransactionManagerLookup.java Thu May 27 15:52:24 2010
@@ -32,19 +32,19 @@ import org.hibernate.transaction.Transac
*/
public class HibernateTransactionManagerLookup implements TransactionManagerLookup {
- /** Constructor. */
- public HibernateTransactionManagerLookup() {
- super();
- }
+ /** Constructor. */
+ public HibernateTransactionManagerLookup() {
+ super();
+ }
- public TransactionManager getTransactionManager(Properties props)
- throws HibernateException {
- return SessionManager.getTransactionManager(props);
- }
+ public TransactionManager getTransactionManager(Properties props)
+ throws HibernateException {
+ return SessionManager.getTransactionManager(props);
+ }
- public String getUserTransactionName() {
- return null;
- }
+ public String getUserTransactionName() {
+ return null;
+ }
public Object getTransactionIdentifier(Transaction transaction) {
return transaction;
Modified: ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java (original)
+++ ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java Thu May 27 15:52:24 2010
@@ -86,7 +86,7 @@ public class BpelDAOConnectionImpl imple
}
protected Session getSession(){
- return _sm.getSession();
+ return _sm.getSession();
}
public MessageExchangeDAO createMessageExchange(char dir) {
@@ -337,7 +337,7 @@ public class BpelDAOConnectionImpl imple
}
@SuppressWarnings("unchecked")
- public Collection<CorrelationSetDAO> getActiveCorrelationSets() {
+ public Collection<CorrelationSetDAO> getActiveCorrelationSets() {
ArrayList<CorrelationSetDAO> csetDaos = new ArrayList<CorrelationSetDAO>();
Collection<HCorrelationSet> csets = getSession().getNamedQuery(HCorrelationSet.SELECT_CORSETS_BY_PROCESS_STATES).setParameter("states", ProcessState.STATE_ACTIVE).list();
for (HCorrelationSet cset : csets)
Modified: ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/HibernateHandle.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/HibernateHandle.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/HibernateHandle.java (original)
+++ ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/HibernateHandle.java Thu May 27 15:52:24 2010
@@ -27,26 +27,26 @@ class HibernateHandle implements Seriali
private static final long serialVersionUID = 1L;
private Class _daoCls;
- private Class _hibCls;
+ private Class _hibCls;
private Serializable _id;
/**
- *
- */
- public HibernateHandle(Class daoCls, Class hibCls, Serializable id) {
- _daoCls = daoCls;
+ *
+ */
+ public HibernateHandle(Class daoCls, Class hibCls, Serializable id) {
+ _daoCls = daoCls;
_hibCls = hibCls;
_id = id;
- }
+ }
public Class getHibernateClass(){
- return _hibCls;
+ return _hibCls;
}
public Class getDAOClass(){
- return _daoCls;
+ return _daoCls;
}
public Serializable getId(){
- return _id;
+ return _id;
}
}
Modified: ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java (original)
+++ ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java Thu May 27 15:52:24 2010
@@ -194,7 +194,7 @@ public class MessageExchangeDaoImpl exte
if (source == null)
_hself.setCallbackEndpoint(null);
else {
- _hself.setCallbackEndpoint(DOMUtils.domToBytes(source));
+ _hself.setCallbackEndpoint(DOMUtils.domToBytes(source));
}
getSession().saveOrUpdate(_hself);
Modified: ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageRouteDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageRouteDaoImpl.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageRouteDaoImpl.java (original)
+++ ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageRouteDaoImpl.java Thu May 27 15:52:24 2010
@@ -73,12 +73,12 @@ class MessageRouteDaoImpl extends Hibern
}
public String getRoute() {
- return _selector.getRoute();
+ return _selector.getRoute();
}
- public CorrelationKeySet getCorrelationKeySet() {
- return new CorrelationKeySet(_selector.getCorrelationKey());
- }
+ public CorrelationKeySet getCorrelationKeySet() {
+ return new CorrelationKeySet(_selector.getCorrelationKey());
+ }
public void setCorrelationKeySet(CorrelationKeySet keySet) {
_selector.setCorrelationKey(keySet.toCanonicalString());
Modified: ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelator.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelator.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelator.java (original)
+++ ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelator.java Thu May 27 15:52:24 2010
@@ -34,8 +34,8 @@ import java.util.Set;
* @hibernate.query name="SELECT_CORRELATOR_IDS_BY_PROCESS" query="select id from HCorrelator as c where c.process = :process"
*/
public class HCorrelator extends HObject {
- public final static String SELECT_CORRELATOR_IDS_BY_PROCESS = "SELECT_CORRELATOR_IDS_BY_PROCESS";
-
+ public final static String SELECT_CORRELATOR_IDS_BY_PROCESS = "SELECT_CORRELATOR_IDS_BY_PROCESS";
+
private HProcess _process;
private String _correlatorId;
Modified: ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessageExchange.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessageExchange.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessageExchange.java (original)
+++ ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessageExchange.java Thu May 27 15:52:24 2010
@@ -348,15 +348,15 @@ public class HMessageExchange extends HO
* @hibernate.property column="SUBSCRIBER_COUNT"
*/
public int getSubscriberCount() {
- return _subscriberCount;
+ return _subscriberCount;
}
public void setSubscriberCount(int subscriberCount) {
- this._subscriberCount = subscriberCount;
+ this._subscriberCount = subscriberCount;
}
public void incrementSubscriberCount() {
- setSubscriberCount(getSubscriberCount() + 1);
+ setSubscriberCount(getSubscriberCount() + 1);
}
}
Modified: ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HPartnerLink.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HPartnerLink.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HPartnerLink.java (original)
+++ ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HPartnerLink.java Thu May 27 15:52:24 2010
@@ -101,7 +101,7 @@ public class HPartnerLink extends HObjec
*
* @hibernate.column name="PARTNERROLE_EPR_DATA" sql-type="blob(2G)"
*/
- public byte[] getPartnerEPR() {
+ public byte[] getPartnerEPR() {
return _partnerEPR;
}
Modified: ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HProcessInstance.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HProcessInstance.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HProcessInstance.java (original)
+++ ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HProcessInstance.java Thu May 27 15:52:24 2010
@@ -39,7 +39,7 @@ public class HProcessInstance extends HO
public static final String SELECT_INSTANCES_BY_PROCESS_AND_STATES="SELECT_INSTANCES_BY_PROCESS_AND_STATES";
public static final String COUNT_INSTANCES_BY_PROCESSES_IDS_AND_STATES = "COUNT_INSTANCES_BY_PROCESSES_IDS_AND_STATES";
- /** Foreign key to owner {@link HProcess}. */
+ /** Foreign key to owner {@link HProcess}. */
private HProcess _process;
private Long _processId;
@@ -193,7 +193,7 @@ public class HProcessInstance extends HO
}
public void setProcessId(Long processId) {
- _processId = processId;
+ _processId = processId;
}
/**
Modified: ode/trunk/dao-jpa-ojpa-derby/build.xml
URL: http://svn.apache.org/viewvc/ode/trunk/dao-jpa-ojpa-derby/build.xml?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/dao-jpa-ojpa-derby/build.xml (original)
+++ ode/trunk/dao-jpa-ojpa-derby/build.xml Thu May 27 15:52:24 2010
@@ -19,14 +19,14 @@
-->
<project>
- <property name="db.scripts.dir" value="${basedir}/target" />
- <property name="descriptor.dir" value="${basedir}/src/main/descriptors"/>
- <property name="scripts.dir" value="${basedir}/src/main/scripts"/>
-
- <path id="classpath">
- <pathelement path="${maven.runtime.classpath}"/>
- </path>
-
+ <property name="db.scripts.dir" value="${basedir}/target" />
+ <property name="descriptor.dir" value="${basedir}/src/main/descriptors"/>
+ <property name="scripts.dir" value="${basedir}/src/main/scripts"/>
+
+ <path id="classpath">
+ <pathelement path="${maven.runtime.classpath}"/>
+ </path>
+
<target name="create-schema">
<taskdef name="mappingtool" classname="org.apache.openjpa.jdbc.ant.MappingToolTask" classpathref="classpath"/>
@@ -68,10 +68,10 @@
<echo>=====================</echo>
<echo>Create DDL @{db}</echo>
<mappingtool schemaAction="build" sqlFile="${db.scripts.dir}/partial.@{db}.sql" readSchema="false">
- <config propertiesFile="${descriptor.dir}/persistence.@{db}.xml"/>
- <classpath>
- <path refid="classpath"/>
- </classpath>
+ <config propertiesFile="${descriptor.dir}/persistence.@{db}.xml"/>
+ <classpath>
+ <path refid="classpath"/>
+ </classpath>
</mappingtool>
<concat destfile="${db.scripts.dir}/@{db}.sql">
<fileset file="${scripts.dir}/common.sql"/>
Modified: ode/trunk/dao-jpa-ojpa-derby/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/dao-jpa-ojpa-derby/pom.xml?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/dao-jpa-ojpa-derby/pom.xml (original)
+++ ode/trunk/dao-jpa-ojpa-derby/pom.xml Thu May 27 15:52:24 2010
@@ -54,7 +54,7 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
@@ -98,7 +98,7 @@
<groupId>net.sourceforge.serp</groupId>
<artifactId>serp</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -180,7 +180,7 @@
<goal>execute</goal>
</goals>
<configuration>
- <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
+ <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
<url>jdbc:derby:${basedir}/target/derby/jpadb;create=true</url>
<username>sa</username>
<password />
@@ -204,8 +204,8 @@
</goals>
<configuration>
<tasks>
- <property name="ode.version" value="${project.version}"/>
- <ant antfile="build.xml" target="zip-derby-db" />
+ <property name="ode.version" value="${project.version}"/>
+ <ant antfile="build.xml" target="zip-derby-db" />
</tasks>
</configuration>
</execution>
Modified: ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java (original)
+++ ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java Thu May 27 15:52:24 2010
@@ -49,11 +49,11 @@ import java.util.GregorianCalendar;
import java.util.Properties;
public class InsertObjectTest extends TestCase {
-
- private static final String TEST_NS = "http://org.apache.ode.jpa.test";
- private static final String CORRELATOR_ID1 = "testCorrelator1";
- private static final String CORRELATOR_ID2 = "testCorrelator2";
- private static final Calendar cal = new GregorianCalendar();
+
+ private static final String TEST_NS = "http://org.apache.ode.jpa.test";
+ private static final String CORRELATOR_ID1 = "testCorrelator1";
+ private static final String CORRELATOR_ID2 = "testCorrelator2";
+ private static final Calendar cal = new GregorianCalendar();
TransactionManager _txm;
DataSource _ds;
@@ -61,7 +61,7 @@ public class InsertObjectTest extends Te
ProcessDAO _process;
@Override
- protected void setUp() throws Exception {
+ protected void setUp() throws Exception {
jdbcDataSource hsqlds = new jdbcDataSource();
hsqlds.setDatabase("jdbc:hsqldb:mem:" + new GUID().toString());
hsqlds.setUser("sa");
@@ -79,8 +79,8 @@ public class InsertObjectTest extends Te
_txm.begin();
}
-
- public void testStart() throws Exception {
+
+ public void testStart() throws Exception {
createStuff(factory);
}
@@ -88,106 +88,106 @@ public class InsertObjectTest extends Te
BpelDAOConnection conn = factory.getConnection();
CorrelatorDAO corr = createProcess(conn,"testPID1","testType");
- ProcessInstanceDAO pi1 = createProcessInstance(_process, corr);
+ ProcessInstanceDAO pi1 = createProcessInstance(_process, corr);
}
@Override
- protected void tearDown() throws Exception {
+ protected void tearDown() throws Exception {
_txm.commit();
- _ds = null;
+ _ds = null;
_txm = null;
}
-
- private MessageExchangeDAO createMessageExchange(ProcessDAO p, ProcessInstanceDAO pi, PartnerLinkDAO pl ) throws SAXException, IOException {
- MessageExchangeDAO me = pi.getConnection().createMessageExchange('0');
-
- me.setCallee(new QName(TEST_NS,"testCallee"));
- me.setChannel("testChannel");
- me.setCorrelationId("testCorrelationId");
- me.setCorrelationStatus("testCorrelationStatus");
- me.setEPR(DOMUtils.stringToDOM("<testEPR>EPR</testEPR>"));
- me.setFault(new QName("testFault"));
- me.setFaultExplanation("testFaultExplanation");
- me.setInstance(pi);
- me.setOperation("testOperation");
- me.setPartnerLink(pl);
- me.setPartnerLinkModelId(1);
- me.setPattern("testPattern");
- me.setPortType(new QName(TEST_NS,"testPortType"));
- me.setProcess(p);
- me.setProperty("testProp1Key", "testProp1");
- me.setProperty("testProp2Key", "testProp2");
- me.setRequest(createMessage(me,"testRequest"));
- me.setResponse(createMessage(me,"testResponse"));
- me.setStatus("testStatus");
-
- return me;
- }
-
- private MessageDAO createMessage(MessageExchangeDAO me, String name) throws SAXException, IOException {
- MessageDAO m = me.createMessage(new QName(TEST_NS,name));
-
- m.setType(new QName(TEST_NS,name));
- m.setData(DOMUtils.stringToDOM("<testData>some test data</testData>"));
-
- return m;
- }
-
- 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, CorrelatorDAO corr) throws SAXException, IOException {
- ProcessInstanceDAO pi = null;
- String[] actions = { "action1","action2" };
- String[] correlationKeys = { "key1", "key2" };
- CorrelationKey key1 = new CorrelationKey("key1",correlationKeys);
- CorrelationKey key2 = new CorrelationKey("key2",correlationKeys);
- CorrelationKey[] corrkeys = {key1,key2};
- QName[] names = { new QName(TEST_NS,"name1"), new QName(TEST_NS,"name2") };
+
+ private MessageExchangeDAO createMessageExchange(ProcessDAO p, ProcessInstanceDAO pi, PartnerLinkDAO pl ) throws SAXException, IOException {
+ MessageExchangeDAO me = pi.getConnection().createMessageExchange('0');
+
+ me.setCallee(new QName(TEST_NS,"testCallee"));
+ me.setChannel("testChannel");
+ me.setCorrelationId("testCorrelationId");
+ me.setCorrelationStatus("testCorrelationStatus");
+ me.setEPR(DOMUtils.stringToDOM("<testEPR>EPR</testEPR>"));
+ me.setFault(new QName("testFault"));
+ me.setFaultExplanation("testFaultExplanation");
+ me.setInstance(pi);
+ me.setOperation("testOperation");
+ me.setPartnerLink(pl);
+ me.setPartnerLinkModelId(1);
+ me.setPattern("testPattern");
+ me.setPortType(new QName(TEST_NS,"testPortType"));
+ me.setProcess(p);
+ me.setProperty("testProp1Key", "testProp1");
+ me.setProperty("testProp2Key", "testProp2");
+ me.setRequest(createMessage(me,"testRequest"));
+ me.setResponse(createMessage(me,"testResponse"));
+ me.setStatus("testStatus");
+
+ return me;
+ }
+
+ private MessageDAO createMessage(MessageExchangeDAO me, String name) throws SAXException, IOException {
+ MessageDAO m = me.createMessage(new QName(TEST_NS,name));
+
+ m.setType(new QName(TEST_NS,name));
+ m.setData(DOMUtils.stringToDOM("<testData>some test data</testData>"));
+
+ return m;
+ }
+
+ 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, CorrelatorDAO corr) throws SAXException, IOException {
+ ProcessInstanceDAO pi = null;
+ String[] actions = { "action1","action2" };
+ String[] correlationKeys = { "key1", "key2" };
+ CorrelationKey key1 = new CorrelationKey("key1",correlationKeys);
+ CorrelationKey key2 = new CorrelationKey("key2",correlationKeys);
+ CorrelationKey[] corrkeys = {key1,key2};
+ QName[] names = { new QName(TEST_NS,"name1"), new QName(TEST_NS,"name2") };
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>"));
- pi.setLastActiveTime(cal.getTime());
- pi.setState((short) 1);
-
- pi.createActivityRecovery("testChannel1", 3, "testReason1", cal.getTime(), DOMUtils.stringToDOM("<testData>testData1</testData>"), actions, 2);
- pi.createActivityRecovery("testChannel2", 4, "testReason2", cal.getTime(), DOMUtils.stringToDOM("<testData>testData2</testData>"), actions, 2);
-
- ScopeDAO root = pi.createScope(null, "Root", 1);
- root.setState(ScopeStateEnum.ACTIVE);
- ScopeDAO child1 = pi.createScope(root, "Child1", 2);
- child1.setState(ScopeStateEnum.ACTIVE);
- XmlDataDAO var1 = child1.getVariable("var1");
- var1.set(DOMUtils.stringToDOM("<testData>testData</testData>"));
- var1.setProperty("key1", "prop1");
- var1.setProperty("key2", "prop2");
- XmlDataDAO var2 = child1.getVariable("var2");
- var2.set(DOMUtils.stringToDOM("<testData>testData</testData>"));
- var2.setProperty("key1", "prop1");
- var2.setProperty("key2", "prop2");
-
- CorrelationSetDAO cs1 = child1.getCorrelationSet("TestCorrelationSet1");
- cs1.setValue(names,key1);
-
- PartnerLinkDAO pl1 = child1.createPartnerLink(1, "Test PartnerLink1", "MyRole1", "PartnerRole1");
- pl1.setMyEPR(DOMUtils.stringToDOM("<testEPR>testMyEPR</testEPR>"));
- pl1.setMyRoleServiceName(new QName(TEST_NS,"testRoleService"));
- pl1.setMySessionId("TestMySessionID");
- pl1.setPartnerEPR(DOMUtils.stringToDOM("<testEPR>testPartnerEPR</testEPR>"));
- pl1.setPartnerSessionId("TestPartnerSessionID");
-
- MessageExchangeDAO mex = createMessageExchange(process,pi,pl1);
-
- corr.addRoute("testRoute", pi, 1, new CorrelationKeySet().add(key1), "one");
- corr.enqueueMessage(mex, new CorrelationKeySet().add(corrkeys[0]).add(corrkeys[1]));
-
- return pi;
- }
+
+ pi.setExecutionState(new String("test execution state").getBytes());
+ pi.setFault(new QName(TEST_NS,"testFault"), "testExplanation", 1, 1, DOMUtils.stringToDOM("<testFaultMessage>testMessage</testFaultMessage>"));
+ pi.setLastActiveTime(cal.getTime());
+ pi.setState((short) 1);
+
+ pi.createActivityRecovery("testChannel1", 3, "testReason1", cal.getTime(), DOMUtils.stringToDOM("<testData>testData1</testData>"), actions, 2);
+ pi.createActivityRecovery("testChannel2", 4, "testReason2", cal.getTime(), DOMUtils.stringToDOM("<testData>testData2</testData>"), actions, 2);
+
+ ScopeDAO root = pi.createScope(null, "Root", 1);
+ root.setState(ScopeStateEnum.ACTIVE);
+ ScopeDAO child1 = pi.createScope(root, "Child1", 2);
+ child1.setState(ScopeStateEnum.ACTIVE);
+ XmlDataDAO var1 = child1.getVariable("var1");
+ var1.set(DOMUtils.stringToDOM("<testData>testData</testData>"));
+ var1.setProperty("key1", "prop1");
+ var1.setProperty("key2", "prop2");
+ XmlDataDAO var2 = child1.getVariable("var2");
+ var2.set(DOMUtils.stringToDOM("<testData>testData</testData>"));
+ var2.setProperty("key1", "prop1");
+ var2.setProperty("key2", "prop2");
+
+ CorrelationSetDAO cs1 = child1.getCorrelationSet("TestCorrelationSet1");
+ cs1.setValue(names,key1);
+
+ PartnerLinkDAO pl1 = child1.createPartnerLink(1, "Test PartnerLink1", "MyRole1", "PartnerRole1");
+ pl1.setMyEPR(DOMUtils.stringToDOM("<testEPR>testMyEPR</testEPR>"));
+ pl1.setMyRoleServiceName(new QName(TEST_NS,"testRoleService"));
+ pl1.setMySessionId("TestMySessionID");
+ pl1.setPartnerEPR(DOMUtils.stringToDOM("<testEPR>testPartnerEPR</testEPR>"));
+ pl1.setPartnerSessionId("TestPartnerSessionID");
+
+ MessageExchangeDAO mex = createMessageExchange(process,pi,pl1);
+
+ corr.addRoute("testRoute", pi, 1, new CorrelationKeySet().add(key1), "one");
+ corr.enqueueMessage(mex, new CorrelationKeySet().add(corrkeys[0]).add(corrkeys[1]));
+
+ return pi;
+ }
}
Modified: ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java (original)
+++ ode/trunk/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java Thu May 27 15:52:24 2010
@@ -50,21 +50,21 @@ import java.util.Properties;
import java.util.List;
public class SelectObjectTest extends TestCase {
-
- private EntityManager em;
- private static final String TEST_NS = "http://org.apache.ode.jpa.test";
- private String[] correlationKeys = { "key1", "key2" };
- private String[] actions = { "action1","action2" };
- private CorrelationKey key1 = new CorrelationKey("key1",correlationKeys);
- private static final String CORRELATOR_ID1 = "testCorrelator1";
- private static final String CORRELATOR_ID2 = "testCorrelator2";
+
+ private EntityManager em;
+ private static final String TEST_NS = "http://org.apache.ode.jpa.test";
+ private String[] correlationKeys = { "key1", "key2" };
+ private String[] actions = { "action1","action2" };
+ private CorrelationKey key1 = new CorrelationKey("key1",correlationKeys);
+ private static final String CORRELATOR_ID1 = "testCorrelator1";
+ private static final String CORRELATOR_ID2 = "testCorrelator2";
TransactionManager _txm;
DataSource _ds;
BPELDAOConnectionFactoryImpl factory;
@Override
- protected void setUp() throws Exception {
+ protected void setUp() throws Exception {
jdbcDataSource hsqlds = new jdbcDataSource();
hsqlds.setDatabase("jdbc:hsqldb:mem:" + new GUID().toString());
hsqlds.setUser("sa");
@@ -81,220 +81,220 @@ public class SelectObjectTest extends Te
factory.init(props);
_txm.begin();
- }
-
- public void testGetObject() throws Exception {
+ }
+
+ public void testGetObject() throws Exception {
new InsertObjectTest().createStuff(factory);
_txm.commit();
_txm.begin();
BpelDAOConnection conn = factory.getConnection();
-
- // Assert the ProcessDAO
- ProcessDAO p = conn.getProcess(new QName(TEST_NS,"testPID1"));
- assertNotNull( p );
- Collection<ProcessInstanceDAO> insts = p.findInstance(key1);
- assertNotNull( insts );
- assertTrue( insts.size() > 0 );
- assertNotNull(p.getType());
- assertNotNull(p.getProcessId());
- assertEquals( p.getVersion() , 1 );
-
- // Assert the CorrelatorDAO
- CorrelatorDAO corr = p.getCorrelator(CORRELATOR_ID1);
- assertNotNull( corr );
- assertEquals(corr.getCorrelatorId(),CORRELATOR_ID1);
-
- // Assert the MessageRouteDAO
- List<MessageRouteDAO> routes = corr.findRoute(new CorrelationKeySet().add(key1));
+
+ // Assert the ProcessDAO
+ ProcessDAO p = conn.getProcess(new QName(TEST_NS,"testPID1"));
+ assertNotNull( p );
+ Collection<ProcessInstanceDAO> insts = p.findInstance(key1);
+ assertNotNull( insts );
+ assertTrue( insts.size() > 0 );
+ assertNotNull(p.getType());
+ assertNotNull(p.getProcessId());
+ assertEquals( p.getVersion() , 1 );
+
+ // Assert the CorrelatorDAO
+ CorrelatorDAO corr = p.getCorrelator(CORRELATOR_ID1);
+ assertNotNull( corr );
+ assertEquals(corr.getCorrelatorId(),CORRELATOR_ID1);
+
+ // Assert the MessageRouteDAO
+ List<MessageRouteDAO> routes = corr.findRoute(new CorrelationKeySet().add(key1));
MessageRouteDAO route = null;
if (routes != null && routes.size() > 0) {
route = routes.get(0);
}
- assertNotNull( route );
- assertEquals(route.getGroupId(),"testRoute" );
- assertEquals(route.getIndex() , 1 );
- assertNotNull(route.getTargetInstance() );
-
- // Assert the ProcessInstanceDAO
- for ( ProcessInstanceDAO inst : insts ) {
- Long id = inst.getInstanceId();
- assertNotNull( id );
-
- ProcessInstanceDAO inst2 = conn.getInstance(id);
- assertSame(inst2,inst);
-
- ProcessInstanceDAO inst3 = p.getInstance(id);
- assertSame( inst3 , inst );
-
- Long mon = inst.genMonotonic();
- assertEquals(inst.getActivityFailureCount() , 2);
- assertNotNull(inst.getActivityFailureDateTime() );
- assertNotNull(inst.getCreateTime() );
- assertTrue(inst.getExecutionState().length > 0 );
- assertNotNull(inst.getLastActiveTime() );
- assertSame(inst.getProcess() , p );
- assertEquals(inst.getPreviousState() , 0);
- assertEquals(inst.getState() , 1);
-
- // Assert the Root ScopeDAO
- ScopeDAO rs = inst.getRootScope();
- assertNotNull( rs );
- assertNotNull(rs.getChildScopes());
- ScopeDAO child1 = null;
- for ( ScopeDAO childItr : rs.getChildScopes()){
- child1 = childItr;
- break;
- }
- assertNotNull(child1);
- assertNotNull(rs.getCorrelationSets());
- assertEquals(rs.getCorrelationSets().size() , 0 );
- assertEquals(rs.getModelId(),1);
- assertEquals(rs.getName(),"Root");
- assertTrue(rs.getParentScope() == null);
- assertNotNull(rs.getPartnerLinks());
- assertEquals(rs.getPartnerLinks().size() ,0);
- assertSame(rs.getProcessInstance(),inst);
- assertNotNull(rs.getScopeInstanceId());
- assertEquals(rs.getState(),ScopeStateEnum.ACTIVE);
- assertNotNull(rs.getVariables());
- assertEquals(rs.getVariables().size(),0);
-
-
- // Assert the ActivityRecoveryDAO
- assertNotNull(inst.getActivityRecoveries());
- ActivityRecoveryDAO rec1 = null;
- for (ActivityRecoveryDAO recItr : inst.getActivityRecoveries()) {
+ assertNotNull( route );
+ assertEquals(route.getGroupId(),"testRoute" );
+ assertEquals(route.getIndex() , 1 );
+ assertNotNull(route.getTargetInstance() );
+
+ // Assert the ProcessInstanceDAO
+ for ( ProcessInstanceDAO inst : insts ) {
+ Long id = inst.getInstanceId();
+ assertNotNull( id );
+
+ ProcessInstanceDAO inst2 = conn.getInstance(id);
+ assertSame(inst2,inst);
+
+ ProcessInstanceDAO inst3 = p.getInstance(id);
+ assertSame( inst3 , inst );
+
+ Long mon = inst.genMonotonic();
+ assertEquals(inst.getActivityFailureCount() , 2);
+ assertNotNull(inst.getActivityFailureDateTime() );
+ assertNotNull(inst.getCreateTime() );
+ assertTrue(inst.getExecutionState().length > 0 );
+ assertNotNull(inst.getLastActiveTime() );
+ assertSame(inst.getProcess() , p );
+ assertEquals(inst.getPreviousState() , 0);
+ assertEquals(inst.getState() , 1);
+
+ // Assert the Root ScopeDAO
+ ScopeDAO rs = inst.getRootScope();
+ assertNotNull( rs );
+ assertNotNull(rs.getChildScopes());
+ ScopeDAO child1 = null;
+ for ( ScopeDAO childItr : rs.getChildScopes()){
+ child1 = childItr;
+ break;
+ }
+ assertNotNull(child1);
+ assertNotNull(rs.getCorrelationSets());
+ assertEquals(rs.getCorrelationSets().size() , 0 );
+ assertEquals(rs.getModelId(),1);
+ assertEquals(rs.getName(),"Root");
+ assertTrue(rs.getParentScope() == null);
+ assertNotNull(rs.getPartnerLinks());
+ assertEquals(rs.getPartnerLinks().size() ,0);
+ assertSame(rs.getProcessInstance(),inst);
+ assertNotNull(rs.getScopeInstanceId());
+ assertEquals(rs.getState(),ScopeStateEnum.ACTIVE);
+ assertNotNull(rs.getVariables());
+ assertEquals(rs.getVariables().size(),0);
+
+
+ // Assert the ActivityRecoveryDAO
+ assertNotNull(inst.getActivityRecoveries());
+ ActivityRecoveryDAO rec1 = null;
+ for (ActivityRecoveryDAO recItr : inst.getActivityRecoveries()) {
if (recItr.getActivityId() == 3) {
rec1 = recItr;break;
}
}
- assertNotNull(rec1);
- String tmpAct = rec1.getActions();
+ assertNotNull(rec1);
+ String tmpAct = rec1.getActions();
// assertEquals(rec1.getActionsList(),actions);
- assertEquals(rec1.getActivityId(),3);
- assertEquals(rec1.getChannel(),"testChannel1");
- assertNotNull(rec1.getDateTime());
+ assertEquals(rec1.getActivityId(),3);
+ assertEquals(rec1.getChannel(),"testChannel1");
+ assertNotNull(rec1.getDateTime());
// assertNotNull(rec1.getDetails());
- assertEquals(rec1.getReason(),"testReason1");
- assertEquals(rec1.getRetries(),2);
-
- // Assert the CorrelationSetDAO
- //assertNotNull(inst.getCorrelationSets());
- //CorrelationSetDAO cs1 = null;
- //for ( CorrelationSetDAO csItr : inst.getCorrelationSets() ) {
- // cs1 = csItr;
- // break;
- //}
- //assertNotNull(cs1);
-
- // Assert the FaultDAO
- FaultDAO fault = inst.getFault();
- assertNotNull(fault);
- assertEquals(fault.getActivityId(),1);
- assertNotNull(fault.getData());
- assertEquals(fault.getExplanation(),"testExplanation");
- assertEquals(fault.getLineNo(),1);
- assertEquals(fault.getName(),new QName(TEST_NS,"testFault"));
-
- // Assert MessageExchangeDAO
- CorrelatorDAO ic = inst.getInstantiatingCorrelator();
- assertNotNull(ic);
- assertEquals(ic.getCorrelatorId(),CORRELATOR_ID1);
- // The message is dequeued but not persisted
- MessageExchangeDAO me = ic.dequeueMessage(new CorrelationKeySet().add(key1));
- assertNotNull(me);
- assertEquals(me.getCallee(),new QName(TEST_NS,"testCallee"));
- assertEquals(me.getPropagateTransactionFlag(),false);
- assertEquals(me.getChannel(),"testChannel");
- assertEquals(me.getCorrelationId(),"testCorrelationId");
- //assertNotNull(me.getCreateTime());
- assertEquals(me.getDirection(),'0');
- assertNotNull(me.getEPR());
- assertEquals(me.getFault().toString(),"testFault");
- assertEquals(me.getFaultExplanation(),"testFaultExplanation");
- assertSame(me.getInstance(),inst);
- assertEquals(me.getOperation(),"testOperation");
- assertNotNull(me.getPartnerLink());
- assertEquals(me.getPartnerLinkModelId(),1);
- assertEquals(me.getPattern(),"testPattern");
- assertEquals(me.getPortType(),new QName(TEST_NS,"testPortType"));
- assertSame(me.getProcess(),p);
- assertEquals(me.getProperty("testProp1Key"),"testProp1");
- assertNotNull(me.getRequest());
- assertNotNull(me.getResponse());
- assertEquals(me.getStatus(),"testStatus");
-
- // Assert MessageDAO
- MessageDAO m = me.getRequest();
- assertNotNull(m.getData());
- assertSame(m.getMessageExchange(),me);
- assertEquals(m.getType(),new QName(TEST_NS,"testRequest"));
-
-
- //Assert Child ScopeDAO
- assertNotNull(inst.getScopes());
- assertTrue(inst.getScopes().size() > 0);
- assertNotNull(inst.getScopes("Child1"));
- assertTrue(inst.getScopes("Child1").size() == 1);
- ScopeDAO childS = inst.getScopes("Child1").iterator().next();
- assertSame(childS,child1);
- assertSame(childS.getParentScope(),rs);
- assertNotNull(childS.getChildScopes());
- assertEquals(childS.getChildScopes().size(), 0);
- assertNotNull(childS.getVariables());
- assertTrue(childS.getVariables().size() > 0);
- assertNotNull(childS.getVariable("var1"));
- XmlDataDAO chsVar = childS.getVariable("var1");
- assertNotNull(childS.getPartnerLinks());
- assertTrue(childS.getPartnerLinks().size() > 0);
- PartnerLinkDAO spl = childS.getPartnerLinks().iterator().next();
- assertSame(spl,me.getPartnerLink());
- assertSame(spl,childS.getPartnerLink(spl.getPartnerLinkModelId()));
- assertNotNull(childS.getCorrelationSets());
- assertTrue(childS.getCorrelationSets().size() > 0);
- assertNotNull(childS.getCorrelationSet("TestCorrelationSet1"));
-
- // Assert CorrelationSetDAO
- CorrelationSetDAO cs = childS.getCorrelationSet("TestCorrelationSet1");
- assertEquals(cs.getName(),"TestCorrelationSet1");
- assertNotNull(cs.getProperties());
- assertTrue(cs.getProperties().size() > 0);
- assertSame(cs.getScope(),childS);
- assertNotNull(cs.getValue());
- assertEquals(cs.getProperties().get(new QName(TEST_NS,"name1")),"key1");
-
-
- // Assert PartnerLinkDAO
- assertNotNull(spl.getMyEPR());
- assertEquals(spl.getMyRoleName(),"MyRole1");
- assertEquals(spl.getMyRoleServiceName(),new QName(TEST_NS,"testRoleService"));
- assertEquals(spl.getMySessionId(),"TestMySessionID");
- assertNotNull(spl.getPartnerEPR());
- assertEquals(spl.getPartnerLinkModelId(),1);
- assertEquals(spl.getPartnerLinkName(),"Test PartnerLink1");
- assertEquals(spl.getPartnerRoleName(),"PartnerRole1");
- assertEquals(spl.getPartnerSessionId(),"TestPartnerSessionID");
-
- // Assert Variables
- assertNotNull(inst.getVariables("var1", 2));
- assertEquals(inst.getVariables("var1", 2).length,1);
- XmlDataDAO[] vars = inst.getVariables("var1", 2);
- assertSame(chsVar,vars[0]);
- assertNotNull(vars[0].get());
- assertEquals(vars[0].getName(),"var1");
- // assertEquals(vars[0].getProperty("key1"),"prop1");
- assertSame(vars[0].getScopeDAO(),childS);
-
- }
- }
+ assertEquals(rec1.getReason(),"testReason1");
+ assertEquals(rec1.getRetries(),2);
+
+ // Assert the CorrelationSetDAO
+ //assertNotNull(inst.getCorrelationSets());
+ //CorrelationSetDAO cs1 = null;
+ //for ( CorrelationSetDAO csItr : inst.getCorrelationSets() ) {
+ // cs1 = csItr;
+ // break;
+ //}
+ //assertNotNull(cs1);
+
+ // Assert the FaultDAO
+ FaultDAO fault = inst.getFault();
+ assertNotNull(fault);
+ assertEquals(fault.getActivityId(),1);
+ assertNotNull(fault.getData());
+ assertEquals(fault.getExplanation(),"testExplanation");
+ assertEquals(fault.getLineNo(),1);
+ assertEquals(fault.getName(),new QName(TEST_NS,"testFault"));
+
+ // Assert MessageExchangeDAO
+ CorrelatorDAO ic = inst.getInstantiatingCorrelator();
+ assertNotNull(ic);
+ assertEquals(ic.getCorrelatorId(),CORRELATOR_ID1);
+ // The message is dequeued but not persisted
+ MessageExchangeDAO me = ic.dequeueMessage(new CorrelationKeySet().add(key1));
+ assertNotNull(me);
+ assertEquals(me.getCallee(),new QName(TEST_NS,"testCallee"));
+ assertEquals(me.getPropagateTransactionFlag(),false);
+ assertEquals(me.getChannel(),"testChannel");
+ assertEquals(me.getCorrelationId(),"testCorrelationId");
+ //assertNotNull(me.getCreateTime());
+ assertEquals(me.getDirection(),'0');
+ assertNotNull(me.getEPR());
+ assertEquals(me.getFault().toString(),"testFault");
+ assertEquals(me.getFaultExplanation(),"testFaultExplanation");
+ assertSame(me.getInstance(),inst);
+ assertEquals(me.getOperation(),"testOperation");
+ assertNotNull(me.getPartnerLink());
+ assertEquals(me.getPartnerLinkModelId(),1);
+ assertEquals(me.getPattern(),"testPattern");
+ assertEquals(me.getPortType(),new QName(TEST_NS,"testPortType"));
+ assertSame(me.getProcess(),p);
+ assertEquals(me.getProperty("testProp1Key"),"testProp1");
+ assertNotNull(me.getRequest());
+ assertNotNull(me.getResponse());
+ assertEquals(me.getStatus(),"testStatus");
+
+ // Assert MessageDAO
+ MessageDAO m = me.getRequest();
+ assertNotNull(m.getData());
+ assertSame(m.getMessageExchange(),me);
+ assertEquals(m.getType(),new QName(TEST_NS,"testRequest"));
+
+
+ //Assert Child ScopeDAO
+ assertNotNull(inst.getScopes());
+ assertTrue(inst.getScopes().size() > 0);
+ assertNotNull(inst.getScopes("Child1"));
+ assertTrue(inst.getScopes("Child1").size() == 1);
+ ScopeDAO childS = inst.getScopes("Child1").iterator().next();
+ assertSame(childS,child1);
+ assertSame(childS.getParentScope(),rs);
+ assertNotNull(childS.getChildScopes());
+ assertEquals(childS.getChildScopes().size(), 0);
+ assertNotNull(childS.getVariables());
+ assertTrue(childS.getVariables().size() > 0);
+ assertNotNull(childS.getVariable("var1"));
+ XmlDataDAO chsVar = childS.getVariable("var1");
+ assertNotNull(childS.getPartnerLinks());
+ assertTrue(childS.getPartnerLinks().size() > 0);
+ PartnerLinkDAO spl = childS.getPartnerLinks().iterator().next();
+ assertSame(spl,me.getPartnerLink());
+ assertSame(spl,childS.getPartnerLink(spl.getPartnerLinkModelId()));
+ assertNotNull(childS.getCorrelationSets());
+ assertTrue(childS.getCorrelationSets().size() > 0);
+ assertNotNull(childS.getCorrelationSet("TestCorrelationSet1"));
+
+ // Assert CorrelationSetDAO
+ CorrelationSetDAO cs = childS.getCorrelationSet("TestCorrelationSet1");
+ assertEquals(cs.getName(),"TestCorrelationSet1");
+ assertNotNull(cs.getProperties());
+ assertTrue(cs.getProperties().size() > 0);
+ assertSame(cs.getScope(),childS);
+ assertNotNull(cs.getValue());
+ assertEquals(cs.getProperties().get(new QName(TEST_NS,"name1")),"key1");
+
+
+ // Assert PartnerLinkDAO
+ assertNotNull(spl.getMyEPR());
+ assertEquals(spl.getMyRoleName(),"MyRole1");
+ assertEquals(spl.getMyRoleServiceName(),new QName(TEST_NS,"testRoleService"));
+ assertEquals(spl.getMySessionId(),"TestMySessionID");
+ assertNotNull(spl.getPartnerEPR());
+ assertEquals(spl.getPartnerLinkModelId(),1);
+ assertEquals(spl.getPartnerLinkName(),"Test PartnerLink1");
+ assertEquals(spl.getPartnerRoleName(),"PartnerRole1");
+ assertEquals(spl.getPartnerSessionId(),"TestPartnerSessionID");
+
+ // Assert Variables
+ assertNotNull(inst.getVariables("var1", 2));
+ assertEquals(inst.getVariables("var1", 2).length,1);
+ XmlDataDAO[] vars = inst.getVariables("var1", 2);
+ assertSame(chsVar,vars[0]);
+ assertNotNull(vars[0].get());
+ assertEquals(vars[0].getName(),"var1");
+ // assertEquals(vars[0].getProperty("key1"),"prop1");
+ assertSame(vars[0].getScopeDAO(),childS);
+
+ }
+ }
- @Override
- protected void tearDown() throws Exception {
+ @Override
+ protected void tearDown() throws Exception {
_txm.commit();
- _txm = null;
+ _txm = null;
_ds = null;
}
-
+
}
Modified: ode/trunk/dao-jpa/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/dao-jpa/pom.xml?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/dao-jpa/pom.xml (original)
+++ ode/trunk/dao-jpa/pom.xml Thu May 27 15:52:24 2010
@@ -100,18 +100,18 @@
<tasks>
<property name="maven.runtime.classpath" refid="maven.compile.classpath"/>
<path id="classpath">
- <pathelement path="${maven.runtime.classpath}"/>
- </path>
- <taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask" classpathref="classpath"/>
+ <pathelement path="${maven.runtime.classpath}"/>
+ </path>
+ <taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask" classpathref="classpath"/>
<openjpac>
- <fileset dir="${basedir}/src/main">
- <include name="**/*.java" />
- </fileset>
- <classpath>
- <pathelement location="${basedir}/target/classes"/>
- <pathelement path="${maven.runtime.classpath}"/>
- </classpath>
- </openjpac>
+ <fileset dir="${basedir}/src/main">
+ <include name="**/*.java" />
+ </fileset>
+ <classpath>
+ <pathelement location="${basedir}/target/classes"/>
+ <pathelement path="${maven.runtime.classpath}"/>
+ </classpath>
+ </openjpac>
</tasks>
</configuration>
</execution>
Modified: ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ActivityRecoveryDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ActivityRecoveryDAOImpl.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ActivityRecoveryDAOImpl.java (original)
+++ ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ActivityRecoveryDAOImpl.java Thu May 27 15:52:24 2010
@@ -42,102 +42,102 @@ import java.util.Date;
@Entity
@Table(name="ODE_ACTIVITY_RECOVERY")
@NamedQueries({
- @NamedQuery(name=ActivityRecoveryDAOImpl.DELETE_ACTIVITY_RECOVERIES_BY_IDS, query="delete from ActivityRecoveryDAOImpl as a where a._instanceId in(:ids)"),
- @NamedQuery(name=ActivityRecoveryDAOImpl.COUNT_ACTIVITY_RECOVERIES_BY_INSTANCES,
- query="select r._instanceId, count(r._id) from ActivityRecoveryDAOImpl r where r._instance in(:instances) group by r._instanceId")
+ @NamedQuery(name=ActivityRecoveryDAOImpl.DELETE_ACTIVITY_RECOVERIES_BY_IDS, query="delete from ActivityRecoveryDAOImpl as a where a._instanceId in(:ids)"),
+ @NamedQuery(name=ActivityRecoveryDAOImpl.COUNT_ACTIVITY_RECOVERIES_BY_INSTANCES,
+ query="select r._instanceId, count(r._id) from ActivityRecoveryDAOImpl r where r._instance in(:instances) group by r._instanceId")
})
public class ActivityRecoveryDAOImpl implements ActivityRecoveryDAO {
- public final static String DELETE_ACTIVITY_RECOVERIES_BY_IDS = "DELETE_ACTIVITY_RECOVERIES_BY_IDS";
- public final static String COUNT_ACTIVITY_RECOVERIES_BY_INSTANCES = "COUNT_ACTIVITY_RECOVERIES_BY_INSTANCES";
-
+ public final static String DELETE_ACTIVITY_RECOVERIES_BY_IDS = "DELETE_ACTIVITY_RECOVERIES_BY_IDS";
+ public final static String COUNT_ACTIVITY_RECOVERIES_BY_INSTANCES = "COUNT_ACTIVITY_RECOVERIES_BY_INSTANCES";
+
@Id @Column(name="ID")
@GeneratedValue(strategy= GenerationType.AUTO)
@SuppressWarnings("unused")
private Long _id;
- @Basic @Column(name="ACTIVITY_ID")
+ @Basic @Column(name="ACTIVITY_ID")
private long _activityId;
- @Basic @Column(name="CHANNEL")
+ @Basic @Column(name="CHANNEL")
private String _channel;
- @Basic @Column(name="REASON")
+ @Basic @Column(name="REASON")
private String _reason;
- @Basic @Column(name="DATE_TIME")
+ @Basic @Column(name="DATE_TIME")
private Date _dateTime;
- @Lob @Column(name="DETAILS")
+ @Lob @Column(name="DETAILS")
private String _details;
- @Basic @Column(name="ACTIONS")
+ @Basic @Column(name="ACTIONS")
private String _actions;
- @Basic @Column(name="RETRIES")
+ @Basic @Column(name="RETRIES")
private int _retries;
- @SuppressWarnings("unused")
- @Basic @Column(name="INSTANCE_ID", insertable=false, updatable=false, nullable=true)
+ @SuppressWarnings("unused")
+ @Basic @Column(name="INSTANCE_ID", insertable=false, updatable=false, nullable=true)
private Long _instanceId;
- // _instances is unused because this is a one-way relationship at the database level
+ // _instances is unused because this is a one-way relationship at the database level
@SuppressWarnings("unused")
@ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @Column(name="INSTANCE_ID")
private ProcessInstanceDAOImpl _instance;
-
+
public ActivityRecoveryDAOImpl() {}
- public ActivityRecoveryDAOImpl(String channel, long activityId,
- String reason, Date dateTime, Element data, String[] actions,
- int retries) {
- _channel = channel;
- _activityId = activityId;
- _reason = reason;
- _dateTime = dateTime;
+ public ActivityRecoveryDAOImpl(String channel, long activityId,
+ String reason, Date dateTime, Element data, String[] actions,
+ int retries) {
+ _channel = channel;
+ _activityId = activityId;
+ _reason = reason;
+ _dateTime = dateTime;
if (data != null) _details = DOMUtils.domToString(data);
-
+
String alist = actions[0];
for (int i = 1; i < actions.length; ++i)
alist += " " + actions[i];
- _actions = alist;
-
- _retries = retries;
- }
-
- public String getActions() {
- return _actions;
- }
-
- public String[] getActionsList() {
- return getActions().split(" ");
- }
-
- public long getActivityId() {
- return _activityId;
- }
-
- public String getChannel() {
- return _channel;
- }
-
- public Date getDateTime() {
- return _dateTime;
- }
-
- public Element getDetails() {
- Element ret = null;
- if ( _details != null ) {
- try {
- ret = DOMUtils.stringToDOM(_details);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
- return ret;
- }
-
- public String getReason() {
- return _reason;
- }
-
- public int getRetries() {
- return _retries;
- }
+ _actions = alist;
+
+ _retries = retries;
+ }
+
+ public String getActions() {
+ return _actions;
+ }
+
+ public String[] getActionsList() {
+ return getActions().split(" ");
+ }
+
+ public long getActivityId() {
+ return _activityId;
+ }
+
+ public String getChannel() {
+ return _channel;
+ }
+
+ public Date getDateTime() {
+ return _dateTime;
+ }
+
+ public Element getDetails() {
+ Element ret = null;
+ if ( _details != null ) {
+ try {
+ ret = DOMUtils.stringToDOM(_details);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return ret;
+ }
+
+ public String getReason() {
+ return _reason;
+ }
+
+ public int getRetries() {
+ return _retries;
+ }
public ProcessInstanceDAOImpl getInstance() {
return _instance;
Modified: ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java (original)
+++ ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java Thu May 27 15:52:24 2010
@@ -43,7 +43,7 @@ import java.util.Properties;
* @author Matthieu Riou <mriou at apache dot org>
*/
public class BPELDAOConnectionFactoryImpl implements BpelDAOConnectionFactoryJDBC {
- static final Log __log = LogFactory.getLog(BPELDAOConnectionFactoryImpl.class);
+ static final Log __log = LogFactory.getLog(BPELDAOConnectionFactoryImpl.class);
protected EntityManagerFactory _emf;
private TransactionManager _tm;
@@ -85,7 +85,7 @@ public class BPELDAOConnectionFactoryImp
}
protected BPELDAOConnectionImpl createBPELDAOConnection(EntityManager em) {
- return new BPELDAOConnectionImpl(em);
+ return new BPELDAOConnectionImpl(em);
}
@SuppressWarnings("unchecked")
Modified: ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrSetProperty.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrSetProperty.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrSetProperty.java (original)
+++ ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrSetProperty.java Thu May 27 15:52:24 2010
@@ -37,11 +37,11 @@ import javax.persistence.Table;
@Entity
@Table(name="ODE_CORSET_PROP")
@NamedQueries({
- @NamedQuery(name=CorrSetProperty.DELETE_CORSET_PROPERTIES_BY_PROPERTY_IDS, query="delete from CorrSetProperty as p where p.corrSetId in(:corrSetIds)")
+ @NamedQuery(name=CorrSetProperty.DELETE_CORSET_PROPERTIES_BY_PROPERTY_IDS, query="delete from CorrSetProperty as p where p.corrSetId in(:corrSetIds)")
})
public class CorrSetProperty {
- public final static String DELETE_CORSET_PROPERTIES_BY_PROPERTY_IDS = "DELETE_CORSET_PROPERTIES_BY_PROPERTY_IDS";
-
+ public final static String DELETE_CORSET_PROPERTIES_BY_PROPERTY_IDS = "DELETE_CORSET_PROPERTIES_BY_PROPERTY_IDS";
+
@Id @Column(name="ID")
@GeneratedValue(strategy=GenerationType.AUTO)
@SuppressWarnings("unused")
Modified: ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelationSetDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelationSetDAOImpl.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelationSetDAOImpl.java (original)
+++ ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelationSetDAOImpl.java Thu May 27 15:52:24 2010
@@ -54,18 +54,18 @@ import java.util.Map;
@NamedQuery(name=CorrelationSetDAOImpl.SELECT_ACTIVE_SETS, query="select c from CorrelationSetDAOImpl as c left join fetch c._scope where c._scope._processInstance._state = (:state)")
})
public class CorrelationSetDAOImpl implements CorrelationSetDAO {
- public final static String DELETE_CORRELATION_SETS_BY_IDS = "DELETE_CORRELATION_SETS_BY_IDS";
+ public final static String DELETE_CORRELATION_SETS_BY_IDS = "DELETE_CORRELATION_SETS_BY_IDS";
public final static String SELECT_CORRELATION_SETS_BY_INSTANCES = "SELECT_CORRELATION_SETS_BY_INSTANCES";
public final static String SELECT_CORRELATION_SET_IDS_BY_PROCESS = "SELECT_CORRELATION_SET_IDS_BY_PROCESS";
public final static String SELECT_CORRELATION_SET_IDS_BY_INSTANCE = "SELECT_CORRELATION_SET_IDS_BY_INSTANCE";
public final static String SELECT_ACTIVE_SETS = "SELECT_ACTIVE_SETS";
-
- @Id @Column(name="CORRELATION_SET_ID")
- @GeneratedValue(strategy=GenerationType.AUTO)
- private Long _correlationSetId;
- @Basic @Column(name="NAME")
+
+ @Id @Column(name="CORRELATION_SET_ID")
+ @GeneratedValue(strategy=GenerationType.AUTO)
+ private Long _correlationSetId;
+ @Basic @Column(name="NAME")
private String _name;
- @Basic @Column(name="CORRELATION_KEY")
+ @Basic @Column(name="CORRELATION_KEY")
private String _correlationKey;
@OneToMany(targetEntity=CorrSetProperty.class,mappedBy="_corrSet",fetch=FetchType.LAZY,cascade={CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH})
@@ -74,45 +74,45 @@ public class CorrelationSetDAOImpl imple
private ScopeDAOImpl _scope;
public CorrelationSetDAOImpl() {}
- public CorrelationSetDAOImpl(ScopeDAOImpl scope, String name) {
- _name = name;
- _scope = scope;
- }
-
- public Long getCorrelationSetId() {
- return _correlationSetId;
- }
-
- public String getName() {
- return _name;
- }
+ public CorrelationSetDAOImpl(ScopeDAOImpl scope, String name) {
+ _name = name;
+ _scope = scope;
+ }
+
+ public Long getCorrelationSetId() {
+ return _correlationSetId;
+ }
+
+ public String getName() {
+ return _name;
+ }
- public Map<QName, String> getProperties() {
+ public Map<QName, String> getProperties() {
HashMap<QName, String> map = new HashMap<QName, String>();
for (CorrSetProperty prop : _props) {
map.put(QName.valueOf(prop.getPropertyKey()), prop.getPropertyValue());
}
return map;
- }
+ }
- public ScopeDAO getScope() {
- return _scope;
- }
+ public ScopeDAO getScope() {
+ return _scope;
+ }
- public CorrelationKey getValue() {
+ public CorrelationKey getValue() {
if (_correlationKey == null) return null;
return new CorrelationKey(_correlationKey);
- }
+ }
- public void setValue(QName[] names, CorrelationKey values) {
- _correlationKey = values.toCanonicalString();
+ public void setValue(QName[] names, CorrelationKey values) {
+ _correlationKey = values.toCanonicalString();
if (names != null)
for (int m = 0; m < names.length; m++) {
CorrSetProperty prop = new CorrSetProperty(names[m].toString(), values.getValues()[m]);
_props.add(prop);
prop.setCorrSet(this);
}
- }
+ }
public ProcessDAO getProcess() {
return _scope.getProcessInstance().getProcess();
Modified: ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/EventDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/EventDAOImpl.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/EventDAOImpl.java (original)
+++ ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/EventDAOImpl.java Thu May 27 15:52:24 2010
@@ -47,13 +47,13 @@ import java.sql.Timestamp;
@NamedQuery(name=EventDAOImpl.DELETE_EVENTS_BY_INSTANCE, query="delete from EventDAOImpl as e where e._instance = :instance")
})
public class EventDAOImpl extends OpenJPADAO {
- public final static String SELECT_EVENT_IDS_BY_PROCESS = "SELECT_EVENT_IDS_BY_PROCESS";
- public final static String DELETE_EVENTS_BY_IDS = "DELETE_EVENTS_BY_IDS";
- public final static String DELETE_EVENTS_BY_INSTANCE = "DELETE_EVENTS_BY_INSTANCE";
-
+ public final static String SELECT_EVENT_IDS_BY_PROCESS = "SELECT_EVENT_IDS_BY_PROCESS";
+ public final static String DELETE_EVENTS_BY_IDS = "DELETE_EVENTS_BY_IDS";
+ public final static String DELETE_EVENTS_BY_INSTANCE = "DELETE_EVENTS_BY_INSTANCE";
+
@Id @Column(name="EVENT_ID")
- @GeneratedValue(strategy= GenerationType.AUTO)
- private Long _id;
+ @GeneratedValue(strategy= GenerationType.AUTO)
+ private Long _id;
@Basic @Column(name="TSTAMP")
private Timestamp _tstamp;
@Basic @Column(name="TYPE")
Modified: ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/FaultDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/FaultDAOImpl.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/FaultDAOImpl.java (original)
+++ ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/FaultDAOImpl.java Thu May 27 15:52:24 2010
@@ -39,62 +39,62 @@ import javax.xml.namespace.QName;
@Entity
@Table(name="ODE_FAULT")
@NamedQueries({
- @NamedQuery(name=FaultDAOImpl.DELETE_FAULTS_BY_IDS, query="delete from FaultDAOImpl as f where f._id in(:ids)")
+ @NamedQuery(name=FaultDAOImpl.DELETE_FAULTS_BY_IDS, query="delete from FaultDAOImpl as f where f._id in(:ids)")
})
public class FaultDAOImpl implements FaultDAO {
- public final static String DELETE_FAULTS_BY_IDS = "DELETE_FAULTS_BY_IDS";
-
- @Id @Column(name="FAULT_ID")
- @GeneratedValue(strategy=GenerationType.AUTO)
- @SuppressWarnings("unused")
- private Long _id;
- @Basic @Column(name="NAME")
+ public final static String DELETE_FAULTS_BY_IDS = "DELETE_FAULTS_BY_IDS";
+
+ @Id @Column(name="FAULT_ID")
+ @GeneratedValue(strategy=GenerationType.AUTO)
+ @SuppressWarnings("unused")
+ private Long _id;
+ @Basic @Column(name="NAME")
private String _name;
- @Basic @Column(name="MESSAGE", length=4000)
+ @Basic @Column(name="MESSAGE", length=4000)
private String _explanation;
- @Lob @Column(name="DATA")
+ @Lob @Column(name="DATA")
private String _data;
- @Basic @Column(name="LINE_NUMBER")
+ @Basic @Column(name="LINE_NUMBER")
private int _lineNo;
- @Basic @Column(name="ACTIVITY_ID")
+ @Basic @Column(name="ACTIVITY_ID")
private int _activityId;
- public FaultDAOImpl() {}
- public FaultDAOImpl(QName faultName, String explanation, int faultLineNo,
- int activityId, Element faultMessage) {
- _name = faultName.toString();
- _explanation = explanation;
- _lineNo = faultLineNo;
- _activityId = activityId;
- _data = (faultMessage == null)?null:DOMUtils.domToString(faultMessage);
- }
-
- public int getActivityId() {
- return _activityId;
- }
-
- public Element getData() {
- Element ret = null;
-
- try {
- ret = (_data == null)?null:DOMUtils.stringToDOM(_data);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
-
- return ret;
- }
-
- public String getExplanation() {
- return _explanation;
- }
-
- public int getLineNo() {
- return _lineNo;
- }
-
- public QName getName() {
- return _name == null ? null : QName.valueOf(_name);
- }
+ public FaultDAOImpl() {}
+ public FaultDAOImpl(QName faultName, String explanation, int faultLineNo,
+ int activityId, Element faultMessage) {
+ _name = faultName.toString();
+ _explanation = explanation;
+ _lineNo = faultLineNo;
+ _activityId = activityId;
+ _data = (faultMessage == null)?null:DOMUtils.domToString(faultMessage);
+ }
+
+ public int getActivityId() {
+ return _activityId;
+ }
+
+ public Element getData() {
+ Element ret = null;
+
+ try {
+ ret = (_data == null)?null:DOMUtils.stringToDOM(_data);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+
+ return ret;
+ }
+
+ public String getExplanation() {
+ return _explanation;
+ }
+
+ public int getLineNo() {
+ return _lineNo;
+ }
+
+ public QName getName() {
+ return _name == null ? null : QName.valueOf(_name);
+ }
}
Modified: ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JpaTxMgrProvider.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JpaTxMgrProvider.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JpaTxMgrProvider.java (original)
+++ ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JpaTxMgrProvider.java Thu May 27 15:52:24 2010
@@ -28,10 +28,10 @@ import org.apache.openjpa.ee.ManagedRunt
import org.apache.openjpa.util.GeneralException;
public class JpaTxMgrProvider implements ManagedRuntime {
- private TransactionManager _txMgr;
-
+ private TransactionManager _txMgr;
+
public JpaTxMgrProvider(TransactionManager txMgr) {
- _txMgr = txMgr;
+ _txMgr = txMgr;
}
public TransactionManager getTransactionManager() throws Exception {
Modified: ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageRouteDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageRouteDAOImpl.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageRouteDAOImpl.java (original)
+++ ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageRouteDAOImpl.java Thu May 27 15:52:24 2010
@@ -40,27 +40,27 @@ import javax.persistence.Table;
@Entity
@Table(name="ODE_MESSAGE_ROUTE")
@NamedQueries ({
- @NamedQuery(name=MessageRouteDAOImpl.DELETE_MESSAGE_ROUTES_BY_INSTANCE_IDS, query="delete from MessageRouteDAOImpl as r where r._instanceId in(:instanceIds)"),
- @NamedQuery(name=MessageRouteDAOImpl.DELETE_MESSAGE_ROUTES_BY_INSTANCE, query="delete from MessageRouteDAOImpl as r where r._processInst = :instance")
+ @NamedQuery(name=MessageRouteDAOImpl.DELETE_MESSAGE_ROUTES_BY_INSTANCE_IDS, query="delete from MessageRouteDAOImpl as r where r._instanceId in(:instanceIds)"),
+ @NamedQuery(name=MessageRouteDAOImpl.DELETE_MESSAGE_ROUTES_BY_INSTANCE, query="delete from MessageRouteDAOImpl as r where r._processInst = :instance")
})
public class MessageRouteDAOImpl implements MessageRouteDAO {
- public final static String DELETE_MESSAGE_ROUTES_BY_INSTANCE = "DELETE_MESSAGE_ROUTES_BY_INSTANCE";
- public final static String DELETE_MESSAGE_ROUTES_BY_INSTANCE_IDS = "DELETE_MESSAGE_ROUTES_BY_INSTANCE_IDS";
-
- @Id @Column(name="MESSAGE_ROUTE_ID")
- @GeneratedValue(strategy=GenerationType.AUTO)
- private Long _id;
- @Basic @Column(name="GROUP_ID")
+ public final static String DELETE_MESSAGE_ROUTES_BY_INSTANCE = "DELETE_MESSAGE_ROUTES_BY_INSTANCE";
+ public final static String DELETE_MESSAGE_ROUTES_BY_INSTANCE_IDS = "DELETE_MESSAGE_ROUTES_BY_INSTANCE_IDS";
+
+ @Id @Column(name="MESSAGE_ROUTE_ID")
+ @GeneratedValue(strategy=GenerationType.AUTO)
+ private Long _id;
+ @Basic @Column(name="GROUP_ID")
private String _groupId;
- @Basic @Column(name="ROUTE_INDEX")
+ @Basic @Column(name="ROUTE_INDEX")
private int _index;
- @Basic @Column(name="CORRELATION_KEY")
+ @Basic @Column(name="CORRELATION_KEY")
private String _correlationKey;
- @Basic @Column(name="ROUTE_POLICY", length=16)
+ @Basic @Column(name="ROUTE_POLICY", length=16)
private String _routePolicy;
- @SuppressWarnings("unused")
- @Basic @Column(name="PROCESS_INSTANCE_ID", insertable=false, updatable=false, nullable=true)
+ @SuppressWarnings("unused")
+ @Basic @Column(name="PROCESS_INSTANCE_ID", insertable=false, updatable=false, nullable=true)
private int _instanceId;
@ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @Column(name="PROCESS_INSTANCE_ID")
private ProcessInstanceDAOImpl _processInst;
@@ -70,12 +70,12 @@ public class MessageRouteDAOImpl impleme
private CorrelatorDAOImpl _correlator;
public MessageRouteDAOImpl() {}
- public MessageRouteDAOImpl(CorrelationKeySet keySet, String groupId, int index,
+ public MessageRouteDAOImpl(CorrelationKeySet keySet, String groupId, int index,
ProcessInstanceDAOImpl processInst, CorrelatorDAOImpl correlator, String routePolicy) {
- _correlationKey = keySet.toCanonicalString();
- _groupId = groupId;
- _index = index;
- _processInst = processInst;
+ _correlationKey = keySet.toCanonicalString();
+ _groupId = groupId;
+ _index = index;
+ _processInst = processInst;
_correlator = correlator;
_routePolicy = routePolicy;
}
@@ -85,32 +85,32 @@ public class MessageRouteDAOImpl impleme
}
public CorrelationKey getCorrelationKey() {
- return new CorrelationKey(_correlationKey);
- }
+ return new CorrelationKey(_correlationKey);
+ }
public void setCorrelationKey(CorrelationKey key) {
_correlationKey = key.toCanonicalString();
}
- public String getGroupId() {
- return _groupId;
- }
-
- public int getIndex() {
- return _index;
- }
-
- public ProcessInstanceDAO getTargetInstance() {
- return _processInst;
- }
-
- public String getRoute() {
- return _routePolicy;
- }
-
- public CorrelationKeySet getCorrelationKeySet() {
- return new CorrelationKeySet(_correlationKey);
- }
+ public String getGroupId() {
+ return _groupId;
+ }
+
+ public int getIndex() {
+ return _index;
+ }
+
+ public ProcessInstanceDAO getTargetInstance() {
+ return _processInst;
+ }
+
+ public String getRoute() {
+ return _routePolicy;
+ }
+
+ public CorrelationKeySet getCorrelationKeySet() {
+ return new CorrelationKeySet(_correlationKey);
+ }
public void setCorrelationKeySet(CorrelationKeySet keySet) {
_correlationKey = keySet.toCanonicalString();
Modified: ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MexProperty.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MexProperty.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MexProperty.java (original)
+++ ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MexProperty.java Thu May 27 15:52:24 2010
@@ -38,10 +38,10 @@ import javax.persistence.Table;
@Entity
@Table(name="ODE_MEX_PROP")
@NamedQueries({
- @NamedQuery(name=MexProperty.DELETE_MEX_PROPERTIES_BY_MEX_IDS, query="delete from MexProperty as p where p._mexId in (:mexIds)")
+ @NamedQuery(name=MexProperty.DELETE_MEX_PROPERTIES_BY_MEX_IDS, query="delete from MexProperty as p where p._mexId in (:mexIds)")
})
public class MexProperty {
- public final static String DELETE_MEX_PROPERTIES_BY_MEX_IDS = "DELETE_MEX_PROPERTIES_BY_MEX_IDS";
+ public final static String DELETE_MEX_PROPERTIES_BY_MEX_IDS = "DELETE_MEX_PROPERTIES_BY_MEX_IDS";
@Id @Column(name="ID")
@GeneratedValue(strategy=GenerationType.AUTO)
Modified: ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/OpenJPADAO.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/OpenJPADAO.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/OpenJPADAO.java (original)
+++ ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/OpenJPADAO.java Thu May 27 15:52:24 2010
@@ -34,7 +34,7 @@ import java.util.List;
* @author Matthieu Riou <mriou at apache dot org>
*/
public class OpenJPADAO {
- private static final Log __log = LogFactory.getLog(OpenJPADAO.class);
+ private static final Log __log = LogFactory.getLog(OpenJPADAO.class);
protected BPELDAOConnectionImpl getConn() {
return BPELDAOConnectionFactoryImpl._connections.get();
@@ -59,20 +59,20 @@ public class OpenJPADAO {
}
protected <T> void batchUpdateByIds(Iterator<T> ids, Query query, String parameterName) {
- if( query instanceof OpenJPAQuery ) {
- OpenJPAQuery openJpaQuery = (OpenJPAQuery)query;
- int batchSize = openJpaQuery.getFetchPlan().getFetchBatchSize();
- if( __log.isTraceEnabled() ) __log.trace("BATCH fetchBatchSize = " + batchSize);
- List<T> batch = new ArrayList<T>();
- while( ids.hasNext() ) {
- for( int i = 0; i < batchSize && ids.hasNext(); i++ ) {
- batch.add(ids.next());
- }
- if( __log.isTraceEnabled() ) __log.trace("BATCH updating " + batch.size() + " objects.");
- query.setParameter(parameterName, batch);
- query.executeUpdate();
- batch.clear();
- }
- }
+ if( query instanceof OpenJPAQuery ) {
+ OpenJPAQuery openJpaQuery = (OpenJPAQuery)query;
+ int batchSize = openJpaQuery.getFetchPlan().getFetchBatchSize();
+ if( __log.isTraceEnabled() ) __log.trace("BATCH fetchBatchSize = " + batchSize);
+ List<T> batch = new ArrayList<T>();
+ while( ids.hasNext() ) {
+ for( int i = 0; i < batchSize && ids.hasNext(); i++ ) {
+ batch.add(ids.next());
+ }
+ if( __log.isTraceEnabled() ) __log.trace("BATCH updating " + batch.size() + " objects.");
+ query.setParameter(parameterName, batch);
+ query.executeUpdate();
+ batch.clear();
+ }
+ }
}
}
\ No newline at end of file
Modified: ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/PartnerLinkDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/PartnerLinkDAOImpl.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/PartnerLinkDAOImpl.java (original)
+++ ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/PartnerLinkDAOImpl.java Thu May 27 15:52:24 2010
@@ -46,127 +46,127 @@ import javax.xml.namespace.QName;
@NamedQuery(name=PartnerLinkDAOImpl.DELETE_PARTNER_LINKS_BY_SCOPE_IDS, query="delete from PartnerLinkDAOImpl as l where l._scopeId in (:scopeIds)")
})
public class PartnerLinkDAOImpl implements PartnerLinkDAO {
- public final static String DELETE_PARTNER_LINKS_BY_SCOPE_IDS = "DELETE_PARTNER_LINKS_BY_SCOPE_IDS";
-
- @Id @Column(name="PARTNER_LINK_ID")
- @GeneratedValue(strategy=GenerationType.AUTO)
- @SuppressWarnings("unused")
- private Long _id;
- @Lob @Column(name="MY_EPR")
+ public final static String DELETE_PARTNER_LINKS_BY_SCOPE_IDS = "DELETE_PARTNER_LINKS_BY_SCOPE_IDS";
+
+ @Id @Column(name="PARTNER_LINK_ID")
+ @GeneratedValue(strategy=GenerationType.AUTO)
+ @SuppressWarnings("unused")
+ private Long _id;
+ @Lob @Column(name="MY_EPR")
private String _myEPR;
- @Transient
+ @Transient
private Element _myEPRElement;
- @Basic @Column(name="MY_ROLE_NAME")
+ @Basic @Column(name="MY_ROLE_NAME")
private String _myRoleName;
- @Basic @Column(name="MY_ROLE_SERVICE_NAME")
+ @Basic @Column(name="MY_ROLE_SERVICE_NAME")
private String _myRoleServiceName;
- @Basic @Column(name="MY_SESSION_ID")
+ @Basic @Column(name="MY_SESSION_ID")
private String _mySessionId;
- @Lob @Column(name="PARTNER_EPR")
+ @Lob @Column(name="PARTNER_EPR")
private String _partnerEPR;
- @Transient
+ @Transient
private Element _partnerEPRElement;
- @Basic @Column(name="PARTNER_LINK_MODEL_ID")
+ @Basic @Column(name="PARTNER_LINK_MODEL_ID")
private int _partnerLinkModelId;
- @Basic @Column(name="PARTNER_LINK_NAME")
+ @Basic @Column(name="PARTNER_LINK_NAME")
private String _partnerLinkName;
- @Basic @Column(name="PARTNER_ROLE_NAME")
+ @Basic @Column(name="PARTNER_ROLE_NAME")
private String _partnerRoleName;
- @Basic @Column(name="PARTNER_SESSION_ID")
+ @Basic @Column(name="PARTNER_SESSION_ID")
private String _partnerSessionId;
- @SuppressWarnings("unused")
- @Basic @Column(name="SCOPE_ID", nullable=true, insertable=false, updatable=false)
+ @SuppressWarnings("unused")
+ @Basic @Column(name="SCOPE_ID", nullable=true, insertable=false, updatable=false)
private Long _scopeId;
@ManyToOne(fetch= FetchType.LAZY,cascade={CascadeType.PERSIST}) @Column(name="SCOPE_ID")
@SuppressWarnings("unused")
private ScopeDAOImpl _scope;
public PartnerLinkDAOImpl() {}
- public PartnerLinkDAOImpl(int modelId, String name, String myRole, String partnerRole) {
- _partnerLinkModelId = modelId;
- _partnerLinkName = name;
- _myRoleName = myRole;
- _partnerRoleName = partnerRole;
- }
-
- public Element getMyEPR() {
- if (_myEPRElement == null && _myEPR != null && !"".equals(_myEPR)) {
- try {
- _myEPRElement = DOMUtils.stringToDOM(_myEPR);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-
- return _myEPRElement;
- }
-
- public String getMyRoleName() {
- return _myRoleName;
- }
-
- public QName getMyRoleServiceName() {
- return _myRoleServiceName == null ? null : QName.valueOf(_myRoleServiceName);
- }
-
- public String getMySessionId() {
- return _mySessionId;
- }
-
- public Element getPartnerEPR() {
- if ( _partnerEPRElement == null && _partnerEPR != null && !"".equals(_partnerEPR)) {
- try {
- _partnerEPRElement = DOMUtils.stringToDOM(_partnerEPR);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
- return _partnerEPRElement;
- }
-
- public int getPartnerLinkModelId() {
- return _partnerLinkModelId;
- }
-
- public String getPartnerLinkName() {
- return _partnerLinkName;
- }
-
- public String getPartnerRoleName() {
- return _partnerRoleName;
- }
-
- public String getPartnerSessionId() {
- return _partnerSessionId;
- }
-
- public void setMyEPR(Element val) {
- _myEPRElement = val;
- _myEPR = DOMUtils.domToString(val);
-
- }
-
- public void setMyRoleServiceName(QName svcName) {
- _myRoleServiceName = svcName.toString();
-
- }
-
- public void setMySessionId(String sessionId) {
- _mySessionId = sessionId;
-
- }
-
- public void setPartnerEPR(Element val) {
- _partnerEPRElement = val;
- _partnerEPR = DOMUtils.domToString(val);
+ public PartnerLinkDAOImpl(int modelId, String name, String myRole, String partnerRole) {
+ _partnerLinkModelId = modelId;
+ _partnerLinkName = name;
+ _myRoleName = myRole;
+ _partnerRoleName = partnerRole;
+ }
- }
+ public Element getMyEPR() {
+ if (_myEPRElement == null && _myEPR != null && !"".equals(_myEPR)) {
+ try {
+ _myEPRElement = DOMUtils.stringToDOM(_myEPR);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ return _myEPRElement;
+ }
- public void setPartnerSessionId(String session) {
- _partnerSessionId = session;
+ public String getMyRoleName() {
+ return _myRoleName;
+ }
+
+ public QName getMyRoleServiceName() {
+ return _myRoleServiceName == null ? null : QName.valueOf(_myRoleServiceName);
+ }
+
+ public String getMySessionId() {
+ return _mySessionId;
+ }
+
+ public Element getPartnerEPR() {
+ if ( _partnerEPRElement == null && _partnerEPR != null && !"".equals(_partnerEPR)) {
+ try {
+ _partnerEPRElement = DOMUtils.stringToDOM(_partnerEPR);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return _partnerEPRElement;
+ }
+
+ public int getPartnerLinkModelId() {
+ return _partnerLinkModelId;
+ }
+
+ public String getPartnerLinkName() {
+ return _partnerLinkName;
+ }
+
+ public String getPartnerRoleName() {
+ return _partnerRoleName;
+ }
- }
+ public String getPartnerSessionId() {
+ return _partnerSessionId;
+ }
+
+ public void setMyEPR(Element val) {
+ _myEPRElement = val;
+ _myEPR = DOMUtils.domToString(val);
+
+ }
+
+ public void setMyRoleServiceName(QName svcName) {
+ _myRoleServiceName = svcName.toString();
+
+ }
+
+ public void setMySessionId(String sessionId) {
+ _mySessionId = sessionId;
+
+ }
+
+ public void setPartnerEPR(Element val) {
+ _partnerEPRElement = val;
+ _partnerEPR = DOMUtils.domToString(val);
+
+ }
+
+ public void setPartnerSessionId(String session) {
+ _partnerSessionId = session;
+
+ }
public void setScope(ScopeDAOImpl scope) {
_scope = scope;
Modified: ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessManagementDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessManagementDAOImpl.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessManagementDAOImpl.java (original)
+++ ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessManagementDAOImpl.java Thu May 27 15:52:24 2010
@@ -38,44 +38,44 @@ import org.apache.ode.bpel.dao.ProcessMa
import org.apache.ode.bpel.dao.ProcessManagementDAO.InstanceSummaryKey;
public class ProcessManagementDAOImpl implements ProcessManagementDAO {
- private static final Log __log = LogFactory.getLog(ProcessManagementDAOImpl.class);
+ private static final Log __log = LogFactory.getLog(ProcessManagementDAOImpl.class);
- private EntityManager em;
-
- public ProcessManagementDAOImpl(EntityManager em) {
- this.em = em;
- }
-
- public Object[] findFailedCountAndLastFailedDateForProcessId(BpelDAOConnection conn, String status, String processId) {
- Query query = em.createNamedQuery(ProcessInstanceDAOImpl.COUNT_FAILED_INSTANCES_BY_STATUS_AND_PROCESS_ID);
- query.setParameter("states", new InstanceFilter("status=" + status).convertFilterState());
- query.setParameter("processId", processId);
-
- return (Object[])query.getSingleResult();
- }
-
- public void prefetchActivityFailureCounts(Collection<ProcessInstanceDAO> instances) {
- if(__log.isTraceEnabled()) __log.trace("Prefetching activity failure counts for " + instances.size() + " instances.");
-
- if( instances.isEmpty() ) return;
-
- Query query = em.createNamedQuery(ActivityRecoveryDAOImpl.COUNT_ACTIVITY_RECOVERIES_BY_INSTANCES);
- query.setParameter("instances", instances);
-
- Map<Long, Long> countsByInstanceId = new HashMap<Long, Long>();
- for( Object instanceIdAndCount : query.getResultList() ) {
- Object instanceId = ((Object[])instanceIdAndCount)[0];
- Object count = ((Object[])instanceIdAndCount)[0];
- countsByInstanceId.put((Long)instanceId, (Long)count);
- }
-
- for( ProcessInstanceDAO instance : instances ) {
- Long count = countsByInstanceId.get(instance.getInstanceId());
- if( count != null ) {
- ((ProcessInstanceDAOImpl)instance).setActivityFailureCount(count.intValue());
- }
- }
- }
+ private EntityManager em;
+
+ public ProcessManagementDAOImpl(EntityManager em) {
+ this.em = em;
+ }
+
+ public Object[] findFailedCountAndLastFailedDateForProcessId(BpelDAOConnection conn, String status, String processId) {
+ Query query = em.createNamedQuery(ProcessInstanceDAOImpl.COUNT_FAILED_INSTANCES_BY_STATUS_AND_PROCESS_ID);
+ query.setParameter("states", new InstanceFilter("status=" + status).convertFilterState());
+ query.setParameter("processId", processId);
+
+ return (Object[])query.getSingleResult();
+ }
+
+ public void prefetchActivityFailureCounts(Collection<ProcessInstanceDAO> instances) {
+ if(__log.isTraceEnabled()) __log.trace("Prefetching activity failure counts for " + instances.size() + " instances.");
+
+ if( instances.isEmpty() ) return;
+
+ Query query = em.createNamedQuery(ActivityRecoveryDAOImpl.COUNT_ACTIVITY_RECOVERIES_BY_INSTANCES);
+ query.setParameter("instances", instances);
+
+ Map<Long, Long> countsByInstanceId = new HashMap<Long, Long>();
+ for( Object instanceIdAndCount : query.getResultList() ) {
+ Object instanceId = ((Object[])instanceIdAndCount)[0];
+ Object count = ((Object[])instanceIdAndCount)[0];
+ countsByInstanceId.put((Long)instanceId, (Long)count);
+ }
+
+ for( ProcessInstanceDAO instance : instances ) {
+ Long count = countsByInstanceId.get(instance.getInstanceId());
+ if( count != null ) {
+ ((ProcessInstanceDAOImpl)instance).setActivityFailureCount(count.intValue());
+ }
+ }
+ }
public int countInstancesByPidAndString(BpelDAOConnection conn, QName pid, String status) {
InstanceFilter instanceFilter = new InstanceFilter("status=" + status + " pid="+ pid);