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 2008/09/09 20:08:49 UTC
svn commit: r693539 - in /ode/sandbox/simpel: ./
src/main/antlr/org/apache/ode/simpel/antlr/
src/main/java/org/apache/ode/embed/ src/main/java/org/apache/ode/simpel/
src/main/java/org/apache/ode/simpel/omodel/
src/test/java/org/apache/ode/simpel/
Author: mriou
Date: Tue Sep 9 11:08:49 2008
New Revision: 693539
URL: http://svn.apache.org/viewvc?rev=693539&view=rev
Log:
Update to latest trunk.
Modified:
ode/sandbox/simpel/Rakefile
ode/sandbox/simpel/src/main/antlr/org/apache/ode/simpel/antlr/SimPELWalker.g
ode/sandbox/simpel/src/main/java/org/apache/ode/embed/EmbeddedStore.java
ode/sandbox/simpel/src/main/java/org/apache/ode/simpel/SimPELCompiler.java
ode/sandbox/simpel/src/main/java/org/apache/ode/simpel/omodel/OBuilder.java
ode/sandbox/simpel/src/main/java/org/apache/ode/simpel/omodel/SimPELExpr.java
ode/sandbox/simpel/src/test/java/org/apache/ode/simpel/SimPELCompilerTest.java
ode/sandbox/simpel/src/test/java/org/apache/ode/simpel/SimPELRuntimeTest.java
Modified: ode/sandbox/simpel/Rakefile
URL: http://svn.apache.org/viewvc/ode/sandbox/simpel/Rakefile?rev=693539&r1=693538&r2=693539&view=diff
==============================================================================
--- ode/sandbox/simpel/Rakefile (original)
+++ ode/sandbox/simpel/Rakefile Tue Sep 9 11:08:49 2008
@@ -39,7 +39,7 @@
:resource =>"org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec:jar:1.0"
)
LOG4J = "log4j:log4j:jar:1.2.15"
-ODE = group("ode-bpel-api", "ode-bpel-compiler", "ode-bpel-dao", "ode-bpel-obj",
+ODE = group("ode-bpel-api", "ode-bpel-compiler", "ode-bpel-dao", "ode-runtimes",
"ode-bpel-runtime", "ode-il-common", "ode-jacob", "ode-scheduler-simple",
"ode-utils", :under=>"org.apache.ode", :version=>"1.3-SNAPSHOT")
WSDL4J = "wsdl4j:wsdl4j:jar:1.6.2"
Modified: ode/sandbox/simpel/src/main/antlr/org/apache/ode/simpel/antlr/SimPELWalker.g
URL: http://svn.apache.org/viewvc/ode/sandbox/simpel/src/main/antlr/org/apache/ode/simpel/antlr/SimPELWalker.g?rev=693539&r1=693538&r2=693539&view=diff
==============================================================================
--- ode/sandbox/simpel/src/main/antlr/org/apache/ode/simpel/antlr/SimPELWalker.g (original)
+++ ode/sandbox/simpel/src/main/antlr/org/apache/ode/simpel/antlr/SimPELWalker.g Tue Sep 9 11:08:49 2008
@@ -19,7 +19,7 @@
import org.apache.ode.simpel.ErrorListener;
import org.apache.ode.simpel.omodel.OBuilder;
import org.apache.ode.simpel.omodel.SimPELExpr;
-import org.apache.ode.bpel.o.*;
+import org.apache.ode.bpel.rtrep.v2.*;
}
@members {
Modified: ode/sandbox/simpel/src/main/java/org/apache/ode/embed/EmbeddedStore.java
URL: http://svn.apache.org/viewvc/ode/sandbox/simpel/src/main/java/org/apache/ode/embed/EmbeddedStore.java?rev=693539&r1=693538&r2=693539&view=diff
==============================================================================
--- ode/sandbox/simpel/src/main/java/org/apache/ode/embed/EmbeddedStore.java (original)
+++ ode/sandbox/simpel/src/main/java/org/apache/ode/embed/EmbeddedStore.java Tue Sep 9 11:08:49 2008
@@ -19,11 +19,11 @@
package org.apache.ode.embed;
+import org.apache.ode.bpel.rtrep.v2.*;
+
import org.apache.ode.bpel.evt.BpelEvent;
import org.apache.ode.bpel.iapi.*;
-import org.apache.ode.bpel.o.OProcess;
-import org.apache.ode.bpel.o.Serializer;
-import org.apache.ode.bpel.o.OPartnerLink;
+import org.apache.ode.bpel.rapi.PartnerLinkModel;
import org.apache.ode.simpel.SimPELCompiler;
import org.w3c.dom.Node;
import org.w3c.dom.Element;
@@ -43,7 +43,7 @@
private static final String SIMPEL_ENDPOINT_NS = "http://ode.apache.org/simpel/1.0/endpoint";
- private HashMap<QName, OProcess> _processes = new HashMap<QName,OProcess>();
+ private HashMap<QName, OProcess> _processes = new HashMap<QName, OProcess>();
private SimPELCompiler _compiler = new SimPELCompiler();
private ArrayList<ProcessStoreListener> _listeners = new ArrayList<ProcessStoreListener>();
@@ -146,7 +146,7 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream();
Serializer fileHeader = new Serializer(System.currentTimeMillis());
try {
- fileHeader.writeOProcess(_oprocess, baos);
+ fileHeader.writePModel(_oprocess, baos);
} catch (IOException e) {
throw new RuntimeException("Failed to serialize compiled OProcess!", e);
}
@@ -195,7 +195,7 @@
private Map<String, Endpoint> defaultEndpoints(boolean myrole) {
Map<String, Endpoint> res = new HashMap<String, Endpoint>();
- for (OPartnerLink partnerLink : _oprocess.getAllPartnerLinks()) {
+ for (PartnerLinkModel partnerLink : _oprocess.getAllPartnerLinks()) {
if (partnerLink.hasMyRole() && myrole || partnerLink.hasPartnerRole() && !myrole)
res.put(partnerLink.getName(), new Endpoint(
new QName(SIMPEL_ENDPOINT_NS, partnerLink.getName()), "SimPELPort"));
@@ -218,5 +218,9 @@
public boolean isSharedService(QName qName) {
return false;
}
+
+ public int getRuntimeVersion() {
+ return 2;
+ }
}
}
Modified: ode/sandbox/simpel/src/main/java/org/apache/ode/simpel/SimPELCompiler.java
URL: http://svn.apache.org/viewvc/ode/sandbox/simpel/src/main/java/org/apache/ode/simpel/SimPELCompiler.java?rev=693539&r1=693538&r2=693539&view=diff
==============================================================================
--- ode/sandbox/simpel/src/main/java/org/apache/ode/simpel/SimPELCompiler.java (original)
+++ ode/sandbox/simpel/src/main/java/org/apache/ode/simpel/SimPELCompiler.java Tue Sep 9 11:08:49 2008
@@ -1,11 +1,12 @@
package org.apache.ode.simpel;
+import org.apache.ode.bpel.rtrep.v2.OProcess;
+
import org.antlr.runtime.ANTLRReaderStream;
import org.antlr.runtime.RecognitionException;
import org.antlr.runtime.tree.CommonTreeNodeStream;
import org.antlr.runtime.tree.Tree;
import org.antlr.runtime.tree.TreeParser;
-import org.apache.ode.bpel.o.OProcess;
import org.apache.ode.simpel.antlr.SimPELLexer;
import org.apache.ode.simpel.antlr.SimPELParser;
import org.apache.ode.simpel.antlr.SimPELWalker;
Modified: ode/sandbox/simpel/src/main/java/org/apache/ode/simpel/omodel/OBuilder.java
URL: http://svn.apache.org/viewvc/ode/sandbox/simpel/src/main/java/org/apache/ode/simpel/omodel/OBuilder.java?rev=693539&r1=693538&r2=693539&view=diff
==============================================================================
--- ode/sandbox/simpel/src/main/java/org/apache/ode/simpel/omodel/OBuilder.java (original)
+++ ode/sandbox/simpel/src/main/java/org/apache/ode/simpel/omodel/OBuilder.java Tue Sep 9 11:08:49 2008
@@ -1,9 +1,11 @@
package org.apache.ode.simpel.omodel;
import org.apache.log4j.Logger;
-import org.apache.ode.bpel.compiler.BaseCompiler;
+
+import org.apache.ode.bpel.compiler.v2.BaseCompiler;
+import org.apache.ode.bpel.rtrep.v2.*;
+
import org.apache.ode.bpel.compiler.bom.Bpel20QNames;
-import org.apache.ode.bpel.o.*;
import org.apache.ode.simpel.wsdl.SimPELInput;
import org.apache.ode.simpel.wsdl.SimPELOperation;
import org.apache.ode.simpel.wsdl.SimPELOutput;
@@ -28,7 +30,7 @@
private OExpressionLanguage _konstExprLang;
private String _processNS;
private HashMap<String,String> namespaces = new HashMap<String,String>();
- private HashMap<String,OPartnerLink> partnerLinks = new HashMap<String,OPartnerLink>();
+ private HashMap<String, OPartnerLink> partnerLinks = new HashMap<String,OPartnerLink>();
private HashMap<String,OScope.Variable> variables = new HashMap<String,OScope.Variable>();
private boolean firstReceive = true;
@@ -93,7 +95,7 @@
_konstExprLang = new OExpressionLanguage(_oprocess, null);
_konstExprLang.expressionLanguageUri = "uri:www.fivesight.com/konstExpression";
_konstExprLang.properties.put("runtime-class",
- "org.apache.ode.bpel.runtime.explang.konst.KonstExpressionLanguageRuntimeImpl");
+ "org.apache.ode.bpel.rtrep.v2.KonstExpressionLanguageRuntimeImpl");
_oprocess.expressionLanguages.add(_konstExprLang);
final OScope processScope = new OScope(_oprocess, null);
Modified: ode/sandbox/simpel/src/main/java/org/apache/ode/simpel/omodel/SimPELExpr.java
URL: http://svn.apache.org/viewvc/ode/sandbox/simpel/src/main/java/org/apache/ode/simpel/omodel/SimPELExpr.java?rev=693539&r1=693538&r2=693539&view=diff
==============================================================================
--- ode/sandbox/simpel/src/main/java/org/apache/ode/simpel/omodel/SimPELExpr.java (original)
+++ ode/sandbox/simpel/src/main/java/org/apache/ode/simpel/omodel/SimPELExpr.java Tue Sep 9 11:08:49 2008
@@ -1,8 +1,6 @@
package org.apache.ode.simpel.omodel;
-import org.apache.ode.bpel.o.OExpression;
-import org.apache.ode.bpel.o.OProcess;
-import org.apache.ode.bpel.o.OScope;
+import org.apache.ode.bpel.rtrep.v2.*;
import java.util.HashMap;
Modified: ode/sandbox/simpel/src/test/java/org/apache/ode/simpel/SimPELCompilerTest.java
URL: http://svn.apache.org/viewvc/ode/sandbox/simpel/src/test/java/org/apache/ode/simpel/SimPELCompilerTest.java?rev=693539&r1=693538&r2=693539&view=diff
==============================================================================
--- ode/sandbox/simpel/src/test/java/org/apache/ode/simpel/SimPELCompilerTest.java (original)
+++ ode/sandbox/simpel/src/test/java/org/apache/ode/simpel/SimPELCompilerTest.java Tue Sep 9 11:08:49 2008
@@ -2,11 +2,7 @@
import junit.framework.TestCase;
import org.antlr.runtime.RecognitionException;
-import org.apache.ode.EmbeddedServer;
-import org.apache.ode.bpel.o.OProcess;
-import org.apache.ode.utils.DOMUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
+import org.apache.ode.bpel.rtrep.v2.OProcess;
import java.io.BufferedReader;
import java.io.FileReader;
Modified: ode/sandbox/simpel/src/test/java/org/apache/ode/simpel/SimPELRuntimeTest.java
URL: http://svn.apache.org/viewvc/ode/sandbox/simpel/src/test/java/org/apache/ode/simpel/SimPELRuntimeTest.java?rev=693539&r1=693538&r2=693539&view=diff
==============================================================================
--- ode/sandbox/simpel/src/test/java/org/apache/ode/simpel/SimPELRuntimeTest.java (original)
+++ ode/sandbox/simpel/src/test/java/org/apache/ode/simpel/SimPELRuntimeTest.java Tue Sep 9 11:08:49 2008
@@ -44,7 +44,7 @@
"}";
public void testHelloWorldComplete() throws Exception {
- EmbeddedServer server = new EmbeddedServer();
+ EmbeddedServer server = new EmbeddedServer();
server.start();
server.deploy(HELLO_WORLD);