svn commit: r1388600 - in /axis/axis1/java/trunk/integration: ./ src/main/java/test/wsdl/anytype/ src/main/java/test/wsdl/anytype/org/ src/main/java/test/wsdl/document/ src/main/java/test/wsdl/document/org/ src/main/java/test/wsdl/gateway/ src/main/jav...

Fri, 21 Sep 2012 11:21:29 -0700 

Author: veithen
Date: Fri Sep 21 18:20:41 2012
New Revision: 1388600

URL: http://svn.apache.org/viewvc?rev=1388600&view=rev
Log:
Avoid collisions between the classes passed to java2wsdl and the classes 
generated later by wsdl2java.

Added:
    axis/axis1/java/trunk/integration/src/main/java/test/wsdl/anytype/org/
    
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/anytype/org/AnyService.java
      - copied, changed from r1388090, 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/anytype/AnyService.java
    axis/axis1/java/trunk/integration/src/main/java/test/wsdl/document/org/
    
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/document/org/TestService.java
      - copied, changed from r1388090, 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/document/TestService.java
    axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/org/
    
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/org/Gateway.java
      - copied, changed from r1388090, 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/Gateway.java
    
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/org/MyClass.java
      - copied, changed from r1388090, 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/MyClass.java
    
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/org/OutClass.java
      - copied, changed from r1388090, 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/OutClass.java
    axis/axis1/java/trunk/integration/src/main/java/test/wsdl/map/org/
    
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/map/org/MapService.java
      - copied, changed from r1388090, 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/map/MapService.java
Removed:
    
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/anytype/AnyService.java
    
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/document/TestService.java
    
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/Gateway.java
    
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/MyClass.java
    
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/OutClass.java
    
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/map/MapService.java
Modified:
    axis/axis1/java/trunk/integration/pom.xml

Modified: axis/axis1/java/trunk/integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/pom.xml?rev=1388600&r1=1388599&r2=1388600&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/pom.xml (original)
+++ axis/axis1/java/trunk/integration/pom.xml Fri Sep 21 18:20:41 2012
@@ -70,12 +70,12 @@
                         <phase>process-classes</phase>
                         <configuration>
                             
<output>${project.build.directory}/work/test/wsdl/anytype/AnyService.wsdl</output>
-                            <className>test.wsdl.anytype.AnyService</className>
+                            
<className>test.wsdl.anytype.org.AnyService</className>
                             <namespace>http://test.com/AnyService</namespace>
                             
<location>http://localhost:8080/axis/services/AnyService</location>
                             <mappings>
                                 <mapping>
-                                    <package>test.wsdl.anytype</package>
+                                    <package>test.wsdl.anytype.org</package>
                                     
<namespace>http://test.com/AnyService</namespace>
                                 </mapping>
                             </mappings>
@@ -109,12 +109,12 @@
                         <phase>process-classes</phase>
                         <configuration>
                             
<output>${project.build.directory}/work/test/wsdl/document/document.wsdl</output>
-                            
<className>test.wsdl.document.TestService</className>
+                            
<className>test.wsdl.document.org.TestService</className>
                             <namespace>http://document.wsdl.test</namespace>
                             
<location>http://localhost:8080/axis/services/DocumentTest</location>
                             <mappings>
                                 <mapping>
-                                    <package>test.wsdl.document</package>
+                                    <package>test.wsdl.document.org</package>
                                     
<namespace>http://document.wsdl.test</namespace>
                                 </mapping>
                             </mappings>
@@ -128,16 +128,16 @@
                         <phase>process-classes</phase>
                         <configuration>
                             
<output>${project.build.directory}/work/test/wsdl/gateway/Gateway.wsdl</output>
-                            <className>test.wsdl.gateway.Gateway</className>
+                            
<className>test.wsdl.gateway.org.Gateway</className>
                             <extraClasses>
-                                
<extraClass>test.wsdl.gateway.MyClass</extraClass>
-                                
<extraClass>test.wsdl.gateway.OutClass</extraClass>
+                                
<extraClass>test.wsdl.gateway.org.MyClass</extraClass>
+                                
<extraClass>test.wsdl.gateway.org.OutClass</extraClass>
                             </extraClasses>
                             <namespace>http://test.com/gateway</namespace>
                             
<location>http://localhost:8080/axis/services/Gateway</location>
                             <mappings>
                                 <mapping>
-                                    <package>test.wsdl.gateway</package>
+                                    <package>test.wsdl.gateway.org</package>
                                     
<namespace>http://test.com/gateway</namespace>
                                 </mapping>
                             </mappings>
