geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r893824 [2/2] - in /geronimo/server/trunk: ./ framework/configs/j2ee-security/ framework/configs/j2ee-security/src/main/resources/ framework/configs/j2ee-security/src/main/resources/var/ framework/configs/j2ee-security/src/main/resources/va...
Date Thu, 24 Dec 2009 23:26:45 GMT
Modified: geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/WSDescriptorParser.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/WSDescriptorParser.java?rev=893824&r1=893823&r2=893824&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/WSDescriptorParser.java
(original)
+++ geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/WSDescriptorParser.java
Thu Dec 24 23:26:43 2009
@@ -77,6 +77,7 @@
 import org.apache.xmlbeans.XmlCursor;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
+import org.osgi.framework.Bundle;
 
 /**
  * @version $Rev$ $Date$
@@ -162,12 +163,12 @@
         rpcHolderClasses.put(String.class, StringHolder.class);
     }
 
-    public static Class getHolderType(String paramJavaTypeName, boolean isInOnly, QName typeQName,
boolean isComplexType, JavaWsdlMappingType mapping, ClassLoader classLoader) throws DeploymentException
{
+    public static Class getHolderType(String paramJavaTypeName, boolean isInOnly, QName typeQName,
boolean isComplexType, JavaWsdlMappingType mapping, Bundle bundle) throws DeploymentException
{
         Class paramJavaType;
         if (isInOnly) {
             //IN parameters just use their own type
             try {
-                paramJavaType = ClassLoading.loadClass(paramJavaTypeName, classLoader);
+                paramJavaType = ClassLoading.loadClass(paramJavaTypeName, bundle);
             } catch (ClassNotFoundException e) {
                 throw new DeploymentException("could not load parameter type", e);
             }
@@ -188,7 +189,7 @@
             } else {
                 //see if it is in the primitive type and simple type mapping
                 try {
-                    paramJavaType = ClassLoading.loadClass(paramJavaTypeName, classLoader);
+                    paramJavaType = ClassLoading.loadClass(paramJavaTypeName, bundle);
                 } catch (ClassNotFoundException e) {
                     throw new DeploymentException("could not load parameter type", e);
                 }
@@ -196,7 +197,7 @@
                 if (holder != null) {
                     try {
                         //TODO use class names in map or make sure we are in the correct
classloader to start with.
-                        holder = ClassLoading.loadClass(holder.getName(), classLoader);
+                        holder = ClassLoading.loadClass(holder.getName(), bundle);
                     } catch (ClassNotFoundException e) {
                         throw new DeploymentException("could not load holder type in correct
classloader", e);
                     }
@@ -213,7 +214,7 @@
                 holderName = buf.toString();
             }
             try {
-                return ClassLoading.loadClass(holderName, classLoader);
+                return ClassLoading.loadClass(holderName, bundle);
             } catch (ClassNotFoundException e) {
                 throw new DeploymentException("Could not load holder class", e);
             }
@@ -461,14 +462,14 @@
         return webservicesDocument.getWebservices();        
     }
     
-    public static List<HandlerInfo> createHandlerInfoList(PortComponentHandlerType[]
handlers, ClassLoader classLoader) throws DeploymentException {
+    public static List<HandlerInfo> createHandlerInfoList(PortComponentHandlerType[]
handlers, Bundle bundle) throws DeploymentException {
         List<HandlerInfo> list = new ArrayList<HandlerInfo>();
         for (PortComponentHandlerType handler : handlers) {
             // Get handler class
             Class handlerClass;
             String className = handler.getHandlerClass().getStringValue().trim();
             try {
-                handlerClass = classLoader.loadClass(className);
+                handlerClass = bundle.loadClass(className);
             } catch (ClassNotFoundException e) {
                 throw new DeploymentException("Unable to load handler class: " + className,
e);
             }

Modified: geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml?rev=893824&r1=893823&r2=893824&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml Thu Dec 24 23:26:43
2009
@@ -96,8 +96,9 @@
 
         <!-- Test only dependencies -->
         <dependency>
-            <groupId>axis</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>axis</artifactId>
+            <version>1.4_1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=893824&r1=893823&r2=893824&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Dec 24 23:26:43 2009
@@ -483,30 +483,6 @@
             </dependency>
 
             <dependency>
-                <groupId>axis</groupId>
-                <artifactId>axis</artifactId>
-                <version>1.4</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>axis</groupId>
-                        <artifactId>axis-jaxrpc</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>axis</groupId>
-                        <artifactId>axis-saaj</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>axis</groupId>
-                        <artifactId>axis-wsdl4j</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
                 <groupId>asm</groupId>
                 <artifactId>asm</artifactId>
                 <version>3.1</version>



Mime
View raw message