You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by bo...@apache.org on 2007/08/06 22:33:59 UTC
svn commit: r563259 - in /ode/trunk: ./
axis2/src/main/java/org/apache/ode/axis2/hooks/
axis2/src/main/java/org/apache/ode/axis2/service/
Author: boisvert
Date: Mon Aug 6 13:33:58 2007
New Revision: 563259
URL: http://svn.apache.org/viewvc?view=rev&rev=563259
Log:
Upgrade to Axis2 1.3-RC3, Neethi 2.0.2, Axiom 1.2.5, Xerces 2.9.0, XmlSchema 1.3.2
Modified:
ode/trunk/Rakefile
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEMessageReceiver.java
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java
ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/ManagementService.java
Modified: ode/trunk/Rakefile
URL: http://svn.apache.org/viewvc/ode/trunk/Rakefile?view=diff&rev=563259&r1=563258&r2=563259
==============================================================================
--- ode/trunk/Rakefile (original)
+++ ode/trunk/Rakefile Mon Aug 6 13:33:58 2007
@@ -15,7 +15,7 @@
# limitations under the License.
#
-gem "buildr", "~>1.2.2"
+gem "buildr", "~>1.2.4"
require "buildr"
require "buildr/xmlbeans.rb"
require "buildr/openjpa"
@@ -29,13 +29,12 @@
ANNONGEN = "annogen:annogen:jar:0.1.0"
ANT = "ant:ant:jar:1.6.5"
-AXIOM = group("axiom-api", "axiom-impl", "axiom-dom", :under=>"org.apache.ws.commons.axiom", :version=>"1.2.4")
-AXIS2 = "org.apache.axis2:axis2:jar:1.1.1"
-AXIS2_WAR = "org.apache.axis2:axis2:war:1.1.1"
-AXIS2_ALL = group("axis2-adb", "axis2-codegen", "axis2-tools",
+AXIOM = [ group("axiom-api", "axiom-impl", "axiom-dom",
+ :under=>"org.apache.ws.commons.axiom", :version=>"1.2.5") ]
+AXIS2_WAR = "org.apache.axis2:axis2-webapp:war:1.3-RC3"
+AXIS2_ALL = group("axis2-adb", "axis2-codegen", "axis2-kernel",
"axis2-java2wsdl", "axis2-jibx", "axis2-saaj", "axis2-xmlbeans",
- :under=>"org.apache.axis2", :version=>"1.1.1")
-AXIS2_PATCHED = "org.apache.axis2:axis2-kernel-intalio:jar:1.1.1b"
+ :under=>"org.apache.axis2", :version=>"1.3-RC3")
BACKPORT = "backport-util-concurrent:backport-util-concurrent:jar:3.0"
COMMONS = struct(
:codec =>"commons-codec:commons-codec:jar:1.3",
@@ -88,12 +87,12 @@
WOODSTOX = "woodstox:wstx-asl:jar:3.2.1"
WSDL4J = "wsdl4j:wsdl4j:jar:1.6.1"
XALAN = "org.apache.ode:xalan:jar:2.7.0"
-XERCES = "xerces:xercesImpl:jar:2.8.0"
+XERCES = "xerces:xercesImpl:jar:2.9.0"
XSTREAM = "xstream:xstream:jar:1.2"
WS_COMMONS = struct(
:axiom =>AXIOM,
- :neethi =>"org.apache.ws.commons.neethi:neethi:jar:2.0",
- :xml_schema =>"org.apache.ws.commons.schema:XmlSchema:jar:1.3.1"
+ :neethi =>"org.apache.neethi:neethi:jar:2.0.2",
+ :xml_schema =>"org.apache.ws.commons.schema:XmlSchema:jar:1.3.2"
)
XBEAN = group("xbean-classloader", "xbean-kernel", "xbean-server", "xbean-spring",
:under=>"org.apache.xbean", :version=>"2.8")
@@ -131,7 +130,7 @@
define "axis2" do
compile.with projects("bpel-api", "bpel-connector", "bpel-dao", "bpel-epr", "bpel-runtime",
"scheduler-simple", "bpel-schemas", "bpel-store", "utils"),
- AXIOM, AXIS2, COMMONS.logging, COMMONS.collections, DERBY, GERONIMO.kernel, GERONIMO.transaction,
+ AXIOM, AXIS2_ALL, COMMONS.logging, COMMONS.collections, DERBY, GERONIMO.kernel, GERONIMO.transaction,
JAVAX.activation, JAVAX.servlet, JAVAX.stream, JAVAX.transaction, JENCKS, WSDL4J, WS_COMMONS.xml_schema,
XMLBEANS
@@ -147,7 +146,7 @@
"bpel-epr", "bpel-obj", "bpel-ql", "bpel-runtime", "scheduler-simple",
"bpel-schemas", "bpel-store", "dao-hibernate", "jacob", "jca-ra", "jca-server",
"utils", "dao-jpa"),
- AXIS2_ALL, AXIS2_PATCHED, ANNONGEN, BACKPORT, COMMONS.codec, COMMONS.collections, COMMONS.fileupload, COMMONS.httpclient,
+ AXIS2_ALL, ANNONGEN, BACKPORT, COMMONS.codec, COMMONS.collections, COMMONS.fileupload, COMMONS.httpclient,
COMMONS.lang, COMMONS.logging, COMMONS.pool, DERBY, DERBY_TOOLS, JAXEN, JAVAX.activation, JAVAX.ejb, JAVAX.javamail,
JAVAX.connector, JAVAX.jms, JAVAX.persistence, JAVAX.transaction, JAVAX.stream, JIBX,
GERONIMO.connector, GERONIMO.kernel, GERONIMO.transaction, LOG4J, OPENJPA, SAXON, TRANQL,
Modified: ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java?view=diff&rev=563259&r1=563258&r2=563259
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java (original)
+++ ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java Mon Aug 6 13:33:58 2007
@@ -66,7 +66,7 @@
+" WSDL="+wsdlDefinition.getDocumentBaseURI()
+" BPEL="+pconf.getBpelDocument());
}
-
+
try {
URI baseUri = pconf.getBaseURI().resolve(wsdlDefinition.getDocumentBaseURI());
InputStream is = baseUri.toURL().openStream();
@@ -95,7 +95,7 @@
}
return axisService;
} catch (Exception e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}
}
@@ -182,5 +182,5 @@
}
}
-
+
}
Modified: ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEMessageReceiver.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEMessageReceiver.java?view=diff&rev=563259&r1=563258&r2=563259
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEMessageReceiver.java (original)
+++ ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEMessageReceiver.java Mon Aug 6 13:33:58 2007
@@ -25,6 +25,7 @@
import org.apache.axis2.engine.AxisEngine;
import org.apache.axis2.receivers.AbstractMessageReceiver;
import org.apache.axis2.util.Utils;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.axis2.ODEService;
@@ -38,7 +39,7 @@
private ODEService _service;
- public final void receive(final MessageContext msgContext) throws AxisFault {
+ public final void invokeBusinessLogic(final MessageContext msgContext) throws AxisFault {
if (hasResponse(msgContext.getAxisOperation())) {
if (__log.isDebugEnabled())
__log.debug("Received request message for " + msgContext.getAxisService().getName() + "."
@@ -73,14 +74,14 @@
}
private boolean hasResponse(AxisOperation op) {
- switch (op.getAxisSpecifMEPConstant()) {
- case AxisOperation.WSDL20_2004Constants.MEP_CONSTANT_IN_OUT:
+ switch (op.getAxisSpecificMEPConstant()) {
+ case WSDLConstants.MEP_CONSTANT_IN_OUT:
return true;
- case AxisOperation.WSDL20_2004Constants.MEP_CONSTANT_OUT_ONLY:
+ case WSDLConstants.MEP_CONSTANT_OUT_ONLY:
return true;
- case AxisOperation.WSDL20_2004Constants.MEP_CONSTANT_OUT_OPTIONAL_IN:
+ case WSDLConstants.MEP_CONSTANT_OUT_OPTIONAL_IN:
return true;
- case AxisOperation.WSDL20_2004Constants.MEP_CONSTANT_ROBUST_OUT_ONLY:
+ case WSDLConstants.MEP_CONSTANT_ROBUST_OUT_ONLY:
return true;
default:
return false;
Modified: ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java?view=diff&rev=563259&r1=563258&r2=563259
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java (original)
+++ ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java Mon Aug 6 13:33:58 2007
@@ -89,7 +89,7 @@
WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
wsdlReader.setFeature("javax.wsdl.verbose", false);
- File wsdlFile = new File(rootpath + "/deploy.wsdl");
+ File wsdlFile = new File(rootpath + "/deploy.wsdl");
def = wsdlReader.readWSDL(wsdlFile.toURI().toString());
AxisService deployService = ODEAxisService.createService(
axisConfig, new QName("http://www.apache.org/ode/deployapi", "DeploymentService"),
@@ -105,7 +105,7 @@
class DeploymentMessageReceiver extends AbstractMessageReceiver {
- public void receive(MessageContext messageContext) throws AxisFault {
+ public void invokeBusinessLogic(MessageContext messageContext) throws AxisFault {
String operation = messageContext.getAxisOperation().getName().getLocalPart();
SOAPFactory factory = getSOAPFactory(messageContext);
boolean unknown = false;
Modified: ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/ManagementService.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/ManagementService.java?view=diff&rev=563259&r1=563258&r2=563259
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/ManagementService.java (original)
+++ ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/ManagementService.java Mon Aug 6 13:33:58 2007
@@ -48,6 +48,7 @@
import org.apache.axis2.engine.AxisEngine;
import org.apache.axis2.receivers.AbstractMessageReceiver;
import org.apache.axis2.util.Utils;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.axis2.OdeFault;
@@ -82,7 +83,7 @@
WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
wsdlReader.setFeature("javax.wsdl.verbose", false);
- File wsdlFile = new File(rootpath + "/pmapi.wsdl");
+ File wsdlFile = new File(rootpath + "/pmapi.wsdl");
def = wsdlReader.readWSDL(wsdlFile.toURI().toString());
AxisService processService = ODEAxisService.createService(
axisConfig, new QName("http://www.apache.org/ode/pmapi", "ProcessManagementService"),
@@ -99,7 +100,7 @@
}
}
- private static void receive(MessageContext msgContext, Class mgmtClass,
+ private static void invokeBusinessLogic(MessageContext msgContext, Class mgmtClass,
Object mgmtObject, SOAPFactory soapFactory) throws AxisFault {
if (__log.isDebugEnabled())
__log.debug("Received mgmt message for " + msgContext.getAxisService().getName() +
@@ -214,25 +215,25 @@
}
private static boolean hasResponse(AxisOperation op) {
- switch(op.getAxisSpecifMEPConstant()) {
- case AxisOperation.WSDL20_2004Constants.MEP_CONSTANT_IN_OUT: return true;
- case AxisOperation.WSDL20_2004Constants.MEP_CONSTANT_OUT_ONLY: return true;
- case AxisOperation.WSDL20_2004Constants.MEP_CONSTANT_OUT_OPTIONAL_IN: return true;
- case AxisOperation.WSDL20_2004Constants.MEP_CONSTANT_ROBUST_OUT_ONLY: return true;
+ switch(op.getAxisSpecificMEPConstant()) {
+ case WSDLConstants.MEP_CONSTANT_IN_OUT: return true;
+ case WSDLConstants.MEP_CONSTANT_OUT_ONLY: return true;
+ case WSDLConstants.MEP_CONSTANT_OUT_OPTIONAL_IN: return true;
+ case WSDLConstants.MEP_CONSTANT_ROBUST_OUT_ONLY: return true;
default: return false;
}
}
class ProcessMessageReceiver extends AbstractMessageReceiver {
- public void receive(MessageContext messageContext) throws AxisFault {
- ManagementService.receive(messageContext, ProcessManagement.class,
+ public void invokeBusinessLogic(MessageContext messageContext) throws AxisFault {
+ ManagementService.invokeBusinessLogic(messageContext, ProcessManagement.class,
_processMgmt, getSOAPFactory(messageContext));
}
}
class InstanceMessageReceiver extends AbstractMessageReceiver {
- public void receive(MessageContext messageContext) throws AxisFault {
- ManagementService.receive(messageContext, InstanceManagement.class,
+ public void invokeBusinessLogic(MessageContext messageContext) throws AxisFault {
+ ManagementService.invokeBusinessLogic(messageContext, InstanceManagement.class,
_instanceMgmt, getSOAPFactory(messageContext));
}
}