axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ngalla...@apache.org
Subject svn commit: r433912 - in /webservices/axis2/trunk/java/modules/jaxws: src/javax/jws/ src/javax/jws/soap/ src/org/apache/axis2/jaxws/client/factory/ src/org/apache/axis2/jaxws/client/proxy/ src/org/apache/axis2/jaxws/description/ test/org/apache/axis2/j...
Date Wed, 23 Aug 2006 05:40:56 GMT
Author: ngallardo
Date: Tue Aug 22 22:40:55 2006
New Revision: 433912

URL: http://svn.apache.org/viewvc?rev=433912&view=rev
Log:
AXIS2-1044
Contributor: Jeff Barrett

Jeff's patch for this issue.  Fixes the problem with the SOAPBinding being in the wrong package.

Added:
    webservices/axis2/trunk/java/modules/jaxws/src/javax/jws/soap/
    webservices/axis2/trunk/java/modules/jaxws/src/javax/jws/soap/SOAPBinding.java
Removed:
    webservices/axis2/trunk/java/modules/jaxws/src/javax/jws/SOAPBinding.java
Modified:
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/factory/ProxyHandlerFactory.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/proxy/ProxyDescriptor.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/EndpointInterfaceDescription.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/OperationDescription.java
    webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/AnnotationServiceImplDescriptionTests.java

Added: webservices/axis2/trunk/java/modules/jaxws/src/javax/jws/soap/SOAPBinding.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/javax/jws/soap/SOAPBinding.java?rev=433912&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/javax/jws/soap/SOAPBinding.java (added)
+++ webservices/axis2/trunk/java/modules/jaxws/src/javax/jws/soap/SOAPBinding.java Tue Aug
22 22:40:55 2006
@@ -0,0 +1,33 @@
+/*
+* Copyright 2006 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package javax.jws.soap;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target (ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface SOAPBinding {
+    public enum Style{DOCUMENT, RPC};
+    public enum Use {LITERAL, ENCODED};
+    public enum ParameterStyle{BARE, WRAPPED};
+    Style style() default Style.DOCUMENT;
+    Use use() default Use.LITERAL;
+    ParameterStyle parameterStyle() default ParameterStyle.WRAPPED;
+}
+

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/factory/ProxyHandlerFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/factory/ProxyHandlerFactory.java?rev=433912&r1=433911&r2=433912&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/factory/ProxyHandlerFactory.java
(original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/factory/ProxyHandlerFactory.java
Tue Aug 22 22:40:55 2006
@@ -16,7 +16,7 @@
  */
 package org.apache.axis2.jaxws.client.factory;
 
-import javax.jws.SOAPBinding.Style;
+import javax.jws.soap.SOAPBinding.Style;
 
 
 import org.apache.axis2.jaxws.client.proxy.BaseProxyHandler;

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/proxy/ProxyDescriptor.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/proxy/ProxyDescriptor.java?rev=433912&r1=433911&r2=433912&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/proxy/ProxyDescriptor.java
(original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/proxy/ProxyDescriptor.java
Tue Aug 22 22:40:55 2006
@@ -20,10 +20,10 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import javax.jws.SOAPBinding;
 import javax.jws.WebParam;
 import javax.jws.WebResult;
-import javax.jws.SOAPBinding.Style;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.Style;
 import javax.xml.ws.RequestWrapper;
 import javax.xml.ws.ResponseWrapper;
 

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/EndpointInterfaceDescription.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/EndpointInterfaceDescription.java?rev=433912&r1=433911&r2=433912&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/EndpointInterfaceDescription.java
(original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/EndpointInterfaceDescription.java
Tue Aug 22 22:40:55 2006
@@ -24,7 +24,7 @@
 import java.util.Hashtable;
 import java.util.Iterator;
 
-import javax.jws.SOAPBinding;
+import javax.jws.soap.SOAPBinding;
 import javax.wsdl.Binding;
 import javax.wsdl.Port;
 import javax.wsdl.PortType;
@@ -74,7 +74,7 @@
     // Annotations and cached values
     private SOAPBinding         soapBindingAnnotation;
     // TODO: (JLB) Should this be using the jaxws annotation values or should that be wrappered?
-    private javax.jws.SOAPBinding.Style soapBindingStyle;
+    private javax.jws.soap.SOAPBinding.Style soapBindingStyle;
 
     
     void addOperation(OperationDescription operation) {
@@ -211,13 +211,13 @@
         return soapBindingAnnotation;
     }
     
-    public javax.jws.SOAPBinding.Style getSoapBindingStyle() {
+    public javax.jws.soap.SOAPBinding.Style getSoapBindingStyle() {
         if (soapBindingStyle == null) {
             if (getSoapBinding() != null && getSoapBinding().style() != null) {
                 soapBindingStyle = getSoapBinding().style();
             }
             else {
-                soapBindingStyle = javax.jws.SOAPBinding.Style.DOCUMENT;
+                soapBindingStyle = javax.jws.soap.SOAPBinding.Style.DOCUMENT;
             }
         }
         return soapBindingStyle;

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/OperationDescription.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/OperationDescription.java?rev=433912&r1=433911&r2=433912&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/OperationDescription.java
(original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/OperationDescription.java
Tue Aug 22 22:40:55 2006
@@ -23,10 +23,10 @@
 import java.util.ArrayList;
 
 import javax.jws.Oneway;
-import javax.jws.SOAPBinding;
 import javax.jws.WebMethod;
 import javax.jws.WebParam;
 import javax.jws.WebResult;
+import javax.jws.soap.SOAPBinding;
 import javax.xml.namespace.QName;
 import javax.xml.ws.RequestWrapper;
 import javax.xml.ws.ResponseWrapper;
@@ -103,7 +103,7 @@
     
     private SOAPBinding         soapBindingAnnotation;
     // TODO: (JLB) Should this be using the jaxws annotation values or should that be wrappered?
-    private javax.jws.SOAPBinding.Style soapBindingStyle;
+    private javax.jws.soap.SOAPBinding.Style soapBindingStyle;
     
     private WebMethod           webMethodAnnotation;
     private String              webMethodOperationName;
@@ -381,13 +381,13 @@
         return soapBindingAnnotation;
     }
     
-    public javax.jws.SOAPBinding.Style getSoapBindingStyle() {
+    public javax.jws.soap.SOAPBinding.Style getSoapBindingStyle() {
         if (soapBindingStyle == null) {
             if (getSoapBinding() != null && getSoapBinding().style() != null) {
                 soapBindingStyle = getSoapBinding().style();
             }
             else {
-                soapBindingStyle = javax.jws.SOAPBinding.Style.DOCUMENT;
+                soapBindingStyle = javax.jws.soap.SOAPBinding.Style.DOCUMENT;
             }
         }
         return soapBindingStyle;

Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/AnnotationServiceImplDescriptionTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/AnnotationServiceImplDescriptionTests.java?rev=433912&r1=433911&r2=433912&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/AnnotationServiceImplDescriptionTests.java
(original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/AnnotationServiceImplDescriptionTests.java
Tue Aug 22 22:40:55 2006
@@ -18,7 +18,7 @@
 
 package org.apache.axis2.jaxws.description;
 
-import javax.jws.SOAPBinding;
+import javax.jws.soap.SOAPBinding;
 
 import junit.framework.TestCase;
 



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message