svn commit: r669870 - in /webservices/axis2/trunk/java/modules/osgi: pom.xml src/org/apache/axis2/osgi/internal/Activator.java

[sa...@apache.org]

Author: saminda
Date: Fri Jun 20 05:09:25 2008
New Revision: 669870

URL: http://svn.apache.org/viewvc?rev=669870&view=rev
Log:
Solving the QName problem,

Modified:
    webservices/axis2/trunk/java/modules/osgi/pom.xml
    webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/internal/Activator.java

Modified: webservices/axis2/trunk/java/modules/osgi/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/osgi/pom.xml?rev=669870&r1=669869&r2=669870&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/osgi/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/osgi/pom.xml Fri Jun 20 05:09:25 2008
@@ -62,7 +62,9 @@
                             org.apache.axis2.*;-split-package:=merge-last; version=1.5,
                         </Export-Package>
                         <Import-Package>
+                            !javax.xml.namespace,
                             !org.apache.axis2.*,
+                            javax.xml.namespace; version=0.0.0,
                             javax.servlet; version=2.4.0,
                             javax.servlet.http; version=2.4.0,
                             org.osgi.framework; version=1.3.0,
@@ -80,14 +82,13 @@
                             javax.wsdl.extensions.*,
                             javax.wsdl.factory,
                             javax.wsdl.xml,
-                            javax.xml.namespace;resolution:=optional;version="1.0",
                             javax.xml.parsers;resolution:=optional,
                             javax.xml.stream;resolution:=optional;version="1.0",
                             javax.xml.transform;resolution:=optional,
                             javax.xml.transform.dom;resolution:=optional,
                             javax.xml.transform.stream;resolution:=optional,
                             org.apache.axiom.*,
-                            org.apache.commons.fileupload.*;resolution:=optional,
+                            org.apache.commons.fileupload.*,
                             org.apache.commons.httpclient.*,
                             org.apache.commons.lang;resolution:=optional,
                             org.apache.commons.logging,
@@ -107,7 +108,6 @@
                             org.jivesoftware.smack.*;resolution:=optional,
                             org.w3c.dom;resolution:=optional,
                             org.xml.sax;resolution:=optional,
-                            *;resolution:=optional
                         </Import-Package>
                         <Private-Package>
                             org.apache.axis2.osgi.internal,

Modified: webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/internal/Activator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/internal/Activator.java?rev=669870&r1=669869&r2=669870&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/internal/Activator.java (original)
+++ webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/internal/Activator.java Fri Jun 20 05:09:25 2008
@@ -28,6 +28,7 @@
 import org.osgi.util.tracker.ServiceTracker;
 
 import javax.servlet.ServletException;
+import javax.xml.namespace.QName;
 
 /**
  * Activator will set the necessary parameters that initiate Axis2 OSGi integration
@@ -39,6 +40,7 @@
 
 
     public void start(BundleContext context) throws Exception {
+        QName qName = new QName("","");
         tracker = new HttpServiceTracker(context);
         tracker.open();
     }