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 gd...@apache.org on 2005/07/11 19:49:08 UTC
svn commit: r210165 [14/20] - in /webservices/axis/trunk/java/modules:
addressing/src/org/apache/axis2/handlers/addressing/
addressing/test/org/apache/axis2/handlers/addressing/
addressing/test/org/apache/axis2/handlers/util/ core/src/org/apache/axis2/...
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/ExtensionConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/ExtensionConstants.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/ExtensionConstants.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/ExtensionConstants.java Mon Jul 11 10:48:55 2005
@@ -26,14 +26,19 @@
/**
* The Type name for the SOAP Address defined in the Port/Endpoint
*/
- public static final QName SOAP_ADDRESS = new QName("http://schemas.xmlsoap.org/wsdl/soap/", "address");
+ public static final QName SOAP_ADDRESS = new QName(
+ "http://schemas.xmlsoap.org/wsdl/soap/", "address");
- public static final QName SOAP_OPERATION = new QName("http://schemas.xmlsoap.org/wsdl/soap/", "operation");
+ public static final QName SOAP_OPERATION = new QName(
+ "http://schemas.xmlsoap.org/wsdl/soap/", "operation");
- public static final QName SCHEMA = new QName("http://www.w3.org/2001/XMLSchema", "schema");
+ public static final QName SCHEMA = new QName(
+ "http://www.w3.org/2001/XMLSchema", "schema");
- public static final QName SOAP_BODY = new QName("http://schemas.xmlsoap.org/wsdl/soap/", "body");
+ public static final QName SOAP_BODY = new QName(
+ "http://schemas.xmlsoap.org/wsdl/soap/", "body");
- public static final QName SOAP_BINDING = new QName("http://schemas.xmlsoap.org/wsdl/soap/", "binding");
+ public static final QName SOAP_BINDING = new QName(
+ "http://schemas.xmlsoap.org/wsdl/soap/", "binding");
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/ExtensionFactoryImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/ExtensionFactoryImpl.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/ExtensionFactoryImpl.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/ExtensionFactoryImpl.java Mon Jul 11 10:48:55 2005
@@ -25,7 +25,8 @@
/**
* @author chathura@opensource.lk
*/
-public class ExtensionFactoryImpl implements ExtensionFactory, ExtensionConstants {
+public class ExtensionFactoryImpl implements ExtensionFactory,
+ ExtensionConstants {
/**
* Returns the correct "Specific" ExtensibilityElement given the
* <code>QName</code>
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPAddressImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPAddressImpl.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPAddressImpl.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPAddressImpl.java Mon Jul 11 10:48:55 2005
@@ -25,7 +25,8 @@
* This Extensibility Element is extended to handle particularly the
* SOAP Adress or the Endpoint URL.
*/
-public class SOAPAddressImpl extends WSDLExtensibilityElementImpl implements ExtensionConstants, SOAPAddress {
+public class SOAPAddressImpl extends WSDLExtensibilityElementImpl implements ExtensionConstants,
+ SOAPAddress {
/**
* Location of the Endpoint
*/
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPBindingImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPBindingImpl.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPBindingImpl.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPBindingImpl.java Mon Jul 11 10:48:55 2005
@@ -23,7 +23,8 @@
/**
* @author chathura@opensource.lk
*/
-public class SOAPBindingImpl extends WSDLExtensibilityElementImpl implements ExtensionConstants, SOAPBinding {
+public class SOAPBindingImpl extends WSDLExtensibilityElementImpl implements ExtensionConstants,
+ SOAPBinding {
protected String style;
protected String transportURI;
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPBodyImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPBodyImpl.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPBodyImpl.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPBodyImpl.java Mon Jul 11 10:48:55 2005
@@ -23,7 +23,8 @@
/**
* @author chathura@opensource.lk
*/
-public class SOAPBodyImpl extends WSDLExtensibilityElementImpl implements ExtensionConstants, SOAPBody {
+public class SOAPBodyImpl extends WSDLExtensibilityElementImpl implements ExtensionConstants,
+ SOAPBody {
protected String use;
protected String namespaceURI;
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SchemaImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SchemaImpl.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SchemaImpl.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SchemaImpl.java Mon Jul 11 10:48:55 2005
@@ -24,7 +24,8 @@
/**
* @author chathura@opensource.lk
*/
-public class SchemaImpl extends WSDLExtensibilityElementImpl implements ExtensionConstants, Schema {
+public class SchemaImpl extends WSDLExtensibilityElementImpl implements ExtensionConstants,
+ Schema {
private Element elelment;
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLBindingImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLBindingImpl.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLBindingImpl.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLBindingImpl.java Mon Jul 11 10:48:55 2005
@@ -137,7 +137,7 @@
public void addBindingOperation(WSDLBindingOperation bindingOperation) {
if (null != bindingOperation) {
this.bindingOperations.put(bindingOperation.getName(),
- bindingOperation);
+ bindingOperation);
}
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLDescriptionImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLDescriptionImpl.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLDescriptionImpl.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLDescriptionImpl.java Mon Jul 11 10:48:55 2005
@@ -15,7 +15,23 @@
*/
package org.apache.wsdl.impl;
-import org.apache.wsdl.*;
+import org.apache.wsdl.MessageReference;
+import org.apache.wsdl.WSDLBinding;
+import org.apache.wsdl.WSDLBindingFault;
+import org.apache.wsdl.WSDLBindingMessageReference;
+import org.apache.wsdl.WSDLBindingOperation;
+import org.apache.wsdl.WSDLDescription;
+import org.apache.wsdl.WSDLEndpoint;
+import org.apache.wsdl.WSDLExtensibilityAttribute;
+import org.apache.wsdl.WSDLFaultReference;
+import org.apache.wsdl.WSDLFeature;
+import org.apache.wsdl.WSDLImport;
+import org.apache.wsdl.WSDLInclude;
+import org.apache.wsdl.WSDLInterface;
+import org.apache.wsdl.WSDLOperation;
+import org.apache.wsdl.WSDLProperty;
+import org.apache.wsdl.WSDLService;
+import org.apache.wsdl.WSDLTypes;
import org.apache.wsdl.extensions.ExtensionFactory;
import org.apache.wsdl.extensions.impl.ExtensionFactoryImpl;
@@ -119,7 +135,8 @@
return;
}
if (null == binding.getName()) {
- throw new WSDLProcessingException("The WSDLBinding name cannot be null(Required)");
+ throw new WSDLProcessingException(
+ "The WSDLBinding name cannot be null(Required)");
}
this.bindings.put(binding.getName(), binding);
}
@@ -147,10 +164,11 @@
return;
}
if (null == interfaceComponent.getName()) {
- throw new WSDLProcessingException("PortType/Interface name cannot be null(Required) ");
+ throw new WSDLProcessingException(
+ "PortType/Interface name cannot be null(Required) ");
}
this.wsdlInterfaces.put(interfaceComponent.getName(),
- interfaceComponent);
+ interfaceComponent);
}
/**
@@ -205,7 +223,8 @@
return;
}
if (null == service.getName()) {
- throw new WSDLProcessingException("The WSDLService name cannot be null (Required)");
+ throw new WSDLProcessingException(
+ "The WSDLService name cannot be null (Required)");
}
this.services.put(service.getName(), service);
}
@@ -478,7 +497,8 @@
if (bindingIterator.hasNext()) {
return (WSDLBinding) bindingIterator.next();
}
- throw new WSDLProcessingException("No Binding Components are available");
+ throw new WSDLProcessingException(
+ "No Binding Components are available");
}
public WSDLExtensibilityAttribute createWSDLExtensibilityAttribute() {
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLInterfaceImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLInterfaceImpl.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLInterfaceImpl.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLInterfaceImpl.java Mon Jul 11 10:48:55 2005
@@ -92,9 +92,11 @@
tobeAdded = true;
while (thisIterator.hasNext()) {
thisOperation = (WSDLOperation) thisIterator.next();
- if ((thisOperation.getName() == superInterfaceOperation.getName())
+ if ((thisOperation.getName() ==
+ superInterfaceOperation.getName())
&& !tobeAdded) {
- if (thisOperation.getTargetnamespace().equals(superInterfaceOperation.getTargetnamespace())) {
+ if (thisOperation.getTargetnamespace().equals(
+ superInterfaceOperation.getTargetnamespace())) {
// Both are the same Operation; the one inherited and
// the one that is already in the map(may or maynot be inherited)
@@ -103,15 +105,18 @@
// same name but target namespces dont match
// TODO Think this is an error
- throw new WSDLProcessingException("The Interface " + this.getName()
- + " has more than one Operation that has the same name but not the same interface ");
+ throw new WSDLProcessingException(
+ "The Interface " + this.getName()
+ +
+ " has more than one Operation that has the same name but not the same interface ");
}
}
}
if (tobeAdded) {
// This one is not in the list already developped
- all.put(superInterfaceOperation.getName().getLocalPart(),
+ all.put(
+ superInterfaceOperation.getName().getLocalPart(),
superInterfaceOperation);
}
}
@@ -215,7 +220,8 @@
return;
}
if (null == operation.getName()) {
- throw new WSDLProcessingException("The Operation name cannot be null (required)");
+ throw new WSDLProcessingException(
+ "The Operation name cannot be null (required)");
}
this.operations.put(operation.getName().getLocalPart(), operation);
}
@@ -235,7 +241,7 @@
*/
public void addSuperInterface(WSDLInterface interfaceComponent) {
this.superInterfaces.put(interfaceComponent.getName(),
- interfaceComponent);
+ interfaceComponent);
}
/**
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLServiceImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLServiceImpl.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLServiceImpl.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLServiceImpl.java Mon Jul 11 10:48:55 2005
@@ -106,7 +106,8 @@
*/
public String getNamespace() {
if (null == this.name) {
- throw new WSDLProcessingException("Target Namespace not set and the Service Name is null");
+ throw new WSDLProcessingException(
+ "Target Namespace not set and the Service Name is null");
}
return this.name.getNamespaceURI();
}
Modified: webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/AbstractTestCase.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/AbstractTestCase.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/AbstractTestCase.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/AbstractTestCase.java Mon Jul 11 10:48:55 2005
@@ -26,8 +26,13 @@
extends TestCase {
protected String testDir = "test" + File.separator;
protected String sampleDir = "samples" + File.separator;
- protected String outDir = "target" + File.separator + "generated" + File.separator + "samples" + File.separator;
- protected String tempDir = "target" + File.separator + "generated" + File.separator + "temp";
+ protected String outDir = "target" + File.separator + "generated" +
+ File.separator +
+ "samples" +
+ File.separator;
+ protected String tempDir = "target" + File.separator + "generated" +
+ File.separator +
+ "temp";
protected String testResourceDir = "test-resources";
/**
Modified: webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/BindingOperationTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/BindingOperationTest.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/BindingOperationTest.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/BindingOperationTest.java Mon Jul 11 10:48:55 2005
@@ -40,15 +40,18 @@
public void testBindingOperation() throws Exception {
WSDLDescription womDescription;
- InputStream in = new FileInputStream(getTestResourceFile("BookQuote.wsdl"));
+ InputStream in = new FileInputStream(
+ getTestResourceFile("BookQuote.wsdl"));
womDescription = WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11)
.build(in).getDescription();
assertNotNull(womDescription);
if (null != womDescription) {
String ns = "http://www.Monson-Haefel.com/jwsbook/BookQuote";
- WSDLBinding binding = womDescription.getBinding(new QName(ns, "BookQuoteBinding"));
- WSDLBindingOperation bindingOperation = binding.getBindingOperation(new QName(ns, "getBookPrice"));
+ WSDLBinding binding = womDescription.getBinding(
+ new QName(ns, "BookQuoteBinding"));
+ WSDLBindingOperation bindingOperation = binding.getBindingOperation(
+ new QName(ns, "getBookPrice"));
assertNotNull(bindingOperation.getInput());
assertNull(bindingOperation.getOutput());
}
Modified: webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/CreateSchemaTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/CreateSchemaTest.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/CreateSchemaTest.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/CreateSchemaTest.java Mon Jul 11 10:48:55 2005
@@ -45,8 +45,11 @@
protected void setUp() throws Exception {
WSDLVersionWrapper wsdlVersionWrapper = null;
if (null == this.womDescription) {
- InputStream in = new FileInputStream(getTestResourceFile("BookQuote.wsdl"));
- wsdlVersionWrapper = WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11).build(in);
+ InputStream in = new FileInputStream(
+ getTestResourceFile("BookQuote.wsdl"));
+ wsdlVersionWrapper =
+ WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11)
+ .build(in);
this.womDescription = wsdlVersionWrapper.getDescription();
}
if (null == wsdl4jDefinition) {
@@ -73,7 +76,7 @@
if (item instanceof Element
&& "complexType".equals(((Element) item).getTagName())
&& "BookQuote_getBookPrice".equals(((Element) item)
- .getAttribute("name"))) {
+ .getAttribute("name"))) {
insertedElementForMessageReference = (Element) item;
}
}
Modified: webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/InterfaceTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/InterfaceTest.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/InterfaceTest.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/InterfaceTest.java Mon Jul 11 10:48:55 2005
@@ -35,11 +35,14 @@
for (int j = 0; j < interfaceCounter; j++) {
intfc = new WSDLInterfaceImpl();
intfc.setName(new QName(WSDLConstants.WSDL2_0_NAMESPACE, "inteface"
- + j));
+ + j));
for (int i = 0; i < operationCounter; i++) {
op = new WSDLOperationImpl();
- op.setName(new QName(WSDLConstants.WSDL1_1_NAMESPACE, "op" + i
- + "of inteface" + j));
+ op.setName(
+ new QName(WSDLConstants.WSDL1_1_NAMESPACE,
+ "op" + i
+ + "of inteface" +
+ j));
assertNotNull(op.getName());
intfc.setOperation(op);
}
@@ -49,24 +52,29 @@
array[j] = intfc;
}
assertEquals(((WSDLOperation) array[0].getOperation("op0of inteface0"))
- .getName().getLocalPart(), "op0of inteface0");
+ .getName().getLocalPart(), "op0of inteface0");
assertEquals(((WSDLOperation) array[0].getOperation("op1of inteface0"))
- .getName().getLocalPart(), "op1of inteface0");
+ .getName().getLocalPart(), "op1of inteface0");
assertEquals(array[interfaceCounter - 1].getAllOperations().size(),
- interfaceCounter * operationCounter);
+ interfaceCounter * operationCounter);
assertEquals(interfaceCounter * operationCounter,
- array[interfaceCounter - 1].getAllOperations().size());
+ array[interfaceCounter - 1].getAllOperations().size());
Iterator iter = array[1].getAllOperations().keySet().iterator();
while (iter.hasNext()) {
- assertNotNull(((WSDLOperation) array[interfaceCounter - 1]
- .getAllOperations().get(iter.next())).getName());
+ assertNotNull(
+ ((WSDLOperation) array[interfaceCounter - 1]
+ .getAllOperations()
+ .get(iter.next())).getName());
}
for (int j = 0; j < interfaceCounter; j++) {
for (int i = 0; i < operationCounter; i++) {
- WSDLOperation operation = (WSDLOperation) array[interfaceCounter - 1]
+ WSDLOperation operation = (WSDLOperation) array[interfaceCounter -
+ 1]
.getAllOperations().get("op" + j + "of inteface" + i);
- assertEquals((operation).getName().getLocalPart(), "op" + j
- + "of inteface" + i);
+ assertEquals((operation).getName().getLocalPart(),
+ "op" + j
+ + "of inteface" +
+ i);
}
}
@@ -87,11 +95,11 @@
for (int j = 0; j < operationCounter; j++) {
op = new WSDLOperationImpl();
op.setName(new QName(WSDLConstants.WSDL1_1_NAMESPACE,
- "operation" + j));
+ "operation" + j));
intfc.setOperation(op);
}
intfc.setName(new QName(WSDLConstants.WSDL2_0_NAMESPACE,
- "Interface" + i));
+ "Interface" + i));
array[i] = intfc;
}
WSDLInterface inheritedInterface = new WSDLInterfaceImpl();
Modified: webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/MessageReuseTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/MessageReuseTest.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/MessageReuseTest.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/MessageReuseTest.java Mon Jul 11 10:48:55 2005
@@ -47,8 +47,11 @@
WSDLVersionWrapper wsdlVersionWrapper = null;
if (null == this.womDescription) {
- InputStream in = new FileInputStream(getTestResourceFile("BookQuote.wsdl"));
- wsdlVersionWrapper = WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11).build(in);
+ InputStream in = new FileInputStream(
+ getTestResourceFile("BookQuote.wsdl"));
+ wsdlVersionWrapper =
+ WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11)
+ .build(in);
this.womDescription = wsdlVersionWrapper.getDescription();
}
if (null == wsdl4jDefinition) {
@@ -59,16 +62,19 @@
public void testMultipartmessageReuse() throws Exception {
- WSDLInterface interface1 = this.womDescription.getInterface(new QName("http://www.Monson-Haefel.com/jwsbook/BookQuote",
- "BookQuote"));
+ WSDLInterface interface1 = this.womDescription.getInterface(
+ new QName("http://www.Monson-Haefel.com/jwsbook/BookQuote",
+ "BookQuote"));
WSDLOperation operation1 = (WSDLOperation) interface1.getAllOperations()
.get("getBookPrice");
QName element1 = operation1.getInputMessage().getElement();
- WSDLOperation operation2 = (WSDLOperation) interface1.getAllOperations().get("getBookPriceNonRobust");
+ WSDLOperation operation2 = (WSDLOperation) interface1.getAllOperations()
+ .get("getBookPriceNonRobust");
QName element2 = operation2.getInputMessage().getElement();
assertEquals(element1, element2);
- Iterator iterator = womDescription.getTypes().getExtensibilityElements().iterator();
+ Iterator iterator = womDescription.getTypes().getExtensibilityElements()
+ .iterator();
Schema types = null;
while (iterator.hasNext()) {
WSDLExtensibilityElement temp = (WSDLExtensibilityElement) iterator.next();
@@ -83,7 +89,8 @@
if (item instanceof Element) {
Element temp = (Element) item;
if ("complexType".equals(temp.getNodeName()) &&
- "BookQuote_getBookPrice".equals(temp.getAttribute("name"))) {
+ "BookQuote_getBookPrice".equals(
+ temp.getAttribute("name"))) {
numberOfBookQuote_getBookPrice++;
}
Modified: webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/SOAPActionTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/SOAPActionTest.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/SOAPActionTest.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/SOAPActionTest.java Mon Jul 11 10:48:55 2005
@@ -44,8 +44,11 @@
super.setUp();
WSDLVersionWrapper wsdlVersionWrapper = null;
if (null == this.womDescription) {
- InputStream in = new FileInputStream(getTestResourceFile("InteropTestDocLit2.wsdl"));
- wsdlVersionWrapper = WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11).build(in);
+ InputStream in = new FileInputStream(
+ getTestResourceFile("InteropTestDocLit2.wsdl"));
+ wsdlVersionWrapper =
+ WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11)
+ .build(in);
this.womDescription = wsdlVersionWrapper.getDescription();
}
@@ -56,8 +59,9 @@
public void testSOAPActionPopulation() {
WSDLBindingOperation bindingOperation = womDescription
- .getFirstBinding().getBindingOperation(new QName("http://soapinterop.org/WSDLInteropTestDocLit",
- "echoVoid"));
+ .getFirstBinding().getBindingOperation(new QName(
+ "http://soapinterop.org/WSDLInteropTestDocLit",
+ "echoVoid"));
Iterator iterator = bindingOperation.getExtensibilityElements()
.iterator();
while (iterator.hasNext()) {
@@ -71,7 +75,7 @@
fail();
} else {
assertEquals(soapOperation.getSoapAction(),
- "http://soapinterop.org/");
+ "http://soapinterop.org/");
}
}
}
Modified: webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/WOMBuilderTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/WOMBuilderTest.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/WOMBuilderTest.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/WOMBuilderTest.java Mon Jul 11 10:48:55 2005
@@ -44,9 +44,12 @@
WSDLVersionWrapper wsdlVersionWrapper = null;
if (null == this.womDescription) {
- InputStream in = new FileInputStream(getTestResourceFile("InteropTest.wsdl"));
+ InputStream in = new FileInputStream(
+ getTestResourceFile("InteropTest.wsdl"));
// InputStream in = new FileInputStream(new File("E:/temp/service.wsdl"));
- wsdlVersionWrapper = WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11).build(in);
+ wsdlVersionWrapper =
+ WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11)
+ .build(in);
this.womDescription = wsdlVersionWrapper.getDescription();
}
if (null == wsdl4jDefinition) {
@@ -56,34 +59,53 @@
public void testTopLevelComponentCount() throws Exception {
this.initialize();
- assertEquals(womDescription.getServices().size(), wsdl4jDefinition.getServices().size());
- assertEquals(womDescription.getWsdlInterfaces().size(), wsdl4jDefinition.getPortTypes().size());
+ assertEquals(womDescription.getServices().size(),
+ wsdl4jDefinition.getServices().size());
+ assertEquals(womDescription.getWsdlInterfaces().size(),
+ wsdl4jDefinition.getPortTypes().size());
;
- assertEquals(womDescription.getServices().size(), wsdl4jDefinition.getServices().size());
- assertEquals(womDescription.getBindings().size(), wsdl4jDefinition.getBindings().size());
+ assertEquals(womDescription.getServices().size(),
+ wsdl4jDefinition.getServices().size());
+ assertEquals(womDescription.getBindings().size(),
+ wsdl4jDefinition.getBindings().size());
}
public void testInterfacesComponent() throws Exception {
this.initialize();
- Iterator interfaceIterator = this.womDescription.getWsdlInterfaces().values().iterator();
- Iterator porttypeIterator = this.wsdl4jDefinition.getPortTypes().values().iterator();
+ Iterator interfaceIterator = this.womDescription.getWsdlInterfaces()
+ .values()
+ .iterator();
+ Iterator porttypeIterator = this.wsdl4jDefinition.getPortTypes()
+ .values()
+ .iterator();
while (interfaceIterator.hasNext() & porttypeIterator.hasNext()) {
WSDLInterface wsdlInterface = (WSDLInterface) interfaceIterator.next();
PortType porttype = (PortType) porttypeIterator.next();
assertEquals(wsdlInterface.getName(), porttype.getQName());
- assertEquals(wsdlInterface.getTargetnamespace(), porttype.getQName().getNamespaceURI());
- assertEquals(wsdlInterface.getAllOperations().size(), porttype.getOperations().size());
- Iterator womOperationIterator = wsdlInterface.getAllOperations().values().iterator();
- Iterator wsdl4jOprationIterator = porttype.getOperations().iterator();
+ assertEquals(wsdlInterface.getTargetnamespace(),
+ porttype.getQName().getNamespaceURI());
+ assertEquals(wsdlInterface.getAllOperations().size(),
+ porttype.getOperations().size());
+ Iterator womOperationIterator = wsdlInterface.getAllOperations()
+ .values()
+ .iterator();
+ Iterator wsdl4jOprationIterator = porttype.getOperations()
+ .iterator();
//Will only work if the order is retained in the iteration
while (wsdl4jOprationIterator.hasNext()) {
Operation wsdl4jOperation = (Operation) wsdl4jOprationIterator.next();
- this.operationsWaliking(wsdlInterface.getOperation(wsdl4jOperation.getName()), wsdl4jOperation);
+ this.operationsWaliking(
+ wsdlInterface.getOperation(wsdl4jOperation.getName()),
+ wsdl4jOperation);
}
while (womOperationIterator.hasNext()) {
WSDLOperation womOperation = (WSDLOperation) womOperationIterator.next();
- this.operationsWaliking(womOperation, porttype.getOperation(womOperation.getName().getLocalPart(), null, null));
+ this.operationsWaliking(womOperation,
+ porttype.getOperation(
+ womOperation.getName().getLocalPart(),
+ null,
+ null));
}
}
@@ -91,8 +113,11 @@
public void testServiceComponent() throws Exception {
this.initialize();
- Iterator womServiceIterator = this.womDescription.getServices().values().iterator();
- Iterator wsdl4jServiceIterator = this.wsdl4jDefinition.getServices().values().iterator();
+ Iterator womServiceIterator = this.womDescription.getServices().values()
+ .iterator();
+ Iterator wsdl4jServiceIterator = this.wsdl4jDefinition.getServices()
+ .values()
+ .iterator();
while (womServiceIterator.hasNext() & wsdl4jServiceIterator.hasNext()) {
WSDLService wsdlService = (WSDLService) womServiceIterator.next();
@@ -103,8 +128,10 @@
}
- private void operationsWaliking(WSDLOperation womOperation, Operation wsdl4jOperation) {
- assertEquals(womOperation.getName().getLocalPart(), wsdl4jOperation.getName());
+ private void operationsWaliking(WSDLOperation womOperation,
+ Operation wsdl4jOperation) {
+ assertEquals(womOperation.getName().getLocalPart(),
+ wsdl4jOperation.getName());
//System.out.println(womOperation.getMessageExchangePattern());
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/attachments/ImageDataSource.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/attachments/ImageDataSource.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/attachments/ImageDataSource.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/attachments/ImageDataSource.java Mon Jul 11 10:48:55 2005
@@ -17,7 +17,11 @@
import javax.activation.DataSource;
import java.awt.*;
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
public class ImageDataSource implements DataSource {
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/attachments/JDK13IO.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/attachments/JDK13IO.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/attachments/JDK13IO.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/attachments/JDK13IO.java Mon Jul 11 10:48:55 2005
@@ -51,7 +51,10 @@
MediaTracker tracker = new MediaTracker(this);
tracker.addImage(image, 0);
tracker.waitForAll();
- rendImage = new BufferedImage(image.getWidth(null), image.getHeight(null), 1);
+ rendImage =
+ new BufferedImage(image.getWidth(null),
+ image.getHeight(null),
+ 1);
Graphics g = rendImage.createGraphics();
g.drawImage(image, 0, 0, null);
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/attachments/MIMEHelper.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/attachments/MIMEHelper.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/attachments/MIMEHelper.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/attachments/MIMEHelper.java Mon Jul 11 10:48:55 2005
@@ -100,7 +100,7 @@
contentType = new ContentType(contentTypeString);
} catch (ParseException e) {
throw new OMException("Invalid Content Type Field in the Mime Message"
- + e.toString());
+ + e.toString());
}
// Boundary always have the prefix "--".
this.boundary = ("--" + contentType.getParameter("boundary"))
@@ -109,7 +109,7 @@
//TODO do we need to wrap InputStream from a BufferedInputStream before
// wrapping from PushbackStream
pushbackInStream = new PushbackInputStream(inStream,
- (this.boundary.length + 2));
+ (this.boundary.length + 2));
// Move the read pointer to the begining of the first part
// read till the end of first boundary
@@ -123,7 +123,8 @@
&& ((byte) value == boundary[boundaryIndex])) {
value = pushbackInStream.read();
if (value == -1)
- throw new OMException("Unexpected End of Stream while searching for first Mime Boundary");
+ throw new OMException(
+ "Unexpected End of Stream while searching for first Mime Boundary");
boundaryIndex++;
}
if (boundaryIndex == boundary.length) { // boundary found
@@ -131,7 +132,8 @@
break;
}
} else if ((byte) value == -1) {
- throw new OMException("Mime parts not found. Stream ended while searching for the boundary");
+ throw new OMException(
+ "Mime parts not found. Stream ended while searching for the boundary");
}
} catch (IOException e1) {
throw new OMException("Stream Error" + e1.toString());
@@ -156,7 +158,8 @@
} else if (applicationType.equalsIgnoreCase(SWA_TYPE)) {
this.applicationType = SWA_TYPE;
} else {
- throw new OMException("Invalid Application type. Support available for MTOM & SwA only.");
+ throw new OMException(
+ "Invalid Application type. Support available for MTOM & SwA only.");
}
}
return this.applicationType;
@@ -184,11 +187,13 @@
try {
dh = getDataHandler(rootContentID);
if (dh == null) {
- throw new OMException("Mandatory Root MIME part containing the SOAP Envelope is missing");
+ throw new OMException(
+ "Mandatory Root MIME part containing the SOAP Envelope is missing");
}
return dh.getInputStream();
} catch (IOException e) {
- throw new OMException("Problem with DataHandler of the Root Mime Part. " + e);
+ throw new OMException(
+ "Problem with DataHandler of the Root Mime Part. " + e);
}
}
@@ -215,7 +220,7 @@
dh = bodyPart.getDataHandler();
} catch (MessagingException e) {
throw new OMException("Problem with Mime Body Part No "
- + partIndex + ". " + e);
+ + partIndex + ". " + e);
}
return dh;
} else {
@@ -249,12 +254,12 @@
MimeBodyPartInputStream partStream;
partStream = new MimeBodyPartInputStream(pushbackInStream,
- boundary);
+ boundary);
try {
mimeBodyPart = new MimeBodyPart(partStream);
} catch (MessagingException e) {
throw new OMException("Problem reading Mime Part No "
- + (partIndex + 1) + ". " + e);
+ + (partIndex + 1) + ". " + e);
}
partIndex++;
@@ -293,7 +298,9 @@
firstPartId = partContentID;
}
if (fileCacheEnable) {
- PartOnFile part = new PartOnFile(nextMimeBodyPart, partContentID, attachmentRepoDir);
+ PartOnFile part = new PartOnFile(nextMimeBodyPart,
+ partContentID,
+ attachmentRepoDir);
return part;
} else {
bodyPartsMap.put(partContentID, nextMimeBodyPart);
@@ -301,10 +308,10 @@
}
} catch (MessagingException e) {
throw new OMException("Error Reading Content-ID from Mime Part No "
- + partIndex + ". " + e);
+ + partIndex + ". " + e);
} catch (Exception e) {
throw new OMException("Error Creating File Storage Part"
- + partIndex + ". " + e);
+ + partIndex + ". " + e);
}
} else
return null;
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/attachments/MimeBodyPartInputStream.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/attachments/MimeBodyPartInputStream.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/attachments/MimeBodyPartInputStream.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/attachments/MimeBodyPartInputStream.java Mon Jul 11 10:48:55 2005
@@ -32,7 +32,8 @@
byte[] boundary;
- public MimeBodyPartInputStream(PushbackInputStream inStream, byte[] boundary) {
+ public MimeBodyPartInputStream(PushbackInputStream inStream,
+ byte[] boundary) {
super();
this.inStream = inStream;
this.boundary = boundary;
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/attachments/PartOnFile.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/attachments/PartOnFile.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/attachments/PartOnFile.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/attachments/PartOnFile.java Mon Jul 11 10:48:55 2005
@@ -23,7 +23,12 @@
import javax.mail.Multipart;
import javax.mail.Part;
import javax.mail.internet.MimeBodyPart;
-import java.io.*;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Date;
import java.util.Enumeration;
@@ -71,7 +76,9 @@
} catch (FileNotFoundException e) {
throw new OMException("File Not Found" + e.toString());
} catch (MessagingException e1) {
- throw new OMException("Cannot create MimePart from the Part read from file" + e1.toString());
+ throw new OMException(
+ "Cannot create MimePart from the Part read from file" +
+ e1.toString());
}
return part;
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/FactoryFinder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/FactoryFinder.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/FactoryFinder.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/FactoryFinder.java Mon Jul 11 10:48:55 2005
@@ -41,7 +41,9 @@
*/
- private static Object findFactory(ClassLoader loader, String factoryClass, String systemPropertyName)
+ private static Object findFactory(ClassLoader loader,
+ String factoryClass,
+ String systemPropertyName)
throws OMFactoryException {
String factoryClassName = factoryClass;
@@ -78,7 +80,9 @@
*/
public static SOAPFactory findSOAP11Factory(ClassLoader loader)
throws OMFactoryException {
- return (SOAPFactory) findFactory(loader, DEFAULT_SOAP11_FACTORY_CLASS_NAME, SOAP11_FACTORY_NAME_PROPERTY);
+ return (SOAPFactory) findFactory(loader,
+ DEFAULT_SOAP11_FACTORY_CLASS_NAME,
+ SOAP11_FACTORY_NAME_PROPERTY);
}
/**
@@ -94,7 +98,9 @@
*/
public static SOAPFactory findSOAP12Factory(ClassLoader loader)
throws OMFactoryException {
- return (SOAPFactory) findFactory(loader, DEFAULT_SOAP12_FACTORY_CLASS_NAME, SOAP12_FACTORY_NAME_PROPERTY);
+ return (SOAPFactory) findFactory(loader,
+ DEFAULT_SOAP12_FACTORY_CLASS_NAME,
+ SOAP12_FACTORY_NAME_PROPERTY);
}
/**
@@ -110,6 +116,8 @@
*/
public static OMFactory findOMFactory(ClassLoader loader)
throws OMFactoryException {
- return (OMFactory) findFactory(loader, DEFAULT_OM_FACTORY_CLASS_NAME, OM_FACTORY_NAME_PROPERTY);
+ return (OMFactory) findFactory(loader,
+ DEFAULT_OM_FACTORY_CLASS_NAME,
+ OM_FACTORY_NAME_PROPERTY);
}
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/MIMEOutputUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/MIMEOutputUtils.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/MIMEOutputUtils.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/MIMEOutputUtils.java Mon Jul 11 10:48:55 2005
@@ -41,13 +41,15 @@
startWritingMime(outStream, boundary);
DataHandler dh = new DataHandler(bufferedSoapOutStream.toString(),
- "text/xml");
+ "text/xml");
MimeBodyPart rootMimeBodyPart = new MimeBodyPart();
rootMimeBodyPart.setDataHandler(dh);
- ContentType partContentType = new ContentType("application/xop+xml");
+ ContentType partContentType = new ContentType(
+ "application/xop+xml");
partContentType.setParameter("charset", "UTF-8");
partContentType.setParameter("type", "application/soap+xml");
- rootMimeBodyPart.addHeader("Content-Type", partContentType.toString());
+ rootMimeBodyPart.addHeader("Content-Type",
+ partContentType.toString());
rootMimeBodyPart.addHeader("Content-Transfer-Encoding", "8bit");
rootMimeBodyPart.addHeader("Content-ID", SOAP_PART_CONTENT_ID);
@@ -57,7 +59,7 @@
while (binaryNodeIterator.hasNext()) {
OMText binaryNode = (OMText) binaryNodeIterator.next();
writeBodyPart(outStream, createMimeBodyPart(binaryNode),
- boundary);
+ boundary);
}
finishWritingMime(outStream);
} catch (IOException e) {
@@ -89,7 +91,8 @@
/**
* @throws IOException This will write the boundary with CRLF
*/
- protected static void startWritingMime(OutputStream outStream, String boundary)
+ protected static void startWritingMime(OutputStream outStream,
+ String boundary)
throws IOException {
writeMimeBoundary(outStream, boundary);
//outStream.write(CRLF);
@@ -125,7 +128,8 @@
contentType.setPrimaryType("multipart");
contentType.setSubType("related");
contentType.setParameter("boundary", boundary);
- contentType.setParameter("start", MIMEOutputUtils.SOAP_PART_CONTENT_ID);
+ contentType.setParameter("start",
+ MIMEOutputUtils.SOAP_PART_CONTENT_ID);
contentType.setParameter("type", "application/xop+xml");
//TODO theres something called action that can be set with
// following. May be SOAPAction. Better check.
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/OMFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/OMFactory.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/OMFactory.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/OMFactory.java Mon Jul 11 10:48:55 2005
@@ -95,7 +95,9 @@
public OMText createText(OMElement parent, String s, String mimeType,
boolean optimize);
- public OMAttribute createOMAttribute(String localName, OMNamespace ns, String value);
+ public OMAttribute createOMAttribute(String localName,
+ OMNamespace ns,
+ String value);
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/OMOutput.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/OMOutput.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/OMOutput.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/OMOutput.java Mon Jul 11 10:48:55 2005
@@ -64,10 +64,14 @@
this.outStream = outStream;
if (doOptimise) {
bufferedSoapOutStream = new ByteArrayOutputStream();
- xmlWriter = XMLOutputFactory.newInstance().createXMLStreamWriter(bufferedSoapOutStream);
+ xmlWriter =
+ XMLOutputFactory.newInstance().createXMLStreamWriter(
+ bufferedSoapOutStream);
binaryNodeList = new LinkedList();
} else {
- xmlWriter = XMLOutputFactory.newInstance().createXMLStreamWriter(outStream);
+ xmlWriter =
+ XMLOutputFactory.newInstance().createXMLStreamWriter(
+ outStream);
}
@@ -115,7 +119,7 @@
if (doOptimise) {
xmlWriter.flush();
MIMEOutputUtils.complete(outStream, bufferedSoapOutStream,
- binaryNodeList, mimeBoundary);
+ binaryNodeList, mimeBoundary);
}
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocument.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocument.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocument.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocument.java Mon Jul 11 10:48:55 2005
@@ -15,7 +15,11 @@
*/
package org.apache.axis2.om.impl.llom;
-import org.apache.axis2.om.*;
+import org.apache.axis2.om.OMContainer;
+import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.OMException;
+import org.apache.axis2.om.OMNode;
+import org.apache.axis2.om.OMXMLParserWrapper;
import org.apache.axis2.om.impl.llom.traverse.OMChildrenIterator;
import org.apache.axis2.om.impl.llom.traverse.OMChildrenQNameIterator;
@@ -168,7 +172,7 @@
*/
public Iterator getChildrenWithName(QName elementQName) throws OMException {
return new OMChildrenQNameIterator((OMNodeImpl) getFirstChild(),
- elementQName);
+ elementQName);
}
/**
@@ -193,13 +197,14 @@
public OMElement getFirstChildWithName(QName elementQName) throws OMException {
OMChildrenQNameIterator omChildrenQNameIterator =
new OMChildrenQNameIterator((OMNodeImpl) getFirstChild(),
- elementQName);
+ elementQName);
OMNode omNode = null;
if (omChildrenQNameIterator.hasNext()) {
omNode = (OMNode) omChildrenQNameIterator.next();
}
- return ((omNode != null) && (OMNode.ELEMENT_NODE == omNode.getType())) ? (OMElement) omNode : null;
+ return ((omNode != null) && (OMNode.ELEMENT_NODE == omNode.getType())) ?
+ (OMElement) omNode : null;
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java Mon Jul 11 10:48:55 2005
@@ -15,7 +15,17 @@
*/
package org.apache.axis2.om.impl.llom;
-import org.apache.axis2.om.*;
+import org.apache.axis2.om.OMAbstractFactory;
+import org.apache.axis2.om.OMAttribute;
+import org.apache.axis2.om.OMConstants;
+import org.apache.axis2.om.OMContainer;
+import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.OMException;
+import org.apache.axis2.om.OMNamespace;
+import org.apache.axis2.om.OMNode;
+import org.apache.axis2.om.OMOutput;
+import org.apache.axis2.om.OMText;
+import org.apache.axis2.om.OMXMLParserWrapper;
import org.apache.axis2.om.impl.llom.serialize.StreamWriterToContentHandlerConverter;
import org.apache.axis2.om.impl.llom.traverse.OMChildrenIterator;
import org.apache.axis2.om.impl.llom.traverse.OMChildrenQNameIterator;
@@ -147,7 +157,7 @@
String namespaceURI = qname.getNamespaceURI();
if (!"".equals(namespaceURI)) {
ns = findNamespace(qname.getNamespaceURI(),
- qname.getPrefix());
+ qname.getPrefix());
// } else {
// if (parent != null) {
// ns = parent.getNamespace();
@@ -166,7 +176,9 @@
if (!"".equals(prefix)) {
ns = declareNamespace(namespaceURI, prefix);
} else {
- ns = declareNamespace(namespaceURI, getNextNamespacePrefix());
+ ns =
+ declareNamespace(namespaceURI,
+ getNextNamespacePrefix());
}
}
if (ns != null) {
@@ -185,7 +197,7 @@
*/
private OMNamespace handleNamespace(OMNamespace ns) {
OMNamespace namespace = findNamespace(ns.getName(),
- ns.getPrefix());
+ ns.getPrefix());
if (namespace == null) {
namespace = declareNamespace(ns);
}
@@ -215,7 +227,7 @@
*/
public Iterator getChildrenWithName(QName elementQName) throws OMException {
return new OMChildrenQNameIterator((OMNodeImpl) getFirstChild(),
- elementQName);
+ elementQName);
}
/**
@@ -228,13 +240,14 @@
public OMElement getFirstChildWithName(QName elementQName) throws OMException {
OMChildrenQNameIterator omChildrenQNameIterator =
new OMChildrenQNameIterator((OMNodeImpl) getFirstChild(),
- elementQName);
+ elementQName);
OMNode omNode = null;
if (omChildrenQNameIterator.hasNext()) {
omNode = (OMNode) omChildrenQNameIterator.next();
}
- return ((omNode != null) && (OMNode.ELEMENT_NODE == omNode.getType())) ? (OMElement) omNode : null;
+ return ((omNode != null) && (OMNode.ELEMENT_NODE == omNode.getType())) ?
+ (OMElement) omNode : null;
}
@@ -459,10 +472,12 @@
if (ns != null) {
namespace = findNamespace(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");
+ 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");
}
}
return addAttribute(new OMAttributeImpl(attributeName, ns, value));
@@ -573,7 +588,8 @@
*/
private XMLStreamReader getXMLStreamReader(boolean cache) {
if ((builder == null) && !cache) {
- throw new UnsupportedOperationException("This element was not created in a manner to be switched");
+ throw new UnsupportedOperationException(
+ "This element was not created in a manner to be switched");
}
return new OMStAXWrapper(builder, this, cache);
}
@@ -611,7 +627,8 @@
while (child != null) {
if (child.getType() == OMNode.TEXT_NODE) {
textNode = (OMText) child;
- if (textNode.getText() != null && !"".equals(textNode.getText().trim())) {
+ if (textNode.getText() != null &&
+ !"".equals(textNode.getText().trim())) {
childText += textNode.getText().trim();
}
}
@@ -643,7 +660,8 @@
}
if ((builderType == PUSH_TYPE_BUILDER)
&& (builder.getRegisteredContentHandler() == null)) {
- builder.registerExternalContentHandler(new StreamWriterToContentHandlerConverter(omOutput));
+ builder.registerExternalContentHandler(
+ new StreamWriterToContentHandlerConverter(omOutput));
}
@@ -780,7 +798,8 @@
*/
public void setNamespace(OMNamespace namespace) {
if (ns != null) {
- OMNamespace ns = this.findNamespace(namespace.getName(), namespace.getPrefix());
+ OMNamespace ns = this.findNamespace(namespace.getName(),
+ namespace.getPrefix());
if (ns == null) {
ns = this.declareNamespace(namespace);
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNamespaceImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNamespaceImpl.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNamespaceImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNamespaceImpl.java Mon Jul 11 10:48:55 2005
@@ -50,7 +50,9 @@
* @return
*/
public boolean equals(String uri, String prefix) {
- return (((prefix == null) && (this.prefix == null)) || ((prefix != null) && prefix.equals(this.prefix))) && uri.equals(uri);
+ return (((prefix == null) && (this.prefix == null)) ||
+ ((prefix != null) && prefix.equals(this.prefix))) &&
+ uri.equals(uri);
}
/**
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNodeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNodeImpl.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNodeImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNodeImpl.java Mon Jul 11 10:48:55 2005
@@ -163,7 +163,8 @@
*/
public OMNode detach() throws OMException {
if (parent == null) {
- throw new OMException("Elements that doesn't have a parent can not be detached");
+ throw new OMException(
+ "Elements that doesn't have a parent can not be detached");
}
OMNodeImpl nextSibling = (OMNodeImpl) getNextSibling();
if (previousSibling == null) {
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMSerializerUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMSerializerUtil.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMSerializerUtil.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMSerializerUtil.java Mon Jul 11 10:48:55 2005
@@ -64,10 +64,10 @@
namespaceName = ns.getName();
if (prefix != null) {
writer.writeAttribute(prefix, namespaceName,
- attr.getLocalName(), attr.getValue());
+ attr.getLocalName(), attr.getValue());
} else {
writer.writeAttribute(namespaceName, attr.getLocalName(),
- attr.getValue());
+ attr.getValue());
}
} else {
writer.writeAttribute(attr.getLocalName(), attr.getValue());
@@ -116,16 +116,16 @@
if (nameSpaceName != null) {
if (writer_prefix != null) {
writer.writeStartElement(nameSpaceName,
- element.getLocalName());
+ element.getLocalName());
} else {
if (prefix != null) {
writer.writeStartElement(prefix, element.getLocalName(),
- nameSpaceName);
+ nameSpaceName);
writer.writeNamespace(prefix, nameSpaceName);
writer.setPrefix(prefix, nameSpaceName);
} else {
writer.writeStartElement(nameSpaceName,
- element.getLocalName());
+ element.getLocalName());
writer.writeDefaultNamespace(nameSpaceName);
writer.setDefaultNamespace(nameSpaceName);
}
@@ -148,7 +148,8 @@
serializeNamespaces(element, omOutput);
}
- public static void serializeNamespaces(OMElementImpl element, OMOutput omOutput) throws XMLStreamException {
+ public static void serializeNamespaces(OMElementImpl element,
+ OMOutput omOutput) throws XMLStreamException {
Iterator namespaces = element.getAllDeclaredNamespaces();
if (namespaces != null) {
while (namespaces.hasNext()) {
@@ -157,11 +158,13 @@
}
}
- public static void serializeAttributes(OMElementImpl element, OMOutput omOutput) throws XMLStreamException {
+ public static void serializeAttributes(OMElementImpl element,
+ OMOutput omOutput) throws XMLStreamException {
if (element.getAttributes() != null) {
Iterator attributesList = element.getAttributes();
while (attributesList.hasNext()) {
- serializeAttribute((OMAttribute) attributesList.next(), omOutput);
+ serializeAttribute((OMAttribute) attributesList.next(),
+ omOutput);
}
}
}
@@ -174,7 +177,9 @@
* @param cache
* @throws XMLStreamException
*/
- static void serializeNormal(OMElementImpl element, OMOutput omOutput, boolean cache)
+ static void serializeNormal(OMElementImpl element,
+ OMOutput omOutput,
+ boolean cache)
throws XMLStreamException {
if (cache) {
@@ -193,10 +198,12 @@
serializeEndpart(omOutput);
}
- static void serializeByPullStream(OMElementImpl element, OMOutput omOutput) throws XMLStreamException {
+ static void serializeByPullStream(OMElementImpl element,
+ OMOutput omOutput) throws XMLStreamException {
StreamingOMSerializer streamingOMSerializer = new StreamingOMSerializer();
- streamingOMSerializer.serialize(element.getXMLStreamReaderWithoutCaching(),
- omOutput);
+ streamingOMSerializer.serialize(
+ element.getXMLStreamReaderWithoutCaching(),
+ omOutput);
return;
}
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMStAXWrapper.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMStAXWrapper.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMStAXWrapper.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMStAXWrapper.java Mon Jul 11 10:48:55 2005
@@ -15,7 +15,12 @@
*/
package org.apache.axis2.om.impl.llom;
-import org.apache.axis2.om.*;
+import org.apache.axis2.om.OMAttribute;
+import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.OMNamespace;
+import org.apache.axis2.om.OMNode;
+import org.apache.axis2.om.OMText;
+import org.apache.axis2.om.OMXMLParserWrapper;
import org.apache.axis2.om.impl.llom.exception.OMStreamingException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -394,7 +399,8 @@
} else {
if (isStartElement() || isEndElement()
|| (currentEvent == NAMESPACE)) {
- OMNamespace ns = (OMNamespace) getItemFromIterator(((OMElement) lastNode).getAllDeclaredNamespaces(), i);
+ OMNamespace ns = (OMNamespace) getItemFromIterator(
+ ((OMElement) lastNode).getAllDeclaredNamespaces(), i);
returnString = (ns == null)
? null
: ns.getName();
@@ -415,7 +421,8 @@
} else {
if (isStartElement() || isEndElement()
|| (currentEvent == NAMESPACE)) {
- OMNamespace ns = (OMNamespace) getItemFromIterator(((OMElement) lastNode).getAllDeclaredNamespaces(), i);
+ OMNamespace ns = (OMNamespace) getItemFromIterator(
+ ((OMElement) lastNode).getAllDeclaredNamespaces(), i);
returnString = (ns == null)
? null
: ns.getPrefix();
@@ -436,7 +443,8 @@
if (isStartElement() || isEndElement()
|| (currentEvent == NAMESPACE)) {
returnCount =
- getCount(((OMElement) lastNode).getAllDeclaredNamespaces());
+ getCount(
+ ((OMElement) lastNode).getAllDeclaredNamespaces());
}
}
return returnCount;
@@ -456,7 +464,8 @@
// theres nothing to be returned here
} else {
- throw new IllegalStateException("attribute type accessed in illegal event!");
+ throw new IllegalStateException(
+ "attribute type accessed in illegal event!");
}
}
return returnValue;
@@ -478,7 +487,8 @@
returnString = attrib.getValue();
}
} else {
- throw new IllegalStateException("attribute type accessed in illegal event!");
+ throw new IllegalStateException(
+ "attribute type accessed in illegal event!");
}
}
return returnString;
@@ -498,7 +508,8 @@
// todo implement this
} else {
- throw new IllegalStateException("attribute type accessed in illegal event!");
+ throw new IllegalStateException(
+ "attribute type accessed in illegal event!");
}
}
return returnString;
@@ -523,7 +534,8 @@
}
}
} else {
- throw new IllegalStateException("attribute prefix accessed in illegal event!");
+ throw new IllegalStateException(
+ "attribute prefix accessed in illegal event!");
}
}
return returnString;
@@ -545,7 +557,8 @@
returnString = attrib.getLocalName();
}
} else {
- throw new IllegalStateException("attribute localName accessed in illegal event!");
+ throw new IllegalStateException(
+ "attribute localName accessed in illegal event!");
}
}
return returnString;
@@ -570,7 +583,8 @@
}
}
} else {
- throw new IllegalStateException("attribute nameSpace accessed in illegal event!");
+ throw new IllegalStateException(
+ "attribute nameSpace accessed in illegal event!");
}
}
return returnString;
@@ -589,7 +603,8 @@
if (isStartElement() || (currentEvent == ATTRIBUTE)) {
returnQName = getAttribute((OMElement) lastNode, i).getQName();
} else {
- throw new IllegalStateException("attribute count accessed in illegal event!");
+ throw new IllegalStateException(
+ "attribute count accessed in illegal event!");
}
}
return returnQName;
@@ -608,7 +623,8 @@
OMElement elt = (OMElement) lastNode;
returnCount = getCount(elt.getAttributes());
} else {
- throw new IllegalStateException("attribute count accessed in illegal event!");
+ throw new IllegalStateException(
+ "attribute count accessed in illegal event!");
}
}
return returnCount;
@@ -797,11 +813,14 @@
try {
parser = (XMLStreamReader) builder.getParser();
} catch (Exception e) {
- throw new UnsupportedOperationException("incompatible parser found!");
+ throw new UnsupportedOperationException(
+ "incompatible parser found!");
}
- log.info("Switching to the Real Stax parser to generated the future events");
+ log.info(
+ "Switching to the Real Stax parser to generated the future events");
- if ((currentEvent == START_DOCUMENT) && (currentEvent == parser.getEventType())) {
+ if ((currentEvent == START_DOCUMENT) &&
+ (currentEvent == parser.getEventType())) {
currentEvent = parser.next();
} else {
currentEvent = parser.getEventType();
@@ -1150,7 +1169,8 @@
OMAttribute returnAttrib = null;
if (elt != null) {
returnAttrib =
- (OMAttribute) getItemFromIterator(elt.getAttributes(), index);
+ (OMAttribute) getItemFromIterator(elt.getAttributes(),
+ index);
}
return returnAttrib;
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java Mon Jul 11 10:48:55 2005
@@ -18,7 +18,15 @@
import org.apache.axis2.attachments.Base64;
import org.apache.axis2.attachments.ByteArrayDataSource;
import org.apache.axis2.attachments.IOUtils;
-import org.apache.axis2.om.*;
+import org.apache.axis2.om.OMAttribute;
+import org.apache.axis2.om.OMConstants;
+import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.OMException;
+import org.apache.axis2.om.OMNamespace;
+import org.apache.axis2.om.OMNode;
+import org.apache.axis2.om.OMOutput;
+import org.apache.axis2.om.OMText;
+import org.apache.axis2.om.OMXMLParserWrapper;
import org.apache.axis2.om.impl.llom.mtom.MTOMStAXSOAPModelBuilder;
import javax.activation.DataHandler;
@@ -60,7 +68,8 @@
/**
* Field nameSpace used when serialising Binary stuff as MTOM optimised
*/
- protected OMNamespace ns = new OMNamespaceImpl("http://www.w3.org/2004/08/xop/Include", "xop");
+ protected OMNamespace ns = new OMNamespaceImpl(
+ "http://www.w3.org/2004/08/xop/Include", "xop");
/**
* Field localName used when serialising Binary stuff as MTOM optimised
@@ -172,13 +181,15 @@
|| (type == PI_NODE))) {
this.textType = type;
} else {
- throw new UnsupportedOperationException("Attempt to set wrong type");
+ throw new UnsupportedOperationException(
+ "Attempt to set wrong type");
}
}
public int getType() throws OMException {
int type = super.getType();
- if (type == COMMENT_NODE || type == CDATA_SECTION_NODE || type == PI_NODE)
+ if (type == COMMENT_NODE || type == CDATA_SECTION_NODE ||
+ type == PI_NODE)
return type;
return textType;
}
@@ -218,7 +229,7 @@
return Base64.encode(data);
} catch (Exception e) {
throw new OMException("Cannot read from Stream taken form the Data Handler"
- + e);
+ + e);
}
}
@@ -280,7 +291,8 @@
try {
inStream = dataHandler.getDataSource().getInputStream();
} catch (IOException e) {
- throw new OMException("Cannot get InputStream from DataHandler." + e);
+ throw new OMException(
+ "Cannot get InputStream from DataHandler." + e);
}
return inStream;
} else {
@@ -304,9 +316,11 @@
} else {
if (omOutput.doOptimise()) {
// send binary as MTOM optimised
- this.attribute = new OMAttributeImpl("href",
- new OMNamespaceImpl("", ""), "cid:"
- + this.contentID.trim());
+ this.attribute =
+ new OMAttributeImpl("href",
+ new OMNamespaceImpl("", ""),
+ "cid:"
+ + this.contentID.trim());
this.serializeStartpart(omOutput);
omOutput.writeOptimised(this);
@@ -339,7 +353,8 @@
private void createContentID() {
// We can use a UUID, taken using Apache commons id project.
// TODO change to UUID
- this.contentID = "2" + String.valueOf(rnd.nextLong()) + "@schemas.xmlsoap.org";
+ this.contentID = "2" + String.valueOf(rnd.nextLong()) +
+ "@schemas.xmlsoap.org";
}
@@ -360,17 +375,17 @@
if (nameSpaceName != null) {
if (writer_prefix != null) {
writer.writeStartElement(nameSpaceName,
- this.getLocalName());
+ this.getLocalName());
} else {
if (prefix != null) {
writer.writeStartElement(prefix, this.getLocalName(),
- nameSpaceName);
+ nameSpaceName);
//TODO FIX ME
//writer.writeNamespace(prefix, nameSpaceName);
writer.setPrefix(prefix, nameSpaceName);
} else {
writer.writeStartElement(nameSpaceName,
- this.getLocalName());
+ this.getLocalName());
writer.writeDefaultNamespace(nameSpaceName);
writer.setDefaultNamespace(nameSpaceName);
}
@@ -414,11 +429,16 @@
prefix = ns.getPrefix();
namespaceName = ns.getName();
if (prefix != null) {
- writer.writeAttribute(prefix, namespaceName, attr
- .getLocalName(), attr.getValue());
+ writer.writeAttribute(prefix,
+ namespaceName,
+ attr
+ .getLocalName(),
+ attr.getValue());
} else {
- writer.writeAttribute(namespaceName, attr.getLocalName(), attr
- .getValue());
+ writer.writeAttribute(namespaceName,
+ attr.getLocalName(),
+ attr
+ .getValue());
}
} else {
writer.writeAttribute(attr.getLocalName(), attr.getValue());
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/SAXOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/SAXOMBuilder.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/SAXOMBuilder.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/SAXOMBuilder.java Mon Jul 11 10:48:55 2005
@@ -16,7 +16,12 @@
package org.apache.axis2.om.impl.llom.builder;
-import org.apache.axis2.om.*;
+import org.apache.axis2.om.OMAbstractFactory;
+import org.apache.axis2.om.OMContainer;
+import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.OMException;
+import org.apache.axis2.om.OMFactory;
+import org.apache.axis2.om.OMNode;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
@@ -52,13 +57,13 @@
root = e = factory.createOMElement(localName, null, null, null);
} else if (lastNode.isComplete()) {
e = factory.createOMElement(localName, null, lastNode.getParent(),
- null);
+ null);
lastNode.setNextSibling(e);
e.setPreviousSibling(lastNode);
} else {
OMElement parent = (OMElement) lastNode;
e = factory.createOMElement(localName, null, (OMElement) lastNode,
- null);
+ null);
parent.setFirstChild(e);
}
return e;
@@ -99,7 +104,7 @@
int j = atts.getLength();
for (int i = 0; i < j; i++)
nextElem.addAttribute(atts.getLocalName(i), atts.getValue(i),
- nextElem.findNamespace(atts.getURI(i), null));
+ nextElem.findNamespace(atts.getURI(i), null));
lastNode = nextElem;
nextElem = null;
}
@@ -134,8 +139,10 @@
}
OMNode node;
if (lastNode.isComplete()) {
- node = factory.createText((OMElement) lastNode.getParent(), new String(ch,
- start, length));
+ node =
+ factory.createText((OMElement) lastNode.getParent(),
+ new String(ch,
+ start, length));
lastNode.setNextSibling(node);
node.setPreviousSibling(lastNode);
} else {
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java Mon Jul 11 10:48:55 2005
@@ -15,7 +15,14 @@
*/
package org.apache.axis2.om.impl.llom.builder;
-import org.apache.axis2.om.*;
+import org.apache.axis2.om.OMAbstractFactory;
+import org.apache.axis2.om.OMConstants;
+import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.OMException;
+import org.apache.axis2.om.OMFactory;
+import org.apache.axis2.om.OMNamespace;
+import org.apache.axis2.om.OMNode;
+import org.apache.axis2.om.OMXMLParserWrapper;
import org.apache.axis2.om.impl.llom.OMElementImpl;
import org.apache.axis2.om.impl.llom.OMNodeImpl;
@@ -118,13 +125,13 @@
String uri = parser.getAttributeNamespace(i);
if (uri.hashCode() != 0) {
ns = node.findNamespace(uri,
- parser.getAttributePrefix(i));
+ parser.getAttributePrefix(i));
}
// todo if the attributes are supposed to namespace qualified all the time
// todo then this should throw an exception here
node.addAttribute(parser.getAttributeLocalName(i),
- parser.getAttributeValue(i), ns);
+ parser.getAttributeValue(i), ns);
}
}
@@ -140,7 +147,9 @@
}
OMNode node;
if (lastNode.isComplete()) {
- node = omfactory.createText((OMElement) lastNode.getParent(), parser.getText());
+ node =
+ omfactory.createText((OMElement) lastNode.getParent(),
+ parser.getText());
lastNode.setNextSibling(node);
node.setPreviousSibling(lastNode);
} else {
@@ -274,7 +283,8 @@
*/
public void setCache(boolean b) {
if (parserAccessed && b) {
- throw new UnsupportedOperationException("parser accessed. cannot set cache");
+ throw new UnsupportedOperationException(
+ "parser accessed. cannot set cache");
}
cache = b;
}
@@ -352,7 +362,8 @@
parserAccessed = true;
return parser;
} else {
- throw new UnsupportedOperationException("cache must be switched off to access the parser");
+ throw new UnsupportedOperationException(
+ "cache must be switched off to access the parser");
}
}