axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r636054 - in /webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder: DescriptionBuilderComposite.java MethodDescriptionComposite.java ParameterDescriptionComposite.java WebServiceContextAnnot.java
Date Tue, 11 Mar 2008 18:47:53 GMT
Author: dims
Date: Tue Mar 11 11:47:46 2008
New Revision: 636054

URL: http://svn.apache.org/viewvc?rev=636054&view=rev
Log:
Fix for AXIS2-3592 - WebServiceContextAnnot should be deleted


Modified:
    webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/DescriptionBuilderComposite.java
    webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/MethodDescriptionComposite.java
    webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/ParameterDescriptionComposite.java
    webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/WebServiceContextAnnot.java

Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/DescriptionBuilderComposite.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/DescriptionBuilderComposite.java?rev=636054&r1=636053&r2=636054&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/DescriptionBuilderComposite.java
(original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/DescriptionBuilderComposite.java
Tue Mar 11 11:47:46 2008
@@ -88,7 +88,6 @@
     private SoapBindingAnnot soapBindingAnnot;
     private List<WebServiceRefAnnot> webServiceRefAnnotList;
     private BindingTypeAnnot bindingTypeAnnot;
-    private WebServiceContextAnnot webServiceContextAnnot;
     
     private List<Annotation> features;
     
@@ -394,11 +393,6 @@
                                                          BindingTypeAnnot.class,
                                                          javax.xml.ws.BindingType.class);
     }
-
-    /** @return Returns the webServiceContextAnnot. */
-    public WebServiceContextAnnot getWebServiceContextAnnot() {
-        return (WebServiceContextAnnot) webServiceContextAnnot;
-    }
     
     public List<Annotation> getWebServiceFeatures() {
         return features;
@@ -651,12 +645,6 @@
     public void setBindingTypeAnnot(
             BindingTypeAnnot bindingTypeAnnot) {
         this.bindingTypeAnnot = bindingTypeAnnot;
-    }
-
-    /** @param webServiceContextAnnot The webServiceContextAnnot to set. */
-    public void setWebServiceContextAnnot(
-            WebServiceContextAnnot webServiceContextAnnot) {
-        this.webServiceContextAnnot = webServiceContextAnnot;
     }
 
     /** @param isInterface Sets whether this composite represents a class or interface */

Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/MethodDescriptionComposite.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/MethodDescriptionComposite.java?rev=636054&r1=636053&r2=636054&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/MethodDescriptionComposite.java
(original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/MethodDescriptionComposite.java
Tue Mar 11 11:47:46 2008
@@ -39,7 +39,6 @@
 	private boolean 				isListType = false;
     private WebMethodAnnot webMethodAnnot;
     private WebResultAnnot webResultAnnot;
-    private WebServiceContextAnnot webServiceContextAnnot;
     private HandlerChainAnnot handlerChainAnnot;
     private SoapBindingAnnot soapBindingAnnot;
     private WebServiceRefAnnot webServiceRefAnnot;
@@ -70,8 +69,7 @@
             WebServiceRefAnnot webServiceRefAnnot,
             WebEndpointAnnot webEndpointAnnot,
             RequestWrapperAnnot requestWrapperAnnot,
-            ResponseWrapperAnnot responseWrapperAnnot,
-            WebServiceContextAnnot webServiceContextAnnot
+            ResponseWrapperAnnot responseWrapperAnnot
     ) {
 
         this.methodName = methodName;
@@ -85,7 +83,6 @@
         this.webEndpointAnnot = webEndpointAnnot;
         this.requestWrapperAnnot = requestWrapperAnnot;
         this.responseWrapperAnnot = responseWrapperAnnot;
-        this.webServiceContextAnnot = webServiceContextAnnot;
     }
 
     /** @return Returns the methodName */
@@ -167,11 +164,6 @@
         return responseWrapperAnnot;
     }
 
