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 ch...@apache.org on 2005/08/10 07:01:39 UTC

svn commit: r231169 [2/2] - in /webservices/axis/trunk/java: modules/addressing/test/org/apache/axis2/handlers/util/ modules/common/src/org/apache/axis2/i18n/ modules/core/src/org/apache/axis2/clientapi/ modules/core/src/org/apache/axis2/context/ modul...

Modified: webservices/axis/trunk/java/modules/saaj/src/org/apache/axis2/util/XMLUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/saaj/src/org/apache/axis2/util/XMLUtils.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/saaj/src/org/apache/axis2/util/XMLUtils.java (original)
+++ webservices/axis/trunk/java/modules/saaj/src/org/apache/axis2/util/XMLUtils.java Tue Aug  9 21:56:37 2005
@@ -42,8 +42,7 @@
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
         dbf.setNamespaceAware(true);
         db = dbf.newDocumentBuilder();
-        Document doc = db.newDocument();
-        return doc;
+        return db.newDocument();
     }
 
     /**

Modified: webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/EnvelopeTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/EnvelopeTest.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/EnvelopeTest.java (original)
+++ webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/EnvelopeTest.java Tue Aug  9 21:56:37 2005
@@ -36,7 +36,7 @@
     	SOAPMessage smsg = 
     		mf.createMessage(new MimeHeaders(), new ByteArrayInputStream(xmlString.getBytes()));
     	SOAPPart sp = smsg.getSOAPPart();
-    	SOAPEnvelope se = (SOAPEnvelope)sp.getEnvelope();
+    	SOAPEnvelope se = sp.getEnvelope();
     	//smsg.writeTo(System.out);
     	assertTrue(se != null);
     }
@@ -46,7 +46,7 @@
     	SOAPMessage smsg =
     		mf.createMessage(new MimeHeaders(), new ByteArrayInputStream(xmlString.getBytes()));
     	SOAPPart sp = smsg.getSOAPPart();
-    	SOAPEnvelope se = (SOAPEnvelope)sp.getEnvelope();
+    	SOAPEnvelope se = sp.getEnvelope();
     	ByteArrayOutputStream baos = new ByteArrayOutputStream();
     	smsg.writeTo(baos);
     	SOAPBody body = smsg.getSOAPPart().getEnvelope().getBody();
@@ -70,7 +70,7 @@
     		factory.createMessage(new MimeHeaders(),
     				new ByteArrayInputStream(soapMessageWithLeadingComment.getBytes()));
     	SOAPPart part = message.getSOAPPart();
-    	SOAPEnvelope envelope = (SOAPEnvelope) part.getEnvelope();
+    	SOAPEnvelope envelope = part.getEnvelope();
     	message.writeTo(System.out);
     	assertTrue(envelope != null);
     }

Modified: webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/QueueManager.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/QueueManager.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/QueueManager.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/QueueManager.java Tue Aug  9 21:56:37 2005
@@ -25,7 +25,7 @@
     private static String key = null;
 
     static {
-        Class clazz = new Object().getClass();
+        Class clazz = Object.class;
         InputStream stream = clazz.getResourceAsStream(
                 "/sample/amazon/common/conf/key.properties");
         Properties properties = new Properties();

Modified: webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/GUIHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/GUIHandler.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/GUIHandler.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/GUIHandler.java Tue Aug  9 21:56:37 2005
@@ -227,8 +227,8 @@
      */
     public void run() {
         while (true) {
-            AsynchronousClient.search.toString().trim();
-            if (AsynchronousClient.doSearch == true) {
+            AsynchronousClient.search.trim();
+            if (AsynchronousClient.doSearch) {
 
                 try {
                     AsynchronousClient.doSearch = false;

Modified: webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/LinkFollower.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/LinkFollower.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/LinkFollower.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/LinkFollower.java Tue Aug  9 21:56:37 2005
@@ -72,7 +72,7 @@
      */
     public void hyperlinkUpdate(HyperlinkEvent evt) {
         if (evt.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
-            if (builded == false) {
+            if (!builded) {
 
                 /** Window is not built yet, so build it */
 
@@ -82,6 +82,7 @@
                 currentURL = evt.getURL().toString();   //set the URL
                 showURL = true;                        // Flag is set, thread should open the URL
             } catch (Exception e) {
+                e.printStackTrace();
             }
         }
     }
@@ -127,7 +128,7 @@
      */
     public void run() {
         while (true) {
-            if (showURL == true) {
+            if (showURL) {
                 this.setPage();
                 showURL = false;
             }

Modified: webservices/axis/trunk/java/modules/samples/src/sample/google/common/util/PropertyLoader.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/google/common/util/PropertyLoader.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/google/common/util/PropertyLoader.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/google/common/util/PropertyLoader.java Tue Aug  9 21:56:37 2005
@@ -31,7 +31,7 @@
     static {
         try {
             Properties prop = new Properties();
-            Class clazz = new Object().getClass();
+            Class clazz = Object.class;
             InputStream stream = clazz.getResourceAsStream(
                     "/sample/google/common/conf/key.properties");
             prop.load(stream);

Modified: webservices/axis/trunk/java/modules/samples/src/sample/google/search/ClientCallbackHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/google/search/ClientCallbackHandler.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/google/search/ClientCallbackHandler.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/google/search/ClientCallbackHandler.java Tue Aug  9 21:56:37 2005
@@ -74,8 +74,7 @@
      */
 
     public void onComplete(AsyncResult result) {
-        AsyncResult myResult = result;
-        extractDetails(myResult);
+        extractDetails(result);
     }
 
     /**

Modified: webservices/axis/trunk/java/modules/samples/src/sample/google/search/LinkFollower.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/google/search/LinkFollower.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/google/search/LinkFollower.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/google/search/LinkFollower.java Tue Aug  9 21:56:37 2005
@@ -76,7 +76,7 @@
 
             /** Window is not built yet, so build it */
 
-            if (builded == false) {
+            if (!builded) {
                 buildURLWindaw();
             }
             try {
@@ -131,7 +131,7 @@
      */
     public void run() {
         while (true) {
-            if (showURL == true) {
+            if (showURL) {
                 this.setPage();
                 showURL = false;
             }

Modified: webservices/axis/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java Tue Aug  9 21:56:37 2005
@@ -118,7 +118,7 @@
                 new EndpointReference(url.toString()));
         try {
             responseElement =
-                    (OMElement) call.invokeBlocking("doGoogleSpellingSugg",
+                    call.invokeBlocking("doGoogleSpellingSugg",
                             requestElement);
         } catch (AxisFault axisFault) {
             observer.updateError(axisFault.getMessage());

Modified: webservices/axis/trunk/java/modules/samples/src/sample/groovy/GroovyReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/groovy/GroovyReceiver.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/groovy/GroovyReceiver.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/groovy/GroovyReceiver.java Tue Aug  9 21:56:37 2005
@@ -134,7 +134,7 @@
         OMFactory fac = OMAbstractFactory.getOMFactory();
 
         StAXOMBuilder staxOMBuilder =
-            new StAXOMBuilder(fac, (XMLStreamReader) xmlReader);
+            new StAXOMBuilder(fac, xmlReader);
         return staxOMBuilder.getDocumentElement();
     }
 

Modified: webservices/axis/trunk/java/modules/samples/src/sample/mtom/imagetransfer/client/MTOMClientModel.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/mtom/imagetransfer/client/MTOMClientModel.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/mtom/imagetransfer/client/MTOMClientModel.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/mtom/imagetransfer/client/MTOMClientModel.java Tue Aug  9 21:56:37 2005
@@ -80,11 +80,10 @@
         call.set(Constants.Configuration.ENABLE_MTOM, Constants.VALUE_TRUE);
         call.setTransportInfo(Constants.TRANSPORT_HTTP,
                 Constants.TRANSPORT_HTTP, false);
-        OMElement result = (OMElement) call.invokeBlocking(operationName
+        return call.invokeBlocking(operationName
                 .getLocalPart(),
                 payload);
 
-        return result;
     }
 
 

Modified: webservices/axis/trunk/java/modules/samples/src/sample/mtom/imagetransfer/client/UserInterface.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/mtom/imagetransfer/client/UserInterface.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/mtom/imagetransfer/client/UserInterface.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/mtom/imagetransfer/client/UserInterface.java Tue Aug  9 21:56:37 2005
@@ -147,7 +147,7 @@
         try {
             mtomTest.setInputFile(file);
             mtomTest.setTargetEPR(EPRName);
-            OMElement result = (OMElement) mtomTest.testEchoXMLSync(fileName);
+            OMElement result = mtomTest.testEchoXMLSync(fileName);
             jTextArea.setText(result.toString());
             jTextArea.append("\n"+result.getText());
             JOptionPane.showMessageDialog(parent, "Sent & saved Image Succesfully",
@@ -169,11 +169,7 @@
 
             String extension = getExtension(f);
             if (extension != null) {
-                if (extension.equals("jpg") || extension.equals("JPEG"))
-                    return true;
-                else {
-                    return false;
-                }
+                return extension.equals("jpg") || extension.equals("JPEG");
             }
 
             return false;

Modified: webservices/axis/trunk/java/modules/samples/src/sample/mtom/interop/client/InteropClientModel.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/mtom/interop/client/InteropClientModel.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/mtom/interop/client/InteropClientModel.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/mtom/interop/client/InteropClientModel.java Tue Aug  9 21:56:37 2005
@@ -62,10 +62,9 @@
         call.set(Constants.Configuration.ENABLE_MTOM, Constants.VALUE_TRUE);
         call.setTransportInfo(Constants.TRANSPORT_HTTP,
                 Constants.TRANSPORT_HTTP, false);
-        OMElement result = (OMElement) call.invokeBlocking(operationName
+        return call.invokeBlocking(operationName
                 .getLocalPart(),
                 payload);
-        return result;
     }
 
     public void setTargetEPR(String targetEPR) {

Modified: webservices/axis/trunk/java/modules/samples/src/sample/mtom/interop/client/UserInterface.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/mtom/interop/client/UserInterface.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/mtom/interop/client/UserInterface.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/mtom/interop/client/UserInterface.java Tue Aug  9 21:56:37 2005
@@ -139,7 +139,7 @@
 
         try {
             mtomTest.setTargetEPR(EPRName);
-            OMElement result = (OMElement) mtomTest.testEchoXMLSync(fileName);
+            OMElement result = mtomTest.testEchoXMLSync(fileName);
 //            jTextArea.setText(result.toString());
 //            jTextArea.append("\n"+result.getText());
 //            JOptionPane.showMessageDialog(parent, "Sent & saved Image Succesfully",

Modified: webservices/axis/trunk/java/modules/samples/src/userguide/clients/ClientForWebServiceWithModule.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/clients/ClientForWebServiceWithModule.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/clients/ClientForWebServiceWithModule.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/clients/ClientForWebServiceWithModule.java Tue Aug  9 21:56:37 2005
@@ -55,7 +55,7 @@
                     false);
 
             //Blocking invocation
-            OMElement result = (OMElement) call.invokeBlocking("echo",
+            OMElement result = call.invokeBlocking("echo",
                     payload);
 
             StringWriter writer = new StringWriter();

Modified: webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoBlockingClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoBlockingClient.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoBlockingClient.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoBlockingClient.java Tue Aug  9 21:56:37 2005
@@ -40,7 +40,7 @@
                     false);
 
             //Blocking invocation
-            OMElement result = (OMElement) call.invokeBlocking("echo",
+            OMElement result = call.invokeBlocking("echo",
                     payload);
 
             StringWriter writer = new StringWriter();

Modified: webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoBlockingDualClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoBlockingDualClient.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoBlockingDualClient.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoBlockingDualClient.java Tue Aug  9 21:56:37 2005
@@ -50,7 +50,7 @@
                     true);
 
             //Blocking Invocation
-            OMElement result = (OMElement) call.invokeBlocking("echo",
+            OMElement result = call.invokeBlocking("echo",
                     payload);
 
             StringWriter writer = new StringWriter();

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilderFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilderFactory.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilderFactory.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilderFactory.java Tue Aug  9 21:56:37 2005
@@ -72,9 +72,9 @@
         int version = getWSDLVersion(doc);
 
         if (version == WSDL11) {
-            return (WOMBuilder) new WSDL1ToWOMBuilder();
+            return new WSDL1ToWOMBuilder();
         } else if (version == wsdl20) {
-            return (WOMBuilder) new WSDL2ToWOMBuilder();
+            return new WSDL2ToWOMBuilder();
         }
 
         throw new WSDLException(WSDLException.OTHER_ERROR,

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java Tue Aug  9 21:56:37 2005
@@ -16,25 +16,18 @@
 
 package org.apache.axis2.wsdl.codegen;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.wsdl.WSDLException;
-
 import org.apache.axis2.wsdl.builder.WOMBuilderFactory;
 import org.apache.axis2.wsdl.codegen.emitter.CSharpEmitter;
 import org.apache.axis2.wsdl.codegen.emitter.Emitter;
 import org.apache.axis2.wsdl.codegen.emitter.JavaEmitter;
-import org.apache.axis2.wsdl.codegen.extension.AxisBindingBuilder;
-import org.apache.axis2.wsdl.codegen.extension.CodeGenExtension;
-import org.apache.axis2.wsdl.codegen.extension.PackageFinder;
-import org.apache.axis2.wsdl.codegen.extension.WSDLValidatorExtension;
-import org.apache.axis2.wsdl.codegen.extension.XMLBeansExtension;
-//import org.apache.axis2.wsdl.codegen.extension.AbstractCodeGenerationExtension;
-//import org.apache.axis2.wsdl.codegen.extension.SimpleDBExtension;
+import org.apache.axis2.wsdl.codegen.extension.*;
 import org.apache.axis2.wsdl.databinding.TypeMapper;
 import org.apache.wsdl.WSDLDescription;
+
+import javax.wsdl.WSDLException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author chathura@opensource.lk

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java Tue Aug  9 21:56:37 2005
@@ -5,17 +5,7 @@
 import org.apache.axis2.wsdl.codegen.Constants;
 import org.apache.axis2.wsdl.codegen.writer.*;
 import org.apache.axis2.wsdl.databinding.TypeMapper;
-import org.apache.wsdl.MessageReference;
-import org.apache.wsdl.WSDLBinding;
-import org.apache.wsdl.WSDLBindingOperation;
-import org.apache.wsdl.WSDLConstants;
-import org.apache.wsdl.WSDLDescription;
-import org.apache.wsdl.WSDLEndpoint;
-import org.apache.wsdl.WSDLExtensibilityElement;
-import org.apache.wsdl.WSDLInterface;
-import org.apache.wsdl.WSDLOperation;
-import org.apache.wsdl.WSDLService;
-import org.apache.wsdl.WSDLTypes;
+import org.apache.wsdl.*;
 import org.apache.wsdl.extensions.ExtensionConstants;
 import org.apache.wsdl.extensions.SOAPBody;
 import org.apache.wsdl.extensions.SOAPOperation;
@@ -457,8 +447,7 @@
     private Document getEmptyDocument() {
         try {
             DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-            Document doc = documentBuilder.newDocument();
-            return doc;
+            return documentBuilder.newDocument();
         } catch (ParserConfigurationException e) {
             throw new RuntimeException(e);
         }

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java Tue Aug  9 21:56:37 2005
@@ -18,22 +18,18 @@
  *
  */
 
+import org.apache.axis.xsd.xml.schema.XmlSchema;
+import org.apache.axis.xsd.xml.schema.XmlSchemaCollection;
 import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
-import org.apache.axis2.wsdl.databinding.JavaTypeMapper;
 import org.apache.axis2.wsdl.databinding.DefaultTypeMapper;
+import org.apache.axis2.wsdl.databinding.JavaTypeMapper;
 import org.apache.wsdl.WSDLExtensibilityElement;
 import org.apache.wsdl.WSDLTypes;
 import org.apache.wsdl.extensions.ExtensionConstants;
 import org.apache.wsdl.extensions.Schema;
-import org.apache.axis.xsd.xml.schema.XmlSchemaCollection;
-import org.apache.axis.xsd.xml.schema.XmlSchema;
 import org.w3c.dom.Element;
 
-import java.util.List;
-import java.util.Stack;
-import java.util.Vector;
-import java.util.Map;
-import java.util.Iterator;
+import java.util.*;
 
 /**
   * Work in progress to test simple DataBinding with the XmlSchema lib

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XMLUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XMLUtils.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XMLUtils.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XMLUtils.java Tue Aug  9 21:56:37 2005
@@ -419,10 +419,9 @@
             if (systemId == null) {
                 systemId = "null";
             }
-            String info = "URI=" + systemId +
+            return "URI=" + systemId +
                 " Line=" + spe.getLineNumber() +
                 ": " + spe.getMessage();
-            return info;
         }
 
         // The following methods are standard SAX ErrorHandler methods.

Modified: webservices/axis/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/codegen/WSDL2JavaTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/codegen/WSDL2JavaTest.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/codegen/WSDL2JavaTest.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/codegen/WSDL2JavaTest.java Tue Aug  9 21:56:37 2005
@@ -1,15 +1,14 @@
 package org.apache.axis2.wsdl.codegen;
 
 import junit.framework.TestCase;
-
-import java.util.Map;
-import java.util.HashMap;
-import java.io.File;
-
-import org.apache.tools.ant.taskdefs.Javac;
-import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Target;
+import org.apache.tools.ant.taskdefs.Javac;
+import org.apache.tools.ant.types.Path;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
 
 /*
 * Copyright 2004,2005 The Apache Software Foundation.

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=231169&r1=231168&r2=231169&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 Tue Aug  9 21:56:37 2005
@@ -51,9 +51,9 @@
             }
             array[j] = intfc;
         }
-        assertEquals(((WSDLOperation) array[0].getOperation("op0of inteface0"))
+        assertEquals(array[0].getOperation("op0of inteface0")
                 .getName().getLocalPart(), "op0of inteface0");
-        assertEquals(((WSDLOperation) array[0].getOperation("op1of inteface0"))
+        assertEquals(array[0].getOperation("op1of inteface0")
                 .getName().getLocalPart(), "op1of inteface0");
         assertEquals(array[interfaceCounter - 1].getAllOperations().size(),
                 interfaceCounter * operationCounter);

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=231169&r1=231168&r2=231169&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 Tue Aug  9 21:56:37 2005
@@ -144,8 +144,7 @@
     }
 
     public InputStream getInputStream() throws IOException, MessagingException {
-        FileInputStream inStream = new FileInputStream(cacheFile);
-        return inStream;
+        return new FileInputStream(cacheFile);
     }
 
     public DataHandler getDataHandler() throws MessagingException {

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/serialize/StreamingOMSerializer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/serialize/StreamingOMSerializer.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/serialize/StreamingOMSerializer.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/serialize/StreamingOMSerializer.java Tue Aug  9 21:56:37 2005
@@ -61,7 +61,7 @@
      */
     public void serialize(XMLStreamReader obj, OMOutputImpl omOutput)
             throws XMLStreamException {
-        XMLStreamReader node = (XMLStreamReader) obj;
+        XMLStreamReader node = obj;
         serializeNode(node, omOutput);
     }
 

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenWithSpecificAttributeIterator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenWithSpecificAttributeIterator.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenWithSpecificAttributeIterator.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenWithSpecificAttributeIterator.java Tue Aug  9 21:56:37 2005
@@ -105,10 +105,13 @@
      * @return
      */
     public Object next() {
-        Object o = super.next();
-        if ((o != null) && detach && ((OMElement) o).getParent() != null) {
-            ((OMElement) o).detach();
+        nextCalled = true;
+        removeCalled = false;
+        lastChild = currentChild;
+        currentChild = currentChild.getNextSibling();
+        if ((lastChild != null) && detach && lastChild.getParent() != null) {
+            lastChild.detach();
         }
-        return o;
+        return lastChild;
     }
 }

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPEnvelopeImpl.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPEnvelopeImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPEnvelopeImpl.java Tue Aug  9 21:56:37 2005
@@ -17,12 +17,7 @@
 
 import org.apache.axis2.om.*;
 import org.apache.axis2.om.impl.OMOutputImpl;
-import org.apache.axis2.soap.SOAP12Constants;
-import org.apache.axis2.soap.SOAPBody;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.soap.SOAPHeader;
-import org.apache.axis2.soap.SOAPHeaderBlock;
-import org.apache.axis2.soap.SOAPFactory;
+import org.apache.axis2.soap.*;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
@@ -86,10 +81,9 @@
 
         SOAPHeader headerContainer = getHeader();
         OMNamespace namespace = factory.createOMNamespace(namespaceURI, null);
-        SOAPHeaderBlock block = factory.createSOAPHeaderBlock(name,
+        return factory.createSOAPHeaderBlock(name,
                                                               namespace,
                                                               headerContainer);
-        return block;
     }
 
     public void addChild(OMNode child) {

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/SOAP12BuilderHelper.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/SOAP12BuilderHelper.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/SOAP12BuilderHelper.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/SOAP12BuilderHelper.java Tue Aug  9 21:56:37 2005
@@ -286,7 +286,7 @@
                 boolean localNameExist = false;
                 for (int i = 0; i < detailElementNames.size(); i++) {
                     if (parent.getLocalName().equals(
-                            (String) detailElementNames.get(i))) {
+                            detailElementNames.get(i))) {
                         localNameExist = true;
                         detailElementLevel = i + 1;
                     }

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11BodyImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11BodyImpl.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11BodyImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11BodyImpl.java Tue Aug  9 21:56:37 2005
@@ -44,7 +44,6 @@
     }
 
     public SOAPFault addFault(Exception e) throws OMException {
-        SOAPFault soapFault = new SOAP11Factory().createSOAPFault(this, e);
-        return soapFault;
+        return new SOAP11Factory().createSOAPFault(this, e);
     }
 }

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/attachments/ImageSampleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/attachments/ImageSampleTest.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/attachments/ImageSampleTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/attachments/ImageSampleTest.java Tue Aug  9 21:56:37 2005
@@ -69,13 +69,6 @@
     String contentTypeString = "multipart/Related; type=\"application/xop+xml\";start=\"<SOAPPart>\"; boundary=\"----=_AxIs2_Def_boundary_=42214532\"";
 
 
-    /*
-     * @see TestCase#setUp()
-     */
-    protected void setUp() throws Exception {
-        super.setUp();
-
-    }
 
     public void testImageSampleSerialize() throws Exception {
 
@@ -126,7 +119,7 @@
                                         mimeHelper
                 .getSOAPPartInputStream())));
         builder = new MTOMStAXSOAPModelBuilder(reader, mimeHelper, null);
-        OMElement root = (OMElement) builder.getDocumentElement();
+        OMElement root = builder.getDocumentElement();
         OMElement body = (OMElement) root.getFirstChild();
         OMElement data = (OMElement) body.getFirstChild();
         OMText blob = (OMText) data.getFirstChild();

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/IteratorTester.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/IteratorTester.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/IteratorTester.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/IteratorTester.java Tue Aug  9 21:56:37 2005
@@ -116,7 +116,7 @@
         int firstChildrenCount = 0;
         int secondChildrenCount = 0;
         while (iter.hasNext()) {
-            assertNotNull((OMNode) iter.next());
+            assertNotNull(iter.next());
             firstChildrenCount++;
         }
 
@@ -128,7 +128,7 @@
         //reset the iterator
         iter = elt.getChildren(); //reset the iterator
         while (iter.hasNext()) {
-            assertNotNull((OMNode) iter.next());
+            assertNotNull(iter.next());
             secondChildrenCount++;
         }
         assertEquals("children count must reduce from 1",

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/OMTestCase.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/OMTestCase.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/OMTestCase.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/OMTestCase.java Tue Aug  9 21:56:37 2005
@@ -44,7 +44,7 @@
     }
 
     protected StAXSOAPModelBuilder getOMBuilder(String fileName) throws Exception {
-        if (fileName == "" || fileName == null) {
+        if ("".equals(fileName) || fileName == null) {
             fileName = IN_FILE_NAME;
         }
         XMLStreamReader parser = XMLInputFactory.newInstance()

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/OMTestUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/OMTestUtils.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/OMTestUtils.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/OMTestUtils.java Tue Aug  9 21:56:37 2005
@@ -30,9 +30,8 @@
     public static OMXMLParserWrapper getOMBuilder(File file) throws Exception {
         XMLStreamReader parser = XMLInputFactory.newInstance()
                 .createXMLStreamReader(new FileReader(file));
-        OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXSOAPModelBuilder(
+        return OMXMLBuilderFactory.createStAXSOAPModelBuilder(
                 OMAbstractFactory.getSOAP11Factory(), parser);
-        return builder;
     }
 
     public static void walkThrough(OMElement omEle) {

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/impl/traverse/OMChildrenWithSpecificAttributeIteratorTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/impl/traverse/OMChildrenWithSpecificAttributeIteratorTest.java?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/impl/traverse/OMChildrenWithSpecificAttributeIteratorTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/impl/traverse/OMChildrenWithSpecificAttributeIteratorTest.java Tue Aug  9 21:56:37 2005
@@ -15,83 +15,94 @@
  */
 package org.apache.axis2.om.impl.traverse;
 
-import org.apache.axis2.om.OMConstants;
-import org.apache.axis2.om.OMTestCase;
+import junit.framework.TestCase;
+import org.apache.axis2.om.OMAbstractFactory;
+import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.OMFactory;
+import org.apache.axis2.om.OMNamespace;
+import org.apache.axis2.om.impl.llom.traverse.OMChildrenWithSpecificAttributeIterator;
 
-public class OMChildrenWithSpecificAttributeIteratorTest extends OMTestCase implements OMConstants {
-    private String sampleSOAPMessage = "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:wsa=\"http://schemas.xmlsoap.org/ws/2004/03/addressing\">\n" +
-            "    <soapenv:Header>\n" +
-            "        <wsa:MessageID soapenv:mustUnderstand=\"1\">uuid:920C5190-0B8F-11D9-8CED-F22EDEEBF7E5</wsa:MessageID>\n" +
-            "        <wsa:To soapenv:mustUnderstand=\"0\">http://localhost:8081/axis/services/BankPort</wsa:To>\n" +
-            "        <wsa:From soapenv:mustUnderstand=\"1\">\n" +
-            "            <Address xmlns=\"http://schemas.xmlsoap.org/ws/2004/03/addressing\">http://schemas.xmlsoap.org/ws/2004/03/addressing/role/anonymous</Address>\n" +
-            "        </wsa:From>\n" +
-            "    </soapenv:Header>\n" +
-            "    <soapenv:Body>\n" +
-            "        <axis2:echoVoid xmlns:axis2=\"http://ws.apache.org/axis2\" ></axis2:echoVoid>\n" +
-            "    </soapenv:Body>\n" +
-            "</soapenv:Envelope>";
+import javax.xml.namespace.QName;
+import java.util.Iterator;
+
+public class OMChildrenWithSpecificAttributeIteratorTest extends TestCase {
 
     public OMChildrenWithSpecificAttributeIteratorTest(String testName) {
         super(testName);
     }
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner
-                .run(OMChildrenWithSpecificAttributeIteratorTest.class);
-    }
+    public void testChildrenRetrievalWithDetaching() {
+
+        OMFactory factory = OMAbstractFactory.getOMFactory();
+        OMNamespace testNamespace = factory.createOMNamespace("http://test.axis2.org", "test");
+        OMElement documentElement = getSampleDocumentElement(testNamespace);
+
+        Iterator childrenIter = new OMChildrenWithSpecificAttributeIterator(
+                documentElement.getFirstChild(), new QName(testNamespace.getName(), "myAttr",
+                testNamespace.getPrefix()), "Axis2", true);
+
+        int childCount = getChidrenCount(childrenIter);
+        assertEquals("Iterator must return 5 children with the given attribute", childCount, 5);
+
+        Iterator children = documentElement.getChildren();
+        childCount = getChidrenCount(children);
+        assertEquals("Iterator must return only one child, having detached the other children", childCount, 1);
 
-    /*
-     * @see TestCase#setUp()
-     */
-    protected void setUp() throws Exception {
-        super.setUp();
     }
 
-    public void testChildrenRetrievalWithNoDetach() {
-        //       try {
-        //            soapEnvelope = getOMBuilder(new ByteArrayInputStream(sampleSOAPMessage.getBytes())).getSOAPEnvelope();
-        //            SOAPHeader soapHeader = soapEnvelope.getHeader();
-        //
-        //            // getting header blocks with mustUnderstand="0"
-        //            OMChildrenWithSpecificAttributeIterator iter = new OMChildrenWithSpecificAttributeIterator(soapHeader.getFirstChild(), new QName(SOAP_ENVELOPE_NAMESPACE_URI, ATTR_MUSTUNDERSTAND), "0", false);
-        //
-        //            if (iter.hasNext()) {
-        //                SOAPHeaderBlock soapHeaderBlock = (SOAPHeaderBlock) iter.next();
-        //                assertEquals("Header Block with mustUnderstand=\")0\" has not been retrieved properly", soapHeaderBlock.getLocalName(), AddressingConstants.WSA_TO);
-        //            }
-        //
-        //            if (iter.hasNext()) {
-        //                fail("Given sample SOAP doesn't have more than one mustunderstand false header blocks");
-        //            }
-        //
-        //
-        //        } catch (Exception e) {
-        //            e.printStackTrace();
-        //            fail("Something has gone wrong in accessing the test xml file");
-        //        }
+    public void testChildrenRetrievalWithNoDetaching() {
+
+        OMFactory factory = OMAbstractFactory.getOMFactory();
+        OMNamespace testNamespace = factory.createOMNamespace("http://test.axis2.org", "test");
+        OMElement documentElement = getSampleDocumentElement(testNamespace);
+
+        Iterator childrenIter = new OMChildrenWithSpecificAttributeIterator(
+                documentElement.getFirstChild(), new QName(testNamespace.getName(), "myAttr",
+                testNamespace.getPrefix()), "Axis2", false);
+
+        int childCount = getChidrenCount(childrenIter);
+        assertEquals("Iterator must return 5 children with the given attribute", childCount, 5);
+
+        Iterator children = documentElement.getChildren();
+        childCount = getChidrenCount(children);
+        assertEquals("Iterator must return 6 children, having not detached the children", childCount, 6);
+
     }
 
-    public void testChildrenRetrievalWithDetach() throws Exception {
-        //        soapEnvelope = getOMBuilder(new ByteArrayInputStream(sampleSOAPMessage.getBytes())).getSOAPEnvelope();
-        //        SOAPHeader soapHeader = soapEnvelope.getHeader();
-        //
-        //        OMChildrenWithSpecificAttributeIterator iter = new OMChildrenWithSpecificAttributeIterator(soapHeader.getFirstChild(), new QName(SOAP_ENVELOPE_NAMESPACE_URI, ATTR_MUSTUNDERSTAND), "0", true);
-        //        if (iter.hasNext()) {
-        //            SOAPHeaderBlock soapHeaderBlock = (SOAPHeaderBlock) iter.next();
-        //            assertEquals("Header Block with mustUnderstand=\")0\" has not been retrieved properly", soapHeaderBlock.getLocalName(), AddressingConstants.WSA_TO);
-        //        }
-        //
-        //        Iterator soapHeaderChildrenIter = soapHeader.getChildren();
-        //        int childrenCount = 0;
-        //        while (soapHeaderChildrenIter.hasNext()) {
-        //            Object o = soapHeaderChildrenIter.next();
-        //            childrenCount++;
-        //        }
-        //
-        //        assertEquals("OMChildrenWithSpecificAttributeIterator with detach true, not working properly", childrenCount, 6); // here this 6 includes white spaces as OMText
+    private OMElement getSampleDocumentElement(OMNamespace testNamespace){
+        OMFactory factory = OMAbstractFactory.getOMFactory();
 
+        OMElement documentElement = factory.createOMElement("Employees", testNamespace);
+        documentElement.declareNamespace(testNamespace);
+
+        OMElement employee;
+        OMElement name;
+
+        for (int i = 0; i < 5; i++) {
+            employee = factory.createOMElement("Employee", testNamespace, documentElement);
+            name = factory.createOMElement("Name"+i, testNamespace);
+            employee.addAttribute("myAttr", "Axis2", testNamespace);
+            name.setText("Apache Developer");
+            employee.addChild(name);
+        }
+
+        //adding one more child with the given attr
+        employee = factory.createOMElement("Employee", testNamespace, documentElement);
+        name = factory.createOMElement("Name", testNamespace);
+        name.addAttribute("myAttr", "Un-Related Value", testNamespace);
+        name.setText("Apache Developer");
+        employee.addChild(name);
+
+        return documentElement;
     }
 
+    private int getChidrenCount(Iterator childrenIter) {
+        int childCount = 0;
+        while (childrenIter.hasNext()) {
+            OMElement omElement = (OMElement) childrenIter.next();
+            childCount++;
+        }
 
+        return childCount;
+    }
 }

Modified: webservices/axis/trunk/java/xdocs/mail-configuration.html
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/xdocs/mail-configuration.html?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/xdocs/mail-configuration.html (original)
+++ webservices/axis/trunk/java/xdocs/mail-configuration.html Tue Aug  9 21:56:37 2005
@@ -14,7 +14,7 @@
   <li>javamail</li>
   <li>activation</li>
   </ol>
-<p>We use the jeranimo version of these jars. Specificaly we are using geronimo-spec-javamail-[version].jar and geronimo-spec-activation-[version].jar. These will be downloaded by maven the build is being run.</p>
+<p>We use the Geronimo version of these jars. Specificaly we are using geronimo-spec-javamail-[version].jar and geronimo-spec-activation-[version].jar. These will be downloaded by maven when you run the maven build.</p>
 
 <h2>Transport Sender</h2>
 <p>You need to have a mail account to activate the mail functionality. This can either be a generic mail server or you can start up a james mail server. The Mail transport sender can be activated by adding following entry to the axis2.xml file.</p>
@@ -31,10 +31,10 @@
 
   <h2>Transport Receiver</h2>
 
-  <p>The mail Listener can be activated by adding following entry to the axis2.xml file.</p>
+  <p>The mail Listener can be activated by adding the following entry to the axis2.xml file.</p>
 
   <source><pre>
-   &lt;transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
+   &lt;transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener"&gt;
         &lt;parameter name="transport.mail.pop3.host" locked="xsd:false"&gt;pop server host&lt;/parameter&gt;
         &lt;parameter name="transport.mail.pop3.user" locked="xsd:false"&gt;user name&lt;/parameter&gt;
         &lt;parameter name="transport.mail.pop3.password" locked="xsd:false"&gt;password&lt;/parameter&gt;
@@ -64,7 +64,7 @@
 </source>
   
   <h2>Configure James as SMTP and POP server</h2>
-  <p>Download the <a href="http://james.apache.org/">Apache James</a> and start James, connect to the James via telnet for administrator James with following code
+  <p>Download the <a href="http://james.apache.org/">Apache James</a> and start James, connect to the James via telnet for administrator James with the following code
 </p>
 
 <source>

Modified: webservices/axis/trunk/java/xdocs/mail-transport.html
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/xdocs/mail-transport.html?rev=231169&r1=231168&r2=231169&view=diff
==============================================================================
--- webservices/axis/trunk/java/xdocs/mail-transport.html (original)
+++ webservices/axis/trunk/java/xdocs/mail-transport.html Tue Aug  9 21:56:37 2005
@@ -37,11 +37,11 @@
 <p></p>
 <p>Option number 1 and 2 are
 fairly simple and easy to implement, whereas option 3 is somewhat
-harder [unless of cause you are one of those guys who see mails going
+harder [unless of course you are one of those guys who see mails going
 around in your dreams.]. However the mailet scenario provides a more robust and useful
 solution in a production environment.</p>
 <p>If you are not a guru in mail
-related issues you should probably get stated on the simple mail server
+related issues you should probably get started on the simple mail server
 that has been provided with Axis2. Once you get the hang of the Axis2
 related issues then you can move onto tackle the mail beast. Please do
 keep in mind that the mail server we have implemented is ONLY FOR
@@ -182,7 +182,7 @@
         Utils.resolvePhases(configContext.getAxisConfiguration(), service);
         ServiceContext serviceContext = configContext.createServiceContext(serviceName);
 </code></pre>
-<p>We have to create a separate ConfigurationContext and then use that. We are done simple as that.</p>
+<p>We have to create a separate ConfigurationContext and then use that. We are done; wasn't that simple?</p>
 <h3>3. Calling Axis through a
 James mailet</h3>
 <p>This process will be a bit more
@@ -274,6 +274,6 @@
                 .buildConfigurationContext(file.getAbsolutePath());
 </code>
 </pre>
-<p>Well that seems to be all form the wonderful world of mail for now. :)</p>
+<p>Well that seems to be all from the wonderful world of mail for now. :)</p>
 </body>
-</html>
\ No newline at end of file
+</html>