geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r735770 - in /geronimo/server/trunk/plugins: axis2/axis2/ axis2/axis2/src/main/history/ axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/ axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/util/ cxf/cxf/ cxf/cxf/src/ma...
Date Mon, 19 Jan 2009 18:48:16 GMT
Author: gawor
Date: Mon Jan 19 10:48:15 2009
New Revision: 735770

URL: http://svn.apache.org/viewvc?rev=735770&view=rev
Log:
moving wsdl resolver code to jaxws module (part of GERONIMO-4501)

Added:
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/CatalogWSDLLocator.java
  (contents, props changed)
      - copied, changed from r735744, geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/util/CatalogWSDLLocator.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/SimpleURIResolver.java
  (contents, props changed)
      - copied, changed from r735744, geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/util/SimpleURIResolver.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/SimpleWSDLLocator.java
  (contents, props changed)
      - copied, changed from r735744, geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/util/SimpleWSDLLocator.java
Removed:
    geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/util/
Modified:
    geronimo/server/trunk/plugins/axis2/axis2/pom.xml
    geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/WSDLQueryHandler.java
    geronimo/server/trunk/plugins/cxf/cxf/pom.xml
    geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml
    geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml

Modified: geronimo/server/trunk/plugins/axis2/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/pom.xml?rev=735770&r1=735769&r2=735770&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/pom.xml Mon Jan 19 10:48:15 2009
@@ -149,11 +149,6 @@
         </dependency>
 
         <dependency>
-            <groupId>xml-resolver</groupId>
-            <artifactId>xml-resolver</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.neethi</groupId>
             <artifactId>neethi</artifactId>
         </dependency>

Modified: geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml?rev=735770&r1=735769&r2=735770&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml Mon Jan 19
10:48:15 2009
@@ -72,11 +72,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>xml-resolver</groupId>
-        <artifactId>xml-resolver</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>webservices-common</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/WSDLQueryHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/WSDLQueryHandler.java?rev=735770&r1=735769&r2=735770&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/WSDLQueryHandler.java
(original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/WSDLQueryHandler.java
Mon Jan 19 10:48:15 2009
@@ -48,8 +48,9 @@
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.jaxws.catalog.JAXWSCatalogManager;
 import org.apache.axis2.jaxws.description.EndpointDescription;
-import org.apache.geronimo.axis2.util.CatalogWSDLLocator;
+
 import org.apache.geronimo.jaxws.WSDLUtils;
+import org.apache.geronimo.jaxws.wsdl.CatalogWSDLLocator;
 import org.apache.xml.resolver.Catalog;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: geronimo/server/trunk/plugins/cxf/cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf/pom.xml?rev=735770&r1=735769&r2=735770&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf/pom.xml Mon Jan 19 10:48:15 2009
@@ -136,10 +136,6 @@
             <artifactId>XmlSchema</artifactId>
         </dependency>
         <dependency>
-            <groupId>xml-resolver</groupId>
-            <artifactId>xml-resolver</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.neethi</groupId>
             <artifactId>neethi</artifactId>
         </dependency>

Modified: geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml?rev=735770&r1=735769&r2=735770&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml Mon Jan 19 10:48:15
2009
@@ -37,11 +37,6 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>xml-resolver</groupId>
-        <artifactId>xml-resolver</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-simple</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml?rev=735770&r1=735769&r2=735770&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml Mon Jan 19 10:48:15 2009
@@ -97,6 +97,11 @@
         </dependency>
 
         <dependency>
+            <groupId>xml-resolver</groupId>
+            <artifactId>xml-resolver</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.plugins.classloaders</groupId>
             <artifactId>geronimo-schema-jee_5</artifactId>
             <version>${version}</version>

Copied: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/CatalogWSDLLocator.java
(from r735744, geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/util/CatalogWSDLLocator.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/CatalogWSDLLocator.java?p2=geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/CatalogWSDLLocator.java&p1=geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/util/CatalogWSDLLocator.java&r1=735744&r2=735770&rev=735770&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/util/CatalogWSDLLocator.java
(original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/CatalogWSDLLocator.java
Mon Jan 19 10:48:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.geronimo.axis2.util;
+package org.apache.geronimo.jaxws.wsdl;
 
 import java.io.IOException;
 

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/CatalogWSDLLocator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/CatalogWSDLLocator.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/CatalogWSDLLocator.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/CatalogWSDLLocator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/SimpleURIResolver.java
(from r735744, geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/util/SimpleURIResolver.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/SimpleURIResolver.java?p2=geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/SimpleURIResolver.java&p1=geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/util/SimpleURIResolver.java&r1=735744&r2=735770&rev=735770&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/util/SimpleURIResolver.java
(original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/SimpleURIResolver.java
Mon Jan 19 10:48:15 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.geronimo.axis2.util;
+package org.apache.geronimo.jaxws.wsdl;
 
 import java.io.File;
 import java.io.IOException;

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/SimpleURIResolver.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/SimpleURIResolver.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/SimpleWSDLLocator.java
(from r735744, geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/util/SimpleWSDLLocator.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/SimpleWSDLLocator.java?p2=geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/SimpleWSDLLocator.java&p1=geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/util/SimpleWSDLLocator.java&r1=735744&r2=735770&rev=735770&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/util/SimpleWSDLLocator.java
(original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/SimpleWSDLLocator.java
Mon Jan 19 10:48:15 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.geronimo.axis2.util;
+package org.apache.geronimo.jaxws.wsdl;
 
 import java.io.IOException;
 

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/SimpleWSDLLocator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/wsdl/SimpleWSDLLocator.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml?rev=735770&r1=735769&r2=735770&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml
Mon Jan 19 10:48:15 2009
@@ -47,6 +47,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>xml-resolver</groupId>
+        <artifactId>xml-resolver</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.plugins.classloaders</groupId>
         <artifactId>geronimo-schema-jee_5</artifactId>
         <type>car</type>



Mime
View raw message