-    /** @return Returns the webServiceContextAnnot. */
-    public WebServiceContextAnnot getWebServiceContextAnnot() {
-        return webServiceContextAnnot;
-    }
-
     /** @return Returns the handlerChainAnnot. */
     public HandlerChainAnnot getHandlerChainAnnot() {
         return handlerChainAnnot;
@@ -261,12 +253,6 @@
             ResponseWrapperAnnot responseWrapperAnnot) {
         this.responseWrapperAnnot = responseWrapperAnnot;
     }
-
-    /** @param webServiceContextAnnot The webServiceContextAnnot to set. */
-    public void setWebServiceContextAnnot(WebServiceContextAnnot webServiceContextAnnot)
{
-        this.webServiceContextAnnot = webServiceContextAnnot;
-    }
-
 
     /** @param handlerChainAnnot The handlerChainAnnot to set. */
     public void setHandlerChainAnnot(HandlerChainAnnot handlerChainAnnot) {

Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/ParameterDescriptionComposite.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/ParameterDescriptionComposite.java?rev=636054&r1=636053&r2=636054&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/ParameterDescriptionComposite.java
(original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/ParameterDescriptionComposite.java
Tue Mar 11 11:47:46 2008
@@ -27,7 +27,6 @@
     private Class parameterTypeClass;
     private WebParamAnnot webParamAnnot;
     private WebServiceRefAnnot webServiceRefAnnot;
-    private WebServiceContextAnnot webServiceContextAnnot;
     private int listOrder;
 	// Will indicate whether or not we found an @XMLList annotation on the parameter
 	private boolean                 isListType;
@@ -42,14 +41,12 @@
             String parameterType,
             Class parameterTypeClass,
             WebParamAnnot webParamAnnot,
-            WebServiceRefAnnot webServiceRefAnnot,
-            WebServiceContextAnnot webServiceContextAnnot) {
+            WebServiceRefAnnot webServiceRefAnnot) {
 
         this.parameterType = parameterType;
         this.parameterTypeClass = parameterTypeClass;
         this.webParamAnnot = webParamAnnot;
         this.webServiceRefAnnot = webServiceRefAnnot;
-        this.webServiceContextAnnot = webServiceContextAnnot;
     }
 
     /**
@@ -133,11 +130,6 @@
     }
 
     /** @return Returns the webServiceContextAnnot. */
-    public WebServiceContextAnnot getWebServiceContextAnnot() {
-        return webServiceContextAnnot;
-    }
-
-    /** @return Returns the webServiceContextAnnot. */
     public int getListOrder() {
         return listOrder;
     }
@@ -165,11 +157,6 @@
     /** @param webServiceRefAnnot The webServiceRefAnnot to set. */
     public void setWebServiceRefAnnot(WebServiceRefAnnot webServiceRefAnnot) {
         this.webServiceRefAnnot = webServiceRefAnnot;
-    }
-
-    /** @param webServiceContextAnnot The webServiceContextAnnot to set. */
-    public void setWebServiceContextAnnot(WebServiceContextAnnot webServiceContextAnnot)
{
-        this.webServiceContextAnnot = webServiceContextAnnot;
     }
 
     /** @param webServiceContextAnnot The webServiceContextAnnot to set. */

Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/WebServiceContextAnnot.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/WebServiceContextAnnot.java?rev=636054&r1=636053&r2=636054&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/WebServiceContextAnnot.java
(original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/WebServiceContextAnnot.java
Tue Mar 11 11:47:46 2008
@@ -46,20 +46,6 @@
         this.isUserInRole = isUserInRole;
     }
 
-    public static WebServiceContextAnnot createWebServiceConextAnnot() {
-        return new WebServiceContextAnnot();
-    }
-
-    public static WebServiceContextAnnot createWebServiceContextAnnot(
-            MessageContext messageContext,
-            Principal userPrincipal,
-            boolean isUserInRole
-    ) {
-        return new WebServiceContextAnnot(messageContext,
-                                          userPrincipal,
-                                          isUserInRole);
-    }
-
     /**
      * @param role The role to check.
      * @return Returns boolean indicating whether user is in Role



---------------------------------------------------------------------
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