You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by gd...@apache.org on 2002/05/31 21:08:12 UTC
cvs commit: xml-axis/java/test/wsdl/sequence SequenceTest.wsdl
gdaniels 2002/05/31 12:08:12
Modified: java/samples/encoding TestSer.java
java/samples/security SignedSOAPEnvelope.java
java/samples/transport FileTest.java
java/samples/transport/tcp TCPListener.java
java/src/org/apache/axis Constants.java MessageContext.java
java/src/org/apache/axis/client AdminClient.java Call.java
java/src/org/apache/axis/deployment/wsdd WSDDConstants.java
WSDDDeployableItem.java WSDDDeployment.java
WSDDService.java WSDDTargetedChain.java
WSDDTypeMapping.java WSDDUndeployment.java
java/src/org/apache/axis/encoding
DefaultTypeMappingImpl.java
DeserializationContextImpl.java
DeserializerImpl.java SerializationContextImpl.java
TypeMappingRegistryImpl.java
java/src/org/apache/axis/encoding/ser ArrayDeserializer.java
ArraySerializer.java JAFDataHandlerSerializer.java
MapDeserializer.java VectorDeserializer.java
java/src/org/apache/axis/handlers/soap SOAPService.java
java/src/org/apache/axis/message BodyBuilder.java
EnvelopeBuilder.java MessageElement.java
RPCElement.java RPCHandler.java SOAPEnvelope.java
SOAPFaultElement.java SOAPHeader.java
SOAPHeaderElement.java
java/src/org/apache/axis/providers/java JavaProvider.java
java/src/org/apache/axis/soap SOAP11Constants.java
SOAP12Constants.java
java/src/org/apache/axis/utils Admin.java
java/src/org/apache/axis/wsdl/fromJava Emitter.java
Types.java
java/src/org/apache/axis/wsdl/symbolTable Utils.java
java/src/org/apache/axis/wsdl/toJava JavaDeployWriter.java
JavaStubWriter.java JavaWriter.java
java/test/RPCDispatch TestRPC.java TestSerializedRPC.java
java/test/encoding TestAttributes.java TestBeanDeser.java
TestDeser.java TestDeser1999.java
TestDeser2000.java TestDeser2001.java
TestHrefs.java TestOmittedValues.java
TestOutputter.java TestRoundTrip.java TestSer.java
java/test/functional TestJWSGlobalTypes.java
TestMiscSample.java
java/test/outparams TestOutParams.java
java/test/session TestSimpleSession.java
java/test/soap TestHeaderAttrs.java
java/test/wsdd TestAdminService.java TestAllowedMethods.java
TestBadWSDD.java TestOptions.java
TestScopeOption.java TestUndeployment.java
java/test/wsdl/_import Import.xsd
ImportMessagesXSDImport.wsdl Phone.xsd
java/test/wsdl/arrays ArrayTest.wsdl
java/test/wsdl/inheritance InheritanceTest.wsdl
java/test/wsdl/marrays MArrayTest.wsdl
java/test/wsdl/sequence SequenceTest.wsdl
Log:
Make constant names more consistent/reasonable/concise as
discussed on axis-dev.
Remove "alt" (i.e. wrong :)) versions of various URIs, and fix all incorrect
references to them in the WSDL files, etc.
Revision Changes Path
1.24 +2 -2 xml-axis/java/samples/encoding/TestSer.java
Index: TestSer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/encoding/TestSer.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- TestSer.java 30 May 2002 03:06:05 -0000 1.23
+++ TestSer.java 31 May 2002 19:08:05 -0000 1.24
@@ -55,10 +55,10 @@
SerializationContext context = new SerializationContextImpl(stringWriter, msgContext);
TypeMappingRegistry reg = context.getTypeMappingRegistry();
- TypeMapping tm = (TypeMapping) reg.getTypeMapping(Constants.NS_URI_SOAP_ENC);
+ TypeMapping tm = (TypeMapping) reg.getTypeMapping(Constants.URI_SOAP11_ENC);
if (tm == null) {
tm = (TypeMapping) reg.createTypeMapping();
- reg.register(Constants.NS_URI_CURRENT_SOAP_ENC, tm);
+ reg.register(Constants.URI_DEFAULT_SOAP_ENC, tm);
}
tm.register(Data.class, dataQName, new DataSerFactory(), new DataDeserFactory());
1.11 +2 -2 xml-axis/java/samples/security/SignedSOAPEnvelope.java
Index: SignedSOAPEnvelope.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/security/SignedSOAPEnvelope.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SignedSOAPEnvelope.java 30 May 2002 23:46:00 -0000 1.10
+++ SignedSOAPEnvelope.java 31 May 2002 19:08:05 -0000 1.11
@@ -111,8 +111,8 @@
try {
System.out.println("Beginning Client signing...");
env.addMapping(new Mapping(SOAPSECNS, SOAPSECprefix));
- env.addAttribute(Constants.NS_URI_SOAP_ENV, "actor", "some-uri");
- env.addAttribute(Constants.NS_URI_SOAP_ENV, "mustUnderstand", "1");
+ env.addAttribute(Constants.URI_SOAP11_ENV, "actor", "some-uri");
+ env.addAttribute(Constants.URI_SOAP11_ENV, "mustUnderstand", "1");
SOAPHeaderElement header =
new SOAPHeaderElement(XMLUtils.StringToElement(SOAPSECNS,
1.29 +2 -2 xml-axis/java/samples/transport/FileTest.java
Index: FileTest.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/transport/FileTest.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- FileTest.java 30 May 2002 03:06:05 -0000 1.28
+++ FileTest.java 31 May 2002 19:08:06 -0000 1.29
@@ -22,9 +22,9 @@
public class FileTest {
static final String wsdd =
"<deployment xmlns=\"http://xml.apache.org/axis/wsdd/\" " +
- "xmlns:java=\"" + WSDDConstants.NS_URI_WSDD_JAVA + "\">\n" +
+ "xmlns:java=\"" + WSDDConstants.URI_WSDD_JAVA + "\">\n" +
" <transport name=\"FileTransport\" pivot=\"java:samples.transport.FileSender\"/>\n" +
- " <service name=\"" + WSDDConstants.NS_URI_WSDD + "\" provider=\"java:MSG\">\n" +
+ " <service name=\"" + WSDDConstants.URI_WSDD + "\" provider=\"java:MSG\">\n" +
" <parameter name=\"allowedMethods\" value=\"AdminService\"/>\n" +
" <parameter name=\"className\" value=\"org.apache.axis.utils.Admin\"/>\n" +
" </service>\n" +
1.20 +2 -2 xml-axis/java/samples/transport/tcp/TCPListener.java
Index: TCPListener.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/transport/tcp/TCPListener.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- TCPListener.java 30 May 2002 03:06:05 -0000 1.19
+++ TCPListener.java 31 May 2002 19:08:06 -0000 1.20
@@ -108,9 +108,9 @@
static final String wsdd =
"<deployment xmlns=\"http://xml.apache.org/axis/wsdd/\" " +
- "xmlns:java=\"" + WSDDConstants.NS_URI_WSDD_JAVA + "\">\n" +
+ "xmlns:java=\"" + WSDDConstants.URI_WSDD_JAVA + "\">\n" +
" <transport name=\"tcp\" pivot=\"java:samples.transport.tcp.TCPSender\"/>\n" +
- " <service name=\"" + WSDDConstants.NS_URI_WSDD + "\" provider=\"java:MSG\">\n" +
+ " <service name=\"" + WSDDConstants.URI_WSDD + "\" provider=\"java:MSG\">\n" +
" <parameter name=\"allowedMethods\" value=\"AdminService\"/>\n" +
" <parameter name=\"className\" value=\"org.apache.axis.utils.Admin\"/>\n" +
" </service>\n" +
1.61 +91 -114 xml-axis/java/src/org/apache/axis/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/Constants.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- Constants.java 30 May 2002 03:06:06 -0000 1.60
+++ Constants.java 31 May 2002 19:08:06 -0000 1.61
@@ -84,23 +84,23 @@
//
// SOAP-ENV Namespaces
//
- public static final String NS_URI_SOAP_ENV =
+ public static final String URI_SOAP11_ENV =
"http://schemas.xmlsoap.org/soap/envelope/" ;
- public static final String NS_URI_SOAP12_ENV =
+ public static final String URI_SOAP12_ENV =
"http://www.w3.org/2001/12/soap-envelope";
- public static final String NS_URI_CURRENT_SOAP_ENV = NS_URI_SOAP_ENV; // SOAP 1.1 over the wire
+ public static final String URI_DEFAULT_SOAP_ENV = URI_SOAP11_ENV; // SOAP 1.1 over the wire
- public static final String[] NS_URIS_SOAP_ENV = {
- NS_URI_SOAP_ENV,
- NS_URI_SOAP12_ENV,
+ public static final String[] URIS_SOAP_ENV = {
+ URI_SOAP11_ENV,
+ URI_SOAP12_ENV,
};
/**
* Returns true if SOAP_ENV Namespace
*/
public static boolean isSOAP_ENV(String s) {
- for (int i=0; i<NS_URIS_SOAP_ENV.length; i++) {
- if (NS_URIS_SOAP_ENV[i].equals(s)) {
+ for (int i=0; i<URIS_SOAP_ENV.length; i++) {
+ if (URIS_SOAP_ENV[i].equals(s)) {
return true;
}
}
@@ -108,31 +108,28 @@
}
- public static final String NS_URI_LITERAL_ENC = "";
+ public static final String URI_LITERAL_ENC = "";
//
// SOAP-ENC Namespaces
//
- public static final String NS_URI_SOAP_ENC =
+ public static final String URI_SOAP11_ENC =
"http://schemas.xmlsoap.org/soap/encoding/" ;
- public static final String NS_URI_SOAP_ENC_ALT =
- "http://schemas.xmlsoap.org/soap/encoding" ;
- public static final String NS_URI_SOAP12_ENC =
+ public static final String URI_SOAP12_ENC =
"http://www.w3.org/2001/12/soap-encoding";
- public static final String NS_URI_CURRENT_SOAP_ENC = NS_URI_SOAP_ENC; // SOAP 1.1 over the wire
+ public static final String URI_DEFAULT_SOAP_ENC = URI_SOAP11_ENC; // SOAP 1.1 over the wire
- public static final String[] NS_URIS_SOAP_ENC = {
- NS_URI_SOAP_ENC,
- NS_URI_SOAP_ENC_ALT,
- NS_URI_SOAP12_ENC,
+ public static final String[] URIS_SOAP_ENC = {
+ URI_SOAP11_ENC,
+ URI_SOAP12_ENC,
};
/**
* Returns true if SOAP_ENC Namespace
*/
public static boolean isSOAP_ENC(String s) {
- for (int i=0; i<NS_URIS_SOAP_ENC.length; i++) {
- if (NS_URIS_SOAP_ENC[i].equals(s)) {
+ for (int i=0; i<URIS_SOAP_ENC.length; i++) {
+ if (URIS_SOAP_ENC[i].equals(s)) {
return true;
}
}
@@ -188,14 +185,14 @@
String namespaceURI = first.getNamespaceURI();
String[] search = null;
- if (namespaceURI.equals(NS_URI_CURRENT_SOAP_ENC))
- search = NS_URIS_SOAP_ENC;
- else if (namespaceURI.equals(NS_URI_CURRENT_SOAP_ENV))
- search = NS_URIS_SOAP_ENV;
- else if (namespaceURI.equals(NS_URI_CURRENT_SCHEMA_XSD))
- search = NS_URIS_SCHEMA_XSD;
- else if (namespaceURI.equals(NS_URI_CURRENT_SCHEMA_XSI))
- search = NS_URIS_SCHEMA_XSI;
+ if (namespaceURI.equals(URI_DEFAULT_SOAP_ENC))
+ search = URIS_SOAP_ENC;
+ else if (namespaceURI.equals(URI_DEFAULT_SOAP_ENV))
+ search = URIS_SOAP_ENV;
+ else if (namespaceURI.equals(URI_DEFAULT_SCHEMA_XSD))
+ search = URIS_SCHEMA_XSD;
+ else if (namespaceURI.equals(URI_DEFAULT_SCHEMA_XSI))
+ search = URIS_SCHEMA_XSI;
else
search = new String[] {namespaceURI};
@@ -208,63 +205,49 @@
}
// Misc SOAP Namespaces
- public static final String NS_URI_NEXT_ACTOR =
+ public static final String URI_SOAP11_NEXT_ACTOR =
"http://schemas.xmlsoap.org/soap/actor/next" ;
- public static final String NS_URI_SOAP12_NEXT_ACTOR =
+ public static final String URI_SOAP12_NEXT_ACTOR =
"http://www.w3.org/2001/06/soap-envelope/actor/next";
- public static final String NS_URI_CURRENT_SOAP_NEXT_ACTOR = NS_URI_SOAP12_NEXT_ACTOR;
- public static final String NS_URI_SOAP12_FAULT_NS =
+ public static final String URI_SOAP12_FAULT =
"http://www.w3.org/2001/06/soap-faults";
- public static final String NS_URI_CURRENT_SOAP_FAULT = NS_URI_SOAP12_FAULT_NS;
- public static final String NS_URI_SOAP12_UPGRADE_NS =
+ public static final String URI_SOAP12_UPGRADE =
"http://www.w3.org/2001/06/soap-upgrade";
- public static final String NS_URI_CURRENT_SOAP_UPGRADE = NS_URI_SOAP12_UPGRADE_NS;
- public static final String NS_URI_SOAP_HTTP =
+ public static final String URI_SOAP11_HTTP =
"http://schemas.xmlsoap.org/soap/http";
- public static final String NS_URI_SOAP12_HTTP =
+ public static final String URI_SOAP12_HTTP =
"http://www.w3.org/2001/06/http";
- public static final String NS_URI_CURRENT_SOAP_HTTP = NS_URI_SOAP12_HTTP;
-
+
public static final String NS_URI_XMLNS =
"http://www.w3.org/2000/xmlns/";
-
//
// Schema XSD Namespaces
//
- public static final String NS_URI_1999_SCHEMA_XSD =
+ public static final String URI_1999_SCHEMA_XSD =
"http://www.w3.org/1999/XMLSchema";
- public static final String NS_URI_1999_SCHEMA_XSD_ALT =
- "http://www.w3.org/1999/XMLSchema/";
- public static final String NS_URI_2000_SCHEMA_XSD =
+ public static final String URI_2000_SCHEMA_XSD =
"http://www.w3.org/2000/10/XMLSchema";
- public static final String NS_URI_2000_SCHEMA_XSD_ALT =
- "http://www.w3.org/2000/10/XMLSchema/";
- public static final String NS_URI_2001_SCHEMA_XSD =
+ public static final String URI_2001_SCHEMA_XSD =
"http://www.w3.org/2001/XMLSchema";
- public static final String NS_URI_2001_SCHEMA_XSD_ALT =
- "http://www.w3.org/2001/XMLSchema/";
- public static final String NS_URI_CURRENT_SCHEMA_XSD = NS_URI_2001_SCHEMA_XSD;
+ public static final String URI_DEFAULT_SCHEMA_XSD = URI_2001_SCHEMA_XSD;
- public static final String[] NS_URIS_SCHEMA_XSD = {
- NS_URI_1999_SCHEMA_XSD,
- NS_URI_2000_SCHEMA_XSD,
- NS_URI_2001_SCHEMA_XSD,
- NS_URI_1999_SCHEMA_XSD_ALT,
- NS_URI_2000_SCHEMA_XSD_ALT,
- NS_URI_2001_SCHEMA_XSD_ALT,
+ public static final String[] URIS_SCHEMA_XSD = {
+ URI_1999_SCHEMA_XSD,
+ URI_2000_SCHEMA_XSD,
+ URI_2001_SCHEMA_XSD,
};
/**
* Returns true if SchemaXSD Namespace
*/
public static boolean isSchemaXSD(String s) {
- for (int i=0; i<NS_URIS_SCHEMA_XSD.length; i++) {
- if (NS_URIS_SCHEMA_XSD[i].equals(s)) {
+ for (int i=0; i<URIS_SCHEMA_XSD.length; i++) {
+ if (URIS_SCHEMA_XSD[i].equals(s)) {
return true;
}
}
@@ -274,26 +257,26 @@
//
// Schema XSI Namespaces
//
- public static final String NS_URI_1999_SCHEMA_XSI =
+ public static final String URI_1999_SCHEMA_XSI =
"http://www.w3.org/1999/XMLSchema-instance";
- public static final String NS_URI_2000_SCHEMA_XSI =
+ public static final String URI_2000_SCHEMA_XSI =
"http://www.w3.org/2000/10/XMLSchema-instance";
- public static final String NS_URI_2001_SCHEMA_XSI =
+ public static final String URI_2001_SCHEMA_XSI =
"http://www.w3.org/2001/XMLSchema-instance";
- public static final String NS_URI_CURRENT_SCHEMA_XSI = NS_URI_2001_SCHEMA_XSI;
+ public static final String URI_DEFAULT_SCHEMA_XSI = URI_2001_SCHEMA_XSI;
- public static final String[] NS_URIS_SCHEMA_XSI = {
- NS_URI_1999_SCHEMA_XSI,
- NS_URI_2000_SCHEMA_XSI,
- NS_URI_2001_SCHEMA_XSI,
+ public static final String[] URIS_SCHEMA_XSI = {
+ URI_1999_SCHEMA_XSI,
+ URI_2000_SCHEMA_XSI,
+ URI_2001_SCHEMA_XSI,
};
/**
* Returns true if SchemaXSI Namespace
*/
public static boolean isSchemaXSI(String s) {
- for (int i=0; i<NS_URIS_SCHEMA_XSI.length; i++) {
- if (NS_URIS_SCHEMA_XSI[i].equals(s)) {
+ for (int i=0; i<URIS_SCHEMA_XSI.length; i++) {
+ if (URIS_SCHEMA_XSI[i].equals(s)) {
return true;
}
}
@@ -303,12 +286,11 @@
//
// WSDL Namespace
//
- public static final String NS_URI_WSDL =
+ public static final String NS_URI_WSDL11 =
"http://schemas.xmlsoap.org/wsdl/";
- public static final String NS_URI_CURRENT_WSDL = NS_URI_WSDL;
-
+
public static final String[] NS_URIS_WSDL = {
- NS_URI_WSDL,
+ NS_URI_WSDL11,
};
/**
@@ -326,12 +308,11 @@
//
// WSDL SOAP Namespace
//
- public static final String NS_URI_WSDL_SOAP =
+ public static final String URI_WSDL11_SOAP =
"http://schemas.xmlsoap.org/wsdl/soap/";
- public static final String NS_URI_CURRENT_WSDL_SOAP = NS_URI_WSDL_SOAP;
-
+
public static final String[] NS_URIS_WSDL_SOAP = {
- NS_URI_WSDL_SOAP,
+ URI_WSDL11_SOAP,
};
/**
@@ -373,10 +354,6 @@
public static final String ATTR_POSITION = "position";
public static final String ATTR_TYPE = "type";
- // Well-known actor values
- public static final String ACTOR_NEXT =
- "http://schemas.xmlsoap.org/soap/actor/next";
-
// Fault Codes
//////////////////////////////////////////////////////////////////////////
public static final String FAULT_SERVER_GENERAL =
@@ -385,7 +362,7 @@
public static final String FAULT_SERVER_USER =
"Server.userException";
public static final QName FAULT_MUSTUNDERSTAND =
- new QName(NS_URI_SOAP_ENV, "MustUnderstand");
+ new QName(URI_SOAP11_ENV, "MustUnderstand");
// QNames
@@ -401,44 +378,44 @@
// Define qnames for the all of the XSD and SOAP-ENC encodings
- public static final QName XSD_STRING = new QName(NS_URI_CURRENT_SCHEMA_XSD, "string");
- public static final QName XSD_BOOLEAN = new QName(NS_URI_CURRENT_SCHEMA_XSD, "boolean");
- public static final QName XSD_DOUBLE = new QName(NS_URI_CURRENT_SCHEMA_XSD, "double");
- public static final QName XSD_FLOAT = new QName(NS_URI_CURRENT_SCHEMA_XSD, "float");
- public static final QName XSD_INT = new QName(NS_URI_CURRENT_SCHEMA_XSD, "int");
- public static final QName XSD_INTEGER = new QName(NS_URI_CURRENT_SCHEMA_XSD, "integer");
- public static final QName XSD_LONG = new QName(NS_URI_CURRENT_SCHEMA_XSD, "long");
- public static final QName XSD_SHORT = new QName(NS_URI_CURRENT_SCHEMA_XSD, "short");
- public static final QName XSD_BYTE = new QName(NS_URI_CURRENT_SCHEMA_XSD, "byte");
- public static final QName XSD_DECIMAL = new QName(NS_URI_CURRENT_SCHEMA_XSD, "decimal");
- public static final QName XSD_BASE64 = new QName(NS_URI_CURRENT_SCHEMA_XSD, "base64Binary");
- public static final QName XSD_HEXBIN = new QName(NS_URI_CURRENT_SCHEMA_XSD, "hexBinary");
- public static final QName XSD_ANYTYPE = new QName(NS_URI_CURRENT_SCHEMA_XSD, "anyType");
- public static final QName XSD_QNAME = new QName(NS_URI_CURRENT_SCHEMA_XSD, "QName");
- public static final QName XSD_DATE = new QName(NS_URI_CURRENT_SCHEMA_XSD, "dateTime");
- public static final QName XSD_DATE1 = new QName(NS_URI_CURRENT_SCHEMA_XSD, "date");
- public static final QName XSD_DATE2= new QName(NS_URI_1999_SCHEMA_XSD, "timeInstant");
- public static final QName XSD_DATE3= new QName(NS_URI_2000_SCHEMA_XSD, "timeInstant");
-
- public static final QName SOAP_BASE64 = new QName(NS_URI_CURRENT_SOAP_ENC, "base64");
- public static final QName SOAP_STRING = new QName(NS_URI_CURRENT_SOAP_ENC, "string");
- public static final QName SOAP_BOOLEAN = new QName(NS_URI_CURRENT_SOAP_ENC, "boolean");
- public static final QName SOAP_DOUBLE = new QName(NS_URI_CURRENT_SOAP_ENC, "double");
- public static final QName SOAP_FLOAT = new QName(NS_URI_CURRENT_SOAP_ENC, "float");
- public static final QName SOAP_INT = new QName(NS_URI_CURRENT_SOAP_ENC, "int");
- public static final QName SOAP_LONG = new QName(NS_URI_CURRENT_SOAP_ENC, "long");
- public static final QName SOAP_SHORT = new QName(NS_URI_CURRENT_SOAP_ENC, "short");
- public static final QName SOAP_BYTE = new QName(NS_URI_CURRENT_SOAP_ENC, "byte");
- public static final QName SOAP_INTEGER = new QName(NS_URI_CURRENT_SOAP_ENC, "integer");
- public static final QName SOAP_DECIMAL = new QName(NS_URI_CURRENT_SOAP_ENC, "decimal");
- public static final QName SOAP_ARRAY = new QName(NS_URI_CURRENT_SOAP_ENC, "Array");
+ 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");
+ public static final QName XSD_FLOAT = new QName(URI_DEFAULT_SCHEMA_XSD, "float");
+ public static final QName XSD_INT = new QName(URI_DEFAULT_SCHEMA_XSD, "int");
+ public static final QName XSD_INTEGER = new QName(URI_DEFAULT_SCHEMA_XSD, "integer");
+ public static final QName XSD_LONG = new QName(URI_DEFAULT_SCHEMA_XSD, "long");
+ public static final QName XSD_SHORT = new QName(URI_DEFAULT_SCHEMA_XSD, "short");
+ public static final QName XSD_BYTE = new QName(URI_DEFAULT_SCHEMA_XSD, "byte");
+ public static final QName XSD_DECIMAL = new QName(URI_DEFAULT_SCHEMA_XSD, "decimal");
+ public static final QName XSD_BASE64 = new QName(URI_DEFAULT_SCHEMA_XSD, "base64Binary");
+ public static final QName XSD_HEXBIN = new QName(URI_DEFAULT_SCHEMA_XSD, "hexBinary");
+ public static final QName XSD_ANYTYPE = new QName(URI_DEFAULT_SCHEMA_XSD, "anyType");
+ public static final QName XSD_QNAME = new QName(URI_DEFAULT_SCHEMA_XSD, "QName");
+ public static final QName XSD_DATE = new QName(URI_DEFAULT_SCHEMA_XSD, "dateTime");
+ public static final QName XSD_DATE1 = new QName(URI_DEFAULT_SCHEMA_XSD, "date");
+ public static final QName XSD_DATE2= new QName(URI_1999_SCHEMA_XSD, "timeInstant");
+ public static final QName XSD_DATE3= new QName(URI_2000_SCHEMA_XSD, "timeInstant");
+
+ public static final QName SOAP_BASE64 = new QName(URI_DEFAULT_SOAP_ENC, "base64");
+ public static final QName SOAP_STRING = new QName(URI_DEFAULT_SOAP_ENC, "string");
+ public static final QName SOAP_BOOLEAN = new QName(URI_DEFAULT_SOAP_ENC, "boolean");
+ public static final QName SOAP_DOUBLE = new QName(URI_DEFAULT_SOAP_ENC, "double");
+ public static final QName SOAP_FLOAT = new QName(URI_DEFAULT_SOAP_ENC, "float");
+ public static final QName SOAP_INT = new QName(URI_DEFAULT_SOAP_ENC, "int");
+ public static final QName SOAP_LONG = new QName(URI_DEFAULT_SOAP_ENC, "long");
+ public static final QName SOAP_SHORT = new QName(URI_DEFAULT_SOAP_ENC, "short");
+ public static final QName SOAP_BYTE = new QName(URI_DEFAULT_SOAP_ENC, "byte");
+ public static final QName SOAP_INTEGER = new QName(URI_DEFAULT_SOAP_ENC, "integer");
+ public static final QName SOAP_DECIMAL = new QName(URI_DEFAULT_SOAP_ENC, "decimal");
+ public static final QName SOAP_ARRAY = new QName(URI_DEFAULT_SOAP_ENC, "Array");
public static final QName SOAP_MAP = new QName(NS_URI_XMLSOAP, "Map");
public static final QName SOAP_ELEMENT = new QName(NS_URI_XMLSOAP, "Element");
public static final QName SOAP_VECTOR = new QName(NS_URI_XMLSOAP, "Vector");
- public static final QName QNAME_LITERAL_ITEM = new QName(NS_URI_LITERAL_ENC,"item");
+ public static final QName QNAME_LITERAL_ITEM = new QName(URI_LITERAL_ENC,"item");
// Misc Strings
//////////////////////////////////////////////////////////////////////////
1.94 +4 -4 xml-axis/java/src/org/apache/axis/MessageContext.java
Index: MessageContext.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/MessageContext.java,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- MessageContext.java 31 May 2002 14:12:37 -0000 1.93
+++ MessageContext.java 31 May 2002 19:08:06 -0000 1.94
@@ -183,7 +183,7 @@
private int operationStyle = ServiceDesc.STYLE_RPC;
private boolean useSOAPAction = false;
private String SOAPActionURI = null;
- private String encodingStyle = Constants.NS_URI_CURRENT_SOAP_ENC;
+ private String encodingStyle = Constants.URI_DEFAULT_SOAP_ENC;
/** Our SOAP namespaces and such - defaults to SOAP 1.1 */
private SOAPConstants soapConstants = new SOAP11Constants();
@@ -362,7 +362,7 @@
* Encoding
*/
public boolean isEncoded() {
- return Constants.NS_URI_CURRENT_SOAP_ENC.equals(encodingStyle);
+ return Constants.URI_DEFAULT_SOAP_ENC.equals(encodingStyle);
}
/**
@@ -565,7 +565,7 @@
setTypeMappingRegistry(tmr);
setOperationStyle(service.getStyle());
setEncodingStyle((service.getStyle() == ServiceDesc.STYLE_RPC) ?
- Constants.NS_URI_CURRENT_SOAP_ENC : "");
+ Constants.URI_DEFAULT_SOAP_ENC : "");
// This MessageContext should now defer properties it can't find
// to the Service's options.
@@ -943,7 +943,7 @@
/**
* Utility function to convert string to operation style constants
- *
+ *
* @param operationStyle "rpc", "document", or "wrapped"
* @return either STYLE_RPC, STYLE_DOCUMENT or STYLE_WRAPPED (all defined
* in org.apache.axis.description.ServiceDesc)
1.60 +4 -4 xml-axis/java/src/org/apache/axis/client/AdminClient.java
Index: AdminClient.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/AdminClient.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- AdminClient.java 30 May 2002 03:06:06 -0000 1.59
+++ AdminClient.java 31 May 2002 19:08:06 -0000 1.60
@@ -141,7 +141,7 @@
public String list() throws Exception {
log.debug( JavaUtils.getMessage("doList00") );
- String str = "<m:list xmlns:m=\"" + WSDDConstants.NS_URI_WSDD + "\"/>" ;
+ String str = "<m:list xmlns:m=\"" + WSDDConstants.URI_WSDD + "\"/>" ;
ByteArrayInputStream input = new ByteArrayInputStream(str.getBytes());
return process(input);
}
@@ -155,14 +155,14 @@
public String quit() throws Exception {
log.debug(JavaUtils.getMessage("doQuit00"));
- String str = "<m:quit xmlns:m=\"" + WSDDConstants.NS_URI_WSDD + "\"/>";
+ String str = "<m:quit xmlns:m=\"" + WSDDConstants.URI_WSDD + "\"/>";
ByteArrayInputStream input = new ByteArrayInputStream(str.getBytes());
return process(input);
}
public String undeployHandler(String handlerName) throws Exception {
log.debug(JavaUtils.getMessage("doQuit00"));
- String str = "<m:"+ROOT_UNDEPLOY +" xmlns:m=\"" + WSDDConstants.NS_URI_WSDD + "\">" +
+ String str = "<m:"+ROOT_UNDEPLOY +" xmlns:m=\"" + WSDDConstants.URI_WSDD + "\">" +
"<handler name=\"" + handlerName + "\"/>"+
"</m:"+ROOT_UNDEPLOY +">" ;
ByteArrayInputStream input = new ByteArrayInputStream(str.getBytes());
@@ -171,7 +171,7 @@
public String undeployService(String serviceName) throws Exception {
log.debug(JavaUtils.getMessage("doQuit00"));
- String str = "<m:"+ROOT_UNDEPLOY +" xmlns:m=\"" + WSDDConstants.NS_URI_WSDD + "\">" +
+ String str = "<m:"+ROOT_UNDEPLOY +" xmlns:m=\"" + WSDDConstants.URI_WSDD + "\">" +
"<service name=\"" + serviceName + "\"/>"+
"</m:"+ROOT_UNDEPLOY +">" ;
ByteArrayInputStream input = new ByteArrayInputStream(str.getBytes());
1.126 +1 -1 xml-axis/java/src/org/apache/axis/client/Call.java
Index: Call.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/Call.java,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- Call.java 30 May 2002 03:06:06 -0000 1.125
+++ Call.java 31 May 2002 19:08:06 -0000 1.126
@@ -159,7 +159,7 @@
private int operationStyle = ServiceDesc.STYLE_RPC;
private boolean useSOAPAction = false;
private String SOAPActionURI = null;
- private String encodingStyle = Constants.NS_URI_CURRENT_SOAP_ENC;
+ private String encodingStyle = Constants.URI_DEFAULT_SOAP_ENC;
private Integer timeout = null;
private OperationDesc operation = new OperationDesc();
1.17 +31 -32 xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDConstants.java
Index: WSDDConstants.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDConstants.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- WSDDConstants.java 30 May 2002 15:01:58 -0000 1.16
+++ WSDDConstants.java 31 May 2002 19:08:06 -0000 1.17
@@ -64,7 +64,7 @@
public static final String BEAN_SERIALIZER_FACTORY = "org.apache.axis.encoding.ser.BeanSerializerFactory";
public static final String BEAN_DESERIALIZER_FACTORY = "org.apache.axis.encoding.ser.BeanDeserializerFactory";
- public static final String NS_URI_WSDD = "http://xml.apache.org/axis/wsdd/";
+ public static final String URI_WSDD = "http://xml.apache.org/axis/wsdd/";
// The following have a '/' appended to the end of NS_URI_WSDD_JAVA.. OK to fix?
// .../java/wsdd/examples/from_SOAP_v2/addressBook.wsdd
@@ -88,27 +88,26 @@
// .../java/wsdd/examples/chaining_examples/ch_wsddScenario10.wsdd
// .../java/wsdd/examples/chaining_examples/ch_wsddScenario11.wsdd
// .../java/wsdd/examples/chaining_examples/ch_wsddScenario12.wsdd
- public static final String NS_URI_WSDD_JAVA = "http://xml.apache.org/axis/wsdd/providers/java";
- public static final String NS_URI_WSDD_HANDLER = "http://xml.apache.org/axis/wsdd/providers/handler";
- public static final String NS_URI_WSDD_WSDD_COM = "http://xml.apache.org/axis/wsdd/providers/com";
+ public static final String URI_WSDD_JAVA = "http://xml.apache.org/axis/wsdd/providers/java";
+ public static final String URI_WSDD_HANDLER = "http://xml.apache.org/axis/wsdd/providers/handler";
+ public static final String URI_WSDD_WSDD_COM = "http://xml.apache.org/axis/wsdd/providers/com";
// the following namespace is used in .../java/wsdd/examples/from_SOAP_v2/calculator.wsdd
// BUT that namespace ends with '/', this one doesn't. Which is right?
- public static final String NS_URI_WSDD_WSDD_BSF = "http://xml.apache.org/axis/wsdd/providers/bsf";
+ public static final String URI_WSDD_WSDD_BSF = "http://xml.apache.org/axis/wsdd/providers/bsf";
public static final String NS_PREFIX_WSDD = "";
public static final String NS_PREFIX_WSDD_JAVA = "java";
- public static final String ELEM_PROVIDER_RPC = "RPC";
- public static final String ELEM_PROVIDER_MSG = "MSG";
- public static final String ELEM_PROVIDER_HANDLER = "Handler";
- public static final String ELEM_PROVIDER_EJB = "EJB";
+ public static final String PROVIDER_RPC = "RPC";
+ public static final String PROVIDER_MSG = "MSG";
+ public static final String PROVIDER_HANDLER = "Handler";
+ public static final String PROVIDER_EJB = "EJB";
- public static final QName QNAME_JAVARPC_PROVIDER = new QName(NS_URI_WSDD_JAVA, ELEM_PROVIDER_RPC);
- public static final QName QNAME_JAVAMSG_PROVIDER = new QName(NS_URI_WSDD_JAVA, ELEM_PROVIDER_MSG);
- public static final QName QNAME_HANDLER_PROVIDER = new QName("", ELEM_PROVIDER_HANDLER);
- public static final QName QNAME_EJB_PROVIDER = new QName(NS_URI_WSDD_JAVA, ELEM_PROVIDER_EJB);
-
+ public static final QName QNAME_JAVARPC_PROVIDER = new QName(URI_WSDD_JAVA, PROVIDER_RPC);
+ public static final QName QNAME_JAVAMSG_PROVIDER = new QName(URI_WSDD_JAVA, PROVIDER_MSG);
+ public static final QName QNAME_HANDLER_PROVIDER = new QName("", PROVIDER_HANDLER);
+ public static final QName QNAME_EJB_PROVIDER = new QName(URI_WSDD_JAVA, PROVIDER_EJB);
public static final String ELEM_WSDD_PARAM = "parameter";
public static final String ELEM_WSDD_DOC = "documentation";
@@ -129,24 +128,24 @@
public static final String ELEM_WSDD_WSDLFILE = "wsdlFile";
public static final String ELEM_WSDD_NAMESPACE = "namespace";
- public static final QName QNAME_PARAM = new QName(NS_URI_WSDD, ELEM_WSDD_PARAM);
- public static final QName QNAME_DOC = new QName(NS_URI_WSDD, ELEM_WSDD_DOC);
- public static final QName QNAME_DEPLOY = new QName(NS_URI_WSDD, ELEM_WSDD_DEPLOY);
- public static final QName QNAME_UNDEPLOY = new QName(NS_URI_WSDD, ELEM_WSDD_UNDEPLOY);
- public static final QName QNAME_REQFLOW = new QName(NS_URI_WSDD, ELEM_WSDD_REQFLOW);
- public static final QName QNAME_RESPFLOW = new QName(NS_URI_WSDD, ELEM_WSDD_RESPFLOW);
- public static final QName QNAME_FAULTFLOW = new QName(NS_URI_WSDD, ELEM_WSDD_FAULTFLOW);
- public static final QName QNAME_HANDLER = new QName(NS_URI_WSDD, ELEM_WSDD_HANDLER);
- public static final QName QNAME_CHAIN = new QName(NS_URI_WSDD, ELEM_WSDD_CHAIN);
- public static final QName QNAME_SERVICE = new QName(NS_URI_WSDD, ELEM_WSDD_SERVICE);
- public static final QName QNAME_TRANSPORT = new QName(NS_URI_WSDD, ELEM_WSDD_TRANSPORT);
- public static final QName QNAME_GLOBAL = new QName(NS_URI_WSDD, ELEM_WSDD_GLOBAL);
- public static final QName QNAME_TYPEMAPPING = new QName(NS_URI_WSDD, ELEM_WSDD_TYPEMAPPING);
- public static final QName QNAME_BEANMAPPING = new QName(NS_URI_WSDD, ELEM_WSDD_BEANMAPPING);
- public static final QName QNAME_OPERATION = new QName(NS_URI_WSDD, ELEM_WSDD_OPERATION);
- public static final QName QNAME_ELEMENTMAPPING = new QName(NS_URI_WSDD, ELEM_WSDD_ELEMENTMAPPING);
- public static final QName QNAME_WSDLFILE = new QName(NS_URI_WSDD, ELEM_WSDD_WSDLFILE);
- public static final QName QNAME_NAMESPACE = new QName(NS_URI_WSDD, ELEM_WSDD_NAMESPACE);
+ public static final QName QNAME_PARAM = new QName(URI_WSDD, ELEM_WSDD_PARAM);
+ public static final QName QNAME_DOC = new QName(URI_WSDD, ELEM_WSDD_DOC);
+ public static final QName QNAME_DEPLOY = new QName(URI_WSDD, ELEM_WSDD_DEPLOY);
+ public static final QName QNAME_UNDEPLOY = new QName(URI_WSDD, ELEM_WSDD_UNDEPLOY);
+ public static final QName QNAME_REQFLOW = new QName(URI_WSDD, ELEM_WSDD_REQFLOW);
+ public static final QName QNAME_RESPFLOW = new QName(URI_WSDD, ELEM_WSDD_RESPFLOW);
+ public static final QName QNAME_FAULTFLOW = new QName(URI_WSDD, ELEM_WSDD_FAULTFLOW);
+ public static final QName QNAME_HANDLER = new QName(URI_WSDD, ELEM_WSDD_HANDLER);
+ public static final QName QNAME_CHAIN = new QName(URI_WSDD, ELEM_WSDD_CHAIN);
+ public static final QName QNAME_SERVICE = new QName(URI_WSDD, ELEM_WSDD_SERVICE);
+ public static final QName QNAME_TRANSPORT = new QName(URI_WSDD, ELEM_WSDD_TRANSPORT);
+ public static final QName QNAME_GLOBAL = new QName(URI_WSDD, ELEM_WSDD_GLOBAL);
+ public static final QName QNAME_TYPEMAPPING = new QName(URI_WSDD, ELEM_WSDD_TYPEMAPPING);
+ public static final QName QNAME_BEANMAPPING = new QName(URI_WSDD, ELEM_WSDD_BEANMAPPING);
+ public static final QName QNAME_OPERATION = new QName(URI_WSDD, ELEM_WSDD_OPERATION);
+ public static final QName QNAME_ELEMENTMAPPING = new QName(URI_WSDD, ELEM_WSDD_ELEMENTMAPPING);
+ public static final QName QNAME_WSDLFILE = new QName(URI_WSDD, ELEM_WSDD_WSDLFILE);
+ public static final QName QNAME_NAMESPACE = new QName(URI_WSDD, ELEM_WSDD_NAMESPACE);
public static final String ATTR_LANG_SPEC_TYPE = "languageSpecificType";
public static final String ATTR_QNAME = "qname";
1.31 +1 -1 xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployableItem.java
Index: WSDDDeployableItem.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployableItem.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- WSDDDeployableItem.java 30 May 2002 23:46:00 -0000 1.30
+++ WSDDDeployableItem.java 31 May 2002 19:08:06 -0000 1.31
@@ -381,7 +381,7 @@
{
QName type = getType();
if (type != null &&
- NS_URI_WSDD_JAVA.equals(type.getNamespaceURI())) {
+ URI_WSDD_JAVA.equals(type.getNamespaceURI())) {
return Class.forName(type.getLocalPart());
}
return null;
1.34 +3 -3 xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployment.java
Index: WSDDDeployment.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployment.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- WSDDDeployment.java 30 May 2002 03:06:07 -0000 1.33
+++ WSDDDeployment.java 31 May 2002 19:08:06 -0000 1.34
@@ -305,7 +305,7 @@
try {
String encodingStyle = mapping.getEncodingStyle();
if (encodingStyle == null) {
- encodingStyle = Constants.NS_URI_CURRENT_SOAP_ENC;
+ encodingStyle = Constants.URI_DEFAULT_SOAP_ENC;
}
TypeMapping tm = (TypeMapping) tmr.getTypeMapping(encodingStyle);
TypeMapping df = (TypeMapping) tmr.getDefaultTypeMapping();
@@ -353,9 +353,9 @@
public void writeToContext(SerializationContext context)
throws IOException
{
- context.registerPrefixForURI(NS_PREFIX_WSDD, NS_URI_WSDD);
+ context.registerPrefixForURI(NS_PREFIX_WSDD, URI_WSDD);
- context.registerPrefixForURI(NS_PREFIX_WSDD_JAVA, NS_URI_WSDD_JAVA);
+ context.registerPrefixForURI(NS_PREFIX_WSDD_JAVA, URI_WSDD_JAVA);
context.startElement(QNAME_DEPLOY, null);
1.67 +3 -3 xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDService.java
Index: WSDDService.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDService.java,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- WSDDService.java 30 May 2002 23:46:00 -0000 1.66
+++ WSDDService.java 31 May 2002 19:08:06 -0000 1.67
@@ -218,7 +218,7 @@
desc.setImplClass(cls);
initTMR();
String encStyle = (desc.getStyle() == ServiceDesc.STYLE_RPC) ?
- Constants.NS_URI_CURRENT_SOAP_ENC : "";
+ Constants.URI_DEFAULT_SOAP_ENC : "";
desc.setTypeMapping(getTypeMapping(encStyle));
} catch (Exception ex) {
}
@@ -436,9 +436,9 @@
String encodingStyle = mapping.getEncodingStyle();
if (encodingStyle == null) {
if (style == ServiceDesc.STYLE_RPC)
- encodingStyle =Constants.NS_URI_CURRENT_SOAP_ENC;
+ encodingStyle =Constants.URI_DEFAULT_SOAP_ENC;
else
- encodingStyle = Constants.NS_URI_LITERAL_ENC; // literal
+ encodingStyle = Constants.URI_LITERAL_ENC; // literal
}
TypeMapping tm = (TypeMapping) tmr.getTypeMapping(encodingStyle);
TypeMapping df = (TypeMapping) tmr.getDefaultTypeMapping();
1.10 +1 -1 xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDTargetedChain.java
Index: WSDDTargetedChain.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDTargetedChain.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- WSDDTargetedChain.java 30 May 2002 03:06:07 -0000 1.9
+++ WSDDTargetedChain.java 31 May 2002 19:08:06 -0000 1.10
@@ -196,7 +196,7 @@
Handler pivot = null;
if (pivotQName != null) {
- if (NS_URI_WSDD_JAVA.equals(pivotQName.getNamespaceURI())) {
+ if (URI_WSDD_JAVA.equals(pivotQName.getNamespaceURI())) {
try {
pivot = (Handler)Class.forName(pivotQName.getLocalPart()).newInstance();
} catch (InstantiationException e) {
1.29 +5 -5 xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDTypeMapping.java
Index: WSDDTypeMapping.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDTypeMapping.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- WSDDTypeMapping.java 30 May 2002 03:06:07 -0000 1.28
+++ WSDDTypeMapping.java 31 May 2002 19:08:06 -0000 1.29
@@ -100,7 +100,7 @@
Attr attrNode = e.getAttributeNode(ATTR_ENCSTYLE);
if (attrNode == null) {
- encodingStyle = Constants.NS_URI_CURRENT_SOAP_ENC;
+ encodingStyle = Constants.URI_DEFAULT_SOAP_ENC;
} else {
encodingStyle = attrNode.getValue();
}
@@ -207,11 +207,11 @@
throws ClassNotFoundException
{
if (typeQName != null) {
- if (!NS_URI_WSDD_JAVA.equals(typeQName.getNamespaceURI())) {
+ if (!URI_WSDD_JAVA.equals(typeQName.getNamespaceURI())) {
throw new ClassNotFoundException(JavaUtils.
getMessage("badTypeNamespace00",
typeQName.getNamespaceURI(),
- NS_URI_WSDD_JAVA));
+ URI_WSDD_JAVA));
}
String loadName = JavaUtils.getLoadableClassName(typeQName.getLocalPart());
if (JavaUtils.getWrapper(loadName) != null) {
@@ -231,7 +231,7 @@
public void setLanguageSpecificType(Class javaType)
{
String type = javaType.getName();
- typeQName = new QName(NS_URI_WSDD_JAVA, type);
+ typeQName = new QName(URI_WSDD_JAVA, type);
}
/**
@@ -241,7 +241,7 @@
*/
public void setLanguageSpecificType(String javaType)
{
- typeQName = new QName(NS_URI_WSDD_JAVA, javaType);
+ typeQName = new QName(URI_WSDD_JAVA, javaType);
}
/**
1.5 +1 -1 xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDUndeployment.java
Index: WSDDUndeployment.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDUndeployment.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WSDDUndeployment.java 30 May 2002 03:06:07 -0000 1.4
+++ WSDDUndeployment.java 31 May 2002 19:08:06 -0000 1.5
@@ -223,7 +223,7 @@
public void writeToContext(SerializationContext context)
throws IOException
{
- context.registerPrefixForURI(NS_PREFIX_WSDD, NS_URI_WSDD);
+ context.registerPrefixForURI(NS_PREFIX_WSDD, URI_WSDD);
context.startElement(WSDDConstants.QNAME_UNDEPLOY, null);
Iterator i = handlers.iterator();
1.28 +6 -6 xml-axis/java/src/org/apache/axis/encoding/DefaultTypeMappingImpl.java
Index: DefaultTypeMappingImpl.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/DefaultTypeMappingImpl.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- DefaultTypeMappingImpl.java 30 May 2002 23:46:00 -0000 1.27
+++ DefaultTypeMappingImpl.java 31 May 2002 19:08:07 -0000 1.28
@@ -346,17 +346,17 @@
// Register all known flavors of the namespace.
try {
if (xmlType.getNamespaceURI().equals(
- Constants.NS_URI_CURRENT_SCHEMA_XSD)) {
- for (int i=0; i < Constants.NS_URIS_SCHEMA_XSD.length; i++) {
- QName qName = new QName(Constants.NS_URIS_SCHEMA_XSD[i],
+ Constants.URI_DEFAULT_SCHEMA_XSD)) {
+ for (int i=0; i < Constants.URIS_SCHEMA_XSD.length; i++) {
+ QName qName = new QName(Constants.URIS_SCHEMA_XSD[i],
xmlType.getLocalPart());
super.register(javaType, qName, sf, df);
}
}
else if (xmlType.getNamespaceURI().equals(
- Constants.NS_URI_CURRENT_SOAP_ENC)) {
- for (int i=0; i < Constants.NS_URIS_SOAP_ENC.length; i++) {
- QName qName = new QName(Constants.NS_URIS_SOAP_ENC[i],
+ Constants.URI_DEFAULT_SOAP_ENC)) {
+ for (int i=0; i < Constants.URIS_SOAP_ENC.length; i++) {
+ QName qName = new QName(Constants.URIS_SOAP_ENC[i],
xmlType.getLocalPart());
super.register(javaType, qName, sf, df);
}
1.33 +3 -3 xml-axis/java/src/org/apache/axis/encoding/DeserializationContextImpl.java
Index: DeserializationContextImpl.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/DeserializationContextImpl.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- DeserializationContextImpl.java 30 May 2002 23:46:01 -0000 1.32
+++ DeserializationContextImpl.java 31 May 2002 19:08:07 -0000 1.33
@@ -338,7 +338,7 @@
QName typeQName = null;
// Check for type
- String type = Constants.getValue(attrs, Constants.NS_URIS_SCHEMA_XSI,
+ String type = Constants.getValue(attrs, Constants.URIS_SCHEMA_XSI,
"type");
if (type != null) {
// Return the type attribute value converted to a QName
@@ -353,7 +353,7 @@
// Else if the default type mapping accepts SOAP 1.1, then
// convert the SOAP-ENC type to the appropriate XSD Schema Type.
QName myQName = new QName(namespace, localName);
- if (Constants.NS_URI_CURRENT_SOAP_ENC.equals(Constants.NS_URI_SOAP12_ENC) &&
+ if (Constants.URI_DEFAULT_SOAP_ENC.equals(Constants.URI_SOAP12_ENC) &&
Constants.isSOAP_ENC(namespace)) {
typeQName = myQName;
} else if (myQName.equals(Constants.SOAP_ARRAY)) {
@@ -404,7 +404,7 @@
if (attrs == null) {
return false;
}
- String nil = Constants.getValue(attrs, Constants.NS_URIS_SCHEMA_XSI,
+ String nil = Constants.getValue(attrs, Constants.URIS_SCHEMA_XSI,
"nil");
return (nil != null && nil.equals("true"));
}
1.14 +1 -1 xml-axis/java/src/org/apache/axis/encoding/DeserializerImpl.java
Index: DeserializerImpl.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/DeserializerImpl.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DeserializerImpl.java 30 May 2002 23:46:01 -0000 1.13
+++ DeserializerImpl.java 31 May 2002 19:08:07 -0000 1.14
@@ -324,7 +324,7 @@
// If the xsi:nil attribute, set the value to null and return since
// there is nothing to deserialize.
String nil = Constants.getValue(attributes,
- Constants.NS_URIS_SCHEMA_XSI,
+ Constants.URIS_SCHEMA_XSI,
"nil");
if (nil != null && nil.equals("true")) {
value = null;
1.30 +4 -4 xml-axis/java/src/org/apache/axis/encoding/SerializationContextImpl.java
Index: SerializationContextImpl.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/SerializationContextImpl.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- SerializationContextImpl.java 30 May 2002 15:47:12 -0000 1.29
+++ SerializationContextImpl.java 31 May 2002 19:08:07 -0000 1.30
@@ -556,7 +556,7 @@
attrs.setAttributes(attributes);
if (sendType)
attrs = (AttributesImpl) setTypeAttribute(attrs, xmlType);
- attrs.addAttribute(Constants.NS_URI_2001_SCHEMA_XSI, "nil", "xsi:nil",
+ attrs.addAttribute(Constants.URI_2001_SCHEMA_XSI, "nil", "xsi:nil",
"CDATA", "true");
startElement(elemQName, attrs);
endElement();
@@ -957,7 +957,7 @@
!shouldSendXSIType() ||
type.getLocalPart().indexOf(SymbolTable.ANON_TOKEN) >= 0 ||
((attributes != null) &&
- (attributes.getIndex(Constants.NS_URI_CURRENT_SCHEMA_XSI,
+ (attributes.getIndex(Constants.URI_DEFAULT_SCHEMA_XSI,
"type") != -1)))
return attributes;
@@ -965,10 +965,10 @@
if (attributes != null && 0 < attributes.getLength() )
attrs.setAttributes(attributes);
- String prefix = getPrefixForURI(Constants.NS_URI_CURRENT_SCHEMA_XSI,
+ String prefix = getPrefixForURI(Constants.URI_DEFAULT_SCHEMA_XSI,
"xsi");
- attrs.addAttribute(Constants.NS_URI_CURRENT_SCHEMA_XSI,
+ attrs.addAttribute(Constants.URI_DEFAULT_SCHEMA_XSI,
"type",
prefix + ":type",
"CDATA", qName2String(type));
1.11 +1 -1 xml-axis/java/src/org/apache/axis/encoding/TypeMappingRegistryImpl.java
Index: TypeMappingRegistryImpl.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/TypeMappingRegistryImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TypeMappingRegistryImpl.java 30 May 2002 03:06:08 -0000 1.10
+++ TypeMappingRegistryImpl.java 31 May 2002 19:08:07 -0000 1.11
@@ -173,7 +173,7 @@
*/
public TypeMappingRegistryImpl() {
mapTM = new HashMap();
- if (Constants.NS_URI_CURRENT_SOAP_ENC.equals(Constants.NS_URI_SOAP_ENC)) {
+ if (Constants.URI_DEFAULT_SOAP_ENC.equals(Constants.URI_SOAP11_ENC)) {
defaultDelTM =
new TypeMappingImpl(DefaultTypeMappingImpl.getSingleton());
} else {
1.16 +3 -3 xml-axis/java/src/org/apache/axis/encoding/ser/ArrayDeserializer.java
Index: ArrayDeserializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/ArrayDeserializer.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ArrayDeserializer.java 30 May 2002 23:46:01 -0000 1.15
+++ ArrayDeserializer.java 31 May 2002 19:08:08 -0000 1.16
@@ -159,7 +159,7 @@
// Now get the arrayType value
QName arrayTypeValue = context.getQNameFromString(
Constants.getValue(attributes,
- Constants.NS_URIS_SOAP_ENC,
+ Constants.URIS_SOAP_ENC,
Constants.ATTR_ARRAY_TYPE));
// The first part of the arrayType expression is
@@ -300,7 +300,7 @@
// If soapenc:offset specified, set the current index accordingly
String offset = Constants.getValue(attributes,
- Constants.NS_URIS_SOAP_ENC,
+ Constants.URIS_SOAP_ENC,
Constants.ATTR_OFFSET);
if (offset != null) {
int leftBracketIndex = offset.lastIndexOf('[');
@@ -353,7 +353,7 @@
if (attributes != null) {
String pos =
Constants.getValue(attributes,
- Constants.NS_URIS_SOAP_ENC,
+ Constants.URIS_SOAP_ENC,
Constants.ATTR_POSITION);
if (pos != null) {
int leftBracketIndex = pos.lastIndexOf('[');
1.19 +6 -6 xml-axis/java/src/org/apache/axis/encoding/ser/ArraySerializer.java
Index: ArraySerializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/ArraySerializer.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ArraySerializer.java 30 May 2002 03:06:08 -0000 1.18
+++ ArraySerializer.java 31 May 2002 19:08:08 -0000 1.19
@@ -204,11 +204,11 @@
attrs = new AttributesImpl();
}
- if (attrs.getIndex(Constants.NS_URI_CURRENT_SOAP_ENC,
+ if (attrs.getIndex(Constants.URI_DEFAULT_SOAP_ENC,
Constants.ATTR_ARRAY_TYPE) == -1) {
String encprefix =
- context.getPrefixForURI(Constants.NS_URI_CURRENT_SOAP_ENC);
- attrs.addAttribute(Constants.NS_URI_CURRENT_SOAP_ENC,
+ context.getPrefixForURI(Constants.URI_DEFAULT_SOAP_ENC);
+ attrs.addAttribute(Constants.URI_DEFAULT_SOAP_ENC,
Constants.ATTR_ARRAY_TYPE,
encprefix + ":arrayType",
"CDATA",
@@ -229,14 +229,14 @@
// and may be useful for operation overloading.
// Cons: More interop test failures (as of 2/6/2002).
//
- int typeI = attrs.getIndex(Constants.NS_URI_CURRENT_SCHEMA_XSI,
+ int typeI = attrs.getIndex(Constants.URI_DEFAULT_SCHEMA_XSI,
"type");
if (typeI != -1) {
String qname =
- context.getPrefixForURI(Constants.NS_URI_CURRENT_SCHEMA_XSI,
+ context.getPrefixForURI(Constants.URI_DEFAULT_SCHEMA_XSI,
"xsi") + ":type";
attrs.setAttribute(typeI,
- Constants.NS_URI_CURRENT_SCHEMA_XSI,
+ Constants.URI_DEFAULT_SCHEMA_XSI,
"type",
qname,
"CDATA",
1.9 +1 -1 xml-axis/java/src/org/apache/axis/encoding/ser/JAFDataHandlerSerializer.java
Index: JAFDataHandlerSerializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/JAFDataHandlerSerializer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JAFDataHandlerSerializer.java 30 May 2002 03:06:08 -0000 1.8
+++ JAFDataHandlerSerializer.java 31 May 2002 19:08:08 -0000 1.9
@@ -117,7 +117,7 @@
attrs.setAttributes(attributes); //copy the existing ones.
int typeIndex=-1;
- if((typeIndex = attrs.getIndex(Constants.NS_URI_CURRENT_SCHEMA_XSI,
+ if((typeIndex = attrs.getIndex(Constants.URI_DEFAULT_SCHEMA_XSI,
"type")) != -1){
//Found a xsi:type which should not be there for attachments.
1.10 +1 -1 xml-axis/java/src/org/apache/axis/encoding/ser/MapDeserializer.java
Index: MapDeserializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/MapDeserializer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MapDeserializer.java 30 May 2002 23:46:01 -0000 1.9
+++ MapDeserializer.java 31 May 2002 19:08:08 -0000 1.10
@@ -109,7 +109,7 @@
log.debug("Enter MapDeserializer::startElement()");
}
- if (attributes.getValue(Constants.NS_URI_CURRENT_SCHEMA_XSI, "nil") != null) {
+ if (attributes.getValue(Constants.URI_DEFAULT_SCHEMA_XSI, "nil") != null) {
return;
}
1.10 +1 -1 xml-axis/java/src/org/apache/axis/encoding/ser/VectorDeserializer.java
Index: VectorDeserializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/VectorDeserializer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- VectorDeserializer.java 30 May 2002 23:46:01 -0000 1.9
+++ VectorDeserializer.java 31 May 2002 19:08:08 -0000 1.10
@@ -102,7 +102,7 @@
log.debug("Enter: VectorDeserializer::startElement()");
}
- if (attributes.getValue(Constants.NS_URI_CURRENT_SCHEMA_XSI, "nil") != null) {
+ if (attributes.getValue(Constants.URI_DEFAULT_SCHEMA_XSI, "nil") != null) {
return;
}
1.64 +1 -1 xml-axis/java/src/org/apache/axis/handlers/soap/SOAPService.java
Index: SOAPService.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/soap/SOAPService.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- SOAPService.java 30 May 2002 23:46:01 -0000 1.63
+++ SOAPService.java 31 May 2002 19:08:08 -0000 1.64
@@ -175,7 +175,7 @@
QName badQName = new QName(badHeader.getNamespaceURI(),
badHeader.getName());
SOAPHeaderElement newHeader = new
- SOAPHeaderElement(Constants.NS_URI_SOAP12_FAULT_NS,
+ SOAPHeaderElement(Constants.URI_SOAP12_FAULT,
Constants.ELEM_MISUNDERSTOOD);
newHeader.addAttribute(null,
Constants.ATTR_QNAME,
1.33 +7 -7 xml-axis/java/src/org/apache/axis/message/BodyBuilder.java
Index: BodyBuilder.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/BodyBuilder.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- BodyBuilder.java 30 May 2002 17:47:47 -0000 1.32
+++ BodyBuilder.java 31 May 2002 19:08:08 -0000 1.33
@@ -56,7 +56,7 @@
package org.apache.axis.message;
/**
- *
+ *
* @author Glen Daniels (gdaniels@allaire.com)
*/
@@ -81,12 +81,12 @@
boolean gotRPCElement = false;
private SOAPEnvelope envelope;
-
+
BodyBuilder(SOAPEnvelope envelope)
{
this.envelope = envelope;
}
-
+
public void startElement(String namespace, String localName,
String qName, Attributes attributes,
DeserializationContext context)
@@ -132,7 +132,7 @@
* description, which can then tell us what to create.
*/
boolean isRoot = true;
- String root = attributes.getValue(Constants.NS_URI_CURRENT_SOAP_ENC,
+ String root = attributes.getValue(Constants.URI_DEFAULT_SOAP_ENC,
Constants.ATTR_ROOT);
if ((root != null) && root.equals("0")) isRoot = false;
@@ -182,7 +182,7 @@
if (handler == null)
handler = new SOAPHandler();
-
+
handler.myElement = element;
context.pushNewElement(element);
@@ -192,14 +192,14 @@
}
return handler;
}
-
+
public void onEndChild(String namespace, String localName,
DeserializationContext context)
{
if (log.isDebugEnabled()) {
log.debug("Enter: BodyBuilder::onEndChild()");
}
-
+
if (element != null) {
envelope.addBodyElement(element);
element = null;
1.22 +12 -12 xml-axis/java/src/org/apache/axis/message/EnvelopeBuilder.java
Index: EnvelopeBuilder.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/EnvelopeBuilder.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- EnvelopeBuilder.java 30 May 2002 23:46:02 -0000 1.21
+++ EnvelopeBuilder.java 31 May 2002 19:08:08 -0000 1.22
@@ -84,19 +84,19 @@
envelope.setMessageType(messageType);
myElement = envelope;
}
-
+
public EnvelopeBuilder(SOAPEnvelope env, String messageType)
{
envelope = env ;
envelope.setMessageType(messageType);
myElement = envelope;
}
-
+
public SOAPEnvelope getEnvelope()
{
return envelope;
}
-
+
public void startElement(String namespace, String localName,
String qName, Attributes attributes,
DeserializationContext context)
@@ -106,10 +106,10 @@
throw new SAXException(
JavaUtils.getMessage("badTag00", localName));
- if (namespace.equals(Constants.NS_URI_SOAP_ENV)) {
+ if (namespace.equals(Constants.URI_SOAP11_ENV)) {
// SOAP 1.1
soapConstants = SOAPConstants.SOAP11_CONSTANTS;
- } else if (namespace.equals(Constants.NS_URI_SOAP12_ENV)) {
+ } else if (namespace.equals(Constants.URI_SOAP12_ENV)) {
// SOAP 1.2
soapConstants = SOAPConstants.SOAP12_CONSTANTS;
} else {
@@ -131,7 +131,7 @@
envelope.setNSMappings(context.getCurrentNSMappings());
context.pushNewElement(envelope);
}
-
+
public SOAPHandler onStartChild(String namespace,
String localName,
String prefix,
@@ -143,31 +143,31 @@
if (thisQName.equals(soapConstants.getHeaderQName())) {
if (gotHeader)
throw new SAXException(JavaUtils.getMessage("only1Header00"));
-
+
gotHeader = true;
return new HeaderBuilder(envelope);
}
-
+
if (thisQName.equals(soapConstants.getBodyQName())) {
if (gotBody)
throw new SAXException(JavaUtils.getMessage("only1Body00"));
-
+
gotBody = true;
return new BodyBuilder(envelope);
}
-
+
if (!gotBody)
throw new SAXException(JavaUtils.getMessage("noCustomElems00"));
MessageElement element = new MessageElement(namespace, localName, prefix,
attributes, context);
-
+
if (element.getFixupDeserializer() != null)
return (SOAPHandler)element.getFixupDeserializer();
return null;
}
-
+
public void onEndChild(String namespace, String localName,
DeserializationContext context)
{
1.99 +5 -5 xml-axis/java/src/org/apache/axis/message/MessageElement.java
Index: MessageElement.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/MessageElement.java,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- MessageElement.java 30 May 2002 16:40:42 -0000 1.98
+++ MessageElement.java 31 May 2002 19:08:08 -0000 1.99
@@ -95,7 +95,7 @@
LogFactory.getLog(MessageElement.class.getName());
private static final Mapping encMapping =
- new Mapping(Constants.NS_URI_CURRENT_SOAP_ENC,
+ new Mapping(Constants.URI_DEFAULT_SOAP_ENC,
"SOAP-ENC");
protected String name ;
@@ -204,7 +204,7 @@
localPart,
attributes);
- String rootVal = attributes.getValue(Constants.NS_URI_CURRENT_SOAP_ENC, Constants.ATTR_ROOT);
+ String rootVal = attributes.getValue(Constants.URI_DEFAULT_SOAP_ENC, Constants.ATTR_ROOT);
if (rootVal != null)
_isRoot = rootVal.equals("1");
@@ -221,13 +221,13 @@
href = attributes.getValue(Constants.ATTR_HREF);
// If there's an arrayType attribute, we can pretty well guess that we're an Array???
- if (attributes.getValue(Constants.NS_URI_CURRENT_SOAP_ENC, Constants.ATTR_ARRAY_TYPE) != null)
+ if (attributes.getValue(Constants.URI_DEFAULT_SOAP_ENC, Constants.ATTR_ARRAY_TYPE) != null)
typeQName = Constants.SOAP_ARRAY;
// Set the encoding style to the attribute value. If null,
// we just automatically use our parent's (see getEncodingStyle)
encodingStyle =
- attributes.getValue(Constants.NS_URI_CURRENT_SOAP_ENC,
+ attributes.getValue(Constants.URI_DEFAULT_SOAP_ENC,
Constants.ATTR_ENCODING_STYLE);
}
}
@@ -335,7 +335,7 @@
// Wherever we set the encoding style, map the SOAP-ENC prefix
// just for fun.
- if (encodingStyle.equals(Constants.NS_URI_CURRENT_SOAP_ENC)) {
+ if (encodingStyle.equals(Constants.URI_DEFAULT_SOAP_ENC)) {
addMapping(encMapping);
}
}
1.60 +4 -4 xml-axis/java/src/org/apache/axis/message/RPCElement.java
Index: RPCElement.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/RPCElement.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- RPCElement.java 30 May 2002 18:55:21 -0000 1.59
+++ RPCElement.java 31 May 2002 19:08:08 -0000 1.60
@@ -89,7 +89,7 @@
// recorder = new SAX2EventRecorder();
- encodingStyle = Constants.NS_URI_CURRENT_SOAP_ENC;
+ encodingStyle = Constants.URI_DEFAULT_SOAP_ENC;
// This came from parsing XML, so we need to deserialize it sometime
needDeser = true;
@@ -122,7 +122,7 @@
this.setNamespaceURI(namespace);
this.name = methodName;
- encodingStyle = Constants.NS_URI_CURRENT_SOAP_ENC;
+ encodingStyle = Constants.URI_DEFAULT_SOAP_ENC;
for (int i = 0; args != null && i < args.length; i++) {
if (args[i] instanceof RPCParam) {
@@ -137,7 +137,7 @@
public RPCElement(String methodName)
{
- encodingStyle = Constants.NS_URI_CURRENT_SOAP_ENC;
+ encodingStyle = Constants.URI_DEFAULT_SOAP_ENC;
this.name = methodName;
}
@@ -216,7 +216,7 @@
if (operations != null) {
rpcHandler.setOperation(operations[0]);
}
-
+
if (elementIsFirstParam) {
context.pushElementHandler(rpcHandler);
context.setCurElement(null);
1.43 +1 -1 xml-axis/java/src/org/apache/axis/message/RPCHandler.java
Index: RPCHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/RPCHandler.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- RPCHandler.java 30 May 2002 23:46:02 -0000 1.42
+++ RPCHandler.java 31 May 2002 19:08:09 -0000 1.43
@@ -211,7 +211,7 @@
}
- String isNil = attributes.getValue(Constants.NS_URI_2001_SCHEMA_XSI,
+ String isNil = attributes.getValue(Constants.URI_2001_SCHEMA_XSI,
"nil");
if ( isNil != null && isNil.equals("true") )
1.70 +2 -2 xml-axis/java/src/org/apache/axis/message/SOAPEnvelope.java
Index: SOAPEnvelope.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPEnvelope.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- SOAPEnvelope.java 30 May 2002 23:46:02 -0000 1.69
+++ SOAPEnvelope.java 31 May 2002 19:08:09 -0000 1.70
@@ -124,9 +124,9 @@
namespaces.add(new Mapping(soapConstants.getEnvelopeURI(),
Constants.NS_PREFIX_SOAP_ENV));
- namespaces.add(new Mapping(Constants.NS_URI_CURRENT_SCHEMA_XSD,
+ namespaces.add(new Mapping(Constants.URI_DEFAULT_SCHEMA_XSD,
Constants.NS_PREFIX_SCHEMA_XSD));
- namespaces.add(new Mapping(Constants.NS_URI_CURRENT_SCHEMA_XSI,
+ namespaces.add(new Mapping(Constants.URI_DEFAULT_SCHEMA_XSI,
Constants.NS_PREFIX_SCHEMA_XSI));
}
1.24 +1 -1 xml-axis/java/src/org/apache/axis/message/SOAPFaultElement.java
Index: SOAPFaultElement.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPFaultElement.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- SOAPFaultElement.java 30 May 2002 03:06:11 -0000 1.23
+++ SOAPFaultElement.java 31 May 2002 19:08:09 -0000 1.24
@@ -83,7 +83,7 @@
public SOAPFaultElement(AxisFault fault)
{
this.fault = fault;
- namespaceURI = Constants.NS_URI_SOAP_ENV;
+ namespaceURI = Constants.URI_SOAP11_ENV;
name = Constants.ELEM_FAULT;
}
1.42 +4 -4 xml-axis/java/src/org/apache/axis/message/SOAPHeader.java
Index: SOAPHeader.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPHeader.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- SOAPHeader.java 16 May 2002 12:54:36 -0000 1.41
+++ SOAPHeader.java 31 May 2002 19:08:09 -0000 1.42
@@ -138,7 +138,7 @@
SOAPHeaderElement header = (SOAPHeaderElement)i.next();
String headerActor = header.getActor();
// Allow NEXT's and any headers with matching actor
- if (Constants.ACTOR_NEXT.equals(headerActor) ||
+ if (Constants.URI_SOAP11_NEXT_ACTOR.equals(headerActor) ||
(actor == headerActor) ||
(actor != null && actor.equals(headerActor))) {
results.add(header);
@@ -172,7 +172,7 @@
while (i.hasNext()) {
SOAPHeaderElement header = (SOAPHeaderElement)i.next();
// Always process NEXT's, and then anything else in our list
- if (Constants.ACTOR_NEXT.equals(header.getActor()) ||
+ if (Constants.URI_SOAP11_NEXT_ACTOR.equals(header.getActor()) ||
(actors != null && actors.contains(header.getActor()))) {
results.add(header);
}
@@ -218,7 +218,7 @@
String actor = header.getActor();
ArrayList actors = mc.getAxisEngine().getActorURIs();
if ((actor != null) &&
- !Constants.ACTOR_NEXT.equals(actor) &&
+ !Constants.URI_SOAP11_NEXT_ACTOR.equals(actor) &&
(actors == null || !actors.contains(actor))) {
header = null;
}
@@ -287,7 +287,7 @@
String actor = header.getActor();
if ((actor != null) &&
- !Constants.ACTOR_NEXT.equals(actor) &&
+ !Constants.URI_SOAP11_NEXT_ACTOR.equals(actor) &&
(actors == null || !actors.contains(actor))) {
continue;
}
1.4 +4 -4 xml-axis/java/src/org/apache/axis/message/SOAPHeaderElement.java
Index: SOAPHeaderElement.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPHeaderElement.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SOAPHeaderElement.java 30 May 2002 03:06:11 -0000 1.3
+++ SOAPHeaderElement.java 31 May 2002 19:08:09 -0000 1.4
@@ -103,11 +103,11 @@
public SOAPHeaderElement(Element elem)
{
super(elem);
- String val = elem.getAttributeNS(Constants.NS_URI_SOAP_ENV,
+ String val = elem.getAttributeNS(Constants.URI_SOAP11_ENV,
Constants.ATTR_MUST_UNDERSTAND);
mustUnderstand = ((val != null) && val.equals("1")) ? true : false;
- actor = elem.getAttributeNS(Constants.NS_URI_SOAP_ENV,
+ actor = elem.getAttributeNS(Constants.URI_SOAP11_ENV,
Constants.ATTR_ACTOR);
}
@@ -150,7 +150,7 @@
// Instead of doing this can we hang out until serialization time
// and do it there, so that we can then resolve SOAP version?
- setAttribute(Constants.NS_URI_SOAP_ENV,
+ setAttribute(Constants.URI_SOAP11_ENV,
Constants.ATTR_MUST_UNDERSTAND,
val);
}
@@ -161,7 +161,7 @@
// Instead of doing this can we hang out until serialization time
// and do it there, so that we can then resolve SOAP version?
- setAttribute(Constants.NS_URI_SOAP_ENV, Constants.ATTR_ACTOR, a);
+ setAttribute(Constants.URI_SOAP11_ENV, Constants.ATTR_ACTOR, a);
}
public void setProcessed(boolean value) {
1.56 +14 -14 xml-axis/java/src/org/apache/axis/providers/java/JavaProvider.java
Index: JavaProvider.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/providers/java/JavaProvider.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- JavaProvider.java 30 May 2002 03:06:11 -0000 1.55
+++ JavaProvider.java 31 May 2002 19:08:09 -0000 1.56
@@ -116,7 +116,7 @@
throws Exception
{
String serviceName = msgContext.getService().getName();
-
+
// scope can be "Request", "Session", "Application"
// (as with Apache SOAP)
String scope = (String)service.getOption("scope");
@@ -258,7 +258,7 @@
if ((allowedMethods == null) || allowedMethods.equals("")) {
throw new AxisFault("Server.NoMethodConfig",
- JavaUtils.getMessage("noOption00",
+ JavaUtils.getMessage("noOption00",
OPTION_ALLOWEDMETHODS, serviceName),
null, null);
}
@@ -314,17 +314,17 @@
log.debug( JavaUtils.getMessage("toAxisFault00"), exp);
throw AxisFault.makeFault(exp);
}
-
+
if (log.isDebugEnabled())
log.debug("Exit: JavaProvider::invoke (" + this + ")");
}
/**
* Generate the WSDL for this service.
- *
- * Put in the "WSDL" property of the message context
+ *
+ * Put in the "WSDL" property of the message context
* as a org.w3c.dom.Document
- */
+ */
public void generateWSDL(MessageContext msgContext) throws AxisFault {
if (log.isDebugEnabled())
log.debug("Enter: JavaProvider::generateWSDL (" + this + ")");
@@ -363,14 +363,14 @@
if (axisConfig != null) {
allowedMethods = axisConfig.getAllowedMethods();
}
-
+
Emitter emitter = new Emitter();
-
+
// service alias may be provided if exact naming is required,
- // otherwise Axis will name it according to the implementing class name
+ // otherwise Axis will name it according to the implementing class name
String alias = (String)service.getOption("alias");
if(alias != null) emitter.setServiceElementName(alias);
-
+
emitter.setMode(service.getStyle());
emitter.setClsSmart(cls,url);
emitter.setAllowedMethods(allowedMethods);
@@ -378,7 +378,7 @@
emitter.setLocationUrl(url);
emitter.setServiceDesc(msgContext.getService().getInitializedServiceDesc(msgContext));
emitter.setTypeMapping((TypeMapping)msgContext.getTypeMappingRegistry().
- getTypeMapping(Constants.NS_URI_CURRENT_SOAP_ENC));
+ getTypeMapping(Constants.URI_DEFAULT_SOAP_ENC));
emitter.setDefaultTypeMapping((TypeMapping)msgContext.getTypeMappingRegistry().
getDefaultTypeMapping());
Document doc = emitter.emit(Emitter.MODE_ALL);
@@ -391,7 +391,7 @@
log.info( JavaUtils.getMessage("toAxisFault00"), e );
throw AxisFault.makeFault(e);
}
-
+
if (log.isDebugEnabled())
log.debug("Exit: JavaProvider::generateWSDL (" + this + ")");
}
@@ -445,10 +445,10 @@
{
return OPTION_CLASSNAME;
}
-
+
/**
* Returns the Class info about the service class.
- */
+ */
protected Class getServiceClass(MessageContext msgContext, String clsName)
throws Exception {
ClassLoader cl = msgContext.getClassLoader();
1.3 +5 -5 xml-axis/java/src/org/apache/axis/soap/SOAP11Constants.java
Index: SOAP11Constants.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/soap/SOAP11Constants.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SOAP11Constants.java 30 May 2002 03:06:11 -0000 1.2
+++ SOAP11Constants.java 31 May 2002 19:08:09 -0000 1.3
@@ -64,19 +64,19 @@
* @author Glen Daniels (gdaniels@apache.org)
*/
public class SOAP11Constants implements SOAPConstants {
- private static QName headerQName = new QName(Constants.NS_URI_SOAP_ENV,
+ private static QName headerQName = new QName(Constants.URI_SOAP11_ENV,
Constants.ELEM_HEADER);
- private static QName bodyQName = new QName(Constants.NS_URI_SOAP_ENV,
+ private static QName bodyQName = new QName(Constants.URI_SOAP11_ENV,
Constants.ELEM_BODY);
- private static QName faultQName = new QName(Constants.NS_URI_SOAP_ENV,
+ private static QName faultQName = new QName(Constants.URI_SOAP11_ENV,
Constants.ELEM_FAULT);
public String getEnvelopeURI() {
- return Constants.NS_URI_SOAP_ENV;
+ return Constants.URI_SOAP11_ENV;
}
public String getEncodingURI() {
- return Constants.NS_URI_SOAP_ENC;
+ return Constants.URI_SOAP11_ENC;
}
public QName getHeaderQName() {
1.3 +5 -5 xml-axis/java/src/org/apache/axis/soap/SOAP12Constants.java
Index: SOAP12Constants.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/soap/SOAP12Constants.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SOAP12Constants.java 30 May 2002 03:06:11 -0000 1.2
+++ SOAP12Constants.java 31 May 2002 19:08:09 -0000 1.3
@@ -64,19 +64,19 @@
* @author Glen Daniels (gdaniels@apache.org)
*/
public class SOAP12Constants implements SOAPConstants {
- private static QName headerQName = new QName(Constants.NS_URI_SOAP12_ENV,
+ private static QName headerQName = new QName(Constants.URI_SOAP12_ENV,
Constants.ELEM_HEADER);
- private static QName bodyQName = new QName(Constants.NS_URI_SOAP12_ENV,
+ private static QName bodyQName = new QName(Constants.URI_SOAP12_ENV,
Constants.ELEM_BODY);
- private static QName faultQName = new QName(Constants.NS_URI_SOAP12_ENV,
+ private static QName faultQName = new QName(Constants.URI_SOAP12_ENV,
Constants.ELEM_FAULT);
public String getEnvelopeURI() {
- return Constants.NS_URI_SOAP12_ENV;
+ return Constants.URI_SOAP12_ENV;
}
public String getEncodingURI() {
- return Constants.NS_URI_SOAP12_ENC;
+ return Constants.URI_SOAP12_ENC;
}
public QName getHeaderQName() {
1.111 +1 -1 xml-axis/java/src/org/apache/axis/utils/Admin.java
Index: Admin.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/Admin.java,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- Admin.java 30 May 2002 03:06:11 -0000 1.110
+++ Admin.java 31 May 2002 19:08:09 -0000 1.111
@@ -225,7 +225,7 @@
AxisEngine engine = msgContext.getAxisEngine();
// If this is WSDD, process it correctly.
- if (rootNS != null && rootNS.equals(WSDDConstants.NS_URI_WSDD)) {
+ if (rootNS != null && rootNS.equals(WSDDConstants.URI_WSDD)) {
return processWSDD(msgContext, engine, root);
}
1.38 +10 -10 xml-axis/java/src/org/apache/axis/wsdl/fromJava/Emitter.java
Index: Emitter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/fromJava/Emitter.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Emitter.java 30 May 2002 03:06:12 -0000 1.37
+++ Emitter.java 31 May 2002 19:08:09 -0000 1.38
@@ -428,7 +428,7 @@
}
encodingList = new ArrayList();
- encodingList.add(Constants.NS_URI_CURRENT_SOAP_ENC);
+ encodingList.add(Constants.URI_DEFAULT_SOAP_ENC);
// We want to produce valid SOAP 1.2 JAX-RPC
@@ -467,23 +467,23 @@
def.addNamespace("impl", implNS);
def.addNamespace(Constants.NS_PREFIX_WSDL_SOAP,
- Constants.NS_URI_CURRENT_WSDL_SOAP);
- namespaces.putPrefix(Constants.NS_URI_CURRENT_WSDL_SOAP,
+ Constants.URI_WSDL11_SOAP);
+ namespaces.putPrefix(Constants.URI_WSDL11_SOAP,
Constants.NS_PREFIX_WSDL_SOAP);
def.addNamespace(Constants.NS_PREFIX_WSDL,
- Constants.NS_URI_CURRENT_WSDL);
- namespaces.putPrefix(Constants.NS_URI_CURRENT_WSDL,
+ Constants.NS_URI_WSDL11);
+ namespaces.putPrefix(Constants.NS_URI_WSDL11,
Constants.NS_PREFIX_WSDL);
def.addNamespace(Constants.NS_PREFIX_SOAP_ENC,
- Constants.NS_URI_CURRENT_SOAP_ENC);
- namespaces.putPrefix(Constants.NS_URI_CURRENT_SOAP_ENC,
+ Constants.URI_DEFAULT_SOAP_ENC);
+ namespaces.putPrefix(Constants.URI_DEFAULT_SOAP_ENC,
Constants.NS_PREFIX_SOAP_ENC);
def.addNamespace(Constants.NS_PREFIX_SCHEMA_XSD,
- Constants.NS_URI_CURRENT_SCHEMA_XSD);
- namespaces.putPrefix(Constants.NS_URI_CURRENT_SCHEMA_XSD,
+ Constants.URI_DEFAULT_SCHEMA_XSD);
+ namespaces.putPrefix(Constants.URI_DEFAULT_SCHEMA_XSD,
Constants.NS_PREFIX_SCHEMA_XSD);
}
@@ -522,7 +522,7 @@
SOAPBinding soapBinding = new SOAPBindingImpl();
String modeStr = (mode == MODE_RPC) ? "rpc" : "document";
soapBinding.setStyle(modeStr);
- soapBinding.setTransportURI(Constants.NS_URI_SOAP_HTTP);
+ soapBinding.setTransportURI(Constants.URI_SOAP11_HTTP);
binding.addExtensibilityElement(soapBinding);
1.30 +2 -2 xml-axis/java/src/org/apache/axis/wsdl/fromJava/Types.java
Index: Types.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/fromJava/Types.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Types.java 30 May 2002 18:55:21 -0000 1.29
+++ Types.java 31 May 2002 19:08:10 -0000 1.30
@@ -298,7 +298,7 @@
if (schemaElem == null) {
schemaElem = docHolder.createElement("schema");
wsdlTypesElem.appendChild(schemaElem);
- schemaElem.setAttribute("xmlns", Constants.NS_URI_CURRENT_SCHEMA_XSD);
+ schemaElem.setAttribute("xmlns", Constants.URI_DEFAULT_SCHEMA_XSD);
schemaElem.setAttribute("targetNamespace", qName.getNamespaceURI());
}
schemaElem.appendChild(element);
@@ -312,7 +312,7 @@
if (wsdlTypesElem == null) {
// Create a <wsdl:types> element corresponding to the wsdl namespaces.
wsdlTypesElem =
- docHolder.createElementNS(Constants.NS_URI_CURRENT_WSDL, "types");
+ docHolder.createElementNS(Constants.NS_URI_WSDL11, "types");
wsdlTypesElem.setPrefix(Constants.NS_PREFIX_WSDL);
}
}
1.6 +2 -2 xml-axis/java/src/org/apache/axis/wsdl/symbolTable/Utils.java
Index: Utils.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/Utils.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Utils.java 30 May 2002 23:46:02 -0000 1.5
+++ Utils.java 31 May 2002 19:08:10 -0000 1.6
@@ -99,11 +99,11 @@
localName.equals("double") ||
localName.equals("boolean") ||
localName.equals("byte")) {
- rc.setNamespaceURI(Constants.NS_URI_CURRENT_SOAP_ENC);
+ rc.setNamespaceURI(Constants.URI_DEFAULT_SOAP_ENC);
}
else if (localName.equals("base64Binary") ||
localName.equals("hexBinary")) {
- rc.setNamespaceURI(Constants.NS_URI_CURRENT_SOAP_ENC);
+ rc.setNamespaceURI(Constants.URI_DEFAULT_SOAP_ENC);
rc.setLocalPart("base64");
}
}
1.44 +1 -1 xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
Index: JavaDeployWriter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaDeployWriter.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- JavaDeployWriter.java 30 May 2002 18:55:21 -0000 1.43
+++ JavaDeployWriter.java 31 May 2002 19:08:10 -0000 1.44
@@ -198,7 +198,7 @@
String deserializerFactory;
String encodingStyle = "";
if (!hasLiteral) {
- encodingStyle = Constants.NS_URI_CURRENT_SOAP_ENC;
+ encodingStyle = Constants.URI_DEFAULT_SOAP_ENC;
}
if (javaType.endsWith("[]")) {
1.64 +1 -5 xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaStubWriter.java
Index: JavaStubWriter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaStubWriter.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- JavaStubWriter.java 30 May 2002 18:55:21 -0000 1.63
+++ JavaStubWriter.java 31 May 2002 19:08:10 -0000 1.64
@@ -85,13 +85,9 @@
import org.apache.axis.wsdl.symbolTable.DefinedElement;
import org.apache.axis.wsdl.symbolTable.Parameter;
import org.apache.axis.wsdl.symbolTable.Parameters;
-import org.apache.axis.wsdl.symbolTable.PortTypeEntry;
-import org.apache.axis.wsdl.symbolTable.SchemaUtils;
import org.apache.axis.wsdl.symbolTable.SymbolTable;
import org.apache.axis.wsdl.symbolTable.TypeEntry;
-import org.w3c.dom.Node;
-
/**
* This is Wsdl2java's stub writer. It writes the <BindingName>Stub.java
* file which contains the <bindingName>Stub class.
@@ -210,7 +206,7 @@
if (bEntry.hasLiteral()) {
pw.println(" call.setEncodingStyle(null);");
} else {
- pw.println(" call.setEncodingStyle(org.apache.axis.Constants.NS_URI_SOAP_ENC);");
+ pw.println(" call.setEncodingStyle(org.apache.axis.Constants.URI_SOAP11_ENC);");
}
pw.println(" for (int i = 0; i < cachedSerFactories.size(); ++i) {");
1.15 +3 -3 xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaWriter.java
Index: JavaWriter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaWriter.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JavaWriter.java 30 May 2002 03:06:13 -0000 1.14
+++ JavaWriter.java 31 May 2002 19:08:10 -0000 1.15
@@ -290,13 +290,13 @@
pw.println();
if ("deploy".equals(deploymentOpName)) {
pw.println("<deployment");
- pw.println(" xmlns=\"" + WSDDConstants.NS_URI_WSDD +"\"");
+ pw.println(" xmlns=\"" + WSDDConstants.URI_WSDD +"\"");
pw.println(" xmlns:" + WSDDConstants.NS_PREFIX_WSDD_JAVA + "=\"" +
- WSDDConstants.NS_URI_WSDD_JAVA +"\">");
+ WSDDConstants.URI_WSDD_JAVA +"\">");
}
else {
pw.println("<undeployment");
- pw.println(" xmlns=\"" + WSDDConstants.NS_URI_WSDD +"\">");
+ pw.println(" xmlns=\"" + WSDDConstants.URI_WSDD +"\">");
}
} // initializeDeploymentDoc
1.39 +2 -2 xml-axis/java/test/RPCDispatch/TestRPC.java
Index: TestRPC.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/RPCDispatch/TestRPC.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- TestRPC.java 30 May 2002 03:06:13 -0000 1.38
+++ TestRPC.java 31 May 2002 19:08:10 -0000 1.39
@@ -36,8 +36,8 @@
"<soap:Envelope " +
"xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" " +
"xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\" " +
- "xmlns:xsi=\"" + Constants.NS_URI_CURRENT_SCHEMA_XSI + "\" " +
- "xmlns:xsd=\"" + Constants.NS_URI_CURRENT_SCHEMA_XSD + "\">\n" +
+ "xmlns:xsi=\"" + Constants.URI_DEFAULT_SCHEMA_XSI + "\" " +
+ "xmlns:xsd=\"" + Constants.URI_DEFAULT_SCHEMA_XSD + "\">\n" +
"<soap:Body>\n";
private final String footer =
1.34 +4 -4 xml-axis/java/test/RPCDispatch/TestSerializedRPC.java
Index: TestSerializedRPC.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/RPCDispatch/TestSerializedRPC.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- TestSerializedRPC.java 30 May 2002 03:06:13 -0000 1.33
+++ TestSerializedRPC.java 31 May 2002 19:08:10 -0000 1.34
@@ -35,8 +35,8 @@
"<soap:Envelope " +
"xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" " +
"xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\" " +
- "xmlns:xsi=\"" + Constants.NS_URI_CURRENT_SCHEMA_XSI + "\" " +
- "xmlns:xsd=\"" + Constants.NS_URI_CURRENT_SCHEMA_XSD + "\">\n" +
+ "xmlns:xsi=\"" + Constants.URI_DEFAULT_SCHEMA_XSI + "\" " +
+ "xmlns:xsd=\"" + Constants.URI_DEFAULT_SCHEMA_XSD + "\">\n" +
"<soap:Body>\n";
private final String footer =
@@ -68,10 +68,10 @@
BeanDeserializerFactory df = new BeanDeserializerFactory(javaType, xmlType);
TypeMappingRegistry tmr = engine.getTypeMappingRegistry();
- TypeMapping tm = (TypeMapping) tmr.getTypeMapping(Constants.NS_URI_CURRENT_SOAP_ENC);
+ TypeMapping tm = (TypeMapping) tmr.getTypeMapping(Constants.URI_DEFAULT_SOAP_ENC);
if (tm == null || tm == tmr.getDefaultTypeMapping()) {
tm = (TypeMapping) tmr.createTypeMapping();
- tmr.register(Constants.NS_URI_CURRENT_SOAP_ENC, tm);
+ tmr.register(Constants.URI_DEFAULT_SOAP_ENC, tm);
}
tm.register(javaType, xmlType, sf, df);
1.10 +4 -4 xml-axis/java/test/encoding/TestAttributes.java
Index: TestAttributes.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestAttributes.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TestAttributes.java 30 May 2002 03:06:13 -0000 1.9
+++ TestAttributes.java 31 May 2002 19:08:10 -0000 1.10
@@ -75,8 +75,8 @@
TypeMappingRegistry reg = context.getTypeMappingRegistry();
TypeMapping tm = (TypeMapping) reg.createTypeMapping();
// The "" namespace is literal (no encoding).
- tm.setSupportedEncodings(new String[] {Constants.NS_URI_CURRENT_SOAP_ENC});
- reg.register(Constants.NS_URI_CURRENT_SOAP_ENC, tm);
+ tm.setSupportedEncodings(new String[] {Constants.URI_DEFAULT_SOAP_ENC});
+ reg.register(Constants.URI_DEFAULT_SOAP_ENC, tm);
QName beanQName = new QName("typeNS", "TheBean");
tm.register(AttributeBean.class,
@@ -131,8 +131,8 @@
TypeMappingRegistry reg = context.getTypeMappingRegistry();
TypeMapping tm = (TypeMapping) reg.createTypeMapping();
// The "" namespace is literal (no encoding).
- tm.setSupportedEncodings(new String[] {Constants.NS_URI_CURRENT_SOAP_ENC});
- reg.register(Constants.NS_URI_CURRENT_SOAP_ENC, tm);
+ tm.setSupportedEncodings(new String[] {Constants.URI_DEFAULT_SOAP_ENC});
+ reg.register(Constants.URI_DEFAULT_SOAP_ENC, tm);
QName beanQName = new QName("typeNS", "Bean");
tm.register(SimpleBean.class,
1.6 +4 -4 xml-axis/java/test/encoding/TestBeanDeser.java
Index: TestBeanDeser.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestBeanDeser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestBeanDeser.java 30 May 2002 03:06:13 -0000 1.5
+++ TestBeanDeser.java 31 May 2002 19:08:10 -0000 1.6
@@ -30,8 +30,8 @@
private AxisServer server = new AxisServer();
public TestBeanDeser(String name) {
- this(name, Constants.NS_URI_CURRENT_SCHEMA_XSI,
- Constants.NS_URI_CURRENT_SCHEMA_XSD);
+ this(name, Constants.URI_DEFAULT_SCHEMA_XSI,
+ Constants.URI_DEFAULT_SCHEMA_XSD);
}
public TestBeanDeser(String name, String NS_XSI, String NS_XSD) {
@@ -54,8 +54,8 @@
TypeMappingRegistry tmr = server.getTypeMappingRegistry();
TypeMapping tm = (TypeMapping) tmr.createTypeMapping();
- tm.setSupportedEncodings(new String[]{Constants.NS_URI_CURRENT_SOAP_ENC});
- tmr.register(Constants.NS_URI_CURRENT_SOAP_ENC, tm);
+ tm.setSupportedEncodings(new String[]{Constants.URI_DEFAULT_SOAP_ENC});
+ tmr.register(Constants.URI_DEFAULT_SOAP_ENC, tm);
tm.register(test.encoding.RETURN.class,
new QName("urn:test.encoding", "RETURN"),
new org.apache.axis.encoding.ser.BeanSerializerFactory(
1.36 +4 -4 xml-axis/java/test/encoding/TestDeser.java
Index: TestDeser.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestDeser.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- TestDeser.java 30 May 2002 03:06:13 -0000 1.35
+++ TestDeser.java 31 May 2002 19:08:10 -0000 1.36
@@ -37,8 +37,8 @@
private AxisServer server = new AxisServer();
public TestDeser(String name) {
- this(name, Constants.NS_URI_CURRENT_SCHEMA_XSI,
- Constants.NS_URI_CURRENT_SCHEMA_XSD);
+ this(name, Constants.URI_DEFAULT_SCHEMA_XSI,
+ Constants.URI_DEFAULT_SCHEMA_XSD);
}
public TestDeser(String name, String NS_XSI, String NS_XSD) {
@@ -62,8 +62,8 @@
TypeMappingRegistry tmr = server.getTypeMappingRegistry();
TypeMapping tm = (TypeMapping) tmr.createTypeMapping();
- tm.setSupportedEncodings(new String[] {Constants.NS_URI_CURRENT_SOAP_ENC});
- tmr.register(Constants.NS_URI_CURRENT_SOAP_ENC, tm);
+ tm.setSupportedEncodings(new String[] {Constants.URI_DEFAULT_SOAP_ENC});
+ tmr.register(Constants.URI_DEFAULT_SOAP_ENC, tm);
tm.register(java.lang.String[].class,
new QName("urn:me", "ArrayOfString"),
new org.apache.axis.encoding.ser.ArraySerializerFactory(),
1.5 +2 -2 xml-axis/java/test/encoding/TestDeser1999.java
Index: TestDeser1999.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestDeser1999.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestDeser1999.java 30 May 2002 23:46:03 -0000 1.4
+++ TestDeser1999.java 31 May 2002 19:08:10 -0000 1.5
@@ -8,7 +8,7 @@
public class TestDeser1999 extends TestDeser {
public TestDeser1999(String name) {
- super(name, Constants.NS_URI_1999_SCHEMA_XSI,
- Constants.NS_URI_1999_SCHEMA_XSD);
+ super(name, Constants.URI_1999_SCHEMA_XSI,
+ Constants.URI_1999_SCHEMA_XSD);
}
}
1.5 +2 -2 xml-axis/java/test/encoding/TestDeser2000.java
Index: TestDeser2000.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestDeser2000.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestDeser2000.java 30 May 2002 03:06:13 -0000 1.4
+++ TestDeser2000.java 31 May 2002 19:08:10 -0000 1.5
@@ -8,7 +8,7 @@
public class TestDeser2000 extends TestDeser {
public TestDeser2000(String name) {
- super(name, Constants.NS_URI_2000_SCHEMA_XSI,
- Constants.NS_URI_2000_SCHEMA_XSD);
+ super(name, Constants.URI_2000_SCHEMA_XSI,
+ Constants.URI_2000_SCHEMA_XSD);
}
}
1.13 +2 -2 xml-axis/java/test/encoding/TestDeser2001.java
Index: TestDeser2001.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestDeser2001.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TestDeser2001.java 30 May 2002 03:06:13 -0000 1.12
+++ TestDeser2001.java 31 May 2002 19:08:10 -0000 1.13
@@ -16,8 +16,8 @@
public class TestDeser2001 extends TestDeser {
public TestDeser2001(String name) {
- super(name, Constants.NS_URI_2001_SCHEMA_XSI,
- Constants.NS_URI_2001_SCHEMA_XSD);
+ super(name, Constants.URI_2001_SCHEMA_XSI,
+ Constants.URI_2001_SCHEMA_XSD);
}
/**
1.19 +2 -2 xml-axis/java/test/encoding/TestHrefs.java
Index: TestHrefs.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestHrefs.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- TestHrefs.java 30 May 2002 03:06:13 -0000 1.18
+++ TestHrefs.java 31 May 2002 19:08:10 -0000 1.19
@@ -23,8 +23,8 @@
private String [] messageParts;
public TestHrefs(String name) {
- this(name, Constants.NS_URI_CURRENT_SCHEMA_XSI,
- Constants.NS_URI_CURRENT_SCHEMA_XSD);
+ this(name, Constants.URI_DEFAULT_SCHEMA_XSI,
+ Constants.URI_DEFAULT_SCHEMA_XSD);
}
public TestHrefs(String name, String NS_XSI, String NS_XSD) {
1.3 +2 -2 xml-axis/java/test/encoding/TestOmittedValues.java
Index: TestOmittedValues.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestOmittedValues.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestOmittedValues.java 30 May 2002 03:06:13 -0000 1.2
+++ TestOmittedValues.java 31 May 2002 19:08:10 -0000 1.3
@@ -87,8 +87,8 @@
"xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" " +
"xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\" " +
"xmlns:me=\"urn:me\" " +
- "xmlns:xsi=\"" + Constants.NS_URI_2001_SCHEMA_XSI + "\" " +
- "xmlns:xsd=\"" + Constants.NS_URI_2001_SCHEMA_XSD + "\">\n" +
+ "xmlns:xsi=\"" + Constants.URI_2001_SCHEMA_XSI + "\" " +
+ "xmlns:xsd=\"" + Constants.URI_2001_SCHEMA_XSD + "\">\n" +
"<soap:Body>\n" +
"<method>\n";
1.4 +2 -2 xml-axis/java/test/encoding/TestOutputter.java
Index: TestOutputter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestOutputter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestOutputter.java 30 May 2002 03:06:14 -0000 1.3
+++ TestOutputter.java 31 May 2002 19:08:10 -0000 1.4
@@ -19,8 +19,8 @@
private AxisServer server = new AxisServer();
public TestOutputter(String name) {
- this(name, Constants.NS_URI_CURRENT_SCHEMA_XSI,
- Constants.NS_URI_CURRENT_SCHEMA_XSD);
+ this(name, Constants.URI_DEFAULT_SCHEMA_XSI,
+ Constants.URI_DEFAULT_SCHEMA_XSD);
}
public TestOutputter(String name, String NS_XSI, String NS_XSD) {
1.5 +4 -4 xml-axis/java/test/encoding/TestRoundTrip.java
Index: TestRoundTrip.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestRoundTrip.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestRoundTrip.java 30 May 2002 03:06:14 -0000 1.4
+++ TestRoundTrip.java 31 May 2002 19:08:11 -0000 1.5
@@ -50,16 +50,16 @@
"</ser-root:SrvResponse>";
public TestRoundTrip(String name) {
- this(name, Constants.NS_URI_CURRENT_SCHEMA_XSI,
- Constants.NS_URI_CURRENT_SCHEMA_XSD);
+ this(name, Constants.URI_DEFAULT_SCHEMA_XSI,
+ Constants.URI_DEFAULT_SCHEMA_XSD);
}
public TestRoundTrip(String name, String NS_XSI, String NS_XSD) {
super(name);
TypeMappingRegistry tmr = server.getTypeMappingRegistry();
TypeMapping tm = (TypeMapping) tmr.createTypeMapping();
- tm.setSupportedEncodings(new String[]{Constants.NS_URI_CURRENT_SOAP_ENC});
- tmr.register(Constants.NS_URI_CURRENT_SOAP_ENC, tm);
+ tm.setSupportedEncodings(new String[]{Constants.URI_DEFAULT_SOAP_ENC});
+ tmr.register(Constants.URI_DEFAULT_SOAP_ENC, tm);
tm.register(test.encoding.RETURN.class,
new QName("urn:test.encoding", "RETURN"),
new org.apache.axis.encoding.ser.BeanSerializerFactory(
1.27 +2 -2 xml-axis/java/test/encoding/TestSer.java
Index: TestSer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestSer.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- TestSer.java 30 May 2002 23:46:03 -0000 1.26
+++ TestSer.java 31 May 2002 19:08:11 -0000 1.27
@@ -62,8 +62,8 @@
// Create a TypeMapping and register the specialized Type Mapping
TypeMappingRegistry reg = context.getTypeMappingRegistry();
TypeMapping tm = (TypeMapping) reg.createTypeMapping();
- tm.setSupportedEncodings(new String[] {Constants.NS_URI_CURRENT_SOAP_ENC});
- reg.register(Constants.NS_URI_CURRENT_SOAP_ENC, tm);
+ tm.setSupportedEncodings(new String[] {Constants.URI_DEFAULT_SOAP_ENC});
+ reg.register(Constants.URI_DEFAULT_SOAP_ENC, tm);
QName dataQName = new QName("typeNS", "Data");
tm.register(Data.class, dataQName, new DataSerFactory(), new DataDeserFactory());
1.3 +2 -2 xml-axis/java/test/functional/TestJWSGlobalTypes.java
Index: TestJWSGlobalTypes.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/functional/TestJWSGlobalTypes.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestJWSGlobalTypes.java 30 May 2002 03:06:14 -0000 1.2
+++ TestJWSGlobalTypes.java 31 May 2002 19:08:11 -0000 1.3
@@ -71,8 +71,8 @@
public class TestJWSGlobalTypes extends TestCase {
private static final String TYPEMAPPING_WSDD =
- "<deployment xmlns=\"" + WSDDConstants.NS_URI_WSDD + "\" " +
- "xmlns:java=\"" + WSDDConstants.NS_URI_WSDD_JAVA + "\" " +
+ "<deployment xmlns=\"" + WSDDConstants.URI_WSDD + "\" " +
+ "xmlns:java=\"" + WSDDConstants.URI_WSDD_JAVA + "\" " +
"xmlns:ns=\"http://globalTypeTest\">\n" +
" <beanMapping type=\"java:test.functional.GlobalBean\" " +
"qname=\"ns:GlobalType\"/>\n" +
1.11 +1 -1 xml-axis/java/test/functional/TestMiscSample.java
Index: TestMiscSample.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/functional/TestMiscSample.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TestMiscSample.java 30 May 2002 03:06:14 -0000 1.10
+++ TestMiscSample.java 31 May 2002 19:08:11 -0000 1.11
@@ -74,7 +74,7 @@
static final String deployDoc =
"<deployment xmlns=\"http://xml.apache.org/axis/wsdd/\" " +
- "xmlns:java=\"" + WSDDConstants.NS_URI_WSDD_JAVA + "\">\n" +
+ "xmlns:java=\"" + WSDDConstants.URI_WSDD_JAVA + "\">\n" +
" <service name=\"EchoService\" provider=\"Handler\">\n" +
" <parameter name=\"handlerClass\" " +
" value=\"org.apache.axis.handlers.EchoHandler\"/>\n" +
1.14 +2 -2 xml-axis/java/test/outparams/TestOutParams.java
Index: TestOutParams.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/outparams/TestOutParams.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TestOutParams.java 30 May 2002 03:06:14 -0000 1.13
+++ TestOutParams.java 31 May 2002 19:08:11 -0000 1.14
@@ -33,8 +33,8 @@
"<soap:Envelope " +
"xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" " +
"xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\" " +
- "xmlns:xsi=\"" + Constants.NS_URI_CURRENT_SCHEMA_XSI + "\" " +
- "xmlns:xsd=\"" + Constants.NS_URI_CURRENT_SCHEMA_XSD + "\">\n" +
+ "xmlns:xsi=\"" + Constants.URI_DEFAULT_SCHEMA_XSI + "\" " +
+ "xmlns:xsd=\"" + Constants.URI_DEFAULT_SCHEMA_XSD + "\">\n" +
"<soap:Body>\n" +
"<ns:someMethod xmlns:ns=\"" + serviceURN + "\"/>\n" +
"</soap:Body>\n" +
1.18 +1 -1 xml-axis/java/test/session/TestSimpleSession.java
Index: TestSimpleSession.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/session/TestSimpleSession.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TestSimpleSession.java 30 May 2002 03:06:15 -0000 1.17
+++ TestSimpleSession.java 31 May 2002 19:08:11 -0000 1.18
@@ -29,7 +29,7 @@
public class TestSimpleSession extends TestCase implements ServiceLifecycle {
static final String clientWSDD =
"<deployment xmlns=\"http://xml.apache.org/axis/wsdd/\" " +
- "xmlns:java=\"" + WSDDConstants.NS_URI_WSDD_JAVA + "\">\n" +
+ "xmlns:java=\"" + WSDDConstants.URI_WSDD_JAVA + "\">\n" +
" <handler type=\"java:org.apache.axis.handlers.SimpleSessionHandler\" " +
"name=\"SimpleSessionHandler\"/>\n" +
" <service name=\"sessionTest\">\n" +
1.5 +3 -3 xml-axis/java/test/soap/TestHeaderAttrs.java
Index: TestHeaderAttrs.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/soap/TestHeaderAttrs.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestHeaderAttrs.java 26 Mar 2002 16:40:35 -0000 1.4
+++ TestHeaderAttrs.java 31 May 2002 19:08:11 -0000 1.5
@@ -101,7 +101,7 @@
assertTrue("Bad result from test", runTest(badHeader, false));
// 2. MU header to NEXT -> should fail
- badHeader.setActor(Constants.ACTOR_NEXT);
+ badHeader.setActor(Constants.URI_SOAP11_NEXT_ACTOR);
badHeader.setMustUnderstand(true);
// Test (should produce MU failure)
@@ -124,7 +124,7 @@
*/
public void testNonMUBadHeader() throws Exception
{
- badHeader.setActor(Constants.ACTOR_NEXT);
+ badHeader.setActor(Constants.URI_SOAP11_NEXT_ACTOR);
badHeader.setMustUnderstand(false);
assertTrue("Non-MU bad header to next actor returned bad result!",
@@ -141,7 +141,7 @@
*/
public void testGoodHeader() throws Exception
{
- goodHeader.setActor(Constants.ACTOR_NEXT);
+ goodHeader.setActor(Constants.URI_SOAP11_NEXT_ACTOR);
assertTrue("Good header with next actor returned bad result!",
runTest(goodHeader, true));
}
1.3 +1 -1 xml-axis/java/test/wsdd/TestAdminService.java
Index: TestAdminService.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdd/TestAdminService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestAdminService.java 30 May 2002 03:06:15 -0000 1.2
+++ TestAdminService.java 31 May 2002 19:08:11 -0000 1.3
@@ -34,7 +34,7 @@
static final String deployDoc =
"<deployment xmlns=\"http://xml.apache.org/axis/wsdd/\" " +
- "xmlns:java=\"" + WSDDConstants.NS_URI_WSDD_JAVA + "\">\n" +
+ "xmlns:java=\"" + WSDDConstants.URI_WSDD_JAVA + "\">\n" +
" <handler type=\"java:org.apache.axis.handlers.LogHandler\" " +
"name=\"" + HANDLER_NAME + "\">\n" +
" <parameter name=\"" + PARAM_NAME +
1.3 +1 -1 xml-axis/java/test/wsdd/TestAllowedMethods.java
Index: TestAllowedMethods.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdd/TestAllowedMethods.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestAllowedMethods.java 30 May 2002 03:06:15 -0000 1.2
+++ TestAllowedMethods.java 31 May 2002 19:08:11 -0000 1.3
@@ -26,7 +26,7 @@
// Two-part WSDD, with a space for scope option in the middle
static final String doc1 =
"<deployment xmlns=\"http://xml.apache.org/axis/wsdd/\" " +
- "xmlns:java=\"" + WSDDConstants.NS_URI_WSDD_JAVA + "\">\n" +
+ "xmlns:java=\"" + WSDDConstants.URI_WSDD_JAVA + "\">\n" +
" <service name=\"" + SERVICE_NAME + "\" " +
"provider=\"java:RPC\">\n" +
" <parameter name=\"allowedMethods\" value=\"allowed\"/>" +
1.5 +2 -2 xml-axis/java/test/wsdd/TestBadWSDD.java
Index: TestBadWSDD.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdd/TestBadWSDD.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestBadWSDD.java 30 May 2002 03:06:15 -0000 1.4
+++ TestBadWSDD.java 31 May 2002 19:08:11 -0000 1.5
@@ -31,7 +31,7 @@
static final String goodWSDD =
"<deployment xmlns=\"http://xml.apache.org/axis/wsdd/\" " +
- "xmlns:java=\"" + WSDDConstants.NS_URI_WSDD_JAVA + "\">\n" +
+ "xmlns:java=\"" + WSDDConstants.URI_WSDD_JAVA + "\">\n" +
" <handler type=\"java:org.apache.axis.handlers.LogHandler\" " +
"name=\"" + HANDLER_NAME + "\">\n" +
" <parameter name=\"" + PARAM_NAME +
@@ -48,7 +48,7 @@
static final String header =
"<deployment xmlns=\"http://xml.apache.org/axis/wsdd/\" " +
- "xmlns:java=\"" + WSDDConstants.NS_URI_WSDD_JAVA + "\">\n";
+ "xmlns:java=\"" + WSDDConstants.URI_WSDD_JAVA + "\">\n";
static final String footer =
"</deployment>";
1.3 +1 -1 xml-axis/java/test/wsdd/TestOptions.java
Index: TestOptions.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdd/TestOptions.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestOptions.java 30 May 2002 03:06:15 -0000 1.2
+++ TestOptions.java 31 May 2002 19:08:11 -0000 1.3
@@ -20,7 +20,7 @@
// Two-part WSDD, with a space for scope option in the middle
static final String doc =
"<deployment xmlns=\"http://xml.apache.org/axis/wsdd/\" " +
- "xmlns:java=\"" + WSDDConstants.NS_URI_WSDD_JAVA + "\">\n" +
+ "xmlns:java=\"" + WSDDConstants.URI_WSDD_JAVA + "\">\n" +
" <handler type=\"java:org.apache.axis.handlers.LogHandler\" " +
"name=\"" + HANDLER_NAME + "\">\n" +
" <parameter name=\"" + PARAM_NAME +
1.3 +1 -1 xml-axis/java/test/wsdd/TestScopeOption.java
Index: TestScopeOption.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdd/TestScopeOption.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestScopeOption.java 30 May 2002 03:06:15 -0000 1.2
+++ TestScopeOption.java 31 May 2002 19:08:11 -0000 1.3
@@ -18,7 +18,7 @@
// Two-part WSDD, with a space for scope option in the middle
static final String doc1 =
"<deployment xmlns=\"http://xml.apache.org/axis/wsdd/\" " +
- "xmlns:java=\"" + WSDDConstants.NS_URI_WSDD_JAVA + "\">\n" +
+ "xmlns:java=\"" + WSDDConstants.URI_WSDD_JAVA + "\">\n" +
" <handler type=\"java:org.apache.axis.handlers.LogHandler\" " +
"name=\"" + HANDLER_NAME + "\" " +
"scope=\"";
1.5 +1 -1 xml-axis/java/test/wsdd/TestUndeployment.java
Index: TestUndeployment.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdd/TestUndeployment.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestUndeployment.java 30 May 2002 03:06:15 -0000 1.4
+++ TestUndeployment.java 31 May 2002 19:08:11 -0000 1.5
@@ -32,7 +32,7 @@
static final String deployDoc =
"<deployment xmlns=\"http://xml.apache.org/axis/wsdd/\" " +
- "xmlns:java=\"" + WSDDConstants.NS_URI_WSDD_JAVA + "\">\n" +
+ "xmlns:java=\"" + WSDDConstants.URI_WSDD_JAVA + "\">\n" +
" <handler type=\"java:org.apache.axis.handlers.LogHandler\" " +
"name=\"" + HANDLER_NAME + "\">\n" +
" <parameter name=\"" + PARAM_NAME +
1.2 +1 -1 xml-axis/java/test/wsdl/_import/Import.xsd
Index: Import.xsd
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/_import/Import.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Import.xsd 16 Jan 2002 14:07:59 -0000 1.1
+++ Import.xsd 31 May 2002 19:08:12 -0000 1.2
@@ -2,7 +2,7 @@
<schema
targetNamespace="urn:types.import.test"
xmlns:tns="urn:types.import.test"
- xmlns="http://www.w3.org/2001/XMLSchema/">
+ xmlns="http://www.w3.org/2001/XMLSchema">
<import
schemaLocation="Phone.xsd"
1.2 +1 -1 xml-axis/java/test/wsdl/_import/ImportMessagesXSDImport.wsdl
Index: ImportMessagesXSDImport.wsdl
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/_import/ImportMessagesXSDImport.wsdl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ImportMessagesXSDImport.wsdl 8 Apr 2002 17:33:53 -0000 1.1
+++ ImportMessagesXSDImport.wsdl 31 May 2002 19:08:12 -0000 1.2
@@ -10,7 +10,7 @@
<schema
targetNamespace="urn:types.import.test"
xmlns:tns="urn:types.import.test"
- xmlns="http://www.w3.org/2001/XMLSchema/">
+ xmlns="http://www.w3.org/2001/XMLSchema">
<import
schemaLocation="Phone.xsd"
1.2 +1 -1 xml-axis/java/test/wsdl/_import/Phone.xsd
Index: Phone.xsd
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/_import/Phone.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Phone.xsd 16 Jan 2002 14:07:59 -0000 1.1
+++ Phone.xsd 31 May 2002 19:08:12 -0000 1.2
@@ -2,7 +2,7 @@
<schema
targetNamespace="urn:types.import.test"
xmlns:tns="urn:types.import.test"
- xmlns="http://www.w3.org/2001/XMLSchema/">
+ xmlns="http://www.w3.org/2001/XMLSchema">
<complexType name="PhoneNumber">
<all>
1.3 +1 -1 xml-axis/java/test/wsdl/arrays/ArrayTest.wsdl
Index: ArrayTest.wsdl
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/arrays/ArrayTest.wsdl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ArrayTest.wsdl 21 Mar 2002 16:20:48 -0000 1.2
+++ ArrayTest.wsdl 31 May 2002 19:08:12 -0000 1.3
@@ -6,7 +6,7 @@
xmlns:typens="urn:ArrayTest2"
xmlns:xsd="http://www.w3.org/1999/XMLSchema"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding"
+ xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:soapy="http://xml.apache.org/xml-soap"
xmlns="http://schemas.xmlsoap.org/wsdl/">
1.2 +1 -1 xml-axis/java/test/wsdl/inheritance/InheritanceTest.wsdl
Index: InheritanceTest.wsdl
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/inheritance/InheritanceTest.wsdl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InheritanceTest.wsdl 30 Jan 2002 03:59:29 -0000 1.1
+++ InheritanceTest.wsdl 31 May 2002 19:08:12 -0000 1.2
@@ -8,7 +8,7 @@
xmlns:typens="urn:InheritanceTest2"
xmlns:xsd="http://www.w3.org/1999/XMLSchema"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding"
+ xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns="http://schemas.xmlsoap.org/wsdl/">
1.4 +1 -1 xml-axis/java/test/wsdl/marrays/MArrayTest.wsdl
Index: MArrayTest.wsdl
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/marrays/MArrayTest.wsdl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MArrayTest.wsdl 4 Apr 2002 22:29:06 -0000 1.3
+++ MArrayTest.wsdl 31 May 2002 19:08:12 -0000 1.4
@@ -6,7 +6,7 @@
xmlns:typens="urn:MArrayTests"
xmlns:xsd="http://www.w3.org/1999/XMLSchema"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding"
+ xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
xmlns:soapy="http://xml.apache.org/xml-soap"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns="http://schemas.xmlsoap.org/wsdl/">
1.3 +1 -1 xml-axis/java/test/wsdl/sequence/SequenceTest.wsdl
Index: SequenceTest.wsdl
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/sequence/SequenceTest.wsdl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SequenceTest.wsdl 1 Feb 2002 22:08:26 -0000 1.2
+++ SequenceTest.wsdl 31 May 2002 19:08:12 -0000 1.3
@@ -6,7 +6,7 @@
xmlns:typens="urn:SequenceTest2"
xmlns:xsd="http://www.w3.org/1999/XMLSchema"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding"
+ xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns="http://schemas.xmlsoap.org/wsdl/">