You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2006/11/06 17:02:49 UTC

svn commit: r471772 - in /incubator/cxf/trunk: pom.xml systests/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java testutils/pom.xml testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java

Author: dkulp
Date: Mon Nov  6 08:02:48 2006
New Revision: 471772

URL: http://svn.apache.org/viewvc?view=rev&rev=471772
Log:
Forgetten part of last commit.   Update locator to generate into a org.apache.cxf package to avoid conflicts with using testutils in other projects


Modified:
    incubator/cxf/trunk/pom.xml
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
    incubator/cxf/trunk/testutils/pom.xml
    incubator/cxf/trunk/testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java

Modified: incubator/cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=diff&rev=471772&r1=471771&r2=471772
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Mon Nov  6 08:02:48 2006
@@ -740,6 +740,7 @@
             <id>everything</id>
             <modules>
                 <module>distribution</module>
+                <module>tools/eclipse-plugin</module>
             </modules>
             <build>
                 <plugins>

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java?view=diff&rev=471772&r1=471771&r2=471772
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java Mon Nov  6 08:02:48 2006
@@ -26,9 +26,6 @@
 import javax.xml.ws.Endpoint;
 import javax.xml.ws.Holder;
 
-import com.iona.ws._2005._11.locator.LocatorService;
-import com.iona.ws._2005._11.locator.LocatorService_Service;
-import com.iona.ws._2005._11.locator.query.QuerySelectType;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -38,6 +35,10 @@
 import org.apache.cxf.systest.common.ClientServerSetupBase;
 import org.apache.cxf.systest.common.ClientServerTestBase;
 import org.apache.cxf.systest.common.TestServerBase;
+
+import org.apache.cxf.testutils.locator.LocatorService;
+import org.apache.cxf.testutils.locator.LocatorService_Service;
+import org.apache.cxf.testutils.locator.QuerySelectType;
 
 import org.apache.locator_test.LocatorServiceImpl;
 

Modified: incubator/cxf/trunk/testutils/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/pom.xml?view=diff&rev=471772&r1=471771&r2=471772
==============================================================================
--- incubator/cxf/trunk/testutils/pom.xml (original)
+++ incubator/cxf/trunk/testutils/pom.xml Mon Nov  6 08:02:48 2006
@@ -222,6 +222,10 @@
                                 </wsdlOption>
                                 <wsdlOption>
                                     <wsdl>${basedir}/src/main/resources/wsdl/locator.wsdl</wsdl>
+                                    <extraargs>
+                                        <extraarg>-p</extraarg>
+                                        <extraarg>org.apache.cxf.testutils.locator</extraarg>
+                                    </extraargs>
                                 </wsdlOption>
 
                                 <wsdlOption>

Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java?view=diff&rev=471772&r1=471771&r2=471772
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java (original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java Mon Nov  6 08:02:48 2006
@@ -25,8 +25,8 @@
 package org.apache.locator_test;
 
 import java.util.logging.Logger;
-import com.iona.ws._2005._11.locator.EndpointNotExistFault;
-import com.iona.ws._2005._11.locator.LocatorService;
+import org.apache.cxf.testutils.locator.EndpointNotExistFault;
+import org.apache.cxf.testutils.locator.LocatorService;
 
 /**
  * This class was generated by the CXF 2.0-incubator-M1-SNAPSHOT Thu Nov 02
@@ -37,7 +37,7 @@
                       serviceName = "LocatorService", 
                       portName = "LocatorServicePort", 
                       targetNamespace = "http://ws.iona.com/2005/11/locator", 
-                      endpointInterface = "com.iona.ws._2005._11.locator.LocatorService")
+                      endpointInterface = "org.apache.cxf.testutils.locator.LocatorService")
 public class LocatorServiceImpl implements LocatorService {
 
     static final Logger LOG = Logger.getLogger(LocatorServiceImpl.class.getName());
@@ -55,12 +55,12 @@
         LOG.info("Executing operation deregisterPeerManager");
     }
 
-    public void registerEndpoint(com.iona.ws._2005._11.locator.types.EndpointIdentity endpointId,
+    public void registerEndpoint(org.apache.cxf.testutils.locator.EndpointIdentity endpointId,
                                  org.apache.cxf.ws.addressing.EndpointReferenceType endpointReference) {
         LOG.info("Executing operation registerEndpoint");
     }
 
-    public void deregisterEndpoint(com.iona.ws._2005._11.locator.types.EndpointIdentity endpointId,
+    public void deregisterEndpoint(org.apache.cxf.testutils.locator.EndpointIdentity endpointId,
                                    org.apache.cxf.ws.addressing.EndpointReferenceType endpointReference) {
         LOG.info("Executing operation deregisterEndpoint");
     }
@@ -75,15 +75,15 @@
 
     
     public java.util.List<
-        com.iona.ws._2005._11.locator.types.ListEndpointsResponse.Endpoint> listEndpoints() {
+        org.apache.cxf.testutils.locator.ListEndpointsResponse.Endpoint> listEndpoints() {
         LOG.info("Executing operation listEndpoints");
         return null;
     }
 
     
     public java.util.List<
-        com.iona.ws._2005._11.locator.types.QueryEndpointsResponse.Endpoint> queryEndpoints(
-            com.iona.ws._2005._11.locator.query.QuerySelectType select) {
+        org.apache.cxf.testutils.locator.QueryEndpointsResponse.Endpoint> queryEndpoints(
+            org.apache.cxf.testutils.locator.QuerySelectType select) {
         LOG.info("Executing operation queryEndpoints");
         return null;
     }