You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ch...@apache.org on 2005/05/11 11:10:11 UTC

svn commit: r169608 - in /webservices/axis/trunk/java/modules: samples/test/org/apache/axis/om/builder/ xml/src/org/apache/axis/om/ xml/src/org/apache/axis/om/impl/llom/ xml/src/org/apache/axis/om/impl/llom/builder/ xml/src/org/apache/axis/om/impl/llom/factory/ xml/src/org/apache/axis/om/impl/llom/soap/ xml/src/org/apache/axis/om/impl/llom/soap/soap11/ xml/src/org/apache/axis/om/impl/llom/soap/soap12/ xml/src/org/apache/axis/om/impl/llom/soap11/ xml/src/org/apache/axis/om/impl/llom/soap12/ xml/test/org/apache/axis/om/ xml/test/org/apache/axis/om/factory/

Author: chinthaka
Date: Wed May 11 02:10:10 2005
New Revision: 169608

URL: http://svn.apache.org/viewcvs?rev=169608&view=rev
Log:
Moving SOAP specific stuff within the *.llom package into *.llom.soap package

Added:
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/soap11/
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/soap11/SOAP11Constants.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/soap11/SOAP11Factory.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/soap12/
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/soap12/SOAP12Constants.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/soap12/SOAP12Factory.java
Removed:
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPBodyImpl.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPConstants.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPEnvelopeImpl.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPFaulReasonImpl.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPFaultImpl.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPHeaderBlockImpl.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPHeaderImpl.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPTextImpl.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap11/
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap12/
Modified:
    webservices/axis/trunk/java/modules/samples/test/org/apache/axis/om/builder/ObjectToOMBuilderTest.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/FactoryFinder.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXSOAPModelBuilder.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/SOAPLinkedListImplFactory.java
    webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMChildrenQNameIteratorTest.java
    webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/factory/OMLinkedListImplFactoryTest.java

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/om/builder/ObjectToOMBuilderTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/om/builder/ObjectToOMBuilderTest.java?rev=169608&r1=169607&r2=169608&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/om/builder/ObjectToOMBuilderTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/om/builder/ObjectToOMBuilderTest.java Wed May 11 02:10:10 2005
@@ -31,8 +31,8 @@
 import org.apache.axis.om.OMNamespace;
 import org.apache.axis.om.OMNode;
 import org.apache.axis.om.builder.dummy.DummyOutObject;
-import org.apache.axis.om.impl.llom.SOAPConstants;
-import org.apache.axis.om.impl.llom.soap11.SOAP11Constants;
+import org.apache.axis.om.impl.llom.soap.SOAPConstants;
+import org.apache.axis.om.impl.llom.soap.soap11.SOAP11Constants;
 import org.apache.axis.testUtils.Encoder;
 import org.apache.axis.testUtils.ObjectToOMBuilder;
 

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/FactoryFinder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/FactoryFinder.java?rev=169608&r1=169607&r2=169608&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/FactoryFinder.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/FactoryFinder.java Wed May 11 02:10:10 2005
@@ -23,7 +23,7 @@
     private static final String DEFAULT_OM_FACTORY_CLASS_NAME =
             "org.apache.axis.om.impl.llom.factory.OMLinkedListImplFactory";
     private static final String DEFAULT_SOAP11_FACTORY_CLASS_NAME =
-            "org.apache.axis.om.impl.llom.soap11.SOAP11Factory";
+            "org.apache.axis.om.impl.llom.soap.soap11.SOAP11Factory";
     private static final String DEFAULT_SOAP12_FACTORY_CLASS_NAME =
             "org.apache.axis.om.impl.llom.soap11.SOAP12Factory";
 

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXSOAPModelBuilder.java?rev=169608&r1=169607&r2=169608&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXSOAPModelBuilder.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXSOAPModelBuilder.java Wed May 11 02:10:10 2005
@@ -27,11 +27,13 @@
 import org.apache.axis.om.SOAPEnvelope;
 import org.apache.axis.om.SOAPFactory;
 import org.apache.axis.om.SOAPHeader;
-import org.apache.axis.om.impl.llom.SOAPConstants;
-import org.apache.axis.om.impl.llom.SOAPEnvelopeImpl;
+import org.apache.axis.om.impl.llom.soap.SOAPConstants;
+import org.apache.axis.om.impl.llom.soap.SOAPEnvelopeImpl;
 import org.apache.axis.om.impl.llom.exception.OMBuilderException;
