cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1490642 [6/6] - in /cxf/trunk: api/ api/src/main/java/org/apache/cxf/binding/ api/src/main/java/org/apache/cxf/common/classloader/ api/src/main/java/org/apache/cxf/common/jaxb/ api/src/main/java/org/apache/cxf/common/util/ api/src/main/jav...
Date Fri, 07 Jun 2013 13:36:19 GMT
Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualNumberFactoryImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualNumberFactoryImpl.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualNumberFactoryImpl.java
(original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualNumberFactoryImpl.java
Fri Jun  7 13:36:13 2013
@@ -27,7 +27,7 @@ import javax.xml.ws.wsaddressing.W3CEndp
 import org.apache.cxf.Bus;
 import org.apache.cxf.jaxws.EndpointImpl;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.apache.cxf.wsdl.EndpointReferenceUtils;
+import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
 
 @WebService(serviceName = "NumberFactoryService", 
             portName = "NumberFactoryPort", 

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberFactoryImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberFactoryImpl.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberFactoryImpl.java
(original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberFactoryImpl.java
Fri Jun  7 13:36:13 2013
@@ -31,7 +31,7 @@ import org.apache.cxf.interceptor.Loggin
 import org.apache.cxf.jaxws.EndpointImpl;
 import org.apache.cxf.testutil.common.EmbeddedJMSBrokerLauncher;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.apache.cxf.wsdl.EndpointReferenceUtils;
+import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
 
 @WebService(serviceName = "NumberFactoryService", 
             portName = "NumberFactoryPort", 

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberImpl.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberImpl.java
(original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberImpl.java
Fri Jun  7 13:36:13 2013
@@ -27,7 +27,7 @@ import javax.xml.ws.handler.MessageConte
 import org.apache.cxf.factory_pattern.IsEvenResponse;
 import org.apache.cxf.factory_pattern.ObjectFactory;
 import org.apache.cxf.transport.jms.JMSConstants;
-import org.apache.cxf.wsdl.EndpointReferenceUtils;
+import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
 
 @WebService(serviceName = "NumberService",
             endpointInterface = "org.apache.cxf.factory_pattern.Number", 

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java
(original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java
Fri Jun  7 13:36:13 2013
@@ -52,10 +52,10 @@ import org.apache.cxf.mime.TestMtom;
 import org.apache.cxf.mime.types.XopStringType;
 import org.apache.cxf.mtom_xop.TestMtomImpl;
 import org.apache.cxf.service.Service;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
 
 import org.junit.BeforeClass;
 import org.junit.Test;

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java
(original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java
Fri Jun  7 13:36:13 2013
@@ -46,11 +46,11 @@ import org.apache.cxf.jaxws.support.JaxW
 import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
 import org.apache.cxf.mime.TestMtom;
 import org.apache.cxf.service.Service;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
 import org.apache.cxf.testutil.common.EmbeddedJMSBrokerLauncher;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
 
 import org.junit.BeforeClass;
 import org.junit.Test;

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/CallbackClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/CallbackClientServerTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/CallbackClientServerTest.java
(original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/CallbackClientServerTest.java
Fri Jun  7 13:36:13 2013
@@ -28,7 +28,7 @@ import javax.xml.ws.wsaddressing.W3CEndp
 
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.apache.cxf.wsdl.EndpointReferenceUtils;
+import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
 import org.apache.nested_callback.NestedCallback;
 import org.apache.nested_callback.SOAPService;
 import org.apache.nested_callback.ServerPortType;

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/ServerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/ServerImpl.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/ServerImpl.java
(original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/ServerImpl.java
Fri Jun  7 13:36:13 2013
@@ -32,7 +32,7 @@ import org.apache.cxf.Bus;
 import org.apache.cxf.common.jaxb.JAXBUtils;
 import org.apache.cxf.jaxws.spi.ProviderImpl;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.apache.cxf.wsdl.EndpointReferenceUtils;
+import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
 import org.apache.cxf.wsdl.WSDLManager;
 import org.apache.cxf.wsdl11.WSDLManagerImpl;
 import org.apache.nested_callback.CallbackPortType;

Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
(original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
Fri Jun  7 13:36:13 2013
@@ -44,11 +44,11 @@ import org.apache.cxf.ws.addressing.Addr
 import org.apache.cxf.ws.addressing.AttributedURIType;
 import org.apache.cxf.ws.addressing.ContextUtils;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
 import org.apache.cxf.ws.addressing.Names;
 import org.apache.cxf.ws.addressing.ReferenceParametersType;
 import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl;
 import org.apache.cxf.ws.addressing.soap.VersionTransformer;
-import org.apache.cxf.wsdl.EndpointReferenceUtils;
 import org.apache.hello_world_soap_http.BadRecordLitFault;
 import org.apache.hello_world_soap_http.Greeter;
 import org.apache.hello_world_soap_http.NoSuchCodeLitFault;

Modified: cxf/trunk/testutils/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/pom.xml?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/testutils/pom.xml (original)
+++ cxf/trunk/testutils/pom.xml Fri Jun  7 13:36:13 2013
@@ -45,6 +45,11 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-wsdl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-core</artifactId>
             <scope>provided</scope>

Copied: cxf/trunk/testutils/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java (from
r1490629, cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java?p2=cxf/trunk/testutils/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/testutils/src/main/java/org/apache/cxf/test/AbstractCXFTest.java (from r1490629,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/java/org/apache/cxf/test/AbstractCXFTest.java?p2=cxf/trunk/testutils/src/main/java/org/apache/cxf/test/AbstractCXFTest.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFTest.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/testutils/src/main/java/org/apache/cxf/test/TestApplicationContext.java
(from r1490629, cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/TestApplicationContext.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/java/org/apache/cxf/test/TestApplicationContext.java?p2=cxf/trunk/testutils/src/main/java/org/apache/cxf/test/TestApplicationContext.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/TestApplicationContext.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/testutils/src/main/java/org/apache/cxf/test/TestUtilities.java (from r1490629,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/TestUtilities.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/java/org/apache/cxf/test/TestUtilities.java?p2=cxf/trunk/testutils/src/main/java/org/apache/cxf/test/TestUtilities.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/TestUtilities.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/testutils/src/main/java/org/apache/cxf/test/XPathAssert.java (from r1490629,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/XPathAssert.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/java/org/apache/cxf/test/XPathAssert.java?p2=cxf/trunk/testutils/src/main/java/org/apache/cxf/test/XPathAssert.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/XPathAssert.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/testutils/src/test/java/org/apache/cxf/test/XPathAssertTest.java (from r1490629,
cxf/trunk/rt/core/src/test/java/org/apache/cxf/test/XPathAssertTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/src/test/java/org/apache/cxf/test/XPathAssertTest.java?p2=cxf/trunk/testutils/src/test/java/org/apache/cxf/test/XPathAssertTest.java&p1=cxf/trunk/rt/core/src/test/java/org/apache/cxf/test/XPathAssertTest.java&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/testutils/src/test/java/org/apache/cxf/test/test.xml (from r1490629, cxf/trunk/rt/core/src/test/java/org/apache/cxf/test/test.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/src/test/java/org/apache/cxf/test/test.xml?p2=cxf/trunk/testutils/src/test/java/org/apache/cxf/test/test.xml&p1=cxf/trunk/rt/core/src/test/java/org/apache/cxf/test/test.xml&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/testutils/src/test/java/org/apache/cxf/test/test2.xml (from r1490629, cxf/trunk/rt/core/src/test/java/org/apache/cxf/test/test2.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/src/test/java/org/apache/cxf/test/test2.xml?p2=cxf/trunk/testutils/src/test/java/org/apache/cxf/test/test2.xml&p1=cxf/trunk/rt/core/src/test/java/org/apache/cxf/test/test2.xml&r1=1490629&r2=1490642&rev=1490642&view=diff
==============================================================================
    (empty)

Modified: cxf/trunk/tools/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/pom.xml?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/tools/common/pom.xml (original)
+++ cxf/trunk/tools/common/pom.xml Fri Jun  7 13:36:13 2013
@@ -75,5 +75,12 @@
             <artifactId>cxf-rt-core</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-wsdl</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 </project>

Modified: cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java (original)
+++ cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java Fri
Jun  7 13:36:13 2013
@@ -24,11 +24,12 @@ import java.io.File;
 import java.io.PrintStream;
 
 import org.apache.cxf.helpers.FileUtils;
-import org.apache.cxf.test.AbstractCXFTest;
+
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 
-public abstract class ToolTestBase extends AbstractCXFTest {
+public abstract class ToolTestBase extends Assert {
 
     protected PrintStream oldStdErr; 
     protected PrintStream oldStdOut; 

Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/util/JavaFirstUtil.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/util/JavaFirstUtil.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/util/JavaFirstUtil.java
(original)
+++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/util/JavaFirstUtil.java
Fri Jun  7 13:36:13 2013
@@ -24,7 +24,6 @@ import java.lang.reflect.ParameterizedTy
 import java.lang.reflect.Type;
 
 import org.apache.cxf.common.util.PackageUtils;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
 import org.apache.cxf.service.model.InterfaceInfo;
 import org.apache.cxf.service.model.OperationInfo;
 import org.apache.cxf.service.model.ServiceInfo;
@@ -35,6 +34,7 @@ import org.apache.cxf.tools.common.model
 import org.apache.cxf.tools.common.model.JavaParameter;
 import org.apache.cxf.tools.common.model.JavaReturn;
 import org.apache.cxf.tools.common.model.JavaType.Style;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
 
 public final class JavaFirstUtil {
     private JavaFirstUtil() {

Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java
(original)
+++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java
Fri Jun  7 13:36:13 2013
@@ -78,7 +78,7 @@ public final class SpringServiceBuilderF
             dataBinding = (DataBinding)applicationContext.getBean(databindingBeanName);
         } catch (RuntimeException e) {
             throw new ToolException("Cannot get databinding bean " + databindingBeanName
-                                    + " for databinding " + databindingName);
+                                    + " for databinding " + databindingName, e);
         }
 
         String beanName = getBuilderBeanName(s);

Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java
(original)
+++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java
Fri Jun  7 13:36:13 2013
@@ -33,7 +33,6 @@ import javax.jws.WebService;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.PackageUtils;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.service.model.InterfaceInfo;
 import org.apache.cxf.service.model.OperationInfo;
@@ -56,6 +55,7 @@ import org.apache.cxf.tools.java2wsdl.pr
 import org.apache.cxf.tools.java2wsdl.processor.internal.jaxws.generator.JaxwsSEIGenerator;
 import org.apache.cxf.tools.java2wsdl.processor.internal.jaxws.generator.JaxwsServerGenerator;
 import org.apache.cxf.tools.wsdlto.core.AbstractGenerator;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
 
 public class JAXWSFrontEndProcessor implements Processor {
     private static final String SEI_SUFFIX = "_PortType";

Modified: cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java (original)
+++ cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java Fri
Jun  7 13:36:13 2013
@@ -20,14 +20,21 @@ package org.apache.cxf.tools.java2ws;
 
 import java.io.File;
 import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.wsdl.Definition;
 import javax.wsdl.factory.WSDLFactory;
 import javax.wsdl.xml.WSDLReader;
+import javax.xml.xpath.XPathConstants;
 
 import org.w3c.dom.Document;
 
+import junit.framework.AssertionFailedError;
+
 import org.apache.cxf.helpers.FileUtils;
+import org.apache.cxf.helpers.XMLUtils;
+import org.apache.cxf.helpers.XPathUtils;
 import org.apache.cxf.tools.common.ToolTestBase;
 import org.junit.After;
 import org.junit.Before;
@@ -39,12 +46,6 @@ public class AegisTest extends ToolTestB
     private String cp;
     private File inputData;
     
-    private void checkStdErr() {
-        String err = getStdErr();
-        if (err != null) {
-            assertEquals("errors: ", "", err);
-        }
-    }
 
     @Before
     public void startUp() throws Exception {
@@ -80,21 +81,18 @@ public class AegisTest extends ToolTestB
         File wsdlFile = null;
         wsdlFile = outputFile("aegis.wsdl");
         JavaToWS.main(args);
-        checkStdErr();
         assertTrue("wsdl is not generated", wsdlFile.exists());
     
         WSDLReader reader = WSDLFactory.newInstance().newWSDLReader();
         reader.setFeature("javax.wsdl.verbose", false);
         Definition def = reader.readWSDL(wsdlFile.toURI().toURL().toString());
         Document wsdl = WSDLFactory.newInstance().newWSDLWriter().getDocument(def);
-        addNamespace("ns0", "http://aegis2ws.fortest.tools.cxf.apache.org/");
         assertValid("//xsd:element[@type='ns0:Something']", wsdl);
     }
     
     @Test 
-    @org.junit.Ignore("Failed on Windows Vista")
     public void testAegisReconfigureDatabinding() throws Exception {
-        final String sei = "org.apache.cxf.tools.fortest.aegis2ws.TestAegisSEI";
+        final String sei = org.apache.cxf.tools.fortest.aegis2ws.TestAegisSEI.class.getName();
         String[] args = new String[] {"-wsdl", "-o", output.getPath() + "/aegis.wsdl", 
                                       "-beans",
                                       new File(inputData, "revisedAegisDefaultBeans.xml").
@@ -105,21 +103,43 @@ public class AegisTest extends ToolTestB
         File wsdlFile = null;
         wsdlFile = outputFile("aegis.wsdl");
         JavaToWS.main(args);
-        checkStdErr();
         assertTrue("wsdl is not generated", wsdlFile.exists());
     
         WSDLReader reader = WSDLFactory.newInstance().newWSDLReader();
         reader.setFeature("javax.wsdl.verbose", false);
         Definition def = reader.readWSDL(wsdlFile.toURI().toURL().toString());
         Document wsdl = WSDLFactory.newInstance().newWSDLWriter().getDocument(def);
-        addNamespace("ns0", "http://aegis2ws.fortest.tools.cxf.apache.org/");
         assertValid("//xsd:element[@type='ns0:Something']", wsdl);
-        assertXPathEquals("//xsd:complexType[@name='Something']/" 
-                          + "xsd:sequence/xsd:element[@name='multiple']/@minOccurs", 
-                          "50", wsdl);
-        assertInvalid("//xsd:complexType[@name='Something']/" 
-                          + "xsd:sequence/xsd:element[@name='singular']/@minOccurs", 
-                          wsdl);
+        XPathUtils xpu = new XPathUtils(getNSMap());
+        
+        String s = (String)xpu.getValue("//xsd:complexType[@name='takeSomething']/"
+                                + "xsd:sequence/xsd:element[@name='arg0']/@minOccurs",
+                                wsdl, XPathConstants.STRING);
+        assertEquals("50", s);
+        assertFalse(xpu.isExist("//xsd:complexType[@name='Something']/xsd:sequence/"
+                                + "xsd:element[@name='singular']/@minOccurs",
+                         wsdl, XPathConstants.NODE));
     }
 
+
+    private Map<String, String> getNSMap() {
+        Map<String, String> namespaces = new HashMap<String, String>();
+        namespaces.put("s", "http://schemas.xmlsoap.org/soap/envelope/");
+        namespaces.put("xsd", "http://www.w3.org/2001/XMLSchema");
+        namespaces.put("wsdl", "http://schemas.xmlsoap.org/wsdl/");
+        namespaces.put("wsdlsoap", "http://schemas.xmlsoap.org/wsdl/soap/");
+        namespaces.put("soap", "http://schemas.xmlsoap.org/soap/");
+        namespaces.put("soap12env", "http://www.w3.org/2003/05/soap-envelope");
+        namespaces.put("xml", "http://www.w3.org/XML/1998/namespace");
+        namespaces.put("ns0", "http://aegis2ws.fortest.tools.cxf.apache.org/");
+        return namespaces;
+    }
+    
+    private void assertValid(String xpathExpression, Document doc) {
+        XPathUtils xpu = new XPathUtils(getNSMap());
+        if (!xpu.isExist(xpathExpression, doc, XPathConstants.NODE)) {
+            throw new AssertionFailedError("Failed to select any nodes for expression:\n"
+ xpathExpression
+                                           + " from document:\n" + XMLUtils.toString(doc));
+        }
+    }    
 }

Modified: cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
(original)
+++ cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
Fri Jun  7 13:36:13 2013
@@ -35,7 +35,6 @@ import org.w3c.dom.Element;
 import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.helpers.WSDLHelper;
 import org.apache.cxf.helpers.XMLUtils;
 import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.cxf.tools.common.ProcessorTestBase;
@@ -46,6 +45,8 @@ import org.apache.cxf.tools.wsdlto.core.
 import org.apache.cxf.tools.wsdlto.core.FrontEndProfile;
 import org.apache.cxf.tools.wsdlto.core.PluginLoader;
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.JAXWSContainer;
+import org.apache.cxf.wsdl.WSDLHelper;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Modified: cxf/trunk/tools/javato/ws/src/test/resources/revisedAegisDefaultBeans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/resources/revisedAegisDefaultBeans.xml?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/test/resources/revisedAegisDefaultBeans.xml (original)
+++ cxf/trunk/tools/javato/ws/src/test/resources/revisedAegisDefaultBeans.xml Fri Jun  7 13:36:13
2013
@@ -22,17 +22,12 @@
        xsi:schemaLocation="
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-<bean id="AegisDatabindingBean" class="org.apache.cxf.aegis.databinding.AegisDatabinding"
 >
-	<property name="typeMappingRegistry">
-		<bean class="org.apache.cxf.aegis.type.DefaultTypeMappingRegistry">
-		    <constructor-arg index="0" value="true"/>
-			<property name="configuration">
-				<bean class="org.apache.cxf.aegis.type.Configuration">
-					<property name="defaultMinOccurs" value="50"/>
-				</bean>
-			</property>
-		</bean>
-	</property>
-</bean>
+    <bean id="AegisDatabindingBean" class="org.apache.cxf.aegis.databinding.AegisDatabinding"
 >
+        <property name="configuration">
+            <bean class="org.apache.cxf.aegis.type.TypeCreationOptions">
+                <property name="defaultMinOccurs" value="50"/>
+            </bean>
+        </property>
+    </bean>
 
 </beans>

Modified: cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
(original)
+++ cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
Fri Jun  7 13:36:13 2013
@@ -43,8 +43,8 @@ import org.apache.cxf.binding.soap.wsdl.
 import org.apache.cxf.common.util.CollectionUtils;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.helpers.CastUtils;
-import org.apache.cxf.helpers.WSDLHelper;
 import org.apache.cxf.tools.common.ToolException;
+import org.apache.cxf.wsdl.WSDLHelper;
 
 public class WSIBPValidator extends AbstractDefinitionValidator {
     private List<String> operationMap = new ArrayList<String>();

Modified: cxf/trunk/tools/wsdlto/core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/pom.xml?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/core/pom.xml (original)
+++ cxf/trunk/tools/wsdlto/core/pom.xml Fri Jun  7 13:36:13 2013
@@ -56,6 +56,11 @@
             <artifactId>cxf-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-wsdl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>junit</groupId>

Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java
(original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java
Fri Jun  7 13:36:13 2013
@@ -85,7 +85,7 @@ public class SEIGenerator extends Abstra
                 if (penv.isVerbose()) {
                     System.out.println(msg.toString());
                 }
-                return;
+                continue;
             }
             for (JavaInterface intf : interfaces.values()) {
     

Modified: cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java
(original)
+++ cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java
Fri Jun  7 13:36:13 2013
@@ -174,7 +174,7 @@ public class WSDLToXMLProcessor extends 
             binding.addExtensibilityElement(getWSDLPlugin("xml", Binding.class).createExtension(null));
         } catch (WSDLException wse) {
             Message msg = new Message("FAIL_TO_CREATE_XMLBINDING", LOG);
-            throw new ToolException(msg);
+            throw new ToolException(msg, wse);
         }
     }
 

Modified: cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java
(original)
+++ cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java
Fri Jun  7 13:36:13 2013
@@ -46,7 +46,7 @@ public class WSDLToXMLProcessorTest exte
 
     @Test
     public void testAllDefault() throws Exception {
-        String[] args = new String[] {"-i", "Greeter", "-d", output.getCanonicalPath(),
+        String[] args = new String[] {"-verbose", "-i", "Greeter", "-d", output.getCanonicalPath(),
                                       getLocation("/misctools_wsdl/hello_world.wsdl")};
         WSDLToXML.main(args);
 

Modified: cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java?rev=1490642&r1=1490641&r2=1490642&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
(original)
+++ cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
Fri Jun  7 13:36:13 2013
@@ -34,6 +34,8 @@ import org.apache.cxf.bindings.xformat.X
 import org.apache.cxf.tools.common.ToolContext;
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.wsdl11.JAXWSDefinitionBuilder;
 import org.apache.cxf.transport.jms.AddressType;
+import org.apache.cxf.wsdl.JAXBExtensibilityElement;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -71,8 +73,12 @@ public class JAXWSDefinitionBuilderTest 
         assertNotNull(port);
 
         assertEquals(1, port.getExtensibilityElements().size());
-        assertTrue(port.getExtensibilityElements().get(0).getClass().getName() + " is an
HTTPAddress",
-                   port.getExtensibilityElements().get(0) instanceof HTTPAddress);
+        Object obj = port.getExtensibilityElements().get(0);
+        if (obj instanceof JAXBExtensibilityElement) {
+            obj = ((JAXBExtensibilityElement)obj).getValue();
+        }
+        assertTrue(obj.getClass().getName() + " is an HTTPAddress",
+                   obj instanceof HTTPAddress);
 
         Binding binding = port.getBinding();
         assertNotNull(binding);
@@ -84,7 +90,12 @@ public class JAXWSDefinitionBuilderTest 
         BindingInput input = operation.getBindingInput();
         assertNotNull(input);
         assertEquals(1, input.getExtensibilityElements().size());
-        assertTrue(input.getExtensibilityElements().get(0) instanceof XMLBindingMessageFormat);
+        obj = input.getExtensibilityElements().get(0);
+        if (obj instanceof JAXBExtensibilityElement) {
+            obj = ((JAXBExtensibilityElement)obj).getValue();
+        }
+        assertTrue(obj.getClass().getName() + " is not an XMLBindingMessageFormat", 
+                   obj instanceof XMLBindingMessageFormat);
     }
 
     @Test



Mime
View raw message