svn commit: r1418217 - in /axis/axis1/java/branches/EMF: ./ axis-rt-core/src/main/java/ maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/ test/wsdl/interop/

[veithen]

Author: veithen
Date: Fri Dec  7 08:33:06 2012
New Revision: 1418217

URL: http://svn.apache.org/viewvc?rev=1418217&view=rev
Log:
Merged latest changes from trunk.

Modified:
    axis/axis1/java/branches/EMF/   (props changed)
    axis/axis1/java/branches/EMF/axis-rt-core/src/main/java/   (props changed)
    
axis/axis1/java/branches/EMF/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceIfaceWriterEx.java
    
axis/axis1/java/branches/EMF/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceImplWriterEx.java
    
axis/axis1/java/branches/EMF/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaStubWriterEx.java
    axis/axis1/java/branches/EMF/test/wsdl/interop/   (props changed)

Propchange: axis/axis1/java/branches/EMF/
------------------------------------------------------------------------------
  Merged /axis/axis1/java/trunk:r1417039-1418216

Propchange: axis/axis1/java/branches/EMF/axis-rt-core/src/main/java/
------------------------------------------------------------------------------
  Merged /axis/axis1/java/trunk/axis-rt-core/src/main/java:r1417039-1418216

Modified: 
axis/axis1/java/branches/EMF/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceIfaceWriterEx.java
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceIfaceWriterEx.java?rev=1418217&r1=1418216&r2=1418217&view=diff
==============================================================================
--- 
axis/axis1/java/branches/EMF/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceIfaceWriterEx.java
 (original)
+++ 
axis/axis1/java/branches/EMF/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceIfaceWriterEx.java
 Fri Dec  7 08:33:06 2012
@@ -35,7 +35,7 @@ public class JavaServiceIfaceWriterEx ex
         if (clientOutputDirectory == null) {
             return super.getFileName();
         } else {
-            return clientOutputDirectory + File.separator + 
packageName.replaceAll("\\.", File.separator) + File.separator + className + 
".java";
+            return clientOutputDirectory + File.separator + 
packageName.replace('.', File.separatorChar) + File.separator + className + 
".java";
         }
     }
 }

Modified: 
axis/axis1/java/branches/EMF/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceImplWriterEx.java
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceImplWriterEx.java?rev=1418217&r1=1418216&r2=1418217&view=diff
==============================================================================
--- 
axis/axis1/java/branches/EMF/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceImplWriterEx.java
 (original)
+++ 
axis/axis1/java/branches/EMF/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceImplWriterEx.java
 Fri Dec  7 08:33:06 2012
@@ -35,7 +35,7 @@ public class JavaServiceImplWriterEx ext
         if (clientOutputDirectory == null) {
             return super.getFileName();
         } else {
-            return clientOutputDirectory + File.separator + 
packageName.replaceAll("\\.", File.separator) + File.separator + className + 
".java";
+            return clientOutputDirectory + File.separator + 
packageName.replace('.', File.separatorChar) + File.separator + className + 
".java";
         }
     }
 }

Modified: 
axis/axis1/java/branches/EMF/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaStubWriterEx.java
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaStubWriterEx.java?rev=1418217&r1=1418216&r2=1418217&view=diff
==============================================================================
--- 
axis/axis1/java/branches/EMF/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaStubWriterEx.java
 (original)
+++ 
axis/axis1/java/branches/EMF/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaStubWriterEx.java
 Fri Dec  7 08:33:06 2012
@@ -35,7 +35,7 @@ public class JavaStubWriterEx extends Ja
         if (clientOutputDirectory == null) {
             return super.getFileName();
         } else {
-            return clientOutputDirectory + File.separator + 
packageName.replaceAll("\\.", File.separator) + File.separator + className + 
".java";
+            return clientOutputDirectory + File.separator + 
packageName.replace('.', File.separatorChar) + File.separator + className + 
".java";
         }
     }
 }

Propchange: axis/axis1/java/branches/EMF/test/wsdl/interop/
------------------------------------------------------------------------------
  Merged /axis/axis1/java/trunk/test/wsdl/interop:r1417039-1418216