You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by va...@apache.org on 2010/05/27 20:10:26 UTC
svn commit: r948937 [13/33] - in /ode/trunk: ./
agents/src/main/java/org/apache/ode/agents/memory/ axis2-war/
axis2-war/src/main/assembly/ axis2-war/src/main/webapp/
axis2-war/src/main/webapp/WEB-INF/
axis2-war/src/main/webapp/WEB-INF/classes/ axis2-wa...
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/LocalEntityResolver.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/LocalEntityResolver.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/LocalEntityResolver.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/LocalEntityResolver.java Thu May 27 18:09:53 2010
@@ -36,37 +36,37 @@ class LocalEntityResolver implements Ent
private static final Log __log = LogFactory.getLog(LocalEntityResolver.class);
private final HashMap<String, URL> _mappings = new HashMap<String,URL>();
-
- public InputSource resolveEntity(String publicId, String systemId)
+
+ public InputSource resolveEntity(String publicId, String systemId)
throws SAXException, IOException {
if (__log.isTraceEnabled())
__log.trace("resolveEntity(" + publicId + "," + systemId + ")") ;
-
+
URL target = _mappings.get(systemId);
if (target == null)
target = _mappings.get(publicId);
-
+
if (target == null) {
if (__log.isDebugEnabled())
- __log.debug("resolveEntity(" + publicId + "," + systemId +
+ __log.debug("resolveEntity(" + publicId + "," + systemId +
") failed (resource not found) ");
throw new IOException("Resource not found: " + publicId + " : " + systemId);
}
-
+
if (__log.isDebugEnabled())
- __log.debug("resolveEntity(" + publicId + "," + systemId +
+ __log.debug("resolveEntity(" + publicId + "," + systemId +
") ==> target" );
-
+
return new InputSource(target.openStream());
}
-
+
void register(String id, URL location) {
if (id == null)
throw new NullPointerException("id arg must not be null!");
if (location == null)
throw new NullPointerException("location arg must not be null for id " + id);
-
+
if (__log.isDebugEnabled())
__log.debug("mapping " + id + " ==> " + location);
_mappings.put(id, location);
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?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- 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 Thu May 27 18:09:53 2010
@@ -58,9 +58,9 @@ public class OnAlarm extends BpelObject
*/
public Expression getUntil() {
return (Expression) getFirstChild(rewriteTargetNS(Bpel20QNames.UNTIL));
-
+
}
-
+
/**
* Get the repeatEvery (optional)
* @return the duration expression that specifies the frequency
@@ -68,7 +68,7 @@ public class OnAlarm extends BpelObject
public Expression getRepeatEvery() {
return (Expression) getFirstChild(rewriteTargetNS(Bpel20QNames.REPEAT_EVERY));
}
-
-
+
+
}
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/OnEvent.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/OnEvent.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/OnEvent.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/OnEvent.java Thu May 27 18:09:53 2010
@@ -28,7 +28,7 @@ import org.w3c.dom.Element;
*/
public class OnEvent extends OnMessage {
-
+
public OnEvent(Element el) {
super(el);
}
@@ -41,7 +41,7 @@ public class OnEvent extends OnMessage {
public QName getMessageType() {
return getNamespaceContext().derefQName(getAttribute("messageType"));
}
-
+
/**
* @return the element type to be used for the incoming message body or
* <code>null</code> if a WSDL message type is to be used instead.
@@ -50,5 +50,5 @@ public class OnEvent extends OnMessage {
public QName getElementType() {
return getNamespaceContext().derefQName(getAttribute("element",null));
}
-
+
}
\ No newline at end of file
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/OnMessage.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/OnMessage.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/OnMessage.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/OnMessage.java Thu May 27 18:09:53 2010
@@ -47,7 +47,7 @@ import org.w3c.dom.Element;
* <code>!</code> operator in the pi-calculus, so there may be multiple
* instances of an <code>onMessage</code> handler around simultaneously.
* </p>
- *
+ *
* @see org.apache.ode.bpel.compiler.bom.PickActivity
* @see org.apache.ode.bpel.compiler.bom.OnEvent
*/
@@ -61,13 +61,13 @@ public class OnMessage extends BpelObjec
/**
* Get the optional message exchange identifier.
- *
+ *
* @return
*/
public String getMessageExchangeId() {
return getAttribute("messageExchange", null);
}
-
+
public String getRoute() {
return getAttribute("route", "one");
}
@@ -75,7 +75,7 @@ public class OnMessage extends BpelObjec
/**
* Get the activity associated with the event (i.e. the activity that is
* activated).
- *
+ *
* @return activity activated when message event occurs
*/
public Activity getActivity() {
@@ -84,7 +84,7 @@ public class OnMessage extends BpelObjec
/**
* Get the input message variable for the event.
- *
+ *
* @return input message variable
*/
public String getVariable() {
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/PartnerLinkType.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/PartnerLinkType.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/PartnerLinkType.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/PartnerLinkType.java Thu May 27 18:09:53 2010
@@ -32,7 +32,7 @@ import org.w3c.dom.Element;
/**
* WSDL4J representation of a BPEL <code><partnerLink></code>
* declaration.
- *
+ *
* @see org.apache.ode.bom.wsdl.PartnerLinkTypeSerializer
*/
public class PartnerLinkType extends BpelObject4WSDL implements ExtensibilityElement, Serializable {
@@ -69,10 +69,10 @@ public class PartnerLinkType extends Bpe
x.setTargetNamespace(getTargetNamespace());
return null;
}
-
+
});
}
-
+
return _roles;
}
@@ -88,7 +88,7 @@ public class PartnerLinkType extends Bpe
/**
* Get the portName of the role (e.g. "Buyer", "Seller").
- *
+ *
* @return role portName
*/
public String getName() {
@@ -98,7 +98,7 @@ public class PartnerLinkType extends Bpe
/**
* 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() {
@@ -106,7 +106,7 @@ public class PartnerLinkType extends Bpe
}
}
-
+
/**
* BPEL 1.1 nonsense.
* @author Maciej Szefler - m s z e f l e r @ g m a i l . c o m
@@ -122,15 +122,15 @@ public class PartnerLinkType extends Bpe
/**
* 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 {
private static final long serialVersionUID = 8174002706633806360L;
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/PickActivity.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/PickActivity.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/PickActivity.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/PickActivity.java Thu May 27 18:09:53 2010
@@ -26,7 +26,7 @@ import org.w3c.dom.Element;
* Reperesentation of a BPEL <code><pick></code> activity.
*/
public class PickActivity extends CreateInstanceActivity {
-
+
public PickActivity(Element el) {
super(el);
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Process.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Process.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Process.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Process.java Thu May 27 18:09:53 2010
@@ -40,7 +40,7 @@ public class Process extends Scope {
/**
* Get the name of the process.
- *
+ *
* @return name of the process
*/
public String getName() {
@@ -58,7 +58,7 @@ public class Process extends Scope {
/**
* Get the root, process-level activity.
- *
+ *
* @return root process-level activity
*/
public Activity getRootActivity() {
@@ -68,7 +68,7 @@ public class Process extends Scope {
/**
* Get the URL of the BPEL source document as a String.
- *
+ *
* @return BPEL source URL.
*/
public String getSource() {
@@ -77,7 +77,7 @@ public class Process extends Scope {
/**
* Get the process' target namespace.
- *
+ *
* @return process' target namespace
*/
public String getTargetNamespace() {
@@ -86,7 +86,7 @@ public class Process extends Scope {
/**
* Get the default query language.
- *
+ *
* @return the default query language.
*/
public String getQueryLanguage() {
@@ -95,7 +95,7 @@ public class Process extends Scope {
/**
* Get the default expression language.
- *
+ *
* @return default expression language
*/
public String getExpressionLanguage() {
@@ -104,7 +104,7 @@ public class Process extends Scope {
/**
* Get the <code><import></code>(s) of the process.
- *
+ *
* @return {@link Set} of {@link Import}s
*/
public List<Import> getImports() {
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Property.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Property.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Property.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Property.java Thu May 27 18:09:53 2010
@@ -35,8 +35,8 @@ public class Property extends BpelObject
/**
- * Get the name of the property; note that this name is in the target-namespace of the WSDL.
- *
+ * Get the name of the property; note that this name is in the target-namespace of the WSDL.
+ *
* @return the <code>QName</code> of the property.
*/
public QName getName() {
@@ -45,7 +45,7 @@ public class Property extends BpelObject
/**
* Get the name of the schema type for this property
- *
+ *
* @return the <code>QName</code> for the schema type of this property.
*/
public QName getPropertyType() {
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/PropertyAlias.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/PropertyAlias.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/PropertyAlias.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/PropertyAlias.java Thu May 27 18:09:53 2010
@@ -29,7 +29,7 @@ import org.w3c.dom.Element;
/**
* WSDL extension element for a BPEL <code><propertyAlias></code>
* element.
- *
+ *
* @see org.apache.ode.bpel.compiler.wsdl.PropertyAliasSerializer_11
*/
public class PropertyAlias extends BpelObject4WSDL implements ExtensibilityElement, Serializable {
@@ -43,7 +43,7 @@ public class PropertyAlias extends BpelO
/**
* Get the name of the WSDL <code>message</code> type that this alias it
* to apply to.
- *
+ *
* @return the <code>QName</code> for the <code>messageType</code>
*/
public QName getMessageType() {
@@ -53,7 +53,7 @@ public class PropertyAlias extends BpelO
/**
* Get the name of the WSDL <code>part</code> that this alias is to apply
* to (within the specified <code>message</code>).
- *
+ *
* @return the name of the part
* @see #getMessageType()
*/
@@ -63,7 +63,7 @@ public class PropertyAlias extends BpelO
/**
* Get the <code>QName</code> of the property that this alias applies to.
- *
+ *
* @return the property <code>QName</code>
*/
public QName getPropertyName() {
@@ -73,7 +73,7 @@ public class PropertyAlias extends BpelO
/**
* Get the location path query for the <code>OPropertyAlias</code> as
* originally specified in the WSDL.
- *
+ *
* @return the query
*/
public Expression getQuery() {
@@ -83,7 +83,7 @@ public class PropertyAlias extends BpelO
/**
* Get the namespace context for the <code><propertyAlias></code>
* element that created this object.
- *
+ *
* @return the <code>NSContext</code> the encapsulates the namespace
* context
*/
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/PropertyAlias11.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/PropertyAlias11.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/PropertyAlias11.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/PropertyAlias11.java Thu May 27 18:09:53 2010
@@ -22,7 +22,7 @@ import org.w3c.dom.Element;
/**
* A BPEL 1.1 - implementation. Basically, the only difference is that the query is in an attribute.
- *
+ *
* @author Maciej Szefler - m s z e f l e r @ g m a i l . c o m
*
*/
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Query.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Query.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Query.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Query.java Thu May 27 18:09:53 2010
@@ -23,7 +23,7 @@ import org.w3c.dom.Element;
/**
* A Query is nothing more than an expression with the expression-language in the "queryLanguage" attribute
* rather than the "expressionLanguage" attribute.
- *
+ *
* @author Maciej Szefler - m s z e f l e r @ g m a i l . c o m
*
*/
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Query11.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Query11.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Query11.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Query11.java Thu May 27 18:09:53 2010
@@ -23,7 +23,7 @@ import org.w3c.dom.Node;
/**
* A BPEL 1.1 Query, extends the 1.1 version of expression: {@link org.apache.ode.bpel.compiler.bom.Expression11}.
- *
+ *
* @author Maciej Szefler - m s z e f l e r @ g m a i l . c o m
*
*/
@@ -32,5 +32,5 @@ public class Query11 extends Expression1
public Query11(Element el, Node expression) {
super(el, expression);
}
-
+
}
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/RdfLabel.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/RdfLabel.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/RdfLabel.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/RdfLabel.java Thu May 27 18:09:53 2010
@@ -21,7 +21,7 @@ package org.apache.ode.bpel.compiler.bom
import org.w3c.dom.Element;
/**
- * BOM representation of an RDF label.
+ * BOM representation of an RDF label.
* @author mszefler
*/
public class RdfLabel extends BpelObject {
@@ -29,7 +29,7 @@ public class RdfLabel extends BpelObject
public RdfLabel(Element el) {
super(el);
}
-
+
/**
* Retrieve the text of the label.
* @return
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ReceiveActivity.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ReceiveActivity.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ReceiveActivity.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ReceiveActivity.java Thu May 27 18:09:53 2010
@@ -29,7 +29,7 @@ import org.w3c.dom.Element;
*/
public class ReceiveActivity extends CreateInstanceActivity implements Communication {
private final CommunicationHelper _commHelper;
-
+
public ReceiveActivity(Element el) {
super(el);
_commHelper = new CommunicationHelper(el);
@@ -37,7 +37,7 @@ public class ReceiveActivity extends Cre
/**
* Get the optional message exchange identifier.
- *
+ *
* @return
*/
public String getMessageExchangeId() {
@@ -46,13 +46,13 @@ public class ReceiveActivity extends Cre
/**
* Get the name of the variable that will hold the input message.
- *
+ *
* @return name of input message variable
*/
public String getVariable() {
return getAttribute("variable", null);
}
-
+
public String getRoute() {
return getAttribute("route", "one");
}
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/RepeatUntilActivity.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/RepeatUntilActivity.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/RepeatUntilActivity.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/RepeatUntilActivity.java Thu May 27 18:09:53 2010
@@ -25,14 +25,14 @@ import org.w3c.dom.Element;
* @author Maciej Szefler (m s z e f l e r @ g m a i l . c o m)
*/
public class RepeatUntilActivity extends Activity {
-
+
public RepeatUntilActivity(Element el) {
super(el);
}
/**
* Get the child (repeated) activity.
- *
+ *
* @return repeated activity
*/
public Activity getActivity() {
@@ -41,7 +41,7 @@ public class RepeatUntilActivity extends
/**
* Get the repeat-until condition.
- *
+ *
* @return the repeat-until condition
*/
public Expression getCondition() {
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ReplyActivity.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ReplyActivity.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ReplyActivity.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ReplyActivity.java Thu May 27 18:09:53 2010
@@ -37,7 +37,7 @@ public class ReplyActivity extends Activ
/**
* Get the optional message exchange identifier.
- *
+ *
* @return
*/
public String getMessageExchangeId() {
@@ -46,7 +46,7 @@ public class ReplyActivity extends Activ
/**
* Get the fault name with which to reply.
- *
+ *
* @return the fault name
*/
public QName getFaultName() {
@@ -55,7 +55,7 @@ public class ReplyActivity extends Activ
/**
* Get the variable containing the reply message.
- *
+ *
* @return name of variable containing the reply message
*/
public String getVariable() {
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?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- 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 Thu May 27 18:09:53 2010
@@ -42,7 +42,7 @@ public class Scope extends JoinFailureSu
/**
* Get the compensation handler for this scope.
- *
+ *
* @return the compensation handler
*/
public CompensationHandler getCompensationHandler() {
@@ -51,7 +51,7 @@ public class Scope extends JoinFailureSu
/**
* Gets the termination handler for this scope.
- *
+ *
* @return terminationHandler
*/
public TerminationHandler getTerminationHandler() {
@@ -60,7 +60,7 @@ public class Scope extends JoinFailureSu
/**
* Get the fault handler for this scope.
- *
+ *
* @return the fault handler
*/
public FaultHandler getFaultHandler() {
@@ -69,7 +69,7 @@ public class Scope extends JoinFailureSu
/**
* Get correlation sets for this scope.
- *
+ *
* @return correlation sets for this scope.
*/
public List<CorrelationSet> getCorrelationSetDecls() {
@@ -81,7 +81,7 @@ public class Scope extends JoinFailureSu
/**
* Get a correlation set decleration.
- *
+ *
* @param setName
* name of correlation set
* @return {@link CorrelationSet} of the fiven name.
@@ -100,7 +100,7 @@ public class Scope extends JoinFailureSu
/**
* DOCUMENTME
- *
+ *
* @param varName
* DOCUMENTME
* @return DOCUMENTME
@@ -127,7 +127,7 @@ public class Scope extends JoinFailureSu
/**
* Get an array of <code>OnAlarmEventHandler</code>s for this scope.
- *
+ *
* @return the <code>OnAlarmEventHandler</code>s
*/
public List<OnAlarm> getAlarms() {
@@ -165,7 +165,7 @@ public class Scope extends JoinFailureSu
/**
* Get a partnerLink declared in this scope.
- *
+ *
* @param partnerLinkName
* name of partner link
*/
@@ -183,7 +183,7 @@ public class Scope extends JoinFailureSu
/**
* Get all partnerLinks delcared in this scope.
- *
+ *
* @return set of declared {@link PartnerLink}s.
*/
public List<PartnerLink> getPartnerLinks() {
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ScopeActivity.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ScopeActivity.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ScopeActivity.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ScopeActivity.java Thu May 27 18:09:53 2010
@@ -32,7 +32,7 @@ public class ScopeActivity extends Scope
/**
* Get the child activity for this {@link ScopeActivity}
- *
+ *
* @return the child {@link Activity}
*/
public Activity getChildActivity() {
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ScopeLikeActivity.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ScopeLikeActivity.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ScopeLikeActivity.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ScopeLikeActivity.java Thu May 27 18:09:53 2010
@@ -29,9 +29,9 @@ public class ScopeLikeActivity extends A
_scope = new Scope(el);
}
-
+
public Scope getScope() {
return _scope;
}
-
+
}
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/SwitchActivity.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/SwitchActivity.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/SwitchActivity.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/SwitchActivity.java Thu May 27 18:09:53 2010
@@ -35,7 +35,7 @@ public class SwitchActivity extends Acti
/**
* Get the cases for this switch.
- *
+ *
* @return the cases
*/
public List<Case> getCases() {
@@ -43,8 +43,8 @@ public class SwitchActivity extends Acti
}
/**
- * BPEL object model representation of <code><case></code> and
- * <code><otherwise></code> elements. Note that the
+ * BPEL object model representation of <code><case></code> and
+ * <code><otherwise></code> elements. Note that the
* <code><otherwise></code> elements simply return null for
* the {@link #getCondition()}.
*/
@@ -56,7 +56,7 @@ public class SwitchActivity extends Acti
/**
* Get the activity for this case.
- *
+ *
* @return activity enabled when case is satisfied
*/
public Activity getActivity() {
@@ -65,15 +65,15 @@ public class SwitchActivity extends Acti
/**
* Get the condition associated with this case.
- *
+ *
* @return the condition
*/
public Expression getCondition() {
- return isAttributeSet("condition")
- ? new Expression11(getElement(),getElement().getAttributeNode("condition"))
+ return isAttributeSet("condition")
+ ? new Expression11(getElement(),getElement().getAttributeNode("condition"))
: null;
}
}
-
+
}
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ToFrom.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ToFrom.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ToFrom.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ToFrom.java Thu May 27 18:09:53 2010
@@ -25,7 +25,7 @@ public class ToFrom extends BpelObject {
public ToFrom(Element el) {
super(el);
}
-
+
public VariableVal getAsVariableVal() {
if (getAttribute("variable", null) != null) {
if (is11()) return new VariableVal11(getElement());
@@ -33,12 +33,12 @@ public class ToFrom extends BpelObject {
}
return null;
}
-
+
/**
- * Cast this tofrom to an "extension" to/from. This is NOT part of the BPEL spec, and
+ * Cast this tofrom to an "extension" to/from. This is NOT part of the BPEL spec, and
* is used to provide access to custom extensions (for example reading/writing SOAP
- * message headers)... Yes. it's evil.
- *
+ * message headers)... Yes. it's evil.
+ *
* @author mszefler
* @return the object cast to {@link ExtensionVal} if appropriate, null otherwise.
*/
@@ -47,10 +47,10 @@ public class ToFrom extends BpelObject {
return new ExtensionVal(getElement());
return null;
}
-
+
/**
- * Test whether this to/from is an "extension" to-from (i.e. does it have the "extension"
- * attribute).
+ * Test whether this to/from is an "extension" to-from (i.e. does it have the "extension"
+ * attribute).
* @return
*/
public boolean isExtensionVal() {
@@ -60,13 +60,13 @@ public class ToFrom extends BpelObject {
public boolean isVariableVal() {
return getAsVariableVal() != null;
}
-
+
public PartnerLinkVal getAsPartnerLinkVal() {
if (getAttribute("partnerLink",null) != null)
return new PartnerLinkVal(getElement());
return null;
}
-
+
public boolean isPartnerLinkVal() {
return getAsPartnerLinkVal() != null;
}
@@ -80,12 +80,12 @@ public class ToFrom extends BpelObject {
return new PropertyVal(getElement());
return null;
}
-
+
public Expression getAsExpression() {
// BPEL 1.1 will have an expression only for the /from/ nodes.
- if (is11())
+ if (is11())
return null;
-
+
return new Expression(getElement());
}
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Variable.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Variable.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Variable.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Variable.java Thu May 27 18:09:53 2010
@@ -37,7 +37,7 @@ public class Variable extends BpelObject
/**
* Get the name of the variable.
- *
+ *
* @return variable name
*/
public String getName() {
@@ -46,7 +46,7 @@ public class Variable extends BpelObject
/**
* Get the type name of this variable.
- *
+ *
* @return an XML element, XML schema type, or WSDL message type name.
*/
public QName getTypeName() {
@@ -72,7 +72,7 @@ public class Variable extends BpelObject
/**
* Get the type of declaration; one of: {@link #TYPE_SCHEMA},
* {@link #TYPE_ELEMENT}, or {@link #TYPE_MESSAGE}.
- *
+ *
* @return type of variable decleration
*/
public Kind getKind() {
@@ -90,7 +90,7 @@ public class Variable extends BpelObject
//
// Stuff related to external variables.
//
-
+
/**
* Get the external variable identifier (each one will be defined in the deployment descriptor)
*/
@@ -105,7 +105,7 @@ public class Variable extends BpelObject
public boolean isExternal() {
return null != getExternalId();
}
-
+
/**
* External variable support - get the "related" variable name.
* @return
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/VariableVal.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/VariableVal.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/VariableVal.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/VariableVal.java Thu May 27 18:09:53 2010
@@ -30,7 +30,7 @@ public class VariableVal extends ToFrom
/**
* Get the name of the variable.
- *
+ *
* @return variable name
*/
public String getVariable() {
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?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- 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 Thu May 27 18:09:53 2010
@@ -24,7 +24,7 @@ import org.w3c.dom.Element;
* Representation of the BPEL <code><wait></code> activity.
*/
public class WaitActivity extends Activity {
-
+
public WaitActivity(Element el) {
super(el);
}
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/WhileActivity.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/WhileActivity.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/WhileActivity.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/WhileActivity.java Thu May 27 18:09:53 2010
@@ -30,7 +30,7 @@ public class WhileActivity extends Activ
/**
* Get the child (repeated) activity.
- *
+ *
* @return repeated activity
*/
public Activity getActivity() {
@@ -39,7 +39,7 @@ public class WhileActivity extends Activ
/**
* Get the while condition.
- *
+ *
* @return the while condition
*/
public Expression getCondition() {
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/WhileActivity11.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/WhileActivity11.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/WhileActivity11.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/WhileActivity11.java Thu May 27 18:09:53 2010
@@ -34,9 +34,9 @@ public class WhileActivity11 extends Whi
@Override
public Expression getCondition() {
// BPEL 1.1 has the condition in an attribute, not an element.
- return isAttributeSet("condition") ?
+ return isAttributeSet("condition") ?
new Expression11(getElement(), getElement().getAttributeNode("condition")) : null;
}
-
+
}
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/package.html
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/package.html?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/package.html (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/package.html Thu May 27 18:09:53 2010
@@ -20,7 +20,7 @@
<html>
<body>
<p>
-The API for the BPEL Object Model (BOM), a domain-specific document
+The API for the BPEL Object Model (BOM), a domain-specific document
object model (DOM) that can represent BPEL v1.1 and BPEL v2.0 (OASIS) processes.
While the BOM enforced strcutural constraints
--for example that a process contain one root activity--
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/package.html
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/package.html?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/package.html (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/package.html Thu May 27 18:09:53 2010
@@ -23,13 +23,13 @@
Taking as input the de-referenced BPEL object model
(see {@link org.apache.ode.bom.impl.nodes}), the BPEL compiler applies
static analysis rules to ensure compliance of the BPEL model.
- Upon successful analysis, the compiler generates a
+ Upon successful analysis, the compiler generates a
"compiled" process description suitable for
consumption by the BPEL Service Provider?s
(see {@link com.fs.jlo.bpel.provider.BpelServiceProvider})
processing engine (also known as the virtual processing unit
or <b>VPU</b>).</p>
-
+
<p>Failures in the static analysis phase are
reported in the same manner as parser errors and contain
detailed error descriptions and line number references to
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/BpelExtensionSerializer.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/BpelExtensionSerializer.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/BpelExtensionSerializer.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/BpelExtensionSerializer.java Thu May 27 18:09:53 2010
@@ -79,9 +79,9 @@ public class BpelExtensionSerializer imp
} catch (URISyntaxException e) {
throw new RuntimeException(e);
}
-
+
obj.setElementType(eltype);
- obj.setRequired(false); // ? what does this do
+ obj.setRequired(false); // ? what does this do
obj.setTargetNamespace(def.getTargetNamespace());
return obj;
}
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/InvalidBpelPropertyAliasException.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/InvalidBpelPropertyAliasException.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/InvalidBpelPropertyAliasException.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/InvalidBpelPropertyAliasException.java Thu May 27 18:09:53 2010
@@ -26,7 +26,7 @@ import javax.wsdl.WSDLException;
* is invalid (from a schema perspective).
*/
public class InvalidBpelPropertyAliasException extends WSDLException {
-
+
private static final long serialVersionUID = 1L;
/**
* Construct a new instance with the specified explanatory message.
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/Messages.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/Messages.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/Messages.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/Messages.java Thu May 27 18:09:53 2010
@@ -54,13 +54,13 @@ public class Messages extends MessageBun
/**
* Format an error message about the <code><X></code> element
* requiring the <code>Y</code> attribute.
- *
+ *
* @param element
* the <code>QName</code> of the element
* @param attribute
* the name of the attribute
* @return the formatted error message
- *
+ *
* The {1} attribute is required by the {0} element.
*/
public String msgElementRequiresAttr(String element, String attribute) {
@@ -71,11 +71,11 @@ public class Messages extends MessageBun
/**
* Format an error message about the <code><X></code> element having
* content when it should be empty.
- *
+ *
* @param element
* the <code>QName</code> of the element
* @return the formatted error message
- *
+ *
* The schema for {0} prohibits child elements or non-whitespace characters as
* content.
*/
@@ -87,13 +87,13 @@ public class Messages extends MessageBun
/**
* Format an error message about a named <code><role></code> already
* being declared within a <code><partnerLink></code>.
- *
+ *
* @param linkName
* the <code>QName</code> of the <code><partnerLink></code>
* @param roleName
* the name of the <code><role></code>
* @return the formatted message
- *
+ *
* The role {1} is already defined for the partnerLink {2}.
*/
public String msgRoleAlreadyDefined(QName linkName, String roleName) {
@@ -104,7 +104,7 @@ public class Messages extends MessageBun
/**
* Format an error message that at most <code>n</code> things of type
* <code>x</code> may be defined with each <code>y</code>.
- *
+ *
* @param n
* the maximum number of things.
* @param x
@@ -112,7 +112,7 @@ public class Messages extends MessageBun
* @param y
* the thing that contains the things.
* @return the formatted message
- *
+ *
* No more than {0} {1} item(s) may be defined within one {2}.
*/
public String msgNoMoreThanNumberOfElements(int n, String x, String y) {
@@ -122,13 +122,13 @@ public class Messages extends MessageBun
/**
* Format an error message about a child element being required.
- *
+ *
* @param element
* the <code>QName</code> of the parent element
* @param child
* the <code>QName</code> of the child element
* @return the formatted message.
- *
+ *
* The element {0} requires a child element with name {1}.
*/
public String msgElementRequiresChild(String element, String child) {
@@ -139,13 +139,13 @@ public class Messages extends MessageBun
/**
* Format an error message about a <code><role></code> referring to a
* <code>portType</code> that can't be dereferenced.
- *
+ *
* @param roleName
* the name of the <code><role></code>
* @param portType
* the <code>QName</code> of the <code>portType</code>
* @return the formatted message
- *
+ *
* The referenced portType {1} for role {0} is not defined in this definition
* or an import.
*/
@@ -157,11 +157,11 @@ public class Messages extends MessageBun
/**
* Format a message about a <code><propertyAlias></code> referring to
* a non-existent WSDL message type.
- *
+ *
* @param messageType
* the non-existent WSDL message type name
* @return the formatted message
- *
+ *
* A propertyAlias refers to the non-existent WSDL message type {0}.
*/
public String msgNoSuchMessageTypeForPropertyAlias(String messageType) {
@@ -172,11 +172,11 @@ public class Messages extends MessageBun
/**
* Format an error message about an element not being permissable as the root
* element in a WSDL document.
- *
+ *
* @param qname
* the stringified <code>QName</code> of the element
* @return the formatted message
- *
+ *
* The element {0} is not permitted as the root element in a WSDL definition.
*/
public String msgCannotBeDocumentRootElement(String qname) {
@@ -187,11 +187,11 @@ public class Messages extends MessageBun
/**
* Format an error message about a WSDL extensibility element requiring to be
* a first level child of the definition element.
- *
+ *
* @param qname
* the stringified <code>QName</code> of the element
* @return the formatted message.
- *
+ *
* The element {0} must be a child of the WSDL definitions element.
*/
public String msgMustBeChildOfDef(String qname) {
@@ -202,11 +202,11 @@ public class Messages extends MessageBun
/**
* Format an error message about an extensibility element occurring out of
* order with respect to other WSDL elements.
- *
+ *
* @param qname
* the stringified <code>QName</code> of the element
* @return the formatted message
- *
+ *
* The WSDL extensibility element {0} must occur after all core WSDL
* declarations in the same WSDL document.
*/
@@ -218,13 +218,13 @@ public class Messages extends MessageBun
/**
* Format a message about a <code><propertyAlias></code> referring to
* a non-existent part of a a WSDL message type.
- *
+ *
* @param message
* the stringified <code>QName</code> of the message
* @param part
* the name of the part
* @return the formatted message
- *
+ *
* A propertyAlias refers to the non-existent part {1} on the WSDL message
* type {0}.
*/
@@ -236,7 +236,7 @@ public class Messages extends MessageBun
/**
* Format an error message about a <code>thing</code> being
* (inappropriately) redefined.
- *
+ *
* @param thing
* the thing, e.g., a message, a port type, etc.
* @param name
@@ -246,7 +246,7 @@ public class Messages extends MessageBun
* @param redef
* where it was redefined
* @return the formatted message
- *
+ *
* The {0} {1} defined in {3} was already defined in {2}.
*/
public String msgAlreadyDefinedIn(String thing, String name, String origin, String redef) {
@@ -257,13 +257,13 @@ public class Messages extends MessageBun
/**
* Format an error message about a reference to a
* <code><property></code> that does not exist.
- *
+ *
* @param name
* the stringified <code>QName</code> of the property
* @param documentBaseURI
* the URI of the WSDL that contains the reference.
* @return the formatted message
- *
+ *
* A property alias in {1} refers to the property {0}, which is not defined.
*/
public String msgNoSuchProperty(String name, String documentBaseURI) {
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/WSDLFactoryBPEL11.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/WSDLFactoryBPEL11.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/WSDLFactoryBPEL11.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/WSDLFactoryBPEL11.java Thu May 27 18:09:53 2010
@@ -38,7 +38,7 @@ public class WSDLFactoryBPEL11 extends W
private BpelExtensionSerializer _bs;
public WSDLFactoryBPEL11() {
- super(Bpel11QNames.NS_BPEL4WS_2003_03,
+ super(Bpel11QNames.NS_BPEL4WS_2003_03,
Bpel11QNames.NS_BPEL4WS_PARTNERLINK_2003_05,
Bpel11QNames.NS_BPEL4WS_2003_03);
_bomf = BpelObjectFactory.getInstance();
@@ -57,7 +57,7 @@ public class WSDLFactoryBPEL11 extends W
extRegistry.registerDeserializer(Types.class, XMLSchemaType.QNAME, new XMLSchemaTypeSerializer());
extRegistry.registerDeserializer(Definition.class, new QName(Bpel11QNames.NS_BPEL4WS_PARTNERLINK_2003_05,
"partnerLinkType"), _bs);
-
+
return extRegistry;
}
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/WSDLFactoryImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/WSDLFactoryImpl.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/WSDLFactoryImpl.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/WSDLFactoryImpl.java Thu May 27 18:09:53 2010
@@ -49,7 +49,7 @@ abstract class WSDLFactoryImpl extends W
} catch (WSDLException e) {
throw new AssertionError("Unable to load WSDL4J!");
}
-
+
_bpwsNS = bpwsNS;
_plnkNS = plnkNS;
_propNS = propNS;
@@ -90,9 +90,9 @@ abstract class WSDLFactoryImpl extends W
public ExtensionRegistry newPopulatedExtensionRegistry() {
ExtensionRegistry extRegistry = _wsdlFactory.newPopulatedExtensionRegistry();
- extRegistry.registerExtensionAttributeType(Operation.class,
+ extRegistry.registerExtensionAttributeType(Operation.class,
new QName("http://www.w3.org/ns/wsdl-extensions","safe"), AttributeExtensible.STRING_TYPE);
-
+
return extRegistry;
}
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/WSDLReaderImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/WSDLReaderImpl.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/WSDLReaderImpl.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/WSDLReaderImpl.java Thu May 27 18:09:53 2010
@@ -25,22 +25,22 @@ import javax.wsdl.factory.WSDLFactory;
* Little hack to solve the disfunctional WSDL4J extension mechanism. Without this,
* WSDL4J will attempt to do Class.forName to get the WSDLFactory, which will break
* if WSDL4J is loaded from a parent class-loader (as it often is, e.g. in ServiceMix).
- *
+ *
* @author Maciej Szefler - m s z e f l e r @ g m a i l . c o m
*
*/
class WSDLReaderImpl extends com.ibm.wsdl.xml.WSDLReaderImpl {
private WSDLFactory _localFactory;
-
+
WSDLReaderImpl(WSDLFactory factory) {
_localFactory = factory;
}
-
+
@Override
protected WSDLFactory getWSDLFactory() throws WSDLException {
return _localFactory;
}
-
+
}
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/XMLSchemaType.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/XMLSchemaType.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/XMLSchemaType.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/XMLSchemaType.java Thu May 27 18:09:53 2010
@@ -27,11 +27,11 @@ import javax.xml.namespace.QName;
* Extensibility element that contains the xml-schema text as a string.
*/
public class XMLSchemaType implements ExtensibilityElement, Serializable {
-
+
private static final long serialVersionUID = -5826656164421594730L;
private static final String NS_XSD_2001 = "http://www.w3.org/2001/XMLSchema";
-
+
/** WSDL QNAME identifier */
public static final QName QNAME = new QName(NS_XSD_2001, "schema");
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/XMLSchemaTypeSerializer.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/XMLSchemaTypeSerializer.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/XMLSchemaTypeSerializer.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/XMLSchemaTypeSerializer.java Thu May 27 18:09:53 2010
@@ -42,7 +42,7 @@ import org.w3c.dom.Element;
public class XMLSchemaTypeSerializer implements ExtensionSerializer,
ExtensionDeserializer,
Serializable {
-
+
private static final long serialVersionUID = -870479908175017298L;
public XMLSchemaTypeSerializer() {
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/JaxenBpelHandler.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/JaxenBpelHandler.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/JaxenBpelHandler.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/JaxenBpelHandler.java Thu May 27 18:09:53 2010
@@ -92,7 +92,7 @@ class JaxenBpelHandler extends JaxenHand
}
}
}
-
+
public void endXPath() throws JaxenException {
super.endXPath();
}
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/SourceLocatorWrapper.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/SourceLocatorWrapper.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/SourceLocatorWrapper.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/SourceLocatorWrapper.java Thu May 27 18:09:53 2010
@@ -31,7 +31,7 @@ public class SourceLocatorWrapper implem
public SourceLocatorWrapper(SourceLocator sloc) {
_sloc = sloc;
}
-
+
public int getColumnNo() {
return _sloc.getColumnNumber();
}
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerBPEL11.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerBPEL11.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerBPEL11.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerBPEL11.java Thu May 27 18:09:53 2010
@@ -32,14 +32,14 @@ public class XPath10ExpressionCompilerBP
public XPath10ExpressionCompilerBPEL11() {
super(Namespaces.BPEL11_NS);
}
-
+
/**
* @see org.apache.ode.bpel.compiler.api.ExpressionCompiler#compileJoinCondition(java.lang.Object)
*/
public OExpression compileJoinCondition(Object source) throws CompilationException {
return compile(source);
}
-
+
public OLValueExpression compileLValue(Object source) throws CompilationException {
throw new UnsupportedOperationException("Not supported for bpel 1.1");
}
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerImpl.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerImpl.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerImpl.java Thu May 27 18:09:53 2010
@@ -59,7 +59,7 @@ public abstract class XPath10ExpressionC
/**
* Construtor.
- *
+ *
* @param bpelNsURI
* the BPEL extension function namespace; varies depending on
* BPEL version.
@@ -69,7 +69,7 @@ public abstract class XPath10ExpressionC
_qnFnGetVariableData = new QName(_bpelNsURI, "getVariableData");
_qnFnGetVariableProperty = new QName(_bpelNsURI, "getVariableProperty");
_qnFnGetLinkStatus = new QName(_bpelNsURI, "getLinkStatus");
- _properties.put("runtime-class", "org.apache.ode.bpel.elang.xpath10.runtime.XPath10ExpressionRuntime");
+ _properties.put("runtime-class", "org.apache.ode.bpel.elang.xpath10.runtime.XPath10ExpressionRuntime");
}
/**
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPathMessages.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPathMessages.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPathMessages.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPathMessages.java Thu May 27 18:09:53 2010
@@ -92,7 +92,7 @@ public class XPathMessages extends Compi
return super.formatCompilationMessage(
"The string \"{0}\" is not a valid XQuery 1.0 expression: {1}", xQueryString, message);
}
-
+
/** The XPath node with value "{0}" was not a text node. */
public CompilationMessage errUnexpectedNodeTypeForXPath(String string) {
return super.formatCompilationMessage(
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/Constants.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/Constants.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/Constants.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/Constants.java Thu May 27 18:09:53 2010
@@ -66,13 +66,13 @@ public class Constants {
public static final String NON_STDRD_FUNCTION_DELETE = "delete";
public static final String NON_STDRD_FUNCTION_RENAME = "rename";
public static final String NON_STDRD_FUNCTION_PROCESS_PROPERTY = "process-property";
-
+
/**
* Non standard extension functions in the deprecated "xdt" namespace
*/
public static final String NON_STDRD_FUNCTION_DAY_TIME_DURATION = "dayTimeDuration";
public static final String NON_STDRD_FUNCTION_YEAR_MONTH_DURATION = "yearMonthDuration";
-
+
public static final String XQUERY_FUNCTION_HANDLER_COMPILER = "org.apache.ode.bpel.elang.xquery10.compiler.XQuery10BpelFunctions";
public static final String XQUERY_FUNCTION_HANDLER_RUNTIME = "org.apache.ode.bpel.elang.xquery10.runtime.XQuery10BpelFunctions";
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpFunctionResolver.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpFunctionResolver.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpFunctionResolver.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpFunctionResolver.java Thu May 27 18:09:53 2010
@@ -184,7 +184,7 @@ public class JaxpFunctionResolver implem
}
return "";
}
- }
+ }
public static class DomToString implements XPathFunction {
public Object evaluate(List args) throws XPathFunctionException {
@@ -204,7 +204,7 @@ public class JaxpFunctionResolver implem
return "";
}
}
-
+
public static class InsertInto implements XPathFunction {
public Object evaluate(List args) throws XPathFunctionException {
if (args.size() != 3) {
@@ -213,7 +213,7 @@ public class JaxpFunctionResolver implem
return "";
}
}
-
+
public static class InsertAfter implements XPathFunction {
public Object evaluate(List args) throws XPathFunctionException {
if (args.size() < 2 || args.size() > 3) {
@@ -222,7 +222,7 @@ public class JaxpFunctionResolver implem
return "";
}
}
-
+
public static class InsertBefore implements XPathFunction {
public Object evaluate(List args) throws XPathFunctionException {
if (args.size() < 2 || args.size() > 3) {
@@ -258,7 +258,7 @@ public class JaxpFunctionResolver implem
return "";
}
}
-
+
public static class Rename implements XPathFunction {
public Object evaluate(List args) throws XPathFunctionException {
if (args.size() < 2) {
@@ -267,7 +267,7 @@ public class JaxpFunctionResolver implem
return "";
}
}
-
+
public static class ProcessProperty implements XPathFunction {
public Object evaluate(List args) throws XPathFunctionException {
if (args.size() != 1) {
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpVariableResolver.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpVariableResolver.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpVariableResolver.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpVariableResolver.java Thu May 27 18:09:53 2010
@@ -64,7 +64,7 @@ public class JaxpVariableResolver implem
|| Namespaces.ODE_EXTENSION_NS.equals(variableName.getNamespaceURI())) {
if ("pid".equals(variableName.getLocalPart()) || "processQName".equals(variableName.getLocalPart()))
return "";
- if ("currentEventDateTime".equals(variableName.getLocalPart()))
+ if ("currentEventDateTime".equals(variableName.getLocalPart()))
return new Date(1L);
}
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/OdeXPathFunctionLibrary.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/OdeXPathFunctionLibrary.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/OdeXPathFunctionLibrary.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/OdeXPathFunctionLibrary.java Thu May 27 18:09:53 2010
@@ -36,7 +36,7 @@ import java.util.ArrayList;
*/
public class OdeXPathFunctionLibrary extends net.sf.saxon.xpath.XPathFunctionLibrary {
private static final long serialVersionUID = -8885396864277163797L;
-
+
private transient JaxpFunctionResolver _funcResolver;
public OdeXPathFunctionLibrary(JaxpFunctionResolver funcResolver) {
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/SaxonContext.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/SaxonContext.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/SaxonContext.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/SaxonContext.java Thu May 27 18:09:53 2010
@@ -35,7 +35,7 @@ import net.sf.saxon.xpath.XPathFunctionL
*/
public class SaxonContext extends JAXPXPathStaticContext {
-
+
private static final long serialVersionUID = 2460900369574468960L;
private transient JaxpVariableResolver _varResolver;
private transient JaxpFunctionResolver _funcResolver;
@@ -58,14 +58,14 @@ public class SaxonContext extends JAXPXP
oxpfl.setXPathFunctionResolver(_funcResolver);
((FunctionLibraryList)getFunctionLibrary()).addFunctionLibrary(oxpfl);
-
+
setXPathFunctionResolver(funcResolver);
setXPathVariableResolver(varResolver);
_varResolver = varResolver;
_funcResolver = funcResolver;
}
-
+
// The following methods don't apply to the JAXPXPathStaticContext interface.
// public Variable declareVariable(String qname, Object initialValue) throws XPathException {
@@ -104,7 +104,7 @@ public class SaxonContext extends JAXPXP
//// return super.bindVariable(fingerprint);
// return null;
// }
-
+
// public VariableReference bindVariable(StructuredQName qName) {
// // The prefix is lost by compilation, hardcoding it from the ns.
// String prefix = qName.getPrefix();
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/WrappedResolverException.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/WrappedResolverException.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/WrappedResolverException.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/WrappedResolverException.java Thu May 27 18:09:53 2010
@@ -26,7 +26,7 @@ import org.apache.ode.bpel.compiler.api.
*/
public class WrappedResolverException extends RuntimeException {
private static final long serialVersionUID = -2677245631724501573L;
-
+
public CompilationMessage _compilationMsg;
public WrappedResolverException(String message) {
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerBPEL20.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerBPEL20.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerBPEL20.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerBPEL20.java Thu May 27 18:09:53 2010
@@ -22,7 +22,7 @@ import org.apache.ode.utils.Namespaces;
/**
- * XPath 2.0 compiler for the BPEL 2.0 final spec.
+ * XPath 2.0 compiler for the BPEL 2.0 final spec.
* @author mriou <mriou at apache dot org>
*/
public class XPath20ExpressionCompilerBPEL20 extends XPath20ExpressionCompilerImpl {
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java Thu May 27 18:09:53 2010
@@ -141,8 +141,8 @@ public class XPath20ExpressionCompilerIm
}
out.xpath = xpathStr;
- try {
- __log.debug("Compiling expression " + xpathStr);
+ try {
+ __log.debug("Compiling expression " + xpathStr);
XPathFactory xpf = new XPathFactoryImpl();
JaxpFunctionResolver funcResolver = new JaxpFunctionResolver(
_compilerContext, out, source.getNamespaceContext(), _bpelNS);
@@ -150,20 +150,20 @@ public class XPath20ExpressionCompilerIm
XPath xpe = xpf.newXPath();
xpe.setXPathFunctionResolver(funcResolver);
xpe.setXPathVariableResolver(varResolver);
- xpe.setNamespaceContext(source.getNamespaceContext());
+ xpe.setNamespaceContext(source.getNamespaceContext());
XPathExpression expr = xpe.compile(xpathStr);
// evaluate the expression so as to initialize the variables
- try {
- expr.evaluate(node);
- } catch (XPathExpressionException xpee) {
- // swallow errors caused by uninitialized variable
+ try {
+ expr.evaluate(node);
+ } catch (XPathExpressionException xpee) {
+ // swallow errors caused by uninitialized variable
}
for (String varExpr : extractVariableExprs(xpathStr)) {
expr = xpe.compile(varExpr);
try {
expr.evaluate(node);
} catch (XPathExpressionException xpee) {
- // swallow errors caused by uninitialized variable
+ // swallow errors caused by uninitialized variable
}
}
for (String functionExpr : extractFunctionExprs(xpathStr)) {
@@ -171,7 +171,7 @@ public class XPath20ExpressionCompilerIm
try {
expr.evaluate(node);
} catch (XPathExpressionException xpee) {
- // swallow errors caused by uninitialized variable
+ // swallow errors caused by uninitialized variable
}
}
} catch (XPathExpressionException e) {
@@ -188,21 +188,21 @@ public class XPath20ExpressionCompilerIm
/**
* Returns the list of variable references in the given XPath expression
- * that may not have been resolved properly, which is the case especially
+ * that may not have been resolved properly, which is the case especially
* if the expression contains a function, which short circuited the evaluation.
- *
+ *
* @param xpathStr
* @return list of variable expressions that may not have been resolved properly
*/
- private List<String> extractVariableExprs(String xpathStr) {
+ private List<String> extractVariableExprs(String xpathStr) {
ArrayList<String> variableExprs = new ArrayList<String>();
- int firstVariable = xpathStr.indexOf("$"),
+ int firstVariable = xpathStr.indexOf("$"),
lastVariable = xpathStr.lastIndexOf("$"),
- firstFunction = xpathStr.indexOf("(");
+ firstFunction = xpathStr.indexOf("(");
StringBuffer variableExpr = new StringBuffer();
if ((firstVariable > 0 && // the xpath references a variable
firstFunction > 0) || // the xpath contains a function
- (firstVariable < lastVariable)) { // the xpath references multiple variables
+ (firstVariable < lastVariable)) { // the xpath references multiple variables
// most likely, the variable reference has not been resolved, so make that happen
boolean quoted = false, doubleQuoted = false, variable = false;
Name11Checker nameChecker = Name11Checker.getInstance();
@@ -228,7 +228,7 @@ public class XPath20ExpressionCompilerIm
if (ch == ':') {
continue;
}
- if (index == xpathStr.length() ||
+ if (index == xpathStr.length() ||
!nameChecker.isQName(variableExpr.substring(1))) {
variable = false;
variableExpr.setLength(variableExpr.length() - 1);
@@ -247,22 +247,22 @@ public class XPath20ExpressionCompilerIm
/**
* Returns the list of function references in the given XPath expression
- * that may not have been resolved properly, which is the case especially
+ * that may not have been resolved properly, which is the case especially
* if the expression contains a preceding function, which short circuited the evaluation.
- *
+ *
* @param xpathStr
* @return list of function expressions that may not have been resolved properly
*/
- private List<String> extractFunctionExprs(String xpathStr) {
- ArrayList<String> functionExprs = new ArrayList<String>();
+ private List<String> extractFunctionExprs(String xpathStr) {
+ ArrayList<String> functionExprs = new ArrayList<String>();
// Match the prefix : function name ( all contents except the ) and the closing )'s that may occur
final String FUNCTION_REGEX = "\\w+:\\w+\\([.[^\\)]]*\\)*";
- int firstFunction = xpathStr.indexOf("("),
- lastFunction = xpathStr.lastIndexOf("(");
+ int firstFunction = xpathStr.indexOf("("),
+ lastFunction = xpathStr.lastIndexOf("(");
if ((firstFunction > 0 && firstFunction < lastFunction)) {
Pattern regex = Pattern.compile(FUNCTION_REGEX);
Matcher matcher = regex.matcher(xpathStr);
-
+
while (matcher.find()) {
String function = matcher.group();
functionExprs.add(function);
@@ -270,7 +270,7 @@ public class XPath20ExpressionCompilerIm
}
return functionExprs;
}
-
+
public Map<String, String> getProperties() {
return _properties;
}
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xquery10/compiler/XQuery10BpelFunctions.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xquery10/compiler/XQuery10BpelFunctions.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xquery10/compiler/XQuery10BpelFunctions.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xquery10/compiler/XQuery10BpelFunctions.java Thu May 27 18:09:53 2010
@@ -37,7 +37,7 @@ import org.w3c.dom.Node;
/**
- * XQuery-Friendly definition of BPEL functions, which
+ * XQuery-Friendly definition of BPEL functions, which
* delegates calls to the JAXP-based function resolver
*/
public class XQuery10BpelFunctions {
@@ -52,7 +52,7 @@ public class XQuery10BpelFunctions {
Constants.EXT_FUNCTION_DOXSLTRANSFORM);
/**
- * WS-BPEL getVariableProperty function
+ * WS-BPEL getVariableProperty function
*
* @param context context
* @param variableName variableName
@@ -73,7 +73,7 @@ public class XQuery10BpelFunctions {
}
/**
- * WS-BPEL getVariableData function
+ * WS-BPEL getVariableData function
*
* @param context context
* @param variableName variableName
@@ -97,7 +97,7 @@ public class XQuery10BpelFunctions {
}
/**
- * WS-BPEL doXslTransform function
+ * WS-BPEL doXslTransform function
*
* @param context context
* @param xslUri xslUri
@@ -118,7 +118,7 @@ public class XQuery10BpelFunctions {
}
/**
- * WS-BPEL getLinkStatus function
+ * WS-BPEL getLinkStatus function
*
* @param context context
* @param linkName linkName
@@ -164,7 +164,7 @@ public class XQuery10BpelFunctions {
}
/**
- * Evaluates function against arguments passed by XQuery
+ * Evaluates function against arguments passed by XQuery
*
* @param function function
* @param arguments arguments
Modified: ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xquery10/compiler/XQuery10ExpressionCompilerImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xquery10/compiler/XQuery10ExpressionCompilerImpl.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xquery10/compiler/XQuery10ExpressionCompilerImpl.java (original)
+++ ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xquery10/compiler/XQuery10ExpressionCompilerImpl.java Thu May 27 18:09:53 2010
@@ -150,8 +150,8 @@ public class XQuery10ExpressionCompilerI
if (node == null) {
throw new CompilationException(__msgs.errEmptyExpression(source.getURI(), new QName(source.getElement().getNamespaceURI(), source.getElement().getNodeName())));
}
- if (node.getNodeType() != Node.TEXT_NODE &&
- node.getNodeType() != Node.ELEMENT_NODE &&
+ if (node.getNodeType() != Node.TEXT_NODE &&
+ node.getNodeType() != Node.ELEMENT_NODE &&
node.getNodeType() != Node.CDATA_SECTION_NODE) {
throw new CompilationException(__msgs.errUnexpectedNodeTypeForXPath(DOMUtils.domToString(node)));
}
@@ -164,7 +164,7 @@ public class XQuery10ExpressionCompilerI
try {
XQDataSource xqds = new SaxonXQDataSource(new Configuration());
XQConnection xqconn = xqds.getConnection();
-
+
__log.debug("Compiling expression " + xqueryStr);
Configuration configuration = ((SaxonXQConnection) xqconn).getConfiguration();
configuration.setAllNodesUntyped(true);
@@ -174,9 +174,9 @@ public class XQuery10ExpressionCompilerI
JaxpFunctionResolver funcResolver = new JaxpFunctionResolver(
_compilerContext, out, source.getNamespaceContext(), _bpelNS);
JaxpVariableResolver variableResolver = new JaxpVariableResolver(
- _compilerContext, out);
+ _compilerContext, out);
- XQueryDeclarations declarations = new XQueryDeclarations();
+ XQueryDeclarations declarations = new XQueryDeclarations();
NSContext nsContext = source.getNamespaceContext();
Set<String> prefixes = nsContext.getPrefixes();
if (!nsContext.getUriSet().contains(Namespaces.ODE_EXTENSION_NS)) {
@@ -194,12 +194,12 @@ public class XQuery10ExpressionCompilerI
}
}
declarations.declareVariable(
- getQName(nsContext, Namespaces.ODE_EXTENSION_NS, "pid"),
+ getQName(nsContext, Namespaces.ODE_EXTENSION_NS, "pid"),
getQName(nsContext, Namespaces.XML_SCHEMA, "integer"));
// Map<URI, Source> schemaDocuments = _compilerContext.getSchemaSources();
// for (URI schemaUri : schemaDocuments.keySet()) {
// Source schemaSource = schemaDocuments.get(schemaUri);
-// // Don't add schema sources, since our Saxon library is not schema-aware.
+// // Don't add schema sources, since our Saxon library is not schema-aware.
// // configuration.addSchemaSource(schemaSource);
// }
configuration.setSchemaValidationMode(Validation.SKIP);
@@ -222,16 +222,16 @@ public class XQuery10ExpressionCompilerI
// declarations.declareVariable(variable.name, typeQName);
declarations.declareVariable(variableName);
}
-
+
// Add implicit declarations as prolog to the user-defined XQuery
out.xquery = declarations.toString() + xqueryStr;
- // Check the XQuery for compilation errors
- xqconn.setStaticContext(staticContext);
+ // Check the XQuery for compilation errors
+ xqconn.setStaticContext(staticContext);
XQPreparedExpression exp = xqconn.prepareExpression(out.xquery);
-
- // Pre-evaluate variables and functions by executing query
- node.setUserData(XQuery10BpelFunctions.USER_DATA_KEY_FUNCTION_RESOLVER,
+
+ // Pre-evaluate variables and functions by executing query
+ node.setUserData(XQuery10BpelFunctions.USER_DATA_KEY_FUNCTION_RESOLVER,
funcResolver, null);
exp.bindItem(XQConstants.CONTEXT_ITEM,
xqconn.createItemFromNode(node, xqconn.createNodeType()));
@@ -241,7 +241,7 @@ public class XQuery10ExpressionCompilerI
Object value = variableResolver.resolveVariable(variable);
if (typeQName != null) {
if (value.getClass().getName().startsWith("java.lang")) {
- exp.bindAtomicValue(variable, value.toString(),
+ exp.bindAtomicValue(variable, value.toString(),
xqconn.createAtomicType(XQItemType.XQBASETYPE_ANYATOMICTYPE));
} else if (value instanceof Node) {
exp.bindNode(variable, (Node) value, xqconn.createNodeType());
@@ -257,12 +257,12 @@ public class XQuery10ExpressionCompilerI
}
}
// evaluate the expression so as to initialize the variables
- try {
+ try {
exp.executeQuery();
- } catch (XQException xpee) {
- // swallow errors caused by uninitialized variables
+ } catch (XQException xpee) {
+ // swallow errors caused by uninitialized variables
} finally {
- // reset the expression's user data, in order to avoid
+ // reset the expression's user data, in order to avoid
// serializing the function resolver in the compiled bpel file.
if (node != null) {
node.setUserData(XQuery10BpelFunctions.USER_DATA_KEY_FUNCTION_RESOLVER, null, null);
@@ -280,16 +280,16 @@ public class XQuery10ExpressionCompilerI
throw wre;
}
}
-
+
public Map<String, String> getProperties() {
return _properties;
}
-
+
private String getQName(NSContext nsContext, String uri, String localPart) {
String prefix = getPrefixForUri(nsContext, uri);
return (prefix == null ? localPart : (prefix + ":" + localPart));
}
-
+
private String getPrefixForUri(NSContext nsContext, String uri) {
Set<String> prefixes = nsContext.getPrefixes();
for (String prefix : prefixes) {
@@ -300,7 +300,7 @@ public class XQuery10ExpressionCompilerI
}
return null;
}
-
+
protected static Collection<String> getVariableNames(String xquery) {
Collection<String> variableNames = new LinkedHashSet<String>();
for (int index = xquery.indexOf("$"); index != -1; index = xquery.indexOf("$")) {
@@ -314,7 +314,7 @@ public class XQuery10ExpressionCompilerI
}
return variableNames;
}
-
+
private OScope.Variable getVariable(List<OScope.Variable> variables, String variableName) {
String declaredVariable = getVariableDeclaredName(variableName);
for (OScope.Variable variable : variables) {
@@ -324,17 +324,17 @@ public class XQuery10ExpressionCompilerI
}
return null;
}
-
+
private String getVariableDeclaredName(String variableReference) {
int dotIndex = variableReference.indexOf(".");
return dotIndex >= 0 ? variableReference.substring(0, dotIndex) : variableReference;
}
-
+
private String getVariablePartName(String variableReference) {
int dotIndex = variableReference.indexOf(".");
- return dotIndex >= 0 ? variableReference.substring(dotIndex + 1) : "";
+ return dotIndex >= 0 ? variableReference.substring(dotIndex + 1) : "";
}
-
+
private QName getNameQName(String variableName) {
String prefix = null, localName = null;;
int colonIndex = variableName.indexOf(":");
@@ -347,7 +347,7 @@ public class XQuery10ExpressionCompilerI
}
return new QName(prefix, localName);
}
-
+
private QName getTypeQName(String variableName, OVarType type) {
QName typeQName = null;
if (type instanceof OConstantVarType) {
@@ -367,13 +367,13 @@ public class XQuery10ExpressionCompilerI
private static class XQueryDeclarations {
StringBuffer declarations = new StringBuffer();
-
+
public XQueryDeclarations() {}
-
+
public void declareVariable(String name, QName type) {
- declareVariable(name, type.getPrefix() + ":" + type.getLocalPart());
+ declareVariable(name, type.getPrefix() + ":" + type.getLocalPart());
}
-
+
public void declareVariable(String name, String type) {
declarations.append("declare variable ")
.append("$")
@@ -383,7 +383,7 @@ public class XQuery10ExpressionCompilerI
.append(" external ")
.append(";\n");
}
-
+
public void declareVariable(String name) {
declarations.append("declare variable ")
.append("$")
@@ -391,7 +391,7 @@ public class XQuery10ExpressionCompilerI
.append(" external ")
.append(";\n");
}
-
+
public void declareNamespace(String prefix, String uri) {
declarations.append("declare namespace ")
.append(prefix)
@@ -399,7 +399,7 @@ public class XQuery10ExpressionCompilerI
.append("\"" + uri + "\"")
.append(";\n");
}
-
+
public void declareDefaultElementNamespace(String uri) {
declarations.append("declare default element namespace ")
.append("\"" + uri + "\"")
@@ -408,6 +408,6 @@ public class XQuery10ExpressionCompilerI
public String toString() {
return declarations.toString();
- }
+ }
}
}
Modified: ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/StaticCheckTCase.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/StaticCheckTCase.java?rev=948937&r1=948936&r2=948937&view=diff
==============================================================================
--- ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/StaticCheckTCase.java (original)
+++ ode/trunk/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/StaticCheckTCase.java Thu May 27 18:09:53 2010
@@ -116,5 +116,5 @@ class StaticCheckTCase extends TestCase
public void setBaseURI(URI u) {
}
-
+
}