[jbossws-commits] JBossWS SVN: r14550 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder: jaxws and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2011-06-14 10:23:11 -0400 (Tue, 14 Jun 2011)
New Revision: 14550

Modified:
   stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
   stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java
   stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java
   stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
Log:
[JBWS-3312] Replace usage of deprecated methods


Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java	2011-06-14 14:20:27 UTC (rev 14549)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java	2011-06-14 14:23:11 UTC (rev 14550)
@@ -98,7 +98,7 @@
 
             // Unmarshall the jaxrpc-mapping.xml
             String mappingFile = wsdMetaData.getJaxrpcMappingFile();
-            serviceMetaData.setMappingLocation(dep.getMetaDataFileURL(mappingFile));
+            serviceMetaData.setMappingLocation(dep.getResourceResolver().resolve(mappingFile));
             JavaWsdlMapping javaWsdlMapping = serviceMetaData.getJavaWsdlMapping();
             if (javaWsdlMapping == null)
                throw new WSException("jaxrpc-mapping-file not configured from webservices.xml");

Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java	2011-06-14 14:20:27 UTC (rev 14549)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java	2011-06-14 14:23:11 UTC (rev 14550)
@@ -220,7 +220,7 @@
          {
             try
             {
-               URL xsdURL = ((ArchiveDeployment)dep).getMetaDataFileURL(xsdLoc);
+               URL xsdURL = ((ArchiveDeployment)dep).getResourceResolver().resolve(xsdLoc);
                xsdLoc = xsdURL.toExternalForm();
             }
             catch (IOException ex)

Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java	2011-06-14 14:20:27 UTC (rev 14549)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java	2011-06-14 14:23:11 UTC (rev 14550)
@@ -122,7 +122,7 @@
       String wsdlLocation = anWebServiceProvider.wsdlLocation();
       if (wsdlLocation.length() > 0)
       {
-         URL wsdlURL = dep.getMetaDataFileURL(wsdlLocation);
+         URL wsdlURL = dep.getResourceResolver().resolve(wsdlLocation);
          serviceMetaData.setWsdlLocation(wsdlURL);
       }
 

Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java	2011-06-14 14:20:27 UTC (rev 14549)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java	2011-06-14 14:23:11 UTC (rev 14550)
@@ -481,7 +481,7 @@
       wsMetaData.addService(result.serviceMetaData);
 
       if (dep instanceof ArchiveDeployment)
-         result.wsdlLocation = ((ArchiveDeployment)dep).getMetaDataFileURL(wsdlLocation);
+         result.wsdlLocation = ((ArchiveDeployment)dep).getResourceResolver().resolve(wsdlLocation);
 
       return result;
    }