axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r377302 - in /webservices/axis2/trunk/java/modules: codegen/src/org/apache/axis2/schema/ codegen/src/org/apache/axis2/wsdl/codegen/extension/ codegen/src/org/apache/axis2/wsdl/databinding/ codegen/src/org/apache/axis2/wsdl/util/ common/src/...
Date Mon, 13 Feb 2006 04:18:30 GMT
Author: dims
Date: Sun Feb 12 20:18:27 2006
New Revision: 377302

URL: http://svn.apache.org/viewcvs?rev=377302&view=rev
Log:
one round of consolidating/cleaning up namespace constants

Modified:
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/SchemaConstants.java
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/databinding/TypeMappingAdapter.java
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/XSLTConstants.java
    webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/namespace/Constants.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisServiceBuilder.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2WOM.java
    webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/om/impl/dom/TextImpl.java
    webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/Constants.java
    webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/WSSPolicyProcessor.java
    webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/Java2WOMBuilder.java
    webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/TypeTable.java
    webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java
    webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java
    webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLConstants.java

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/SchemaConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/SchemaConstants.java?rev=377302&r1=377301&r2=377302&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/SchemaConstants.java
(original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/SchemaConstants.java
Sun Feb 12 20:18:27 2006
@@ -1,5 +1,7 @@
 package org.apache.axis2.schema;
 
+import org.apache.axis2.namespace.Constants;
+
 import javax.xml.namespace.QName;
 /*
  * Copyright 2004,2005 The Apache Software Foundation.
@@ -23,7 +25,7 @@
 public class SchemaConstants {
 
 
-    public static final String URI_DEFAULT_SCHEMA_XSD = "http://www.w3.org/2001/XMLSchema";
+    public static final String URI_DEFAULT_SCHEMA_XSD = Constants.URI_2001_SCHEMA_XSD;
     public static final QName XSD_STRING = new QName(URI_DEFAULT_SCHEMA_XSD, "string");
     public static final QName XSD_BOOLEAN = new QName(URI_DEFAULT_SCHEMA_XSD, "boolean");
     public static final QName XSD_DOUBLE = new QName(URI_DEFAULT_SCHEMA_XSD, "double");

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java?rev=377302&r1=377301&r2=377302&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java
(original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java
Sun Feb 12 20:18:27 2006
@@ -23,6 +23,7 @@
 import org.apache.axis2.wsdl.i18n.CodegenMessages;
 import org.apache.axis2.wsdl.util.ConfigPropertyFileLoader;
 import org.apache.axis2.wsdl.util.XSLTConstants;
+import org.apache.axis2.namespace.Constants;
 import org.apache.wsdl.WSDLBinding;
 import org.apache.wsdl.WSDLBindingMessageReference;
 import org.apache.wsdl.WSDLBindingOperation;
@@ -251,13 +252,13 @@
             SchemaType sType = (SchemaType) allSeenTypes.get(i);
 
             if (sType.getContentType() == SchemaType.SIMPLE_CONTENT && sType.getPrimitiveType()
!= null) {
-                if (XSLTConstants.BASE_64_CONTENT_QNAME.equals(sType.getPrimitiveType().getName()))
{
+                if (Constants.BASE_64_CONTENT_QNAME.equals(sType.getPrimitiveType().getName()))
{
                     outerType = sType.getOuterType();
                     //check the outer type further to see whether it has the contenttype
attribute from
                     //XMime namespace
                     SchemaProperty[] properties = sType.getProperties();
                     for (int j = 0; j < properties.length; j++) {
-                        if (XSLTConstants.XMIME_CONTENT_TYPE_QNAME.equals(properties[j].getName()))
{
+                        if (Constants.XMIME_CONTENT_TYPE_QNAME.equals(properties[j].getName()))
{
                             base64ElementQNamesList.add(outerType.getDocumentElementName());
                             break;
                         }

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/databinding/TypeMappingAdapter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/databinding/TypeMappingAdapter.java?rev=377302&r1=377301&r2=377302&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/databinding/TypeMappingAdapter.java
(original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/databinding/TypeMappingAdapter.java
Sun Feb 12 20:18:27 2006
@@ -16,6 +16,8 @@
 
 package org.apache.axis2.wsdl.databinding;
 
+import org.apache.axis2.namespace.Constants;
+
 import javax.xml.namespace.QName;
 import java.util.HashMap;
 import java.util.Map;
@@ -23,7 +25,7 @@
 public abstract class TypeMappingAdapter implements TypeMapper {
 
     //todo get this from a constant
-    protected static final String XSD_SCHEMA_URL = "http://www.w3.org/2001/XMLSchema";
+    protected static final String XSD_SCHEMA_URL = Constants.URI_2001_SCHEMA_XSD;
 
     //hashmap that contains the type mapping names
     protected HashMap qName2NameMap = new HashMap();

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/XSLTConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/XSLTConstants.java?rev=377302&r1=377301&r2=377302&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/XSLTConstants.java
(original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/XSLTConstants.java
Sun Feb 12 20:18:27 2006
@@ -16,17 +16,14 @@
 
 package org.apache.axis2.wsdl.util;
 
-import javax.xml.namespace.QName;
- //todo rename this
+//todo rename this
 public interface XSLTConstants {
-    QName BASE_64_CONTENT_QNAME = new QName("http://www.w3.org/2001/XMLSchema", "base64Binary");
-    QName XMIME_CONTENT_TYPE_QNAME = new QName("http://www.w3.org/2004/06/xmlmime", "contentType");
 
-    String BASE_64_PROPERTY_KEY = "base64map";
+     String BASE_64_PROPERTY_KEY = "base64map";
 
     String EXTERNAL_TEMPLATE_PROPERTY_KEY = "externalTemplate";
     String XSLT_INCLUDE_DATABIND_SUPPORTER_HREF_KEY = "databindsupporter";
-    String XSLT_INCLUDE_TEST_OBJECT_HREF_KEY = "testObject"; 
+    String XSLT_INCLUDE_TEST_OBJECT_HREF_KEY = "testObject";
 
 
     public interface CodegenStyle {

Modified: webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/namespace/Constants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/namespace/Constants.java?rev=377302&r1=377301&r2=377302&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/namespace/Constants.java
(original)
+++ webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/namespace/Constants.java
Sun Feb 12 20:18:27 2006
@@ -20,24 +20,10 @@
 
 public class Constants {
 
-    /** The namespace identifier for the SOAP envelope. */
-    public static final String URI_NS_SOAP_ENVELOPE =
-        "http://schemas.xmlsoap.org/soap/envelope/";
-
-    /**
-     * The namespace identifier for the SOAP encoding (see section 5 of
-     * the SOAP 1.1 specification).
-     */
-    public static final String URI_NS_SOAP_ENCODING =
-        "http://schemas.xmlsoap.org/soap/encoding/";
-
-    /**
-     * The URI identifying the first application processing a SOAP request as the intended
-     * actor for a SOAP header entry (see section 4.2.2 of the SOAP 1.1 specification).
-     */
-    public static final String URI_SOAP_ACTOR_NEXT =
-        "http://schemas.xmlsoap.org/soap/actor/next";
-
+    public static final String AXIS2_NAMESPACE_URI =
+            "http://ws.apache.org/namespaces/axis2";
+    public static final String AXIS2_NAMESPACE_PREFIX = "axis2";
+    
     // Namespace Prefix Constants
     //////////////////////////////////////////////////////////////////////////
     public static final String NS_PREFIX_SOAP_ENV   = "soapenv";
@@ -46,7 +32,6 @@
     public static final String NS_PREFIX_SCHEMA_XSD = "xsd" ;
     public static final String NS_PREFIX_WSDL       = "wsdl" ;
     public static final String NS_PREFIX_WSDL_SOAP  = "wsdlsoap";
-    public static final String NS_PREFIX_XMLSOAP    = "apachesoap";
     public static final String NS_PREFIX_XML        = "xml";
     public static final String NS_PREFIX_XOP        = "xop";
 
@@ -128,6 +113,9 @@
     public static final String NS_URI_WSDL11 =
                                  "http://schemas.xmlsoap.org/wsdl/";
 
+    public static final String NS_URI_WSDL20 =
+                                 "http://www.w3.org/2004/03/wsdl";
+
     //
     // WSDL extensions for SOAP in DIME
     // (http://gotdotnet.com/team/xml_wsspecs/dime/WSDL-Extension-for-DIME.htm)
@@ -351,11 +339,6 @@
     public static final QName QNAME_LITERAL_ITEM = new QName(URI_LITERAL_ENC,"item");
     public static final QName QNAME_RPC_RESULT = new QName(URI_SOAP12_RPC,"result");
 
-    /**
-     * MIME Content Types
-     * 
-     * @since Axis1.2
-     */
     public static final String MIME_CT_APPLICATION_OCTETSTREAM     = "application/octet-stream";
     public static final String MIME_CT_TEXT_PLAIN         = "text/plain";
     public static final String MIME_CT_IMAGE_JPEG        = "image/jpeg";
@@ -363,4 +346,8 @@
     public static final String MIME_CT_TEXT_XML            = "text/xml";
     public static final String MIME_CT_APPLICATION_XML        = "application/xml";
     public static final String MIME_CT_MULTIPART_PREFIX        = "multipart/";
+    
+    public static final QName BASE_64_CONTENT_QNAME = new QName(URI_2001_SCHEMA_XSD, "base64Binary");
+    public static final QName XMIME_CONTENT_TYPE_QNAME = new QName("http://www.w3.org/2004/06/xmlmime",
"contentType");
+    public static final String URI_SECURITYPOLICY = "http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";
 }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java?rev=377302&r1=377301&r2=377302&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java Sun Feb
