svn commit: r933089 - in /cxf/branches/2.2.x-fixes: ./ common/common/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java tools/wsdlto/frontend/javascript/src/test/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptTest.java

[dkulp]

Author: dkulp
Date: Mon Apr 12 04:03:27 2010
New Revision: 933089

URL: http://svn.apache.org/viewvc?rev=933089&view=rev
Log:
Merged revisions 933086 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r933086 | dkulp | 2010-04-11 23:55:55 -0400 (Sun, 11 Apr 2010) | 1 line
  
  [CXF-2731] Add a NPE guard in wsdl2js
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java
    
cxf/branches/2.2.x-fixes/tools/wsdlto/frontend/javascript/src/test/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptTest.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java?rev=933089&r1=933088&r2=933089&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java
 Mon Apr 12 04:03:27 2010
@@ -228,7 +228,7 @@ public class SchemaCollection {
      */
     public XmlSchema getSchemaByTargetNamespace(String namespaceURI) {
         for (XmlSchema schema : schemaCollection.getXmlSchemas()) {
-            if (schema.getTargetNamespace().equals(namespaceURI)) {
+            if (namespaceURI.equals(schema.getTargetNamespace())) {
                 return schema;
             }
         }

Modified: 
cxf/branches/2.2.x-fixes/tools/wsdlto/frontend/javascript/src/test/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/wsdlto/frontend/javascript/src/test/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptTest.java?rev=933089&r1=933088&r2=933089&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/tools/wsdlto/frontend/javascript/src/test/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptTest.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/tools/wsdlto/frontend/javascript/src/test/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptTest.java
 Mon Apr 12 04:03:27 2010
@@ -53,4 +53,16 @@ public class WSDLToJavaScriptTest extend
         String javascript = IOUtils.readStringFromStream(fis);
         
assertTrue(javascript.contains("xmlns:murble='http://apache.org/hello_world_soap_http'"));
     }
+    
+    // just run with a minimum of fuss.
+    @Test
+    public void testGeneration2() throws Exception {
+        JavaScriptContainer container = new JavaScriptContainer(null);
+
+        ToolContext context = new ToolContext();
+        context.put(ToolConstants.CFG_WSDLURL, "/tmp/tmp.wsdl");
+        context.put(ToolConstants.CFG_OUTPUTDIR, output.toString()); 
+        container.setContext(context); 
+        container.execute();
+    }
 }