cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterjo...@apache.org
Subject svn commit: r484882 - in /incubator/cxf/trunk: common/common/src/main/java/org/apache/cxf/resource/ tools/common/src/main/java/org/apache/cxf/tools/common/extensions/jaxws/ tools/common/src/main/java/org/apache/cxf/tools/util/ tools/wsdl2java/src/main/...
Date Sat, 09 Dec 2006 01:28:59 GMT
Author: peterjones
Date: Fri Dec  8 17:28:56 2006
New Revision: 484882

URL: http://svn.apache.org/viewvc?view=rev&rev=484882
Log:
Related to [CXF-290].  Space ' ' in the path problem.

Fixed a couple more space in the pathname issues in the tools on windows.
Corrected a couple of typos also.

Modified:
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
    incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/jaxws/CustomizationParser.java
    incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/jaxws/Messages.properties
    incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/ProcessorUtil.java
    incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/databindings/jaxb/JAXBBindingGenerator.java
    incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/compiler/Compiler.java

Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java?view=diff&rev=484882&r1=484881&r2=484882
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
(original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
Fri Dec  8 17:28:56 2006
@@ -61,7 +61,6 @@
     public URIResolver(String baseUriStr, String uriStr, Class calling) throws IOException
{
         this.calling = (calling != null) ? calling : getClass();
 
-        uriStr = uriStr.replaceAll(" ", "%20");
         if (uriStr.startsWith("classpath:")) {
             tryClasspath(uriStr);
         } else if (baseUriStr != null && baseUriStr.startsWith("jar:")) {
@@ -77,7 +76,6 @@
     public void resolve(String baseUriStr, String uriStr, Class callingCls) throws IOException
{
         this.calling = (callingCls != null) ? callingCls : getClass();
 
-        uriStr = uriStr.replaceAll(" ", "%20");
         if (uriStr.startsWith("classpath:")) {
             tryClasspath(uriStr);
         } else if (baseUriStr != null && baseUriStr.startsWith("jar:")) {
@@ -100,7 +98,7 @@
             if (uriFile.exists()) {
                 relative = uriFile.toURI();
             } else {
-                relative = new URI(uriStr);
+                relative = new URI(uriStr.replaceAll(" ", "%20"));
             }
             
             if (relative.isAbsolute()) {

Modified: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/jaxws/CustomizationParser.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/jaxws/CustomizationParser.java?view=diff&rev=484882&r1=484881&r2=484882
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/jaxws/CustomizationParser.java
(original)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/jaxws/CustomizationParser.java
Fri Dec  8 17:28:56 2006
@@ -193,7 +193,7 @@
             try {
                 evaluateBindingsNode(bindings, expression);
             } catch (WSDLException we) {
-                Message msg = new Message("PARSE_BININDINGFILE_EXCEPTION", LOG);
+                Message msg = new Message("PARSE_BINDINGFILE_EXCEPTION", LOG);
                 throw new ToolException(msg, we);
             }
         }
@@ -238,7 +238,7 @@
         } else if (isValidJaxbBindingFile(reader)) {
             env.addJaxbBindingFile(bindingFile, is);
         } else {
-            Message msg = new Message("UNKONW_BINDING_FILE", LOG, bindingFile);
+            Message msg = new Message("UNKNOWN_BINDING_FILE", LOG, bindingFile);
             throw new ToolException(msg);
         }
     }

Modified: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/jaxws/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/jaxws/Messages.properties?view=diff&rev=484882&r1=484881&r2=484882
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/jaxws/Messages.properties
(original)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/jaxws/Messages.properties
Fri Dec  8 17:28:56 2006
@@ -19,7 +19,7 @@
 #
 #
 STAX_PASER_ERROR = StAX parser error, check your external binding file(s)
-PARSE_BININDINGFILE_EXCEPTION = Exception during parsing external jaxws binding file(s)
-UNKONW_BINDING_FILE= Unknown external binding files : {0}
+PARSE_BINDINGFILE_EXCEPTION = Exception while parsing external jaxws binding file(s)
+UNKNOWN_BINDING_FILE= Unknown external binding files : {0}
 NOT_POINTTO_URL = External binding file: {0} does not point to the specified wsdl url:{1}
 CAN_NOT_GET_WSDL_LOCATION = Can not get this wsdl

Modified: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/ProcessorUtil.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/ProcessorUtil.java?view=diff&rev=484882&r1=484881&r2=484882
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/ProcessorUtil.java
(original)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/ProcessorUtil.java
Fri Dec  8 17:28:56 2006
@@ -320,7 +320,7 @@
         // so that we can map system IDs to DOM trees.
         try {
             URL baseURL = new File(".").getCanonicalFile().toURL();
-            return new URL(baseURL, name).toExternalForm();
+            return new URL(baseURL, name.replaceAll(" ", "%20")).toExternalForm();
         } catch (IOException e) {
             // ignore
         }

Modified: incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/databindings/jaxb/JAXBBindingGenerator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/databindings/jaxb/JAXBBindingGenerator.java?view=diff&rev=484882&r1=484881&r2=484882
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/databindings/jaxb/JAXBBindingGenerator.java
(original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/databindings/jaxb/JAXBBindingGenerator.java
Fri Dec  8 17:28:56 2006
@@ -165,9 +165,9 @@
     }
   
     
-    //Jaxb's bug . Jaxb ClassNameCollecotr may not be invoked when generated class is an
enum.
-    //So we need use this method to add the missed file to classCollector
-    
+    // JAXB bug. JAXB ClassNameCollector may not be invoked when generated
+    // class is an enum.  We need to use this method to add the missed file
+    // to classCollector.
     private void addedEnumClassToCollector(List<Schema> schemaList, ClassNameAllocatorImpl
allocator) {
         for (Schema schema : schemaList) {
             Element schemaElement = schema.getElement();

Modified: incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/compiler/Compiler.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/compiler/Compiler.java?view=diff&rev=484882&r1=484881&r2=484882
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/compiler/Compiler.java
(original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/compiler/Compiler.java
Fri Dec  8 17:28:56 2006
@@ -38,7 +38,17 @@
                 for (int i = sourceFileIndex; i < args.length; i++) {
                     if (args[i].indexOf(" ") > -1) {
                         args[i] = args[i].replace(File.separatorChar, '/');
-                        out.println("\"" + args[i] + "\"");
+                        //
+                        // javac gives an error if you use forward slashes
+                        // with package-info.java.  Refer to:
+                        // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6198196
+                        //
+                        if (args[i].indexOf("package-info.java") > -1
+                            && System.getProperty("os.name").toLowerCase().indexOf("windows")
> -1) {
+                            out.println("\"" + args[i].replaceAll("/", "\\\\\\\\") + "\"");
+                        } else {
+                            out.println("\"" + args[i] + "\"");
+                        }
                     } else {
                         out.println(args[i]);
                     }



Mime
View raw message