geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r743444 - in /geronimo/server/trunk: plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/ testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/ testsuite/webservice...
Date Wed, 11 Feb 2009 18:41:53 GMT
Author: gawor
Date: Wed Feb 11 18:41:53 2009
New Revision: 743444

URL: http://svn.apache.org/viewvc?rev=743444&view=rev
Log:
handle xsd:imports without schemaLocation (GERONIMO-4528)

Modified:
    geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/WSDLQueryHandler.java
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/CatalogTest.java
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/resources/META-INF/wsdl/greeter_porttype.wsdl
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/wsdl/greeter_porttype.wsdl

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=743444&r1=743443&r2=743444&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
Wed Feb 11 18:41:53 2009
@@ -241,7 +241,11 @@
         for (List list : imports) {
             List<SchemaImport> impList = list;
             for (SchemaImport s : impList) {
-                String docURI = s.getReferencedSchema().getDocumentBaseURI();
+                Schema importedSchema = s.getReferencedSchema();
+                if (importedSchema == null) {
+                    continue;
+                }
+                String docURI = importedSchema.getDocumentBaseURI();
                 String location = s.getSchemaLocationURI(); 
                 String importId = parentDocKey + "/" + location;                        
       
                 String docKey = docMap.get(docURI);                
@@ -249,7 +253,7 @@
                     docKey = getUniqueSchemaId();
                     docMap.put(docURI, docKey);
                     schemaMap.put(docKey, s);
-                    updateSchemaImports(docKey, s.getReferencedSchema(), docMap, base);
+                    updateSchemaImports(docKey, importedSchema, docMap, base);
                 }                
                 importMap.put(importId, docKey);
             }
@@ -257,7 +261,11 @@
         
         List<SchemaReference> includes = schema.getIncludes();
         for (SchemaReference s : includes) {
-            String docURI = s.getReferencedSchema().getDocumentBaseURI();
+            Schema includedSchema = s.getReferencedSchema();
+            if (includedSchema == null) {
+                continue;
+            }
+            String docURI = includedSchema.getDocumentBaseURI();
             String location = s.getSchemaLocationURI(); 
             String importId = parentDocKey + "/" + location;                            
   
             String docKey = docMap.get(docURI);                
@@ -265,7 +273,7 @@
                 docKey = getUniqueSchemaId();
                 docMap.put(docURI, docKey);
                 schemaMap.put(docKey, s);
-                updateSchemaImports(docKey, s.getReferencedSchema(), docMap, base);
+                updateSchemaImports(docKey, includedSchema, docMap, base);
             }                
             importMap.put(importId, docKey);
         }

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/CatalogTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/CatalogTest.java?rev=743444&r1=743443&r2=743444&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/CatalogTest.java
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/CatalogTest.java
Wed Feb 11 18:41:53 2009
@@ -144,7 +144,11 @@
         for (List list : imports) {
             List<SchemaImport> impList = list;
             for (SchemaImport imp : impList) {
-                boolean rs = checkForElement(imp.getReferencedSchema());
+                Schema importedSchema = imp.getReferencedSchema();
+                if (importedSchema == null) {
+                    continue;
+                }
+                boolean rs = checkForElement(importedSchema);
                 if (rs) {
                     return true;
                 }

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/resources/META-INF/wsdl/greeter_porttype.wsdl
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/resources/META-INF/wsdl/greeter_porttype.wsdl?rev=743444&r1=743443&r2=743444&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/resources/META-INF/wsdl/greeter_porttype.wsdl
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/resources/META-INF/wsdl/greeter_porttype.wsdl
Wed Feb 11 18:41:53 2009
@@ -31,6 +31,8 @@
 
             <import namespace="http://apache.org/greeter_control/types" 
                     schemaLocation="http://foo3/greeter.xsd" />
+
+            <import namespace="http://schemas.ggf.org/jsdl/2005/11/jsdl"/>
             
         </schema>
    </wsdl:types>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/wsdl/greeter_porttype.wsdl
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/wsdl/greeter_porttype.wsdl?rev=743444&r1=743443&r2=743444&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/wsdl/greeter_porttype.wsdl
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/wsdl/greeter_porttype.wsdl
Wed Feb 11 18:41:53 2009
@@ -31,6 +31,8 @@
 
             <import namespace="http://apache.org/greeter_control/types" 
                     schemaLocation="http://foo3/greeter.xsd" />
+
+            <import namespace="http://schemas.ggf.org/jsdl/2005/11/jsdl"/>
             
         </schema>
    </wsdl:types>



Mime
View raw message