@@ -151,12 +151,12 @@
                         <phase>process-classes</phase>
                         <configuration>
                             
<output>${project.build.directory}/work/test/wsdl/map/MapService.wsdl</output>
-                            <className>test.wsdl.map.MapService</className>
+                            <className>test.wsdl.map.org.MapService</className>
                             <namespace>http://test.com/MapService</namespace>
                             
<location>http://localhost:8080/axis/services/MapService</location>
                             <mappings>
                                 <mapping>
-                                    <package>test.wsdl.map</package>
+                                    <package>test.wsdl.map.org</package>
                                     
<namespace>http://test.com/MapService</namespace>
                                 </mapping>
                             </mappings>

Copied: 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/anytype/org/AnyService.java
 (from r1388090, 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/anytype/AnyService.java)
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/main/java/test/wsdl/anytype/org/AnyService.java?p2=axis/axis1/java/trunk/integration/src/main/java/test/wsdl/anytype/org/AnyService.java&p1=axis/axis1/java/trunk/integration/src/main/java/test/wsdl/anytype/AnyService.java&r1=1388090&r2=1388600&rev=1388600&view=diff
==============================================================================
--- 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/anytype/AnyService.java
 (original)
+++ 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/anytype/org/AnyService.java
 Fri Sep 21 18:20:41 2012
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package test.wsdl.anytype;
+package test.wsdl.anytype.org;
 
 public class AnyService {
     public Object run() {

Copied: 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/document/org/TestService.java
 (from r1388090, 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/document/TestService.java)
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/main/java/test/wsdl/document/org/TestService.java?p2=axis/axis1/java/trunk/integration/src/main/java/test/wsdl/document/org/TestService.java&p1=axis/axis1/java/trunk/integration/src/main/java/test/wsdl/document/TestService.java&r1=1388090&r2=1388600&rev=1388600&view=diff
==============================================================================
--- 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/document/TestService.java
 (original)
+++ 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/document/org/TestService.java
 Fri Sep 21 18:20:41 2012
@@ -1,4 +1,4 @@
-package test.wsdl.document;
+package test.wsdl.document.org;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

Copied: 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/org/Gateway.java
 (from r1388090, 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/Gateway.java)
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/org/Gateway.java?p2=axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/org/Gateway.java&p1=axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/Gateway.java&r1=1388090&r2=1388600&rev=1388600&view=diff
==============================================================================
--- 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/Gateway.java 
(original)
+++ 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/org/Gateway.java
 Fri Sep 21 18:20:41 2012
@@ -1,4 +1,4 @@
-package test.wsdl.gateway;
+package test.wsdl.gateway.org;
 
 public interface Gateway {
        public String test1(MyClass myClass);

Copied: 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/org/MyClass.java
 (from r1388090, 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/MyClass.java)
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/org/MyClass.java?p2=axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/org/MyClass.java&p1=axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/MyClass.java&r1=1388090&r2=1388600&rev=1388600&view=diff
==============================================================================
--- 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/MyClass.java 
(original)
+++ 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/org/MyClass.java
 Fri Sep 21 18:20:41 2012
@@ -1,4 +1,4 @@
-package test.wsdl.gateway;
+package test.wsdl.gateway.org;
 
 /**
  * Test for Bug 14033 - bean property multi-dimensional arrays don't 
deserialize

Copied: 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/org/OutClass.java
 (from r1388090, 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/OutClass.java)
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/org/OutClass.java?p2=axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/org/OutClass.java&p1=axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/OutClass.java&r1=1388090&r2=1388600&rev=1388600&view=diff
==============================================================================
--- 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/OutClass.java 
(original)
+++ 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/gateway/org/OutClass.java
 Fri Sep 21 18:20:41 2012
@@ -1,4 +1,4 @@
-package test.wsdl.gateway;
+package test.wsdl.gateway.org;
 
 public class OutClass {
        public String text;

Copied: 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/map/org/MapService.java
 (from r1388090, 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/map/MapService.java)
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/main/java/test/wsdl/map/org/MapService.java?p2=axis/axis1/java/trunk/integration/src/main/java/test/wsdl/map/org/MapService.java&p1=axis/axis1/java/trunk/integration/src/main/java/test/wsdl/map/MapService.java&r1=1388090&r2=1388600&rev=1388600&view=diff
==============================================================================
--- 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/map/MapService.java 
(original)
+++ 
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/map/org/MapService.java
 Fri Sep 21 18:20:41 2012
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package test.wsdl.map;
+package test.wsdl.map.org;
 
 import java.util.Map;

Reply via email to