-import org.apache.axis.om.impl.llom.soap11.SOAP11Constants;
-import org.apache.axis.om.impl.llom.soap12.SOAP12Constants;
+import org.apache.axis.om.impl.llom.soap.soap11.SOAP11Constants;
+import org.apache.axis.om.impl.llom.soap.soap12.SOAP12Constants;
+import org.apache.axis.om.impl.llom.soap.soap12.SOAP12Constants;
+import org.apache.axis.om.impl.llom.soap.SOAPConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/SOAPLinkedListImplFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/SOAPLinkedListImplFactory.java?rev=169608&r1=169607&r2=169608&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/SOAPLinkedListImplFactory.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/SOAPLinkedListImplFactory.java Wed May 11 02:10:10 2005
@@ -10,13 +10,14 @@
 import org.apache.axis.om.SOAPHeader;
 import org.apache.axis.om.SOAPHeaderBlock;
 import org.apache.axis.om.impl.llom.OMNamespaceImpl;
-import org.apache.axis.om.impl.llom.SOAPBodyImpl;
-import org.apache.axis.om.impl.llom.SOAPConstants;
-import org.apache.axis.om.impl.llom.SOAPEnvelopeImpl;
-import org.apache.axis.om.impl.llom.SOAPFaultImpl;
-import org.apache.axis.om.impl.llom.SOAPHeaderBlockImpl;
-import org.apache.axis.om.impl.llom.SOAPHeaderImpl;
-import org.apache.axis.om.impl.llom.soap11.SOAP11Constants;
+import org.apache.axis.om.impl.llom.soap.SOAPEnvelopeImpl;
+import org.apache.axis.om.impl.llom.soap.SOAPFaultImpl;
+import org.apache.axis.om.impl.llom.soap.SOAPHeaderBlockImpl;
+import org.apache.axis.om.impl.llom.soap.SOAPHeaderImpl;
+import org.apache.axis.om.impl.llom.soap.soap11.SOAP11Constants;
+import org.apache.axis.om.impl.llom.soap.SOAPBodyImpl;
+import org.apache.axis.om.impl.llom.soap.SOAPConstants;
+import org.apache.axis.om.impl.llom.soap.*;
 
 /**
  * Copyright 2001-2004 The Apache Software Foundation.

Added: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/soap11/SOAP11Constants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/soap11/SOAP11Constants.java?rev=169608&view=auto
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/soap11/SOAP11Constants.java (added)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/soap11/SOAP11Constants.java Wed May 11 02:10:10 2005
@@ -0,0 +1,27 @@
+package org.apache.axis.om.impl.llom.soap.soap11;
+
+import org.apache.axis.om.impl.llom.soap.SOAPConstants;
+import org.apache.axis.om.impl.llom.soap.SOAPConstants;
+
+/**
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ * <p/>
+ */
+public interface SOAP11Constants extends SOAPConstants{
+    /**
+     * Eran Chinthaka (chinthaka@apache.org)
+     */
+   public static final String SOAP_ENVELOPE_NAMESPACE_URI = "http://schemas.xmlsoap.org/soap/envelope/";
+}

Added: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/soap11/SOAP11Factory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/soap11/SOAP11Factory.java?rev=169608&view=auto
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/soap11/SOAP11Factory.java (added)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/soap11/SOAP11Factory.java Wed May 11 02:10:10 2005
@@ -0,0 +1,27 @@
+package org.apache.axis.om.impl.llom.soap.soap11;
+
+import org.apache.axis.om.SOAPFactory;
+import org.apache.axis.om.impl.llom.factory.SOAPLinkedListImplFactory;
+
+/**
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ * <p/>
+ */
+public class SOAP11Factory extends SOAPLinkedListImplFactory implements SOAPFactory{
+    /**
+     * Eran Chinthaka (chinthaka@apache.org)
+     */
+
+}

