Author: vanto
Date: Wed Aug 1 13:49:12 2007
New Revision: 561943
URL: http://svn.apache.org/viewvc?view=rev&rev=561943
Log:
changed 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=561943&r1=561942&r2=561943
==============================================================================
---
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 13:49:12 2007
@@ -193,19 +193,10 @@
});
}
- 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;
- }
- });
+ protected QName rewriteTargetNS(QName target) {
+ return new QName(getType().getNamespaceURI(), target.getLocalPart());
}
-
+
protected List<BpelObject> getChildren() {
if (_children == null) {
_children = new ArrayList<BpelObject>();
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=561943&r1=561942&r2=561943
==============================================================================
---
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 13:49:12 2007
@@ -58,7 +58,7 @@
* @return start iteration counter
*/
public Expression getStartCounter() {
- return (Expression) getFirstChild(new QName[]
{Bpel20QNames.START_COUNTER_VALUE, Bpel20QNames.FINAL_START_COUNTER_VALUE});
+ return (Expression)
getFirstChild(rewriteTargetNS(Bpel20QNames.START_COUNTER_VALUE));
}
/**
@@ -68,7 +68,7 @@
* @return final counter expression
*/
public Expression getFinalCounter() {
- return (Expression) getFirstChild(new QName[]
{Bpel20QNames.FINAL_COUNTER_VALUE, Bpel20QNames.FINAL_FINAL_COUNTER_VALUE});
+ return (Expression)
getFirstChild(rewriteTargetNS(Bpel20QNames.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=561943&r1=561942&r2=561943
==============================================================================
---
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 13:49:12 2007
@@ -47,7 +47,7 @@
* @return duration of the alarm
*/
public Expression getFor() {
- return (Expression) getFirstChild(new QName[] {Bpel20QNames.FOR,
Bpel20QNames.FINAL_FOR});
+ return (Expression) getFirstChild(rewriteTargetNS(Bpel20QNames.FOR));
}
@@ -57,7 +57,7 @@
* @return deadline when alarm goes out of effect
*/
public Expression getUntil() {
- return (Expression) getFirstChild(new QName[] {Bpel20QNames.UNTIL,
Bpel20QNames.FINAL_UNTIL});
+ return (Expression) getFirstChild(rewriteTargetNS(Bpel20QNames.UNTIL));
}
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=561943&r1=561942&r2=561943
==============================================================================
---
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 13:49:12 2007
@@ -131,7 +131,7 @@
* @return the <code>OnAlarmEventHandler</code>s
*/
public List<OnAlarm> getAlarms() {
- BpelObject eventHandlers = getFirstChild(new QName[]
{Bpel20QNames.EVENTHANDLERS, Bpel20QNames.FINAL_EVENTHANDLERS});
+ BpelObject eventHandlers =
getFirstChild(rewriteTargetNS(Bpel20QNames.EVENTHANDLERS));
if (eventHandlers == null)
return Collections.emptyList();
return eventHandlers.getChildren(OnAlarm.class);
@@ -140,7 +140,7 @@
/**
*/
public List<OnEvent> getEvents() {
- BpelObject eventHandlers = getFirstChild(new QName[]
{Bpel20QNames.EVENTHANDLERS, Bpel20QNames.FINAL_EVENTHANDLERS});
+ BpelObject eventHandlers =
getFirstChild(rewriteTargetNS(Bpel20QNames.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=561943&r1=561942&r2=561943
==============================================================================
---
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 13:49:12 2007
@@ -18,8 +18,6 @@
*/
package org.apache.ode.bpel.compiler.bom;
-import javax.xml.namespace.QName;
-
import org.w3c.dom.Element;
/**
@@ -37,7 +35,7 @@
* @return Returns the for.
*/
public Expression getFor() {
- return (Expression) getFirstChild(new QName[] {Bpel20QNames.FOR,
Bpel20QNames.FINAL_FOR});
+ return (Expression) getFirstChild(rewriteTargetNS(Bpel20QNames.FOR));
}
/**
@@ -46,7 +44,6 @@
* @return the "until" expression
*/
public Expression getUntil() {
- return (Expression) getFirstChild(new QName[] {Bpel20QNames.UNTIL,
Bpel20QNames.FINAL_UNTIL});
-
+ return (Expression)
getFirstChild(rewriteTargetNS(Bpel20QNames.UNTIL));
}
}
