svn commit: r1221899 - in /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2: deployment/DeploymentConstants.java namespace/Constants.java wsdl/WSDLConstants.java

[veithen]

Author: veithen
Date: Wed Dec 21 22:01:12 2011
New Revision: 1221899

URL: http://svn.apache.org/viewvc?rev=1221899&view=rev
Log:
Removed the constants deprecated in r1221716 from the trunk (they will still be 
present in Axis2 1.6.x).

Modified:
    
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java
    
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/namespace/Constants.java
    
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/WSDLConstants.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java?rev=1221899&r1=1221898&r2=1221899&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java
 Wed Dec 21 22:01:12 2011
@@ -159,24 +159,6 @@ public interface DeploymentConstants {
     char SEPARATOR_DOT = '.';
     char SEPARATOR_COLON = ':';
 
-    /**
-     * @deprecated Please use {@link 
org.apache.neethi.Constants#isPolicyNS(String)} to check for a
-     *             supported policy namespace.
-     */
-    String POLICY_NS_URI = Constants.URI_POLICY;
-    
-    /**
-     * @deprecated Please use an appropriate method or constant from
-     *             {@link org.apache.neethi.Constants} instead.
-     */
-    String TAG_POLICY = "Policy";
-    
-    /**
-     * @deprecated Please use an appropriate method or constant from
-     *             {@link org.apache.neethi.Constants} instead.
-     */
-    String TAG_POLICY_REF = "PolicyReference";
-    
     String TAG_POLICY_ATTACHMENT = "PolicyAttachment";
     String TAG_APPLIES_TO = "AppliesTo";
 }

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/namespace/Constants.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/namespace/Constants.java?rev=1221899&r1=1221898&r2=1221899&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/namespace/Constants.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/namespace/Constants.java
 Wed Dec 21 22:01:12 2011
@@ -110,13 +110,6 @@ public class Constants {
             "http://www.w3.org/2001/XMLSchema-instance";;
     public static final String URI_DEFAULT_SCHEMA_XSI = URI_2001_SCHEMA_XSI;
 
-    /**
-     * @deprecated Please use {@link 
org.apache.neethi.Constants#isPolicyNS(String)} to check for a
-     *             supported policy namespace.
-     */
-    public static final String URI_POLICY =
-            "http://schemas.xmlsoap.org/ws/2004/09/policy";;
-    
     public static final String FORMAT_BINDING = 
"http://schemas.xmlsoap.org/wsdl/formatbinding/";;
     public static final String JAVA_NS = 
"http://schemas.xmlsoap.org/wsdl/java/";;
     /**

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/WSDLConstants.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/WSDLConstants.java?rev=1221899&r1=1221898&r2=1221899&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/WSDLConstants.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/WSDLConstants.java
 Wed Dec 21 22:01:12 2011
@@ -126,20 +126,6 @@ public interface WSDLConstants {
                 Constants.URI_WSDL11_SOAP, "binding");
         QName SOAP_12_BINDING = new QName(
                 Constants.URI_WSDL12_SOAP, "binding");
-        
-        /**
-         * @deprecated Please use {@link 
org.apache.neethi.Constants#isPolicyElement(QName)} to
-         *             check for Policy elements.
-         */
-        QName POLICY = new QName(
-                Constants.URI_POLICY, "Policy");
-        
-        /**
-         * @deprecated Please use {@link 
org.apache.neethi.Constants#isPolicyRef(QName)} to check
-         *             for policy references.
-         */
-        QName POLICY_REFERENCE = new QName(
-                Constants.URI_POLICY, "PolicyReference");
     }
 
     public static final int MEP_CONSTANT_OUT_IN = 16;