cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1488382 - in /cxf/branches/dkulp-nowsdl4j: rt/bindings/xml/ rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/ rt/bindings/xml/src/main/resources/schemas/wsdl/ rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ r...
Date Fri, 31 May 2013 20:24:39 GMT
Author: dkulp
Date: Fri May 31 20:24:37 2013
New Revision: 1488382

URL: http://svn.apache.org/r1488382
Log:
Everything now compiles...

Removed:
    cxf/branches/dkulp-nowsdl4j/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/BookDynamicClient.java
Modified:
    cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/pom.xml
    cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XMLWSDLExtensionLoader.java
    cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlBindingPlugin.java
    cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlIoPlugin.java
    cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xjb
    cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd
    cxf/branches/dkulp-nowsdl4j/rt/transports/http-jetty/pom.xml
    cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/HttpNumberFactoryImpl.java
    cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/HttpNumberImpl.java
    cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualHttpMulitplexClientServerTest.java
    cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualNumberFactoryImpl.java
    cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberFactoryImpl.java
    cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberImpl.java
    cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/CallbackClientServerTest.java
    cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/ServerImpl.java

Modified: cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/pom.xml?rev=1488382&r1=1488381&r2=1488382&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/pom.xml (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/pom.xml Fri May 31 20:24:37 2013
@@ -73,7 +73,19 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-wsdl</artifactId>
+            <version>${project.version}</version>
+            <optional>true</optional>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.cxf</groupId>
+                    <artifactId>cxf-rt-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

Modified: cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XMLWSDLExtensionLoader.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XMLWSDLExtensionLoader.java?rev=1488382&r1=1488381&r2=1488382&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XMLWSDLExtensionLoader.java
(original)
+++ cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XMLWSDLExtensionLoader.java
Fri May 31 20:24:37 2013
@@ -24,7 +24,6 @@ import javax.xml.bind.JAXBException;
 import org.apache.cxf.Bus;
 import org.apache.cxf.common.injection.NoJSR250Annotations;
 import org.apache.cxf.wsdl.JAXBExtensionHelper;
-import org.apache.cxf.wsdl.TExtensibilityElementImpl;
 import org.apache.cxf.wsdl.WSDLExtensionLoader;
 import org.apache.cxf.wsdl.WSDLManager;
 
@@ -53,7 +52,7 @@ public final class XMLWSDLExtensionLoade
     
     public static void createExtensor(WSDLManager manager,
                                 Class<?> parentType,
-                                Class<? extends TExtensibilityElementImpl> elementType)
{
+                                Class<?> elementType) {
         try {
             JAXBExtensionHelper.addExtensions(manager.getExtensionRegistry(),
                                               parentType, 

Modified: cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlBindingPlugin.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlBindingPlugin.java?rev=1488382&r1=1488381&r2=1488382&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlBindingPlugin.java
(original)
+++ cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlBindingPlugin.java
Fri May 31 20:24:37 2013
@@ -36,6 +36,7 @@ public final class XmlBindingPlugin exte
         xmlBinding = (XMLFormatBinding)registry.createExtension(Binding.class,
                                                                 ToolConstants.XML_BINDING_FORMAT);
 
-        return xmlBinding;
+        //return xmlBinding;
+        return null;
     }
 }

Modified: cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlIoPlugin.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlIoPlugin.java?rev=1488382&r1=1488381&r2=1488382&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlIoPlugin.java
(original)
+++ cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XmlIoPlugin.java
Fri May 31 20:24:37 2013
@@ -38,6 +38,7 @@ public final class XmlIoPlugin extends A
 
         xmlFormat = (XMLBindingMessageFormat)registry.createExtension(clz, ToolConstants.XML_FORMAT);
         xmlFormat.setRootNode(qname);
-        return xmlFormat;
+        //return new xmlFormat;
+        return null;
     }
 }

Modified: cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xjb
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xjb?rev=1488382&r1=1488381&r2=1488382&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xjb
(original)
+++ cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xjb
Fri May 31 20:24:37 2013
@@ -22,13 +22,6 @@
   xmlns:xs="http://www.w3.org/2001/XMLSchema" 
   xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc" 
   jaxb:extensionBindingPrefixes="xjc">
-    <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd" node="/xs:schema">
-        <jaxb:schemaBindings>
-            <jaxb:package name="org.apache.cxf.wsdl"/>
-        </jaxb:schemaBindings>
-        <jaxb:globalBindings generateIsSetMethod="true"/>
-    </jaxb:bindings>
-    <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd" node="/xs:schema/xs:complexType[@name='tExtensibilityElement']">
-        <jaxb:class implClass="org.apache.cxf.wsdl.TExtensibilityElementImpl"/>
-    </jaxb:bindings>
+    <jaxb:globalBindings generateIsSetMethod="true"/>
+
 </jaxb:bindings>

