cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1489600 - in /cxf/branches/dkulp-nowsdl4j: rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ systests/databinding/src/test/resources/ systests/databinding/src/test/resources/webapp/WEB-INF/ ...
Date Tue, 04 Jun 2013 20:53:18 GMT
Author: dkulp
Date: Tue Jun  4 20:53:17 2013
New Revision: 1489600

URL: http://svn.apache.org/r1489600
Log:
Get some more of the tests passing

Modified:
    cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
    cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
    cxf/branches/dkulp-nowsdl4j/systests/databinding/src/test/resources/mtomTestBeans.xml
    cxf/branches/dkulp-nowsdl4j/systests/databinding/src/test/resources/webapp/WEB-INF/beans.xml
    cxf/branches/dkulp-nowsdl4j/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java

Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java?rev=1489600&r1=1489599&r2=1489600&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
(original)
+++ cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
Tue Jun  4 20:53:17 2013
@@ -37,6 +37,7 @@ import javax.jws.WebService;
 import javax.wsdl.Definition;
 import javax.wsdl.Port;
 import javax.wsdl.extensions.ExtensibilityElement;
+import javax.wsdl.extensions.http.HTTPAddress;
 import javax.wsdl.extensions.soap.SOAPAddress;
 import javax.wsdl.extensions.soap12.SOAP12Address;
 import javax.wsdl.extensions.soap12.SOAP12Binding;
@@ -189,6 +190,8 @@ public class ServiceImpl extends Service
                         address = ((SOAP12Address)e).getLocationURI();
                     } else if (e instanceof SOAPAddress) {
                         address = ((SOAPAddress)e).getLocationURI();                    
   
+                    } else if (e instanceof HTTPAddress) {
+                        address = ((HTTPAddress)e).getLocationURI();
                     }
                 }
                 addPort(name, bindingID, address);

Modified: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java?rev=1489600&r1=1489599&r2=1489600&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
(original)
+++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
Tue Jun  4 20:53:17 2013
@@ -56,6 +56,7 @@ import org.w3c.dom.Element;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusException;
+import org.apache.cxf.binding.AbstractBindingFactory;
 import org.apache.cxf.binding.BindingFactory;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.xmlschema.SchemaCollection;
@@ -491,6 +492,8 @@ public class WSDLServiceBuilder {
             bi = wFactory.createBindingInfo(service, binding, ns.toString());
             copyExtensors(bi, binding.getExtensibilityElements());
             copyExtensionAttributes(bi, binding);
+        } else if (factory instanceof AbstractBindingFactory) {
+            bi = ((AbstractBindingFactory)factory).createBindingInfo(service, ns.toString(),
null);
         }
         if (bi == null) {
             bi = new BindingInfo(service, ns.toString());

Modified: cxf/branches/dkulp-nowsdl4j/systests/databinding/src/test/resources/mtomTestBeans.xml
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/systests/databinding/src/test/resources/mtomTestBeans.xml?rev=1489600&r1=1489599&r2=1489600&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/systests/databinding/src/test/resources/mtomTestBeans.xml
(original)
+++ cxf/branches/dkulp-nowsdl4j/systests/databinding/src/test/resources/mtomTestBeans.xml
Tue Jun  4 20:53:17 2013
@@ -83,7 +83,7 @@ http://cxf.apache.org/core http://cxf.ap
 			<ref bean="mtomImpl" />
 		</simple:serviceBean>
 		<simple:serviceFactory>
-			<bean class='org.apache.cxf.service.factory.ReflectionServiceFactoryBean'>
+			<bean class='org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean'>
 				<property name="properties">
 					<map>
 						<entry key="mtom-enabled">

Modified: cxf/branches/dkulp-nowsdl4j/systests/databinding/src/test/resources/webapp/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/systests/databinding/src/test/resources/webapp/WEB-INF/beans.xml?rev=1489600&r1=1489599&r2=1489600&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/systests/databinding/src/test/resources/webapp/WEB-INF/beans.xml
(original)
+++ cxf/branches/dkulp-nowsdl4j/systests/databinding/src/test/resources/webapp/WEB-INF/beans.xml
Tue Jun  4 20:53:17 2013
@@ -63,7 +63,7 @@ http://cxf.apache.org/schemas/jaxws.xsd"
     				<bean class="org.apache.cxf.aegis.databinding.AegisServiceConfiguration">
     					<property name="serviceNamespace" value="http://foo.bar.com"/>
     				</bean>
-    				<bean class="org.apache.cxf.service.factory.DefaultServiceConfiguration"/>
+    				<bean class="org.apache.cxf.wsdl.service.factory.DefaultServiceConfiguration"/>
     			</list>
     		</property>
     	</bean>

Modified: cxf/branches/dkulp-nowsdl4j/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java?rev=1489600&r1=1489599&r2=1489600&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java
(original)
+++ cxf/branches/dkulp-nowsdl4j/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java
Tue Jun  4 20:53:17 2013
@@ -94,6 +94,7 @@ public class ClientServerXMLTest extends
         try {
             Greeter greeter = service.getPort(barePortName, Greeter.class);
             updateAddressPort(greeter, REG_PORT);
+
             String username = System.getProperty("user.name");
             String reply = greeter.greetMe(username);
 



Mime
View raw message