12 20:18:27 2006
@@ -172,9 +172,7 @@
     public static final char METHOD_NAME_ESCAPE_CHARACTER = '?';
     public static final String LOGGED = "Logged";
     public static final String CONTAINER_MANAGED = "ContainerManaged";
-    public static final String AXIS2_NAMESPACE_URI =
-            "http://ws.apache.org/namespaces/axis2";
-    public static final String AXIS2_NAMESPACE_PREFIX = "axis2";
+
     public static final String ADDRESSING_TO = "WS-Addressing:To";
     public static final String ADDRESSING_REPLY_TO = "WS-Addressing:ReplyTo";
     public static final String ADDRESSING_RELATES_TO = "WS-Addressing:RelatesTo";

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisServiceBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisServiceBuilder.java?rev=377302&r1=377301&r2=377302&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisServiceBuilder.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisServiceBuilder.java
Sun Feb 12 20:18:27 2006
@@ -77,7 +77,7 @@
  */
 public class AxisServiceBuilder {
 
-    private static final String XMLSCHEMA_NAMESPACE_URI = "http://www.w3.org/2001/XMLSchema";
+    private static final String XMLSCHEMA_NAMESPACE_URI = Constants.URI_2001_SCHEMA_XSD;
 
     private static final String XMLSCHEMA_NAMESPACE_PREFIX = "xs";
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java?rev=377302&r1=377301&r2=377302&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
Sun Feb 12 20:18:27 2006
@@ -17,6 +17,8 @@
 
 package org.apache.axis2.deployment;
 
+import org.apache.axis2.Constants;
+
 /**
  * Constants used during service/module deployment.
  */
@@ -54,7 +56,7 @@
     String TAG_MESSAGE_RECEIVERS = "messageReceivers";
     String TAG_MEP = "mep";
     String TAG_DEFAULT_MODULE_VERSION = "defaultModuleVersions";
-    
+
 
     String TAG_FLOW_OUT_FAULT = "Outfaultflow";    // faultflow start tag
     String TAG_FLOW_OUT = "outflow";         // outflow start tag
@@ -103,7 +105,7 @@
     char SEPARATOR_DOT = '.';
     char SEPARATOR_COLON = ':';
 
-    String POLICY_NS_URI = "http://schemas.xmlsoap.org/ws/2004/09/policy";
+    String POLICY_NS_URI = Constants.URI_POLICY;
     String TAG_POLICY = "Policy";
     String TAG_POLICY_REF = "PolicyReference";
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java?rev=377302&r1=377301&r2=377302&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
Sun Feb 12 20:18:27 2006
@@ -349,7 +349,7 @@
                 binding.getExtensibilityElements().clear();
                 javax.wsdl.extensions.soap.SOAPBinding soapBinding = new SOAPBindingImpl();
                 soapBinding.setStyle("document");
-                soapBinding.setTransportURI("http://schemas.xmlsoap.org/soap/http");
+                soapBinding.setTransportURI(Constants.URI_SOAP11_HTTP);
                 binding.addExtensibilityElement(soapBinding);
 
                 Iterator bin_ops = binding.getBindingOperations().iterator();

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2WOM.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2WOM.java?rev=377302&r1=377301&r2=377302&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2WOM.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2WOM.java
Sun Feb 12 20:18:27 2006
@@ -127,7 +127,7 @@
 		// generating binding
 		WSDLBinding binding = generateBinding(wsdlComponentFactory, portType,
 				bindingName, "document", "literal",
-				"http://schemas.xmlsoap.org/soap/http",
+				Constants.URI_SOAP11_HTTP,
 				"http://www.org.apache.axis2");
 		womDescription.addBinding(binding);
 

Modified: webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/om/impl/dom/TextImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/om/impl/dom/TextImpl.java?rev=377302&r1=377301&r2=377302&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/om/impl/dom/TextImpl.java
(original)
+++ webservices/axis2/trunk/java/modules/doom/src/org/apache/axis2/om/impl/dom/TextImpl.java
Sun Feb 12 20:18:27 2006
@@ -17,6 +17,7 @@
 
 import org.apache.axis2.util.Base64;
 import org.apache.axis2.util.UUIDGenerator;
+import org.apache.axis2.namespace.Constants;
 import org.apache.ws.commons.attachments.DataHandlerUtils;
 import org.apache.ws.commons.om.OMAttribute;
 import org.apache.ws.commons.om.OMElement;
@@ -58,7 +59,7 @@
      * Field nameSpace is used when serializing Binary stuff as MTOM optimized.
      */
     protected OMNamespace ns = new NamespaceImpl(
-            "http://www.w3.org/2004/08/xop/include", "xop");
+            Constants.URI_XOP_INCLUDE, "xop");
 
     /**
      * Field localName is used when serializing Binary stuff as MTOM optimized.

Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/Constants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/Constants.java?rev=377302&r1=377301&r2=377302&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/Constants.java
(original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/trust/Constants.java
Sun Feb 12 20:18:27 2006
@@ -19,41 +19,41 @@
  * Constants of the WS-Trust implementation
  */
 public interface Constants {
-	
+
     static final String NS_YEAR_PREFIX = "http://schemas.xmlsoap.org/ws/2005/02/";
     public static final String WST_NS = NS_YEAR_PREFIX + "trust";
     public static final String WST_PREFIX = "wst";
-    
+
     //local names of the token used in WS-Trust
     public interface LN {
-	    public static final String TOKEN_TYPE = "TokenType";
-	    public static final String REQUEST_TYPE = "RequestType";
-	    public static final String KEY_TYPE = "KeyType";
-	    public static final String KEY_SIZE = "KeySize";
-	    public static final String LIFE_TIME = "Lifetime";
-	    public static final String BASE = "Base";
-	    public static final String STATUS = "Status";
-	    public static final String CODE = "Code";
-	    public static final String REASON = "Reason";
-	    public static final String RENEWING = "Renewing";
-	    public static final String RENEW_TARGET = "RenewTarget";
-	    public static final String CANCEL_TARGET = "CancelTarget";
-	    public static final String REQUESTED_TOKEN_CANCELLED = "RequestedTokenCancelled";
-	    public static final String ALLOWPOSTDATING = "AllowPostdating";
-	    public static final String BINARY_SECRET = "BinarySecret";
-	    public static final String ENTROPY = "Entropy";
-	    public static final String CLAIMS = "Claims";
-	    public static final String COMPUTED_KEY = "ComputedKey";
-	    
-	    public static final String REQUEST_SECURITY_TOKEN = "RequestSecurityToken";
-	    public static final String REQUEST_SECURITY_TOKEN_RESPONSE = "RequestSecurityTokenResponse";
-	    public static final String REQUESTED_SECURITY_TOKEN = "RequestedSecurityToken";
-	    public static final String REQUESTED_PROOF_TOKEN = "RequestedProofToken";
+        public static final String TOKEN_TYPE = "TokenType";
+        public static final String REQUEST_TYPE = "RequestType";
+        public static final String KEY_TYPE = "KeyType";
+        public static final String KEY_SIZE = "KeySize";
+        public static final String LIFE_TIME = "Lifetime";
+        public static final String BASE = "Base";
+        public static final String STATUS = "Status";
+        public static final String CODE = "Code";
+        public static final String REASON = "Reason";
+        public static final String RENEWING = "Renewing";
+        public static final String RENEW_TARGET = "RenewTarget";
+        public static final String CANCEL_TARGET = "CancelTarget";
+        public static final String REQUESTED_TOKEN_CANCELLED = "RequestedTokenCancelled";
+        public static final String ALLOWPOSTDATING = "AllowPostdating";
+        public static final String BINARY_SECRET = "BinarySecret";
+        public static final String ENTROPY = "Entropy";
+        public static final String CLAIMS = "Claims";
+        public static final String COMPUTED_KEY = "ComputedKey";
+
+        public static final String REQUEST_SECURITY_TOKEN = "RequestSecurityToken";
+        public static final String REQUEST_SECURITY_TOKEN_RESPONSE = "RequestSecurityTokenResponse";
+        public static final String REQUESTED_SECURITY_TOKEN = "RequestedSecurityToken";
+        public static final String REQUESTED_PROOF_TOKEN = "RequestedProofToken";
     }
 
     //Attributes
     public interface ATTR {
-    	public static final String CONTEXT = "Context";
+        public static final String CONTEXT = "Context";
         public static final String BINARY_SECRET_TYPE = "Type";
         public static final String CLAIMS_DIALECT = "Dialect";
         public static final String RENEWING_ALLOW = "Allow";
@@ -62,56 +62,56 @@
 
     //RSTs
     public interface RST {
-	    public static final String PREFIX = WST_NS + "/RST";
-	    public static final String ISSUE_SECURITY_TOKEN = PREFIX + "/Issue";
-	    public static final String RENEW_SECURITY_TOKEN = PREFIX + "/Renew";
-	    public static final String VALIDATE_SECURITY_TOKEN = PREFIX + "/Validate";
-	    public static final String CANCEL_SECURITY_TOKEN = PREFIX + "/Cancel";
+        public static final String PREFIX = WST_NS + "/RST";
+        public static final String ISSUE_SECURITY_TOKEN = PREFIX + "/Issue";
+        public static final String RENEW_SECURITY_TOKEN = PREFIX + "/Renew";
+        public static final String VALIDATE_SECURITY_TOKEN = PREFIX + "/Validate";
+        public static final String CANCEL_SECURITY_TOKEN = PREFIX + "/Cancel";
     }
-    
+
     //RSTRs
     public interface RSTR {
-	    public static final String PREFIX = WST_NS + "/RSTR";
-	    public static final String ISSUE_SECURITY_TOKEN = PREFIX + "/Issue";
-	    public static final String RENEW_SECURITY_TOKEN = PREFIX + "/Renew";
-	    public static final String VALIDATE_SECURITY_TOKEN = PREFIX + "/Validate";
-	    public static final String CANCEL_SECURITY_TOKEN = PREFIX + "/Cancel";
+        public static final String PREFIX = WST_NS + "/RSTR";
+        public static final String ISSUE_SECURITY_TOKEN = PREFIX + "/Issue";
+        public static final String RENEW_SECURITY_TOKEN = PREFIX + "/Renew";
+        public static final String VALIDATE_SECURITY_TOKEN = PREFIX + "/Validate";
+        public static final String CANCEL_SECURITY_TOKEN = PREFIX + "/Cancel";
     }
-    
+
     // The request type is specified using following URIs as specified in the WS-Trust specification
     public interface REQ_TYPE {
-	    public static final String ISSUE_SECURITY_TOKEN = WST_NS + "/Issue";
-	    public static final String RENEW_SECURITY_TOKEN = WST_NS + "/Renew";
-	    public static final String VALIDATE_SECURITY_TOKEN = WST_NS + "/Validate";
-	    public static final String CANCEL_SECURITY_TOKEN = WST_NS + "/Cancel";    
+        public static final String ISSUE_SECURITY_TOKEN = WST_NS + "/Issue";
+        public static final String RENEW_SECURITY_TOKEN = WST_NS + "/Renew";
+        public static final String VALIDATE_SECURITY_TOKEN = WST_NS + "/Validate";
+        public static final String CANCEL_SECURITY_TOKEN = WST_NS + "/Cancel";
     }
-    
+
     //STATUS
     public interface STATUS {
-	    public static final String PREFIX = WST_NS + "/status";
-	    public static final String VALID = PREFIX + "/valid";
-	    public static final String INVALID = PREFIX + "/invalid";
+        public static final String PREFIX = WST_NS + "/status";
+        public static final String VALID = PREFIX + "/valid";
+        public static final String INVALID = PREFIX + "/invalid";
     }
-    
+
     //Token types
     public interface TOKEN_TYPE {
-    	public static final String RSTR_STATUS = RSTR.PREFIX + "/Status";
-    	public final static String UNT = "http://schemas.xmlsoap.org/ws/2004/04/security/sc/unt";
-    	public final static String SCT = "http://schemas.xmlsoap.org/ws/2004/04/security/sc/sct";
+        public static final String RSTR_STATUS = RSTR.PREFIX + "/Status";
+        public final static String UNT = "http://schemas.xmlsoap.org/ws/2004/04/security/sc/unt";
+        public final static String SCT = "http://schemas.xmlsoap.org/ws/2004/04/security/sc/sct";
     }
-    
+
     //Binary secret types
     public interface BINARY_SECRET_TYPE {
-	    public static final String ASYMMETRIC_KEY = WST_NS + "/AsymmetricKey";
-		public static final String SYMMETRIC_KEY = WST_NS + "/SymmetricKey";
-		public static final String NONCE_VAL= WST_NS + "/Nonce";
+        public static final String ASYMMETRIC_KEY = WST_NS + "/AsymmetricKey";
+        public static final String SYMMETRIC_KEY = WST_NS + "/SymmetricKey";
+        public static final String NONCE_VAL= WST_NS + "/Nonce";
     }
-    
+
     //ComputedKey types
     public interface COMPUTED_KEY_TYPE {
-    	public static final String PSHA1 = WST_NS + "/CK/PSHA1";	
+        public static final String PSHA1 = WST_NS + "/CK/PSHA1";
     }
-     
+
     public interface WSU {
         public static final String NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
         public static final String PREFIX = "wsu";
@@ -119,10 +119,10 @@
         public static final String EXPIRES_LN = "Expires";
         public static final String ID_ATTR = "Id";
     }
-    
+
     public interface WSP {
-        public static final String NS = "http://schemas.xmlsoap.org/ws/2004/09/policy";
-        public static final String PREFIX = "wsp";	
+        public static final String NS = org.apache.axis2.Constants.URI_POLICY;
+        public static final String PREFIX = "wsp";
         public static final String APPLIESTO_LN = "AppliesTo";
     }
 

Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/WSSPolicyProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/WSSPolicyProcessor.java?rev=377302&r1=377301&r2=377302&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/WSSPolicyProcessor.java
(original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/WSSPolicyProcessor.java
Sun Feb 12 20:18:27 2006
@@ -38,6 +38,7 @@
 import org.apache.ws.security.policy.parser.processors.SymmetricBindingProcessor;
 import org.apache.ws.security.policy.parser.processors.Wss10Processor;
 import org.apache.ws.security.policy.parser.processors.Wss11Processor;
+import org.apache.axis2.namespace.Constants;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -236,7 +237,7 @@
                  */
                 PrimitiveAssertion pa = (PrimitiveAssertion) assertion;
                 if (!(pa.getName().getNamespaceURI()
-                        .equals("http://schemas.xmlsoap.org/ws/2005/07/securitypolicy")))
{
+                        .equals(Constants.URI_SECURITYPOLICY))) {
                     log.debug("Got a unexpected assertion: "
                             + pa.getName().getLocalPart());
                     continue;

Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/Java2WOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/Java2WOMBuilder.java?rev=377302&r1=377301&r2=377302&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/Java2WOMBuilder.java
(original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/Java2WOMBuilder.java
Sun Feb 12 20:18:27 2006
@@ -115,7 +115,7 @@
                 //todo these need to be constants
                 "document",
                 "literal",
-                "http://schemas.xmlsoap.org/soap/http",
+                Constants.URI_SOAP11_HTTP,
                 targetNamespace);
 
         womDescription.addBinding(binding);

Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/TypeTable.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/TypeTable.java?rev=377302&r1=377301&r2=377302&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/TypeTable.java
(original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/TypeTable.java
Sun Feb 12 20:18:27 2006
@@ -1,6 +1,7 @@
 package org.apache.axis2.wsdl.builder;
 
 import org.apache.ws.commons.om.OMElement;
+import org.apache.axis2.namespace.Constants;
 
 import javax.xml.namespace.QName;
 import java.util.ArrayList;
@@ -38,56 +39,56 @@
     private void populateSimpleTypes() {
         //todo pls use the types from org.apache.ws.commons.schema.constants.Constants
         simpleTypetoxsd.put("int",
-                new QName("http://www.w3.org/2001/XMLSchema", "int", "xs"));
+                new QName(Constants.URI_2001_SCHEMA_XSD, "int", "xs"));
         simpleTypetoxsd.put("java.lang.String",
-                new QName("http://www.w3.org/2001/XMLSchema", "string", "xs"));
+                new QName(Constants.URI_2001_SCHEMA_XSD, "string", "xs"));
         simpleTypetoxsd.put("boolean",
-                new QName("http://www.w3.org/2001/XMLSchema", "boolean", "xs"));
+                new QName(Constants.URI_2001_SCHEMA_XSD, "boolean", "xs"));
         simpleTypetoxsd.put("float",
-                new QName("http://www.w3.org/2001/XMLSchema", "float", "xs"));
+                new QName(Constants.URI_2001_SCHEMA_XSD, "float", "xs"));
         simpleTypetoxsd.put("double",
-                new QName("http://www.w3.org/2001/XMLSchema", "double", "xs"));
+                new QName(Constants.URI_2001_SCHEMA_XSD, "double", "xs"));
         simpleTypetoxsd.put("short",
-                new QName("http://www.w3.org/2001/XMLSchema", "short", "xs"));
+                new QName(Constants.URI_2001_SCHEMA_XSD, "short", "xs"));
         simpleTypetoxsd.put("long",
-                new QName("http://www.w3.org/2001/XMLSchema", "long", "xs"));
+                new QName(Constants.URI_2001_SCHEMA_XSD, "long", "xs"));
         simpleTypetoxsd.put("byte",
-                new QName("http://www.w3.org/2001/XMLSchema", "byte", "xs"));
+                new QName(Constants.URI_2001_SCHEMA_XSD, "byte", "xs"));
         simpleTypetoxsd.put("char",
-                new QName("http://www.w3.org/2001/XMLSchema", "anyType", "xs"));
+                new QName(Constants.URI_2001_SCHEMA_XSD, "anyType", "xs"));
         simpleTypetoxsd.put("java.lang.Integer",
-                new QName("http://www.w3.org/2001/XMLSchema", "int", "xs"));
+                new QName(Constants.URI_2001_SCHEMA_XSD, "int", "xs"));
         simpleTypetoxsd.put("java.lang.Double",
-                new QName("http://www.w3.org/2001/XMLSchema", "double", "xs"));
+                new QName(Constants.URI_2001_SCHEMA_XSD, "double", "xs"));
         simpleTypetoxsd.put("java.lang.Float",
-                new QName("http://www.w3.org/2001/XMLSchema", "float", "xs"));
+                new QName(Constants.URI_2001_SCHEMA_XSD, "float", "xs"));
         simpleTypetoxsd.put("java.lang.Long",
-                new QName("http://www.w3.org/2001/XMLSchema", "long", "xs"));
+                new QName(Constants.URI_2001_SCHEMA_XSD, "long", "xs"));
         simpleTypetoxsd.put("java.lang.Character",
-                new QName("http://www.w3.org/2001/XMLSchema", "anyType", "xs"));
+                new QName(Constants.URI_2001_SCHEMA_XSD, "anyType", "xs"));
         simpleTypetoxsd.put("java.lang.Boolean",
-                new QName("http://www.w3.org/2001/XMLSchema", "boolean", "xs"));
+                new QName(Constants.URI_2001_SCHEMA_XSD, "boolean", "xs"));
         simpleTypetoxsd.put("java.lang.Byte",
-                new QName("http://www.w3.org/2001/XMLSchema", "byte", "xs"));
+                new QName(Constants.URI_2001_SCHEMA_XSD, "byte", "xs"));
         simpleTypetoxsd.put("java.lang.Short",
-                new QName("http://www.w3.org/2001/XMLSchema", "short", "xs"));
+                new QName(Constants.URI_2001_SCHEMA_XSD, "short", "xs"));
         simpleTypetoxsd.put("java.util.Date",
-                new QName("http://www.w3.org/2001/XMLSchema", "dateTime", "xs"));
+                new QName(Constants.URI_2001_SCHEMA_XSD, "dateTime", "xs"));
         simpleTypetoxsd.put("java.util.Calendar",
-                new QName("http://www.w3.org/2001/XMLSchema", "dateTime", "xs"));
+                new QName(Constants.URI_2001_SCHEMA_XSD, "dateTime", "xs"));
 
         simpleTypetoxsd.put("java.lang.Object",
-                new QName("http://www.w3.org/2001/XMLSchema", "anyType", "xs"));
+                new QName(Constants.URI_2001_SCHEMA_XSD, "anyType", "xs"));
 
         // Any types
         simpleTypetoxsd.put(OMElement.class.getName(),
-                new QName("http://www.w3.org/2001/XMLSchema", "anyType", "xs"));
+                new QName(Constants.URI_2001_SCHEMA_XSD, "anyType", "xs"));
         simpleTypetoxsd.put(ArrayList.class.getName(),
-                new QName("http://www.w3.org/2001/XMLSchema", "anyType", "xs"));
+                new QName(Constants.URI_2001_SCHEMA_XSD, "anyType", "xs"));
         simpleTypetoxsd.put(Vector.class.getName(),
-                new QName("http://www.w3.org/2001/XMLSchema", "anyType", "xs"));
+                new QName(Constants.URI_2001_SCHEMA_XSD, "anyType", "xs"));
         simpleTypetoxsd.put(List.class.getName(),
-                new QName("http://www.w3.org/2001/XMLSchema", "anyType", "xs"));
+                new QName(Constants.URI_2001_SCHEMA_XSD, "anyType", "xs"));
     }
 
     public QName getSimpleSchemaTypeName(String typename) {

Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java?rev=377302&r1=377301&r2=377302&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java
(original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java
Sun Feb 12 20:18:27 2006
@@ -18,6 +18,7 @@
 
 import com.ibm.wsdl.extensions.soap.SOAPConstants;
 import org.apache.axis2.wsdl.builder.WSDLComponentFactory;
+import org.apache.axis2.namespace.Constants;
 import org.apache.ws.policy.util.DOMPolicyReader;
 import org.apache.ws.policy.util.PolicyFactory;
 import org.apache.wsdl.Component;
@@ -84,7 +85,7 @@
 
 public class WSDLPump {
 
-    private static final String XMLSCHEMA_NAMESPACE_URI = "http://www.w3.org/2001/XMLSchema";
+    private static final String XMLSCHEMA_NAMESPACE_URI = Constants.URI_2001_SCHEMA_XSD;
     private static final String XMLSCHEMA_NAMESPACE_PREFIX = "xs";
     private static final String XML_SCHEMA_LOCAL_NAME = "schema";
     private static final String XML_SCHEMA_SEQUENCE_LOCAL_NAME = "sequence";

Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java?rev=377302&r1=377301&r2=377302&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java
(original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java
Sun Feb 12 20:18:27 2006
@@ -72,7 +72,7 @@
     private String encoding = "UTF-8"; //default encoding is UTF-8
     private String defaultWSDLPrefix = "wsdl11";
     private String targetNamespacePrefix = "tns";
-    private static final String WSDL1_1_NAMESPACE_URI = "http://schemas.xmlsoap.org/wsdl/";
+    private static final String WSDL1_1_NAMESPACE_URI = Constants.NS_URI_WSDL11;
     private static final String WSDL1_1_SOAP_NAMESPACE_URI = Constants.URI_WSDL11_SOAP;
     private static final String DEFINITION_NAME = "definitions";
     private static final String IMPORT_NAME = "import";

Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLConstants.java?rev=377302&r1=377301&r2=377302&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLConstants.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLConstants.java Sun Feb
12 20:18:27 2006
@@ -16,16 +16,18 @@
 
 package org.apache.wsdl;
 
+import org.apache.axis2.namespace.Constants;
+
 public interface WSDLConstants {
     /**
      * Field WSDL2_0_NAMESPACE
      */
-    public static final String WSDL2_0_NAMESPACE = "http://www.w3.org/2004/03/wsdl";
+    public static final String WSDL2_0_NAMESPACE = Constants.NS_URI_WSDL20;
 
     /**
      * Field WSDL1_1_NAMESPACE
      */
-    public static final String WSDL1_1_NAMESPACE = "http://schemas.xmlsoap.org/wsdl/";
+    public static final String WSDL1_1_NAMESPACE = Constants.NS_URI_WSDL11;
 
 
     /**



Mime
View raw message