cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1489599 - in /cxf/branches/dkulp-nowsdl4j: rt/javascript/javascript-tests/src/test/resources/ rt/wsdl/src/main/java/org/apache/cxf/wsdl/ rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ systests/databinding/src/test/resources/ systests/databin...
Date Tue, 04 Jun 2013 20:53:00 GMT
Author: dkulp
Date: Tue Jun  4 20:52:50 2013
New Revision: 1489599

URL: http://svn.apache.org/r1489599
Log:
Get the tooling tests passing

Modified:
    cxf/branches/dkulp-nowsdl4j/rt/javascript/javascript-tests/src/test/resources/AegisBeans.xml
    cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
    cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/TExtensibilityElementImpl.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/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java

Modified: cxf/branches/dkulp-nowsdl4j/rt/javascript/javascript-tests/src/test/resources/AegisBeans.xml
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/javascript/javascript-tests/src/test/resources/AegisBeans.xml?rev=1489599&r1=1489598&r2=1489599&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/javascript/javascript-tests/src/test/resources/AegisBeans.xml
(original)
+++ cxf/branches/dkulp-nowsdl4j/rt/javascript/javascript-tests/src/test/resources/AegisBeans.xml
Tue Jun  4 20:52:50 2013
@@ -43,7 +43,7 @@
 			</bean>
 		</simple:dataBinding>
 		<simple:serviceFactory>
-			<bean class='org.apache.cxf.service.factory.ReflectionServiceFactoryBean'>
+			<bean class='org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean'>
 
 			</bean>
 		</simple:serviceFactory>

Modified: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java?rev=1489599&r1=1489598&r2=1489599&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
(original)
+++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
Tue Jun  4 20:52:50 2013
@@ -505,7 +505,9 @@ public class JAXBExtensionHelper impleme
         mv.visitEnd();
 
         mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "getRequired", "()Ljava/lang/Boolean;", null,
null);
-        av0 = mv.visitAnnotation("Ljavax/xml/bind/annotation/XmlTransient;", true);
+        av0 = mv.visitAnnotation("Ljavax/xml/bind/annotation/XmlAttribute;", true);
+        av0.visit("name", "required");
+        av0.visit("namespace", "http://schemas.xmlsoap.org/wsdl/required");
         av0.visitEnd();
         mv.visitCode();
         l0 = helper.createLabel();

Modified: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/TExtensibilityElementImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/TExtensibilityElementImpl.java?rev=1489599&r1=1489598&r2=1489599&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/TExtensibilityElementImpl.java
(original)
+++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/TExtensibilityElementImpl.java
Tue Jun  4 20:52:50 2013
@@ -21,6 +21,7 @@ package org.apache.cxf.wsdl;
 
 
 import javax.wsdl.extensions.ExtensibilityElement;
+import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.namespace.QName;
 
@@ -39,6 +40,7 @@ public class TExtensibilityElementImpl
      * Returns the type of this extensibility element.
      * @return QName the type of this element.
      */
+    @XmlTransient()
     public QName getElementType() {
         return elementType;
     }
@@ -56,6 +58,7 @@ public class TExtensibilityElementImpl
      * Relates to the wsdl:required attribute.
      * @return Boolean
      */
+    @XmlAttribute(name = "required", namespace = "http://schemas.xmlsoap.org/wsdl/")
     public Boolean getRequired() {
         return required;
     }

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=1489599&r1=1489598&r2=1489599&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:52:50 2013
@@ -510,7 +510,7 @@ public class WSDLServiceBuilder {
                 if (bop.getBindingOutput() != null) {
                     outName = bop.getBindingOutput().getName();
                 }
-                BindingOperationInfo bop2 = bi.buildOperation(new QName(service.getName().getNamespaceURI(),
+                BindingOperationInfo bop2 = bi.buildOperation(new QName(binding.getQName().getNamespaceURI(),
                                                                         bop.getName()), inName,
outName);
                 if (bop2 != null) {
 

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=1489599&r1=1489598&r2=1489599&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:52:50 2013
@@ -56,7 +56,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=1489599&r1=1489598&r2=1489599&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:52:50 2013
@@ -57,7 +57,7 @@ http://cxf.apache.org/schemas/jaxws.xsd"
       <bean class="org.apache.cxf.authservice.AuthServiceImpl" />
     </simple:serviceBean>
     <simple:serviceFactory>
-    	<bean class="org.apache.cxf.service.factory.ReflectionServiceFactoryBean">
+    	<bean class="org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean">
     		<property name="serviceConfigurations">
     			<list>
     				<bean class="org.apache.cxf.aegis.databinding.AegisServiceConfiguration">

Modified: cxf/branches/dkulp-nowsdl4j/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java?rev=1489599&r1=1489598&r2=1489599&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java
(original)
+++ cxf/branches/dkulp-nowsdl4j/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java
Tue Jun  4 20:52:50 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()) {
     



Mime
View raw message