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 de...@apache.org on 2006/10/24 09:00:20 UTC
svn commit: r467258 - in /webservices/axis2/branches/java/1_1/modules:
adb/src/org/apache/axis2/rpc/receivers/
codegen/src/org/apache/axis2/wsdl/template/java/
integration/test/org/apache/axis2/async/
integration/test/org/apache/axis2/engine/util/ inte...
Author: deepal
Date: Tue Oct 24 00:00:18 2006
New Revision: 467258
URL: http://svn.apache.org/viewvc?view=rev&rev=467258
Log:
- fixed problems in MessageContext.getCurrentContext();
- remove setOperationContext();
- rename services parameter into ServicesDirectory and
- rename modules parameter inti ModulesDirectory
Modified:
webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOnlyMessageReceiver.java
webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/async/AsyncMessageReceiver.java
webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/util/FaultThrowingService.java
webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/mtom/EchoService2.java
webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/swa/EchoSwA.java
webservices/axis2/branches/java/1_1/modules/kernel/conf/axis2.xml
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/context/MessageContext.java
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutAsyncMessageReceiver.java
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java
webservices/axis2/branches/java/1_1/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java
Modified: webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOnlyMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOnlyMessageReceiver.java?view=diff&rev=467258&r1=467257&r2=467258
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOnlyMessageReceiver.java (original)
+++ webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOnlyMessageReceiver.java Tue Oct 24 00:00:18 2006
@@ -42,8 +42,6 @@
Object obj = getTheImplementationObject(inMessage);
Class ImplClass = obj.getClass();
- DependencyManager.configureBusinessLogicProvider(obj,
- inMessage.getOperationContext());
AxisOperation op = inMessage.getOperationContext().getAxisOperation();
Modified: webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java?view=diff&rev=467258&r1=467257&r2=467258
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java (original)
+++ webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java Tue Oct 24 00:00:18 2006
@@ -69,8 +69,6 @@
Object obj = getTheImplementationObject(inMessage);
Class ImplClass = obj.getClass();
- DependencyManager.configureBusinessLogicProvider(obj,
- inMessage.getOperationContext());
AxisOperation op = inMessage.getOperationContext().getAxisOperation();
AxisService service = inMessage.getAxisService();
Modified: webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java?view=diff&rev=467258&r1=467257&r2=467258
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java (original)
+++ webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java Tue Oct 24 00:00:18 2006
@@ -75,8 +75,6 @@
Object obj = getTheImplementationObject(inMessage);
Class ImplClass = obj.getClass();
- DependencyManager.configureBusinessLogicProvider(obj,
- inMessage.getOperationContext());
AxisOperation op = inMessage.getOperationContext().getAxisOperation();
AxisService service = inMessage.getAxisService();
Modified: webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl?view=diff&rev=467258&r1=467257&r2=467258
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl (original)
+++ webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl Tue Oct 24 00:00:18 2006
@@ -39,9 +39,6 @@
// get the implementation class for the Web Service
Object obj = getTheImplementationObject(msgContext);
- //Inject the Message Context if it is asked for
- org.apache.axis2.engine.DependencyManager.configureBusinessLogicProvider(obj, msgContext.getOperationContext());
-
<xsl:value-of select="$skeletonname"/> skel = (<xsl:value-of select="$skeletonname"/>)obj;
//Out Envelop
org.apache.axiom.soap.SOAPEnvelope envelope = null;
@@ -230,9 +227,6 @@
// get the implementation class for the Web Service
Object obj = getTheImplementationObject(inMessage);
- //Inject the Message Context if it is asked for
- org.apache.axis2.engine.DependencyManager.configureBusinessLogicProvider(obj, inMessage.getOperationContext());
-
<xsl:value-of select="$skeletonname"/> skel = (<xsl:value-of select="$skeletonname"/>)obj;
//Out Envelop
org.apache.axiom.soap.SOAPEnvelope envelope = null;
@@ -355,9 +349,6 @@
// get the implementation class for the Web Service
Object obj = getTheImplementationObject(msgContext);
-
- //Inject the Message Context if it is asked for
- org.apache.axis2.engine.DependencyManager.configureBusinessLogicProvider(obj, msgContext.getOperationContext());
<xsl:value-of select="$skeletonname"/> skel = (<xsl:value-of select="$skeletonname"/>)obj;
//Out Envelop
Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/async/AsyncMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/async/AsyncMessageReceiver.java?view=diff&rev=467258&r1=467257&r2=467258
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/async/AsyncMessageReceiver.java (original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/async/AsyncMessageReceiver.java Tue Oct 24 00:00:18 2006
@@ -41,10 +41,6 @@
// find the WebService method
Class ImplClass = obj.getClass();
- // Inject the Message Context if it is asked for
- DependencyManager.configureBusinessLogicProvider(obj,
- msgContext.getOperationContext());
-
AxisOperation opDesc = msgContext.getOperationContext().getAxisOperation();
Method method = findOperation(opDesc, ImplClass);
Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/util/FaultThrowingService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/util/FaultThrowingService.java?view=diff&rev=467258&r1=467257&r2=467258
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/util/FaultThrowingService.java (original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/engine/util/FaultThrowingService.java Tue Oct 24 00:00:18 2006
@@ -1,18 +1,10 @@
package org.apache.axis2.engine.util;
-import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axiom.soap.SOAPFaultCode;
-import org.apache.axiom.soap.SOAPFaultReason;
-import org.apache.axiom.soap.SOAPFaultDetail;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPFaultValue;
-import org.apache.axiom.soap.SOAPFaultText;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.soap.*;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.wsdl.WSDLConstants;
import javax.xml.namespace.QName;
/*
@@ -36,25 +28,18 @@
public static final String THROW_FAULT_AS_AXIS_FAULT = "ThrowFaultAsAxisFault";
public static final String THROW_FAULT_WITH_MSG_CTXT = "ThrowFaultWithMsgCtxt";
- MessageContext inMessageContext;
private SOAPFaultCode soapFaultCode;
private SOAPFaultReason soapFaultReason;
private SOAPFaultDetail soapFaultDetail;
- public void setOperationContext(OperationContext opContext) {
- try {
- inMessageContext = opContext.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
- } catch (AxisFault axisFault) {
- axisFault.printStackTrace();
- }
- }
-
public OMElement echoWithFault(OMElement echoOMElement) throws AxisFault {
String text = echoOMElement.getText();
if (THROW_FAULT_AS_AXIS_FAULT.equalsIgnoreCase(text)) {
throw new AxisFault(new QName("http://test.org", "TestFault", "test"), "FaultReason", new Exception("This is a test Exception"));
} else if (THROW_FAULT_WITH_MSG_CTXT.equalsIgnoreCase(text)) {
- initFaultInformation();
+ MessageContext inMessageContext = MessageContext.getCurrentMessageContext();
+ initFaultInformation(inMessageContext);
+
inMessageContext.setProperty(SOAP12Constants.SOAP_FAULT_CODE_LOCAL_NAME, soapFaultCode);
inMessageContext.setProperty(SOAP12Constants.SOAP_FAULT_REASON_LOCAL_NAME, soapFaultReason);
inMessageContext.setProperty(SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME, soapFaultDetail);
@@ -64,7 +49,7 @@
}
}
- private void initFaultInformation() {
+ private void initFaultInformation(MessageContext inMessageContext) {
SOAPFactory soapFactory;
if (inMessageContext.isSOAP11()) {
soapFactory = OMAbstractFactory.getSOAP11Factory();
Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/mtom/EchoService2.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/mtom/EchoService2.java?view=diff&rev=467258&r1=467257&r2=467258
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/mtom/EchoService2.java (original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/mtom/EchoService2.java Tue Oct 24 00:00:18 2006
@@ -1,53 +1,40 @@
-/*
-* Copyright 2004,2005 The Apache Software Foundation.
-*
-* Licensed 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.
-*/
-
+/*
+* Copyright 2004,2005 The Apache Software Foundation.
+*
+* Licensed 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.axis2.mtom;
+import org.apache.axiom.attachments.Attachments;
import org.apache.axiom.attachments.IncomingAttachmentInputStream;
import org.apache.axiom.attachments.IncomingAttachmentStreams;
-import org.apache.axiom.attachments.Attachments;
import org.apache.axiom.attachments.utils.IOUtils;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.util.Base64;
import org.apache.axiom.om.impl.MTOMConstants;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.axiom.om.util.Base64;
+import org.apache.axis2.context.MessageContext;
public class EchoService2 {
- OperationContext oprCtx;
-
- public void setOperationContext(OperationContext oprCtx) {
- this.oprCtx = oprCtx;
- }
public OMElement mtomSample(OMElement element) throws Exception {
Attachments attachments = null;
-
- if (this.oprCtx != null) {
- attachments = (Attachments) this.oprCtx.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE).getProperty(MTOMConstants.ATTACHMENTS);
- } else {
- throw new AxisFault("Message context not set/Attachments not set");
- }
-
+ attachments = (Attachments) MessageContext.getCurrentMessageContext().getProperty(MTOMConstants.ATTACHMENTS);
// Get image data
IncomingAttachmentStreams streams = attachments.getIncomingAttachmentStreams();
IncomingAttachmentInputStream stream = streams.getNextStream();
Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/swa/EchoSwA.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/swa/EchoSwA.java?view=diff&rev=467258&r1=467257&r2=467258
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/swa/EchoSwA.java (original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/swa/EchoSwA.java Tue Oct 24 00:00:18 2006
@@ -20,12 +20,10 @@
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMText;
-import org.apache.axiom.om.impl.MTOMConstants;
import org.apache.axiom.om.impl.llom.OMTextImpl;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.wsdl.WSDLConstants;
import javax.activation.DataHandler;
import javax.xml.namespace.QName;
@@ -35,15 +33,10 @@
*/
public class EchoSwA {
- private OperationContext operationContext;
public EchoSwA() {
}
- public void setOperationContext(OperationContext oc) throws AxisFault {
- operationContext = oc;
- }
-
public OMElement echoAttachment(OMElement omEle) throws AxisFault {
OMElement child = (OMElement) omEle.getFirstOMChild();
OMAttribute attr = child.getAttribute(new QName("href"));
@@ -52,9 +45,10 @@
if (contentID.substring(0, 3).equalsIgnoreCase("cid")) {
contentID = contentID.substring(4);
}
-
- Attachments attachment = (Attachments) (operationContext.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE)).getAttachmentMap();
-
+
+ MessageContext msgCtx = MessageContext.getCurrentMessageContext();
+ Attachments attachment = (msgCtx).getAttachmentMap();
+
DataHandler dataHandler = attachment.getDataHandler(contentID);
OMText textNode = new OMTextImpl(dataHandler, omEle.getOMFactory());
omEle.build();
@@ -62,12 +56,14 @@
omEle.addChild(textNode);
return omEle;
}
-
+
public OMElement echoOMElement(OMElement omEle) throws AxisFault {
OMElement child = (OMElement) omEle.getFirstOMChild();
- Attachments attachment = (Attachments) (operationContext.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE)).getAttachmentMap();
- operationContext.getMessageContext(WSDLConstants.MESSAGE_LABEL_OUT_VALUE).setAttachmentMap(attachment);
-
+ MessageContext msgCtx = MessageContext.getCurrentMessageContext();
+ Attachments attachment = (msgCtx).getAttachmentMap();
+ msgCtx.getOperationContext().getMessageContext(
+ WSDLConstants.MESSAGE_LABEL_OUT_VALUE).setAttachmentMap(attachment);
+
omEle.build();
return omEle;
}
Modified: webservices/axis2/branches/java/1_1/modules/kernel/conf/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/conf/axis2.xml?view=diff&rev=467258&r1=467257&r2=467258
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/conf/axis2.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/conf/axis2.xml Tue Oct 24 00:00:18 2006
@@ -29,9 +29,9 @@
<parameter name="password" locked="false">axis2</parameter>
<!--To override repository/services you need to uncomment following parameter and value SHOULD be absolute file path.-->
- <!--<parameter name="services" locked="false">service</parameter>-->
+ <!--<parameter name="ServicesDirectory" locked="false">service</parameter>-->
<!--To override repository/modules you need to uncomment following parameter and value SHOULD be absolute file path-->
- <!--<parameter name="modules" locked="false">modules</parameter>-->
+ <!--<parameter name="ModulesDirectory" locked="false">modules</parameter>-->
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/context/MessageContext.java?view=diff&rev=467258&r1=467257&r2=467258
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/context/MessageContext.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/context/MessageContext.java Tue Oct 24 00:00:18 2006
@@ -43,6 +43,19 @@
*/
public class MessageContext extends AbstractContext {
+ /**
+ * A place to store the current MessageContext
+ */
+ public static ThreadLocal currentMessageContext = new ThreadLocal();
+
+ public static MessageContext getCurrentMessageContext() {
+ return (MessageContext) currentMessageContext.get();
+ }
+
+ public static void setCurrentMessageContext(MessageContext ctx) {
+ currentMessageContext.set(ctx);
+ }
+
protected Options options;
public final static int IN_FLOW = 1;
@@ -54,7 +67,7 @@
public static final String REMOTE_ADDR = "REMOTE_ADDR";
public static final String TRANSPORT_HEADERS = "TRANSPORT_HEADERS";
-
+
public Attachments attachments = new Attachments();
/**
@@ -132,7 +145,7 @@
// Are we doing MTOM now?
private boolean doingMTOM;
-
+
// Are we doing SwA now?
private boolean doingSwA;
@@ -627,7 +640,7 @@
public boolean isDoingREST() {
return doingREST;
}
-
+
/**
* @return Returns boolean.
*/
@@ -736,7 +749,7 @@
public void setDoingREST(boolean b) {
doingREST = b;
}
-
+
/**
* @param b
*/
@@ -1039,42 +1052,40 @@
*/
public boolean isHeaderPresent() {
OMElement node = this.envelope.getFirstElement();
- if (node ==null)
- {
- return false;
- }
- else if (node.getQName().getLocalPart().equals(SOAPConstants.BODY_LOCAL_NAME)) {
+ if (node == null) {
+ return false;
+ } else if (node.getQName().getLocalPart().equals(SOAPConstants.BODY_LOCAL_NAME)) {
return false;
}
return true;
}
-
+
/**
- * Setting of the attachments map should be performed at the receipt of a
- * message only. This method is only meant to be used by the Axis2
- * internals.
- *
- * @param attachments
- */
+ * Setting of the attachments map should be performed at the receipt of a
+ * message only. This method is only meant to be used by the Axis2
+ * internals.
+ *
+ * @param attachments
+ */
public void setAttachmentMap(Attachments attachments) {
- this.attachments = attachments;
- }
-
- public Attachments getAttachmentMap(){
- return attachments;
- }
-
- public void addAttachment(String contentID, DataHandler dataHandler) {
- attachments.addDataHandler(contentID, dataHandler);
- }
-
- public String addAttachment(DataHandler dataHandler) {
- String contentID = UUIDGenerator.getUUID();
- addAttachment(contentID, dataHandler);
- return contentID;
- }
-
- public DataHandler getAttachment(String contentID) {
- return attachments.getDataHandler(contentID);
- }
+ this.attachments = attachments;
+ }
+
+ public Attachments getAttachmentMap() {
+ return attachments;
+ }
+
+ public void addAttachment(String contentID, DataHandler dataHandler) {
+ attachments.addDataHandler(contentID, dataHandler);
+ }
+
+ public String addAttachment(DataHandler dataHandler) {
+ String contentID = UUIDGenerator.getUUID();
+ addAttachment(contentID, dataHandler);
+ return contentID;
+ }
+
+ public DataHandler getAttachment(String contentID) {
+ return attachments.getDataHandler(contentID);
+ }
}
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java?view=diff&rev=467258&r1=467257&r2=467258
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java Tue Oct 24 00:00:18 2006
@@ -27,7 +27,9 @@
public static String SERVICES_XML = "META-INF/services.xml";
public static String MODULE_XML = "META-INF/module.xml";
public static String SERVICE_PATH = "services";
+ public static String SERVICE_DIR_PATH = "ServicesDirectory";
public static String MODULE_PATH = "modules";
+ public static String MODULE_DRI_PATH = "ModulesDirectory";
int TYPE_SERVICE = 0; // is it a service
int TYPE_DEFAULT = -1; // is it a service
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java?view=diff&rev=467258&r1=467257&r2=467258
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java Tue Oct 24 00:00:18 2006
@@ -832,13 +832,13 @@
}
}
String serviceDirPara = (String)
- axisConfig.getParameterValue(DeploymentConstants.SERVICE_PATH);
+ axisConfig.getParameterValue(DeploymentConstants.SERVICE_DIR_PATH);
if (serviceDirPara != null) {
servicesDirPath = serviceDirPara;
}
String moduleDirPara = (String)
- axisConfig.getParameterValue(DeploymentConstants.MODULE_PATH);
+ axisConfig.getParameterValue(DeploymentConstants.MODULE_DRI_PATH);
if (moduleDirPara != null) {
modulesDirPath = moduleDirPara;
}
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml?view=diff&rev=467258&r1=467257&r2=467258
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml Tue Oct 24 00:00:18 2006
@@ -21,9 +21,9 @@
<parameter name="password" locked="false">axis2</parameter>
<!--To override repository/services you need to uncomment following parameter and value SHOULD be absolute file path.-->
- <!--<parameter name="services" locked="false">service</parameter>-->
+ <!--<parameter name="ServicesDirectory" locked="false">service</parameter>-->
<!--To override repository/modules you need to uncomment following parameter and value SHOULD be absolute file path-->
- <!--<parameter name="modules" locked="false">modules</parameter>-->
+ <!--<parameter name="ModulesDirectory" locked="false">modules</parameter>-->
<!--Following params will set the proper context paths for invocations. All the endpoints will have a commons context-->
<!--root which can configured using the following contextRoot parameter-->
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java?view=diff&rev=467258&r1=467257&r2=467258
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/DependencyManager.java Tue Oct 24 00:00:18 2006
@@ -19,7 +19,6 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
-import org.apache.axis2.context.OperationContext;
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.context.ServiceGroupContext;
import org.apache.axis2.description.AxisService;
@@ -39,45 +38,10 @@
*/
public class DependencyManager {
private static final Log log = LogFactory.getLog(DependencyManager.class);
- public final static String MESSAGE_CONTEXT_INJECTION_METHOD = "setOperationContext";
public final static String SERVICE_INIT_METHOD = "init";
public final static String SERVICE_START_METHOD = "startUp";
public final static String SERVICE_DESTROY_METHOD = "destroy";
- public static void configureBusinessLogicProvider(Object obj,
- OperationContext opCtx)
- throws AxisFault {
- try {
- Class classToLoad = obj.getClass();
-
- // We can not call classToLoad.getDeclaredMethed() , since there
- // can be insatnce where mutiple services extends using one class
- // just for init and other reflection methods
- Method[] methods = classToLoad.getMethods();
-
- for (int i = 0; i < methods.length; i++) {
- if (MESSAGE_CONTEXT_INJECTION_METHOD.equals(methods[i].getName())
- && (methods[i].getParameterTypes().length == 1)
- && (methods[i].getParameterTypes()[0] == OperationContext.class)) {
- methods[i].invoke(obj, new Object[]{opCtx});
- break;
- }
- }
- } catch (SecurityException e) {
- log.info("Exception trying to call " + MESSAGE_CONTEXT_INJECTION_METHOD, e);
- throw new AxisFault(e);
- } catch (IllegalArgumentException e) {
- log.info("Exception trying to call " + MESSAGE_CONTEXT_INJECTION_METHOD, e);
- throw new AxisFault(e);
- } catch (IllegalAccessException e) {
- log.info("Exception trying to call " + MESSAGE_CONTEXT_INJECTION_METHOD, e);
- throw new AxisFault(e);
- } catch (InvocationTargetException e) {
- log.info("Exception trying to call " + MESSAGE_CONTEXT_INJECTION_METHOD, e);
- throw new AxisFault(e);
- }
- }
-
public static void initServiceClass(Object obj,
ServiceContext serviceContext) throws AxisFault {
try {
@@ -116,7 +80,7 @@
* @param serviceGroupContext
* @throws AxisFault
*/
- public static void initService(ServiceGroupContext serviceGroupContext) throws AxisFault{
+ public static void initService(ServiceGroupContext serviceGroupContext) throws AxisFault {
AxisServiceGroup serviceGroup = serviceGroupContext.getDescription();
Iterator serviceItr = serviceGroup.getServices();
while (serviceItr.hasNext()) {
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java?view=diff&rev=467258&r1=467257&r2=467258
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java Tue Oct 24 00:00:18 2006
@@ -42,6 +42,7 @@
public static final String SAVED_TCCL = "_SAVED_TCCL_";
public static final String SAVED_MC = "_SAVED_MC_";
+
// Place to store previous values
public class ThreadContextDescriptor {
public ClassLoader oldClassLoader;
@@ -49,19 +50,6 @@
}
/**
- * A place to store the current MessageContext
- */
- protected static ThreadLocal currentMessageContext = new ThreadLocal();
-
- protected static MessageContext getCurrentMessageContext() {
- return (MessageContext) currentMessageContext.get();
- }
-
- protected static void setCurrentMessageContext(MessageContext ctx) {
- currentMessageContext.set(ctx);
- }
-
- /**
* Several pieces of information need to be available to the service
* implementation class. For one, the ThreadContextClassLoader needs
* to be correct, and for another we need to give the service code
@@ -72,9 +60,8 @@
*/
protected ThreadContextDescriptor
setThreadContext(MessageContext msgContext) {
-
ThreadContextDescriptor tc = new ThreadContextDescriptor();
- tc.oldMessageContext = (MessageContext) currentMessageContext.get();
+ tc.oldMessageContext = (MessageContext) MessageContext.currentMessageContext.get();
ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
tc.oldClassLoader = contextClassLoader;
@@ -97,12 +84,13 @@
);
}
}
+ MessageContext.setCurrentMessageContext(msgContext);
return tc;
}
protected void restoreThreadContext(ThreadContextDescriptor tc) {
Thread.currentThread().setContextClassLoader(tc.oldClassLoader);
- currentMessageContext.set(tc.oldMessageContext);
+ MessageContext.currentMessageContext.set(tc.oldMessageContext);
}
/**
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java?view=diff&rev=467258&r1=467257&r2=467258
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java Tue Oct 24 00:00:18 2006
@@ -21,7 +21,6 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.engine.DependencyManager;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.i18n.Messages;
import org.apache.commons.logging.Log;
@@ -43,7 +42,7 @@
public class RawXMLINOnlyMessageReceiver extends AbstractInMessageReceiver
implements MessageReceiver {
- private static final Log log = LogFactory.getLog(RawXMLINOnlyMessageReceiver.class);
+ private static final Log log = LogFactory.getLog(RawXMLINOnlyMessageReceiver.class);
private Method findOperation(AxisOperation op, Class ImplClass) {
String methodName = op.getName().getLocalPart();
@@ -51,10 +50,10 @@
for (int i = 0; i < methods.length; i++) {
if (methods[i].getName().equals(methodName) &&
- methods[i].getParameterTypes().length == 1 &&
- OMElement.class.getName().equals(
- methods[i].getParameterTypes()[0].getName()) &&
- "void".equals(methods[i].getReturnType().getName())) {
+ methods[i].getParameterTypes().length == 1 &&
+ OMElement.class.getName().equals(
+ methods[i].getParameterTypes()[0].getName()) &&
+ "void".equals(methods[i].getReturnType().getName())) {
return methods[i];
}
}
@@ -64,6 +63,7 @@
/**
* Invokes the bussiness logic invocation on the service implementation class
+ *
* @param msgContext the incoming message context
* @throws AxisFault on invalid method (wrong signature)
*/
@@ -76,18 +76,15 @@
// find the WebService method
Class ImplClass = obj.getClass();
- DependencyManager.configureBusinessLogicProvider(obj,
- msgContext.getOperationContext());
-
AxisOperation op = msgContext.getOperationContext().getAxisOperation();
Method method = findOperation(op, ImplClass);
if (method != null) {
method.invoke(
- obj, new Object[] {msgContext.getEnvelope().getBody().getFirstElement()});
+ obj, new Object[]{msgContext.getEnvelope().getBody().getFirstElement()});
} else {
throw new AxisFault(Messages.getMessage("methodDoesNotExistInOnly",
- op.getName().toString()));
+ op.getName().toString()));
}
} catch (Exception e) {
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutAsyncMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutAsyncMessageReceiver.java?view=diff&rev=467258&r1=467257&r2=467258
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutAsyncMessageReceiver.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutAsyncMessageReceiver.java Tue Oct 24 00:00:18 2006
@@ -7,7 +7,6 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
-import org.apache.axis2.engine.DependencyManager;
import org.apache.axis2.i18n.Messages;
import java.lang.reflect.Method;
@@ -48,10 +47,10 @@
for (int i = 0; i < methods.length; i++) {
if (methods[i].getName().equals(methodName) &&
- methods[i].getParameterTypes().length == 1 &&
- OMElement.class.getName().equals(
- methods[i].getParameterTypes()[0].getName()) &&
- OMElement.class.getName().equals(methods[i].getReturnType().getName())) {
+ methods[i].getParameterTypes().length == 1 &&
+ OMElement.class.getName().equals(
+ methods[i].getParameterTypes()[0].getName()) &&
+ OMElement.class.getName().equals(methods[i].getReturnType().getName())) {
return methods[i];
}
}
@@ -61,7 +60,8 @@
/**
* Invokes the bussiness logic invocation on the service implementation class
- * @param msgContext the incoming message context
+ *
+ * @param msgContext the incoming message context
* @param newmsgContext the response message context
* @throws AxisFault on invalid method (wrong signature) or behaviour (return null)
*/
@@ -75,23 +75,19 @@
// find the WebService method
Class ImplClass = obj.getClass();
- // Inject the Message Context if it is asked for
- DependencyManager.configureBusinessLogicProvider(obj,
- msgContext.getOperationContext());
-
AxisOperation opDesc = msgContext.getOperationContext().getAxisOperation();
Method method = findOperation(opDesc, ImplClass);
if (method != null) {
OMElement result = (OMElement) method.invoke(
- obj, new Object[] {msgContext.getEnvelope().getBody().getFirstElement()});
+ obj, new Object[]{msgContext.getEnvelope().getBody().getFirstElement()});
SOAPFactory fac = getSOAPFactory(msgContext);
SOAPEnvelope envelope = fac.getDefaultEnvelope();
if (result != null) {
AxisService service = msgContext.getAxisService();
result.declareNamespace(service.getTargetNamespace(),
- service.getTargetNamespacePrefix());
+ service.getTargetNamespacePrefix());
envelope.getBody().addChild(result);
}
@@ -99,7 +95,7 @@
} else {
throw new AxisFault(Messages.getMessage("methodDoesNotExistInOut",
- opDesc.getName().toString()));
+ opDesc.getName().toString()));
}
} catch (Exception e) {
throw AxisFault.makeFault(e);
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java?view=diff&rev=467258&r1=467257&r2=467258
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java Tue Oct 24 00:00:18 2006
@@ -24,7 +24,6 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
-import org.apache.axis2.engine.DependencyManager;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.i18n.Messages;
import org.apache.commons.logging.Log;
@@ -46,7 +45,7 @@
public class RawXMLINOutMessageReceiver extends AbstractInOutSyncMessageReceiver
implements MessageReceiver {
- private static final Log log = LogFactory.getLog(RawXMLINOutMessageReceiver.class);
+ private static final Log log = LogFactory.getLog(RawXMLINOutMessageReceiver.class);
private Method findOperation(AxisOperation op, Class ImplClass) {
String methodName = op.getName().getLocalPart();
@@ -54,10 +53,10 @@
for (int i = 0; i < methods.length; i++) {
if (methods[i].getName().equals(methodName) &&
- methods[i].getParameterTypes().length == 1 &&
- OMElement.class.getName().equals(
- methods[i].getParameterTypes()[0].getName()) &&
- OMElement.class.getName().equals(methods[i].getReturnType().getName())) {
+ methods[i].getParameterTypes().length == 1 &&
+ OMElement.class.getName().equals(
+ methods[i].getParameterTypes()[0].getName()) &&
+ OMElement.class.getName().equals(methods[i].getReturnType().getName())) {
return methods[i];
}
}
@@ -67,7 +66,8 @@
/**
* Invokes the bussiness logic invocation on the service implementation class
- * @param msgContext the incoming message context
+ *
+ * @param msgContext the incoming message context
* @param newmsgContext the response message context
* @throws AxisFault on invalid method (wrong signature) or behaviour (return null)
*/
@@ -81,23 +81,19 @@
// find the WebService method
Class ImplClass = obj.getClass();
- // Inject the Message Context if it is asked for
- DependencyManager.configureBusinessLogicProvider(obj,
- msgContext.getOperationContext());
-
AxisOperation opDesc = msgContext.getOperationContext().getAxisOperation();
Method method = findOperation(opDesc, ImplClass);
if (method != null) {
OMElement result = (OMElement) method.invoke(
- obj, new Object[] {msgContext.getEnvelope().getBody().getFirstElement()});
+ obj, new Object[]{msgContext.getEnvelope().getBody().getFirstElement()});
SOAPFactory fac = getSOAPFactory(msgContext);
SOAPEnvelope envelope = fac.getDefaultEnvelope();
if (result != null) {
AxisService service = msgContext.getAxisService();
result.declareNamespace(service.getTargetNamespace(),
- service.getTargetNamespacePrefix());
+ service.getTargetNamespacePrefix());
envelope.getBody().addChild(result);
}
@@ -105,7 +101,7 @@
} else {
throw new AxisFault(Messages.getMessage("methodDoesNotExistInOut",
- opDesc.getName().toString()));
+ opDesc.getName().toString()));
}
} catch (Exception e) {
throw AxisFault.makeFault(e);
Modified: webservices/axis2/branches/java/1_1/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java?view=diff&rev=467258&r1=467257&r2=467258
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java (original)
+++ webservices/axis2/branches/java/1_1/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java Tue Oct 24 00:00:18 2006
@@ -34,13 +34,6 @@
* Auto generated java skeleton for the service by the Axis code generator
*/
public class PingPortSkeleton{
-
- private MessageContext mc;
-
- public void setOperationContext(OperationContext oc) throws AxisFault {
- mc = oc.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
- }
-
/**
* Auto generated method signature
*
@@ -49,8 +42,9 @@
public PingResponseDocument Ping
(PingDocument param0) {
Vector results = null;
+ MessageContext msgCtx = MessageContext.getCurrentMessageContext();
if ((results =
- (Vector) mc.getProperty(WSHandlerConstants.RECV_RESULTS))
+ (Vector) msgCtx.getProperty(WSHandlerConstants.RECV_RESULTS))
== null) {
System.out.println("No security results!!");
throw new RuntimeException("No security results!!");
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org