You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2011/04/02 13:29:00 UTC
svn commit: r1087999 - in
/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom:
om/ om/impl/ soap/ soap/impl/builder/
Author: veithen
Date: Sat Apr 2 11:29:00 2011
New Revision: 1087999
URL: http://svn.apache.org/viewvc?rev=1087999&view=rev
Log:
AXIOM-353: Introduced a specific interface for SOAP model builders.
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPModelBuilder.java (with props)
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMMetaFactory.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMXMLBuilderFactory.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/AbstractOMMetaFactory.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMMetaFactory.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMMetaFactory.java?rev=1087999&r1=1087998&r2=1087999&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMMetaFactory.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMMetaFactory.java Sat Apr 2 11:29:00 2011
@@ -23,6 +23,7 @@ import javax.xml.stream.XMLStreamReader;
import org.apache.axiom.om.util.StAXParserConfiguration;
import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axiom.soap.SOAPModelBuilder;
import org.xml.sax.InputSource;
/**
@@ -104,7 +105,7 @@ public interface OMMetaFactory {
* the stream reader to read the SOAP message from
* @return the builder
*/
- OMXMLParserWrapper createStAXSOAPModelBuilder(XMLStreamReader parser);
+ SOAPModelBuilder createStAXSOAPModelBuilder(XMLStreamReader parser);
/**
* Create an object model builder for SOAP that reads a message from the provided input source.
@@ -118,5 +119,5 @@ public interface OMMetaFactory {
* the source of the SOAP message
* @return the builder
*/
- OMXMLParserWrapper createSOAPModelBuilder(StAXParserConfiguration configuration, InputSource is);
+ SOAPModelBuilder createSOAPModelBuilder(StAXParserConfiguration configuration, InputSource is);
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMXMLBuilderFactory.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMXMLBuilderFactory.java?rev=1087999&r1=1087998&r2=1087999&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMXMLBuilderFactory.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMXMLBuilderFactory.java Sat Apr 2 11:29:00 2011
@@ -25,6 +25,7 @@ import javax.xml.stream.XMLStreamReader;
import org.apache.axiom.om.util.StAXParserConfiguration;
import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axiom.soap.SOAPModelBuilder;
import org.xml.sax.InputSource;
/**
@@ -190,7 +191,7 @@ public class OMXMLBuilderFactory {
* the charset encoding
* @return the builder
*/
- public static OMXMLParserWrapper createSOAPModelBuilder(InputStream in, String encoding) {
+ public static SOAPModelBuilder createSOAPModelBuilder(InputStream in, String encoding) {
InputSource is = new InputSource(in);
is.setEncoding(encoding);
return OMAbstractFactory.getMetaFactory().createSOAPModelBuilder(StAXParserConfiguration.SOAP, is);
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/AbstractOMMetaFactory.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/AbstractOMMetaFactory.java?rev=1087999&r1=1087998&r2=1087999&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/AbstractOMMetaFactory.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/AbstractOMMetaFactory.java Sat Apr 2 11:29:00 2011
@@ -28,6 +28,7 @@ import org.apache.axiom.om.OMXMLParserWr
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.util.StAXParserConfiguration;
import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.soap.SOAPModelBuilder;
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.xml.sax.InputSource;
@@ -69,13 +70,13 @@ public abstract class AbstractOMMetaFact
return createStAXOMBuilder(omFactory, createXMLStreamReader(configuration, is));
}
- public OMXMLParserWrapper createStAXSOAPModelBuilder(XMLStreamReader parser) {
+ public SOAPModelBuilder createStAXSOAPModelBuilder(XMLStreamReader parser) {
StAXSOAPModelBuilder builder = new StAXSOAPModelBuilder(this, parser);
builder.releaseParserOnClose(true);
return builder;
}
- public OMXMLParserWrapper createSOAPModelBuilder(StAXParserConfiguration configuration, InputSource is) {
+ public SOAPModelBuilder createSOAPModelBuilder(StAXParserConfiguration configuration, InputSource is) {
return createStAXSOAPModelBuilder(createXMLStreamReader(configuration, is));
}
}
Added: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPModelBuilder.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPModelBuilder.java?rev=1087999&view=auto
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPModelBuilder.java (added)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPModelBuilder.java Sat Apr 2 11:29:00 2011
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.axiom.soap;
+
+import org.apache.axiom.om.OMXMLParserWrapper;
+
+/**
+ * SOAP specific extension to {@link OMXMLParserWrapper}.
+ */
+public interface SOAPModelBuilder extends OMXMLParserWrapper {
+ /**
+ * Get the SOAP envelope for the document processed by this builder.
+ *
+ * @return the SOAP envelope
+ */
+ SOAPEnvelope getSOAPEnvelope();
+}
Propchange: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPModelBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java?rev=1087999&r1=1087998&r2=1087999&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java Sat Apr 2 11:29:00 2011
@@ -39,6 +39,7 @@ import org.apache.axiom.soap.SOAPEnvelop
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPMessage;
+import org.apache.axiom.soap.SOAPModelBuilder;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -65,7 +66,7 @@ import javax.xml.stream.XMLStreamReader;
* specified when the builder is constructed, or if none is specified, from the default
* meta factory returned by {@link OMAbstractFactory#getMetaFactory()}.
*/
-public class StAXSOAPModelBuilder extends StAXOMBuilder {
+public class StAXSOAPModelBuilder extends StAXOMBuilder implements SOAPModelBuilder {
SOAPMessage soapMessage;
/** Field envelope */
@@ -193,12 +194,6 @@ public class StAXSOAPModelBuilder extend
}
- /**
- * Method getSOAPEnvelope.
- *
- * @return Returns SOAPEnvelope.
- * @throws OMException
- */
public SOAPEnvelope getSOAPEnvelope() throws OMException {
while ((envelope == null) && !done) {
next();