Author: dennyxu
Date: 2009-12-09 05:23:41 -0500 (Wed, 09 Dec 2009)
New Revision: 19148
Modified:
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/Main.java
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/ModelQuery.java
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IConstants.java
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CValidator.java
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/FromValidator.java
Log:
JBIDE-5393:BPEL validation errors in hello_world_header_ode riftsaw quickstart sample
Modified:
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/Main.java
===================================================================
---
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/Main.java 2009-12-09
09:34:32 UTC (rev 19147)
+++
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/Main.java 2009-12-09
10:23:41 UTC (rev 19148)
@@ -182,6 +182,8 @@
WSDLElement wsdle = (WSDLElement) obj;
Element el = wsdle.getElement();
if (el != null) {
+// System.out.println(el.getOwnerDocument().getDocumentURI() + " " +
el.getLocalName() + "----" + obj);
+
el.setUserData("emf.model", obj, null); //$NON-NLS-1$
}
}
Modified:
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/ModelQuery.java
===================================================================
---
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/ModelQuery.java 2009-12-09
09:34:32 UTC (rev 19147)
+++
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/ModelQuery.java 2009-12-09
10:23:41 UTC (rev 19148)
@@ -200,6 +200,8 @@
}
// set it.
+// System.out.println(elm.getOwnerDocument().getDocumentURI() + " " +
elm.getLocalName() + "----" + obj);
+
elm.setUserData("emf.model", eObj, null);
@@ -217,6 +219,8 @@
domElement = ((XSDConcreteComponent)next).getElement();
}
if ( domElement != null ) {
+// System.out.println(elm.getOwnerDocument().getDocumentURI() + " " +
elm.getLocalName() + "----" + next);
+
domElement.setUserData("emf.model",next,null);
}
}
Modified:
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IConstants.java
===================================================================
---
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IConstants.java 2009-12-09
09:34:32 UTC (rev 19147)
+++
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IConstants.java 2009-12-09
10:23:41 UTC (rev 19148)
@@ -250,6 +250,7 @@
public static final QName AT_OUTPUT_VARIABLE = new
QName("outputVariable");
public static final QName AT_CREATE_INSTANCE = new
QName("createInstance");
public static final QName AT_PART = new QName("part");
+ public static final QName AT_HEADER = new QName("header");
public static final QName AT_QUERY = new QName("query");
public static final QName AT_OPAQUE = new QName("opaque");
public static final QName AT_PROPERTY = new QName("property");
Modified:
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CValidator.java
===================================================================
---
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CValidator.java 2009-12-09
09:34:32 UTC (rev 19147)
+++
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CValidator.java 2009-12-09
10:23:41 UTC (rev 19148)
@@ -277,7 +277,7 @@
* @param toNode
*/
public void compatibleCopyCheck ( INode fromNode, INode toNode ) {
- int i =0;
+// int i =0;
INode fromTypeNode = getValue(fromNode,"type",null);
INode toTypeNode = getValue(toNode,"type",null);
@@ -303,6 +303,12 @@
return ;
}
+ String fHeaderName = getValue(fromNode, "header", null);
+ //if there is a header defined in from, it should ODE ws-bpel extension, so ignore
+ //the compatibleCopyCheck
+ if(!isEmpty(fHeaderName)){
+ return ;
+ }
// source -> destination
boolean bCompatible = mModelQuery.check(IModelQueryLookups.TEST_COMPATIBLE_TYPE,
fromTypeNode, toTypeNode);
Modified:
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/FromValidator.java
===================================================================
---
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/FromValidator.java 2009-12-09
09:34:32 UTC (rev 19147)
+++
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/FromValidator.java 2009-12-09
10:23:41 UTC (rev 19148)
@@ -94,6 +94,8 @@
protected String fPartName;
+ protected String fHeaderName;
+
/**
*
*/
@@ -101,13 +103,14 @@
@Override
protected void start () {
super.start();
-
fVariableNode = mModelQuery.lookup(mNode,
IModelQueryLookups.LOOKUP_NODE_VARIABLE,
mNode.getAttribute(AT_VARIABLE));
fPartName = mNode.getAttribute(AT_PART);
+ fHeaderName = mNode.getAttribute(AT_HEADER);
+
fQueryNode = mNode.getNode(ND_QUERY);
fPartnerLinkNode = mModelQuery.lookup(mNode,
@@ -146,6 +149,10 @@
variant += 1;
}
+ if(!isEmpty(fHeaderName)){
+ setValue("header", fHeaderName);
+ }
+
if (fVariableNode != null) {
variant += 1;
Show replies by date