Author: mszefler
Date: Tue Oct 24 11:59:15 2006
New Revision: 467439
URL: http://svn.apache.org/viewvc?view=rev&rev=467439
Log:
BPEL 1.1 fixes for refactor.
Modified:
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Bpel11QNames.java
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/BpelObjectFactory.java
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/From.java
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/PartnerLinkType.java
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Process.java
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ToFrom.java
incubator/ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTest.java
Modified:
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java?view=diff&rev=467439&r1=467438&r2=467439
==============================================================================
---
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java
(original)
+++
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java
Tue Oct 24 11:59:15 2006
@@ -350,6 +350,8 @@
throw new CompilationException(cmsg, e);
}
+ assert process != null;
+
compile(process);
this.invalidate();
}
Modified:
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java?view=diff&rev=467439&r1=467438&r2=467439
==============================================================================
---
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
(original)
+++
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
Tue Oct 24 11:59:15 2006
@@ -212,6 +212,9 @@
}
public PortType resolvePortType(final QName portTypeName) {
+ if (portTypeName == null)
+ throw new NullPointerException("Null portTypeName argument!");
+
PortType portType = _wsdlRegistry.getPortType(portTypeName);
if (portType == null)
throw new
CompilationException(__cmsgs.errUndeclaredPortType(portTypeName));
@@ -537,6 +540,8 @@
* Compile a process.
*/
public OProcess compile(File bpelFile, final Process process) throws
CompilationException {
+ if (process == null)
+ throw new NullPointerException("Null process parameter");
_processDef = process;
_generatedDate = new Date();
_structureStack.clear();
Modified:
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Bpel11QNames.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Bpel11QNames.java?view=diff&rev=467439&r1=467438&r2=467439
==============================================================================
---
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Bpel11QNames.java
(original)
+++
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Bpel11QNames.java
Tue Oct 24 11:59:15 2006
@@ -106,6 +106,7 @@
public static final QName PLINKROLE = new
QName(NS_BPEL4WS_PARTNERLINK_2003_05, "role");
+ public static final QName PORTTYPE = new
QName(NS_BPEL4WS_PARTNERLINK_2003_05, "portType");
private static QName newQName(String local) {
return new QName(NS_BPEL4WS_2003_03, local);
Modified:
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/BpelObjectFactory.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/BpelObjectFactory.java?view=diff&rev=467439&r1=467438&r2=467439
==============================================================================
---
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/BpelObjectFactory.java
(original)
+++
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/BpelObjectFactory.java
Tue Oct 24 11:59:15 2006
@@ -140,7 +140,7 @@
_mappings.put(Bpel11QNames.TERMINATE, TerminateActivity.class);
_mappings.put(Bpel11QNames.FLOW, FlowActivity.class);
_mappings.put(Bpel11QNames.SWITCH, IfActivity.class);
- _mappings.put(Bpel11QNames.WHILE, WhileActivity.class);
+ _mappings.put(Bpel11QNames.WHILE, WhileActivity11.class);
_mappings.put(Bpel11QNames.SEQUENCE, SequenceActivity.class);
_mappings.put(Bpel11QNames.PICK, PickActivity.class);
_mappings.put(Bpel11QNames.SCOPE, ScopeActivity.class);
@@ -158,7 +158,8 @@
_mappings.put(Bpel11QNames.ONALARM, OnAlarm.class);
_mappings.put(Bpel11QNames.ONMESSAGE, OnMessage.class);
_mappings.put(Bpel11QNames.PLINKTYPE, PartnerLinkType.class);
- _mappings.put(Bpel11QNames.PLINKROLE, PartnerLinkType.Role.class);
+ _mappings.put(Bpel11QNames.PLINKROLE, PartnerLinkType.Role11.class);
+ _mappings.put(Bpel11QNames.PORTTYPE,
PartnerLinkType.Role11.PortType11.class);
_mappings.put(Bpel11QNames.PROPALIAS, PropertyAlias.class);
_mappings.put(Bpel11QNames.PROPERTY, Property.class);
_mappings.put(Bpel11QNames.VARIABLES, Variables.class);
Modified:
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/From.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/From.java?view=diff&rev=467439&r1=467438&r2=467439
==============================================================================
---
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/From.java
(original)
+++
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/From.java
Tue Oct 24 11:59:15 2006
@@ -37,4 +37,16 @@
return getAsLiteralVal() != null;
}
+ @Override
+ public Expression getAsExpression() {
+ // BPEL 1.1 fixups. In 1.1 the expression was an attribute not the
child element.
+ if (is11()) {
+ String expr = getAttribute("expression" , null);
+ return expr == null ? null : new
Expression11(getElement(),getElement().getAttributeNode("expression"));
+ }
+
+ return super.getAsExpression();
+ }
+
+
}
Modified:
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/PartnerLinkType.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/PartnerLinkType.java?view=diff&rev=467439&r1=467438&r2=467439
==============================================================================
---
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/PartnerLinkType.java
(original)
+++
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/PartnerLinkType.java
Tue Oct 24 11:59:15 2006
@@ -109,5 +109,41 @@
}
}
+
+ /**
+ * BPEL 1.1 nonsense.
+ * @author Maciej Szefler - m s z e f l e r @ g m a i l . c o m
+ *
+ */
+ public static class Role11 extends Role {
+ private static final long serialVersionUID = -1L;
+
+ public Role11(Element el) {
+ super(el);
+ }
+
+ /**
+ * Get the WSDL portType of the role (i.e. the interface implemented by
+ * the object acting in the role).
+ *
+ * @return role portType
+ */
+ public QName getPortType() {
+ PortType11 pt11 = getFirstChild(PortType11.class);
+ return pt11 == null ? null : pt11.getName();
+ }
+
+
+ public static class PortType11 extends BpelObject4WSDL {
+
+ public PortType11(Element el) {
+ super(el);
+ }
+
+ public QName getName() {
+ return getNamespaceContext().derefQName(getAttribute("name"));
+ }
+ }
+ }
}
Modified:
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Process.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Process.java?view=diff&rev=467439&r1=467438&r2=467439
==============================================================================
---
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Process.java
(original)
+++
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Process.java
Tue Oct 24 11:59:15 2006
@@ -50,7 +50,7 @@
* Get the BPEL version of this process.
*/
public Version getBpelVersion() {
- return Version.BPEL20;
+ return is11() ? Version.BPEL11 : Version.BPEL20;
}
/**
Modified:
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ToFrom.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ToFrom.java?view=diff&rev=467439&r1=467438&r2=467439
==============================================================================
---
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ToFrom.java
(original)
+++
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ToFrom.java
Tue Oct 24 11:59:15 2006
@@ -58,6 +58,10 @@
}
public Expression getAsExpression() {
+ // BPEL 1.1 will have an expression only for the /from/ nodes.
+ if (is11())
+ return null;
+
return new Expression(getElement());
}
Modified:
incubator/ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTest.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTest.java?view=diff&rev=467439&r1=467438&r2=467439
==============================================================================
---
incubator/ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTest.java
(original)
+++
incubator/ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTest.java
Tue Oct 24 11:59:15 2006
@@ -29,50 +29,50 @@
public static Test suite() throws Exception {
TestSuite suite = new TestSuite();
-// suite.addTest(new
GoodCompileTCase("/2.0/good/assign/Assign1-2.0.bpel"));
-// suite.addTest(new
GoodCompileTCase("/2.0/good/assign/Assign2-2.0.bpel"));
-// suite.addTest(new
GoodCompileTCase("/2.0/good/assign/Assign3-2.0.bpel"));
-// suite.addTest(new
GoodCompileTCase("/2.0/good/assign/Assign5-2.0.bpel"));
-// suite.addTest(new
GoodCompileTCase("/2.0/good/assign/Assign6-2.0.bpel"));
-// suite.addTest(new
GoodCompileTCase("/2.0/good/assign/Assign7-2.0.bpel"));
-// suite.addTest(new
GoodCompileTCase("/2.0/good/assign/Assign8-2.0.bpel"));
-// suite.addTest(new
GoodCompileTCase("/2.0/good/assign/Assign9-2.0.bpel"));
-// suite.addTest(new
GoodCompileTCase("/2.0/good/AsyncProcess/AsyncProcess2.bpel"));
-// suite.addTest(new
GoodCompileTCase("/2.0/good/compensation/comp1-2.0.bpel"));
-// suite.addTest(new
GoodCompileTCase("/2.0/good/compensation/comp2-2.0.bpel"));
-// suite.addTest(new GoodCompileTCase("/2.0/good/flow/flow2-2.0.bpel"));
-// suite.addTest(new GoodCompileTCase("/2.0/good/flow/flow3-2.0.bpel"));
-// suite.addTest(new GoodCompileTCase("/2.0/good/flow/flow4-2.0.bpel"));
-// suite.addTest(new GoodCompileTCase("/2.0/good/flow/flow5-2.0.bpel"));
+ suite.addTest(new
GoodCompileTCase("/2.0/good/assign/Assign1-2.0.bpel"));
+ suite.addTest(new
GoodCompileTCase("/2.0/good/assign/Assign2-2.0.bpel"));
+ suite.addTest(new
GoodCompileTCase("/2.0/good/assign/Assign3-2.0.bpel"));
+ suite.addTest(new
GoodCompileTCase("/2.0/good/assign/Assign5-2.0.bpel"));
+ suite.addTest(new
GoodCompileTCase("/2.0/good/assign/Assign6-2.0.bpel"));
+ suite.addTest(new
GoodCompileTCase("/2.0/good/assign/Assign7-2.0.bpel"));
+ suite.addTest(new
GoodCompileTCase("/2.0/good/assign/Assign8-2.0.bpel"));
+ suite.addTest(new
GoodCompileTCase("/2.0/good/assign/Assign9-2.0.bpel"));
+ suite.addTest(new
GoodCompileTCase("/2.0/good/AsyncProcess/AsyncProcess2.bpel"));
+ suite.addTest(new
GoodCompileTCase("/2.0/good/compensation/comp1-2.0.bpel"));
+ suite.addTest(new
GoodCompileTCase("/2.0/good/compensation/comp2-2.0.bpel"));
+ suite.addTest(new GoodCompileTCase("/2.0/good/flow/flow2-2.0.bpel"));
+ suite.addTest(new GoodCompileTCase("/2.0/good/flow/flow3-2.0.bpel"));
+ suite.addTest(new GoodCompileTCase("/2.0/good/flow/flow4-2.0.bpel"));
+ suite.addTest(new GoodCompileTCase("/2.0/good/flow/flow5-2.0.bpel"));
suite.addTest(new GoodCompileTCase("/2.0/good/flow/flow6-2.0.bpel"));
-// suite.addTest(new GoodCompileTCase("/2.0/good/flow/flow7-2.0.bpel"));
-// suite.addTest(new GoodCompileTCase("/2.0/good/if/If1-2.0.bpel"));
-// suite.addTest(new GoodCompileTCase("/2.0/good/if/If2-2.0.bpel"));
-// suite.addTest(new GoodCompileTCase("/2.0/good/if/If3-2.0.bpel"));
-// suite.addTest(new GoodCompileTCase("/2.0/good/pick/Pick3-2.0.bpel"));
-// suite.addTest(new GoodCompileTCase("/2.0/good/pick/Pick4-2.0.bpel"));
-// suite.addTest(new GoodCompileTCase("/2.0/good/pick/Pick5-2.0.bpel"));
-// suite.addTest(new GoodCompileTCase("/2.0/good/pick/Pick6-2.0.bpel"));
-// suite.addTest(new
GoodCompileTCase("/2.0/good/rethrow/Rethrow1-2.0.bpel"));
-// suite.addTest(new
GoodCompileTCase("/2.0/good/rethrow/Rethrow2-2.0.bpel"));
-// suite.addTest(new
GoodCompileTCase("/2.0/good/throw/Throw1-2.0.bpel"));
-// suite.addTest(new
GoodCompileTCase("/2.0/good/throw/Throw2-2.0.bpel"));
-// suite.addTest(new
GoodCompileTCase("/2.0/good/throw/Throw3-2.0.bpel"));
-// suite.addTest(new
GoodCompileTCase("/2.0/good/throw/Throw4-2.0.bpel"));
-// suite.addTest(new
GoodCompileTCase("/2.0/good/throw/Throw5-2.0.bpel"));
-// suite.addTest(new
GoodCompileTCase("/2.0/good/throw/Throw6-2.0.bpel"));
-// suite.addTest(new
GoodCompileTCase("/2.0/good/throw/Throw7-2.0.bpel"));
-// suite.addTest(new GoodCompileTCase("/2.0/good/wait/Wait1-2.0.bpel"));
-// suite.addTest(new GoodCompileTCase("/2.0/good/wait/Wait2-2.0.bpel"));
-// suite.addTest(new
GoodCompileTCase("/2.0/good/while/While1-2.0.bpel"));
-// suite.addTest(new
GoodCompileTCase("/2.0/good/xpath10-func/GetVariableData1-2.0.bpel"));
-// suite.addTest(new
GoodCompileTCase("/2.0/good/xpath10-func/GetVariableData2-2.0.bpel"));
-// suite.addTest(new
GoodCompileTCase("/2.0/good/xpath10-func/GetVariableData3-2.0.bpel"));
-// suite.addTest(new
GoodCompileTCase("/2.0/good/xpath10-func/GetVariableData4-2.0.bpel"));
-// suite.addTest(new
GoodCompileTCase("/2.0/good/xpath10-func/GetVariableProperty1-2.0.bpel"));
+ suite.addTest(new GoodCompileTCase("/2.0/good/flow/flow7-2.0.bpel"));
+ suite.addTest(new GoodCompileTCase("/2.0/good/if/If1-2.0.bpel"));
+ suite.addTest(new GoodCompileTCase("/2.0/good/if/If2-2.0.bpel"));
+ suite.addTest(new GoodCompileTCase("/2.0/good/if/If3-2.0.bpel"));
+ suite.addTest(new GoodCompileTCase("/2.0/good/pick/Pick3-2.0.bpel"));
+ suite.addTest(new GoodCompileTCase("/2.0/good/pick/Pick4-2.0.bpel"));
+ suite.addTest(new GoodCompileTCase("/2.0/good/pick/Pick5-2.0.bpel"));
+ suite.addTest(new GoodCompileTCase("/2.0/good/pick/Pick6-2.0.bpel"));
+ suite.addTest(new
GoodCompileTCase("/2.0/good/rethrow/Rethrow1-2.0.bpel"));
+ suite.addTest(new
GoodCompileTCase("/2.0/good/rethrow/Rethrow2-2.0.bpel"));
+ suite.addTest(new GoodCompileTCase("/2.0/good/throw/Throw1-2.0.bpel"));
+ suite.addTest(new GoodCompileTCase("/2.0/good/throw/Throw2-2.0.bpel"));
+ suite.addTest(new GoodCompileTCase("/2.0/good/throw/Throw3-2.0.bpel"));
+ suite.addTest(new GoodCompileTCase("/2.0/good/throw/Throw4-2.0.bpel"));
+ suite.addTest(new GoodCompileTCase("/2.0/good/throw/Throw5-2.0.bpel"));
+ suite.addTest(new GoodCompileTCase("/2.0/good/throw/Throw6-2.0.bpel"));
+ suite.addTest(new GoodCompileTCase("/2.0/good/throw/Throw7-2.0.bpel"));
+ suite.addTest(new GoodCompileTCase("/2.0/good/wait/Wait1-2.0.bpel"));
+ suite.addTest(new GoodCompileTCase("/2.0/good/wait/Wait2-2.0.bpel"));
+ suite.addTest(new GoodCompileTCase("/2.0/good/while/While1-2.0.bpel"));
+ suite.addTest(new
GoodCompileTCase("/2.0/good/xpath10-func/GetVariableData1-2.0.bpel"));
+ suite.addTest(new
GoodCompileTCase("/2.0/good/xpath10-func/GetVariableData2-2.0.bpel"));
+ suite.addTest(new
GoodCompileTCase("/2.0/good/xpath10-func/GetVariableData3-2.0.bpel"));
+ suite.addTest(new
GoodCompileTCase("/2.0/good/xpath10-func/GetVariableData4-2.0.bpel"));
+ suite.addTest(new
GoodCompileTCase("/2.0/good/xpath10-func/GetVariableProperty1-2.0.bpel"));
suite.addTest(new
GoodCompileTCase("/2.0/good/xpath20-func/GetVariableData2-xp2.0.bpel"));
-// suite.addTest(new
GoodCompileTCase("/2.0/good/xpath20-func/GetVariableData3-xp2.0.bpel"));
-// suite.addTest(new
GoodCompileTCase("/2.0/good/xpath20-func/GetVariableData4-xp2.0.bpel"));
+ suite.addTest(new
GoodCompileTCase("/2.0/good/xpath20-func/GetVariableData3-xp2.0.bpel"));
+ suite.addTest(new
GoodCompileTCase("/2.0/good/xpath20-func/GetVariableData4-xp2.0.bpel"));
suite.addTest(new
GoodCompileTCase("/2.0/good/xpath20-func/GetVariableProperty1-xp2.0.bpel"));
return suite;
}
