You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-commits@ws.apache.org by da...@apache.org on 2006/12/11 00:27:50 UTC
svn commit: r485309 - in
/webservices/muse/trunk/modules/muse-osgi-soa-axis2/src/org/apache/muse/core/platform/osgi/axis2:
Axis2Environment.java Axis2IsolationLayer.java
internal/OSGiRawXMLInOutMessageReceiver.java
Author: danj
Date: Sun Dec 10 15:27:49 2006
New Revision: 485309
URL: http://svn.apache.org/viewvc?view=rev&rev=485309
Log:
Fixed compilation errors that resulted from mixing Joel's Axis2 1.1 patch and mine. I will need to check this with Joel to
make sure I haven't broken the behavior of the Axis2 initialization.
Modified:
webservices/muse/trunk/modules/muse-osgi-soa-axis2/src/org/apache/muse/core/platform/osgi/axis2/Axis2Environment.java
webservices/muse/trunk/modules/muse-osgi-soa-axis2/src/org/apache/muse/core/platform/osgi/axis2/Axis2IsolationLayer.java
webservices/muse/trunk/modules/muse-osgi-soa-axis2/src/org/apache/muse/core/platform/osgi/axis2/internal/OSGiRawXMLInOutMessageReceiver.java
Modified: webservices/muse/trunk/modules/muse-osgi-soa-axis2/src/org/apache/muse/core/platform/osgi/axis2/Axis2Environment.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-osgi-soa-axis2/src/org/apache/muse/core/platform/osgi/axis2/Axis2Environment.java?view=diff&rev=485309&r1=485308&r2=485309
==============================================================================
--- webservices/muse/trunk/modules/muse-osgi-soa-axis2/src/org/apache/muse/core/platform/osgi/axis2/Axis2Environment.java (original)
+++ webservices/muse/trunk/modules/muse-osgi-soa-axis2/src/org/apache/muse/core/platform/osgi/axis2/Axis2Environment.java Sun Dec 10 15:27:49 2006
@@ -114,18 +114,16 @@
public Axis2Environment() {
MessageHeaders wsa = convertContext();
addAddressingContext(wsa);
-
- MessageContext message = MessageContext.getCurrentMessageContext();
-
-
- String address = message.getTo().getAddress();
+
+ String address = wsa.getToAddress().getAddress().toString();
setDefaultURI(getDeploymentURI(address));
//TODO enable real back-level servlet check
//int major = servletContext.getMajorVersion();
//int minor = servletContext.getMinorVersion();
//if (major <= 2 && minor <= 1)
backLevelServletAPI = true;
-
+
+ MessageContext message = MessageContext.getCurrentMessageContext();
_realDirectory = message.getConfigurationContext().getRealPath("/");
//_realDirectory = new File(address);
}
Modified: webservices/muse/trunk/modules/muse-osgi-soa-axis2/src/org/apache/muse/core/platform/osgi/axis2/Axis2IsolationLayer.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-osgi-soa-axis2/src/org/apache/muse/core/platform/osgi/axis2/Axis2IsolationLayer.java?view=diff&rev=485309&r1=485308&r2=485309
==============================================================================
--- webservices/muse/trunk/modules/muse-osgi-soa-axis2/src/org/apache/muse/core/platform/osgi/axis2/Axis2IsolationLayer.java (original)
+++ webservices/muse/trunk/modules/muse-osgi-soa-axis2/src/org/apache/muse/core/platform/osgi/axis2/Axis2IsolationLayer.java Sun Dec 10 15:27:49 2006
@@ -39,9 +39,10 @@
protected boolean initializing = false;
protected boolean initialized = false;
- private static Axis2IsolationLayer _instance = new Axis2IsolationLayer();
+ private static Axis2IsolationLayer _instance = null;
public static Axis2IsolationLayer getInstance(){
+ _instance = new Axis2IsolationLayer();
return _instance;
}
@@ -84,7 +85,7 @@
* @see Axis2Environment
*/
protected Environment createEnvironment() {
- return new Axis2Environment(getInitialContext());
+ return new Axis2Environment();
}
/**
Modified: webservices/muse/trunk/modules/muse-osgi-soa-axis2/src/org/apache/muse/core/platform/osgi/axis2/internal/OSGiRawXMLInOutMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-osgi-soa-axis2/src/org/apache/muse/core/platform/osgi/axis2/internal/OSGiRawXMLInOutMessageReceiver.java?view=diff&rev=485309&r1=485308&r2=485309
==============================================================================
--- webservices/muse/trunk/modules/muse-osgi-soa-axis2/src/org/apache/muse/core/platform/osgi/axis2/internal/OSGiRawXMLInOutMessageReceiver.java (original)
+++ webservices/muse/trunk/modules/muse-osgi-soa-axis2/src/org/apache/muse/core/platform/osgi/axis2/internal/OSGiRawXMLInOutMessageReceiver.java Sun Dec 10 15:27:49 2006
@@ -18,12 +18,8 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.Parameter;
-import org.apache.axis2.i18n.Messages;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
import org.apache.muse.core.platform.osgi.axis2.Axis2IsolationLayer;
-import org.osgi.framework.Bundle;
/**
*
@@ -43,8 +39,6 @@
* @return the <code>Axis2IsolationLayer</code> instance
*/
protected Object makeNewServiceObject(MessageContext msgContext) throws AxisFault {
- //Axis2.1.1 doesn't call setOperationContext any more.
- Axis2IsolationLayer.getInstance().setOperationContext(msgContext.getOperationContext());
return Axis2IsolationLayer.getInstance();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org