You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mr...@apache.org on 2007/01/30 20:11:08 UTC
svn commit: r501522 - in /incubator/ode/trunk:
axis2/src/main/java/org/apache/ode/axis2/
axis2/src/main/java/org/apache/ode/axis2/service/
axis2/src/test/java/org/apache/ode/axis2/management/
bpel-api/src/main/java/org/apache/ode/bpel/iapi/ bpel-dao/sr...
Author: mriou
Date: Tue Jan 30 11:11:05 2007
New Revision: 501522
URL: http://svn.apache.org/viewvc?view=rev&rev=501522
Log:
Few improvements to the versioning scheme. First changed to a global monotonically increased version number (this time really like subversion and its repo-level version number). Second returning info about what has been really deployed in remote deployment (by web service) because if you deploy foo you will end up with a package like foo-12.
Modified:
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java
incubator/ode/trunk/axis2/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
incubator/ode/trunk/axis2/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ProcessConf.java
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ProcessStore.java
incubator/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/BpelDAOConnection.java
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/engine/BpelServerImpl.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/BpelDAOConnectionImpl.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessDaoImpl.java
incubator/ode/trunk/bpel-scheduler-quartz/src/main/java/org/apache/ode/bpel/scheduler/quartz/JobStoreJTA.java
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ConfStoreConnection.java
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDAO.java
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfDAO.java
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/ConfStoreConnectionHib.java
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DeploymentUnitDaoImpl.java
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/ProcessConfDaoImpl.java
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/VersionTrackerDAOImpl.java
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/ConfStoreConnectionJpa.java
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/DeploymentUnitDaoImpl.java
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/ProcessConfDaoImpl.java
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/VersionTrackerDAOImpl.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HProcess.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java
incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingConnectionWrapper.java
Modified: incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java (original)
+++ incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java Tue Jan 30 11:11:05 2007
@@ -19,23 +19,6 @@
package org.apache.ode.axis2;
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Properties;
-import java.util.StringTokenizer;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import javax.naming.InitialContext;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.sql.DataSource;
-import javax.transaction.TransactionManager;
-import javax.wsdl.Definition;
-import javax.xml.namespace.QName;
-
import org.apache.axis2.AxisFault;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
@@ -61,6 +44,22 @@
import org.apache.ode.utils.fs.TempFileManager;
import org.opentools.minerva.MinervaPool;
+import javax.naming.InitialContext;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
+import javax.wsdl.Definition;
+import javax.xml.namespace.QName;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Properties;
+import java.util.StringTokenizer;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
/**
* Server class called by our Axis hooks to handle all ODE lifecycle management.
*
@@ -406,7 +405,14 @@
private void initEmbeddedDb() throws ServletException {
__log.info("Using DataSource Derby");
- String url = "jdbc:derby:" + _workRoot + "/hibdb/" + _odeConfig.getDbEmbeddedName();
+ String db = "jpadb";
+ String persistenceType = System.getProperty("ode.persistence");
+ if (persistenceType != null) {
+ if ("hibernate".equalsIgnoreCase(persistenceType))
+ db = "hibdb";
+ }
+
+ String url = "jdbc:derby:" + _workRoot + "/" + db + "/" + _odeConfig.getDbEmbeddedName();
__log.debug("creating Minerva pool for " + url);
Modified: incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java (original)
+++ incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java Tue Jan 30 11:11:05 2007
@@ -19,24 +19,6 @@
package org.apache.ode.axis2.service;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Collection;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-import javax.activation.DataHandler;
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.namespace.QName;
-
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
@@ -60,6 +42,18 @@
import org.apache.ode.bpel.iapi.ProcessStore;
import org.apache.ode.utils.fs.FileUtils;
+import javax.activation.DataHandler;
+import javax.wsdl.Definition;
+import javax.wsdl.WSDLException;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLReader;
+import javax.xml.namespace.QName;
+import java.io.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
/**
* Axis wrapper for process deployment.
*/
@@ -125,12 +119,7 @@
// it to hold on for a while.
_poller.hold();
- File dest = buildUnusedDir(_deployPath, namePart.getText());
-
- // If the previous deployment failed, there will still be something but
- // undeploy won't do anything
- FileUtils.deepDelete(dest);
-
+ File dest = new File(_deployPath, namePart.getText() + "-" + (_store.getCurrentVersion() + 1));
dest.mkdir();
unzip(dest, (DataHandler) binaryNode.getDataHandler());
@@ -141,7 +130,6 @@
"descriptor in its root directory named deploy.xml, aborting.");
Collection<QName> deployed = _store.deploy(dest);
-
File deployedMarker = new File(_deployPath, dest.getName() + ".deployed");
deployedMarker.createNewFile();
Modified: incubator/ode/trunk/axis2/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/axis2/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java (original)
+++ incubator/ode/trunk/axis2/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java Tue Jan 30 11:11:05 2007
@@ -19,25 +19,19 @@
package org.apache.ode.axis2.management;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-
import junit.framework.TestCase;
-
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.OMText;
+import org.apache.axiom.om.*;
import org.apache.axiom.om.util.Base64;
import org.apache.axis2.AxisFault;
import org.apache.ode.axis2.service.ServiceClientUtil;
import org.apache.ode.utils.Namespaces;
+import javax.xml.namespace.QName;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+
public class DeploymentTest extends TestCase {
private OMFactory _factory;
@@ -106,16 +100,54 @@
assertEquals(_package, result2.getText());
}
+ public void testMultipleDeployUndeployVersion() throws Exception {
+ ArrayList<String> deployed = new ArrayList<String>();
+ // Testing that versions are monotonically increased
+ int lastVer = Integer.parseInt(_package.substring(_package.lastIndexOf("-") + 1, _package.length()));
+ for (int m = 1; m <= 5; m++) {
+ String depPack = deploy();
+ int ver = Integer.parseInt(depPack.substring(depPack.lastIndexOf("-") + 1, depPack.length()));
+ assertEquals(lastVer + m, ver);
+ deployed.add(depPack);
+ }
+ // Deploying a couple of "tagged" versions
+ String depPack = deploy("foo");
+ int ver = Integer.parseInt(depPack.substring(depPack.lastIndexOf("-") + 1, depPack.length()));
+ assertEquals(lastVer + 6, ver);
+ deployed.add(depPack);
+
+ depPack = deploy("bar");
+ ver = Integer.parseInt(depPack.substring(depPack.lastIndexOf("-") + 1, depPack.length()));
+ assertEquals(lastVer + 7, ver);
+ deployed.add(depPack);
+
+ // Cleaning up
+ for (String aDeployed : deployed) {
+ undeploy(aDeployed);
+ }
+ }
+
protected void setUp() throws Exception {
// Create a factory
_factory = OMAbstractFactory.getOMFactory();
_client = new ServiceClientUtil();
+ _package = deploy();
+
+ assertNotNull(_package);
+ assertEquals(2, _deployed.size());
+ }
+
+ protected void tearDown() throws Exception {
+ undeploy(_package);
+ }
+
+ private String deploy(String packageName) throws Exception {
// Use the factory to create three elements
OMNamespace depns = _factory.createOMNamespace(Namespaces.ODE_PMAPI, "deployapi");
OMElement root = _factory.createOMElement("deploy", null);
OMElement namePart = _factory.createOMElement("name", depns);
- namePart.setText("DynPartner");
+ namePart.setText(packageName);
OMElement zipPart = _factory.createOMElement("package", depns);
OMElement zipElmt = _factory.createOMElement("zip", depns);
@@ -138,27 +170,30 @@
OMElement result = sendToDeployment(root);
_deployed.clear();
- _package = null;
+ String pakage = null;
Iterator iter = result.getChildElements();
while (iter.hasNext()) {
OMElement e = (OMElement) iter.next();
if (e.getLocalName().equals("name")) {
- _package = e.getText();
+ pakage = e.getText();
}
if (e.getLocalName().equals("id")) {
_deployed.add(e.getTextAsQName());
- }
+ }
}
- assertNotNull(_package);
- assertEquals(2, _deployed.size());
+ return pakage;
}
- protected void tearDown() throws Exception {
+ private String deploy() throws Exception {
+ return deploy("DynPartner");
+ }
+
+ private void undeploy(String pakage) throws Exception {
// Prepare undeploy message
OMNamespace depns = _factory.createOMNamespace(Namespaces.ODE_PMAPI, "deployapi");
OMElement root = _factory.createOMElement("undeploy", depns);
OMElement part = _factory.createOMElement("packageName", null);
- part.setText(_package);
+ part.setText(pakage);
root.addChild(part);
// Undeploy
@@ -169,7 +204,6 @@
OMElement result = sendToPM(listRoot);
assertNull("Leftover process after undeployment", result.getFirstElement());
}
-
private OMElement sendToPM(OMElement msg) throws AxisFault {
return _client.send(msg, "http://localhost:8080/ode/services/ProcessManagement");
Modified: incubator/ode/trunk/axis2/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/axis2/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java (original)
+++ incubator/ode/trunk/axis2/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java Tue Jan 30 11:11:05 2007
@@ -20,11 +20,7 @@
package org.apache.ode.axis2.management;
import junit.framework.TestCase;
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.OMText;
+import org.apache.axiom.om.*;
import org.apache.axiom.om.util.Base64;
import org.apache.axis2.AxisFault;
import org.apache.ode.axis2.service.ServiceClientUtil;
@@ -45,6 +41,7 @@
private OMFactory _factory;
private DateFormat xsdDF = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
private ServiceClientUtil _client;
+ private String _deployedName;
public void testListInstances() throws Exception {
OMElement listRoot = _client.buildMessage("listInstances", new String[] {"filter", "order", "limit"},
@@ -150,6 +147,14 @@
assert(result.toString().split("element").length > 10);
}
+ public void testDeleteInstances() throws Exception {
+ OMElement root = _client.buildMessage("listAllInstancesWithLimit", new String[] {"limit"}, new String[] {"1"});
+ OMElement result = sendToIM(root);
+ String iid = result.getFirstElement().getFirstElement().getText();
+ System.out.println("=> " + result.getFirstElement().getFirstElement().getText());
+ _client.buildMessage("delete", new String[] {"piid"}, new String[] {iid});
+ }
+
protected void setUp() throws Exception {
// Create a factory
_factory = OMAbstractFactory.getOMFactory();
@@ -177,7 +182,8 @@
zipElmt.addChild(zipContent);
// Deploy
- sendToDeployment(root);
+ OMElement res = sendToDeployment(root);
+ _deployedName = res.getFirstChildWithName(new QName(null, "name")).getText();
// Execute
URL svcUrl = new URL("http://localhost:8080/ode/processes/DynMainService");
@@ -191,8 +197,8 @@
// Prepare undeploy message
OMNamespace depns = _factory.createOMNamespace(Namespaces.ODE_PMAPI, "deployapi");
OMElement root = _factory.createOMElement("undeploy", depns);
- OMElement part = _factory.createOMElement("processName", null);
- part.setText("DynPartner");
+ OMElement part = _factory.createOMElement("package", null);
+ part.setText(_deployedName);
root.addChild(part);
// Undeploy
Modified: incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ProcessConf.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ProcessConf.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ProcessConf.java (original)
+++ incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ProcessConf.java Tue Jan 30 11:11:05 2007
@@ -53,7 +53,7 @@
* Get the process version.
* @return version
*/
- int getVersion();
+ long getVersion();
/**
* Is this a <em>transient</em> process? Transient processes are not persisted in the store.
Modified: incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ProcessStore.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ProcessStore.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ProcessStore.java (original)
+++ incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ProcessStore.java Tue Jan 30 11:11:05 2007
@@ -19,14 +19,13 @@
package org.apache.ode.bpel.iapi;
+import org.w3c.dom.Node;
+
+import javax.xml.namespace.QName;
import java.io.File;
import java.util.Collection;
import java.util.List;
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Node;
-
/**
* @author mriou <mriou at apache dot org>
*/
@@ -102,4 +101,10 @@
* @param status true for active, false for inactive
*/
void setState(QName pid, ProcessState state);
+
+ /**
+ * Gets the version used by the store for the last deployment.
+ * @return
+ */
+ long getCurrentVersion();
}
Modified: incubator/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/BpelDAOConnection.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/BpelDAOConnection.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/BpelDAOConnection.java (original)
+++ incubator/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/BpelDAOConnection.java Tue Jan 30 11:11:05 2007
@@ -93,7 +93,7 @@
Collection<ProcessInstanceDAO> instanceQuery(String expression);
- ProcessDAO createProcess(QName pid, QName type, String guid, int version);
+ ProcessDAO createProcess(QName pid, QName type, String guid, long version);
/**
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=501522&r1=501521&r2=501522
==============================================================================
--- 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 Tue Jan 30 11:11:05 2007
@@ -18,11 +18,10 @@
*/
package org.apache.ode.bpel.dao;
-import java.util.Collection;
+import org.apache.ode.bpel.common.CorrelationKey;
import javax.xml.namespace.QName;
-
-import org.apache.ode.bpel.common.CorrelationKey;
+import java.util.Collection;
/**
* BPEL process data access objects. Contains references to active process instances ({@link ProcessInstanceDAO} and messages bound
@@ -48,7 +47,7 @@
*
* @return version
*/
- int getVersion();
+ long getVersion();
/**
* Get a message correlator instance.
Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java Tue Jan 30 11:11:05 2007
@@ -341,7 +341,7 @@
* @param pid
* @param oprocess
*/
- private void createProcessDAO(final QName pid, final int version, final OProcess oprocess) {
+ private void createProcessDAO(final QName pid, final long version, final OProcess oprocess) {
__log.debug("Creating process DAO for " + pid + " (guid=" + oprocess.guid + ")");
try {
boolean create = _db.exec(new BpelDatabase.Callable<Boolean>() {
Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/BpelDAOConnectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/BpelDAOConnectionImpl.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/BpelDAOConnectionImpl.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/BpelDAOConnectionImpl.java Tue Jan 30 11:11:05 2007
@@ -42,7 +42,7 @@
return _store.get(processId);
}
- public ProcessDAO createProcess(QName pid, QName type, String guid, int version) {
+ public ProcessDAO createProcess(QName pid, QName type, String guid, long version) {
ProcessDaoImpl process = new ProcessDaoImpl(this,_store,pid,type, guid,version);
_store.put(pid,process);
return process;
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=501522&r1=501521&r2=501522
==============================================================================
--- 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 Tue Jan 30 11:11:05 2007
@@ -22,7 +22,7 @@
private QName _processId;
private QName _type;
- private int _version;
+ private long _version;
final Map<String, CorrelatorDaoImpl> _correlators = new ConcurrentHashMap<String, CorrelatorDaoImpl>();
protected final Map<Long, ProcessInstanceDAO> _instances = new ConcurrentHashMap<Long, ProcessInstanceDAO>();
protected final Map<Integer, PartnerLinkDAO> _plinks = new ConcurrentHashMap<Integer, PartnerLinkDAO>();
@@ -32,7 +32,7 @@
private String _guid;
public ProcessDaoImpl(BpelDAOConnectionImpl conn, Map<QName, ProcessDaoImpl> store,
- QName processId, QName type, String guid, int version) {
+ QName processId, QName type, String guid, long version) {
if (__log.isDebugEnabled()) {
__log.debug("Creating ProcessDao object for process \"" + processId + "\".");
}
@@ -104,7 +104,7 @@
_store.remove(_processId);
}
- public int getVersion() {
+ public long getVersion() {
return _version;
}
Modified: incubator/ode/trunk/bpel-scheduler-quartz/src/main/java/org/apache/ode/bpel/scheduler/quartz/JobStoreJTA.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-scheduler-quartz/src/main/java/org/apache/ode/bpel/scheduler/quartz/JobStoreJTA.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/bpel-scheduler-quartz/src/main/java/org/apache/ode/bpel/scheduler/quartz/JobStoreJTA.java (original)
+++ incubator/ode/trunk/bpel-scheduler-quartz/src/main/java/org/apache/ode/bpel/scheduler/quartz/JobStoreJTA.java Tue Jan 30 11:11:05 2007
@@ -1294,7 +1294,7 @@
rollback = false;
resume = false;
- return new LoggingConnectionWrapper(conn);
+ return new LoggingConnectionWrapper(conn, __log);
} catch (SQLException sqle) {
throw new JobPersistenceException(
"Failed to obtain DB connection from data source '" + getDataSource()
@@ -1318,7 +1318,7 @@
}
protected Connection getConnection() throws JobPersistenceException {
- return new LoggingConnectionWrapper(super.getConnection());
+ return new LoggingConnectionWrapper(super.getConnection(), __log);
}
@Override
Modified: incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ConfStoreConnection.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ConfStoreConnection.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ConfStoreConnection.java (original)
+++ incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ConfStoreConnection.java Tue Jan 30 11:11:05 2007
@@ -1,7 +1,6 @@
package org.apache.ode.store;
-import javax.xml.namespace.QName;
import java.util.Collection;
/**
@@ -19,8 +18,8 @@
void close();
- int getNextVersion(QName processName);
+ long getNextVersion();
- void setVersion(QName processName, int version);
+ void setVersion(long version);
}
Modified: incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDAO.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDAO.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDAO.java (original)
+++ incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDAO.java Tue Jan 30 11:11:05 2007
@@ -51,7 +51,7 @@
*/
void delete();
- ProcessConfDAO createProcess(QName pid, QName type, int version);
+ ProcessConfDAO createProcess(QName pid, QName type, long version);
ProcessConfDAO getProcess(QName pid);
Modified: incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java (original)
+++ incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java Tue Jan 30 11:11:05 2007
@@ -43,7 +43,7 @@
private volatile DeployDocument _dd;
private volatile DocumentRegistry _docRegistry;
- private int _version = -1;
+ private long _version = -1;
private static final FileFilter _wsdlFilter = new FileFilter() {
public boolean accept(File path) {
@@ -290,11 +290,11 @@
return null;
}
- public int getVersion() {
+ public long getVersion() {
return _version;
}
- public void setVersion(int version) {
+ public void setVersion(long version) {
_version = version;
}
Modified: incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfDAO.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfDAO.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfDAO.java (original)
+++ incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfDAO.java Tue Jan 30 11:11:05 2007
@@ -1,10 +1,9 @@
package org.apache.ode.store;
-import java.util.Collection;
+import org.apache.ode.bpel.iapi.ProcessState;
import javax.xml.namespace.QName;
-
-import org.apache.ode.bpel.iapi.ProcessState;
+import java.util.Collection;
/**
* DAO interface for a process configuration.
@@ -16,7 +15,7 @@
QName getType();
- int getVersion();
+ long getVersion();
DeploymentUnitDAO getDeploymentUnit();
Modified: incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java (original)
+++ incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java Tue Jan 30 11:11:05 2007
@@ -40,11 +40,11 @@
ProcessState _state;
final TDeployment.Process _pinfo;
final DeploymentUnitDir _du;
- private int _version = 0;
+ private long _version = 0;
private QName _pid;
private QName _type;
- ProcessConfImpl(QName pid, QName type, int version, DeploymentUnitDir du, TDeployment.Process pinfo, Date deployDate,
+ ProcessConfImpl(QName pid, QName type, long version, DeploymentUnitDir du, TDeployment.Process pinfo, Date deployDate,
Map<QName, Node> props, ProcessState pstate) {
_pid = pid;
_version = version;
@@ -127,7 +127,7 @@
return _props;
}
- public int getVersion() {
+ public long getVersion() {
return _version;
}
Modified: incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java (original)
+++ incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java Tue Jan 30 11:11:05 2007
@@ -151,21 +151,14 @@
final ArrayList<ProcessConfImpl> processes = new ArrayList<ProcessConfImpl>();
Collection<QName> deployed;
- // Process and DU are all versioned at the highest process version number
- // which becomes the DU version (subversion style).
- int version = exec(new Callable<Integer>() {
- public Integer call(ConfStoreConnection conn) {
- int v = 0;
- for (TDeployment.Process processDD : dd.getDeploy().getProcessList()) {
- int procVersion = conn.getNextVersion(processDD.getName());
- if (procVersion > v) v = procVersion;
- }
- return v;
+ _rw.writeLock().lock();
+ // Process and DU use a monotically increased single version number.
+ long version = exec(new Callable<Long>() {
+ public Long call(ConfStoreConnection conn) {
+ return conn.getNextVersion();
}
});
- _rw.writeLock().lock();
-
try {
if (_deploymentUnits.containsKey(du.getName())) {
String errmsg = __msgs.msgDeployFailDuplicateDU(du.getName());
@@ -252,7 +245,7 @@
newDao.setProperty(prop.getKey(), DOMUtils.domToString(prop.getValue()));
}
deployed.add(pc.getProcessId());
- conn.setVersion(pc.getType(), pc.getVersion());
+ conn.setVersion(pc.getVersion());
} catch (Throwable e) {
String errmsg = "Error persisting deployment record for " + pc.getProcessId()
+ "; process will not be available after restart!";
@@ -452,6 +445,15 @@
}
}
+ public long getCurrentVersion() {
+ long version = exec(new Callable<Long>() {
+ public Long call(ConfStoreConnection conn) {
+ return conn.getNextVersion();
+ }
+ });
+ return version;
+ }
+
protected void fireEvent(ProcessStoreEvent pse) {
for (ProcessStoreListener psl : _listeners)
try {
@@ -649,7 +651,7 @@
}
}
- private Collection<QName> toPids(Collection<QName> processTypes, int version) {
+ private Collection<QName> toPids(Collection<QName> processTypes, long version) {
ArrayList<QName> result = new ArrayList<QName>();
for (QName pqName : processTypes) {
result.add(toPid(pqName, version));
@@ -657,7 +659,7 @@
return result;
}
- private QName toPid(QName processType, int version) {
+ private QName toPid(QName processType, long version) {
return new QName(processType.getNamespaceURI(), processType.getLocalPart() + "-" + version);
}
Modified: incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/ConfStoreConnectionHib.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/ConfStoreConnectionHib.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/ConfStoreConnectionHib.java (original)
+++ incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/ConfStoreConnectionHib.java Tue Jan 30 11:11:05 2007
@@ -60,19 +60,19 @@
}
}
- public int getNextVersion(QName processName) {
+ public long getNextVersion() {
VersionTrackerDAOImpl vt = (VersionTrackerDAOImpl)
- _session.get(VersionTrackerDAOImpl.class,processName.toString());
+ _session.createQuery("from VersionTrackerDAOImpl v ").uniqueResult();
if (vt == null) return 1;
else return vt.getVersion() + 1;
}
- public void setVersion(QName processName, int version) {
+ public void setVersion(long version) {
VersionTrackerDAOImpl vt = (VersionTrackerDAOImpl)
- _session.get(VersionTrackerDAOImpl.class,processName.toString());
+ _session.createQuery("from VersionTrackerDAOImpl v ").uniqueResult();
if (vt == null) {
vt = new VersionTrackerDAOImpl();
- vt.setNamespace(processName.toString());
+ vt.setId(1);
}
vt.setVersion(version);
_session.save(vt);
Modified: incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DeploymentUnitDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DeploymentUnitDaoImpl.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DeploymentUnitDaoImpl.java (original)
+++ incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DeploymentUnitDaoImpl.java Tue Jan 30 11:11:05 2007
@@ -102,7 +102,7 @@
super.delete();
}
- public ProcessConfDAO createProcess(QName pid, QName type, int version) {
+ public ProcessConfDAO createProcess(QName pid, QName type, long version) {
ProcessConfDaoImpl p = new ProcessConfDaoImpl();
p.setPID(pid);
p.setType(type);
Modified: incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/ProcessConfDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/ProcessConfDaoImpl.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/ProcessConfDaoImpl.java (original)
+++ incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/ProcessConfDaoImpl.java Tue Jan 30 11:11:05 2007
@@ -1,17 +1,16 @@
package org.apache.ode.store.hib;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
import org.apache.ode.bpel.iapi.ProcessState;
import org.apache.ode.store.ProcessConfDAO;
import org.apache.ode.utils.stl.CollectionsX;
import org.apache.ode.utils.stl.UnaryFunction;
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* @author mriou <mriou at apache dot org>
* @hibernate.class table="STORE_PROCESS"
@@ -20,7 +19,6 @@
private DeploymentUnitDaoImpl _du;
- /** {@link HProcessProperty}s for this process. */
private Map<String,String> _properties = new HashMap<String,String>();
/** Simple name of the process. */
@@ -31,7 +29,7 @@
/** Process version. */
- private int _version;
+ private long _version;
/** Process state.*/
private String _state;
@@ -97,11 +95,11 @@
* @hibernate.property
* column="version"
*/
- public int getVersion() {
+ public long getVersion() {
return _version;
}
- public void setVersion(int version) {
+ public void setVersion(long version) {
_version = version;
}
Modified: incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/VersionTrackerDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/VersionTrackerDAOImpl.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/VersionTrackerDAOImpl.java (original)
+++ incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/VersionTrackerDAOImpl.java Tue Jan 30 11:11:05 2007
@@ -25,29 +25,29 @@
*/
public class VersionTrackerDAOImpl extends HibObj {
- private String _namespace;
- private int _version;
+ private int _id;
+ private long _version;
/**
* @hibernate.id generator-class="assigned"
- * @hibernate.property column="NS"
+ * @hibernate.column name="ID" not-null="true"
*/
- public String getNamespace() {
- return _namespace;
+ public int getId() {
+ return _id;
}
- public void setNamespace(String namespace) {
- _namespace = namespace;
+ public void setId(int id) {
+ _id = id;
}
/**
* @hibernate.property column="VERSION"
*/
- public int getVersion() {
+ public long getVersion() {
return _version;
}
- public void setVersion(int version) {
+ public void setVersion(long version) {
_version = version;
}
}
Modified: incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/ConfStoreConnectionJpa.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/ConfStoreConnectionJpa.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/ConfStoreConnectionJpa.java (original)
+++ incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/ConfStoreConnectionJpa.java Tue Jan 30 11:11:05 2007
@@ -23,9 +23,9 @@
import org.apache.ode.store.DeploymentUnitDAO;
import javax.persistence.EntityManager;
-import javax.xml.namespace.QName;
import java.util.Collection;
import java.util.Date;
+import java.util.List;
/**
* @author Matthieu Riou <mriou at apache dot org>
@@ -72,18 +72,20 @@
_em.getTransaction().rollback();
}
- public int getNextVersion(QName processName) {
- VersionTrackerDAOImpl vt = _em.find(VersionTrackerDAOImpl.class,processName.toString());
- if (vt == null) return 1;
- else return vt.getVersion() + 1;
+ public long getNextVersion() {
+ List<VersionTrackerDAOImpl> res = _em.createQuery("select v from VersionTrackerDAOImpl v").getResultList();
+ if (res.size() == 0) return 1;
+ else {
+ VersionTrackerDAOImpl vt = res.get(0);
+ return vt.getVersion() + 1;
+ }
}
- public void setVersion(QName processName, int version) {
- VersionTrackerDAOImpl vt = _em.find(VersionTrackerDAOImpl.class,processName.toString());
- if (vt == null) {
- vt = new VersionTrackerDAOImpl();
- vt.setNamespace(processName.toString());
- }
+ public void setVersion(long version) {
+ List<VersionTrackerDAOImpl> res = _em.createQuery("select v from VersionTrackerDAOImpl v").getResultList();
+ VersionTrackerDAOImpl vt;
+ if (res.size() == 0) vt = new VersionTrackerDAOImpl();
+ else vt = res.get(0);
vt.setVersion(version);
_em.persist(vt);
}
Modified: incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/DeploymentUnitDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/DeploymentUnitDaoImpl.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/DeploymentUnitDaoImpl.java (original)
+++ incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/DeploymentUnitDaoImpl.java Tue Jan 30 11:11:05 2007
@@ -114,7 +114,7 @@
super.delete();
}
- public ProcessConfDAO createProcess(QName pid, QName type, int version) {
+ public ProcessConfDAO createProcess(QName pid, QName type, long version) {
ProcessConfDaoImpl p = new ProcessConfDaoImpl();
p.setPID(pid);
p.setType(type);
Modified: incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/ProcessConfDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/ProcessConfDaoImpl.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/ProcessConfDaoImpl.java (original)
+++ incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/ProcessConfDaoImpl.java Tue Jan 30 11:11:05 2007
@@ -53,7 +53,7 @@
private String _type;
@Basic @Column(name="VERSION")
- private int _version;
+ private long _version;
@Basic @Column(name="STATE")
private String _state;
@@ -101,11 +101,11 @@
* @hibernate.property
* column="version"
*/
- public int getVersion() {
+ public long getVersion() {
return _version;
}
- public void setVersion(int version) {
+ public void setVersion(long version) {
_version = version;
}
Modified: incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/VersionTrackerDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/VersionTrackerDAOImpl.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/VersionTrackerDAOImpl.java (original)
+++ incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/VersionTrackerDAOImpl.java Tue Jan 30 11:11:05 2007
@@ -19,7 +19,10 @@
package org.apache.ode.store.jpa;
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
/**
* @author Matthieu Riou <mriou at apache dot org>
@@ -28,24 +31,14 @@
@Table(name="STORE_VERSIONS")
public class VersionTrackerDAOImpl {
- @Id @Column(name="NS")
- private String _namespace;
@Basic @Column(name="VERSION")
- private int _version;
+ private long _version;
- public String getNamespace() {
- return _namespace;
- }
-
- public void setNamespace(String namespace) {
- _namespace = namespace;
- }
-
- public int getVersion() {
+ public long getVersion() {
return _version;
}
- public void setVersion(int version) {
+ public void setVersion(long version) {
_version = version;
}
}
Modified: incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java (original)
+++ incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java Tue Jan 30 11:11:05 2007
@@ -76,7 +76,7 @@
return mex == null ? null : new MessageExchangeDaoImpl(_sm, mex);
}
- public ProcessDAO createProcess(QName pid, QName type, String guid, int version) {
+ public ProcessDAO createProcess(QName pid, QName type, String guid, long version) {
HProcess process = new HProcess();
process.setProcessId(pid.toString());
process.setTypeName(type.getLocalPart());
@@ -88,9 +88,6 @@
return new ProcessDaoImpl(_sm, process);
}
- /**
- * @see org.apache.ode.bpel.dao.BpelDAOConnection#getProcess(java.lang.String)
- */
public ProcessDAO getProcess(QName processId) {
try {
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=501522&r1=501521&r2=501522
==============================================================================
--- 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 Tue Jan 30 11:11:05 2007
@@ -126,7 +126,7 @@
return new QName(_process.getTypeNamespace(), _process.getTypeName());
}
- public int getVersion() {
+ public long getVersion() {
return _process.getVersion();
}
Modified: incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HProcess.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HProcess.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HProcess.java (original)
+++ incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HProcess.java Tue Jan 30 11:11:05 2007
@@ -61,7 +61,7 @@
private String _typeNamespace;
/** Process version. */
- private int _version;
+ private long _version;
/** Whether process is retired */
private boolean _retired;
@@ -238,11 +238,11 @@
* @hibernate.property
* column="version"
*/
- public int getVersion() {
+ public long getVersion() {
return _version;
}
- public void setVersion(int version) {
+ public void setVersion(long version) {
_version = version;
}
Modified: incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java (original)
+++ incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java Tue Jan 30 11:11:05 2007
@@ -88,7 +88,7 @@
return ret;
}
- public ProcessDAO createProcess(QName pid, QName type, String guid, int version) {
+ public ProcessDAO createProcess(QName pid, QName type, String guid, long version) {
ProcessDAOImpl ret = new ProcessDAOImpl(pid,type,guid,this,version);
_processes.add(ret);
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=501522&r1=501521&r2=501522
==============================================================================
--- 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 Tue Jan 30 11:11:05 2007
@@ -39,7 +39,7 @@
@Basic @Column(name="PROCESS_KEY") private QName _processKey;
@Basic @Column(name="PROCESS_TYPE") private QName _processType;
@Basic @Column(name="GUID") private String _guid;
- @Version @Column(name="VERSION") private int _version;
+ @Version @Column(name="VERSION") private long _version;
@OneToMany(targetEntity=ProcessInstanceDAOImpl.class,mappedBy="_process",fetch=FetchType.LAZY,cascade={CascadeType.ALL})
private Collection<ProcessInstanceDAO> _instances = new ArrayList<ProcessInstanceDAO>();
@@ -51,7 +51,7 @@
private BPELDAOConnectionImpl _connection;
public ProcessDAOImpl() {}
- public ProcessDAOImpl(QName key, QName type, String guid, BPELDAOConnectionImpl connection, int version) {
+ public ProcessDAOImpl(QName key, QName type, String guid, BPELDAOConnectionImpl connection, long version) {
_processKey = key;
_processType = type;
_connection = connection;
@@ -119,7 +119,7 @@
return _processType;
}
- public int getVersion() {
+ public long getVersion() {
return _version;
}
Modified: incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingConnectionWrapper.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingConnectionWrapper.java?view=diff&rev=501522&r1=501521&r2=501522
==============================================================================
--- incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingConnectionWrapper.java (original)
+++ incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingConnectionWrapper.java Tue Jan 30 11:11:05 2007
@@ -108,47 +108,47 @@
}
public CallableStatement prepareCall(String sql) throws SQLException {
- print("### prepareCall: " + sql);
+ print("prepareCall: " + sql);
return _conn.prepareCall(sql);
}
public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
- print("### prepareCall: " + sql);
+ print("prepareCall: " + sql);
return _conn.prepareCall(sql, resultSetType, resultSetConcurrency);
}
public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
- print("### prepareCall: " + sql);
+ print("prepareCall: " + sql);
return _conn.prepareCall(sql, resultSetType, resultSetConcurrency, resultSetHoldability);
}
public PreparedStatement prepareStatement(String sql) throws SQLException {
- print("### prepareStmt: " + sql);
+ print("prepareStmt: " + sql);
return _conn.prepareStatement(sql);
}
public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
- print("### prepareStmt: " + sql);
+ print("prepareStmt: " + sql);
return _conn.prepareStatement(sql, autoGeneratedKeys);
}
public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
- print("### prepareStmt: " + sql);
+ print("prepareStmt: " + sql);
return _conn.prepareStatement(sql, columnIndexes);
}
public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
- print("### prepareStmt: " + sql);
+ print("prepareStmt: " + sql);
return _conn.prepareStatement(sql, columnNames);
}
public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
- print("### prepareStmt: " + sql);
+ print("prepareStmt: " + sql);
return _conn.prepareStatement(sql, resultSetType, resultSetConcurrency);
}
public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
- print("### prepareStmt: " + sql);
+ print("prepareStmt: " + sql);
return _conn.prepareStatement(sql, resultSetType, resultSetConcurrency, resultSetHoldability);
}