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 ch...@apache.org on 2005/02/08 07:23:02 UTC
svn commit: r152643 - in
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis:
impl/llom/OMElementImpl.java impl/llom/SOAPBodyImpl.java
impl/llom/SOAPHeaderImpl.java impl/llom/builder/StAXSOAPModelBuilder.java
impl/llom/factory/OMLinkedListImplFactory.java om/OMFactory.java
Author: chinthaka
Date: Mon Feb 7 22:22:59 2005
New Revision: 152643
URL: http://svn.apache.org/viewcvs?view=rev&rev=152643
Log:
Changed meaning less method signatures from the OMFactory and changed relevant implementations as well.
Modified:
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMElementImpl.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPBodyImpl.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPHeaderImpl.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/StAXSOAPModelBuilder.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/factory/OMLinkedListImplFactory.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMFactory.java
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMElementImpl.java?view=diff&r1=152642&r2=152643
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMElementImpl.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMElementImpl.java Mon Feb 7 22:22:59 2005
@@ -69,8 +69,9 @@
* @param ns
* @param parent
*/
- public OMElementImpl(OMElement parent) {
+ protected OMElementImpl(OMElement parent) {
super(parent);
+ this.done = true;
}
public OMElementImpl(String localName, OMNamespace ns) {
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPBodyImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPBodyImpl.java?view=diff&r1=152642&r2=152643
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPBodyImpl.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPBodyImpl.java Mon Feb 7 22:22:59 2005
@@ -43,8 +43,8 @@
this.localName = OMConstants.BODY_LOCAL_NAME;
}
- public SOAPBodyImpl(String localName, OMNamespace ns, OMElement parent, OMXMLParserWrapper builder) {
- super(localName, ns, parent, builder);
+ public SOAPBodyImpl(SOAPEnvelope envelope, OMXMLParserWrapper builder) {
+ super(OMConstants.BODY_LOCAL_NAME, envelope.getNamespace(), envelope, builder);
}
/**
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPHeaderImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPHeaderImpl.java?view=diff&r1=152642&r2=152643
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPHeaderImpl.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPHeaderImpl.java Mon Feb 7 22:22:59 2005
@@ -44,8 +44,8 @@
}
- public SOAPHeaderImpl(String localName, OMNamespace ns, OMElement parent, OMXMLParserWrapper builder) {
- super(localName, ns, parent, builder);
+ public SOAPHeaderImpl(SOAPEnvelope envelope, OMXMLParserWrapper builder) {
+ super(OMConstants.HEADER_LOCAL_NAME, envelope == null ? null : envelope.getNamespace(), envelope, builder);
}
/**
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/StAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/StAXSOAPModelBuilder.java?view=diff&r1=152642&r2=152643
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/StAXSOAPModelBuilder.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/StAXSOAPModelBuilder.java Mon Feb 7 22:22:59 2005
@@ -109,7 +109,7 @@
throw new OMBuilderException("Header Body wrong order!");
}
headerPresent = true;
- element = ombuilderFactory.createSOAPHeader(elementName, null, parent, this);
+ element = ombuilderFactory.createSOAPHeader((SOAPEnvelope)parent, this);
//envelope.setHeader((SOAPHeader)element);
processNamespaceData(element, true);
} else if (elementName.equals(OMConstants.BODY_LOCAL_NAME)) {
@@ -117,7 +117,7 @@
throw new OMBuilderException("Multiple body elements encountered");
}
bodyPresent = true;
- element = ombuilderFactory.createSOAPBody(elementName, null, parent, this);
+ element = ombuilderFactory.createSOAPBody((SOAPEnvelope)parent, this);
//envelope.setBody((SOAPBody)element);
processNamespaceData(element, true);
} else {
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/factory/OMLinkedListImplFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/factory/OMLinkedListImplFactory.java?view=diff&r1=152642&r2=152643
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/factory/OMLinkedListImplFactory.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/factory/OMLinkedListImplFactory.java Mon Feb 7 22:22:59 2005
@@ -83,12 +83,11 @@
public SOAPBody createSOAPBody(SOAPEnvelope envelope) {
SOAPBody soapBody = new SOAPBodyImpl(envelope);
- soapBody.setComplete(true);
return soapBody;
}
- public SOAPBody createSOAPBody(String localName, OMNamespace ns, OMElement parent, OMXMLParserWrapper builder) {
- return new SOAPBodyImpl(localName, ns, parent, builder);
+ public SOAPBody createSOAPBody(SOAPEnvelope envelope, OMXMLParserWrapper builder) {
+ return new SOAPBodyImpl(envelope, builder);
}
public SOAPEnvelope createSOAPEnvelope(OMNamespace ns, OMXMLParserWrapper builder) {
@@ -99,18 +98,16 @@
return new SOAPEnvelopeImpl(ns);
}
- public SOAPEnvelope createOMEnvelope(OMXMLParserWrapper parserWrapper) {
- throw new UnsupportedOperationException(); //TODO implement this
- }
- //TODO there should be a method to create an SOAPEnvelope giving OMXMLParserWrapper, as OMMessage is no longer there
+
+ //TODO there should be a method to create a SOAPEnvelope giving OMXMLParserWrapper, as OMMessage is no longer there
public SOAPHeader createSOAPHeader(SOAPEnvelope envelope) {
return new SOAPHeaderImpl(envelope);
}
- public SOAPHeader createSOAPHeader(String localName, OMNamespace ns, OMElement parent, OMXMLParserWrapper builder) {
- return new SOAPHeaderImpl(localName, ns, parent, builder);
+ public SOAPHeader createSOAPHeader(SOAPEnvelope envelope, OMXMLParserWrapper builder) {
+ return new SOAPHeaderImpl(envelope, builder);
}
public SOAPHeaderBlock createSOAPHeaderBlock(String localName, OMNamespace ns) {
@@ -135,7 +132,6 @@
SOAPEnvelopeImpl env = new SOAPEnvelopeImpl(ns);
SOAPBodyImpl bodyImpl = new SOAPBodyImpl(env);
- bodyImpl.setComplete(true);
env.addChild(bodyImpl);
//env.setBody(bodyImpl);
SOAPHeaderImpl headerImpl = new SOAPHeaderImpl(env);
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMFactory.java?view=diff&r1=152642&r2=152643
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMFactory.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMFactory.java Mon Feb 7 22:22:59 2005
@@ -36,25 +36,16 @@
public abstract OMElement createOMElement(String localName, OMNamespace ns, OMElement parent, OMXMLParserWrapper builder);
+
/**
- * @param localName
- * @param ns
- * @param parent
+ *
+ * @param uri
+ * @param prefix
* @return
*/
- /// public abstract OMNamedNode createOMNamedNode(String localName, OMNamespace ns, OMElement parent);
-
-// /**
-// * @param parent
-// * @return
-// */
-// public abstract OMNamedNode createOMNamedNode(OMElement parent);
-
public abstract OMNamespace createOMNamespace(String uri, String prefix);
-// public abstract OMNode createOMNode(OMElement parent);
-
/**
* @param parent
* @param text
@@ -75,13 +66,12 @@
public abstract SOAPBody createSOAPBody(SOAPEnvelope envelope);
/**
- * @param localName
- * @param ns
- * @param parent
+ *
+ * @param envelope
* @param builder
* @return
*/
- public abstract SOAPBody createSOAPBody(String localName, OMNamespace ns, OMElement parent, OMXMLParserWrapper builder);
+ public abstract SOAPBody createSOAPBody(SOAPEnvelope envelope, OMXMLParserWrapper builder);
/**
@@ -102,13 +92,12 @@
public abstract SOAPHeader createSOAPHeader(SOAPEnvelope envelope);
/**
- * @param localName
- * @param ns
- * @param parent
+ *
+ * @param envelope
* @param builder
* @return
*/
- public abstract SOAPHeader createSOAPHeader(String localName, OMNamespace ns, OMElement parent, OMXMLParserWrapper builder);
+ public abstract SOAPHeader createSOAPHeader(SOAPEnvelope envelope, OMXMLParserWrapper builder);
/**