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 jh...@apache.org on 2007/03/21 14:11:29 UTC
svn commit: r520872 - in /webservices/muse/trunk/modules:
muse-osgi-soa-axis2/resources/META-INF/
muse-osgi-soa-axis2/src/org/apache/muse/core/platform/osgi/axis2/
muse-osgi-soa-axis2/src/org/apache/muse/core/platform/osgi/axis2/internal/
osgi-bundles/...
Author: jhawkins
Date: Wed Mar 21 06:11:27 2007
New Revision: 520872
URL: http://svn.apache.org/viewvc?view=rev&rev=520872
Log:
[MUSE-205] MUSE on OSGI/Axis not working with wsdl2java-generated code and samples
Modified:
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/Activator.java
webservices/muse/trunk/modules/muse-osgi-soa-axis2/src/org/apache/muse/core/platform/osgi/axis2/internal/ResourceManagementAdminServiceImpl.java
webservices/muse/trunk/modules/osgi-bundles/muse-complete/resources/META-INF/MANIFEST.MF
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=520872&r1=520871&r2=520872
==============================================================================
--- 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 Wed Mar 21 06:11:27 2007
@@ -7,6 +7,7 @@
Bundle-Localization: plugin
Import-Package: javax.servlet;version="2.3.0",
javax.wsdl.xml;version="1.5.2",
+ javax.xml.namespace,
javax.xml.stream;version="1.0.0",
javax.xml.stream.events;version="1.0.0",
javax.xml.stream.util;version="1.0.0",
Modified: webservices/muse/trunk/modules/muse-osgi-soa-axis2/src/org/apache/muse/core/platform/osgi/axis2/Activator.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-osgi-soa-axis2/src/org/apache/muse/core/platform/osgi/axis2/Activator.java?view=diff&rev=520872&r1=520871&r2=520872
==============================================================================
--- webservices/muse/trunk/modules/muse-osgi-soa-axis2/src/org/apache/muse/core/platform/osgi/axis2/Activator.java (original)
+++ webservices/muse/trunk/modules/muse-osgi-soa-axis2/src/org/apache/muse/core/platform/osgi/axis2/Activator.java Wed Mar 21 06:11:27 2007
@@ -28,6 +28,7 @@
import org.osgi.framework.ServiceListener;
import org.osgi.framework.ServiceReference;
import org.apache.muse.osgi.soa.core.SOAPProvider;
+import org.apache.muse.util.xml.XmlUtils;
/**
*
@@ -52,6 +53,13 @@
public void start(BundleContext context) throws Exception {
this.context = context;
try {
+
+ //Intialize XMLUtils with this bundle's services.
+ ClassLoader prev = Thread.currentThread().getContextClassLoader();
+ Thread.currentThread().setContextClassLoader(Activator.class.getClassLoader());
+ XmlUtils.createDocument();
+ Thread.currentThread().setContextClassLoader(prev);
+
if ((soapProviderReference = context
.getServiceReference("org.apache.muse.osgi.soa.core.SOAPProvider")) != null) {
SOAPProvider soapProvider = (SOAPProvider)context.getService(soapProviderReference);
Modified: webservices/muse/trunk/modules/muse-osgi-soa-axis2/src/org/apache/muse/core/platform/osgi/axis2/internal/ResourceManagementAdminServiceImpl.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-osgi-soa-axis2/src/org/apache/muse/core/platform/osgi/axis2/internal/ResourceManagementAdminServiceImpl.java?view=diff&rev=520872&r1=520871&r2=520872
==============================================================================
--- webservices/muse/trunk/modules/muse-osgi-soa-axis2/src/org/apache/muse/core/platform/osgi/axis2/internal/ResourceManagementAdminServiceImpl.java (original)
+++ webservices/muse/trunk/modules/muse-osgi-soa-axis2/src/org/apache/muse/core/platform/osgi/axis2/internal/ResourceManagementAdminServiceImpl.java Wed Mar 21 06:11:27 2007
@@ -82,6 +82,7 @@
// rename all references to service name
try {
+
ConfigurationContext context = (ConfigurationContext)provider.getProviderDeployer(webApp);
AxisConfiguration axisConfig = context.getAxisConfiguration();
Axis2ResourceManagementService service = new Axis2ResourceManagementService(axisConfig);
@@ -98,6 +99,8 @@
axisConfig.addService(service);
} catch (AxisFault se){
se.printStackTrace();
+ } catch(Throwable t){
+ t.printStackTrace();
}
}
}
Modified: webservices/muse/trunk/modules/osgi-bundles/muse-complete/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/osgi-bundles/muse-complete/resources/META-INF/MANIFEST.MF?view=diff&rev=520872&r1=520871&r2=520872
==============================================================================
--- webservices/muse/trunk/modules/osgi-bundles/muse-complete/resources/META-INF/MANIFEST.MF (original)
+++ webservices/muse/trunk/modules/osgi-bundles/muse-complete/resources/META-INF/MANIFEST.MF Wed Mar 21 06:11:27 2007
@@ -24,7 +24,8 @@
org.apache.xpath.patterns;version="2.7.0",
org.apache.xpath.res;version="2.7.0",
org.osgi.framework;version="1.3.0",
- org.osgi.service.http;version="1.1.0"
+ org.osgi.service.http;version="1.1.0",
+ org.osgi.service.log;version="1.3.0"
Bundle-ClassPath: .
Export-Package: javax.xml.namespace,
org.apache.muse.core;version="2.2.0",
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org