Added: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/soap12/SOAP12Constants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/soap12/SOAP12Constants.java?rev=169608&view=auto
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/soap12/SOAP12Constants.java (added)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/soap12/SOAP12Constants.java Wed May 11 02:10:10 2005
@@ -0,0 +1,67 @@
+package org.apache.axis.om.impl.llom.soap.soap12;
+
+import org.apache.axis.om.impl.llom.soap.SOAPConstants;
+
+/**
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ * <p/>
+ */
+public interface SOAP12Constants extends SOAPConstants{
+    /**
+     * Eran Chinthaka (chinthaka@apache.org)
+     *
+     */
+
+    public String SOAP_ENVELOPE_NAMESPACE_URI =
+            "http://www.w3.org/2003/05/soap-envelope";
+
+    public static final String SOAP_ENVELOPE_LOCAL_NAME = "Envelope";
+
+    public static final String SOAP_HEADER_LOCAL_NAME = "Header";
+
+    public static final String SOAP_ROLE = "role";
+    public static final String SOAP_MUSTUNDERSTAND = "mustUnderstand";
+    public static final String SOAP_RELAY = "relay";
+
+    public static final String SOAP_BODY_LOCAL_NAME = "Body";
+
+    // SOAP Faults
+    public static final String SOAP_FAULT_LOCAL_NAME = "Fault";
+
+    // SOAP Fault Code
+    public static final String SOAP_FAULT_CODE_LOCAL_NAME = "Code";
+    public static final String SOAP_FAULT_SUB_CODE_LOCAL_NAME = "SubCode";
+    public static final String SOAP_FAULT_VALUE_LOCAL_NAME = "Value";
+
+    // SOAP Fault Codes
+    public static final String SOAP_FAULT_VALUE_VERSION_MISMATCH = "env:VersionMismatch";
+    public static final String SOAP_FAULT_VALUE_MUST_UNDERSTAND = "env:MustUnderstand";
+    public static final String SOAP_FAULT_VALUE_DATA_ENCODING_UKNOWN = "env:DataEncodingUnknown";
+    public static final String SOAP_FAULT_VALUE_SENDER = "env:Sender";
+    public static final String SOAP_FAULT_VALUE_RECEIVER = "env:Receiver";
+
+    // SOAP Fault Reason
+    public static final String SOAP_FAULT_REASON_LOCAL_NAME = "Reason";
+    public static final String SOAP_FAULT_TEXT_LOCAL_NAME = "Text";
+    public static final String SOAP_FAULT_TEXT_LANG_ATTR_LOCAL_NAME = "lang";
+    public static final String SOAP_FAULT_TEXT_LANG_ATTR_NS_URI = "http://www.w3.org/XML/1998/namespace";
+    public static final String SOAP_FAULT_TEXT_LANG_ATTR_NS_PREFIX = "xml";
+
+    // SOAP Fault Node
+    public static final String SOAP_FAULT_NODE_LOCAL_NAME = "Node";
+
+    // SOAP Fault Detail
+    public static final String SOAP_FAULT_DETAIL_LOCAL_NAME = "Detail";
+}

Added: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/soap12/SOAP12Factory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/soap12/SOAP12Factory.java?rev=169608&view=auto
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/soap12/SOAP12Factory.java (added)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/soap12/SOAP12Factory.java Wed May 11 02:10:10 2005
@@ -0,0 +1,26 @@
+package org.apache.axis.om.impl.llom.soap.soap12;
+
+import org.apache.axis.om.SOAPFactory;
+import org.apache.axis.om.impl.llom.factory.SOAPLinkedListImplFactory;
+
+/**
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ * <p/>
+ */
+public class SOAP12Factory extends SOAPLinkedListImplFactory implements SOAPFactory{
+    /**
+     * Eran Chinthaka (chinthaka@apache.org)
+     */
+}

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMChildrenQNameIteratorTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMChildrenQNameIteratorTest.java?rev=169608&r1=169607&r2=169608&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMChildrenQNameIteratorTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMChildrenQNameIteratorTest.java Wed May 11 02:10:10 2005
@@ -21,7 +21,7 @@
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLInputFactory;
 
-import org.apache.axis.om.impl.llom.SOAPConstants;
+import org.apache.axis.om.impl.llom.soap.SOAPConstants;
 import org.apache.axis.om.impl.llom.builder.StAXSOAPModelBuilder;
 import org.apache.axis.om.impl.llom.traverse.OMChildrenQNameIterator;
 

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/factory/OMLinkedListImplFactoryTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/factory/OMLinkedListImplFactoryTest.java?rev=169608&r1=169607&r2=169608&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/factory/OMLinkedListImplFactoryTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/factory/OMLinkedListImplFactoryTest.java Wed May 11 02:10:10 2005
@@ -28,8 +28,9 @@
 import org.apache.axis.om.SOAPFault;
 import org.apache.axis.om.SOAPHeader;
 import org.apache.axis.om.SOAPHeaderBlock;
-import org.apache.axis.om.impl.llom.SOAPConstants;
-import org.apache.axis.om.impl.llom.soap11.SOAP11Constants;
+import org.apache.axis.om.impl.llom.soap.SOAPConstants;
+import org.apache.axis.om.impl.llom.soap.soap11.SOAP11Constants;
+import org.apache.axis.om.impl.llom.soap.SOAPConstants;
 
 /**
  * User: Eran Chinthaka (eran.chinthaka@gmail.com)