Author: vanto
Date: Wed Aug 1 12:43:16 2007
New Revision: 561932
URL: http://svn.apache.org/viewvc?view=rev&rev=561932
Log:
Fix for ODE-163
Modified:
ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/BpelObject.java
ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ForEachActivity.java
ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/OnAlarm.java
ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Scope.java
ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/WaitActivity.java
Modified:
ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/BpelObject.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/BpelObject.java?view=diff&rev=561932&r1=561931&r2=561932
==============================================================================
---
ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/BpelObject.java
(original)
+++
ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/BpelObject.java
Wed Aug 1 12:43:16 2007
@@ -130,6 +130,19 @@
return e.getElement();
}
+ public Element getFirstExtensibilityElementElement() {
+ Element child = null;
+ NodeList nl = getElement().getChildNodes();
+ for (int i = 0; i < nl.getLength(); ++i) {
+ Node node = nl.item(i);
+ if (node.getNodeType() == Node.ELEMENT_NODE &&
+
!getType().getNamespaceURI().equals(node.getNamespaceURI())) {
+ child = (Element)node;
+ break;
+ }
+ }
+ return child;
+ }
/**
* Is this a BPEL 1.1 object?
@@ -176,6 +189,19 @@
@Override
public boolean isMember(BpelObject o) {
return o.getType().equals(type);
+ }
+ });
+ }
+
+ protected BpelObject getFirstChild(final QName[] oneOfTheseTypes) {
+ return CollectionsX.find_if(getChildren(), new
MemberOfFunction<BpelObject>() {
+ @Override
+ public boolean isMember(BpelObject o) {
+ boolean isMember = false;
+ for (QName type : oneOfTheseTypes) {
+ isMember |= o.getType().equals(type);
+ }
+ return isMember;
}
});
}
Modified:
ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ForEachActivity.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ForEachActivity.java?view=diff&rev=561932&r1=561931&r2=561932
==============================================================================
---
ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ForEachActivity.java
(original)
+++
ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ForEachActivity.java
Wed Aug 1 12:43:16 2007
@@ -19,6 +19,8 @@
package org.apache.ode.bpel.compiler.bom;
+import javax.xml.namespace.QName;
+
import org.w3c.dom.Element;
/**
@@ -56,7 +58,7 @@
* @return start iteration counter
*/
public Expression getStartCounter() {
- return (Expression) getFirstChild(Bpel20QNames.START_COUNTER_VALUE);
+ return (Expression) getFirstChild(new QName[]
{Bpel20QNames.START_COUNTER_VALUE, Bpel20QNames.FINAL_START_COUNTER_VALUE});
}
/**
@@ -66,7 +68,7 @@
* @return final counter expression
*/
public Expression getFinalCounter() {
- return (Expression) getFirstChild(Bpel20QNames.FINAL_COUNTER_VALUE);
+ return (Expression) getFirstChild(new QName[]
{Bpel20QNames.FINAL_COUNTER_VALUE, Bpel20QNames.FINAL_FINAL_COUNTER_VALUE});
}
/**
Modified:
ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/OnAlarm.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/OnAlarm.java?view=diff&rev=561932&r1=561931&r2=561932
==============================================================================
---
ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/OnAlarm.java
(original)
+++
ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/OnAlarm.java
Wed Aug 1 12:43:16 2007
@@ -18,6 +18,8 @@
*/
package org.apache.ode.bpel.compiler.bom;
+import javax.xml.namespace.QName;
+
import org.w3c.dom.Element;
/**
@@ -45,7 +47,7 @@
* @return duration of the alarm
*/
public Expression getFor() {
- return (Expression) getFirstChild(Bpel20QNames.FOR);
+ return (Expression) getFirstChild(new QName[] {Bpel20QNames.FOR,
Bpel20QNames.FINAL_FOR});
}
@@ -55,7 +57,7 @@
* @return deadline when alarm goes out of effect
*/
public Expression getUntil() {
- return (Expression) getFirstChild(Bpel20QNames.UNTIL);
+ return (Expression) getFirstChild(new QName[] {Bpel20QNames.UNTIL,
Bpel20QNames.FINAL_UNTIL});
}
@@ -64,7 +66,7 @@
* @return the duration expression that specifies the frequency
*/
public Expression getRepeatEvery() {
- return (Expression) getFirstChild(Bpel20QNames.REPEAT_EVERY);
+ return (Expression) getFirstChild(new QName[]
{Bpel20QNames.REPEAT_EVERY, Bpel20QNames.FINAL_REPEAT_EVERY});
}
Modified:
ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Scope.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Scope.java?view=diff&rev=561932&r1=561931&r2=561932
==============================================================================
---
ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Scope.java
(original)
+++
ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Scope.java
Wed Aug 1 12:43:16 2007
@@ -21,6 +21,8 @@
import java.util.Collections;
import java.util.List;
+import javax.xml.namespace.QName;
+
import org.apache.ode.utils.stl.CollectionsX;
import org.apache.ode.utils.stl.MemberOfFunction;
import org.w3c.dom.Element;
@@ -129,7 +131,7 @@
* @return the <code>OnAlarmEventHandler</code>s
*/
public List<OnAlarm> getAlarms() {
- BpelObject eventHandlers = getFirstChild(Bpel20QNames.EVENTHANDLERS);
+ BpelObject eventHandlers = getFirstChild(new QName[]
{Bpel20QNames.EVENTHANDLERS, Bpel20QNames.FINAL_EVENTHANDLERS});
if (eventHandlers == null)
return Collections.emptyList();
return eventHandlers.getChildren(OnAlarm.class);
@@ -138,7 +140,7 @@
/**
*/
public List<OnEvent> getEvents() {
- BpelObject eventHandlers = getFirstChild(Bpel20QNames.EVENTHANDLERS);
+ BpelObject eventHandlers = getFirstChild(new QName[]
{Bpel20QNames.EVENTHANDLERS, Bpel20QNames.FINAL_EVENTHANDLERS});
if (eventHandlers == null)
return Collections.emptyList();
Modified:
ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/WaitActivity.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/WaitActivity.java?view=diff&rev=561932&r1=561931&r2=561932
==============================================================================
---
ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/WaitActivity.java
(original)
+++
ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/WaitActivity.java
Wed Aug 1 12:43:16 2007
@@ -18,6 +18,8 @@
*/
package org.apache.ode.bpel.compiler.bom;
+import javax.xml.namespace.QName;
+
import org.w3c.dom.Element;
/**
@@ -35,7 +37,7 @@
* @return Returns the for.
*/
public Expression getFor() {
- return (Expression) getFirstChild(Bpel20QNames.FOR);
+ return (Expression) getFirstChild(new QName[] {Bpel20QNames.FOR,
Bpel20QNames.FINAL_FOR});
}
/**
@@ -44,7 +46,7 @@
* @return the "until" expression
*/
public Expression getUntil() {
- return (Expression) getFirstChild(Bpel20QNames.UNTIL);
+ return (Expression) getFirstChild(new QName[] {Bpel20QNames.UNTIL,
Bpel20QNames.FINAL_UNTIL});
}
}