Modified: cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd?rev=1488382&r1=1488381&r2=1488382&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd
(original)
+++ cxf/branches/dkulp-nowsdl4j/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd
Fri May 31 20:24:37 2013
@@ -24,30 +24,22 @@
 	elementFormDefault="qualified"
 	xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" jaxb:version="2.0">
 
-	<xs:import namespace="http://schemas.xmlsoap.org/wsdl/" 
-        schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd" />
-
 	<xs:complexType name="XMLBindingMessageFormat">
-		<xs:complexContent>
-			<xs:extension base="wsdl:tExtensibilityElement">
-				<xs:sequence />
-				<xs:attribute name="rootNode" type="xs:QName"
-					use="optional">
-					<xs:annotation>
-						<xs:documentation>Specifies the QName of the root element used to wrap the message
passed across the wire</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-			</xs:extension>
-		</xs:complexContent>
+    
+		<xs:sequence />
+		<xs:attribute name="rootNode" type="xs:QName"
+			use="optional">
+			<xs:annotation>
+				<xs:documentation>Specifies the QName of the root element used to wrap the message
passed across the wire</xs:documentation>
+			</xs:annotation>
+        </xs:attribute>
+        <xs:anyAttribute namespace="http://schemas.xmlsoap.org/wsdl/"/>
 	</xs:complexType>
 
 	
 	<xs:complexType name="XMLFormatBinding">
-		<xs:complexContent>
-			<xs:extension base="wsdl:tExtensibilityElement">
-				<xs:sequence />
-			</xs:extension>
-		</xs:complexContent>
+ 		<xs:sequence />
+        <xs:anyAttribute namespace="http://schemas.xmlsoap.org/wsdl/"/>
 	</xs:complexType>
 
 	<xs:element name="body" type="xformat:XMLBindingMessageFormat">

Modified: cxf/branches/dkulp-nowsdl4j/rt/transports/http-jetty/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/transports/http-jetty/pom.xml?rev=1488382&r1=1488381&r2=1488382&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/transports/http-jetty/pom.xml (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/transports/http-jetty/pom.xml Fri May 31 20:24:37 2013
@@ -137,7 +137,12 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-wsdl</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

Modified: cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/HttpNumberFactoryImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/HttpNumberFactoryImpl.java?rev=1488382&r1=1488381&r2=1488382&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/HttpNumberFactoryImpl.java
(original)
+++ cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/HttpNumberFactoryImpl.java
Fri May 31 20:24:37 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/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/HttpNumberImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/HttpNumberImpl.java?rev=1488382&r1=1488381&r2=1488382&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/HttpNumberImpl.java
(original)
+++ cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/HttpNumberImpl.java
Fri May 31 20:24:37 2013
@@ -24,7 +24,7 @@ import javax.jws.WebService;
 import javax.xml.ws.WebServiceContext;
 import javax.xml.ws.handler.MessageContext;
 
-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/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualHttpMulitplexClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualHttpMulitplexClientServerTest.java?rev=1488382&r1=1488381&r2=1488382&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualHttpMulitplexClientServerTest.java
(original)
+++ cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualHttpMulitplexClientServerTest.java
Fri May 31 20:24:37 2013
@@ -43,7 +43,7 @@ import org.apache.cxf.testutil.common.Ab
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
 import org.apache.cxf.testutil.common.TestUtil;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.apache.cxf.wsdl.EndpointReferenceUtils;
+import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

Modified: cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualNumberFactoryImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualNumberFactoryImpl.java?rev=1488382&r1=1488381&r2=1488382&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualNumberFactoryImpl.java
(original)
+++ cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualNumberFactoryImpl.java
Fri May 31 20:24:37 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/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberFactoryImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberFactoryImpl.java?rev=1488382&r1=1488381&r2=1488382&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberFactoryImpl.java
(original)
+++ cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberFactoryImpl.java
Fri May 31 20:24:37 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/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberImpl.java?rev=1488382&r1=1488381&r2=1488382&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberImpl.java
(original)
+++ cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberImpl.java
Fri May 31 20:24:37 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/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/CallbackClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/CallbackClientServerTest.java?rev=1488382&r1=1488381&r2=1488382&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/CallbackClientServerTest.java
(original)
+++ cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/CallbackClientServerTest.java
Fri May 31 20:24:37 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/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/ServerImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/ServerImpl.java?rev=1488382&r1=1488381&r2=1488382&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/ServerImpl.java
(original)
+++ cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/ServerImpl.java
Fri May 31 20:24:37 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;



Mime
View raw message