You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mr...@apache.org on 2008/08/05 20:20:03 UTC
svn commit: r682847 - in /ode/branches/rtver/bpel-compiler/src:
main/java/org/apache/ode/bpel/compiler/
main/java/org/apache/ode/bpel/compiler/api/
main/java/org/apache/ode/bpel/compiler/v2/
main/java/org/apache/ode/bpel/compiler/v2/xpath10/ main/java/...
Author: mriou
Date: Tue Aug 5 11:20:02 2008
New Revision: 682847
URL: http://svn.apache.org/viewvc?rev=682847&view=rev
Log:
Done with the compiler for now, moving up the dependency graph.
Added:
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CommonCompilationMessages.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CompilationExceptionWrapper.java (contents, props changed)
- copied, changed from r680846, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/CompilationExceptionWrapper.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/DefaultResourceFinder.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/SourceLocatorWrapper.java
- copied, changed from r682542, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/SourceLocatorWrapper.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WrappedResolverException.java (contents, props changed)
- copied, changed from r680846, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/WrappedResolverException.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/XPathMessages.java (contents, props changed)
- copied, changed from r680846, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPathMessages.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/api/ExtensionValidator.java
- copied, changed from r682542, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/ExtensionValidator.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/WSDLRegistry.java
- copied, changed from r682542, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WSDLRegistry.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/JaxenBpelHandler.java (contents, props changed)
- copied, changed from r682542, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/JaxenBpelHandler.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerBPEL11.java (contents, props changed)
- copied, changed from r682542, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerBPEL11.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerBPEL20.java (contents, props changed)
- copied, changed from r682542, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerBPEL20.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerBPEL20Draft.java
- copied, changed from r680846, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerBPEL20Draft.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerImpl.java (contents, props changed)
- copied, changed from r682542, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerImpl.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XslCompilationErrorListener.java (contents, props changed)
- copied, changed from r682542, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XslCompilationErrorListener.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XslCompileUriResolver.java (contents, props changed)
- copied, changed from r682542, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XslCompileUriResolver.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/JaxpFunctionResolver.java (contents, props changed)
- copied, changed from r682542, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpFunctionResolver.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/JaxpVariableResolver.java (contents, props changed)
- copied, changed from r682542, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpVariableResolver.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/OdeXPathFunctionLibrary.java (contents, props changed)
- copied, changed from r680846, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/OdeXPathFunctionLibrary.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/SaxonContext.java (contents, props changed)
- copied, changed from r680846, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/SaxonContext.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/XPath20ExpressionCompilerBPEL20.java (contents, props changed)
- copied, changed from r680846, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerBPEL20.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/XPath20ExpressionCompilerBPEL20Draft.java
- copied, changed from r680846, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerBPEL20Draft.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/XPath20ExpressionCompilerImpl.java
- copied, changed from r682542, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java
Removed:
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WSDLRegistry.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/ExtensionValidator.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/
Modified:
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/SourceLocation.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/AssignGenerator.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/BpelCompiler11.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/BpelCompiler20.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/BpelCompiler20Draft.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/BpelCompilerImpl.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/CompilerContext.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/ExtensionActivtityGenerator.java
ode/branches/rtver/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/WSDLRegistryTest.java
ode/branches/rtver/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/XPathTest.java
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java?rev=682847&r1=682846&r2=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java Tue Aug 5 11:20:02 2008
@@ -33,7 +33,7 @@
import org.apache.ode.bpel.compiler.api.CompilationException;
import org.apache.ode.bpel.compiler.api.CompilationMessage;
import org.apache.ode.bpel.compiler.api.CompileListener;
-import org.apache.ode.bpel.compiler.v2.ExtensionValidator;
+import org.apache.ode.bpel.compiler.api.ExtensionValidator;
import org.apache.ode.bpel.compiler.bom.BpelObjectFactory;
import org.apache.ode.bpel.compiler.bom.Process;
import org.apache.ode.bpel.rapi.ProcessModel;
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java?rev=682847&r1=682846&r2=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java Tue Aug 5 11:20:02 2008
@@ -1,7 +1,7 @@
package org.apache.ode.bpel.compiler;
import org.apache.ode.bpel.compiler.api.CompileListener;
-import org.apache.ode.bpel.compiler.v2.ExtensionValidator;
+import org.apache.ode.bpel.compiler.api.ExtensionValidator;
import org.apache.ode.bpel.compiler.bom.Process;
import org.apache.ode.bpel.rapi.ProcessModel;
import org.w3c.dom.Node;
Added: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CommonCompilationMessages.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CommonCompilationMessages.java?rev=682847&view=auto
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CommonCompilationMessages.java (added)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CommonCompilationMessages.java Tue Aug 5 11:20:02 2008
@@ -0,0 +1,495 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.ode.bpel.compiler;
+
+import org.apache.ode.bpel.compiler.api.CompilationMessage;
+import org.apache.ode.bpel.compiler.api.CompilationMessageBundle;
+
+import javax.xml.namespace.QName;
+
+/**
+ * General compilation messages.
+ */
+public class CommonCompilationMessages extends CompilationMessageBundle {
+
+ /** Compiling BPEL process. */
+ public CompilationMessage infCompilingProcess() {
+ return this.formatCompilationMessage("Compiling BPEL process.");
+ }
+
+ /** Error parsing BPEL process: the BPEL is either malformed or is invalid. */
+ public CompilationMessage errBpelParseErr() {
+ return this
+ .formatCompilationMessage("Error parsing BPEL process: the BPEL is either malformed or is invalid.");
+ }
+
+ /** Compilation completed with {0} error(s): {1} */
+ public CompilationMessage errCompilationErrors(int errorCount, String prettyErrors) {
+ return this.formatCompilationMessage("Compilation completed with {0} error(s):\n{1}",
+ errorCount, prettyErrors);
+ }
+
+ /** Attempt to reference undeclared link "{0}". */
+ public CompilationMessage errUndeclaredLink(String linkName) {
+ return this.formatCompilationMessage("Attempt to reference undeclared link \"{0}\".",
+ linkName);
+ }
+
+ /** The import "{0}" is invalid / malformed. */
+ public CompilationMessage errInvalidImport(String importUri) {
+ return this.formatCompilationMessage("The import \"{0}\" is invalid/malformed. */",
+ importUri);
+ }
+
+ /** Unable to import WSDL at URI "{0}"; WSDL fault code "{1}". */
+ public CompilationMessage errWsdlImportFailed(String wsdlUri, String faultCode) {
+ return this.formatCompilationMessage(
+ "Unable to import WSDL at URI \"{0}\"; WSDL fault code \"{1}\".", wsdlUri, faultCode);
+ }
+
+ /** The WSDL for namespace "{0}" could not be found in "{1}". */
+ public CompilationMessage errWsdlImportNotFound(String wsdlUri, String location) {
+ return this.formatCompilationMessage(
+ "The WSDL for namespace \"{0}\" could not be found in \"{1}\".", wsdlUri, location);
+ }
+
+ /** {1}: [{0}] {2} */
+ public CompilationMessage errWsdlParseError(String faultCode, String location, String message) {
+ return this.formatCompilationMessage("{1}: [{0}] {2}", faultCode, location, message);
+ }
+
+ /** The import type "{0}" is unknown. */
+ public CompilationMessage errUnknownImportType(String importType) {
+ return this.formatCompilationMessage("The import type \"{0}\" is unknown.", importType);
+ }
+
+ /** Must specify an import type. */
+ public CompilationMessage errUnspecifiedImportType() {
+ return this.formatCompilationMessage("Must specify an import type.");
+ }
+
+ /** Missing import location. */
+ public CompilationMessage errMissingImportLocation() {
+ return this.formatCompilationMessage("Missing import location.");
+ }
+
+ /** Attempt to reference undeclared property "{0}". */
+ public CompilationMessage errUndeclaredProperty(QName propertyName) {
+ return this.formatCompilationMessage("Attempt to reference undeclared property \"{0}\".",
+ propertyName);
+ }
+
+ /** Attempt to reference undeclared variable "{0}". */
+ public CompilationMessage errUndeclaredVariable(String varName) {
+ return this.formatCompilationMessage("Attempt to reference undeclared variable \"{0}\".",
+ varName);
+ }
+
+ /** Attempt to reference undeclared correlation set "{0}". */
+ public CompilationMessage errUndeclaredCorrelationSet(String csetName) {
+ return this.formatCompilationMessage(
+ "Attempt to reference undeclared correlation set \"{0}\".", csetName);
+ }
+
+ /**
+ * Cannot use non-message variable "{0}" in this context (message variable is
+ * required).
+ */
+ public CompilationMessage errMessageVariableRequired(String variableName) {
+ return this.formatCompilationMessage(
+ "Cannot use non-message variable \"{0}\" in this context" +
+ " (message variable is required).", variableName);
+ }
+
+ /** Attempt to declare property "{0}" with complex type "{1}". */
+ public CompilationMessage errPropertyDeclaredWithComplexType(QName propertyName, QName complexType) {
+ return this.formatCompilationMessage(
+ "Attempt to declare property \"{0}\" with complex type \"{1}\".", propertyName,
+ complexType);
+ }
+
+ /** Duplicate declaration of target for link "{0}". */
+ public CompilationMessage errDuplicateLinkTarget(String linkName) {
+ return this.formatCompilationMessage("Duplicate declaration of target for link \"{0}\".",
+ linkName);
+ }
+
+ /** Duplicate declaration of source for link "{0}". */
+ public CompilationMessage errDuplicateLinkSource(String linkName) {
+ return this.formatCompilationMessage("Duplicate declaration of source for link \"{0}\".",
+ linkName);
+ }
+
+ /** Duplicate declaration of partnerLink "{0}". */
+ public CompilationMessage errDuplicatePartnerLinkDecl(String partnerLinkName) {
+ return this.formatCompilationMessage("Duplicate declaration of partnerLink \"{0}\".",
+ partnerLinkName);
+ }
+
+ /**
+ * Declaration of variable "{0}" does not specify the required type (either
+ * MessageType or ElementType).
+ */
+ public CompilationMessage errVariableDeclMissingType(String varName) {
+ return this.formatCompilationMessage("Declaration of variable \"{0}\" does not specify"
+ + " the required type (either MessageType or ElementType).", varName);
+ }
+
+ public CompilationMessage errVariableDeclInvalid(String variable) {
+ return this.formatCompilationMessage("Declaration of variable \"{0}\" specifies "
+ + " both a MessageType and an ElementType.", variable);
+ }
+
+ /**
+ * Declaration of variable "{0}" can specify either MessageType or
+ * ElementType, but not both.
+ */
+ public CompilationMessage errVariableDeclMutipleTypes(String varName) {
+ return this.formatCompilationMessage("Declaration of variable \"{0}\" can specify either"
+ + " MessageType or ElementType, but not both.", varName);
+ }
+
+ /** Duplicate declaration of variable "{0}". */
+ public CompilationMessage errDuplicateVariableDecl(String varName) {
+ return this
+ .formatCompilationMessage("Duplicate declaration of variable \"{0}\".", varName);
+ }
+
+ /** The BOM activity class "{0}" is unrecoginized. */
+ public CompilationMessage errUnknownActivity(String className) {
+ return this.formatCompilationMessage("The BOM activity class \"{0}\" is unrecoginized.",
+ className);
+ }
+
+ /** Process has no root activity. */
+ public CompilationMessage errNoRootActivity() {
+ return this.formatCompilationMessage("Process has no root activity.");
+ }
+
+ /** The expression language "{0}" is unrecognized. */
+ public CompilationMessage errUnknownExpressionLanguage(String expressionLanguage) {
+ return this.formatCompilationMessage("The expression language \"{0}\" is unrecognized.",
+ expressionLanguage);
+ }
+
+ /** No WSDL definition for namespace "{0}". */
+ public CompilationMessage errNoWsdlDefinitionForNamespace(String namespaceURI) {
+ return this.formatCompilationMessage("No WSDL definition for namespace \"{0}\".",
+ namespaceURI);
+ }
+
+ /** Attempt to reference undeclared WSDL message "{0}" in namespace {1}. */
+ public CompilationMessage errUndeclaredMessage(String msgName, String namespaceURI) {
+ return this.formatCompilationMessage(
+ "Attempt to reference undeclared WSDL message \"{0}\"" + " in namespace {1}.",
+ msgName, namespaceURI);
+ }
+
+ /** Missing message type reference in property alias {0} in namespace {1}. */
+ public CompilationMessage errAliasUndeclaredMessage(QName property, String path) {
+ return this.formatCompilationMessage(
+ "Missing message type reference in property alias for property {0} using path {1}.",
+ property.toString(), path);
+ }
+
+ /** The property "{1}" does not have an alias for message type "{0}". */
+ public CompilationMessage errUndeclaredPropertyAlias(String messageType, QName propertyName) {
+ return this.formatCompilationMessage("The property \"{1}\" does not have an alias"
+ + " for message type \"{0}\".", messageType, propertyName);
+ }
+
+ /** Attempt to reference undeclared partner link "{0}". */
+ public CompilationMessage errUndeclaredPartnerLink(String plinkName) {
+ return this.formatCompilationMessage(
+ "Attempt to reference undeclared partner link \"{0}\".", plinkName);
+ }
+
+ /** Attempt to reference undeclared partner link type "{0}". */
+ public CompilationMessage errUndeclaredPartnerLinkType(QName partnerLinkType) {
+ return this.formatCompilationMessage(
+ "Attempt to reference undeclared partner link type \"{0}\".", partnerLinkType);
+ }
+
+ /** Attempt to reference undeclared role "{0}" for partnerLink "{1}". */
+ public CompilationMessage errUndeclaredRole(String roleName, QName partnerLinkTypeName) {
+ return this.formatCompilationMessage(
+ "Attempt to reference undeclared role \"{0}\" for partnerLink \"{1}\".", roleName,
+ partnerLinkTypeName);
+ }
+
+ /** Attempt to reference undeclared portType "{0}". */
+ public CompilationMessage errUndeclaredPortType(QName portType) {
+ return this.formatCompilationMessage("Attempt to reference undeclared portType \"{0}\".",
+ portType);
+ }
+
+ /**
+ * Attempt to reference undeclared part "{2}" for variable "{0}": the WSDL
+ * message type "{1}" does not declare "{2}".
+ */
+ public CompilationMessage errUndeclaredMessagePart(String varName, QName messageType, String partName) {
+ return this.formatCompilationMessage("Attempt to reference undeclared part \"{2}\""
+ + " for variable \"{0}\": the WSDL message type \"{1}\" does not declare \"{2}\".",
+ varName, messageType, partName);
+ }
+
+ /** The partnerLink "{0}" does not define a myRole. */
+ public CompilationMessage errPartnerLinkDoesNotDeclareMyRole(String partnerLinkName) {
+ return this.formatCompilationMessage("The partnerLink \"{0}\" does not define a myRole.",
+ partnerLinkName);
+ }
+
+ /** The partnerLink "{0}" does not define a partnerRole. */
+ public CompilationMessage errPartnerLinkDoesNotDeclarePartnerRole(String partnerLinkName) {
+ return this.formatCompilationMessage(
+ "The partnerLink \"{0}\" does not define a partnerRole.", partnerLinkName);
+ }
+
+ /** The partnerLink "{0}" does not define a partnerRole but is set to initializePartnerRole=yes. */
+ public CompilationMessage errPartnerLinkNoPartnerRoleButInitialize(String partnerLinkName) {
+ return this.formatCompilationMessage(
+ "The partnerLink \"{0}\" does not define a partnerRole but is set to initializePartnerRole=yes.", partnerLinkName);
+ }
+
+ /** The operation "{1}" is not declared on portType "{0}". */
+ public CompilationMessage errUndeclaredOperation(QName portType, String operationName) {
+ return this.formatCompilationMessage(
+ "The operation \"{1}\" is not declared on portType \"{0}\".", portType, operationName);
+ }
+
+ /**
+ * The variable "{0}" must be of type "{1}" to be used in this context; its
+ * actual type is "{1}".
+ */
+ public CompilationMessage errVariableTypeMismatch(String varName, QName expectedType,
+ QName actualType) {
+ return this.formatCompilationMessage("The variable \"{0}\" must be of type \"{1}\""
+ + " to be used in this context; its actual type is \"{2}\".", varName, expectedType,
+ actualType);
+ }
+
+ /** The port type "{0}" does not match the expected port type ("{1}"). */
+ public CompilationMessage errPortTypeMismatch(QName portType, QName expectedPortType) {
+ return this.formatCompilationMessage("The port type \"{0}\" does not match the expected"
+ + " port type (\"{1}\").", portType, expectedPortType);
+ }
+
+ /** Attempt to use correlation set "{0}" before it has been initialized. */
+ public CompilationMessage errUseOfUninitializedCorrelationSet(String correlationSet) {
+ return this.formatCompilationMessage("Attempt to use correlation set \"{0}\" before"
+ + " it has been initialized.", correlationSet);
+ }
+
+ /**
+ * Attempt to use one-way operation "{0}" in a context requiring a
+ * request-response.
+ */
+ public CompilationMessage errTwoWayOperationExpected(String opname) {
+ return this
+ .formatCompilationMessage("Attempt to use one-way operation \"{0}\" in a context"
+ + " requiring a request-response.");
+ }
+
+ /** A required query language expression was not present. */
+ public CompilationMessage errMissingQueryExpression() {
+ return this
+ .formatCompilationMessage("A required query language expression was not present.");
+ }
+
+ /** Compensation is not applicable in this (non-recovery) context. */
+ public CompilationMessage errCompensateNAtoContext() {
+ return this
+ .formatCompilationMessage("Compensation is not applicable in this (non-recovery) context.");
+ }
+
+ /** The scope "{0}" is not available for compensation in this context. */
+ public CompilationMessage errCompensateOfInvalidScope(String scopeToCompensate) {
+ return this.formatCompilationMessage(
+ "The scope \"{0}\" is not available for compensation in this context.",
+ scopeToCompensate);
+ }
+
+ /** Unrecognized BPEL version! */
+ public CompilationMessage errUnrecognizedBpelVersion() {
+ return this.formatCompilationMessage("Unrecognized BPEL version!");
+ }
+
+ /** Attempt to reference undeclared XSD type "{0}". */
+ public CompilationMessage errUndeclaredXsdType(QName typeName) {
+ return this.formatCompilationMessage("Attempt to reference undeclared XSD type \"{0}\".",
+ typeName);
+ }
+
+ /** The declaration of variable "{0}" was not recognized. */
+ public CompilationMessage errUnrecognizedVariableDeclaration(String varName) {
+ return this.formatCompilationMessage(
+ "The declaration of variable \"{0}\" was not recognized.", varName);
+ }
+
+ /** FEATURE NOT SUPPORTED: {0} */
+ public CompilationMessage errTODO(String description) {
+ return this.formatCompilationMessage("FEATURE NOT SUPPORTED: {0}");
+ }
+
+ /** A WSDL document must be specified for a BPEL4WS 1.1 process. */
+ public CompilationMessage errBpel11RequiresWsdl() {
+ return this
+ .formatCompilationMessage("A WSDL document must be specified for a BPEL4WS 1.1 process.");
+ }
+
+ /** The link "{0}" crosses an event handler boundary. */
+ public CompilationMessage errLinkCrossesEventHandlerBoundary(String linkName) {
+ return this
+ .formatCompilationMessage("The link \"{0}\" crosses an event handler boundary.");
+ }
+
+ /** Invalid alarm handler (check for/until/repeatEvery). */
+ public CompilationMessage errInvalidAlarm() {
+ return this
+ .formatCompilationMessage("Invalid alarm handler (check for/until/repeatEvery or child activity).");
+ }
+
+ /** Invalid alarm handler (check for/until/repeatEvery). */
+ public CompilationMessage errInvalidEvent() {
+ return this
+ .formatCompilationMessage("Invalid event handler (no child activity?).");
+ }
+
+ /** Process WSDL URI is ignored for WS-BPEL 2.0 processes. */
+ public CompilationMessage warnWsdlUriIgnoredFor20Process() {
+ return this
+ .formatCompilationMessage("Process WSDL URI is ignored for WS-BPEL 2.0 processes.");
+ }
+
+ /**
+ * Attempted to import WSDL for namespace {0} from multiple locations:
+ * definitions from {1} will be ignored!
+ */
+ public CompilationMessage errDuplicateWSDLImport(String tns, String location) {
+ return this.formatCompilationMessage("Attempted to import WSDL for namespace {0} from"
+ + " multiple locations: definitions from {1} will be ignored!", tns, location);
+ }
+
+ /**
+ * Error in schema processing: {0}
+ */
+ public CompilationMessage errSchemaError(String detailMessage) {
+ return this.formatCompilationMessage("Error in schema processing: {0}", detailMessage);
+ }
+
+ /**
+ * XSLT stylesheet URI is invalid/malformed: {0}
+ */
+ public CompilationMessage errInvalidDocXsltUri(String docStrUri) {
+ return this.formatCompilationMessage("XSLT stylesheet URI is invalid/malformed: {0}", docStrUri);
+ }
+
+ /**
+ * Could not find the XSLT stylesheet referenced with URI {0}, make sure it has been properly provided to the compiler.
+ */
+ public CompilationMessage errCantFindXslt(String docStrUri) {
+ return this.formatCompilationMessage("Could not find the XSLT stylesheet referenced with URI {0}, make " +
+ "sure it has been properly provided to the compiler.", docStrUri);
+ }
+
+ /**
+ * Partner link {0} used in receive activity doesn't define role myRole.
+ */
+ public CompilationMessage errNoMyRoleOnReceivePartnerLink(String plink) {
+ return this.formatCompilationMessage("Partner link {0} used in receive activity doesn't define role myRole.", plink);
+ }
+
+ /**
+ * Deployment descriptor is invalid: {0}
+ */
+ public CompilationMessage errInvalidDeploymentDescriptor(String message) {
+ return this.formatCompilationMessage("Deployment descriptor is invalid: {0}", message);
+ }
+
+ /**
+ * The retryFor attribute must be a positive integer, found {0}
+ */
+ public CompilationMessage errInvalidRetryForValue(String message) {
+ return this.formatCompilationMessage("The retryFor attribute must be a positive integer, found {0}", message);
+ }
+
+ /**
+ * The retryDelay attribute must be a positive integer, found {0}
+ */
+ public CompilationMessage errInvalidRetryDelayValue(String message) {
+ return this.formatCompilationMessage("The retryDelay attribute must be a positive integer, found {0}", message);
+ }
+
+ public CompilationMessage errAtomicScopeNesting(boolean atomic) {
+ if (atomic)
+ return this.formatCompilationMessage("Cannot nest atomic scopes inside each other.");
+ else
+ return this.formatCompilationMessage("A scope enclosed inside an atomic scope cannot declare itself as not atomic");
+ }
+
+ public CompilationMessage errIsolatedScopeNesting() {
+ return this.formatCompilationMessage("Cannot nest isolated scopes.");
+ }
+
+ public CompilationMessage errProcessNameNotSpecified() {
+ return this.formatCompilationMessage("The process name was not specified.");
+ }
+
+ public CompilationMessage errProcessNamespaceNotSpecified() {
+ return this.formatCompilationMessage("The process namespace was not specified.");
+ }
+
+ public CompilationMessage errMissingMyRolePortType(QName portType, String myRole, QName plnkType) {
+ return formatCompilationMessage("Missing portType {0} on partnerLinkType {1} for myRole {2}", portType, plnkType, myRole);
+ }
+
+ public CompilationMessage errMissingPartnerRolePortType(QName portType, String partnerRole, QName plnkType) {
+ return formatCompilationMessage("Missing portType {0} on partnerLinkType {1} for partnerRole {2}", portType, plnkType, partnerRole);
+ }
+
+ /**
+ * The part {0} declared in property alias for messageType {1} couldn't be found.
+ */
+ public CompilationMessage errUnknownPartInAlias(String part, String message) {
+ return this.formatCompilationMessage("The part {0} declared in property alias for " +
+ "messageType {1} couldn't be found.", part, message);
+ }
+
+ /** Empty scopes are forbidden. */
+ public CompilationMessage errEmptyScope() {
+ return this.formatCompilationMessage("Empty scopes are forbidden.");
+ }
+
+ public CompilationMessage errEmptySequence() {
+ return this.formatCompilationMessage("Empty sequences are forbidden.");
+ }
+
+ public CompilationMessage errMustSpecifyRelatedVariable(String name) {
+ return this.formatCompilationMessage("The external variable declaration for \"{0}\" must specify a related variable.", name);
+ }
+
+ public CompilationMessage errMustSpecifyExternalVariableId(String name) {
+ return this.formatCompilationMessage("The external variable declaration for \"{0}\" must specify an external variable identifier.", name);
+ }
+
+ public CompilationMessage errEmptyCatch() {
+ return this.formatCompilationMessage("Empty catch faut handlers are forbidden.");
+ }
+}
Copied: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CompilationExceptionWrapper.java (from r680846, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/CompilationExceptionWrapper.java)
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CompilationExceptionWrapper.java?p2=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CompilationExceptionWrapper.java&p1=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/CompilationExceptionWrapper.java&r1=680846&r2=682847&rev=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/CompilationExceptionWrapper.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CompilationExceptionWrapper.java Tue Aug 5 11:20:02 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.elang.xpath10.compiler;
+package org.apache.ode.bpel.compiler;
import org.apache.ode.bpel.compiler.api.CompilationException;
@@ -26,7 +26,7 @@
* Jaxen-compliant wrapper for
* {@link org.apache.ode.bpel.compiler.api.CompilationException}.
*/
-class CompilationExceptionWrapper extends JaxenException {
+public class CompilationExceptionWrapper extends JaxenException {
private static final long serialVersionUID = -6918197147269316065L;
Propchange: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CompilationExceptionWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/DefaultResourceFinder.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/DefaultResourceFinder.java?rev=682847&view=auto
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/DefaultResourceFinder.java (added)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/DefaultResourceFinder.java Tue Aug 5 11:20:02 2008
@@ -0,0 +1,106 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ode.bpel.compiler;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ode.bpel.compiler.ResourceFinder;
+
+/**
+ * Basic implementation of the {@link org.apache.ode.bpel.compiler.ResourceFinder} interface. Resolves
+ * URIs relative to a base URI specified at the time of construction.
+ *
+ * @author Maciej Szefler - m s z e f l e r @ g m a i l . c o m
+ *
+ */
+public class DefaultResourceFinder implements ResourceFinder {
+ private static final Log __log = LogFactory.getLog(DefaultResourceFinder.class);
+
+ private File _relativeDir;
+ private File _absoluteDir;
+
+ /**
+ * Default constructor: resolve relative URIs against current working directory.
+ */
+ public DefaultResourceFinder() {
+ _absoluteDir = new File("");
+ _relativeDir = _absoluteDir;
+ }
+
+ /**
+ * Constructor: resolve relative URIs against specified directory.
+ * @param relativeDir base path for relative URLs.
+ * @param absoluteDir base path for absolute URLs.
+ */
+ public DefaultResourceFinder(File relativeDir, File absoluteDir) {
+ checkDir("relativeDir", relativeDir);
+ checkDir("absoluteDir", absoluteDir);
+ _relativeDir = relativeDir;
+ _absoluteDir = absoluteDir;
+ }
+
+ private void checkDir(String arg, File dir) {
+ if (dir == null) {
+ throw new IllegalArgumentException("Argument '"+arg+"' is null");
+ }
+ if (!dir.exists()) {
+ throw new IllegalArgumentException("Directory does not exist: " + dir);
+ }
+ }
+
+ public InputStream openResource(URI uri) throws MalformedURLException, IOException {
+ URI absolute = _absoluteDir.toURI();
+ if (__log.isDebugEnabled()) {
+ __log.debug("openResource: uri="+uri+" relativeDir="+_relativeDir+" absoluteDir="+_absoluteDir);
+ }
+
+ if (uri.isAbsolute() && uri.getScheme().equals("file")) {
+ try {
+ return uri.toURL().openStream();
+ } catch (Exception except) {
+ __log.fatal("openResource: unable to open file URL " + uri + "; " + except.toString());
+ return null;
+ }
+ }
+
+ // Note that if we get an absolute URI, the relativize operation will simply
+ // return the absolute URI.
+ URI relative = _relativeDir.toURI().relativize(uri);
+ if (relative.isAbsolute() && !relative.getScheme().equals("urn")) {
+ __log.fatal("openResource: invalid scheme (should be urn:) " + uri);
+ return null;
+ }
+
+ File f = new File(absolute.getPath(), relative.getPath());
+ if (!f.exists()) {
+ __log.debug("fileNotFound: " + f);
+ return null;
+ }
+
+ return new FileInputStream(f);
+ }
+
+}
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/SourceLocation.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/SourceLocation.java?rev=682847&r1=682846&r2=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/SourceLocation.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/SourceLocation.java Tue Aug 5 11:20:02 2008
@@ -30,7 +30,7 @@
public SourceLocation() {
}
- SourceLocation(URI uri) {
+ public SourceLocation(URI uri) {
_uri = uri;
}
Copied: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/SourceLocatorWrapper.java (from r682542, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/SourceLocatorWrapper.java)
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/SourceLocatorWrapper.java?p2=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/SourceLocatorWrapper.java&p1=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/SourceLocatorWrapper.java&r1=682542&r2=682847&rev=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/SourceLocatorWrapper.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/SourceLocatorWrapper.java Tue Aug 5 11:20:02 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.elang.xpath10.compiler;
+package org.apache.ode.bpel.compiler;
import java.net.URI;
Copied: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WrappedResolverException.java (from r680846, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/WrappedResolverException.java)
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WrappedResolverException.java?p2=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WrappedResolverException.java&p1=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/WrappedResolverException.java&r1=680846&r2=682847&rev=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/WrappedResolverException.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WrappedResolverException.java Tue Aug 5 11:20:02 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ode.bpel.elang.xpath20.compiler;
+package org.apache.ode.bpel.compiler;
import org.apache.ode.bpel.compiler.api.CompilationMessage;
Propchange: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WrappedResolverException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WrappedResolverException.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WrappedResolverException.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/XPathMessages.java (from r680846, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPathMessages.java)
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/XPathMessages.java?p2=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/XPathMessages.java&p1=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPathMessages.java&r1=680846&r2=682847&rev=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPathMessages.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/XPathMessages.java Tue Aug 5 11:20:02 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ode.bpel.elang.xpath10.compiler;
+package org.apache.ode.bpel.compiler;
import org.apache.ode.bpel.compiler.api.CompilationMessage;
import org.apache.ode.bpel.compiler.api.CompilationMessageBundle;
Propchange: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/XPathMessages.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/api/ExtensionValidator.java (from r682542, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/ExtensionValidator.java)
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/api/ExtensionValidator.java?p2=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/api/ExtensionValidator.java&p1=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/ExtensionValidator.java&r1=682542&r2=682847&rev=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/ExtensionValidator.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/api/ExtensionValidator.java Tue Aug 5 11:20:02 2008
@@ -16,10 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.compiler.v2;
+package org.apache.ode.bpel.compiler.api;
import org.apache.ode.bpel.compiler.bom.ExtensibleElement;
-import org.apache.ode.bpel.compiler.api.CompilationException;
/**
* Interface that allows Ode extensions to validate an extension element's
@@ -29,6 +28,12 @@
*/
public interface ExtensionValidator {
- void validate(CompilerContext context, ExtensibleElement element) throws CompilationException;
+ /**
+ *
+ * @param compilerContext
+ * @param element
+ * @throws CompilationException
+ */
+ void validate(Object compilerContext, ExtensibleElement element) throws CompilationException;
}
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/AssignGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/AssignGenerator.java?rev=682847&r1=682846&r2=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/AssignGenerator.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/AssignGenerator.java Tue Aug 5 11:20:02 2008
@@ -23,7 +23,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.compiler.api.CompilationException;
-import org.apache.ode.bpel.compiler.v2.ExtensionValidator;
+import org.apache.ode.bpel.compiler.api.ExtensionValidator;
import org.apache.ode.bpel.compiler.bom.Activity;
import org.apache.ode.bpel.compiler.bom.AssignActivity;
import org.apache.ode.bpel.compiler.bom.Copy;
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/BpelCompiler11.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/BpelCompiler11.java?rev=682847&r1=682846&r2=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/BpelCompiler11.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/BpelCompiler11.java Tue Aug 5 11:20:02 2008
@@ -62,7 +62,7 @@
registerActivityCompiler(WaitActivity.class, new WaitGenerator());
registerActivityCompiler(TerminateActivity.class, new TerminateGenerator());
- registerExpressionLanguage(EXPLANG_XPATH, "org.apache.ode.bpel.elang.xpath10.compiler.XPath10ExpressionCompilerBPEL11");
+ registerExpressionLanguage(EXPLANG_XPATH, "org.apache.ode.bpel.compiler.v2.xpath10.XPath10ExpressionCompilerBPEL11");
}
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/BpelCompiler20.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/BpelCompiler20.java?rev=682847&r1=682846&r2=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/BpelCompiler20.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/BpelCompiler20.java Tue Aug 5 11:20:02 2008
@@ -40,7 +40,7 @@
import org.apache.ode.bpel.compiler.bom.WhileActivity;
import org.apache.ode.bpel.compiler.wsdl.WSDLFactory4BPEL;
import org.apache.ode.bpel.compiler.wsdl.WSDLFactoryBPEL20;
-import org.apache.ode.bpel.elang.xpath10.compiler.XPath10ExpressionCompilerBPEL20;
+import org.apache.ode.bpel.compiler.v2.xpath10.XPath10ExpressionCompilerBPEL20;
/**
* OASIS BPEL V2.0 Compiler
@@ -77,7 +77,7 @@
try {
registerExpressionLanguage(OASIS_EXPLANG_XPATH_2_0,
- "org.apache.ode.bpel.elang.xpath20.compiler.XPath20ExpressionCompilerBPEL20");
+ "org.apache.ode.bpel.compiler.v2.xpath20.XPath20ExpressionCompilerBPEL20");
} catch (Exception e) {
__log.error("Error loading XPath 2.0 Expression Language: it will not be available.");
}
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/BpelCompiler20Draft.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/BpelCompiler20Draft.java?rev=682847&r1=682846&r2=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/BpelCompiler20Draft.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/BpelCompiler20Draft.java Tue Aug 5 11:20:02 2008
@@ -40,7 +40,7 @@
import org.apache.ode.bpel.compiler.bom.WhileActivity;
import org.apache.ode.bpel.compiler.wsdl.WSDLFactory4BPEL;
import org.apache.ode.bpel.compiler.wsdl.WSDLFactoryBPEL20Draft;
-import org.apache.ode.bpel.elang.xpath10.compiler.XPath10ExpressionCompilerBPEL20Draft;
+import org.apache.ode.bpel.compiler.v2.xpath10.XPath10ExpressionCompilerBPEL20Draft;
/**
* @author Matthieu Riou <mriou at apache dot org>
@@ -75,7 +75,7 @@
registerExpressionLanguage(OASIS_EXPLANG_XPATH_1_0, new XPath10ExpressionCompilerBPEL20Draft());
try {
registerExpressionLanguage(OASIS_EXPLANG_XPATH_2_0,
- "org.apache.ode.bpel.elang.xpath20.compiler.XPath20ExpressionCompilerBPEL20Draft");
+ "org.apache.ode.bpel.compiler.v2.xpath20.XPath20ExpressionCompilerBPEL20Draft");
} catch (Exception e) {
__log.error("Error loading XPath 2.0 Expression Language: it will not be available.");
}
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/BpelCompilerImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/BpelCompilerImpl.java?rev=682847&r1=682846&r2=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/BpelCompilerImpl.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/BpelCompilerImpl.java Tue Aug 5 11:20:02 2008
@@ -48,9 +48,9 @@
import org.apache.ode.bpel.compiler.api.CompilationException;
import org.apache.ode.bpel.compiler.api.CompilationMessage;
import org.apache.ode.bpel.compiler.api.CompileListener;
+import org.apache.ode.bpel.compiler.api.ExtensionValidator;
import org.apache.ode.bpel.compiler.v2.CompilerContext;
import org.apache.ode.bpel.compiler.v2.ExpressionCompiler;
-import org.apache.ode.bpel.compiler.v2.ExtensionValidator;
import org.apache.ode.bpel.compiler.bom.Activity;
import org.apache.ode.bpel.compiler.bom.Bpel11QNames;
import org.apache.ode.bpel.compiler.bom.Bpel20QNames;
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/CompilerContext.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/CompilerContext.java?rev=682847&r1=682846&r2=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/CompilerContext.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/CompilerContext.java Tue Aug 5 11:20:02 2008
@@ -28,7 +28,7 @@
import org.apache.ode.bpel.compiler.bom.ScopeLikeActivity;
import org.apache.ode.bpel.compiler.SourceLocation;
import org.apache.ode.bpel.compiler.api.CompilationException;
-import org.apache.ode.bpel.compiler.v2.ExtensionValidator;
+import org.apache.ode.bpel.compiler.api.ExtensionValidator;
import org.apache.ode.bpel.rtrep.v2.OActivity;
import org.apache.ode.bpel.rtrep.v2.OExpression;
import org.apache.ode.bpel.rtrep.v2.OLValueExpression;
@@ -42,11 +42,8 @@
import org.apache.ode.bpel.rtrep.v2.OScope.Variable;
import org.apache.ode.utils.NSContext;
-
/**
* Interface providing access to the compiler.
- *
- * @author Maciej Szefler ( m s z e f l e r @ g m a i l . c o m )
*/
public interface CompilerContext {
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/ExtensionActivtityGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/ExtensionActivtityGenerator.java?rev=682847&r1=682846&r2=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/ExtensionActivtityGenerator.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/ExtensionActivtityGenerator.java Tue Aug 5 11:20:02 2008
@@ -19,7 +19,7 @@
package org.apache.ode.bpel.compiler.v2;
import org.apache.ode.bpel.compiler.api.CompilationException;
-import org.apache.ode.bpel.compiler.v2.ExtensionValidator;
+import org.apache.ode.bpel.compiler.api.ExtensionValidator;
import org.apache.ode.bpel.compiler.bom.Activity;
import org.apache.ode.bpel.compiler.bom.CompositeActivity;
import org.apache.ode.bpel.compiler.bom.ExtensionActivity;
Copied: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/WSDLRegistry.java (from r682542, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WSDLRegistry.java)
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/WSDLRegistry.java?p2=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/WSDLRegistry.java&p1=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WSDLRegistry.java&r1=682542&r2=682847&rev=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WSDLRegistry.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/WSDLRegistry.java Tue Aug 5 11:20:02 2008
@@ -16,16 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.compiler;
+package org.apache.ode.bpel.compiler.v2;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.compiler.api.CompilationException;
-import org.apache.ode.bpel.compiler.v2.CompilerContext;
import org.apache.ode.bpel.compiler.bom.PartnerLinkType;
import org.apache.ode.bpel.compiler.bom.PropertyAlias;
import org.apache.ode.bpel.compiler.wsdl.Definition4BPEL;
import org.apache.ode.bpel.compiler.wsdl.XMLSchemaType;
+import org.apache.ode.bpel.compiler.CommonCompilationMessages;
+import org.apache.ode.bpel.compiler.ResourceFinder;
+import org.apache.ode.bpel.compiler.SourceLocation;
+import org.apache.ode.bpel.compiler.WsdlFinderXMLEntityResolver;
import org.apache.ode.utils.DOMUtils;
import org.apache.ode.utils.Namespaces;
import org.apache.ode.utils.StreamUtils;
Copied: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/JaxenBpelHandler.java (from r682542, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/JaxenBpelHandler.java)
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/JaxenBpelHandler.java?p2=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/JaxenBpelHandler.java&p1=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/JaxenBpelHandler.java&r1=682542&r2=682847&rev=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/JaxenBpelHandler.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/JaxenBpelHandler.java Tue Aug 5 11:20:02 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.elang.xpath10.compiler;
+package org.apache.ode.bpel.compiler.v2.xpath10;
import java.util.List;
@@ -32,6 +32,9 @@
import org.apache.ode.bpel.rtrep.v2.OXslSheet;
import org.apache.ode.bpel.rtrep.v2.xpath10.OXPath10ExpressionBPEL20;
import org.apache.ode.bpel.rtrep.v2.xpath10.OXPath10Expression;
+import org.apache.ode.bpel.rtrep.common.Constants;
+import org.apache.ode.bpel.compiler.XPathMessages;
+import org.apache.ode.bpel.compiler.CompilationExceptionWrapper;
import org.apache.ode.utils.NSContext;
import org.apache.ode.utils.msg.MessageBundle;
import org.apache.ode.utils.xsl.XslTransformHandler;
Propchange: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/JaxenBpelHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerBPEL11.java (from r682542, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerBPEL11.java)
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerBPEL11.java?p2=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerBPEL11.java&p1=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerBPEL11.java&r1=682542&r2=682847&rev=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerBPEL11.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerBPEL11.java Tue Aug 5 11:20:02 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.elang.xpath10.compiler;
+package org.apache.ode.bpel.compiler.v2.xpath10;
import org.apache.ode.bpel.compiler.api.CompilationException;
import org.apache.ode.bpel.compiler.bom.Expression;
Propchange: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerBPEL11.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerBPEL20.java (from r682542, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerBPEL20.java)
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerBPEL20.java?p2=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerBPEL20.java&p1=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerBPEL20.java&r1=682542&r2=682847&rev=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerBPEL20.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerBPEL20.java Tue Aug 5 11:20:02 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.elang.xpath10.compiler;
+package org.apache.ode.bpel.compiler.v2.xpath10;
import org.apache.ode.bpel.compiler.api.CompilationException;
import org.apache.ode.bpel.compiler.v2.CompilerContext;
@@ -25,6 +25,7 @@
import org.apache.ode.bpel.rtrep.v2.xpath10.OXPath10ExpressionBPEL20;
import org.apache.ode.bpel.rtrep.v2.OExpression;
import org.apache.ode.bpel.rtrep.v2.OLValueExpression;
+import org.apache.ode.bpel.compiler.v2.xpath10.XslCompilationErrorListener;
import org.apache.ode.utils.Namespaces;
import org.apache.ode.utils.xsl.XslTransformHandler;
Propchange: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerBPEL20.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerBPEL20Draft.java (from r680846, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerBPEL20Draft.java)
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerBPEL20Draft.java?p2=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerBPEL20Draft.java&p1=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerBPEL20Draft.java&r1=680846&r2=682847&rev=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerBPEL20Draft.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerBPEL20Draft.java Tue Aug 5 11:20:02 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ode.bpel.elang.xpath10.compiler;
+package org.apache.ode.bpel.compiler.v2.xpath10;
import org.apache.ode.utils.Namespaces;
Copied: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerImpl.java (from r682542, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerImpl.java)
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerImpl.java?p2=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerImpl.java&p1=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerImpl.java&r1=682542&r2=682847&rev=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerImpl.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerImpl.java Tue Aug 5 11:20:02 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.elang.xpath10.compiler;
+package org.apache.ode.bpel.compiler.v2.xpath10;
import java.util.HashMap;
import java.util.Map;
@@ -27,6 +27,8 @@
import org.apache.ode.bpel.compiler.v2.CompilerContext;
import org.apache.ode.bpel.compiler.v2.ExpressionCompiler;
import org.apache.ode.bpel.compiler.bom.Expression;
+import org.apache.ode.bpel.compiler.XPathMessages;
+import org.apache.ode.bpel.compiler.CompilationExceptionWrapper;
import org.apache.ode.bpel.rtrep.v2.xpath10.OXPath10Expression;
import org.apache.ode.utils.msg.MessageBundle;
import org.jaxen.saxpath.SAXPathException;
Propchange: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XPath10ExpressionCompilerImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XslCompilationErrorListener.java (from r682542, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XslCompilationErrorListener.java)
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XslCompilationErrorListener.java?p2=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XslCompilationErrorListener.java&p1=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XslCompilationErrorListener.java&r1=682542&r2=682847&rev=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XslCompilationErrorListener.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XslCompilationErrorListener.java Tue Aug 5 11:20:02 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ode.bpel.elang.xpath10.compiler;
+package org.apache.ode.bpel.compiler.v2.xpath10;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -25,6 +25,7 @@
import org.apache.ode.bpel.compiler.api.CompilationMessage;
import org.apache.ode.bpel.compiler.v2.CompilerContext;
import org.apache.ode.bpel.compiler.SourceLocation;
+import org.apache.ode.bpel.compiler.SourceLocatorWrapper;
import javax.xml.transform.ErrorListener;
import javax.xml.transform.TransformerException;
Propchange: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XslCompilationErrorListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XslCompileUriResolver.java (from r682542, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XslCompileUriResolver.java)
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XslCompileUriResolver.java?p2=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XslCompileUriResolver.java&p1=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XslCompileUriResolver.java&r1=682542&r2=682847&rev=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XslCompileUriResolver.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XslCompileUriResolver.java Tue Aug 5 11:20:02 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ode.bpel.elang.xpath10.compiler;
+package org.apache.ode.bpel.compiler.v2.xpath10;
import org.apache.ode.bpel.compiler.v2.CompilerContext;
import org.apache.ode.bpel.rtrep.v2.xpath10.OXPath10Expression;
Propchange: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath10/XslCompileUriResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/JaxpFunctionResolver.java (from r682542, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpFunctionResolver.java)
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/JaxpFunctionResolver.java?p2=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/JaxpFunctionResolver.java&p1=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpFunctionResolver.java&r1=682542&r2=682847&rev=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpFunctionResolver.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/JaxpFunctionResolver.java Tue Aug 5 11:20:02 2008
@@ -17,12 +17,13 @@
* under the License.
*/
-package org.apache.ode.bpel.elang.xpath20.compiler;
+package org.apache.ode.bpel.compiler.v2.xpath20;
import org.apache.ode.bpel.compiler.api.CompilationException;
import org.apache.ode.bpel.compiler.v2.CompilerContext;
-import org.apache.ode.bpel.elang.xpath10.compiler.XPathMessages;
-import org.apache.ode.bpel.elang.xpath10.compiler.XslCompileUriResolver;
+import org.apache.ode.bpel.compiler.v2.xpath10.XslCompileUriResolver;
+import org.apache.ode.bpel.compiler.XPathMessages;
+import org.apache.ode.bpel.compiler.WrappedResolverException;
import org.apache.ode.bpel.rtrep.v2.xpath20.OXPath20ExpressionBPEL20;
import org.apache.ode.bpel.rtrep.v2.OProcess;
import org.apache.ode.bpel.rtrep.v2.OScope;
Propchange: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/JaxpFunctionResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/JaxpFunctionResolver.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/JaxpFunctionResolver.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/JaxpVariableResolver.java (from r682542, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpVariableResolver.java)
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/JaxpVariableResolver.java?p2=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/JaxpVariableResolver.java&p1=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpVariableResolver.java&r1=682542&r2=682847&rev=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpVariableResolver.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/JaxpVariableResolver.java Tue Aug 5 11:20:02 2008
@@ -17,11 +17,12 @@
* under the License.
*/
-package org.apache.ode.bpel.elang.xpath20.compiler;
+package org.apache.ode.bpel.compiler.v2.xpath20;
import org.apache.ode.bpel.compiler.api.CompilationException;
import org.apache.ode.bpel.compiler.v2.CompilerContext;
-import org.apache.ode.bpel.elang.xpath10.compiler.XPathMessages;
+import org.apache.ode.bpel.compiler.XPathMessages;
+import org.apache.ode.bpel.compiler.WrappedResolverException;
import org.apache.ode.bpel.rtrep.v2.xpath10.OXPath10ExpressionBPEL20;
import org.apache.ode.bpel.rtrep.v2.OElementVarType;
import org.apache.ode.bpel.rtrep.v2.OLink;
Propchange: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/JaxpVariableResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/JaxpVariableResolver.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/JaxpVariableResolver.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/OdeXPathFunctionLibrary.java (from r680846, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/OdeXPathFunctionLibrary.java)
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/OdeXPathFunctionLibrary.java?p2=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/OdeXPathFunctionLibrary.java&p1=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/OdeXPathFunctionLibrary.java&r1=680846&r2=682847&rev=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/OdeXPathFunctionLibrary.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/OdeXPathFunctionLibrary.java Tue Aug 5 11:20:02 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.elang.xpath20.compiler;
+package org.apache.ode.bpel.compiler.v2.xpath20;
import net.sf.saxon.expr.Expression;
import net.sf.saxon.trans.XPathException;
@@ -28,6 +28,8 @@
import javax.xml.xpath.XPathFunctionException;
import java.util.ArrayList;
+import org.apache.ode.bpel.compiler.v2.xpath20.JaxpFunctionResolver;
+
/**
* Overloading the XPathFunctionLibrary to force it to initialize our functions giving
* the provided parameters. Otherwise the Saxon implemetation just never gives you
Propchange: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/OdeXPathFunctionLibrary.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/OdeXPathFunctionLibrary.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/OdeXPathFunctionLibrary.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/SaxonContext.java (from r680846, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/SaxonContext.java)
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/SaxonContext.java?p2=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/SaxonContext.java&p1=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/SaxonContext.java&r1=680846&r2=682847&rev=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/SaxonContext.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/SaxonContext.java Tue Aug 5 11:20:02 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.elang.xpath20.compiler;
+package org.apache.ode.bpel.compiler.v2.xpath20;
import net.sf.saxon.xpath.StandaloneContext;
import net.sf.saxon.xpath.XPathFunctionLibrary;
@@ -33,6 +33,8 @@
import javax.xml.namespace.QName;
import org.apache.ode.utils.Namespaces;
+import org.apache.ode.bpel.compiler.v2.xpath20.JaxpVariableResolver;
+import org.apache.ode.bpel.compiler.v2.xpath20.JaxpFunctionResolver;
import java.util.List;
Propchange: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/SaxonContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/SaxonContext.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/SaxonContext.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/XPath20ExpressionCompilerBPEL20.java (from r680846, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerBPEL20.java)
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/XPath20ExpressionCompilerBPEL20.java?p2=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/XPath20ExpressionCompilerBPEL20.java&p1=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerBPEL20.java&r1=680846&r2=682847&rev=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerBPEL20.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/XPath20ExpressionCompilerBPEL20.java Tue Aug 5 11:20:02 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.elang.xpath20.compiler;
+package org.apache.ode.bpel.compiler.v2.xpath20;
import org.apache.ode.utils.Namespaces;
Propchange: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/XPath20ExpressionCompilerBPEL20.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/XPath20ExpressionCompilerBPEL20.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/XPath20ExpressionCompilerBPEL20.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/XPath20ExpressionCompilerBPEL20Draft.java (from r680846, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerBPEL20Draft.java)
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/XPath20ExpressionCompilerBPEL20Draft.java?p2=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/XPath20ExpressionCompilerBPEL20Draft.java&p1=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerBPEL20Draft.java&r1=680846&r2=682847&rev=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerBPEL20Draft.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/XPath20ExpressionCompilerBPEL20Draft.java Tue Aug 5 11:20:02 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ode.bpel.elang.xpath20.compiler;
+package org.apache.ode.bpel.compiler.v2.xpath20;
import org.apache.ode.utils.Namespaces;
Copied: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/XPath20ExpressionCompilerImpl.java (from r682542, ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java)
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/XPath20ExpressionCompilerImpl.java?p2=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/XPath20ExpressionCompilerImpl.java&p1=ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java&r1=682542&r2=682847&rev=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/v2/xpath20/XPath20ExpressionCompilerImpl.java Tue Aug 5 11:20:02 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ode.bpel.elang.xpath20.compiler;
+package org.apache.ode.bpel.compiler.v2.xpath20;
import java.util.HashMap;
import java.util.Map;
@@ -34,9 +34,11 @@
import org.apache.ode.bpel.compiler.api.CompilationException;
import org.apache.ode.bpel.compiler.v2.CompilerContext;
import org.apache.ode.bpel.compiler.v2.ExpressionCompiler;
+import org.apache.ode.bpel.compiler.v2.xpath10.XslCompilationErrorListener;
import org.apache.ode.bpel.compiler.bom.Expression;
-import org.apache.ode.bpel.elang.xpath10.compiler.XPathMessages;
-import org.apache.ode.bpel.elang.xpath10.compiler.XslCompilationErrorListener;
+import org.apache.ode.bpel.compiler.XPathMessages;
+import org.apache.ode.bpel.compiler.WrappedResolverException;
+import org.apache.ode.bpel.compiler.v2.xpath20.SaxonContext;
import org.apache.ode.bpel.rtrep.v2.xpath20.OXPath20ExpressionBPEL20;
import org.apache.ode.bpel.rtrep.v2.OExpression;
import org.apache.ode.bpel.rtrep.v2.OLValueExpression;
Modified: ode/branches/rtver/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/WSDLRegistryTest.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/WSDLRegistryTest.java?rev=682847&r1=682846&r2=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/WSDLRegistryTest.java (original)
+++ ode/branches/rtver/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/WSDLRegistryTest.java Tue Aug 5 11:20:02 2008
@@ -30,6 +30,7 @@
import org.apache.ode.bpel.compiler.wsdl.WSDLFactory4BPEL;
import org.apache.ode.bpel.compiler.wsdl.WSDLFactoryBPEL11;
import org.apache.ode.bpel.compiler.DefaultResourceFinder;
+import org.apache.ode.bpel.compiler.v2.WSDLRegistry;
import org.apache.ode.utils.xsd.SchemaModel;
public class WSDLRegistryTest extends TestCase {
Modified: ode/branches/rtver/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/XPathTest.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/XPathTest.java?rev=682847&r1=682846&r2=682847&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/XPathTest.java (original)
+++ ode/branches/rtver/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler/XPathTest.java Tue Aug 5 11:20:02 2008
@@ -32,17 +32,17 @@
import org.apache.ode.bpel.compiler.api.CompilationException;
import org.apache.ode.bpel.compiler.v2.CompilerContext;
import org.apache.ode.bpel.compiler.v2.ExpressionCompiler;
-import org.apache.ode.bpel.compiler.v2.ExtensionValidator;
+import org.apache.ode.bpel.compiler.api.ExtensionValidator;
import org.apache.ode.bpel.compiler.api.SourceLocation;
import org.apache.ode.bpel.compiler.bom.Activity;
import org.apache.ode.bpel.compiler.bom.BpelObject;
import org.apache.ode.bpel.compiler.bom.Expression;
import org.apache.ode.bpel.compiler.bom.ScopeLikeActivity;
-import org.apache.ode.bpel.elang.xpath10.compiler.XPath10ExpressionCompilerBPEL11;
-import org.apache.ode.bpel.elang.xpath10.compiler.XPath10ExpressionCompilerBPEL20;
-import org.apache.ode.bpel.elang.xpath10.compiler.XPath10ExpressionCompilerBPEL20Draft;
-import org.apache.ode.bpel.elang.xpath20.compiler.XPath20ExpressionCompilerBPEL20;
-import org.apache.ode.bpel.elang.xpath20.compiler.XPath20ExpressionCompilerBPEL20Draft;
+import org.apache.ode.bpel.compiler.v2.xpath10.XPath10ExpressionCompilerBPEL11;
+import org.apache.ode.bpel.compiler.v2.xpath10.XPath10ExpressionCompilerBPEL20;
+import org.apache.ode.bpel.compiler.v2.xpath10.XPath10ExpressionCompilerBPEL20Draft;
+import org.apache.ode.bpel.compiler.v2.xpath20.XPath20ExpressionCompilerBPEL20;
+import org.apache.ode.bpel.compiler.v2.xpath20.XPath20ExpressionCompilerBPEL20Draft;
import org.apache.ode.bpel.o.OActivity;
import org.apache.ode.bpel.o.OElementVarType;
import org.apache.ode.bpel.o.OExpression;