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 ru...@apache.org on 2001/06/08 02:12:00 UTC
cvs commit: xml-axis/java/test/encoding TestDeser1999.java PackageTests.java
rubys 01/06/07 17:12:00
Modified: java/src/org/apache/axis Constants.java
java/test/encoding PackageTests.java
Added: java/test/encoding TestDeser1999.java
Log:
Change the default to 2001 schema. No other code changes were required
in order to keep the unit and functional tests running (I like it when
that happens!). One set of functional tests has been added.
This actually is per the request of the people at the soap interop
event, and was discussed and agreed upon at a weekly IRC, but if
there are any concerns let me know and I will back it out.
I actually like the progression. Apache SOAP 2.1 only generated 1999.
Apache SOAP 2.2 generates 1999, but will accept 2000/10 and 2001.
Apache Axis 3.0 will generate 2001, but will accept 1999 and 2000/10.
Each release will interop with its predecessor.
At some future release, we can hopefully can drop schemas prior to 2001
entirely.
Revision Changes Path
1.16 +153 -153 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Constants.java 2001/05/30 14:18:15 1.15
+++ Constants.java 2001/06/08 00:12:00 1.16
@@ -1,153 +1,153 @@
-/*
- * The Apache Software License, Version 1.1
- *
- *
- * Copyright (c) 1999 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Axis" and "Apache Software Foundation" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-
-package org.apache.axis;
-
-public class Constants {
- // Some common Constants that should be used in local handler options
- // (Not all implementations will have these concepts - for example
- // not all Engines will have notion of registries but defining these
- // here should allow people to ask if they exist)
- //////////////////////////////////////////////////////////////////////////
- public static String AXIS_ENGINE = "AxisEngine" ;
- public static String HANDLER_REGISTRY = "HandlerRegistry" ;
- public static String SERVICE_REGISTRY = "ServiceRegistry" ;
- public static String TYPEMAP_REGISTRY = "TypeMapRegistry" ;
-
- // Envelope Stuff
- //////////////////////////////////////////////////////////////////////////
- public static String NSPREFIX_SOAP_ENV = "SOAP-ENV" ;
- public static String NSPREFIX_SOAP_ENC = "SOAP-ENC" ;
- public static String NSPREFIX_SCHEMA_XSI = "xsi" ;
- public static String NSPREFIX_SCHEMA_XSD = "xsd" ;
-
-
- public static String AXIS_NS = "http://xml.apache.org/axis/";
- public static String URI_SOAP_ENV =
- "http://schemas.xmlsoap.org/soap/envelope/" ;
- public static String URI_SOAP_ENC =
- "http://schemas.xmlsoap.org/soap/encoding/" ;
- public static String URI_NEXT_ACTOR =
- "http://schemas.xmlsoap.org/soap/actor/next" ;
-
- public static String NS_URI_XMLNS =
- "http://www.w3.org/2000/xmlns/";
-
- // Schema namespaces
- public static final String URI_1999_SCHEMA_XSI =
- "http://www.w3.org/1999/XMLSchema-instance";
- public static final String URI_1999_SCHEMA_XSD =
- "http://www.w3.org/1999/XMLSchema";
- public static final String URI_2000_SCHEMA_XSI =
- "http://www.w3.org/2000/10/XMLSchema-instance";
- public static final String URI_2000_SCHEMA_XSD =
- "http://www.w3.org/2000/10/XMLSchema";
- public static final String URI_2001_SCHEMA_XSI =
- "http://www.w3.org/2001/XMLSchema-instance";
- public static final String URI_2001_SCHEMA_XSD =
- "http://www.w3.org/2001/XMLSchema";
- public static final String URI_CURRENT_SCHEMA_XSI = URI_1999_SCHEMA_XSI;
- public static final String URI_CURRENT_SCHEMA_XSD = URI_1999_SCHEMA_XSD;
-
- public static final String[] URIS_SCHEMA_XSI = {
- URI_1999_SCHEMA_XSI,
- URI_2000_SCHEMA_XSI,
- URI_2001_SCHEMA_XSI,
- };
-
- public static final String[] URIS_SCHEMA_XSD = {
- URI_1999_SCHEMA_XSD,
- URI_2000_SCHEMA_XSD,
- URI_2001_SCHEMA_XSD,
- };
-
- public static String ELEM_ENVELOPE = "Envelope" ;
- public static String ELEM_HEADER = "Header" ;
- public static String ELEM_BODY = "Body" ;
- public static String ELEM_FAULT = "Fault" ;
-
- public static String ELEM_FAULT_CODE = "faultcode" ;
- public static String ELEM_FAULT_STRING = "faultstring" ;
- public static String ELEM_FAULT_DETAIL = "detail" ;
- public static String ELEM_FAULT_ACTOR = "faultactor" ;
-
- public static String ATTR_MUST_UNDERSTAND = "mustUnderstand" ;
- public static String ATTR_ENCODING_STYLE = "encodingStyle" ;
- public static String ATTR_ACTOR = "actor" ;
- public static String ATTR_ROOT = "root" ;
- public static String ATTR_ID = "id" ;
- public static String ATTR_HREF = "href" ;
- public static final String ATTR_ARRAY_TYPE = "arrayType";
-
- // Fault Codes
- //////////////////////////////////////////////////////////////////////////
- public static String FAULT_SERVER_GENERAL = "Server.generalException";
-
-
- // Misc Strings
- //////////////////////////////////////////////////////////////////////////
- public static String URI_DEBUG = "http://xml.apache.org/axis/debug" ;
-
- /** The global input/out chains */
- public static String GLOBAL_INPUT = "global.input" ;
- public static String GLOBAL_OUTPUT = "global.output" ;
-
- public static String JWSPROCESSOR_TARGET = "JWSProcessor" ;
-
- public static String CLIENT_HANDLER_REGISTRY = "handler-client.reg" ;
- public static String SERVER_HANDLER_REGISTRY = "handler-server.reg" ;
- public static String CLIENT_SERVICE_REGISTRY = "service-client.reg" ;
- public static String SERVER_SERVICE_REGISTRY = "service-server.reg" ;
-}
+/*
+ * The Apache Software License, Version 1.1
+ *
+ *
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Axis" and "Apache Software Foundation" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+package org.apache.axis;
+
+public class Constants {
+ // Some common Constants that should be used in local handler options
+ // (Not all implementations will have these concepts - for example
+ // not all Engines will have notion of registries but defining these
+ // here should allow people to ask if they exist)
+ //////////////////////////////////////////////////////////////////////////
+ public static String AXIS_ENGINE = "AxisEngine" ;
+ public static String HANDLER_REGISTRY = "HandlerRegistry" ;
+ public static String SERVICE_REGISTRY = "ServiceRegistry" ;
+ public static String TYPEMAP_REGISTRY = "TypeMapRegistry" ;
+
+ // Envelope Stuff
+ //////////////////////////////////////////////////////////////////////////
+ public static String NSPREFIX_SOAP_ENV = "SOAP-ENV" ;
+ public static String NSPREFIX_SOAP_ENC = "SOAP-ENC" ;
+ public static String NSPREFIX_SCHEMA_XSI = "xsi" ;
+ public static String NSPREFIX_SCHEMA_XSD = "xsd" ;
+
+
+ public static String AXIS_NS = "http://xml.apache.org/axis/";
+ public static String URI_SOAP_ENV =
+ "http://schemas.xmlsoap.org/soap/envelope/" ;
+ public static String URI_SOAP_ENC =
+ "http://schemas.xmlsoap.org/soap/encoding/" ;
+ public static String URI_NEXT_ACTOR =
+ "http://schemas.xmlsoap.org/soap/actor/next" ;
+
+ public static String NS_URI_XMLNS =
+ "http://www.w3.org/2000/xmlns/";
+
+ // Schema namespaces
+ public static final String URI_1999_SCHEMA_XSI =
+ "http://www.w3.org/1999/XMLSchema-instance";
+ public static final String URI_1999_SCHEMA_XSD =
+ "http://www.w3.org/1999/XMLSchema";
+ public static final String URI_2000_SCHEMA_XSI =
+ "http://www.w3.org/2000/10/XMLSchema-instance";
+ public static final String URI_2000_SCHEMA_XSD =
+ "http://www.w3.org/2000/10/XMLSchema";
+ public static final String URI_2001_SCHEMA_XSI =
+ "http://www.w3.org/2001/XMLSchema-instance";
+ public static final String URI_2001_SCHEMA_XSD =
+ "http://www.w3.org/2001/XMLSchema";
+ public static final String URI_CURRENT_SCHEMA_XSI = URI_2001_SCHEMA_XSI;
+ public static final String URI_CURRENT_SCHEMA_XSD = URI_2001_SCHEMA_XSD;
+
+ public static final String[] URIS_SCHEMA_XSI = {
+ URI_1999_SCHEMA_XSI,
+ URI_2000_SCHEMA_XSI,
+ URI_2001_SCHEMA_XSI,
+ };
+
+ public static final String[] URIS_SCHEMA_XSD = {
+ URI_1999_SCHEMA_XSD,
+ URI_2000_SCHEMA_XSD,
+ URI_2001_SCHEMA_XSD,
+ };
+
+ public static String ELEM_ENVELOPE = "Envelope" ;
+ public static String ELEM_HEADER = "Header" ;
+ public static String ELEM_BODY = "Body" ;
+ public static String ELEM_FAULT = "Fault" ;
+
+ public static String ELEM_FAULT_CODE = "faultcode" ;
+ public static String ELEM_FAULT_STRING = "faultstring" ;
+ public static String ELEM_FAULT_DETAIL = "detail" ;
+ public static String ELEM_FAULT_ACTOR = "faultactor" ;
+
+ public static String ATTR_MUST_UNDERSTAND = "mustUnderstand" ;
+ public static String ATTR_ENCODING_STYLE = "encodingStyle" ;
+ public static String ATTR_ACTOR = "actor" ;
+ public static String ATTR_ROOT = "root" ;
+ public static String ATTR_ID = "id" ;
+ public static String ATTR_HREF = "href" ;
+ public static final String ATTR_ARRAY_TYPE = "arrayType";
+
+ // Fault Codes
+ //////////////////////////////////////////////////////////////////////////
+ public static String FAULT_SERVER_GENERAL = "Server.generalException";
+
+
+ // Misc Strings
+ //////////////////////////////////////////////////////////////////////////
+ public static String URI_DEBUG = "http://xml.apache.org/axis/debug" ;
+
+ /** The global input/out chains */
+ public static String GLOBAL_INPUT = "global.input" ;
+ public static String GLOBAL_OUTPUT = "global.output" ;
+
+ public static String JWSPROCESSOR_TARGET = "JWSProcessor" ;
+
+ public static String CLIENT_HANDLER_REGISTRY = "handler-client.reg" ;
+ public static String SERVER_HANDLER_REGISTRY = "handler-server.reg" ;
+ public static String CLIENT_SERVICE_REGISTRY = "service-client.reg" ;
+ public static String SERVER_SERVICE_REGISTRY = "service-server.reg" ;
+}
1.6 +1 -0 xml-axis/java/test/encoding/PackageTests.java
Index: PackageTests.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/PackageTests.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PackageTests.java 2001/05/06 15:59:50 1.5
+++ PackageTests.java 2001/06/08 00:12:00 1.6
@@ -20,6 +20,7 @@
TestSuite suite = new TestSuite();
suite.addTestSuite(TestDeser.class);
+ suite.addTestSuite(TestDeser1999.class);
suite.addTestSuite(TestDeser2000.class);
suite.addTestSuite(TestDeser2001.class);
suite.addTestSuite(TestSer.class);
1.1 xml-axis/java/test/encoding/TestDeser1999.java
Index: TestDeser1999.java
===================================================================
package test.encoding;
import org.apache.axis.Constants;
import junit.framework.TestCase;
/**
* Test deserialization of SOAP responses
*/
public class TestDeser1999 extends TestDeser {
public TestDeser1999(String name) {
super(name, Constants.URI_1999_SCHEMA_XSI,
Constants.URI_1999_SCHEMA_XSD);
}
}