You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by gd...@apache.org on 2007/03/07 15:59:13 UTC
svn commit: r515594 [13/19] - in
/webservices/commons/trunk/modules/axiom/modules:
axiom-api/src/main/java/org/apache/axiom/attachments/
axiom-api/src/main/java/org/apache/axiom/attachments/utils/
axiom-api/src/main/java/org/apache/axiom/om/ axiom-api/...
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11Factory.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11Factory.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11Factory.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11Factory.java Wed Mar 7 06:59:00 2007
@@ -40,15 +40,13 @@
import org.apache.axiom.soap.impl.llom.SOAPEnvelopeImpl;
import org.apache.axiom.soap.impl.llom.SOAPMessageImpl;
-public class SOAP11Factory extends OMLinkedListImplFactory implements SOAPFactory {
- /**
- * Eran Chinthaka (chinthaka@apache.org)
- */
+public class SOAP11Factory extends OMLinkedListImplFactory implements SOAPFactory {
+ /** Eran Chinthaka (chinthaka@apache.org) */
public OMNamespace getNamespace() {
return new OMNamespaceImpl(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI,
- SOAP11Constants.SOAP_DEFAULT_NAMESPACE_PREFIX);
+ SOAP11Constants.SOAP_DEFAULT_NAMESPACE_PREFIX);
}
public String getSoapVersionURI() {
@@ -78,12 +76,13 @@
}
public SOAPHeaderBlock createSOAPHeaderBlock(String localName,
- OMNamespace ns, SOAPHeader parent) throws SOAPProcessingException {
+ OMNamespace ns, SOAPHeader parent)
+ throws SOAPProcessingException {
return new SOAP11HeaderBlockImpl(localName, ns, parent, this);
}
public SOAPHeaderBlock createSOAPHeaderBlock(String localName,
- OMNamespace ns) throws SOAPProcessingException {
+ OMNamespace ns) throws SOAPProcessingException {
return new SOAP11HeaderBlockImpl(localName, ns, this);
}
@@ -302,7 +301,6 @@
public SOAPMessage createSOAPMessage(SOAPEnvelope envelope, OMXMLParserWrapper parserWrapper) {
return new SOAPMessageImpl(envelope, parserWrapper);
}
-
public SOAPEnvelope createSOAPEnvelope(OMXMLParserWrapper builder) {
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultCodeImpl.java Wed Mar 7 06:59:00 2007
@@ -18,9 +18,9 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.util.ElementHelper;
-import org.apache.axiom.om.impl.util.OMSerializerUtil;
import org.apache.axiom.om.impl.serialize.StreamWriterToContentHandlerConverter;
+import org.apache.axiom.om.impl.util.OMSerializerUtil;
+import org.apache.axiom.om.util.ElementHelper;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
@@ -42,7 +42,8 @@
super(parent, SOAP11Constants.SOAP_FAULT_CODE_LOCAL_NAME, builder, factory);
}
- public SOAP11FaultCodeImpl(SOAPFault parent, SOAPFactory factory) throws SOAPProcessingException {
+ public SOAP11FaultCodeImpl(SOAPFault parent, SOAPFactory factory)
+ throws SOAPProcessingException {
super(parent, SOAP11Constants.SOAP_FAULT_CODE_LOCAL_NAME, false, factory);
}
@@ -70,7 +71,8 @@
}
}
- protected void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
+ protected void internalSerialize(XMLStreamWriter writer, boolean cache)
+ throws XMLStreamException {
// select the builder
short builderType = PULL_TYPE_BUILDER; // default is pull type
@@ -83,10 +85,10 @@
new StreamWriterToContentHandlerConverter(writer));
}
- OMSerializerUtil.serializeStartpart(this,
- SOAP11Constants.SOAP_FAULT_CODE_LOCAL_NAME,
- writer);
-
+ OMSerializerUtil.serializeStartpart(this,
+ SOAP11Constants.SOAP_FAULT_CODE_LOCAL_NAME,
+ writer);
+
String text = this.getText();
writer.writeCharacters(text);
writer.writeEndElement();
@@ -98,7 +100,7 @@
public SOAPFaultValue getValue() {
return (SOAPFaultValue) ElementHelper.getChildWithName(this,
- SOAP11Constants.SOAP_FAULT_CODE_LOCAL_NAME);
+ SOAP11Constants.SOAP_FAULT_CODE_LOCAL_NAME);
}
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultDetailImpl.java Wed Mar 7 06:59:00 2007
@@ -43,7 +43,7 @@
}
public SOAP11FaultDetailImpl(SOAPFault parent, OMXMLParserWrapper builder,
- SOAPFactory factory) {
+ SOAPFactory factory) {
super(parent, builder, factory);
}
@@ -51,7 +51,7 @@
if (!(parent instanceof SOAP11FaultImpl)) {
throw new SOAPProcessingException(
"Expecting SOAP 1.1 implementation of SOAP Fault as the " +
- "parent. But received some other implementation");
+ "parent. But received some other implementation");
}
}
@@ -68,13 +68,13 @@
new StreamWriterToContentHandlerConverter(writer));
}
- OMSerializerUtil.serializeStartpart(this,
- SOAP11Constants.SOAP_FAULT_DETAIL_LOCAL_NAME,
- writer);
-
+ OMSerializerUtil.serializeStartpart(this,
+ SOAP11Constants.SOAP_FAULT_DETAIL_LOCAL_NAME,
+ writer);
+
OMNode child = firstChild;
while (child != null && ((!(child instanceof OMElement)) || child.isComplete())) {
- ((OMNodeImpl) child).internalSerializeAndConsume(writer);
+ ((OMNodeImpl) child).internalSerializeAndConsume(writer);
child = child.getNextOMSibling();
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultImpl.java Wed Mar 7 06:59:00 2007
@@ -35,9 +35,7 @@
public class SOAP11FaultImpl extends SOAPFaultImpl {
- /**
- * Eran Chinthaka (chinthaka@apache.org)
- */
+ /** Eran Chinthaka (chinthaka@apache.org) */
public SOAP11FaultImpl(SOAPFactory factory) {
@@ -67,7 +65,7 @@
protected SOAPFaultDetail getNewSOAPFaultDetail(SOAPFault fault)
throws SOAPProcessingException {
- return new SOAP11FaultDetailImpl(fault, (SOAPFactory)this.factory);
+ return new SOAP11FaultDetailImpl(fault, (SOAPFactory) this.factory);
}
@@ -81,7 +79,7 @@
if (!(soapFaultCode instanceof SOAP11FaultCodeImpl)) {
throw new SOAPProcessingException(
"Expecting SOAP 1.1 implementation of SOAP Fault Code. " +
- "But received some other implementation");
+ "But received some other implementation");
}
super.setCode(soapFaultCode);
}
@@ -90,7 +88,7 @@
if (!(reason instanceof SOAP11FaultReasonImpl)) {
throw new SOAPProcessingException(
"Expecting SOAP 1.1 implementation of SOAP Fault Reason. " +
- "But received some other implementation");
+ "But received some other implementation");
}
super.setReason(reason);
}
@@ -99,7 +97,7 @@
if (!(node instanceof SOAP11FaultNodeImpl)) {
throw new SOAPProcessingException(
"Expecting SOAP 1.1 implementation of SOAP Fault Node. " +
- "But received some other implementation");
+ "But received some other implementation");
}
super.setNode(node);
}
@@ -108,7 +106,7 @@
if (!(role instanceof SOAP11FaultRoleImpl)) {
throw new SOAPProcessingException(
"Expecting SOAP 1.1 implementation of SOAP Fault Role. " +
- "But received some other implementation");
+ "But received some other implementation");
}
super.setRole(role);
}
@@ -117,7 +115,7 @@
if (!(parent instanceof SOAP11BodyImpl)) {
throw new SOAPProcessingException(
"Expecting SOAP 1.1 implementation of SOAP Body as the " +
- "parent. But received some other implementation");
+ "parent. But received some other implementation");
}
}
@@ -125,7 +123,7 @@
if (!(detail instanceof SOAP11FaultDetailImpl)) {
throw new SOAPProcessingException(
"Expecting SOAP 1.1 implementation of SOAP Fault Detail. " +
- "But received some other implementation");
+ "But received some other implementation");
}
super.setDetail(detail);
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultNodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultNodeImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultNodeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultNodeImpl.java Wed Mar 7 06:59:00 2007
@@ -37,7 +37,7 @@
}
public SOAP11FaultNodeImpl(SOAPFault parent, OMXMLParserWrapper builder,
- SOAPFactory factory) {
+ SOAPFactory factory) {
super(parent, builder, factory);
}
@@ -45,7 +45,7 @@
if (!(parent instanceof SOAP11FaultImpl)) {
throw new SOAPProcessingException(
"Expecting SOAP 1.1 implementation of SOAP Fault as the " +
- "parent. But received some other implementation");
+ "parent. But received some other implementation");
}
}
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultReasonImpl.java Wed Mar 7 06:59:00 2007
@@ -18,8 +18,8 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.util.OMSerializerUtil;
import org.apache.axiom.om.impl.serialize.StreamWriterToContentHandlerConverter;
+import org.apache.axiom.om.impl.util.OMSerializerUtil;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
@@ -33,22 +33,18 @@
public class SOAP11FaultReasonImpl extends SOAPFaultReasonImpl {
- /**
- * Eran Chinthaka (chinthaka@apache.org)
- */
+ /** Eran Chinthaka (chinthaka@apache.org) */
- public SOAP11FaultReasonImpl(SOAPFactory factory) {
+ public SOAP11FaultReasonImpl(SOAPFactory factory) {
super(null, factory);
}
public SOAP11FaultReasonImpl(SOAPFault parent, OMXMLParserWrapper builder,
- SOAPFactory factory) {
+ SOAPFactory factory) {
super(parent, builder, factory);
}
- /**
- * @param parent
- */
+ /** @param parent */
public SOAP11FaultReasonImpl(SOAPFault parent, SOAPFactory factory)
throws SOAPProcessingException {
super(parent, false, factory);
@@ -59,7 +55,7 @@
if (!(soapFaultText instanceof SOAP11FaultTextImpl)) {
throw new SOAPProcessingException(
"Expecting SOAP 1.1 implementation of SOAP Fault Text. " +
- "But received some other implementation");
+ "But received some other implementation");
}
super.addSOAPText(soapFaultText);
}
@@ -68,7 +64,7 @@
if (!(parent instanceof SOAP11FaultImpl)) {
throw new SOAPProcessingException(
"Expecting SOAP 1.1 implementation of SOAP Fault as the " +
- "parent. But received some other implementation");
+ "parent. But received some other implementation");
}
}
@@ -86,15 +82,15 @@
new StreamWriterToContentHandlerConverter(writer));
}
- OMSerializerUtil.serializeStartpart(this,
- SOAP11Constants.SOAP_FAULT_STRING_LOCAL_NAME,
- writer);
+ OMSerializerUtil.serializeStartpart(this,
+ SOAP11Constants.SOAP_FAULT_STRING_LOCAL_NAME,
+ writer);
String text = this.getText();
writer.writeCharacters(text);
writer.writeEndElement();
}
-
+
public String getLocalName() {
return SOAP11Constants.SOAP_FAULT_STRING_LOCAL_NAME;
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultRoleImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultRoleImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultRoleImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultRoleImpl.java Wed Mar 7 06:59:00 2007
@@ -18,8 +18,8 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.util.OMSerializerUtil;
import org.apache.axiom.om.impl.serialize.StreamWriterToContentHandlerConverter;
+import org.apache.axiom.om.impl.util.OMSerializerUtil;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
@@ -30,7 +30,7 @@
import javax.xml.stream.XMLStreamWriter;
public class SOAP11FaultRoleImpl extends SOAPFaultRoleImpl {
-
+
public SOAP11FaultRoleImpl(SOAPFault parent, SOAPFactory factory)
throws SOAPProcessingException {
super(parent, false, factory);
@@ -41,7 +41,7 @@
}
public SOAP11FaultRoleImpl(SOAPFault parent, OMXMLParserWrapper builder,
- SOAPFactory factory) {
+ SOAPFactory factory) {
super(parent, builder, factory);
}
@@ -49,7 +49,7 @@
if (!(parent instanceof SOAP11FaultImpl)) {
throw new SOAPProcessingException(
"Expecting SOAP 1.1 implementation of SOAP Fault as the " +
- "parent. But received some other implementation");
+ "parent. But received some other implementation");
}
}
@@ -68,10 +68,10 @@
new StreamWriterToContentHandlerConverter(writer));
}
- OMSerializerUtil.serializeStartpart(this,
- SOAP11Constants.SOAP_FAULT_ACTOR_LOCAL_NAME,
- writer);
-
+ OMSerializerUtil.serializeStartpart(this,
+ SOAP11Constants.SOAP_FAULT_ACTOR_LOCAL_NAME,
+ writer);
+
String text = this.getText();
writer.writeCharacters(text);
writer.writeEndElement();
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultSubCodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultSubCodeImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultSubCodeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultSubCodeImpl.java Wed Mar 7 06:59:00 2007
@@ -44,7 +44,7 @@
OMXMLParserWrapper builder,
SOAPFactory factory) {
super(parent, SOAP12Constants.SOAP_FAULT_SUB_CODE_LOCAL_NAME, builder,
- factory);
+ factory);
}
public SOAP11FaultSubCodeImpl(SOAPFaultSubCode parent, SOAPFactory factory)
@@ -56,25 +56,30 @@
OMXMLParserWrapper builder,
SOAPFactory factory) {
super(parent, SOAP12Constants.SOAP_FAULT_SUB_CODE_LOCAL_NAME, builder,
- factory);
+ factory);
}
protected void checkParent(OMElement parent) throws SOAPProcessingException {
- if (!((parent instanceof SOAP11FaultSubCodeImpl) || (parent instanceof SOAP11FaultCodeImpl))) {
- throw new SOAPProcessingException("Expecting SOAP 1.1 implementation of SOAP FaultSubCode or SOAP FaultCode as the parent. But received some other implementation");
+ if (!((parent instanceof SOAP11FaultSubCodeImpl) ||
+ (parent instanceof SOAP11FaultCodeImpl))) {
+ throw new SOAPProcessingException(
+ "Expecting SOAP 1.1 implementation of SOAP FaultSubCode or SOAP FaultCode as the parent. But received some other implementation");
}
}
public void setSubCode(SOAPFaultSubCode subCode) throws SOAPProcessingException {
- if (!((parent instanceof SOAP11FaultSubCodeImpl) || (parent instanceof SOAP11FaultCodeImpl))) {
- throw new SOAPProcessingException("Expecting SOAP 1.1 implementation of SOAP Fault Sub Code. But received some other implementation");
+ if (!((parent instanceof SOAP11FaultSubCodeImpl) ||
+ (parent instanceof SOAP11FaultCodeImpl))) {
+ throw new SOAPProcessingException(
+ "Expecting SOAP 1.1 implementation of SOAP Fault Sub Code. But received some other implementation");
}
super.setSubCode(subCode);
}
public void setValue(SOAPFaultValue soapFaultSubCodeValue) throws SOAPProcessingException {
if (!(soapFaultSubCodeValue instanceof SOAP11FaultValueImpl)) {
- throw new SOAPProcessingException("Expecting SOAP 1.1 implementation of SOAP Fault Value. But received some other implementation");
+ throw new SOAPProcessingException(
+ "Expecting SOAP 1.1 implementation of SOAP Fault Value. But received some other implementation");
}
super.setValue(soapFaultSubCodeValue);
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultTextImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultTextImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultTextImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultTextImpl.java Wed Mar 7 06:59:00 2007
@@ -25,7 +25,7 @@
import org.apache.axiom.soap.impl.llom.SOAPFaultTextImpl;
public class SOAP11FaultTextImpl extends SOAPFaultTextImpl {
-
+
public SOAP11FaultTextImpl(SOAPFaultReason parent, SOAPFactory factory)
throws SOAPProcessingException {
super(parent, factory);
@@ -37,7 +37,7 @@
}
public SOAP11FaultTextImpl(SOAPFaultReason parent,
- OMXMLParserWrapper builder,
+ OMXMLParserWrapper builder,
SOAPFactory factory) {
super(parent, builder, factory);
}
@@ -46,7 +46,7 @@
if (!(parent instanceof SOAP11FaultReasonImpl)) {
throw new SOAPProcessingException(
"Expecting SOAP 1.1 implementation of SOAP FaultReason as " +
- "the parent. But received some other implementation");
+ "the parent. But received some other implementation");
}
}
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultValueImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultValueImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultValueImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultValueImpl.java Wed Mar 7 06:59:00 2007
@@ -19,14 +19,15 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMXMLParserWrapper;
+import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPProcessingException;
-import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.impl.llom.SOAPFaultValueImpl;
public class SOAP11FaultValueImpl extends SOAPFaultValueImpl {
-
- public SOAP11FaultValueImpl(OMElement parent, SOAPFactory factory) throws SOAPProcessingException {
+
+ public SOAP11FaultValueImpl(OMElement parent, SOAPFactory factory)
+ throws SOAPProcessingException {
super(SOAP11Constants.SOAP_FAULT_CODE_LOCAL_NAME, parent, factory);
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11HeaderBlockImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11HeaderBlockImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11HeaderBlockImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11HeaderBlockImpl.java Wed Mar 7 06:59:00 2007
@@ -29,7 +29,7 @@
public class SOAP11HeaderBlockImpl extends SOAPHeaderBlockImpl {
public SOAP11HeaderBlockImpl(String localName, OMNamespace ns,
- SOAPFactory factory) {
+ SOAPFactory factory) {
super(localName, ns, factory);
}
@@ -57,7 +57,7 @@
public SOAP11HeaderBlockImpl(String localName,
OMNamespace ns,
OMElement parent,
- OMXMLParserWrapper builder,
+ OMXMLParserWrapper builder,
SOAPFactory factory) {
super(localName, ns, parent, builder, factory);
}
@@ -72,20 +72,20 @@
public void setRole(String roleURI) {
setAttribute(SOAP11Constants.ATTR_ACTOR,
- roleURI,
- SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
+ roleURI,
+ SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
}
public String getRole() {
return getAttribute(SOAP11Constants.ATTR_ACTOR,
- SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
+ SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
}
public void setMustUnderstand(boolean mustUnderstand) {
setAttribute(SOAPConstants.ATTR_MUSTUNDERSTAND,
- mustUnderstand ? "1" : "0",
- SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
+ mustUnderstand ? "1" : "0",
+ SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
}
public void setMustUnderstand(String mustUnderstand) throws SOAPProcessingException {
@@ -94,8 +94,8 @@
SOAPConstants.ATTR_MUSTUNDERSTAND_0.equals(mustUnderstand) ||
SOAPConstants.ATTR_MUSTUNDERSTAND_1.equals(mustUnderstand)) {
setAttribute(SOAPConstants.ATTR_MUSTUNDERSTAND,
- mustUnderstand,
- SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
+ mustUnderstand,
+ SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
} else {
throw new SOAPProcessingException(
"mustUndertand should be one of \"true\", \"false\", \"0\" or \"1\" ");
@@ -103,18 +103,17 @@
}
/**
- * Returns whether the mustUnderstand attribute for this
- * <CODE>SOAPHeaderBlock</CODE> object is turned on.
+ * Returns whether the mustUnderstand attribute for this <CODE>SOAPHeaderBlock</CODE> object is
+ * turned on.
*
- * @return <CODE>true</CODE> if the mustUnderstand attribute of
- * this <CODE>SOAPHeaderBlock</CODE> object is turned on;
- * <CODE>false</CODE> otherwise
+ * @return <CODE>true</CODE> if the mustUnderstand attribute of this
+ * <CODE>SOAPHeaderBlock</CODE> object is turned on; <CODE>false</CODE> otherwise
*/
public boolean getMustUnderstand() throws SOAPProcessingException {
String mustUnderstand = "";
if ((mustUnderstand =
getAttribute(SOAPConstants.ATTR_MUSTUNDERSTAND,
- SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI))
+ SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI))
!= null) {
if (SOAPConstants.ATTR_MUSTUNDERSTAND_TRUE.equalsIgnoreCase(
mustUnderstand) ||
@@ -129,21 +128,21 @@
} else {
throw new SOAPProcessingException(
"Invalid value found in mustUnderstand value of " +
- this.getLocalName() +
- " header block");
+ this.getLocalName() +
+ " header block");
}
}
return false;
- }
-
- //TODO : implement
- public void setRelay(boolean relay) {
- throw new UnsupportedOperationException("Not supported for SOAP 1.1");
- }
-
- //TODO : implement
- public boolean getRelay() {
- throw new UnsupportedOperationException("Not supported for SOAP 1.1");
+ }
+
+ //TODO : implement
+ public void setRelay(boolean relay) {
+ throw new UnsupportedOperationException("Not supported for SOAP 1.1");
+ }
+
+ //TODO : implement
+ public boolean getRelay() {
+ throw new UnsupportedOperationException("Not supported for SOAP 1.1");
}
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11HeaderImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11HeaderImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11HeaderImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11HeaderImpl.java Wed Mar 7 06:59:00 2007
@@ -34,13 +34,11 @@
public class SOAP11HeaderImpl extends SOAPHeaderImpl {
public SOAP11HeaderImpl(SOAPFactory factory)
- throws SOAPProcessingException {
+ throws SOAPProcessingException {
super(factory.getNamespace(), factory);
}
-
- /**
- * @param envelope
- */
+
+ /** @param envelope */
public SOAP11HeaderImpl(SOAPEnvelope envelope, SOAPFactory factory)
throws SOAPProcessingException {
super(envelope, factory);
@@ -53,13 +51,13 @@
* @param builder
*/
public SOAP11HeaderImpl(SOAPEnvelope envelope, OMXMLParserWrapper builder,
- SOAPFactory factory) {
+ SOAPFactory factory) {
super(envelope, builder, factory);
}
public SOAPHeaderBlock addHeaderBlock(String localName, OMNamespace ns)
throws OMException {
-
+
if (ns == null || ns.getNamespaceURI() == null || "".equals(ns.getNamespaceURI())) {
throw new OMException(
"All the SOAP Header blocks should be namespace qualified");
@@ -73,20 +71,21 @@
SOAPHeaderBlock soapHeaderBlock = null;
try {
soapHeaderBlock = new SOAP11HeaderBlockImpl(localName, ns, this,
- (SOAPFactory)this.factory);
+ (SOAPFactory) this.factory);
} catch (SOAPProcessingException e) {
throw new OMException(e);
}
- ((OMNodeEx)soapHeaderBlock).setComplete(true);
+ ((OMNodeEx) soapHeaderBlock).setComplete(true);
return soapHeaderBlock;
}
public Iterator extractHeaderBlocks(String role) {
return new OMChildrenWithSpecificAttributeIterator(getFirstOMChild(),
- new QName(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI,
- SOAP11Constants.ATTR_ACTOR),
- role,
- true);
+ new QName(
+ SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI,
+ SOAP11Constants.ATTR_ACTOR),
+ role,
+ true);
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12BodyImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12BodyImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12BodyImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12BodyImpl.java Wed Mar 7 06:59:00 2007
@@ -18,19 +18,21 @@
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.soap.*;
+import org.apache.axiom.soap.SOAPConstants;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axiom.soap.SOAPFault;
+import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.llom.SOAPBodyImpl;
public class SOAP12BodyImpl extends SOAPBodyImpl {
public SOAP12BodyImpl(SOAPFactory factory) {
- super(SOAPConstants.BODY_LOCAL_NAME, factory.getNamespace(),
- factory);
+ super(SOAPConstants.BODY_LOCAL_NAME, factory.getNamespace(),
+ factory);
}
- /**
- * @param envelope
- */
+ /** @param envelope */
public SOAP12BodyImpl(SOAPEnvelope envelope, SOAPFactory factory)
throws SOAPProcessingException {
super(envelope, factory);
@@ -43,12 +45,12 @@
* @param builder
*/
public SOAP12BodyImpl(SOAPEnvelope envelope, OMXMLParserWrapper builder,
- SOAPFactory factory) {
+ SOAPFactory factory) {
super(envelope, builder, factory);
}
public SOAPFault addFault(Exception e) throws OMException {
return new SOAP12FaultImpl(this, e,
- (SOAPFactory) this.factory);
+ (SOAPFactory) this.factory);
}
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12Factory.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12Factory.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12Factory.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12Factory.java Wed Mar 7 06:59:00 2007
@@ -41,9 +41,7 @@
import org.apache.axiom.soap.impl.llom.SOAPMessageImpl;
public class SOAP12Factory extends OMLinkedListImplFactory implements SOAPFactory {
- /**
- * Eran Chinthaka (chinthaka@apache.org)
- */
+ /** Eran Chinthaka (chinthaka@apache.org) */
public String getSoapVersionURI() {
return SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI;
@@ -51,7 +49,7 @@
public OMNamespace getNamespace() {
return new OMNamespaceImpl(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI,
- SOAP12Constants.SOAP_DEFAULT_NAMESPACE_PREFIX);
+ SOAP12Constants.SOAP_DEFAULT_NAMESPACE_PREFIX);
}
public SOAPEnvelope createSOAPEnvelope() {
@@ -76,12 +74,14 @@
}
public SOAPHeaderBlock createSOAPHeaderBlock(String localName,
- OMNamespace ns, SOAPHeader parent) throws SOAPProcessingException {
+ OMNamespace ns, SOAPHeader parent)
+ throws SOAPProcessingException {
return new SOAP12HeaderBlockImpl(localName, ns, parent, this);
}
public SOAPHeaderBlock createSOAPHeaderBlock(String localName,
- OMNamespace ns, SOAPHeader parent, OMXMLParserWrapper builder)
+ OMNamespace ns, SOAPHeader parent,
+ OMXMLParserWrapper builder)
throws SOAPProcessingException {
return new SOAP12HeaderBlockImpl(localName, ns, parent, builder, this);
}
@@ -148,7 +148,7 @@
}
public SOAPHeaderBlock createSOAPHeaderBlock(String localName,
- OMNamespace ns) throws SOAPProcessingException {
+ OMNamespace ns) throws SOAPProcessingException {
return new SOAP12HeaderBlockImpl(localName, ns, this);
}
@@ -303,11 +303,9 @@
}
-
public SOAPEnvelope createSOAPEnvelope(OMXMLParserWrapper builder) {
return new SOAPEnvelopeImpl(builder, this);
}
-
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultCodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultCodeImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultCodeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultCodeImpl.java Wed Mar 7 06:59:00 2007
@@ -26,9 +26,7 @@
import org.apache.axiom.soap.impl.llom.SOAPFaultCodeImpl;
public class SOAP12FaultCodeImpl extends SOAPFaultCodeImpl {
- /**
- * Eran Chinthaka (chinthaka@apache.org)
- */
+ /** Eran Chinthaka (chinthaka@apache.org) */
public SOAP12FaultCodeImpl(SOAPFactory factory) {
super(factory.getNamespace(), factory);
@@ -44,10 +42,9 @@
super(parent, builder, factory);
}
- /**
- * @param parent
- */
- public SOAP12FaultCodeImpl(SOAPFault parent, SOAPFactory factory) throws SOAPProcessingException {
+ /** @param parent */
+ public SOAP12FaultCodeImpl(SOAPFault parent, SOAPFactory factory)
+ throws SOAPProcessingException {
super(parent, true, factory);
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultDetailImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultDetailImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultDetailImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultDetailImpl.java Wed Mar 7 06:59:00 2007
@@ -36,7 +36,7 @@
}
public SOAP12FaultDetailImpl(SOAPFault parent, OMXMLParserWrapper builder,
- SOAPFactory factory) {
+ SOAPFactory factory) {
super(parent, builder, factory);
}
@@ -44,7 +44,7 @@
if (!(parent instanceof SOAP12FaultImpl)) {
throw new SOAPProcessingException(
"Expecting SOAP 1.2 implementation of SOAP Fault as the " +
- "parent. But received some other implementation");
+ "parent. But received some other implementation");
}
}
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultImpl.java Wed Mar 7 06:59:00 2007
@@ -18,7 +18,6 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.OMNodeEx;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
@@ -37,9 +36,7 @@
public class SOAP12FaultImpl extends SOAPFaultImpl {
- /**
- * Eran Chinthaka (chinthaka@apache.org)
- */
+ /** Eran Chinthaka (chinthaka@apache.org) */
public SOAP12FaultImpl(SOAPFactory factory) {
@@ -67,7 +64,7 @@
}
protected SOAPFaultDetail getNewSOAPFaultDetail(SOAPFault fault) {
- return new SOAP12FaultDetailImpl(fault, (SOAPFactory)this.factory);
+ return new SOAP12FaultDetailImpl(fault, (SOAPFactory) this.factory);
}
@@ -76,7 +73,7 @@
if (!(soapFaultCode instanceof SOAP12FaultCodeImpl)) {
throw new SOAPProcessingException(
"Expecting SOAP 1.2 implementation of SOAP Fault Code. " +
- "But received some other implementation");
+ "But received some other implementation");
}
super.setCode(soapFaultCode);
}
@@ -86,7 +83,7 @@
if (!(reason instanceof SOAP12FaultReasonImpl)) {
throw new SOAPProcessingException(
"Expecting SOAP 1.2 implementation of SOAP Fault Reason. " +
- "But received some other implementation");
+ "But received some other implementation");
}
super.setReason(reason);
}
@@ -95,7 +92,7 @@
if (!(node instanceof SOAP12FaultNodeImpl)) {
throw new SOAPProcessingException(
"Expecting SOAP 1.2 implementation of SOAP Fault Node. " +
- "But received some other implementation");
+ "But received some other implementation");
}
super.setNode(node);
}
@@ -104,7 +101,7 @@
if (!(role instanceof SOAP12FaultRoleImpl)) {
throw new SOAPProcessingException(
"Expecting SOAP 1.2 implementation of SOAP Fault Role. " +
- "But received some other implementation");
+ "But received some other implementation");
}
super.setRole(role);
}
@@ -113,7 +110,7 @@
if (!(detail instanceof SOAP12FaultDetailImpl)) {
throw new SOAPProcessingException(
"Expecting SOAP 1.2 implementation of SOAP Fault Detail. " +
- "But received some other implementation");
+ "But received some other implementation");
}
super.setDetail(detail);
}
@@ -122,7 +119,7 @@
if (!(parent instanceof SOAP12BodyImpl)) {
throw new SOAPProcessingException(
"Expecting SOAP 1.2 implementation of SOAP Body as the " +
- "parent. But received some other implementation");
+ "parent. But received some other implementation");
}
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultNodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultNodeImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultNodeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultNodeImpl.java Wed Mar 7 06:59:00 2007
@@ -30,7 +30,8 @@
super(factory.getNamespace(), factory);
}
- public SOAP12FaultNodeImpl(SOAPFault parent, SOAPFactory factory) throws SOAPProcessingException {
+ public SOAP12FaultNodeImpl(SOAPFault parent, SOAPFactory factory)
+ throws SOAPProcessingException {
super(parent, factory);
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultReasonImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultReasonImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultReasonImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultReasonImpl.java Wed Mar 7 06:59:00 2007
@@ -25,11 +25,9 @@
import org.apache.axiom.soap.impl.llom.SOAPFaultReasonImpl;
public class SOAP12FaultReasonImpl extends SOAPFaultReasonImpl {
- /**
- * Eran Chinthaka (chinthaka@apache.org)
- */
+ /** Eran Chinthaka (chinthaka@apache.org) */
public SOAP12FaultReasonImpl(SOAPFault parent, OMXMLParserWrapper builder,
- SOAPFactory factory) {
+ SOAPFactory factory) {
super(parent, builder, factory);
}
@@ -37,9 +35,7 @@
super(factory.getNamespace(), factory);
}
- /**
- * @param parent
- */
+ /** @param parent */
public SOAP12FaultReasonImpl(SOAPFault parent, SOAPFactory factory)
throws SOAPProcessingException {
super(parent, true, factory);
@@ -50,7 +46,7 @@
if (!(soapFaultText instanceof SOAP12FaultTextImpl)) {
throw new SOAPProcessingException(
"Expecting SOAP 1.2 implementation of SOAP Fault Text. " +
- "But received some other implementation");
+ "But received some other implementation");
}
super.addSOAPText(soapFaultText);
}
@@ -59,7 +55,7 @@
if (!(parent instanceof SOAP12FaultImpl)) {
throw new SOAPProcessingException(
"Expecting SOAP 1.2 implementation of SOAP Fault as the " +
- "parent. But received some other implementation");
+ "parent. But received some other implementation");
}
}
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultRoleImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultRoleImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultRoleImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultRoleImpl.java Wed Mar 7 06:59:00 2007
@@ -24,7 +24,7 @@
import org.apache.axiom.soap.impl.llom.SOAPFaultRoleImpl;
public class SOAP12FaultRoleImpl extends SOAPFaultRoleImpl {
-
+
public SOAP12FaultRoleImpl(SOAPFault parent, SOAPFactory factory)
throws SOAPProcessingException {
super(parent, true, factory);
@@ -35,7 +35,7 @@
}
public SOAP12FaultRoleImpl(SOAPFault parent, OMXMLParserWrapper builder,
- SOAPFactory factory) {
+ SOAPFactory factory) {
super(parent, builder, factory);
}
@@ -43,7 +43,7 @@
if (!(parent instanceof SOAP12FaultImpl)) {
throw new SOAPProcessingException(
"Expecting SOAP 1.2 implementation of SOAP Fault as the " +
- "parent. But received some other implementation");
+ "parent. But received some other implementation");
}
}
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultSubCodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultSubCodeImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultSubCodeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultSubCodeImpl.java Wed Mar 7 06:59:00 2007
@@ -33,7 +33,7 @@
super(parent, SOAP12Constants.SOAP_FAULT_SUB_CODE_LOCAL_NAME, factory);
}
- public SOAP12FaultSubCodeImpl(SOAPFactory factory) {
+ public SOAP12FaultSubCodeImpl(SOAPFactory factory) {
super(factory.getNamespace(), factory);
}
@@ -42,7 +42,7 @@
OMXMLParserWrapper builder,
SOAPFactory factory) {
super(parent, SOAP12Constants.SOAP_FAULT_SUB_CODE_LOCAL_NAME, builder,
- factory);
+ factory);
}
public SOAP12FaultSubCodeImpl(SOAPFaultSubCode parent, SOAPFactory factory)
@@ -51,9 +51,9 @@
}
public SOAP12FaultSubCodeImpl(SOAPFaultSubCode parent,
- OMXMLParserWrapper builder, SOAPFactory factory) {
+ OMXMLParserWrapper builder, SOAPFactory factory) {
super(parent, SOAP12Constants.SOAP_FAULT_SUB_CODE_LOCAL_NAME, builder,
- factory);
+ factory);
}
protected void checkParent(OMElement parent) throws SOAPProcessingException {
@@ -61,8 +61,8 @@
(parent instanceof SOAP12FaultCodeImpl))) {
throw new SOAPProcessingException(
"Expecting SOAP 1.2 implementation of SOAP FaultSubCode " +
- "or SOAP FaultCodeValue as the parent. But received some " +
- "other implementation");
+ "or SOAP FaultCodeValue as the parent. But received some " +
+ "other implementation");
}
}
@@ -71,7 +71,7 @@
if (!(subCode instanceof SOAP12FaultSubCodeImpl)) {
throw new SOAPProcessingException(
"Expecting SOAP 1.2 implementation of SOAP Fault Sub " +
- "Code. But received some other implementation");
+ "Code. But received some other implementation");
}
super.setSubCode(subCode);
}
@@ -81,7 +81,7 @@
if (!(soapFaultSubCodeValue instanceof SOAP12FaultValueImpl)) {
throw new SOAPProcessingException(
"Expecting SOAP 1.2 implementation of SOAP Fault Value. " +
- "But received some other implementation");
+ "But received some other implementation");
}
super.setValue(soapFaultSubCodeValue);
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultTextImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultTextImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultTextImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultTextImpl.java Wed Mar 7 06:59:00 2007
@@ -24,7 +24,7 @@
import org.apache.axiom.soap.impl.llom.SOAPFaultTextImpl;
public class SOAP12FaultTextImpl extends SOAPFaultTextImpl {
-
+
public SOAP12FaultTextImpl(SOAPFaultReason parent, SOAPFactory factory)
throws SOAPProcessingException {
super(parent, factory);
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultValueImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultValueImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultValueImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultValueImpl.java Wed Mar 7 06:59:00 2007
@@ -24,7 +24,7 @@
public class SOAP12FaultValueImpl extends SOAPFaultValueImpl {
-
+
public SOAP12FaultValueImpl(OMElement parent, SOAPFactory factory)
throws SOAPProcessingException {
super(parent, factory);
@@ -36,7 +36,7 @@
}
public SOAP12FaultValueImpl(OMElement parent, OMXMLParserWrapper builder,
- SOAPFactory factory) {
+ SOAPFactory factory) {
super(parent, builder, factory);
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12HeaderBlockImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12HeaderBlockImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12HeaderBlockImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12HeaderBlockImpl.java Wed Mar 7 06:59:00 2007
@@ -29,7 +29,7 @@
public class SOAP12HeaderBlockImpl extends SOAPHeaderBlockImpl {
public SOAP12HeaderBlockImpl(String localName, OMNamespace ns,
- SOAPFactory factory) {
+ SOAPFactory factory) {
super(localName, ns, factory);
}
/**
@@ -69,26 +69,27 @@
if (!(parent instanceof SOAP12HeaderImpl)) {
throw new SOAPProcessingException(
"Expecting SOAP 1.2 implementation of SOAP Body as " +
- "the parent. But received some other implementation");
+ "the parent. But received some other implementation");
}
}
public void setRole(String roleURI) {
setAttribute(SOAP12Constants.SOAP_ROLE,
- roleURI,
- SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
+ roleURI,
+ SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
}
public String getRole() {
return getAttribute(SOAP12Constants.SOAP_ROLE,
- SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
+ SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
}
public void setMustUnderstand(boolean mustUnderstand) {
setAttribute(SOAPConstants.ATTR_MUSTUNDERSTAND,
- mustUnderstand ? SOAPConstants.ATTR_MUSTUNDERSTAND_TRUE : SOAPConstants.ATTR_MUSTUNDERSTAND_FALSE,
- SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
+ mustUnderstand ? SOAPConstants.ATTR_MUSTUNDERSTAND_TRUE :
+ SOAPConstants.ATTR_MUSTUNDERSTAND_FALSE,
+ SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
}
@@ -99,12 +100,12 @@
SOAPConstants.ATTR_MUSTUNDERSTAND_0.equals(mustUnderstand) ||
SOAPConstants.ATTR_MUSTUNDERSTAND_1.equals(mustUnderstand)) {
setAttribute(SOAPConstants.ATTR_MUSTUNDERSTAND,
- mustUnderstand,
- SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
+ mustUnderstand,
+ SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
} else {
throw new SOAPProcessingException(
"mustUndertand should be one of \"true\", " +
- "\"false\", \"0\" or \"1\" ");
+ "\"false\", \"0\" or \"1\" ");
}
}
@@ -112,7 +113,7 @@
String mustUnderstand = "";
if ((mustUnderstand =
getAttribute(SOAPConstants.ATTR_MUSTUNDERSTAND,
- SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI))
+ SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI))
!= null) {
if (SOAPConstants.ATTR_MUSTUNDERSTAND_TRUE.equalsIgnoreCase(
mustUnderstand) ||
@@ -127,21 +128,21 @@
} else {
throw new SOAPProcessingException(
"Invalid value found in mustUnderstand value of " +
- this.getLocalName() +
- " header block");
+ this.getLocalName() +
+ " header block");
}
}
return false;
- }
-
- //TODO : implement
- public void setRelay(boolean relay) {
- throw new UnsupportedOperationException("Not supported for SOAP 1.1");
- }
-
- //TODO : implement
- public boolean getRelay() {
- throw new UnsupportedOperationException("Not supported for SOAP 1.1");
+ }
+
+ //TODO : implement
+ public void setRelay(boolean relay) {
+ throw new UnsupportedOperationException("Not supported for SOAP 1.1");
+ }
+
+ //TODO : implement
+ public boolean getRelay() {
+ throw new UnsupportedOperationException("Not supported for SOAP 1.1");
}
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12HeaderImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12HeaderImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12HeaderImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12HeaderImpl.java Wed Mar 7 06:59:00 2007
@@ -32,17 +32,13 @@
import java.util.Iterator;
public class SOAP12HeaderImpl extends SOAPHeaderImpl {
- /**
- * Eran Chinthaka (chinthaka@apache.org)
- */
+ /** Eran Chinthaka (chinthaka@apache.org) */
public SOAP12HeaderImpl(SOAPFactory factory) {
super(factory.getNamespace(), factory);
}
- /**
- * @param envelope
- */
+ /** @param envelope */
public SOAP12HeaderImpl(SOAPEnvelope envelope, SOAPFactory factory)
throws SOAPProcessingException {
super(envelope, factory);
@@ -55,7 +51,7 @@
* @param builder
*/
public SOAP12HeaderImpl(SOAPEnvelope envelope, OMXMLParserWrapper builder,
- SOAPFactory factory) {
+ SOAPFactory factory) {
super(envelope, builder, factory);
}
@@ -73,7 +69,7 @@
SOAPHeaderBlock soapHeaderBlock = null;
try {
soapHeaderBlock = new SOAP12HeaderBlockImpl(localName, ns, this,
- (SOAPFactory) this.factory);
+ (SOAPFactory) this.factory);
} catch (SOAPProcessingException e) {
throw new OMException(e);
}
@@ -84,10 +80,11 @@
public Iterator extractHeaderBlocks(String role) {
return new OMChildrenWithSpecificAttributeIterator(getFirstOMChild(),
- new QName(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI,
- SOAP12Constants.SOAP_ROLE),
- role,
- true);
+ new QName(
+ SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI,
+ SOAP12Constants.SOAP_ROLE),
+ role,
+ true);
}
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/attachments/AttachmentsTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/attachments/AttachmentsTest.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/attachments/AttachmentsTest.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/attachments/AttachmentsTest.java Wed Mar 7 06:59:00 2007
@@ -16,19 +16,17 @@
package org.apache.axiom.attachments;
+import org.apache.axiom.om.AbstractTestCase;
+
+import javax.activation.DataHandler;
+import javax.activation.FileDataSource;
import java.io.ByteArrayOutputStream;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.Set;
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
-
-import org.apache.axiom.om.AbstractTestCase;
-
public class AttachmentsTest extends AbstractTestCase {
public AttachmentsTest(String testName) {
@@ -39,7 +37,8 @@
String img1FileName = "mtom/img/test.jpg";
String img2FileName = "mtom/img/test2.jpg";
- String contentTypeString = "multipart/related; boundary=\"MIMEBoundaryurn:uuid:A3ADBAEE51A1A87B2A11443668160701\"; type=\"application/xop+xml\"; start=\"<0....@apache.org>\"; start-info=\"application/soap+xml\"; charset=UTF-8;action=\"mtomSample\"";
+ String contentTypeString =
+ "multipart/related; boundary=\"MIMEBoundaryurn:uuid:A3ADBAEE51A1A87B2A11443668160701\"; type=\"application/xop+xml\"; start=\"<0....@apache.org>\"; start-info=\"application/soap+xml\"; charset=UTF-8;action=\"mtomSample\"";
public void testMIMEHelper() {
}
@@ -58,10 +57,10 @@
// This should throw an error
try {
- attachments.getIncomingAttachmentStreams();
- fail("No exception caught when attempting to access datahandler and stream at the same time");
+ attachments.getIncomingAttachmentStreams();
+ fail("No exception caught when attempting to access datahandler and stream at the same time");
} catch (IllegalStateException ise) {
- // Nothing
+ // Nothing
}
inStream.close();
@@ -74,24 +73,25 @@
// These should NOT throw error even though they are using part based access
try {
- assertEquals("application/xop+xml; charset=UTF-8; type=\"application/soap+xml\";", attachments.getSOAPPartContentType());
+ assertEquals("application/xop+xml; charset=UTF-8; type=\"application/soap+xml\";",
+ attachments.getSOAPPartContentType());
} catch (IllegalStateException ise) {
- fail("No exception expected when requesting SOAP part data");
- ise.printStackTrace();
+ fail("No exception expected when requesting SOAP part data");
+ ise.printStackTrace();
}
try {
attachments.getSOAPPartInputStream();
} catch (IllegalStateException ise) {
- fail("No exception expected when requesting SOAP part data");
+ fail("No exception expected when requesting SOAP part data");
}
// These should throw an error
try {
attachments.getDataHandler("2.urn:uuid:A3ADBAEE51A1A87B2A11443668160994@apache.org");
- fail("No exception caught when attempting to access stream and datahandler at the same time");
+ fail("No exception caught when attempting to access stream and datahandler at the same time");
} catch (IllegalStateException ise) {
- // Nothing
+ // Nothing
}
// Additionally, we also need to ensure mutual exclusion if someone
@@ -99,16 +99,16 @@
try {
attachments.getAllContentIDs();
- fail("No exception caught when attempting to access stream and contentids list at the same time");
+ fail("No exception caught when attempting to access stream and contentids list at the same time");
} catch (IllegalStateException ise) {
- // Nothing
+ // Nothing
}
try {
attachments.getDataHandler("2.urn:uuid:A3ADBAEE51A1A87B2A11443668160994@apache.org");
- fail("No exception caught when attempting to access stream and part at the same time");
+ fail("No exception caught when attempting to access stream and part at the same time");
} catch (IllegalStateException ise) {
- // Nothing
+ // Nothing
}
}
@@ -125,7 +125,7 @@
// directly, and then get to the streams. If this sequence throws an
// error, something is wrong with the stream handling code.
InputStream is = attachments.getSOAPPartInputStream();
- while (is.read() != -1);
+ while (is.read() != -1) ;
// Get the inputstream container
IncomingAttachmentStreams ias = attachments.getIncomingAttachmentStreams();
@@ -146,16 +146,17 @@
// After all is done, we should *still* be able to access and
// re-consume the SOAP part stream, as it should be cached.. can we?
is = attachments.getSOAPPartInputStream();
- while (is.read() != -1);
+ while (is.read() != -1) ;
}
private void compareStreams(InputStream data, InputStream expected) throws Exception {
- byte[] dataArray = this.getStreamAsByteArray(data,-1);
- byte[] expectedArray = this.getStreamAsByteArray(expected,-1);
- if(dataArray.length == expectedArray.length) {
+ byte[] dataArray = this.getStreamAsByteArray(data, -1);
+ byte[] expectedArray = this.getStreamAsByteArray(expected, -1);
+ if (dataArray.length == expectedArray.length) {
assertTrue(Arrays.equals(dataArray, expectedArray));
} else {
- System.out.println("Skipping compare because of lossy image i/o ["+dataArray.length+"]["+expectedArray.length+"]");
+ System.out.println("Skipping compare because of lossy image i/o [" + dataArray.length +
+ "][" + expectedArray.length + "]");
}
}
@@ -164,7 +165,8 @@
InputStream inStream = new FileInputStream(getTestResourceFile(inMimeFileName));
Attachments attachments = new Attachments(inStream, contentTypeString);
- DataHandler dh = attachments.getDataHandler("2.urn:uuid:A3ADBAEE51A1A87B2A11443668160994@apache.org");
+ DataHandler dh = attachments
+ .getDataHandler("2.urn:uuid:A3ADBAEE51A1A87B2A11443668160994@apache.org");
InputStream dataIs = dh.getDataSource().getInputStream();
FileDataSource dataSource = new FileDataSource(getTestResourceFile(img2FileName));
@@ -173,7 +175,7 @@
// Compare data across streams
compareStreams(dataIs, expectedDataIs);
}
-
+
public void testNonExistingMIMEPart() throws Exception {
InputStream inStream = new FileInputStream(getTestResourceFile(inMimeFileName));
@@ -182,30 +184,29 @@
DataHandler dh = attachments.getDataHandler("ThisShouldReturnNull");
assertNull(dh);
}
-
+
public void testGetAllContentIDs() throws Exception {
InputStream inStream = new FileInputStream(getTestResourceFile(inMimeFileName));
Attachments attachments = new Attachments(inStream, contentTypeString);
String[] contentIDs = attachments.getAllContentIDs();
- assertEquals(contentIDs.length,3);
- assertEquals(contentIDs[0],"0.urn:uuid:A3ADBAEE51A1A87B2A11443668160702@apache.org");
- assertEquals(contentIDs[1],"1.urn:uuid:A3ADBAEE51A1A87B2A11443668160943@apache.org");
- assertEquals(contentIDs[2],"2.urn:uuid:A3ADBAEE51A1A87B2A11443668160994@apache.org");
-
+ assertEquals(contentIDs.length, 3);
+ assertEquals(contentIDs[0], "0.urn:uuid:A3ADBAEE51A1A87B2A11443668160702@apache.org");
+ assertEquals(contentIDs[1], "1.urn:uuid:A3ADBAEE51A1A87B2A11443668160943@apache.org");
+ assertEquals(contentIDs[2], "2.urn:uuid:A3ADBAEE51A1A87B2A11443668160994@apache.org");
+
Set idSet = attachments.getContentIDSet();
assertTrue(idSet.contains("0.urn:uuid:A3ADBAEE51A1A87B2A11443668160702@apache.org"));
assertTrue(idSet.contains("2.urn:uuid:A3ADBAEE51A1A87B2A11443668160994@apache.org"));
assertTrue(idSet.contains("1.urn:uuid:A3ADBAEE51A1A87B2A11443668160943@apache.org"));
}
-
+
/**
* Returns the contents of the input stream as byte array.
*
* @param stream the <code>InputStream</code>
- * @param length the number of bytes to copy, if length < 0,
- * the number is unlimited
+ * @param length the number of bytes to copy, if length < 0, the number is unlimited
* @return the stream content as byte array
*/
private byte[] getStreamAsByteArray(InputStream stream, int length) throws IOException {
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/attachments/ImageSampleTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/attachments/ImageSampleTest.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/attachments/ImageSampleTest.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/attachments/ImageSampleTest.java Wed Mar 7 06:59:00 2007
@@ -16,26 +16,6 @@
package org.apache.axiom.attachments;
-import java.awt.Image;
-import java.awt.image.BufferedImage;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.util.Iterator;
-
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
-import javax.imageio.IIOImage;
-import javax.imageio.ImageIO;
-import javax.imageio.ImageWriter;
-import javax.imageio.stream.ImageOutputStream;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
import org.apache.axiom.om.AbstractTestCase;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
@@ -47,6 +27,25 @@
import org.apache.axiom.om.impl.llom.OMTextImpl;
import org.apache.axiom.soap.impl.builder.MTOMStAXSOAPModelBuilder;
+import javax.activation.DataHandler;
+import javax.activation.FileDataSource;
+import javax.imageio.IIOImage;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageWriter;
+import javax.imageio.stream.ImageOutputStream;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.util.Iterator;
+
public class ImageSampleTest extends AbstractTestCase {
public ImageSampleTest(String testName) {
@@ -76,8 +75,8 @@
String inMimeFileName = "mtom/ImageMTOMOut.bin";
- String contentTypeString = "multipart/Related; type=\"application/xop+xml\";start=\"<SOAPPart>\"; boundary=\"----=_AxIs2_Def_boundary_=42214532\"";
-
+ String contentTypeString =
+ "multipart/Related; type=\"application/xop+xml\";start=\"<SOAPPart>\"; boundary=\"----=_AxIs2_Def_boundary_=42214532\"";
public void testImageSampleSerialize() throws Exception {
@@ -85,7 +84,7 @@
outMTOMFile = new File(outFileName);
outBase64File = new File(outBase64FileName);
OMOutputFormat mtomOutputFormat = new OMOutputFormat();
- mtomOutputFormat.setDoOptimize(true);
+ mtomOutputFormat.setDoOptimize(true);
OMOutputFormat baseOutputFormat = new OMOutputFormat();
baseOutputFormat.setDoOptimize(false);
@@ -120,7 +119,7 @@
new BufferedReader(
new InputStreamReader(
attachments
- .getSOAPPartInputStream())));
+ .getSOAPPartInputStream())));
builder = new MTOMStAXSOAPModelBuilder(reader, attachments, null);
OMElement root = builder.getDocumentElement();
OMElement body = (OMElement) root.getFirstOMChild();
@@ -134,11 +133,12 @@
*/
DataHandler actualDH;
- actualDH = (DataHandler)blob.getDataHandler();
+ actualDH = (DataHandler) blob.getDataHandler();
BufferedImage bufferedImage = ImageIO.read(actualDH.getDataSource().getInputStream());
- this.saveImage("image/jpeg",bufferedImage, new FileOutputStream(imageOutFileName) );
+ this.saveImage("image/jpeg", bufferedImage, new FileOutputStream(imageOutFileName));
}
- /**
+
+ /**
* Saves an image.
*
* @param mimeType the mime-type of the format to save the image
@@ -156,7 +156,7 @@
}
ImageOutputStream ios = javax.imageio.ImageIO.createImageOutputStream(os);
writer.setOutput(ios);
-
+
writer.write(new IIOImage(image, null, null));
ios.flush();
writer.dispose();
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/attachments/IncomingAttachmentInputTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/attachments/IncomingAttachmentInputTest.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/attachments/IncomingAttachmentInputTest.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/attachments/IncomingAttachmentInputTest.java Wed Mar 7 06:59:00 2007
@@ -16,48 +16,49 @@
package org.apache.axiom.attachments;
+import org.apache.axiom.om.AbstractTestCase;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
-import org.apache.axiom.om.AbstractTestCase;
-
-/**
- * Test the PartOnFile class
- */
+/** Test the PartOnFile class */
public class IncomingAttachmentInputTest extends AbstractTestCase {
-
- public IncomingAttachmentInputTest(String testName) {
+
+ public IncomingAttachmentInputTest(String testName) {
super(testName);
}
String inMimeFileName = "mtom/MTOMAttachmentStream.bin";
- String contentTypeString = "multipart/related; boundary=\"MIMEBoundaryurn:uuid:A3ADBAEE51A1A87B2A11443668160701\"; type=\"application/xop+xml\"; start=\"<0....@apache.org>\"; start-info=\"application/soap+xml\"; charset=UTF-8;action=\"mtomSample\"";
+ String contentTypeString =
+ "multipart/related; boundary=\"MIMEBoundaryurn:uuid:A3ADBAEE51A1A87B2A11443668160701\"; type=\"application/xop+xml\"; start=\"<0....@apache.org>\"; start-info=\"application/soap+xml\"; charset=UTF-8;action=\"mtomSample\"";
File temp;
- public void testIncomingAttachmentInputStreamFunctions() throws Exception {
+ public void testIncomingAttachmentInputStreamFunctions() throws Exception {
InputStream inStream = new FileInputStream(getTestResourceFile(inMimeFileName));
Attachments attachments = new Attachments(inStream, contentTypeString);
// Get the inputstream container
IncomingAttachmentStreams ias = attachments.getIncomingAttachmentStreams();
-
+
IncomingAttachmentInputStream dataIs;
// Img1 stream
dataIs = ias.getNextStream();
-
+
// Make sure it was the first attachment
- assertEquals("<1....@apache.org>", dataIs.getContentId());
-
+ assertEquals("<1....@apache.org>",
+ dataIs.getContentId());
+
// Consume the stream
- while (dataIs.read() != -1);
-
+ while (dataIs.read() != -1) ;
+
// Img2 stream
dataIs = ias.getNextStream();
- assertEquals("<2....@apache.org>", dataIs.getContentId());
+ assertEquals("<2....@apache.org>",
+ dataIs.getContentId());
// Test if getContentType() works..
assertEquals("image/jpeg", dataIs.getContentType());
@@ -65,5 +66,5 @@
// Test if a adding/getting a header works
dataIs.addHeader("new-header", "test-value");
assertEquals("test-value", dataIs.getHeader("new-header"));
- }
+ }
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/attachments/PartOnFileTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/attachments/PartOnFileTest.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/attachments/PartOnFileTest.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/attachments/PartOnFileTest.java Wed Mar 7 06:59:00 2007
@@ -16,60 +16,58 @@
package org.apache.axiom.attachments;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.util.Enumeration;
+import org.apache.axiom.om.AbstractTestCase;
import javax.activation.DataHandler;
import javax.activation.FileDataSource;
-import javax.mail.Header;
-
-import org.apache.axiom.om.AbstractTestCase;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
-/**
- * Test the PartOnFile class
- */
+/** Test the PartOnFile class */
public class PartOnFileTest extends AbstractTestCase {
-
- public PartOnFileTest(String testName) {
+
+ public PartOnFileTest(String testName) {
super(testName);
}
String inMimeFileName = "mtom/MTOMAttachmentStream.bin";
- String contentTypeString = "multipart/related; boundary=\"MIMEBoundaryurn:uuid:A3ADBAEE51A1A87B2A11443668160701\"; type=\"application/xop+xml\"; start=\"<0....@apache.org>\"; start-info=\"application/soap+xml\"; charset=UTF-8;action=\"mtomSample\"";
+ String contentTypeString =
+ "multipart/related; boundary=\"MIMEBoundaryurn:uuid:A3ADBAEE51A1A87B2A11443668160701\"; type=\"application/xop+xml\"; start=\"<0....@apache.org>\"; start-info=\"application/soap+xml\"; charset=UTF-8;action=\"mtomSample\"";
File temp;
public void setUp() throws Exception {
- createTemporaryDirectory();
+ createTemporaryDirectory();
}
-
+
public void tearDown() throws Exception {
- deleteTemporaryDirectory();
+ deleteTemporaryDirectory();
}
- public void testHeaderGetSet() throws Exception {
+ public void testHeaderGetSet() throws Exception {
InputStream inStream = new FileInputStream(getTestResourceFile(inMimeFileName));
- Attachments attachments = new Attachments(inStream, contentTypeString, true, temp.getPath(), "1");
+ Attachments attachments =
+ new Attachments(inStream, contentTypeString, true, temp.getPath(), "1");
- DataHandler p = attachments.getDataHandler("1.urn:uuid:A3ADBAEE51A1A87B2A11443668160943@apache.org");
-
- if (!(p.getDataSource() instanceof FileDataSource)) {
- fail("Expected PartOnFile");
- }
+ DataHandler p = attachments
+ .getDataHandler("1.urn:uuid:A3ADBAEE51A1A87B2A11443668160943@apache.org");
+
+ if (!(p.getDataSource() instanceof FileDataSource)) {
+ fail("Expected PartOnFile");
+ }
// assertEquals("<1....@apache.org>", p.getContentID());
- assertEquals("image/jpeg", p.getContentType());
+ assertEquals("image/jpeg", p.getContentType());
// p.addHeader("Some-New-Header", "TestNH");
// assertEquals(p.getHeader("Some-New-Header"), "TestNH");
- }
+ }
- public void testGetAllheaders() throws Exception {
+ public void testGetAllheaders() throws Exception {
// InputStream inStream = new FileInputStream(getTestResourceFile(inMimeFileName));
// Attachments attachments = new Attachments(inStream, contentTypeString, true, temp.getPath(), "1");
@@ -114,31 +112,31 @@
// fail("Header enumeration failed");
// }
- }
+ }
+
+ private void createTemporaryDirectory() throws Exception {
+ temp = File.createTempFile("partOnFileTest", ".tmp");
- private void createTemporaryDirectory() throws Exception {
- temp = File.createTempFile("partOnFileTest", ".tmp");
+ if (!temp.delete()) {
+ fail("Cannot delete from temporary directory. File: " + temp.toURL());
+ }
- if (!temp.delete()) {
- fail("Cannot delete from temporary directory. File: " + temp.toURL());
- }
-
- if (!temp.mkdir()) {
- fail("Cannot create a temporary location for part files");
- }
- }
+ if (!temp.mkdir()) {
+ fail("Cannot create a temporary location for part files");
+ }
+ }
- private void deleteTemporaryDirectory() throws Exception {
+ private void deleteTemporaryDirectory() throws Exception {
- String[] fileList = temp.list();
- for (int i=0; i < fileList.length; i++) {
+ String[] fileList = temp.list();
+ for (int i = 0; i < fileList.length; i++) {
if (!(new File(temp, fileList[i])).delete()) {
- System.err.println("WARNING: temporary directory removal failed.");
+ System.err.println("WARNING: temporary directory removal failed.");
}
}
- if (!temp.delete()) {
- System.err.println("WARNING: temporary directory removal failed.");
- }
- }
+ if (!temp.delete()) {
+ System.err.println("WARNING: temporary directory removal failed.");
+ }
+ }
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/AbstractOMSerializationTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/AbstractOMSerializationTest.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/AbstractOMSerializationTest.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/AbstractOMSerializationTest.java Wed Mar 7 06:59:00 2007
@@ -54,9 +54,7 @@
protected Log log = LogFactory.getLog(getClass());
- /**
- * @param xmlString - remember this is not the file path. this is the xml string
- */
+ /** @param xmlString - remember this is not the file path. this is the xml string */
public Diff getDiffForComparison(String xmlString) throws Exception {
return getDiffForComparison(new ByteArrayInputStream(xmlString.getBytes()));
}
@@ -69,10 +67,11 @@
try {
XMLInputFactory factory = XMLInputFactory.newInstance();
- ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(xmlString.getBytes());
+ ByteArrayInputStream byteArrayInputStream =
+ new ByteArrayInputStream(xmlString.getBytes());
StAXOMBuilder staxOMBuilder = OMXMLBuilderFactory.
createStAXOMBuilder(OMAbstractFactory.getOMFactory(),
- factory.createXMLStreamReader(byteArrayInputStream));
+ factory.createXMLStreamReader(byteArrayInputStream));
OMElement rootElement = staxOMBuilder.getDocumentElement();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -95,7 +94,7 @@
StAXOMBuilder staxOMBuilder = OMXMLBuilderFactory.
createStAXOMBuilder(OMAbstractFactory.getOMFactory(),
- factory.createXMLStreamReader(inStream));
+ factory.createXMLStreamReader(inStream));
OMElement rootElement = staxOMBuilder.getDocumentElement();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: commons-dev-help@ws.apache.org