You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ch...@apache.org on 2005/10/13 05:14:19 UTC
svn commit: r320618 - in /webservices/axis2/trunk/java/modules:
codegen/src/org/apache/axis2/databinding/utils/
codegen/src/org/apache/axis2/rpc/receivers/
codegen/src/org/apache/axis2/wsdl/template/java/
core/src/org/apache/axis2/context/ core/src/org...
Author: chinthaka
Date: Wed Oct 12 20:13:42 2005
New Revision: 320618
URL: http://svn.apache.org/viewcvs?rev=320618&view=rev
Log:
Renaming getAxisOperation() to getOperationDescription() in OperationDescription. I know we have a naming problem, but for the time being I made this to be consistent with the existing hierarchy.
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/utils/ADBPullParser.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContext.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchingChecker.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/Phase.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerailzationWithEngine.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerializationTest.java
webservices/axis2/trunk/java/modules/samples/src/sample/groovy/GroovyReceiver.java
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/utils/ADBPullParser.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/utils/ADBPullParser.java?rev=320618&r1=320617&r2=320618&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/utils/ADBPullParser.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/utils/ADBPullParser.java Wed Oct 12 20:13:42 2005
@@ -89,6 +89,8 @@
* ---------------------------------------------------------------
* | "Name" | "FooOne" | QName("DependentOne") | Dependent object|
* ---------------------------------------------------------------
+ * Remember "Name" and "FooOne" MUST be strings and DependentOne SHOULD be
+ * QName.
* This DependentObject can either be an ADBBean or a POJO. If its an ADBBean
* We directly get the pull parser from that. If not we create a reflection based
* pull parser for that java bean.
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java?rev=320618&r1=320617&r2=320618&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java Wed Oct 12 20:13:42 2005
@@ -1,17 +1,17 @@
package org.apache.axis2.rpc.receivers;
-import org.apache.axis2.context.MessageContext;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.util.BeanSerializerUtil;
-import org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver;
-import org.apache.axis2.soap.SOAPEnvelope;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.description.OperationDescription;
+import org.apache.axis2.engine.DependencyManager;
+import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
import org.apache.axis2.om.impl.llom.factory.OMXMLBuilderFactory;
-import org.apache.axis2.engine.DependencyManager;
-import org.apache.axis2.description.OperationDescription;
+import org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver;
+import org.apache.axis2.soap.SOAPEnvelope;
+import org.apache.axis2.util.BeanSerializerUtil;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
@@ -77,8 +77,7 @@
Class ImplClass = obj.getClass();
DependencyManager.configureBusinessLogicProvider(obj, inMessage, null);
- OperationDescription op = inMessage.getOperationContext()
- .getAxisOperation();
+ OperationDescription op = inMessage.getOperationContext().getOperationDescription();
if (op == null) {
throw new AxisFault(
"Operation is not located, if this is doclit style the SOAP-ACTION should " +
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl?rev=320618&r1=320617&r2=320618&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl Wed Oct 12 20:13:42 2005
@@ -27,7 +27,7 @@
//Out Envelop
org.apache.axis2.soap.SOAPEnvelope envelope = null;
//Find the operation that has been set by the Dispatch phase.
- org.apache.axis2.description.OperationDescription op = msgContext.getOperationContext().getAxisOperation();
+ org.apache.axis2.description.OperationDescription op = msgContext.getOperationContext().getOperationDescription();
if (op == null) {
throw new org.apache.axis2.AxisFault("Operation is not located, if this is doclit style the SOAP-ACTION should specified via the SOAP Action to use the RawXMLProvider");
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java?rev=320618&r1=320617&r2=320618&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java Wed Oct 12 20:13:42 2005
@@ -49,11 +49,11 @@
PhaseResolver phaseResolver = new PhaseResolver(configuration);
Parameter parameter = configuration.getParameter("seralizeLocation");
- String serailzeLocaion = ".";
+ String serializeLocation = ".";
if (parameter !=null) {
- serailzeLocaion = ((String)parameter.getValue()).trim();
+ serializeLocation = ((String)parameter.getValue()).trim();
}
- File objFile = new File(serailzeLocaion,"Axis2.obj");
+ File objFile = new File(serializeLocation,"Axis2.obj");
if(objFile.exists()){
try {
FileInputStream filein = new FileInputStream(objFile);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java?rev=320618&r1=320617&r2=320618&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java Wed Oct 12 20:13:42 2005
@@ -534,9 +534,6 @@
this.transportOutname = out.getName();
}
- /**
- * @return
- */
public OperationContext getOperationContext() {
return operationContext;
}
@@ -551,7 +548,7 @@
}
this.setParent(operationContext);
if (operationContext != null) {
- this.setOperationDescription(operationContext.getAxisOperation());
+ this.setOperationDescription(operationContext.getOperationDescription());
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContext.java?rev=320618&r1=320617&r2=320618&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/OperationContext.java Wed Oct 12 20:13:42 2005
@@ -25,9 +25,9 @@
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.util.Map;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
/**
* An OperationContext represents a running "instance" of an operation, which is
@@ -138,7 +138,7 @@
/**
* @return Returns the axisOperation.
*/
- public OperationDescription getAxisOperation() {
+ public OperationDescription getOperationDescription() {
return axisOperation;
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java?rev=320618&r1=320617&r2=320618&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java Wed Oct 12 20:13:42 2005
@@ -70,7 +70,7 @@
if (relatesTo != null || "".equals(relatesTo)) {
OperationContext operationContext = msgctx.getSystemContext().getOperationContext(relatesTo);
if (operationContext != null) {
- msgctx.setOperationDescription(operationContext.getAxisOperation());
+ msgctx.setOperationDescription(operationContext.getOperationDescription());
msgctx.setOperationContext(operationContext);
msgctx.setServiceContext((ServiceContext) operationContext.getParent());
msgctx.setServiceDescription(((ServiceContext) operationContext.getParent()).getServiceConfig());
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java?rev=320618&r1=320617&r2=320618&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java Wed Oct 12 20:13:42 2005
@@ -83,7 +83,7 @@
//find and invoke the Phases
OperationContext operationContext = msgContext.getOperationContext();
ArrayList phases =
- operationContext.getAxisOperation().getPhasesOutFlow();
+ operationContext.getOperationDescription().getPhasesOutFlow();
if (msgContext.isPaused()) {
// the message has paused, so rerun them from the position they stoped. The Handler
//who paused the Message will be the first one to run
@@ -132,7 +132,7 @@
//resume operation specific phases
OperationContext operationContext =
msgContext.getOperationContext();
- operationDescription = operationContext.getAxisOperation();
+ operationDescription = operationContext.getOperationDescription();
operationSpecificPhases =
operationDescription.getRemainingPhasesInFlow();
resumeInvocationPhases(operationSpecificPhases, msgContext);
@@ -141,7 +141,7 @@
verifyContextBuilt(msgContext);
OperationContext operationContext =
msgContext.getOperationContext();
- operationDescription = operationContext.getAxisOperation();
+ operationDescription = operationContext.getOperationDescription();
operationSpecificPhases =
operationDescription.getRemainingPhasesInFlow();
invokePhases(operationSpecificPhases, msgContext);
@@ -165,7 +165,7 @@
OperationContext opContext = msgContext.getOperationContext();
//find and execute the Fault Out Flow Handlers
if (opContext != null) {
- OperationDescription axisOperation = opContext.getAxisOperation();
+ OperationDescription axisOperation = opContext.getOperationDescription();
ArrayList phases = axisOperation.getPhasesOutFaultFlow();
if (msgContext.isPaused()) {
resumeInvocationPhases(phases, msgContext);
@@ -211,7 +211,7 @@
opContext = msgContext.getOperationContext();
//find and execute the Fault In Flow Handlers
if (opContext != null) {
- OperationDescription axisOperation = opContext.getAxisOperation();
+ OperationDescription axisOperation = opContext.getOperationDescription();
ArrayList phases = axisOperation.getPhasesInFaultFlow();
if (msgContext.isPaused()) {
resumeInvocationPhases(phases, msgContext);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchingChecker.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchingChecker.java?rev=320618&r1=320617&r2=320618&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchingChecker.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DispatchingChecker.java Wed Oct 12 20:13:42 2005
@@ -54,7 +54,7 @@
*/
public final void invoke(MessageContext msgctx) throws AxisFault {
if(msgctx.getOperationDescription() == null && msgctx.getOperationContext() != null ){
- msgctx.setOperationDescription(msgctx.getOperationContext().getAxisOperation());
+ msgctx.setOperationDescription(msgctx.getOperationContext().getOperationDescription());
}
if(msgctx.getServiceDescription() == null && msgctx.getServiceContext() != null){
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/Phase.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/Phase.java?rev=320618&r1=320617&r2=320618&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/Phase.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/Phase.java Wed Oct 12 20:13:42 2005
@@ -91,7 +91,7 @@
* this is want if the phaseFirst and phaseLst same hanlder
* that is for this phase there is only one phase
*/
- private boolean isonehanlder;
+ private boolean isOneHanlder;
/**
* Constructor Phase
@@ -275,7 +275,7 @@
* @throws PhaseException
*/
public void addHandler(HandlerDescription handler) throws PhaseException {
- if (isonehanlder) {
+ if (isOneHanlder) {
throw new PhaseException(
this.getPhaseName()
+ "can only have one handler, since there is a "
@@ -291,7 +291,7 @@
+ " is invalid or incorrect phase rules");
} else {
handlers.add(handler.getHandler());
- isonehanlder = true;
+ isOneHanlder = true;
return;
}
} else if (handler.getRules().isPhaseFirst()) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java?rev=320618&r1=320617&r2=320618&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java Wed Oct 12 20:13:42 2005
@@ -76,7 +76,7 @@
DependencyManager.configureBusinessLogicProvider(obj, msgContext, null);
OperationDescription op = msgContext.getOperationContext()
- .getAxisOperation();
+ .getOperationDescription();
if (op == null) {
throw new AxisFault(
"Operation is not located, if this is doclit style the SOAP-ACTION should specified via the SOAP Action to use the RawXMLProvider");
@@ -101,7 +101,7 @@
SOAPEnvelope envelope = null;
String style = msgContext.getOperationContext()
- .getAxisOperation()
+ .getOperationDescription()
.getStyle();
if (WSDLService.STYLE_DOC.equals(style)) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java?rev=320618&r1=320617&r2=320618&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java Wed Oct 12 20:13:42 2005
@@ -75,11 +75,11 @@
DependencyManager.configureBusinessLogicProvider(obj, msgContext, newmsgContext);
OperationDescription opDesc = msgContext.getOperationContext()
- .getAxisOperation();
+ .getOperationDescription();
Method method = findOperation(opDesc, ImplClass);
if (method != null) {
String style = msgContext.getOperationContext()
- .getAxisOperation()
+ .getOperationDescription()
.getStyle();
Class[] parameters = method.getParameterTypes();
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerailzationWithEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerailzationWithEngine.java?rev=320618&r1=320617&r2=320618&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerailzationWithEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerailzationWithEngine.java Wed Oct 12 20:13:42 2005
@@ -124,7 +124,7 @@
AxisConfiguration axisConfiguration1 = newConfigContext.getAxisConfiguration();
assertNotNull(axisConfiguration1);
- assertNotNull(operationContext1.getAxisOperation());
+ assertNotNull(operationContext1.getOperationDescription());
assertNotNull(serviceGroupcontext1.getDescription());
assertNotNull(serviceContext1.getServiceConfig());
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerializationTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerializationTest.java?rev=320618&r1=320617&r2=320618&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerializationTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerializationTest.java Wed Oct 12 20:13:42 2005
@@ -19,10 +19,10 @@
import junit.framework.TestCase;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.miheaders.RelatesTo;
+import org.apache.axis2.description.InOutOperationDescrition;
import org.apache.axis2.description.OperationDescription;
import org.apache.axis2.description.ServiceDescription;
import org.apache.axis2.description.ServiceGroupDescription;
-import org.apache.axis2.description.InOutOperationDescrition;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.AxisConfigurationImpl;
import org.apache.wsdl.WSDLConstants;
@@ -166,7 +166,7 @@
AxisConfiguration axisConfiguration1 = configurationContext.getAxisConfiguration();
assertNotNull(axisConfiguration1);
- assertNotNull(operationContext1.getAxisOperation());
+ assertNotNull(operationContext1.getOperationDescription());
assertNotNull(serviceGroupcontext1.getDescription());
assertNotNull(serviceContext1.getServiceConfig());
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/groovy/GroovyReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/groovy/GroovyReceiver.java?rev=320618&r1=320617&r2=320618&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/groovy/GroovyReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/groovy/GroovyReceiver.java Wed Oct 12 20:13:42 2005
@@ -73,7 +73,7 @@
//look at the method name. if available this should be a groovy method
OperationDescription op =
- inMessage.getOperationContext().getAxisOperation();
+ inMessage.getOperationContext().getOperationDescription();
if (op == null) {
throw new AxisFault(
Messages.getMessage("notFound", "Operation"));