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 di...@apache.org on 2005/02/19 04:25:43 UTC
svn commit: r154388 [4/7] - in webservices/axis/trunk/java/modules:
core/src/java/org/apache/axis/ core/src/java/org/apache/axis/addressing/
core/src/java/org/apache/axis/addressing/miheaders/
core/src/java/org/apache/axis/addressing/om/
core/src/java/org/apache/axis/clientapi/
core/src/java/org/apache/axis/context/
core/src/java/org/apache/axis/description/
core/src/java/org/apache/axis/engine/ core/src/java/org/apache/axis/handlers/
core/src/java/org/apache/axis/phaseresolver/
core/src/java/org/apache/axis/providers/
core/src/java/org/apache/axis/receivers/
core/src/java/org/apache/axis/transport/
core/src/java/org/apache/axis/transport/http/
core/src/java/org/apache/axis/util/ core/src/test/org/apache/axis/
core/src/test/org/apache/axis/addressing/
core/src/test/org/apache/axis/addressing/miheaders/
core/src/test/org/apache/axis/clientapi/
core/src/test/org/apache/axis/description/
core/src/test/org/apache/axis/engine/ core/src/test/org/apache/axis/misc/
core/src/test/org/apache/axis/transport/
deployment/src/java/org/apache/axis/deployment/
deployment/src/java/org/apache/axis/deployment/listener/
deployment/src/java/org/apache/axis/deployment/repository/utill/
deployment/src/java/org/apache/axis/deployment/scheduler/
deployment/src/samples/deployment/module1/
deployment/src/samples/deployment/module2/
deployment/src/samples/deployment/service1/org/apache/axis/sample/echo/
deployment/src/samples/deployment/service1/org/apache/axis/sample/handlers/
deployment/src/samples/deployment/service2/
deployment/src/test/org/apache/axis/deployment/
om/src/java/org/apache/axis/om/ om/src/java/org/apache/axis/om/impl/llom/
om/src/java/org/apache/axis/om/impl/llom/builder/
om/src/java/org/apache/axis/om/impl/llom/exception/
om/src/java/org/apache/axis/om/impl/llom/factory/
om/src/java/org/apache/axis/om/impl/llom/serialize/
om/src/java/org/apache/axis/om/impl/llom/traverse/
om/src/test/org/apache/axis/om/ om/src/test/org/apache/axis/om/factory/
om/src/test/org/apache/axis/om/impl/builder/
om/src/test/org/apache/axis/om/impl/seriliazer/
om/src/test/org/apache/axis/om/impl/streamwrapper/
om/src/test/org/apache/axis/om/impl/traverse/
samples/src/java/encoding/sample1/
samples/src/java/encoding/sample2/benchMark/
samples/src/java/org/apache/axis/testUtils/
samples/src/java/userguide/sample1/
samples/src/test/org/apache/axis/encoding/
samples/src/test/org/apache/axis/integration/
samples/src/test/org/apache/axis/om/builder/
samples/src/test/org/apache/axis/om/builder/dummy/
wsdl/src/java/org/apache/axis/wsdl/wsdltowom/
wsdl/src/java/org/apache/wsdl/ wsdl/src/java/org/apache/wsdl/impl/
wsdl/src/java/org/apache/wsdl/util/ wsdl/src/test/org/apache/wsdl/
Modified: webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/OMUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/OMUtils.java?view=diff&r1=154387&r2=154388
==============================================================================
--- webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/OMUtils.java (original)
+++ webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/OMUtils.java Fri Feb 18 19:24:49 2005
@@ -1,22 +1,22 @@
-/*
- * Copyright 2003,2004 The Apache Software Foundation.
- *
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.
- */
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+
package org.apache.axis.om;
import java.util.Iterator;
-
public class OMUtils {
public static OMElement getFirstChildElement(OMElement omele) {
Modified: webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/OMXMLParserWrapper.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/OMXMLParserWrapper.java?view=diff&r1=154387&r2=154388
==============================================================================
--- webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/OMXMLParserWrapper.java (original)
+++ webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/OMXMLParserWrapper.java Fri Feb 18 19:24:49 2005
@@ -1,22 +1,21 @@
-package org.apache.axis.om;
-
-
-/**
- * Copyright 2001-2004 The Apache Software Foundation.
- * <p/>
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
* 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/>
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* 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/>
*/
+
+package org.apache.axis.om;
+
public interface OMXMLParserWrapper {
/**
* Proceed the parser one step and return the event value
Modified: webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/SOAPBody.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/SOAPBody.java?view=diff&r1=154387&r2=154388
==============================================================================
--- webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/SOAPBody.java (original)
+++ webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/SOAPBody.java Fri Feb 18 19:24:49 2005
@@ -1,21 +1,21 @@
-/* Copyright 2004 The Apache Software Foundation
- *
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
*/
-
+
package org.apache.axis.om;
-
/**
* An object that represents the contents of the SOAP body
* element in a SOAP message. B SOAP body element consists of XML data
@@ -27,7 +27,6 @@
* error information, is an example of a <code>OMBodyBlock</code> object.
*/
public interface SOAPBody extends OMElement {
-
/**
* Creates a new <code>SOAPFault</code> object and adds it to
* this <code>SOAPBody</code> object.
Modified: webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/SOAPEnvelope.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/SOAPEnvelope.java?view=diff&r1=154387&r2=154388
==============================================================================
--- webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/SOAPEnvelope.java (original)
+++ webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/SOAPEnvelope.java Fri Feb 18 19:24:49 2005
@@ -1,43 +1,34 @@
-/* Copyright 2004 The Apache Software Foundation
- *
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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/>
- * User: Eran Chinthaka - Lanka Software Foundation
- * Date: Oct 28, 2004
- * Time: 11:52:18 AM
- * <p/>
- *
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
*/
-
-
+
package org.apache.axis.om;
-
public interface SOAPEnvelope extends OMElement {
-
/**
- * Returns the <CODE>SOAPHeader</CODE> object for this <CODE>
- * SOAPEnvelope</CODE> object.
- * <p/>
- * <P> This SOAPHeader will just be a container for all the headers in the
- * <CODE>OMMessage</CODE>
- * </P>
- *
- * @return the <CODE>SOAPHeader</CODE> object or <CODE>
- * null</CODE> if there is none
- * @throws OMException if there is a problem
- * obtaining the <CODE>SOAPHeader</CODE> object
- */
+ * Returns the <CODE>SOAPHeader</CODE> object for this <CODE>
+ * SOAPEnvelope</CODE> object.
+ * <P> This SOAPHeader will just be a container for all the headers in the
+ * <CODE>OMMessage</CODE>
+ * </P>
+ *
+ * @return the <CODE>SOAPHeader</CODE> object or <CODE>
+ * null</CODE> if there is none
+ * @throws OMException if there is a problem
+ * obtaining the <CODE>SOAPHeader</CODE> object
+ */
public abstract SOAPHeader getHeader() throws OMException;
/**
Modified: webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/SOAPFault.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/SOAPFault.java?view=diff&r1=154387&r2=154388
==============================================================================
--- webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/SOAPFault.java (original)
+++ webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/SOAPFault.java Fri Feb 18 19:24:49 2005
@@ -1,23 +1,23 @@
-/* Copyright 2004 The Apache Software Foundation
- *
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
*/
-
+
package org.apache.axis.om;
import javax.xml.namespace.QName;
-
/**
* An element in the <CODE>SOAPBody</CODE> object that contains
* error and/or status information. This information may relate to
@@ -39,22 +39,20 @@
* recipient.
*/
public interface SOAPFault extends OMElement {
-
/**
- * Sets this <CODE>SOAPFault</CODE> object with the given
- * fault code.
- * <p/>
- * <P>Fault codes, which given information about the fault,
- * are defined in the SOAP 1.1 specification.</P>
- *
- * @param faultCode a <CODE>QName</CODE> giving
- * the fault code to be set; must be one of the fault codes
- * defined in the SOAP 1.1 specification
- * @throws OMException if there was an error in
- * adding the <CODE>faultCode</CODE> to the underlying XML
- * tree.
- * @see #getFaultCode() getFaultCode()
- */
+ * Sets this <CODE>SOAPFault</CODE> object with the given
+ * fault code.
+ * <P>Fault codes, which given information about the fault,
+ * are defined in the SOAP 1.1 specification.</P>
+ *
+ * @param faultCode a <CODE>QName</CODE> giving
+ * the fault code to be set; must be one of the fault codes
+ * defined in the SOAP 1.1 specification
+ * @throws OMException if there was an error in
+ * adding the <CODE>faultCode</CODE> to the underlying XML
+ * tree.
+ * @see #getFaultCode() getFaultCode()
+ */
public abstract void setFaultCode(QName faultCode) throws OMException;
/**
@@ -67,20 +65,19 @@
public abstract QName getFaultCode();
/**
- * Sets this <CODE>SOAPFault</CODE> object with the given
- * fault actor.
- * <p/>
- * <P>The fault actor is the recipient in the message path who
- * caused the fault to happen.</P>
- *
- * @param faultActor a <CODE>String</CODE>
- * identifying the actor that caused this <CODE>
- * SOAPFault</CODE> object
- * @throws OMException if there was an error in
- * adding the <CODE>faultActor</CODE> to the underlying XML
- * tree.
- * @see #getFaultActor() getFaultActor()
- */
+ * Sets this <CODE>SOAPFault</CODE> object with the given
+ * fault actor.
+ * <P>The fault actor is the recipient in the message path who
+ * caused the fault to happen.</P>
+ *
+ * @param faultActor a <CODE>String</CODE>
+ * identifying the actor that caused this <CODE>
+ * SOAPFault</CODE> object
+ * @throws OMException if there was an error in
+ * adding the <CODE>faultActor</CODE> to the underlying XML
+ * tree.
+ * @see #getFaultActor() getFaultActor()
+ */
public abstract void setFaultActor(String faultActor) throws OMException;
/**
@@ -124,7 +121,6 @@
public abstract void setDetailInformation(OMNode detail);
public abstract OMNode getDetailInformation();
-
public abstract Exception getException() throws OMException;
}
Modified: webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/SOAPHeader.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/SOAPHeader.java?view=diff&r1=154387&r2=154388
==============================================================================
--- webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/SOAPHeader.java (original)
+++ webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/SOAPHeader.java Fri Feb 18 19:24:49 2005
@@ -1,26 +1,24 @@
-/* Copyright 2004 The Apache Software Foundation
- *
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
*/
-
+
package org.apache.axis.om;
import java.util.Iterator;
-
public interface SOAPHeader extends OMElement {
-
-
/**
* Creates a new <CODE>SOAPHeaderBlock</CODE> object
* initialized with the specified name and adds it to this
@@ -55,23 +53,22 @@
public abstract Iterator examineHeaderBlocks(String actor);
/**
- * Returns a list of all the <CODE>SOAPHeaderBlock</CODE>
- * objects in this <CODE>SOAPHeader</CODE> object that have
- * the the specified actor and detaches them from this <CODE>
- * SOAPHeader</CODE> object.
- * <p/>
- * <P>This method allows an actor to process only the parts of
- * the <CODE>SOAPHeader</CODE> object that apply to it and to
- * remove them before passing the message on to the next
- * actor.
- *
- * @param actor a <CODE>String</CODE> giving the
- * URI of the actor for which to search
- * @return an <CODE>Iterator</CODE> object over all the <CODE>
- * SOAPHeaderBlock</CODE> objects that contain the
- * specified actor
- * @see #examineHeaderBlocks(java.lang.String) examineHeaderBlocks(java.lang.String)
- */
+ * Returns a list of all the <CODE>SOAPHeaderBlock</CODE>
+ * objects in this <CODE>SOAPHeader</CODE> object that have
+ * the the specified actor and detaches them from this <CODE>
+ * SOAPHeader</CODE> object.
+ * <P>This method allows an actor to process only the parts of
+ * the <CODE>SOAPHeader</CODE> object that apply to it and to
+ * remove them before passing the message on to the next
+ * actor.
+ *
+ * @param actor a <CODE>String</CODE> giving the
+ * URI of the actor for which to search
+ * @return an <CODE>Iterator</CODE> object over all the <CODE>
+ * SOAPHeaderBlock</CODE> objects that contain the
+ * specified actor
+ * @see #examineHeaderBlocks(java.lang.String) examineHeaderBlocks(java.lang.String)
+ */
public abstract Iterator extractHeaderBlocks(String actor);
/**
Modified: webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/SOAPHeaderBlock.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/SOAPHeaderBlock.java?view=diff&r1=154387&r2=154388
==============================================================================
--- webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/SOAPHeaderBlock.java (original)
+++ webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/SOAPHeaderBlock.java Fri Feb 18 19:24:49 2005
@@ -1,32 +1,30 @@
-/* Copyright 2004 The Apache Software Foundation
- *
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
*/
-
+
package org.apache.axis.om;
-
/**
* <P>An object representing the contents in the SOAP header part
* of the SOAP envelope. The immediate children of a <CODE>
* SOAPHeader</CODE> object can be represented only as <CODE>
* SOAPHeaderBlock</CODE> objects.</P>
- * <p/>
* <P>B <CODE>SOAPHeaderBlock</CODE> object can have other
* <CODE>OMElement</CODE> objects as its children.</P>
*/
public interface SOAPHeaderBlock extends OMElement {
-
/**
* Sets the actor associated with this <CODE>
* SOAPHeaderBlock</CODE> object to the specified actor. The
@@ -53,23 +51,22 @@
public abstract String getActor();
/**
- * Sets the mustUnderstand attribute for this <CODE>
- * SOAPHeaderBlock</CODE> object to be on or off.
- * <p/>
- * <P>If the mustUnderstand attribute is on, the actor who
- * receives the <CODE>SOAPHeaderBlock</CODE> must process it
- * correctly. This ensures, for example, that if the <CODE>
- * SOAPHeaderBlock</CODE> object modifies the message, that
- * the message is being modified correctly.</P>
- *
- * @param mustUnderstand <CODE>true</CODE> to
- * set the mustUnderstand attribute on; <CODE>false</CODE>
- * to turn if off
- * @throws java.lang.IllegalArgumentException
- * if
- * there is a problem in setting the actor.
- * @see #getMustUnderstand() getMustUnderstand()
- */
+ * Sets the mustUnderstand attribute for this <CODE>
+ * SOAPHeaderBlock</CODE> object to be on or off.
+ * <P>If the mustUnderstand attribute is on, the actor who
+ * receives the <CODE>SOAPHeaderBlock</CODE> must process it
+ * correctly. This ensures, for example, that if the <CODE>
+ * SOAPHeaderBlock</CODE> object modifies the message, that
+ * the message is being modified correctly.</P>
+ *
+ * @param mustUnderstand <CODE>true</CODE> to
+ * set the mustUnderstand attribute on; <CODE>false</CODE>
+ * to turn if off
+ * @throws java.lang.IllegalArgumentException
+ * if
+ * there is a problem in setting the actor.
+ * @see #getMustUnderstand() getMustUnderstand()
+ */
public abstract void setMustUnderstand(boolean mustUnderstand);
/**
Modified: webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMAttributeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMAttributeImpl.java?view=diff&r1=154387&r2=154388
==============================================================================
--- webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMAttributeImpl.java (original)
+++ webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMAttributeImpl.java Fri Feb 18 19:24:49 2005
@@ -1,30 +1,29 @@
-package org.apache.axis.om.impl.llom;
-
-import org.apache.axis.om.OMAttribute;
-import org.apache.axis.om.OMNamespace;
-
-import javax.xml.namespace.QName;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Copyright 2001-2004 The Apache Software Foundation.
- * <p/>
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
* 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/>
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* 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 OMAttributeImpl implements OMAttribute {
+
+package org.apache.axis.om.impl.llom;
+import org.apache.axis.om.OMAttribute;
+import org.apache.axis.om.OMNamespace;
+
+import javax.xml.namespace.QName;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class OMAttributeImpl implements OMAttribute {
private String localName;
private String value;
private OMNamespace namespace;
@@ -38,10 +37,10 @@
setOMNamespace(ns);
}
-// private static String replaceQuoteWithEntity(String value) {
-// matcher.reset(value);
-// return matcher.replaceAll(QUOTE_ENTITY);
-// }
+ // private static String replaceQuoteWithEntity(String value) {
+ // matcher.reset(value);
+ // return matcher.replaceAll(QUOTE_ENTITY);
+ // }
public QName getQName() {
String namespaceName = namespace != null ? namespace.getName() : null;
Modified: webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMDocument.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMDocument.java?view=diff&r1=154387&r2=154388
==============================================================================
--- webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMDocument.java (original)
+++ webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMDocument.java Fri Feb 18 19:24:49 2005
@@ -1,24 +1,24 @@
-package org.apache.axis.om.impl.llom;
-
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMXMLParserWrapper;
-
-/**
- * Copyright 2001-2004 The Apache Software Foundation.
- * <p/>
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
* 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/>
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* 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/>
*/
+
+package org.apache.axis.om.impl.llom;
+
+import org.apache.axis.om.OMElement;
+import org.apache.axis.om.OMXMLParserWrapper;
+
public class OMDocument {
private OMElement rootElement;
private OMXMLParserWrapper parserWrapper;
Modified: webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMElementImpl.java?view=diff&r1=154387&r2=154388
==============================================================================
--- webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMElementImpl.java (original)
+++ webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMElementImpl.java Fri Feb 18 19:24:49 2005
@@ -1,6 +1,30 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+
package org.apache.axis.om.impl.llom;
-import org.apache.axis.om.*;
+import org.apache.axis.om.OMAttribute;
+import org.apache.axis.om.OMConstants;
+import org.apache.axis.om.OMElement;
+import org.apache.axis.om.OMException;
+import org.apache.axis.om.OMFactory;
+import org.apache.axis.om.OMNamespace;
+import org.apache.axis.om.OMNode;
+import org.apache.axis.om.OMText;
+import org.apache.axis.om.OMXMLParserWrapper;
import org.apache.axis.om.impl.llom.serialize.StreamWriterToContentHandlerConverter;
import org.apache.axis.om.impl.llom.serialize.StreamingOMSerializer;
import org.apache.axis.om.impl.llom.traverse.OMChildrenIterator;
@@ -15,22 +39,6 @@
import java.util.HashMap;
import java.util.Iterator;
-/**
- * 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 OMElementImpl
extends OMNamedNodeImpl
implements OMElement, OMConstants {
@@ -54,7 +62,6 @@
setNamespace(handleNamespace(ns));
}
this.builder = builder;
-
firstChild = null;
}
@@ -118,22 +125,18 @@
ns = declareNamespace(namespaceURI, getNextNamespacePrefix());
}
}
-
if (ns == null) {
throw new OMException("Element can not be declared without a namespaceURI. Every Element should be namespace qualified");
}
-
this.setNamespace(ns);
}
private OMNamespace handleNamespace(OMNamespace ns) {
-
OMNamespace namespace =
findInScopeNamespace(ns.getName(), ns.getPrefix());
if (namespace == null) {
namespace = declareNamespace(ns);
}
-
return namespace;
}
@@ -164,13 +167,12 @@
public OMNode getChildWithName(QName elementQName) throws OMException {
OMChildrenQNameIterator omChildrenQNameIterator =
- new OMChildrenQNameIterator((OMNodeImpl) getFirstChild(),
- elementQName);
+ new OMChildrenQNameIterator((OMNodeImpl) getFirstChild(),
+ elementQName);
OMNode omNode = null;
if (omChildrenQNameIterator.hasNext()) {
omNode = (OMNode) omChildrenQNameIterator.next();
}
-
return omNode;
}
@@ -336,9 +338,7 @@
if (attributes == null) {
this.attributes = new HashMap(5);
}
-
attributes.put(attr.getQName(), attr);
-
return attr;
}
@@ -356,11 +356,11 @@
namespace = findInScopeNamespace(ns.getName(), ns.getPrefix());
if (namespace == null) {
throw new OMException("Given OMNamespace("
- + ns.getName()
- + ns.getPrefix()
- + ") for "
- + "this attribute is not declared in the scope of this element. First declare the namespace"
- + " and then use it with the attribute");
+ + ns.getName()
+ + ns.getPrefix()
+ + ") for "
+ + "this attribute is not declared in the scope of this element. First declare the namespace"
+ + " and then use it with the attribute");
}
}
return insertAttribute(new OMAttributeImpl(attributeName, ns, value));
@@ -442,7 +442,6 @@
public void serialize(XMLStreamWriter writer, boolean cache)
throws XMLStreamException {
boolean firstElement = false;
-
short builderType = PULL_TYPE_BUILDER; //default is pull type
if (builder != null)
builderType = this.builder.getBuilderType();
@@ -460,18 +459,16 @@
&& !isComplete()
&& builderType == PULL_TYPE_BUILDER) {
StreamingOMSerializer streamingOMSerializer =
- new StreamingOMSerializer();
+ new StreamingOMSerializer();
streamingOMSerializer.serialize(this.getPullParser(!cache),
writer);
return;
}
}
-
if (!cache) {
if (isComplete()) {
//serialize own normally
serializeNormal(writer, cache);
-
if (nextSibling != null) {
//serilize next sibling
nextSibling.serialize(writer, cache);
@@ -518,11 +515,9 @@
private void serializeStartpart(XMLStreamWriter writer)
throws XMLStreamException {
-
String nameSpaceName = null;
String writer_prefix = null;
String prefix = null;
-
if (ns != null) {
nameSpaceName = ns.getName();
writer_prefix = writer.getPrefix(nameSpaceName);
@@ -580,12 +575,10 @@
private void serializeNormal(XMLStreamWriter writer, boolean cache)
throws XMLStreamException {
serializeStartpart(writer);
-
OMNode firstChild = getFirstChild();
if (firstChild != null) {
firstChild.serialize(writer, cache);
}
-
serializeEndpart(writer);
}
@@ -617,7 +610,6 @@
protected void serializeNamespace(OMNamespace namespace,
XMLStreamWriter writer)
throws XMLStreamException {
-
if (namespace != null) {
String uri = namespace.getName();
String prefix = writer.getPrefix(uri);
Modified: webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMNamedNodeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMNamedNodeImpl.java?view=diff&r1=154387&r2=154388
==============================================================================
--- webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMNamedNodeImpl.java (original)
+++ webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMNamedNodeImpl.java Fri Feb 18 19:24:49 2005
@@ -1,30 +1,29 @@
-package org.apache.axis.om.impl.llom;
-
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMException;
-import org.apache.axis.om.OMNamedNode;
-import org.apache.axis.om.OMNamespace;
-
-import javax.xml.namespace.QName;
-
-/**
- * Copyright 2001-2004 The Apache Software Foundation.
- * <p/>
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
* 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/>
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* 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 OMNamedNodeImpl extends OMNodeImpl implements OMNamedNode {
+
+package org.apache.axis.om.impl.llom;
+import org.apache.axis.om.OMElement;
+import org.apache.axis.om.OMException;
+import org.apache.axis.om.OMNamedNode;
+import org.apache.axis.om.OMNamespace;
+
+import javax.xml.namespace.QName;
+
+public class OMNamedNodeImpl extends OMNodeImpl implements OMNamedNode {
protected OMNamespace ns;
protected String localName;
@@ -47,14 +46,11 @@
}
public OMNamespace getNamespace() throws OMException {
-
if (ns == null && parent != null) {
ns = parent.getNamespace();
}
-
if (ns == null)
throw new OMException("all elements in a soap message must be namespace qualified");
-
return ns;
}
@@ -71,7 +67,6 @@
public void setNamespace(OMNamespace namespace) {
this.ns = namespace;
}
-
public QName getQName() {
QName qName = new QName(ns.getName(), localName, ns.getPrefix());
Modified: webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMNamespaceImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMNamespaceImpl.java?view=diff&r1=154387&r2=154388
==============================================================================
--- webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMNamespaceImpl.java (original)
+++ webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMNamespaceImpl.java Fri Feb 18 19:24:49 2005
@@ -1,23 +1,23 @@
-package org.apache.axis.om.impl.llom;
-
-import org.apache.axis.om.OMNamespace;
-
-/**
- * Copyright 2001-2004 The Apache Software Foundation.
- * <p/>
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
* 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/>
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* 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/>
*/
+
+package org.apache.axis.om.impl.llom;
+
+import org.apache.axis.om.OMNamespace;
+
public class OMNamespaceImpl implements OMNamespace {
private String prefix;
private String uri;
@@ -32,12 +32,10 @@
this.prefix = prefix;
}
-
public boolean equals(String uri, String prefix) {
return ((prefix == null && this.prefix == null) || (prefix != null && prefix.equals(this.prefix)))
&& uri.equals(uri);
}
-
public String getPrefix() {
return prefix;
Modified: webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMNavigator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMNavigator.java?view=diff&r1=154387&r2=154388
==============================================================================
--- webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMNavigator.java (original)
+++ webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMNavigator.java Fri Feb 18 19:24:49 2005
@@ -1,25 +1,20 @@
/*
-* Copyright 2004 The Apache Software Foundation.
-*
-* 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
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* 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.
-*
-*/
-
/*
-* Created on Sep 25, 2004
-*
-
-*/
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+
package org.apache.axis.om.impl.llom;
import org.apache.axis.om.OMElement;
@@ -30,7 +25,6 @@
* features like isNavigable, isComplete and step
*/
public class OMNavigator {
-
protected OMNode node;
private boolean visited;
private OMNode next;
@@ -71,7 +65,6 @@
node = next;
visited = backtracked;
backtracked = false;
-
updateNextNode();
//set the starting and ending flags
if (root.equals(node)) {
@@ -81,7 +74,6 @@
start = false;
}
}
-
return node;
}
@@ -90,7 +82,6 @@
*/
private void updateNextNode() {
if (next instanceof OMElement && !visited) {
-
OMElementImpl e = (OMElementImpl) next;
if (e.firstChild != null)
next = e.firstChild;
@@ -102,7 +93,6 @@
} else {
OMNode nextSibling = ((OMNodeImpl) next).nextSibling;
OMNode parent = next.getParent();
-
if (nextSibling != null)
next = nextSibling;
else if (parent != null && parent.isComplete()) {
@@ -112,7 +102,6 @@
next = null;
}
}
-
public boolean visited() {
return visited;
Modified: webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMNodeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMNodeImpl.java?view=diff&r1=154387&r2=154388
==============================================================================
--- webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMNodeImpl.java (original)
+++ webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMNodeImpl.java Fri Feb 18 19:24:49 2005
@@ -1,28 +1,28 @@
-package org.apache.axis.om.impl.llom;
-
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMException;
-import org.apache.axis.om.OMNode;
-
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-/**
- * Copyright 2001-2004 The Apache Software Foundation.
- * <p/>
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
* 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/>
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* 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/>
*/
+
+package org.apache.axis.om.impl.llom;
+
+import org.apache.axis.om.OMElement;
+import org.apache.axis.om.OMException;
+import org.apache.axis.om.OMNode;
+
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+
public class OMNodeImpl implements OMNode {
protected OMElementImpl parent;
protected OMNodeImpl nextSibling;
@@ -39,7 +39,6 @@
*
* @param parent
*/
-
public OMNodeImpl(OMElement parent) {
if (parent != null && parent.getType() == OMNode.ELEMENT_NODE) {
this.parent = (OMElementImpl) parent;
@@ -138,7 +137,6 @@
if (parent == null)
throw new OMException();
sibling.setParent(parent);
-
if (sibling instanceof OMNodeImpl) {
OMNodeImpl siblingImpl = (OMNodeImpl) sibling;
if (nextSibling == null)
@@ -162,7 +160,6 @@
if (parent == null)
throw new OMException();
sibling.setParent(parent);
-
if (sibling instanceof OMNodeImpl) {
OMNodeImpl siblingImpl = (OMNodeImpl) sibling;
siblingImpl.setPreviousSibling(previousSibling);
Modified: webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMStAXWrapper.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMStAXWrapper.java?view=diff&r1=154387&r2=154388
==============================================================================
--- webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMStAXWrapper.java (original)
+++ webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMStAXWrapper.java Fri Feb 18 19:24:49 2005
@@ -1,6 +1,28 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+
package org.apache.axis.om.impl.llom;
-import org.apache.axis.om.*;
+import org.apache.axis.om.OMAttribute;
+import org.apache.axis.om.OMElement;
+import org.apache.axis.om.OMNamedNode;
+import org.apache.axis.om.OMNamespace;
+import org.apache.axis.om.OMNode;
+import org.apache.axis.om.OMText;
+import org.apache.axis.om.OMXMLParserWrapper;
import org.apache.axis.om.impl.llom.exception.OMStreamingException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -15,27 +37,10 @@
import java.util.Stack;
/**
- * 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.
- */
-
-/**
* Note - This class also implements the streaming constants interface
* to get access to the StAX constants
*/
public class OMStAXWrapper implements XMLStreamReader, XMLStreamConstants {
-
private Log log = LogFactory.getLog(getClass());
private OMNavigator navigator;
private OMXMLParserWrapper builder;
@@ -162,7 +167,6 @@
returnStr = ((OMElement) lastNode).getLocalName();
}
}
-
return returnStr;
}
@@ -178,20 +182,18 @@
returnName = getQName((OMNamedNode) lastNode);
}
}
-
return returnName;
}
-
/**
* @see javax.xml.stream.XMLStreamReader#hasText()
*/
public boolean hasText() {
return (currentEvent == CHARACTERS ||
- currentEvent == DTD ||
- currentEvent == ENTITY_REFERENCE ||
- currentEvent == COMMENT ||
- currentEvent == SPACE);
+ currentEvent == DTD ||
+ currentEvent == ENTITY_REFERENCE ||
+ currentEvent == COMMENT ||
+ currentEvent == SPACE);
}
/**
@@ -205,7 +207,6 @@
OMText textNode = (OMText) lastNode;
returnLength = textNode.getValue().length();
}
-
return returnLength;
}
@@ -245,7 +246,6 @@
*/
public char[] getTextCharacters() {
char[] returnArray = null;
-
if (parser != null) {
returnArray = parser.getTextCharacters();
} else {
@@ -255,7 +255,6 @@
returnArray = str.toCharArray();
}
}
-
return returnArray;
}
@@ -268,7 +267,6 @@
returnString = parser.getText();
} else {
if (hasText()) {
-
OMText textNode = (OMText) lastNode;
returnString = textNode.getValue();
@@ -298,7 +296,6 @@
returnString = ns == null ? null : ns.getName();
}
}
-
return returnString;
}
@@ -330,8 +327,6 @@
returnCount = getCount(((OMElement) lastNode).getAllDeclaredNamespaces());
}
}
-
-
return returnCount;
}
@@ -361,7 +356,6 @@
returnString = parser.getAttributeValue(i);
} else {
if (isStartElement() || currentEvent == ATTRIBUTE) {
-
OMAttribute attrib = getAttribute((OMElement) lastNode, i);
if (attrib != null) {
returnString = attrib.getValue();
@@ -370,7 +364,6 @@
throw new IllegalStateException("attribute type accessed in illegal event!");
}
}
-
return returnString;
}
@@ -388,7 +381,6 @@
throw new IllegalStateException("attribute type accessed in illegal event!");
}
}
-
return returnString;
}
@@ -401,7 +393,6 @@
returnString = parser.getAttributePrefix(i);
} else {
if (isStartElement() || currentEvent == ATTRIBUTE) {
-
OMAttribute attrib = getAttribute((OMElement) lastNode, i);
if (attrib != null) {
OMNamespace nameSpace = attrib.getNamespace();
@@ -414,7 +405,6 @@
throw new IllegalStateException("attribute prefix accessed in illegal event!");
}
}
-
return returnString;
}
@@ -427,7 +417,6 @@
returnString = parser.getAttributeLocalName(i);
} else {
if (isStartElement() || currentEvent == ATTRIBUTE) {
-
OMAttribute attrib = getAttribute((OMElement) lastNode, i);
if (attrib != null)
returnString = attrib.getLocalName();
@@ -437,7 +426,6 @@
throw new IllegalStateException("attribute localName accessed in illegal event!");
}
}
-
return returnString;
}
@@ -450,7 +438,6 @@
returnString = parser.getAttributeNamespace(i);
} else {
if (isStartElement() || currentEvent == ATTRIBUTE) {
-
OMAttribute attrib = getAttribute((OMElement) lastNode, i);
if (attrib != null) {
OMNamespace nameSpace = attrib.getNamespace();
@@ -463,7 +450,6 @@
throw new IllegalStateException("attribute nameSpace accessed in illegal event!");
}
}
-
return returnString;
}
@@ -476,14 +462,12 @@
returnQName = parser.getAttributeName(i);
} else {
if (isStartElement() || currentEvent == ATTRIBUTE) {
-
returnQName = getAttribute((OMElement) lastNode, i).getQName();
} else {
throw new IllegalStateException("attribute count accessed in illegal event!");
}
}
-
return returnQName;
}
@@ -497,7 +481,6 @@
returnCount = parser.getAttributeCount();
} else {
if (isStartElement() || currentEvent == ATTRIBUTE) {
-
OMElement elt = (OMElement) lastNode;
returnCount = getCount(elt.getAttributes());
@@ -506,8 +489,6 @@
throw new IllegalStateException("attribute count accessed in illegal event!");
}
}
-
-
return returnCount;
}
@@ -524,7 +505,6 @@
} else {
b = (currentEvent == SPACE);
}
-
return b;
}
@@ -545,7 +525,6 @@
} else {
b = (currentEvent == END_ELEMENT);
}
-
return b;
}
@@ -567,7 +546,6 @@
} else {
b = (currentEvent == START_ELEMENT);
}
-
return b;
}
@@ -582,7 +560,6 @@
}
}
-
return returnString;
}
@@ -614,7 +591,6 @@
* @see javax.xml.stream.XMLStreamReader#getElementText()
*/
public String getElementText() throws XMLStreamException {
-
String returnText = "";
if (parser != null) {
try {
@@ -628,7 +604,6 @@
return null;
}
}
-
return returnText;
}
@@ -660,8 +635,6 @@
default:
throw new OMStreamingException("unsuppported state!");
}
-
-
return currentEvent;
}
@@ -669,7 +642,6 @@
throw new UnsupportedOperationException();
}
-
/**
* This is a very important method. this keeps the
* navigator one step ahead and pushes the navigator
@@ -680,7 +652,6 @@
private void updateLastNode() throws XMLStreamException {
lastNode = currentNode;
currentNode = nextNode;
-
try {
updateNextNode();
} catch (Exception e) {
@@ -689,7 +660,6 @@
}
private void updateNextNode() {
-
if (navigator.isNavigable()) {
nextNode = navigator.next();
} else {
@@ -723,7 +693,6 @@
}
-
public NamespaceContext getNamespaceContext() {
throw new UnsupportedOperationException();
}
@@ -770,7 +739,6 @@
private int generateEvents(OMNode node) {
int returnEvent = 0;
-
int nodeType = node.getType();
switch (nodeType) {
case OMNode.ELEMENT_NODE:
@@ -790,11 +758,9 @@
default:
break; //just ignore any other nodes
}
-
return returnEvent;
}
-
private int generateElementEvents(OMElement elt) {
int returnValue = START_ELEMENT;
if (!elementStack.isEmpty() && elementStack.peek().equals(elt)) {
@@ -806,7 +772,6 @@
return returnValue;
}
-
private int generateTextEvents() {
return CHARACTERS;
}
@@ -862,7 +827,6 @@
}
}
}
-
if (found) {
return returnObject;
} else {
Modified: webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMTextImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMTextImpl.java?view=diff&r1=154387&r2=154388
==============================================================================
--- webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMTextImpl.java (original)
+++ webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/OMTextImpl.java Fri Feb 18 19:24:49 2005
@@ -1,28 +1,31 @@
-package org.apache.axis.om.impl.llom;
-
-import org.apache.axis.om.*;
-
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-/**
- * Copyright 2001-2004 The Apache Software Foundation.
- * <p/>
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
* 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/>
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* 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 OMTextImpl extends OMNodeImpl implements OMText, OMConstants {
+
+package org.apache.axis.om.impl.llom;
+import org.apache.axis.om.OMConstants;
+import org.apache.axis.om.OMElement;
+import org.apache.axis.om.OMException;
+import org.apache.axis.om.OMNode;
+import org.apache.axis.om.OMText;
+
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+
+public class OMTextImpl extends OMNodeImpl implements OMText, OMConstants {
protected short textType = TEXT_NODE;
public OMTextImpl(OMElement parent, String text) {
@@ -74,8 +77,6 @@
* @throws XMLStreamException
*/
public void serialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
-
-
if (textType == TEXT_NODE)
writer.writeCharacters(this.value);
else if (textType == COMMENT_NODE)
@@ -83,7 +84,6 @@
else if (textType == CDATA_SECTION_NODE) {
writer.writeCData(this.value);
}
-
OMNode nextSibling = this.getNextSibling();
if (nextSibling != null) {
nextSibling.serialize(writer, cache);
Modified: webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/SOAPBodyImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/SOAPBodyImpl.java?view=diff&r1=154387&r2=154388
==============================================================================
--- webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/SOAPBodyImpl.java (original)
+++ webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/SOAPBodyImpl.java Fri Feb 18 19:24:49 2005
@@ -1,31 +1,33 @@
-package org.apache.axis.om.impl.llom;
-
-import org.apache.axis.om.*;
-
-import javax.xml.namespace.QName;
-import java.util.Iterator;
-
-
-/**
- * Copyright 2001-2004 The Apache Software Foundation.
- * <p/>
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
* 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/>
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* 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 SOAPBodyImpl extends OMElementImpl implements SOAPBody, OMConstants {
+
+package org.apache.axis.om.impl.llom;
- private boolean hasSOAPFault = false;
+import org.apache.axis.om.OMConstants;
+import org.apache.axis.om.OMException;
+import org.apache.axis.om.OMXMLParserWrapper;
+import org.apache.axis.om.SOAPBody;
+import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.SOAPFault;
+
+import javax.xml.namespace.QName;
+import java.util.Iterator;
+public class SOAPBodyImpl extends OMElementImpl implements SOAPBody, OMConstants {
+ private boolean hasSOAPFault = false;
/**
* @param envelope
@@ -93,7 +95,6 @@
}
return null;
}
-
/**
* @param soapFault
Modified: webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/SOAPEnvelopeImpl.java?view=diff&r1=154387&r2=154388
==============================================================================
--- webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/SOAPEnvelopeImpl.java (original)
+++ webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/SOAPEnvelopeImpl.java Fri Feb 18 19:24:49 2005
@@ -1,23 +1,31 @@
-package org.apache.axis.om.impl.llom;
-
-import org.apache.axis.om.*;
-
-/**
- * Copyright 2001-2004 The Apache Software Foundation.
- * <p/>
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
* 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/>
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* 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/>
*/
+
+package org.apache.axis.om.impl.llom;
+
+import org.apache.axis.om.OMConstants;
+import org.apache.axis.om.OMElement;
+import org.apache.axis.om.OMException;
+import org.apache.axis.om.OMNamespace;
+import org.apache.axis.om.OMNode;
+import org.apache.axis.om.OMXMLParserWrapper;
+import org.apache.axis.om.SOAPBody;
+import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.SOAPHeader;
+
public class SOAPEnvelopeImpl extends OMElementImpl implements SOAPEnvelope, OMConstants {
/**
* @param builder
@@ -38,24 +46,23 @@
}
/**
- * Returns the <CODE>SOAPHeader</CODE> object for this <CODE>
- * SOAPEnvelope</CODE> object.
- * <p/>
- * <P> This SOAPHeader will just be a container for all the headers in the
- * <CODE>OMMessage</CODE>
- * </P>
- *
- * @return the <CODE>SOAPHeader</CODE> object or <CODE>
- * null</CODE> if there is none
- * @throws org.apache.axis.om.OMException if there is a problem
- * obtaining the <CODE>SOAPHeader</CODE> object
- */
+ * Returns the <CODE>SOAPHeader</CODE> object for this <CODE>
+ * SOAPEnvelope</CODE> object.
+ * <P> This SOAPHeader will just be a container for all the headers in the
+ * <CODE>OMMessage</CODE>
+ * </P>
+ *
+ * @return the <CODE>SOAPHeader</CODE> object or <CODE>
+ * null</CODE> if there is none
+ * @throws org.apache.axis.om.OMException if there is a problem
+ * obtaining the <CODE>SOAPHeader</CODE> object
+ */
public SOAPHeader getHeader() throws OMException {
-// if(builder != null){
-// while(header == null && body == null){
-// builder.next();
-// }
-// }
+ // if(builder != null){
+ // while(header == null && body == null){
+ // builder.next();
+ // }
+ // }
OMNode node = getFirstChild();
while (node != null) {
if (node != null && node.getType() == OMNode.ELEMENT_NODE) {
@@ -86,14 +93,14 @@
public SOAPBody getBody() throws OMException {
//Look at this . this code forces the OM to build the whole thing because
//the iterator needs to stay <i>ahead</i> one node.We need to do this manually
-// if(builder != null){
-// while( body == null){
-// builder.next();
-// }
-//
-// }
+ // if(builder != null){
+ // while( body == null){
+ // builder.next();
+ // }
+ //
+ // }
-// return body;
+ // return body;
OMNode node = getFirstChild();
while (node != null) {
@@ -106,13 +113,13 @@
node = node.getNextSibling();
}
return null;
-// Iterator bodyIterator = this.getChildrenWithName(new QName(OMConstants.BODY_NAMESPACE_URI, OMConstants.BODY_LOCAL_NAME));
-// SOAPBody soapBody = null;
-// if (bodyIterator.hasNext()) {
-// soapBody = (SOAPBody) bodyIterator.next();
-// }
-//
-// return soapBody;
+ // Iterator bodyIterator = this.getChildrenWithName(new QName(OMConstants.BODY_NAMESPACE_URI, OMConstants.BODY_LOCAL_NAME));
+ // SOAPBody soapBody = null;
+ // if (bodyIterator.hasNext()) {
+ // soapBody = (SOAPBody) bodyIterator.next();
+ // }
+ //
+ // return soapBody;
}
public void detach() throws OMException {
Modified: webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/SOAPFaultImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/SOAPFaultImpl.java?view=diff&r1=154387&r2=154388
==============================================================================
--- webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/SOAPFaultImpl.java (original)
+++ webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/SOAPFaultImpl.java Fri Feb 18 19:24:49 2005
@@ -1,6 +1,30 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+
package org.apache.axis.om.impl.llom;
-import org.apache.axis.om.*;
+import org.apache.axis.om.OMConstants;
+import org.apache.axis.om.OMElement;
+import org.apache.axis.om.OMException;
+import org.apache.axis.om.OMFactory;
+import org.apache.axis.om.OMNamespace;
+import org.apache.axis.om.OMNode;
+import org.apache.axis.om.OMText;
+import org.apache.axis.om.OMXMLParserWrapper;
+import org.apache.axis.om.SOAPFault;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLOutputFactory;
@@ -10,24 +34,7 @@
import java.io.StringWriter;
import java.util.Iterator;
-/**
- * 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 SOAPFaultImpl extends OMElementImpl implements SOAPFault, OMConstants {
-
private Exception e;
private OMElementImpl faultCodeElement;
private OMElementImpl faultActorElement;
@@ -49,7 +56,6 @@
}
public void setFaultCode(QName faultCode) throws OMException {
-
if (faultCodeElement != null) {
faultCodeElement.detach();
}
@@ -106,7 +112,6 @@
return null;
}
-
public void setFaultString(String faultString) throws OMException {
if (faultStringElement != null) {
faultStringElement.detach();
@@ -161,10 +166,8 @@
return null;
}
-
public Exception getException() throws OMException {
if (e == null) {
-
OMNode detailsInformationNode = this.getDetailInformation();
if (detailsInformationNode instanceof OMElement) {
try {
@@ -177,7 +180,6 @@
throw new OMException("Exception in StAX Writer", e1);
}
} else if (detailsInformationNode instanceof OMText) {
-
return new Exception(((OMText) detailsInformationNode).getValue());
}
Modified: webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/SOAPHeaderBlockImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/SOAPHeaderBlockImpl.java?view=diff&r1=154387&r2=154388
==============================================================================
--- webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/SOAPHeaderBlockImpl.java (original)
+++ webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/SOAPHeaderBlockImpl.java Fri Feb 18 19:24:49 2005
@@ -1,27 +1,31 @@
-package org.apache.axis.om.impl.llom;
-
-import org.apache.axis.om.*;
-
-import javax.xml.namespace.QName;
-
-/**
- * Copyright 2001-2004 The Apache Software Foundation.
- * <p/>
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
* 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/>
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* 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 SOAPHeaderBlockImpl extends OMElementImpl implements SOAPHeaderBlock {
+
+package org.apache.axis.om.impl.llom;
+
+import org.apache.axis.om.OMAttribute;
+import org.apache.axis.om.OMConstants;
+import org.apache.axis.om.OMElement;
+import org.apache.axis.om.OMNamespace;
+import org.apache.axis.om.OMXMLParserWrapper;
+import org.apache.axis.om.SOAPHeaderBlock;
+import javax.xml.namespace.QName;
+
+public class SOAPHeaderBlockImpl extends OMElementImpl implements SOAPHeaderBlock {
/**
* @param localName
* @param ns
@@ -77,28 +81,26 @@
}
private String getAttribute(String attrName) {
-
OMAttribute omAttribute = this.getAttributeWithQName(new QName(OMConstants.SOAP_ENVELOPE_NAMESPACE_URI, attrName));
return (omAttribute != null) ? omAttribute.getValue() : null;
}
/**
- * Sets the mustUnderstand attribute for this <CODE>
- * SOAPHeaderBlock</CODE> object to be on or off.
- * <p/>
- * <P>If the mustUnderstand attribute is on, the actor who
- * receives the <CODE>SOAPHeaderBlock</CODE> must process it
- * correctly. This ensures, for example, that if the <CODE>
- * SOAPHeaderBlock</CODE> object modifies the message, that
- * the message is being modified correctly.</P>
- *
- * @param mustUnderstand <CODE>true</CODE> to
- * set the mustUnderstand attribute on; <CODE>false</CODE>
- * to turn if off
- * @throws IllegalArgumentException if
- * there is a problem in setting the actor.
- * @see #getMustUnderstand() getMustUnderstand()
- */
+ * Sets the mustUnderstand attribute for this <CODE>
+ * SOAPHeaderBlock</CODE> object to be on or off.
+ * <P>If the mustUnderstand attribute is on, the actor who
+ * receives the <CODE>SOAPHeaderBlock</CODE> must process it
+ * correctly. This ensures, for example, that if the <CODE>
+ * SOAPHeaderBlock</CODE> object modifies the message, that
+ * the message is being modified correctly.</P>
+ *
+ * @param mustUnderstand <CODE>true</CODE> to
+ * set the mustUnderstand attribute on; <CODE>false</CODE>
+ * to turn if off
+ * @throws IllegalArgumentException if
+ * there is a problem in setting the actor.
+ * @see #getMustUnderstand() getMustUnderstand()
+ */
public void setMustUnderstand(boolean mustUnderstand) {
setAttribute(OMConstants.ATTR_MUSTUNDERSTAND, mustUnderstand ? "true" : "false");
}
Modified: webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/SOAPHeaderImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/SOAPHeaderImpl.java?view=diff&r1=154387&r2=154388
==============================================================================
--- webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/SOAPHeaderImpl.java (original)
+++ webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/SOAPHeaderImpl.java Fri Feb 18 19:24:49 2005
@@ -1,30 +1,34 @@
-package org.apache.axis.om.impl.llom;
-
-import org.apache.axis.om.*;
-import org.apache.axis.om.impl.llom.traverse.OMChildrenWithSpecificAttributeIterator;
-
-import javax.xml.namespace.QName;
-import java.util.Iterator;
-
-/**
- * Copyright 2001-2004 The Apache Software Foundation.
- * <p/>
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
* 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/>
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* 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 SOAPHeaderImpl extends OMElementImpl implements SOAPHeader {
+
+package org.apache.axis.om.impl.llom;
+import org.apache.axis.om.OMConstants;
+import org.apache.axis.om.OMException;
+import org.apache.axis.om.OMNamespace;
+import org.apache.axis.om.OMXMLParserWrapper;
+import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.SOAPHeader;
+import org.apache.axis.om.SOAPHeaderBlock;
+import org.apache.axis.om.impl.llom.traverse.OMChildrenWithSpecificAttributeIterator;
+import javax.xml.namespace.QName;
+import java.util.Iterator;
+
+public class SOAPHeaderImpl extends OMElementImpl implements SOAPHeader {
/**
* @param envelope
*/
@@ -77,14 +81,13 @@
*/
public Iterator examineHeaderBlocks(String paramActor) {
Iterator headerBlocksIter = this.getChildren();
-
while (headerBlocksIter.hasNext()) {
Object o = headerBlocksIter.next();
if (o instanceof SOAPHeaderBlock) {
SOAPHeaderBlock soapHeaderBlock = (SOAPHeaderBlock) o;
String actor = soapHeaderBlock.getActor();
if (actor != null && actor.equalsIgnoreCase(paramActor)) {
-// headerBlocksIter.
+ // headerBlocksIter.
}
}
}
@@ -92,23 +95,22 @@
}
/**
- * Returns a list of all the <CODE>SOAPHeaderBlock</CODE>
- * objects in this <CODE>SOAPHeader</CODE> object that have
- * the the specified actor and detaches them from this <CODE>
- * SOAPHeader</CODE> object.
- * <p/>
- * <P>This method allows an actor to process only the parts of
- * the <CODE>SOAPHeader</CODE> object that apply to it and to
- * remove them before passing the message on to the next
- * actor.
- *
- * @param actor a <CODE>String</CODE> giving the
- * URI of the actor for which to search
- * @return an <CODE>Iterator</CODE> object over all the <CODE>
- * SOAPHeaderBlock</CODE> objects that contain the
- * specified actor
- * @see #examineHeaderBlocks(String) examineHeaderBlocks(java.lang.String)
- */
+ * Returns a list of all the <CODE>SOAPHeaderBlock</CODE>
+ * objects in this <CODE>SOAPHeader</CODE> object that have
+ * the the specified actor and detaches them from this <CODE>
+ * SOAPHeader</CODE> object.
+ * <P>This method allows an actor to process only the parts of
+ * the <CODE>SOAPHeader</CODE> object that apply to it and to
+ * remove them before passing the message on to the next
+ * actor.
+ *
+ * @param actor a <CODE>String</CODE> giving the
+ * URI of the actor for which to search
+ * @return an <CODE>Iterator</CODE> object over all the <CODE>
+ * SOAPHeaderBlock</CODE> objects that contain the
+ * specified actor
+ * @see #examineHeaderBlocks(String) examineHeaderBlocks(java.lang.String)
+ */
public Iterator extractHeaderBlocks(String actor) {
return new OMChildrenWithSpecificAttributeIterator(getFirstChild(), new QName(OMConstants.SOAP_ENVELOPE_NAMESPACE_URI, OMConstants.ATTR_ACTOR), actor, true);
}
@@ -131,16 +133,15 @@
}
/**
- * Returns an <code>Iterator</code> over all the
- * <code>SOAPHeaderBlock</code> objects in this <code>SOAPHeader</code>
- * object.
- * <p/>
- * Not that this will return elements containing the QName (http://schemas.xmlsoap.org/soap/envelope/, Header)
- *
- * @return an <code>Iterator</code> object over all the
- * <code>SOAPHeaderBlock</code> objects contained by this
- * <code>SOAPHeader</code>
- */
+ * Returns an <code>Iterator</code> over all the
+ * <code>SOAPHeaderBlock</code> objects in this <code>SOAPHeader</code>
+ * object.
+ * Not that this will return elements containing the QName (http://schemas.xmlsoap.org/soap/envelope/, Header)
+ *
+ * @return an <code>Iterator</code> object over all the
+ * <code>SOAPHeaderBlock</code> objects contained by this
+ * <code>SOAPHeader</code>
+ */
public Iterator examineAllHeaderBlocks() {
return this.getChildrenWithName(null);
}
Modified: webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/builder/StAXBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/builder/StAXBuilder.java?view=diff&r1=154387&r2=154388
==============================================================================
--- webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/builder/StAXBuilder.java (original)
+++ webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/builder/StAXBuilder.java Fri Feb 18 19:24:49 2005
@@ -1,41 +1,45 @@
-package org.apache.axis.om.impl.llom.builder;
-
-import org.apache.axis.om.*;
-import org.apache.axis.om.impl.llom.OMElementImpl;
-import org.apache.axis.om.impl.llom.OMNodeImpl;
-
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamReader;
-
-/**
- * Copyright 2001-2004 The Apache Software Foundation.
- * <p/>
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
* 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/>
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* 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/>
*/
+
+package org.apache.axis.om.impl.llom.builder;
+
+import org.apache.axis.om.OMConstants;
+import org.apache.axis.om.OMElement;
+import org.apache.axis.om.OMException;
+import org.apache.axis.om.OMFactory;
+import org.apache.axis.om.OMNamespace;
+import org.apache.axis.om.OMNode;
+import org.apache.axis.om.OMXMLParserWrapper;
+import org.apache.axis.om.impl.llom.OMElementImpl;
+import org.apache.axis.om.impl.llom.OMNodeImpl;
+
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamReader;
/**
* OM should be able to built from any data source. And the model it builds may be a SOAP specific one
* or just an XML model. This class will give some common functionality of OM Building from StAX.
*/
public abstract class StAXBuilder implements OMXMLParserWrapper {
-
protected OMFactory ombuilderFactory;
protected XMLStreamReader parser;
protected OMFactory omfactory;
protected OMNode lastNode;
-//returns the state of completion
+ //returns the state of completion
protected boolean done = false;
//keeps the state of the cache
@@ -100,14 +104,12 @@
}
public void discard(OMElement el) throws OMException {
-
OMElementImpl elementImpl = null;
if (el instanceof OMElementImpl) {
elementImpl = (OMElementImpl) el;
} else {
throw new OMException();
}
-
if (elementImpl.isComplete() || !cache)
throw new OMException();
try {
@@ -218,17 +220,15 @@
protected abstract OMNode createOMElement() throws OMException;
/**
- * This should proceed the parser one step further, if parser is not completed yet.
- * If this has been called whist parser is done, then throw an OMException.
- * <p/>
- * If the cache is set to false, then should be return the event, *without* building the OM tree.
- * <p/>
- * If the cache is set to true, then this should handle all the events within this, and should build
- * the object structure appropriately and return the event.
- *
- * @return
- * @throws OMException
- */
+ * This should proceed the parser one step further, if parser is not completed yet.
+ * If this has been called whist parser is done, then throw an OMException.
+ * If the cache is set to false, then should be return the event, *without* building the OM tree.
+ * If the cache is set to true, then this should handle all the events within this, and should build
+ * the object structure appropriately and return the event.
+ *
+ * @return
+ * @throws OMException
+ */
public abstract int next() throws OMException;
/**
Modified: webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/builder/StAXOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/builder/StAXOMBuilder.java?view=diff&r1=154387&r2=154388
==============================================================================
--- webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/builder/StAXOMBuilder.java (original)
+++ webservices/axis/trunk/java/modules/om/src/java/org/apache/axis/om/impl/llom/builder/StAXOMBuilder.java Fri Feb 18 19:24:49 2005
@@ -1,27 +1,32 @@
-package org.apache.axis.om.impl.llom.builder;
-
-import org.apache.axis.om.*;
-import org.apache.axis.om.impl.llom.OMDocument;
-
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamReader;
-
-/**
- * Copyright 2001-2004 The Apache Software Foundation.
- * <p/>
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
* 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/>
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* 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/>
*/
+
+package org.apache.axis.om.impl.llom.builder;
+
+import org.apache.axis.om.OMElement;
+import org.apache.axis.om.OMException;
+import org.apache.axis.om.OMFactory;
+import org.apache.axis.om.OMNamespace;
+import org.apache.axis.om.OMNode;
+import org.apache.axis.om.OMXMLParserWrapper;
+import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.impl.llom.OMDocument;
+
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamReader;
/**
* This will construct an OM without using SOAP specific classes like SOAPEnvelope, SOAPHeader, SOAPHeaderBlock and SOAPBody.
@@ -46,7 +51,6 @@
protected OMNode createOMElement() throws OMException {
OMElement node;
String elementName = parser.getLocalName();
-
if (lastNode == null) {
node = omfactory.createOMElement(elementName, null, null, this);
document.setRootElement(node);
@@ -65,7 +69,6 @@
//fill in the attributes
processAttributes(node);
-
return node;
}
@@ -75,29 +78,22 @@
public int next() throws OMException {
try {
-
if (done)
throw new OMException();
-
int token = parser.next();
-
if (!cache) {
return token;
}
-
switch (token) {
case XMLStreamConstants.START_ELEMENT:
lastNode = createOMElement();
break;
-
case XMLStreamConstants.START_DOCUMENT:
document = new OMDocument(this);
break;
-
case XMLStreamConstants.CHARACTERS:
lastNode = createOMText();
break;
-
case XMLStreamConstants.END_ELEMENT:
if (lastNode.isComplete()) {
OMElement parent = lastNode.getParent();
@@ -108,15 +104,12 @@
e.setComplete(true);
}
break;
-
case XMLStreamConstants.END_DOCUMENT:
done = true;
-
break;
case XMLStreamConstants.SPACE:
next();
break;
-
default :
throw new OMException();
}