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/08 21:39:31 UTC
svn commit: r484765 - in
/webservices/muse/trunk/modules/muse-osgi-soa-axis2: pom.xml
src/org/apache/muse/core/platform/osgi/axis2/Axis2Environment.java
src/org/apache/muse/core/platform/osgi/axis2/Axis2IsolationLayer.java
Author: danj
Date: Fri Dec 8 12:39:30 2006
New Revision: 484765
URL: http://svn.apache.org/viewvc?view=rev&rev=484765
Log:
Updated this module to compile against the latest jars from Axis2 1.1 Final
Modified:
webservices/muse/trunk/modules/muse-osgi-soa-axis2/pom.xml
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
Modified: webservices/muse/trunk/modules/muse-osgi-soa-axis2/pom.xml
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-osgi-soa-axis2/pom.xml?view=diff&rev=484765&r1=484764&r2=484765
==============================================================================
--- webservices/muse/trunk/modules/muse-osgi-soa-axis2/pom.xml (original)
+++ webservices/muse/trunk/modules/muse-osgi-soa-axis2/pom.xml Fri Dec 8 12:39:30 2006
@@ -15,7 +15,11 @@
<dependencies>
<dependency>
<groupId>axis2</groupId>
- <artifactId>axis2</artifactId>
+ <artifactId>axis2-kernel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-saaj</artifactId>
</dependency>
<dependency>
<groupId>stax</groupId>
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=484765&r1=484764&r2=484765
==============================================================================
--- 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 Fri Dec 8 12:39:30 2006
@@ -110,22 +110,12 @@
localEnvironmentContext.set(bundle);
OSGiReflectUtilHelper.getDefault().setThreadLocalBundle(bundle);
}
-
-
- /**
- *
- * This constructor allows the user to initialize the environment based on
- * an Axis2 <code>OperationContext</code>
- *
- * @param opContext the OperationContext of the current invocation
- *
- */
- public Axis2Environment(OperationContext opContext) {
- super(opContext);
- MessageHeaders wsa = convertContext(opContext);
+
+ public Axis2Environment() {
+ MessageHeaders wsa = convertContext();
addAddressingContext(wsa);
- MessageContext message = getInputMessageContext(opContext);
+ MessageContext message = MessageContext.getCurrentMessageContext();
String address = message.getTo().getAddress();
@@ -135,7 +125,8 @@
//int minor = servletContext.getMinorVersion();
//if (major <= 2 && minor <= 1)
backLevelServletAPI = true;
- _realDirectory = opContext.getConfigurationContext().getRealPath("/");
+
+ _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=484765&r1=484764&r2=484765
==============================================================================
--- 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 Fri Dec 8 12:39:30 2006
@@ -77,7 +77,7 @@
* @see Axis2Environment
*/
protected Environment createEnvironment() {
- return new Axis2Environment(getInitialContext());
+ return new Axis2Environment();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org