[prev in list] [next in list] [prev in thread] [next in thread]
List: muse-commits
Subject: svn commit: r485300 - in /webservices/muse/trunk/modules:
From: danj () apache ! org
Date: 2006-12-10 23:04:33
Message-ID: 20061210230433.C7C4E1A9846 () eris ! apache ! org
[Download RAW message or body]
Author: danj
Date: Sun Dec 10 15:04:30 2006
New Revision: 485300
URL: http://svn.apache.org/viewvc?view=rev&rev=485300
Log:
Joel H.'s fixes for MUSE-157 and MUSE-158
Modified:
webservices/muse/trunk/modules/muse-osgi-core/resources/META-INF/MANIFEST.MF
webservices/muse/trunk/modules/muse-osgi-soa-axis2/resources/META-INF/MANIFEST.MF
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
webservices/muse/trunk/modules/muse-osgi-soa-core/resources/META-INF/MANIFEST.MF
Modified: webservices/muse/trunk/modules/muse-osgi-core/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-osgi-core/resources/META-INF/MANIFEST.MF?view=diff&rev=485300&r1=485299&r2=485300
==============================================================================
--- webservices/muse/trunk/modules/muse-osgi-core/resources/META-INF/MANIFEST.MF \
(original)
+++ webservices/muse/trunk/modules/muse-osgi-core/resources/META-INF/MANIFEST.MF Sun \
Dec 10 15:04:30 2006 @@ -1,26 +1,26 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Osgi Plug-in
-Bundle-SymbolicName: muse.osgi.core
-Bundle-Version: 1.0.0
-Bundle-Activator: org.apache.muse.core.platform.osgi.Activator
-Bundle-Vendor: Apache
-Bundle-Localization: plugin
-Import-Package: javax.servlet;version="2.3.0",
- javax.servlet.http;version="2.3.0",
- javax.wsdl,
- javax.wsdl.extensions,
- javax.wsdl.factory,
- javax.wsdl.xml,
- javax.xml.soap,
- org.osgi.framework;version="1.3.0",
- org.osgi.util.tracker;version="1.3.1",
- org.w3c.dom
-Require-Bundle: muse.core,
- muse.util.all,
- muse.wsa.soap
-Export-Package: org.apache.muse.core.platform.osgi,
- org.apache.muse.core.platform.osgi.descriptor,
- org.apache.muse.core.platform.osgi.routing,
- org.apache.muse.core.platform.osgi.util
-Bundle-ClassPath: .
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Osgi Plug-in
+Bundle-SymbolicName: muse.osgi.core
+Bundle-Version: 2.1.0
+Bundle-Activator: org.apache.muse.core.platform.osgi.Activator
+Bundle-Vendor: Apache
+Bundle-Localization: plugin
+Import-Package: javax.servlet;version="2.3.0",
+ javax.servlet.http;version="2.3.0",
+ javax.wsdl,
+ javax.wsdl.extensions,
+ javax.wsdl.factory,
+ javax.wsdl.xml,
+ javax.xml.soap,
+ org.osgi.framework;version="1.3.0",
+ org.osgi.util.tracker;version="1.3.1",
+ org.w3c.dom
+Require-Bundle: muse.core;bundle-version="2.1.0",
+ muse.util.all;bundle-version="2.1.0",
+ muse.wsa.soap;bundle-version="2.1.0"
+Export-Package: org.apache.muse.core.platform.osgi;version="2.1.0",
+ org.apache.muse.core.platform.osgi.descriptor;version="2.1.0",
+ org.apache.muse.core.platform.osgi.routing;version="2.1.0",
+ org.apache.muse.core.platform.osgi.util;version="2.1.0"
+Bundle-ClassPath: .
Modified: webservices/muse/trunk/modules/muse-osgi-soa-axis2/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-osgi-soa-axis2/resources/META-INF/MANIFEST.MF?view=diff&rev=485300&r1=485299&r2=485300
==============================================================================
--- webservices/muse/trunk/modules/muse-osgi-soa-axis2/resources/META-INF/MANIFEST.MF \
(original)
+++ webservices/muse/trunk/modules/muse-osgi-soa-axis2/resources/META-INF/MANIFEST.MF \
Sun Dec 10 15:04:30 2006 @@ -1,26 +1,68 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Axis2 Plug-in
-Bundle-SymbolicName: muse.osgi.soa.axis2
-Bundle-Version: 1.0.0
-Bundle-Activator: org.apache.muse.core.platform.osgi.axis2.Activator
-Bundle-Localization: plugin
-Import-Package: javax.servlet;version="2.3.0",
- javax.servlet.http;version="2.3.0",
- javax.servlet.resources;version="2.3.0",
- javax.wsdl,
- javax.wsdl.extensions,
- javax.wsdl.extensions.http,
- javax.wsdl.factory,
- javax.wsdl.xml,
- javax.xml.soap,
- org.osgi.framework;version="1.3.0"
-Require-Bundle: muse.osgi.soa.core,
- muse.osgi.core,
- muse.core,
- muse.wsa.soap,
- muse.util.all,
- org.apache.axis2,
- org.apache.xerces
-Bundle-ClassPath: .,
- lib/muse-platform-axis2-2.0.0-SNAPSHOT.jar
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Axis2 Plug-in
+Bundle-SymbolicName: muse.osgi.soa.axis2
+Bundle-Version: 2.1.0
+Bundle-Activator: org.apache.muse.core.platform.osgi.axis2.Activator
+Bundle-Localization: plugin
+Import-Package: javax.servlet;version="2.3.0",
+ javax.wsdl.xml;version="1.5.2",
+ javax.xml.stream;version="1.0.0",
+ javax.xml.stream.events;version="1.0.0",
+ javax.xml.stream.util;version="1.0.0",
+ org.apache.axiom.om;version="1.0.0",
+ org.apache.axiom.om.impl;version="1.0.0",
+ org.apache.axiom.om.impl.builder;version="1.0.0",
+ org.apache.axiom.om.impl.dom;version="1.0.0",
+ org.apache.axiom.om.impl.dom.factory;version="1.0.0",
+ org.apache.axiom.om.impl.exception;version="1.0.0",
+ org.apache.axiom.om.impl.llom;version="1.0.0",
+ org.apache.axiom.om.impl.llom.factory;version="1.0.0",
+ org.apache.axiom.om.impl.llom.util;version="1.0.0",
+ org.apache.axiom.om.impl.serialize;version="1.0.0",
+ org.apache.axiom.om.impl.traverse;version="1.0.0",
+ org.apache.axiom.om.impl.util;version="1.0.0",
+ org.apache.axiom.om.util;version="1.0.0",
+ org.apache.axiom.om.xpath;version="1.0.0",
+ org.apache.axiom.soap;version="1.0.0",
+ org.apache.axiom.soap.impl.builder;version="1.0.0",
+ org.apache.axiom.soap.impl.dom;version="1.0.0",
+ org.apache.axiom.soap.impl.dom.factory;version="1.0.0",
+ org.apache.axiom.soap.impl.dom.soap11;version="1.0.0",
+ org.apache.axiom.soap.impl.dom.soap12;version="1.0.0",
+ org.apache.axiom.soap.impl.llom;version="1.0.0",
+ org.apache.axiom.soap.impl.llom.soap11;version="1.0.0",
+ org.apache.axiom.soap.impl.llom.soap12;version="1.0.0",
+ org.apache.axis2;version="1.0.0",
+ org.apache.axis2.addressing;version="1.0.0",
+ org.apache.axis2.addressing.wsdl;version="1.1.0";resolution:=optional,
+ org.apache.axis2.context;version="1.0.0",
+ org.apache.axis2.description;version="1.0.0",
+ org.apache.axis2.engine;version="1.0.0",
+ org.apache.axis2.receivers;version="1.0.0",
+ org.apache.muse.core;version="2.1.0",
+ org.apache.muse.core.descriptor;version="2.1.0",
+ org.apache.muse.core.platform;version="2.1.0",
+ org.apache.muse.core.platform.osgi;version="2.1.0",
+ org.apache.muse.core.platform.osgi.descriptor;version="2.1.0",
+ org.apache.muse.core.platform.osgi.routing;version="2.1.0",
+ org.apache.muse.core.platform.osgi.util;version="2.1.0",
+ org.apache.muse.core.proxy;version="2.1.0",
+ org.apache.muse.core.routing;version="2.1.0",
+ org.apache.muse.core.serializer;version="2.1.0",
+ org.apache.muse.core.serializer.xstream;version="2.1.0";resolution:=optional,
+ org.apache.muse.osgi.soa.core;version="2.1.0",
+ org.apache.muse.osgi.soa.core.web;version="2.1.0",
+ org.apache.muse.util;version="2.1.0",
+ org.apache.muse.util.messages;version="2.1.0",
+ org.apache.muse.util.uuid;version="2.1.0",
+ org.apache.muse.util.xml;version="2.1.0",
+ org.apache.muse.ws.addressing;version="2.1.0",
+ org.apache.muse.ws.addressing.soap;version="2.1.0",
+ org.apache.xerces.dom,
+ org.apache.xerces.jaxp,
+ org.apache.xerces.jaxp.datatype,
+ org.apache.xerces.jaxp.validation,
+ org.apache.xerces.util,
+ org.osgi.framework;version="1.3.0"
+Bundle-ClassPath: .
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/s \
rc/org/apache/muse/core/platform/osgi/axis2/Axis2IsolationLayer.java?view=diff&rev=485300&r1=485299&r2=485300
==============================================================================
--- 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:04:30 2006 @@ -24,6 +24,8 @@
import org.apache.muse.core.platform.osgi.util.OSGiReflectUtilHelper;
import org.apache.muse.util.ReflectUtils;
+import org.apache.axis2.context.ServiceContext;
+
/**
*
* Axis2IsolationLayer is an OSGi aware extension of the Muse AxisIsolationLayer.
@@ -42,6 +44,11 @@
public static Axis2IsolationLayer getInstance(){
return _instance;
}
+
+
+ public void init(ServiceContext serviceContext){
+ if(!initialized) initialize();
+ }
/**
* performs initialzation of the IsolationLayer, and installs the
@@ -77,7 +84,7 @@
* @see Axis2Environment
*/
protected Environment createEnvironment() {
- return new Axis2Environment();
+ return new Axis2Environment(getInitialContext());
}
/**
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/s \
rc/org/apache/muse/core/platform/osgi/axis2/internal/OSGiRawXMLInOutMessageReceiver.java?view=diff&rev=485300&r1=485299&r2=485300
==============================================================================
--- 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:04:30 2006 @@ -43,6 +43,8 @@
* @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();
}
Modified: webservices/muse/trunk/modules/muse-osgi-soa-core/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-osgi-soa-core/resources/META-INF/MANIFEST.MF?view=diff&rev=485300&r1=485299&r2=485300
==============================================================================
--- webservices/muse/trunk/modules/muse-osgi-soa-core/resources/META-INF/MANIFEST.MF \
(original)
+++ webservices/muse/trunk/modules/muse-osgi-soa-core/resources/META-INF/MANIFEST.MF \
Sun Dec 10 15:04:30 2006 @@ -1,15 +1,15 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Apache Muse Provisional SOAP Service Plug-in
-Bundle-SymbolicName: muse.osgi.soa.core
-Bundle-Version: 1.0.0
-Bundle-Activator: org.apache.muse.osgi.soa.core.Activator
-Bundle-Localization: plugin
-Import-Package: javax.servlet;version="2.3.0",
- javax.servlet.http;version="2.3.0",
- javax.xml.soap,
- javax.xml.namespace,
- org.osgi.framework;version="1.3.0",
- org.osgi.service.http;version="1.2.0"
-Export-Package: org.apache.muse.osgi.soa.core,
- org.apache.muse.osgi.soa.core.web
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Apache Muse Provisional SOAP Service Plug-in
+Bundle-SymbolicName: muse.osgi.soa.core
+Bundle-Version: 2.1.0
+Bundle-Activator: org.apache.muse.osgi.soa.core.Activator
+Bundle-Localization: plugin
+Import-Package: javax.servlet;version="2.3.0",
+ javax.servlet.http;version="2.3.0",
+ javax.xml.soap,
+ javax.xml.namespace,
+ org.osgi.framework;version="1.3.0",
+ org.osgi.service.http;version="1.2.0"
+Export-Package: org.apache.muse.osgi.soa.core;version="2.1.0",
+ org.apache.muse.osgi.soa.core.web;version="2.1.0"
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic