You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ch...@apache.org on 2005/09/25 01:07:09 UTC
svn commit: r291346 - in /webservices/axis2/trunk/java/modules:
core/src/org/apache/axis2/deployment/ core/test/org/apache/axis2/deployment/
databinding/src/org/apache/axis2/databinding/deserializers/
integration/test/org/apache/axis2/engine/ xml/test/...
Author: chinthaka
Date: Sat Sep 24 16:07:00 2005
New Revision: 291346
URL: http://svn.apache.org/viewcvs?rev=291346&view=rev
Log:
Devs, we need some more discipline. Here I'm removing the System.outs. Can't we live without this ??
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BuildWithAddressingTest.java
webservices/axis2/trunk/java/modules/databinding/src/org/apache/axis2/databinding/deserializers/SimpleDeserializer.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java
webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/AbstractOMSerializationTest.java
webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/CompareOMWithDOMTest.java
webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/MIMEOutputUtilsTest.java
webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMBlankElementTest.java
webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMDocumentTest.java
webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/SpacesTest.java
webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMDocumentSerilizationTest.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=291346&r1=291345&r2=291346&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java Sat Sep 24 16:07:00 2005
@@ -25,13 +25,7 @@
import org.apache.axis2.deployment.scheduler.Scheduler;
import org.apache.axis2.deployment.scheduler.SchedulerTask;
import org.apache.axis2.deployment.util.PhasesInfo;
-import org.apache.axis2.description.Flow;
-import org.apache.axis2.description.HandlerDescription;
-import org.apache.axis2.description.ModuleDescription;
-import org.apache.axis2.description.OperationDescription;
-import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.ServiceDescription;
-import org.apache.axis2.description.ServiceGroupDescription;
+import org.apache.axis2.description.*;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.AxisConfigurationImpl;
import org.apache.axis2.engine.Handler;
@@ -43,19 +37,8 @@
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
+import java.io.*;
+import java.util.*;
public class DeploymentEngine implements DeploymentConstants {
@@ -455,7 +438,6 @@
serviceMetaData.addService(serviceDescription);
}
axisConfig.addServiceGroup(serviceMetaData);
-// System.out.println("Adding service = " + serviceMetaData.getName().getLocalPart());
}
/**
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BuildWithAddressingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BuildWithAddressingTest.java?rev=291346&r1=291345&r2=291346&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BuildWithAddressingTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BuildWithAddressingTest.java Sat Sep 24 16:07:00 2005
@@ -42,7 +42,6 @@
if (metadata.getHandlerCount() <= 0) {
fail("this must failed Since there are addressing handlers ");
} else {
- System.out.println("Found pre-dispatch handlers");
}
}
}*/
Modified: webservices/axis2/trunk/java/modules/databinding/src/org/apache/axis2/databinding/deserializers/SimpleDeserializer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/databinding/src/org/apache/axis2/databinding/deserializers/SimpleDeserializer.java?rev=291346&r1=291345&r2=291346&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/databinding/src/org/apache/axis2/databinding/deserializers/SimpleDeserializer.java (original)
+++ webservices/axis2/trunk/java/modules/databinding/src/org/apache/axis2/databinding/deserializers/SimpleDeserializer.java Sat Sep 24 16:07:00 2005
@@ -16,21 +16,21 @@
package org.apache.axis2.databinding.deserializers;
-import org.apache.axis2.databinding.DeserializationTarget;
import org.apache.axis2.databinding.DeserializationContext;
+import org.apache.axis2.databinding.DeserializationTarget;
import org.apache.axis2.databinding.Deserializer;
import org.apache.axis2.databinding.metadata.TypeDesc;
import org.apache.axis2.i18n.Messages;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamReader;
import java.lang.reflect.Constructor;
+import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
-import java.util.TimeZone;
import java.util.GregorianCalendar;
-import java.text.SimpleDateFormat;
+import java.util.TimeZone;
/**
* SimpleDeserializer
@@ -80,7 +80,6 @@
if (eventType == XMLStreamConstants.START_ELEMENT) {
int numAttrs = reader.getAttributeCount();
eventType = reader.next();
- System.out.println("There are " + numAttrs + " attr(s)");
}
if (eventType == XMLStreamConstants.CHARACTERS) {
text = text.concat(reader.getText());
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java?rev=291346&r1=291345&r2=291346&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/FaultHandlingTest.java Sat Sep 24 16:07:00 2005
@@ -23,13 +23,7 @@
import org.apache.axis2.engine.util.MyInOutMEPClient;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.impl.OMOutputImpl;
-import org.apache.axis2.soap.SOAP11Constants;
-import org.apache.axis2.soap.SOAP12Constants;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.soap.SOAPFactory;
-import org.apache.axis2.soap.SOAPFault;
+import org.apache.axis2.soap.*;
import org.apache.axis2.soap.impl.llom.builder.StAXSOAPModelBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -89,14 +83,6 @@
// } catch (Exception e) {
// }
// }
-
- private void printElement(OMElement element) throws XMLStreamException {
- OMOutputImpl output = new OMOutputImpl(System.out, false);
- element.serializeWithCache(output);
- output.flush();
- }
-
-
private void checkSOAPFaultContent(SOAPEnvelope soapEnvelope) {
assertTrue(soapEnvelope.getBody().hasFault());
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java?rev=291346&r1=291345&r2=291346&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java Sat Sep 24 16:07:00 2005
@@ -29,7 +29,6 @@
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMFactory;
import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.om.impl.OMOutputImpl;
import org.apache.axis2.soap.SOAP11Constants;
import org.apache.axis2.soap.SOAP12Constants;
import org.apache.axis2.soap.SOAPEnvelope;
@@ -39,7 +38,6 @@
import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
public class SOAPversionTest extends TestCase {
private EndpointReference targetEPR =
@@ -139,13 +137,6 @@
inOutMEPClient.invokeBlockingWithEnvelopeOut(
operationName.getLocalPart(), payload);
// assertEquals("SOAP Version received is not compatible", SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI, result.getNamespace().getName());
- try {
- OMOutputImpl output = new org.apache.axis2.om.impl.OMOutputImpl(System.out, false);
- result.serializeWithCache(output);
- output.flush();
- } catch (XMLStreamException e) {
- log.info(e.getMessage());
- }
inOutMEPClient.close();
}
Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/AbstractOMSerializationTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/AbstractOMSerializationTest.java?rev=291346&r1=291345&r2=291346&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/AbstractOMSerializationTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/AbstractOMSerializationTest.java Sat Sep 24 16:07:00 2005
@@ -32,21 +32,10 @@
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.*;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.*;
public class AbstractOMSerializationTest extends XMLTestCase {
@@ -116,8 +105,6 @@
((OMDocument) rootElement.getParent()).serializeWithCache(omOutput);
}
omOutput.flush();
-
- System.out.println("XML = " + new String(baos.toByteArray()));
InputSource resultXML = new InputSource(new InputStreamReader(
new ByteArrayInputStream(baos.toByteArray())));
Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/CompareOMWithDOMTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/CompareOMWithDOMTest.java?rev=291346&r1=291345&r2=291346&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/CompareOMWithDOMTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/CompareOMWithDOMTest.java Sat Sep 24 16:07:00 2005
@@ -39,7 +39,7 @@
File[] files = dir.listFiles();
if (files != null) {
for (int i = 0; i < files.length; i++) {
- System.out.println("Processing files:" + files[i].getAbsolutePath());
+// System.out.println("Processing files:" + files[i].getAbsolutePath());
if (files[i].isFile() && files[i].getName().endsWith(".xml") && !files[i].getName().startsWith("wrong")) {
SOAPEnvelope soapEnvelope = (SOAPEnvelope) OMTestUtils.getOMBuilder(
files[i])
Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/MIMEOutputUtilsTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/MIMEOutputUtilsTest.java?rev=291346&r1=291345&r2=291346&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/MIMEOutputUtilsTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/MIMEOutputUtilsTest.java Sat Sep 24 16:07:00 2005
@@ -71,7 +71,6 @@
MIMEOutputUtils.writeBodyPart(outStream, part2, boundary);
MIMEOutputUtils.finishWritingMime(outStream);
buffer = outStream.toByteArray();
-// System.out.println(new String(buffer));
}
public void testMIMEWriting() throws IOException, MessagingException {
Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMBlankElementTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMBlankElementTest.java?rev=291346&r1=291345&r2=291346&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMBlankElementTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMBlankElementTest.java Sat Sep 24 16:07:00 2005
@@ -35,7 +35,6 @@
try {
//We should not get anything as the return value here: the output of the serialization
String value = buildBlankOMElem();
-// System.out.println(value);
assertNull("There's a serialized output for a blank XML element that cannot exist", value);
} catch (Exception e) {
//An exception is thrown trying to serialize a blank element
Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMDocumentTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMDocumentTest.java?rev=291346&r1=291345&r2=291346&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMDocumentTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMDocumentTest.java Sat Sep 24 16:07:00 2005
@@ -46,7 +46,6 @@
omDocument.serialize(output);
output.flush();
outXML = new String(outStream.toByteArray());
- System.out.println("outXML = " + outXML);
// again load that to another builder
OMDocument secondDocument = getSampleOMDocument(outXML);
Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/SpacesTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/SpacesTest.java?rev=291346&r1=291345&r2=291346&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/SpacesTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/SpacesTest.java Sat Sep 24 16:07:00 2005
@@ -32,12 +32,7 @@
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.*;
public class SpacesTest extends XMLTestCase {
private String filePath = "test-resources/xml/spaces.xml";
@@ -73,7 +68,6 @@
writer.flush();
writer.close();
- System.out.println("XML = " + new String(baos.toByteArray()));
InputSource resultXML = new InputSource(new InputStreamReader(
new ByteArrayInputStream(baos.toByteArray())));
Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMDocumentSerilizationTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMDocumentSerilizationTest.java?rev=291346&r1=291345&r2=291346&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMDocumentSerilizationTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMDocumentSerilizationTest.java Sat Sep 24 16:07:00 2005
@@ -17,11 +17,7 @@
package org.apache.axis2.om.impl.llom;
import junit.framework.TestCase;
-import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.om.OMDocument;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMFactory;
-import org.apache.axis2.om.OMNamespace;
+import org.apache.axis2.om.*;
import org.apache.axis2.om.impl.OMOutputImpl;
import javax.xml.stream.XMLStreamException;
@@ -95,7 +91,6 @@
output.flush();
String xmlDocument = new String(baos.toByteArray());
- System.out.println("xmlDocument = " + xmlDocument);
assertTrue("Charset declaration missing",-1 < xmlDocument.indexOf(encoding) ||
-1 < xmlDocument.indexOf(encoding.toLowerCase()) ||