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 ru...@apache.org on 2006/01/05 16:03:50 UTC
svn commit: r366192 [3/3] - in /webservices/axis2/trunk/java/modules:
adb/src/org/apache/axis2/databinding/
adb/src/org/apache/axis2/databinding/deserializers/
adb/src/org/apache/axis2/databinding/types/
adb/test/org/apache/axis2/databinding/ addressin...
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/attachments/PartOnFile.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/attachments/PartOnFile.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/attachments/PartOnFile.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/attachments/PartOnFile.java Thu Jan 5 07:00:02 2006
@@ -16,21 +16,21 @@
package org.apache.axis2.attachments;
-import org.apache.axis2.om.OMException;
-
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
-import javax.mail.MessagingException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
+import javax.activation.DataHandler;
+import javax.activation.FileDataSource;
+import javax.mail.MessagingException;
+
+import org.apache.axis2.om.OMException;
+
public class PartOnFile implements Part {
File cacheFile;
@@ -162,7 +162,6 @@
}
public String getHeader(String arg0) throws MessagingException {
- ArrayList selectedHeader = null;
String header;
header = (String) headers.get(arg0);
return header;
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/attachments/utils/ImageIO.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/attachments/utils/ImageIO.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/attachments/utils/ImageIO.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/attachments/utils/ImageIO.java Thu Jan 5 07:00:02 2006
@@ -17,8 +17,6 @@
package org.apache.axis2.attachments.utils;
-import javax.imageio.IIOImage;
-import javax.imageio.ImageWriter;
import java.awt.Component;
import java.awt.Graphics;
import java.awt.Image;
@@ -28,11 +26,17 @@
import java.io.OutputStream;
import java.util.Iterator;
+import javax.imageio.IIOImage;
+import javax.imageio.ImageWriter;
+
/**
* JDK1.4 based Image I/O
*/
public class ImageIO extends Component {
- /**
+
+ private static final long serialVersionUID = 4697911685739683266L;
+
+ /**
* Saves an image.
*
* @param mimeType the mime-type of the format to save the image
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/MIMEOutputUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/MIMEOutputUtils.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/MIMEOutputUtils.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/MIMEOutputUtils.java Thu Jan 5 07:00:02 2006
@@ -16,23 +16,21 @@
package org.apache.axis2.om.impl;
-import org.apache.axis2.om.OMException;
-import org.apache.axis2.om.OMText;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeBodyPart;
import java.io.IOException;
import java.io.OutputStream;
import java.io.StringWriter;
import java.util.Iterator;
import java.util.LinkedList;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeBodyPart;
+
+import org.apache.axis2.om.OMException;
+import org.apache.axis2.om.OMText;
+
public class MIMEOutputUtils {
private static byte[] CRLF = { 13, 10 };
- private Log log = LogFactory.getLog(getClass());
public static void complete(OutputStream outStream,
StringWriter writer, LinkedList binaryNodeList,
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMSerializerUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMSerializerUtil.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMSerializerUtil.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMSerializerUtil.java Thu Jan 5 07:00:02 2006
@@ -30,7 +30,6 @@
import java.util.Iterator;
public class OMSerializerUtil {
- private static int namespaceCounter = 0;
/**
* Method serializeEndpart
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/exception/OMBuilderException.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/exception/OMBuilderException.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/exception/OMBuilderException.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/exception/OMBuilderException.java Thu Jan 5 07:00:02 2006
@@ -22,7 +22,10 @@
* Class OMBuilderException
*/
public class OMBuilderException extends OMException {
- /**
+
+ private static final long serialVersionUID = -7447667411291193889L;
+
+ /**
* Constructor OMBuilderException
*
* @param s
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/exception/OMStreamingException.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/exception/OMStreamingException.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/exception/OMStreamingException.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/exception/OMStreamingException.java Thu Jan 5 07:00:02 2006
@@ -22,7 +22,10 @@
* Class OMStreamingException
*/
public class OMStreamingException extends OMException {
- /**
+
+ private static final long serialVersionUID = 8108888406034145092L;
+
+ /**
* Constructor OMStreamingException
*/
public OMStreamingException() {
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/exception/XMLComparisonException.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/exception/XMLComparisonException.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/exception/XMLComparisonException.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/exception/XMLComparisonException.java Thu Jan 5 07:00:02 2006
@@ -17,9 +17,11 @@
package org.apache.axis2.om.impl.llom.exception;
public class XMLComparisonException extends Exception {
- /**
+ /**
* Eran Chinthaka (chinthaka@apache.org)
*/
+
+ private static final long serialVersionUID = -7918497983548520994L;
public XMLComparisonException(String message) {
super(message);
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/AXIOMXPath.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/AXIOMXPath.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/AXIOMXPath.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/AXIOMXPath.java Thu Jan 5 07:00:02 2006
@@ -4,7 +4,10 @@
import org.jaxen.JaxenException;
public class AXIOMXPath extends BaseXPath {
- /**
+
+ private static final long serialVersionUID = -5839161412925154639L;
+
+ /**
* Construct given an XPath expression string.
*
* @param xpathExpr the XPath expression.
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java Thu Jan 5 07:00:02 2006
@@ -31,7 +31,10 @@
import java.util.List;
public class DocumentNavigator extends DefaultNavigator {
- /**
+
+ private static final long serialVersionUID = 7325116153349780805L;
+
+ /**
* Returns a parsed form of the given xpath string, which will be suitable
* for queries on documents that use the same navigator as this one.
*
Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/DefaultNamespaceTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/DefaultNamespaceTest.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/DefaultNamespaceTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/DefaultNamespaceTest.java Thu Jan 5 07:00:02 2006
@@ -29,8 +29,8 @@
OMFactory factory = OMAbstractFactory.getOMFactory();
OMElement foo = factory.createOMElement(new QName("http://defaultNsUri.org", "Foo"), null);
- OMElement bar = factory.createOMElement("Bar", null, foo);
- OMElement baz = factory.createOMElement(new QName("http://defaultNsUri.org", "Baz"), foo);
+ factory.createOMElement("Bar", null, foo);
+ factory.createOMElement(new QName("http://defaultNsUri.org", "Baz"), foo);
assertXMLEqual(expectedXML, foo.toString());
}
@@ -42,10 +42,10 @@
OMElement element = factory.createOMElement("DocElement", null);
OMElement foo = factory.createOMElement(new QName(nsURI, "Foo", nsPrefix), element);
- OMElement bar = factory.createOMElement(new QName(nsURI+1, "Bar", nsPrefix), element);
+ factory.createOMElement(new QName(nsURI+1, "Bar", nsPrefix), element);
- OMElement baz = factory.createOMElement(new QName(nsURI+2, "Baz", nsPrefix), foo);
- OMElement baz2 = factory.createOMElement(new QName(nsURI, "Baz", nsPrefix), foo);
+ factory.createOMElement(new QName(nsURI+2, "Baz", nsPrefix), foo);
+ factory.createOMElement(new QName(nsURI, "Baz", nsPrefix), foo);
}
Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMElementQNameTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMElementQNameTest.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMElementQNameTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMElementQNameTest.java Thu Jan 5 07:00:02 2006
@@ -33,7 +33,6 @@
private static final String WSA= "http://schemas.xmlsoap.org/ws/2004/03/addressing";
private static final String SOAPENV = "http://schemas.xmlsoap.org/soap/envelope/";
- private static final String XSD = "http://www.w3.org/2001/XMLSchema";
public OMElementQNameTest(String testName) {
super(testName);
Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMNavigatorTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMNavigatorTest.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMNavigatorTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMNavigatorTest.java Thu Jan 5 07:00:02 2006
@@ -16,18 +16,18 @@
package org.apache.axis2.om;
-import org.apache.axis2.om.impl.llom.OMNavigator;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.soap.SOAPFactory;
-import org.apache.axis2.soap.impl.llom.builder.StAXSOAPModelBuilder;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileReader;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileReader;
+
+import org.apache.axis2.om.impl.llom.OMNavigator;
+import org.apache.axis2.soap.SOAPEnvelope;
+import org.apache.axis2.soap.impl.llom.builder.StAXSOAPModelBuilder;
public class OMNavigatorTest extends AbstractTestCase {
private SOAPEnvelope envelope = null;
@@ -44,7 +44,6 @@
createXMLStreamReader(
new FileReader(
getTestResourceFile(TestConstants.SOAP_SOAPMESSAGE1)));
- SOAPFactory factory = OMAbstractFactory.getSOAP11Factory();
builder = new StAXSOAPModelBuilder(xmlStreamReader, null);
envelope = (SOAPEnvelope) builder.getDocumentElement();
tempFile = File.createTempFile("temp", "xml");
Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMTest.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMTest.java Thu Jan 5 07:00:02 2006
@@ -16,22 +16,21 @@
package org.apache.axis2.om;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.soap.SOAPFactory;
-import org.apache.axis2.soap.impl.llom.builder.StAXSOAPModelBuilder;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
import java.io.File;
import java.io.FileReader;
import java.util.Iterator;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.axis2.soap.SOAPEnvelope;
+import org.apache.axis2.soap.impl.llom.builder.StAXSOAPModelBuilder;
+
/**
* This test case tests the basic expectations of the engine from the OM.
*/
public class OMTest extends AbstractTestCase {
private SOAPEnvelope envelope;
- private SOAPFactory fac;
/**
* Constructor.
@@ -44,7 +43,6 @@
File file = getTestResourceFile(TestConstants.SAMPLE1);
XMLStreamReader parser = XMLInputFactory.newInstance()
.createXMLStreamReader(new FileReader(file));
- fac = OMAbstractFactory.getSOAP11Factory();
OMXMLParserWrapper builder = new StAXSOAPModelBuilder(parser, null);
envelope = (SOAPEnvelope) builder.getDocumentElement();
}
Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMTestUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMTestUtils.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMTestUtils.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/OMTestUtils.java Thu Jan 5 07:00:02 2006
@@ -79,8 +79,6 @@
NamedNodeMap map = ele.getAttributes();
Iterator attIterator = omele.getAllAttributes();
OMAttribute omattribute;
- Attr domAttribute;
- String DOMAttrName;
while (attIterator != null && attIterator.hasNext() && map == null) {
omattribute = (OMAttribute) attIterator.next();
Node node = map.getNamedItemNS(
Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/factory/OMLinkedListImplFactoryTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/factory/OMLinkedListImplFactoryTest.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/factory/OMLinkedListImplFactoryTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/factory/OMLinkedListImplFactoryTest.java Thu Jan 5 07:00:02 2006
@@ -134,7 +134,7 @@
public void testCreateSOAPEnvelope() {
try {
- OMNamespace soapNamespace = omFactory.createOMNamespace(
+ omFactory.createOMNamespace(
SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI,
SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX);
SOAPEnvelope soapEnvelopeTwo = omFactory.createSOAPEnvelope();
Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMOutputTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMOutputTest.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMOutputTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/llom/OMOutputTest.java Thu Jan 5 07:00:02 2006
@@ -50,7 +50,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- Object object;
DataHandler dataHandler;
outFileName = "OMSerializeMTOMOut.txt";
Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/traverse/OMChildrenWithSpecificAttributeIteratorTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/traverse/OMChildrenWithSpecificAttributeIteratorTest.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/traverse/OMChildrenWithSpecificAttributeIteratorTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/om/impl/traverse/OMChildrenWithSpecificAttributeIteratorTest.java Thu Jan 5 07:00:02 2006
@@ -100,7 +100,7 @@
private int getChidrenCount(Iterator childrenIter) {
int childCount = 0;
while (childrenIter.hasNext()) {
- OMElement omElement = (OMElement) childrenIter.next();
+ childrenIter.next();
childCount++;
}
Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/OMElementTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/OMElementTest.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/OMElementTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/OMElementTest.java Thu Jan 5 07:00:02 2006
@@ -76,7 +76,7 @@
public void testConstructors(){
try {
- OMElement elementWithNoLocalName = factory.createOMElement("", null);
+ factory.createOMElement("", null);
fail("This should fail as OMElement should not be allowed to create without a local name ");
} catch (Exception e) {
assertTrue(true);
@@ -114,7 +114,7 @@
Iterator children = firstElement.getChildren();
int childCount = 0;
while (children.hasNext()) {
- Object o = children.next();
+ children.next();
childCount++;
}
assertEquals("Children count should be two", childCount, 2);
Modified: webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/soap11/SOAP11SerializerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/soap11/SOAP11SerializerTest.java?rev=366192&r1=366191&r2=366192&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/soap11/SOAP11SerializerTest.java (original)
+++ webservices/axis2/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/soap11/SOAP11SerializerTest.java Thu Jan 5 07:00:02 2006
@@ -16,17 +16,13 @@
package org.apache.axis2.soap.impl.llom.soap11;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamWriter;
+
import org.apache.axis2.om.OMTestCase;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.impl.llom.builder.StAXSOAPModelBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamWriter;
public class SOAP11SerializerTest extends OMTestCase {
-
- private Log log = LogFactory.getLog(getClass());
public SOAP11SerializerTest(String testName) {
super(testName);