Author: mriou
Date: Tue Aug 5 11:51:32 2008
New Revision: 682862
URL: http://svn.apache.org/viewvc?rev=682862&view=rev
Log:
Incremental commit before attacking the real beast: bpel-runtime.
Modified:
ode/branches/rtver/Rakefile
ode/branches/rtver/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/Serializer.java
ode/branches/rtver/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/MockCompilerContext.java
ode/branches/rtver/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntimeTest.java
ode/branches/rtver/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java
ode/branches/rtver/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
ode/branches/rtver/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/Serializers.java
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/Serializer.java
Modified: ode/branches/rtver/Rakefile
URL:
http://svn.apache.org/viewvc/ode/branches/rtver/Rakefile?rev=682862&r1=682861&r2=682862&view=diff
==============================================================================
--- ode/branches/rtver/Rakefile (original)
+++ ode/branches/rtver/Rakefile Tue Aug 5 11:51:32 2008
@@ -287,7 +287,7 @@
desc "ODE Process Store"
define "bpel-store" do
- compile.with projects("bpel-api", "bpel-compiler", "bpel-dao",
"bpel-schemas", "il-common",
+ compile.with projects("bpel-api", "runtime-repo", "bpel-compiler",
"bpel-dao", "bpel-schemas", "il-common",
"dao-hibernate", "utils"),
COMMONS.logging, JAVAX.persistence, JAVAX.stream, HIBERNATE, HSQLDB,
XMLBEANS, XERCES, WSDL4J
compile { open_jpa_enhance }
Modified:
ode/branches/rtver/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
URL:
http://svn.apache.org/viewvc/ode/branches/rtver/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java?rev=682862&r1=682861&r2=682862&view=diff
==============================================================================
--- ode/branches/rtver/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
(original)
+++ ode/branches/rtver/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
Tue Aug 5 11:51:32 2008
@@ -47,7 +47,7 @@
import org.apache.ode.axis2.service.ManagementService;
import org.apache.ode.axis2.httpbinding.HttpExternalService;
import org.apache.ode.axis2.soapbinding.SoapExternalService;
-import org.apache.ode.bpel.compiler.v2.ExtensionValidator;
+import org.apache.ode.bpel.compiler.api.ExtensionValidator;
import org.apache.ode.bpel.connector.BpelServerConnector;
import org.apache.ode.bpel.dao.BpelDAOConnectionFactory;
import org.apache.ode.bpel.engine.BpelServerImpl;
Modified:
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/Serializer.java
URL:
http://svn.apache.org/viewvc/ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/Serializer.java?rev=682862&r1=682861&r2=682862&view=diff
==============================================================================
---
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/Serializer.java
(original)
+++
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/Serializer.java
Tue Aug 5 11:51:32 2008
@@ -1,11 +1,17 @@
package org.apache.ode.bpel.rapi;
+import javax.xml.namespace.QName;
import java.io.OutputStream;
import java.io.IOException;
public interface Serializer {
+ public String getGuid();
+
+ public QName getType();
+
public void writePModel(ProcessModel process, OutputStream os) throws
IOException;
public ProcessModel readPModel() throws IOException,
ClassNotFoundException;
+
}
Modified:
ode/branches/rtver/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/MockCompilerContext.java
URL:
http://svn.apache.org/viewvc/ode/branches/rtver/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/MockCompilerContext.java?rev=682862&r1=682861&r2=682862&view=diff
==============================================================================
---
ode/branches/rtver/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/MockCompilerContext.java
(original)
+++
ode/branches/rtver/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/MockCompilerContext.java
Tue Aug 5 11:51:32 2008
@@ -27,8 +27,8 @@
import javax.xml.namespace.QName;
import org.apache.ode.bpel.compiler.api.CompilationException;
+import org.apache.ode.bpel.compiler.api.ExtensionValidator;
import org.apache.ode.bpel.compiler.v2.CompilerContext;
-import org.apache.ode.bpel.compiler.v2.ExtensionValidator;
import org.apache.ode.bpel.compiler.bom.Activity;
import org.apache.ode.bpel.compiler.bom.BpelObject;
import org.apache.ode.bpel.compiler.bom.Expression;
Modified:
ode/branches/rtver/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntimeTest.java
URL:
http://svn.apache.org/viewvc/ode/branches/rtver/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntimeTest.java?rev=682862&r1=682861&r2=682862&view=diff
==============================================================================
---
ode/branches/rtver/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntimeTest.java
(original)
+++
ode/branches/rtver/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntimeTest.java
Tue Aug 5 11:51:32 2008
@@ -21,7 +21,7 @@
import junit.framework.TestCase;
import org.apache.ode.bpel.common.FaultException;
import org.apache.ode.bpel.compiler.bom.Expression;
-import
org.apache.ode.bpel.elang.xpath20.compiler.XPath20ExpressionCompilerBPEL20;
+import org.apache.ode.bpel.compiler.v2.xpath20.XPath20ExpressionCompilerBPEL20;
import org.apache.ode.bpel.elang.xpath20.o.OXPath20ExpressionBPEL20;
import org.apache.ode.bpel.explang.EvaluationContext;
import org.apache.ode.bpel.o.OExpression;
Modified:
ode/branches/rtver/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java
URL:
http://svn.apache.org/viewvc/ode/branches/rtver/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java?rev=682862&r1=682861&r2=682862&view=diff
==============================================================================
---
ode/branches/rtver/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java
(original)
+++
ode/branches/rtver/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java
Tue Aug 5 11:51:32 2008
@@ -23,7 +23,7 @@
import org.apache.ode.bpel.compiler.BpelC;
import org.apache.ode.bpel.compiler.DefaultResourceFinder;
import org.apache.ode.bpel.compiler.WSDLLocatorImpl;
-import org.apache.ode.bpel.compiler.v2.ExtensionValidator;
+import org.apache.ode.bpel.compiler.api.ExtensionValidator;
import org.apache.ode.bpel.compiler.wsdl.Definition4BPEL;
import org.apache.ode.bpel.compiler.wsdl.WSDLFactory4BPEL;
import org.apache.ode.bpel.compiler.wsdl.WSDLFactoryBPEL20;
@@ -31,8 +31,8 @@
import org.apache.ode.bpel.dd.TDeployment;
import org.apache.ode.bpel.dd.TDeployment.Process;
import org.apache.ode.bpel.iapi.ContextException;
-import org.apache.ode.bpel.o.Serializer;
import org.apache.ode.bpel.rapi.Serializer;
+import org.apache.ode.bpel.rtrep.Serializers;
import org.apache.xmlbeans.XmlOptions;
import org.w3c.dom.Node;
@@ -177,9 +177,8 @@
InputStream is = null;
try {
is = new FileInputStream(f);
- Serializer ofh = new Serializer(is);
- CBPInfo info = new CBPInfo(ofh.type,ofh.guid,f);
- return info;
+ Serializer ofh = Serializers.getLatest(is);
+ return new CBPInfo(ofh.getType(), ofh.getGuid(), f);
} catch (Exception e) {
throw new ContextException("Couldn't read compiled BPEL process "
+ f.getAbsolutePath(), e);
} finally {
Modified:
ode/branches/rtver/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
URL:
http://svn.apache.org/viewvc/ode/branches/rtver/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java?rev=682862&r1=682861&r2=682862&view=diff
==============================================================================
---
ode/branches/rtver/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
(original)
+++
ode/branches/rtver/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
Tue Aug 5 11:51:32 2008
@@ -36,7 +36,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.compiler.api.CompilationException;
-import org.apache.ode.bpel.compiler.v2.ExtensionValidator;
+import org.apache.ode.bpel.compiler.api.ExtensionValidator;
import org.apache.ode.bpel.dd.DeployDocument;
import org.apache.ode.bpel.dd.TDeployment;
import org.apache.ode.bpel.iapi.ContextException;
Modified:
ode/branches/rtver/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
URL:
http://svn.apache.org/viewvc/ode/branches/rtver/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java?rev=682862&r1=682861&r2=682862&view=diff
==============================================================================
--- ode/branches/rtver/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
(original)
+++ ode/branches/rtver/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
Tue Aug 5 11:51:32 2008
@@ -37,7 +37,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ode.bpel.compiler.v2.ExtensionValidator;
+import org.apache.ode.bpel.compiler.api.ExtensionValidator;
import org.apache.ode.bpel.connector.BpelServerConnector;
import org.apache.ode.bpel.dao.BpelDAOConnectionFactoryJDBC;
import org.apache.ode.bpel.engine.BpelServerImpl;
Modified:
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/Serializers.java
URL:
http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/Serializers.java?rev=682862&r1=682861&r2=682862&view=diff
==============================================================================
---
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/Serializers.java
(original)
+++
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/Serializers.java
Tue Aug 5 11:51:32 2008
@@ -2,14 +2,29 @@
import org.apache.ode.bpel.rapi.Serializer;
+import java.io.InputStream;
+
+/**
+ * Factory to instantiate OModel serializers/deserializers for a specific
version of the model. It's
+ * the entry point to reading and writing the ODE internal object model.
+ */
public class Serializers {
public static Serializer getLatest() {
return new
org.apache.ode.bpel.rtrep.v2.Serializer(System.currentTimeMillis());
}
+ public static Serializer getLatest(InputStream stream) {
+ return new
org.apache.ode.bpel.rtrep.v2.Serializer(System.currentTimeMillis());
+ }
+
public static Serializer getVersion(int version) {
// TODO switch on the version when we'll have more than one
return getLatest();
}
+ public static Serializer getVersion(InputStream stream, int version) {
+ // TODO switch on the version when we'll have more than one
+ return getLatest(stream);
+ }
+
}
Modified:
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/Serializer.java
URL:
http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/Serializer.java?rev=682862&r1=682861&r2=682862&view=diff
==============================================================================
---
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/Serializer.java
(original)
+++
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/Serializer.java
Tue Aug 5 11:51:32 2008
@@ -55,8 +55,6 @@
public String guid;
-// public OProcess _oprocess;
-
public QName type;
@@ -139,7 +137,15 @@
return oprocess;
}
-
+
+ public String getGuid() {
+ return guid;
+ }
+
+ public QName getType() {
+ return type;
+ }
+
static class CustomObjectOutputStream extends ObjectOutputStream {
/**
