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 17:49:55 UTC

svn commit: r210150 [15/35] - in /webservices/axis/trunk/java: ./ etc/ modules/addressing/ modules/addressing/src/org/apache/axis2/handlers/addressing/ modules/addressing/test-resources/ modules/addressing/test/org/apache/axis2/handlers/addressing/ mod...

Modified: webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/HeadersTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/HeadersTest.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/HeadersTest.java (original)
+++ webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/HeadersTest.java Mon Jul 11 08:49:30 2005
@@ -22,19 +22,18 @@
 
 /**
  * @author Ashutosh Shahi ashutosh.shahi@gmail.com
- *
  */
 public class HeadersTest extends TestCase {
-	
+
     private final String actor = "ACTOR#1";
     private final String localName = "Local1";
     private final String namespace = "http://ws.apache.org";
     private final String prefix = "P1";
-	
+
     public HeadersTest(String name) {
         super(name);
     }
-    
+
     public void testAddingHeaderElements() throws Exception {
         javax.xml.soap.SOAPMessage soapMessage = javax.xml.soap.MessageFactory.newInstance().createMessage();
         javax.xml.soap.SOAPEnvelope soapEnv = soapMessage.getSOAPPart().getEnvelope();
@@ -48,12 +47,12 @@
         
         Iterator it = header.getChildElements();
         boolean b = false;
-        while(it.hasNext()){
+        while (it.hasNext()) {
             SOAPElement el = (SOAPElement) it.next();
             String lName = el.getNodeName();
-            if(lName.equalsIgnoreCase("ebxmlms")){
-            	b = true;
-            	break;
+            if (lName.equalsIgnoreCase("ebxmlms")) {
+                b = true;
+                break;
             }
         }
         assertTrue(b);

Modified: webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/PrefixesTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/PrefixesTest.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/PrefixesTest.java (original)
+++ webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/PrefixesTest.java Mon Jul 11 08:49:30 2005
@@ -22,29 +22,28 @@
 
 /**
  * @author Ashutosh Shahi
- *
  */
 public class PrefixesTest extends TestCase {
-	
+
     public PrefixesTest(String name) {
         super(name);
     }
-    
+
     public void testAddingPrefixesForChildElements() throws Exception {
-    	MessageFactory factory = MessageFactory.newInstance();
-    	SOAPMessage msg = factory.createMessage();
-    	SOAPPart sp = msg.getSOAPPart();
-    	SOAPEnvelope se = sp.getEnvelope();
-    	SOAPBody sb = se.getBody();
+        MessageFactory factory = MessageFactory.newInstance();
+        SOAPMessage msg = factory.createMessage();
+        SOAPPart sp = msg.getSOAPPart();
+        SOAPEnvelope se = sp.getEnvelope();
+        SOAPBody sb = se.getBody();
         SOAPElement el1 = sb.addBodyElement(se.createName
-                ("element1", "prefix1", "http://www.sun.com"));
+                                            ("element1", "prefix1", "http://www.sun.com"));
         SOAPElement el2 = el1.addChildElement(se.createName
-                ("element2", "prefix2", "http://www.apache.org"));
-        
-        org.apache.axis2.soap.SOAPEnvelope omEnv = ((SOAPEnvelopeImpl)se).getOMEnvelope();
+                                              ("element2", "prefix2", "http://www.apache.org"));
+
+        org.apache.axis2.soap.SOAPEnvelope omEnv = ((SOAPEnvelopeImpl) se).getOMEnvelope();
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         msg.writeTo(baos);
-        
+
         String xml = new String(baos.toByteArray());
         System.out.println(xml);
         assertTrue(xml.indexOf("prefix1") != -1);
@@ -52,26 +51,26 @@
         assertTrue(xml.indexOf("http://www.sun.com") != -1);
         assertTrue(xml.indexOf("http://www.apache.org") != -1);
     }
-    
-   /* public void testAttribute() throws Exception {
-        String soappacket = "<SOAP-ENV:Envelope xmlns:SOAP-ENV =\"http://schemas.xmlsoap.org/soap/envelope/\"" + 
-                            "xmlns:xsi =\"http://www.w3.org/1999/XMLSchema-instance\"" +
-                            "xmlns:xsd =\"http://www.w3.org/1999/XMLSchema\">" + 
-                            "<SOAP-ENV:Body>" +
-                            "<helloworld name=\"tester\" />" + 
-                            "</SOAP-ENV:Body>" +
-                            "</SOAP-ENV:Envelope>";
-        SOAPMessage msg = MessageFactory.newInstance().createMessage(new MimeHeaders(), new ByteArrayInputStream(soappacket.getBytes()));
-        SOAPBody body = msg.getSOAPPart().getEnvelope().getBody();
-        msg.writeTo(System.out);
-
-        SOAPElement ele = (SOAPElement) body.getChildElements().next();
-        java.util.Iterator attit = ele.getAllAttributes();
-
-        System.out.println(attit.next().getClass());
-        
-        javax.xml.soap.Name n = (javax.xml.soap.Name) attit.next();
-        //assertEquals("Test fail prefix problem",n.getQualifiedName(),"name");
-    }*/
+
+    /* public void testAttribute() throws Exception {
+         String soappacket = "<SOAP-ENV:Envelope xmlns:SOAP-ENV =\"http://schemas.xmlsoap.org/soap/envelope/\"" +
+                             "xmlns:xsi =\"http://www.w3.org/1999/XMLSchema-instance\"" +
+                             "xmlns:xsd =\"http://www.w3.org/1999/XMLSchema\">" +
+                             "<SOAP-ENV:Body>" +
+                             "<helloworld name=\"tester\" />" +
+                             "</SOAP-ENV:Body>" +
+                             "</SOAP-ENV:Envelope>";
+         SOAPMessage msg = MessageFactory.newInstance().createMessage(new MimeHeaders(), new ByteArrayInputStream(soappacket.getBytes()));
+         SOAPBody body = msg.getSOAPPart().getEnvelope().getBody();
+         msg.writeTo(System.out);
+
+         SOAPElement ele = (SOAPElement) body.getChildElements().next();
+         java.util.Iterator attit = ele.getAllAttributes();
+
+         System.out.println(attit.next().getClass());
+
+         javax.xml.soap.Name n = (javax.xml.soap.Name) attit.next();
+         //assertEquals("Test fail prefix problem",n.getQualifiedName(),"name");
+     }*/
 
 }

Modified: webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java (original)
+++ webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java Mon Jul 11 08:49:30 2005
@@ -22,7 +22,6 @@
 
 /**
  * @author Ashutosh Shahi ashutosh.shahi@gmail.com
- *
  */
 public class SOAPBodyTest extends TestCase {
 
@@ -31,10 +30,10 @@
      *                                                         
      * @return
      */
-  /*  public static Test suite() {
-        return new TestSuite(test.message.TestSOAPBody.class);
-    }
-  */
+    /*  public static Test suite() {
+          return new TestSuite(test.message.TestSOAPBody.class);
+      }
+    */
     /**
      * Method main
      *
@@ -53,41 +52,41 @@
     public SOAPBodyTest(String name) {
         super(name);
     }
-    
+
     /**
      * Method testSoapBodyBUG
      *
      * @throws Exception
      */
     public void testSoapBodyBUG() throws Exception {
-    	
-    	MessageFactory fact = MessageFactory.newInstance();
-    	SOAPMessage message = fact.createMessage();
-    	SOAPPart soapPart = message.getSOAPPart();
-    	SOAPEnvelopeImpl env = (SOAPEnvelopeImpl)soapPart.getEnvelope();
-    	SOAPHeader header = env.getHeader();
-    	Name hns = env.createName("Hello","shw", "http://www.jcommerce.net/soap/ns/SOAPHelloWorld");
-    	SOAPElement headElmnt = header.addHeaderElement(hns);
-    	Name hns1 = env.createName("Myname","shw", "http://www.jcommerce.net/soap/ns/SOAPHelloWorld");
-    	SOAPElement myName = headElmnt.addChildElement(hns1);
-    	myName.addTextNode("Tony");
-    	Name ns =  env.createName("Address", "shw", "http://www.jcommerce.net/soap/ns/SOAPHelloWorld");
-    	SOAPBody body = env.getBody();
-    	SOAPElement bodyElmnt =  body.addBodyElement(ns);
-    	Name ns1 =  env.createName("City", "shw", "http://www.jcommerce.net/soap/ns/SOAPHelloWorld");
-    	SOAPElement city = bodyElmnt.addChildElement(ns1);
-    	city.addTextNode("GENT");
-    	
-    	Iterator it = body.getChildElements();
-    	int count = 0;
-    	
+
+        MessageFactory fact = MessageFactory.newInstance();
+        SOAPMessage message = fact.createMessage();
+        SOAPPart soapPart = message.getSOAPPart();
+        SOAPEnvelopeImpl env = (SOAPEnvelopeImpl) soapPart.getEnvelope();
+        SOAPHeader header = env.getHeader();
+        Name hns = env.createName("Hello", "shw", "http://www.jcommerce.net/soap/ns/SOAPHelloWorld");
+        SOAPElement headElmnt = header.addHeaderElement(hns);
+        Name hns1 = env.createName("Myname", "shw", "http://www.jcommerce.net/soap/ns/SOAPHelloWorld");
+        SOAPElement myName = headElmnt.addChildElement(hns1);
+        myName.addTextNode("Tony");
+        Name ns = env.createName("Address", "shw", "http://www.jcommerce.net/soap/ns/SOAPHelloWorld");
+        SOAPBody body = env.getBody();
+        SOAPElement bodyElmnt = body.addBodyElement(ns);
+        Name ns1 = env.createName("City", "shw", "http://www.jcommerce.net/soap/ns/SOAPHelloWorld");
+        SOAPElement city = bodyElmnt.addChildElement(ns1);
+        city.addTextNode("GENT");
+
+        Iterator it = body.getChildElements();
+        int count = 0;
+
         while (it.hasNext()) {
             SOAPElement el = (SOAPElement) it.next();
             count++;
             Name name = el.getElementName();
             System.out.println("Element:" + el);
             System.out.println("BODY ELEMENT NAME:" + name.getPrefix() + ":"
-                    + name.getLocalName() + " " + name.getURI());
+                               + name.getLocalName() + " " + name.getURI());
         }
         assertTrue(count == 1);
     }

Modified: webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java (original)
+++ webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java Mon Jul 11 08:49:30 2005
@@ -21,43 +21,38 @@
 import java.util.List;
 
 /**
- * @author Ashutosh Shahi ashutosh.shahi@gmail.com	
- *
+ * @author Ashutosh Shahi ashutosh.shahi@gmail.com
  */
 public class SOAPElementTest extends TestCase {
-	
-	private SOAPElement soapElem;
-	
-    protected void setUp() throws Exception
-    {
-        soapElem = SOAPFactoryImpl.newInstance().createElement( "Test", "test", "http://test.apache.org/" );
+
+    private SOAPElement soapElem;
+
+    protected void setUp() throws Exception {
+        soapElem = SOAPFactoryImpl.newInstance().createElement("Test", "test", "http://test.apache.org/");
     }
 
-    public void testAddTextNode() throws Exception
-    {
-        assertNotNull( soapElem );
+    public void testAddTextNode() throws Exception {
+        assertNotNull(soapElem);
         final String value = "foo";
-        soapElem.addTextNode( value );
-        assertEquals( value, soapElem.getValue() );
-        TextImpl text = assertContainsText( soapElem );
-        assertEquals( value, text.getValue() );
+        soapElem.addTextNode(value);
+        assertEquals(value, soapElem.getValue());
+        TextImpl text = assertContainsText(soapElem);
+        assertEquals(value, text.getValue());
     }
 
-    private TextImpl assertContainsText( SOAPElement soapElem ){
-    	assertTrue( soapElem.hasChildNodes() );
-    	List childElems = toList( soapElem.getChildElements() );
-    	assertTrue( childElems.size() == 1 );
-    	NodeImpl node = (NodeImpl) childElems.get( 0 );
-    	assertTrue( node instanceof TextImpl );
-    	return (TextImpl) node;
+    private TextImpl assertContainsText(SOAPElement soapElem) {
+        assertTrue(soapElem.hasChildNodes());
+        List childElems = toList(soapElem.getChildElements());
+        assertTrue(childElems.size() == 1);
+        NodeImpl node = (NodeImpl) childElems.get(0);
+        assertTrue(node instanceof TextImpl);
+        return (TextImpl) node;
     }
-    
-    private List toList( java.util.Iterator iter )
-    {
+
+    private List toList(java.util.Iterator iter) {
         List list = new java.util.ArrayList();
-        while ( iter.hasNext() )
-        {
-            list.add( iter.next() );
+        while (iter.hasNext()) {
+            list.add(iter.next());
         }
         return list;
     }

Modified: webservices/axis/trunk/java/modules/samples/build.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/build.xml?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/build.xml (original)
+++ webservices/axis/trunk/java/modules/samples/build.xml Mon Jul 11 08:49:30 2005
@@ -1,137 +1,135 @@
 <?xml version="1.0"?>
-<!-- ====================================================================== 
-     Feb 11, 2005 1:04:21 PM                                                        
-
-      This build file is intended to compile and run the Axis2 samples
-      provided here with the service being deployed at Tomcat or by
-      running a simple Axis2 server.   
-     
-                   
-                                                                     
+<!-- ====================================================================== 
+     Feb 11, 2005 1:04:21 PM                                                        
+
+      This build file is intended to compile and run the Axis2 samples
+      provided here with the service being deployed at Tomcat or by
+      running a simple Axis2 server.   
+     
+                   
+                                                                     
      ====================================================================== -->
 <project name="samples" basedir="." default="compile">
-	<property name="src.dir" value="src" />
-	<property name="build.dir" value="build" />
-	<property name="lib.dir" value="${build.dir}/lib" />
-	<property name="classes.dir" value="./classes" />
-
-	<property name="jardrop.dir" value="${build.dir}/services" />
-	<property environment="env" />
-	<property name="AXIS_HOME" value="${env.AXIS_HOME}" />
-	<property name="axis.serverJarDrop.dir" value="${AXIS_HOME}/WEB-INF/services" />
-
-	<property name="conf.dir" value="conf"/>
-	
-	<path id="classpath.library">
-		<fileset dir="${AXIS_HOME}/WEB-INF/lib">
-			<include name="**/*.jar" />
-		</fileset>
-	</path>
-
-	<path id="classpath.client">
-		<fileset dir="${lib.dir}">
-			<include name="**/*.jar" />
-		</fileset>
-	</path>
-
-	<path id="classpath.runtimelibraries">
-		<path refid="classpath.library" />
-		<path refid="classpath.client" />
-	</path>
-
-
-
-
-	<target name="clean" description="Delete all generated files">
-		<delete dir="${classes.dir}" failonerror="false" />
-		
-		<delete dir="${build.dir}" failonerror="false" />
-	</target>
-
-	<target name="validateAxisHome">
-		<available file="${AXIS_HOME}}" type="dir" property="axis2.deployed" />
-	</target>
-
-	<target name="validateSevices.dir">
-		<available file="${AXIS_HOME}/WEB-INF/services" type="dir" property="axis2.services" />
-	</target>
-
-	<target name="validateDeploymentSettings" depends="validateAxisHome" unless="validateSevices.dir">
-		<mkdir dir="${AXIS_HOME}/WEB-INF/services" />
-	</target>
-
-
-	<target name="createDir">
-		<mkdir dir="${build.dir}" />
-		<mkdir dir="${lib.dir}" />
-		<mkdir dir="${classes.dir}" />
-		<mkdir dir="${jardrop.dir}" />
-	</target>
-
-	<target name="compile" depends="clean,createDir">
-		<javac srcdir="${src.dir}" destdir="${classes.dir}">
-			<classpath refid="classpath.library" />
-		</javac>
-		<jar destfile="${lib.dir}/${ant.project.name}-all.jar">
-			<fileset dir="${classes.dir}" />
-		</jar>
-
-		<copy file="${conf.dir}/service.xml" todir="${build.dir}/META-INF" overwrite="true" />
-
-		<jar destfile="${jardrop.dir}/sample1.jar">
-
-			<fileset dir="${classes.dir}">
-				<include name="**/EchoXML.class" />
-			</fileset>
-			<fileset dir="${build.dir}">
-				<include name="META-INF/service.xml" />
-			</fileset>
-		</jar>
-
-
-		<copy file="${conf.dir}/service4withhandler.xml" tofile="${build.dir}/META-INF/service.xml" overwrite="true" />
-
-		<jar destfile="${jardrop.dir}/sample1WithHandler.jar">
-
-			<fileset dir="${classes.dir}">
-				<include name="**/EchoXML.class" />
-				<include name="**/LoggingHandler.class" />
-			</fileset>
-			<fileset dir="${build.dir}">
-				<include name="META-INF/service.xml" />
-			</fileset>
-		</jar>
-		<delete dir="${classes.dir}" failonerror="false" />
-	</target>
-
-
-	<target name="deploy" depends="compile,validateDeploymentSettings">
-		<copy file="${jardrop.dir}/sample1.jar" todir="${axis.serverJarDrop.dir}" overwrite="true" />
-		<copy file="${jardrop.dir}/sample1WithHandler.jar" todir="${axis.serverJarDrop.dir}" overwrite="true" />
-	</target>
-
-	<target name="echo" depends="compile">
-		<java classname="userguide.sample1.SynchronousClient">
-			<classpath refid="classpath.runtimelibraries" />
-			<arg value="8080" />
-			<arg value="/axis2/services/sample1" />
-		</java>
-	</target>
-
-	<target name="echoWithHandler" depends="compile">
-		<java classname="userguide.sample1.SynchronousClient">
-			<classpath refid="classpath.runtimelibraries" />
-			<arg value="8080" />
-			<arg value="/axis2/services/sample1WithHandler" />
-		</java>
-	</target>
-
-	<target name="echoAsync" depends="compile">
-		<java classname="userguide.sample1.AsynchronousClient">
-			<classpath refid="classpath.runtimelibraries" />
-			<arg value="8080" />
-			<arg value="/axis2/services/sample1" />
-		</java>
-	</target>
+    <property name="src.dir" value="src"/>
+    <property name="build.dir" value="build"/>
+    <property name="lib.dir" value="${build.dir}/lib"/>
+    <property name="classes.dir" value="./classes"/>
+
+    <property name="jardrop.dir" value="${build.dir}/services"/>
+    <property environment="env"/>
+    <property name="AXIS_HOME" value="${env.AXIS_HOME}"/>
+    <property name="axis.serverJarDrop.dir" value="${AXIS_HOME}/WEB-INF/services"/>
+
+    <property name="conf.dir" value="conf"/>
+
+    <path id="classpath.library">
+        <fileset dir="${AXIS_HOME}/WEB-INF/lib">
+            <include name="**/*.jar"/>
+        </fileset>
+    </path>
+
+    <path id="classpath.client">
+        <fileset dir="${lib.dir}">
+            <include name="**/*.jar"/>
+        </fileset>
+    </path>
+
+    <path id="classpath.runtimelibraries">
+        <path refid="classpath.library"/>
+        <path refid="classpath.client"/>
+    </path>
+
+
+    <target name="clean" description="Delete all generated files">
+        <delete dir="${classes.dir}" failonerror="false"/>
+
+        <delete dir="${build.dir}" failonerror="false"/>
+    </target>
+
+    <target name="validateAxisHome">
+        <available file="${AXIS_HOME}}" type="dir" property="axis2.deployed"/>
+    </target>
+
+    <target name="validateSevices.dir">
+        <available file="${AXIS_HOME}/WEB-INF/services" type="dir" property="axis2.services"/>
+    </target>
+
+    <target name="validateDeploymentSettings" depends="validateAxisHome" unless="validateSevices.dir">
+        <mkdir dir="${AXIS_HOME}/WEB-INF/services"/>
+    </target>
+
+
+    <target name="createDir">
+        <mkdir dir="${build.dir}"/>
+        <mkdir dir="${lib.dir}"/>
+        <mkdir dir="${classes.dir}"/>
+        <mkdir dir="${jardrop.dir}"/>
+    </target>
+
+    <target name="compile" depends="clean,createDir">
+        <javac srcdir="${src.dir}" destdir="${classes.dir}">
+            <classpath refid="classpath.library"/>
+        </javac>
+        <jar destfile="${lib.dir}/${ant.project.name}-all.jar">
+            <fileset dir="${classes.dir}"/>
+        </jar>
+
+        <copy file="${conf.dir}/service.xml" todir="${build.dir}/META-INF" overwrite="true"/>
+
+        <jar destfile="${jardrop.dir}/sample1.jar">
+
+            <fileset dir="${classes.dir}">
+                <include name="**/EchoXML.class"/>
+            </fileset>
+            <fileset dir="${build.dir}">
+                <include name="META-INF/service.xml"/>
+            </fileset>
+        </jar>
+
+
+        <copy file="${conf.dir}/service4withhandler.xml" tofile="${build.dir}/META-INF/service.xml" overwrite="true"/>
+
+        <jar destfile="${jardrop.dir}/sample1WithHandler.jar">
+
+            <fileset dir="${classes.dir}">
+                <include name="**/EchoXML.class"/>
+                <include name="**/LoggingHandler.class"/>
+            </fileset>
+            <fileset dir="${build.dir}">
+                <include name="META-INF/service.xml"/>
+            </fileset>
+        </jar>
+        <delete dir="${classes.dir}" failonerror="false"/>
+    </target>
+
+
+    <target name="deploy" depends="compile,validateDeploymentSettings">
+        <copy file="${jardrop.dir}/sample1.jar" todir="${axis.serverJarDrop.dir}" overwrite="true"/>
+        <copy file="${jardrop.dir}/sample1WithHandler.jar" todir="${axis.serverJarDrop.dir}" overwrite="true"/>
+    </target>
+
+    <target name="echo" depends="compile">
+        <java classname="userguide.sample1.SynchronousClient">
+            <classpath refid="classpath.runtimelibraries"/>
+            <arg value="8080"/>
+            <arg value="/axis2/services/sample1"/>
+        </java>
+    </target>
+
+    <target name="echoWithHandler" depends="compile">
+        <java classname="userguide.sample1.SynchronousClient">
+            <classpath refid="classpath.runtimelibraries"/>
+            <arg value="8080"/>
+            <arg value="/axis2/services/sample1WithHandler"/>
+        </java>
+    </target>
+
+    <target name="echoAsync" depends="compile">
+        <java classname="userguide.sample1.AsynchronousClient">
+            <classpath refid="classpath.runtimelibraries"/>
+            <arg value="8080"/>
+            <arg value="/axis2/services/sample1"/>
+        </java>
+    </target>
 </project>
 

Modified: webservices/axis/trunk/java/modules/samples/conf/service4withhandler.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/conf/service4withhandler.xml?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/conf/service4withhandler.xml (original)
+++ webservices/axis/trunk/java/modules/samples/conf/service4withhandler.xml Mon Jul 11 08:49:30 2005
@@ -1,4 +1,4 @@
-<service  messageReceiver="org.apache.axis2.receivers.RawXMLINOutMessageReceiver" style="rpc" contextPath="services">
+<service messageReceiver="org.apache.axis2.receivers.RawXMLINOutMessageReceiver" style="rpc" contextPath="services">
 
     <parameter name="ServiceClass" locked="xsd:false">userguide.sample1.EchoXML</parameter>
     <operation name="echo" qname="echo"/>

Modified: webservices/axis/trunk/java/modules/samples/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/maven.xml?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/maven.xml (original)
+++ webservices/axis/trunk/java/modules/samples/maven.xml Mon Jul 11 08:49:30 2005
@@ -11,48 +11,48 @@
     <postGoal name="test:compile">
         <mkdir dir="target/test-resources/samples/modules"/>
         <mkdir dir="target/test-resources/repository-client/modules"/>
-        <copy file="../addressing/target/addressing.mar" 
-		tofile="target/test-resources/samples/modules/addressing.mar"/>
-        <copy file="../addressing/target/addressing.mar" 
-		tofile="target/test-resources/repository-client/modules/addressing.mar"/>
+        <copy file="../addressing/target/addressing.mar"
+            tofile="target/test-resources/samples/modules/addressing.mar"/>
+        <copy file="../addressing/target/addressing.mar"
+            tofile="target/test-resources/repository-client/modules/addressing.mar"/>
         <mkdir dir="target/toWar/services/"/>
         
         <!-- Create Chuncked enabled Repository -->
         <mkdir dir="target/test-resources/chuncked-enabledRepository"/>
         <copy file="test/org/apache/axis2/engine/chuncking-enabled-axis2.xml"
-        tofile="target/test-resources/chuncked-enabledRepository/axis2.xml"/>
+            tofile="target/test-resources/chuncked-enabledRepository/axis2.xml"/>
         
         <!-- Create Mail transport enabled Repository -->
         <mkdir dir="target/test-resources/mail-transport-enabledRepository"/>
-         <mkdir dir="target/test-resources/mail-transport-enabledRepository/modules"/>
+        <mkdir dir="target/test-resources/mail-transport-enabledRepository/modules"/>
         <copy file="test/org/apache/axis2/mail/mail-enabled-axis2.xml"
-        tofile="target/test-resources/mail-transport-enabledRepository/axis2.xml"/>
-        <copy file="../addressing/target/addressing.mar" 
-		tofile="target/test-resources/mail-transport-enabledRepository/modules/addressing.mar"/>
-        
-      <!-- Commons transport enabled enabled Repository -->
+            tofile="target/test-resources/mail-transport-enabledRepository/axis2.xml"/>
+        <copy file="../addressing/target/addressing.mar"
+            tofile="target/test-resources/mail-transport-enabledRepository/modules/addressing.mar"/>
+
+        <!-- Commons transport enabled enabled Repository -->
         <mkdir dir="target/test-resources/commons-http-enabledRepository"/>
         <copy file="test/org/apache/axis2/engine/commons-http-enabled-axis2.xml"
-        tofile="target/test-resources/commons-http-enabledRepository/axis2.xml"/>       
+            tofile="target/test-resources/commons-http-enabledRepository/axis2.xml"/>
         
         <!-- MTOM enabled Repository -->
         <mkdir dir="target/test-resources/MTOM-enabledRepository"/>
         <copy file="test/org/apache/axis2/mtom/MTOM-enabled-axis2.xml"
-        tofile="target/test-resources/MTOM-enabledRepository/axis2.xml"/>         
+            tofile="target/test-resources/MTOM-enabledRepository/axis2.xml"/>
     </postGoal>
 
     <postGoal name="test:test">
         <attainGoal name="create-samples"/>
-         <!-- <attainGoal name="doInterop-test"/>   -->
+        <!-- <attainGoal name="doInterop-test"/>   -->
     </postGoal>
 
     <goal name="create-samples">
-	     <mkdir dir="target/samples"/>
-         <mkdir dir="${samples.dir}/userguide"/>
-         <mkdir dir="target/samples/wsdl"/>
-         <copy todir="target/samples/wsdl">
-			<ant:fileset dir="wsdl"/>
-		</copy>
+        <mkdir dir="target/samples"/>
+        <mkdir dir="${samples.dir}/userguide"/>
+        <mkdir dir="target/samples/wsdl"/>
+        <copy todir="target/samples/wsdl">
+            <ant:fileset dir="wsdl"/>
+        </copy>
         <attainGoal name="userguide"/>
         <attainGoal name="amazonQS"/>
         <attainGoal name="googleSearch"/>
@@ -61,278 +61,278 @@
         <attainGoal name="mtomSample"/>
     </goal>
 
-  <!-- ================================================================ -->
-   <!--- Version Sample -->
-  <!-- ================================================================ -->
-  <goal name="version">
-	<mkdir dir="target/samples"/>
+    <!-- ================================================================ -->
+    <!--- Version Sample -->
+    <!-- ================================================================ -->
+    <goal name="version">
+        <mkdir dir="target/samples"/>
         <mkdir dir="${samples.dir}/version"/>
         <mkdir dir="${samples.dir}/version/src"/>
         <ant:copy todir="${samples.dir}/version/src">
-        	<ant:fileset dir="src">
-        		<ant:include name="sample/axisversion/**"/>
-        	</ant:fileset> 
-	</ant:copy> 
+            <ant:fileset dir="src">
+                <ant:include name="sample/axisversion/**"/>
+            </ant:fileset>
+        </ant:copy>
         <jar destfile="${samples.dir}/version/version.jar">
             <fileset dir="target/classes">
                 <include name="sample/axisversion/**"/>
-            </fileset>           
-           <fileset dir="src/sample/axisversion/">
-               <include name="META-INF/**"/>
-           </fileset> 
+            </fileset>
+            <fileset dir="src/sample/axisversion/">
+                <include name="META-INF/**"/>
+            </fileset>
         </jar>
         <copy file="${samples.dir}/version/version.jar"
-		tofile="target/toWar/services/version.aar"/>
+            tofile="target/toWar/services/version.aar"/>
     </goal>
-  <!-- ================================================================ -->
-   <!--- User Guide Sample -->
-  <!-- ================================================================ -->
+    <!-- ================================================================ -->
+    <!--- User Guide Sample -->
+    <!-- ================================================================ -->
 
 
     <goal name="userguide">
-	<mkdir dir="target/samples"/>
+        <mkdir dir="target/samples"/>
         <mkdir dir="${samples.dir}/userguide"/>
         <mkdir dir="${samples.dir}/userguide/src"/>
         <ant:copy todir="${samples.dir}/userguide/src">
-        	<ant:fileset dir="src">
-        		<ant:include name="userguide/**"/>
-        	</ant:fileset> 
-	</ant:copy> 
+            <ant:fileset dir="src">
+                <ant:include name="userguide/**"/>
+            </ant:fileset>
+        </ant:copy>
         <jar destfile="${samples.dir}/userguide/sample.jar">
             <fileset dir="target/classes">
                 <include name="userguide/**"/>
-            </fileset>           
+            </fileset>
         </jar>
         <jar destfile="${samples.dir}/userguide/MyService.aar">
             <fileset dir="src/userguide/example1/">
                 <include name="META-INF/**"/>
-            </fileset>           
+            </fileset>
             <fileset dir="target/classes">
                 <include name="userguide/example1/**/*.class"/>
-            </fileset>           
+            </fileset>
         </jar>
         <jar destfile="${samples.dir}/userguide/MyServiceWithModule.aar">
             <fileset dir="src/userguide/example2/">
                 <include name="META-INF/**"/>
-            </fileset>           
+            </fileset>
             <fileset dir="target/classes">
                 <include name="userguide/example2/**/*.class"/>
-            </fileset>           
+            </fileset>
         </jar>
         <jar destfile="${samples.dir}/userguide/LoggingModule.mar">
             <fileset dir="src/userguide/loggingmodule/">
                 <include name="META-INF/**"/>
-            </fileset>           
+            </fileset>
             <fileset dir="target/classes">
                 <include name="userguide/loggingmodule/**/*.class"/>
-            </fileset>           
+            </fileset>
         </jar>
     </goal>
-  <!-- ================================================================ -->
+    <!-- ================================================================ -->
     <!--- Amazon Qaueing Service Sample -->
-  <!-- ================================================================ -->
+    <!-- ================================================================ -->
 
     <goal name="amazonQS">
         <mkdir dir="${samples.dir}/amazonQS"/>
         <mkdir dir="${samples.dir}/amazonQS/src"/>
         <ant:copy todir="${samples.dir}/amazonQS/src">
-        	<ant:fileset dir="src">
-        		<ant:include name="sample/amazon/amazonSimpleQueueService/**"/>
-        		<ant:include name="sample/amazon/common/**"/>
-        	</ant:fileset> 
-	</ant:copy> 
+            <ant:fileset dir="src">
+                <ant:include name="sample/amazon/amazonSimpleQueueService/**"/>
+                <ant:include name="sample/amazon/common/**"/>
+            </ant:fileset>
+        </ant:copy>
         <mkdir dir="${samples.dir}/amazonQS/docs"/>
         <ant:copy todir="${samples.dir}/amazonQS/docs">
-        	<ant:fileset dir="xdocs/amazonQS"/>
-	</ant:copy> 
-	<ant:copy file="xdocs/readme.txt" tofile="${samples.dir}/amazonQS/readme.txt" />
-     	<ant:copy todir="${samples.dir}/amazonQS">
-        	<ant:fileset dir="script/amazonQS"/>
-	</ant:copy>
+            <ant:fileset dir="xdocs/amazonQS"/>
+        </ant:copy>
+        <ant:copy file="xdocs/readme.txt" tofile="${samples.dir}/amazonQS/readme.txt"/>
+        <ant:copy todir="${samples.dir}/amazonQS">
+            <ant:fileset dir="script/amazonQS"/>
+        </ant:copy>
         <jar destfile="${samples.dir}/amazonQS/amazonQS.jar">
             <fileset dir="target/classes">
                 <include name="sample/amazon/amazonSimpleQueueService/**"/>
                 <include name="sample/amazon/common/**"/>
-            </fileset>           
+            </fileset>
         </jar>
     </goal>
-  <!-- ================================================================ -->
-  <!--- Google Search Sample -->
-  <!-- ================================================================ -->
+    <!-- ================================================================ -->
+    <!--- Google Search Sample -->
+    <!-- ================================================================ -->
 
     <goal name="googleSearch">
         <mkdir dir="${samples.dir}/googleSearch"/>
         <mkdir dir="${samples.dir}/googleSearch/src"/>
         <ant:copy todir="${samples.dir}/googleSearch/src">
-        	<ant:fileset dir="src">
-        		<ant:include name="sample/google/search/**"/>
-        		<ant:include name="sample/google/common/**"/>
-        	</ant:fileset> 
-	</ant:copy> 
+            <ant:fileset dir="src">
+                <ant:include name="sample/google/search/**"/>
+                <ant:include name="sample/google/common/**"/>
+            </ant:fileset>
+        </ant:copy>
         <mkdir dir="${samples.dir}/googleSearch/docs"/>
         <ant:copy todir="${samples.dir}/googleSearch/docs">
-        	<ant:fileset dir="xdocs/googleSearch"/>
-	</ant:copy> 
-	<ant:copy file="xdocs/readme.txt" tofile="${samples.dir}/googleSearch/readme.txt" />
-	<ant:copy todir="${samples.dir}/googleSearch">
-        	<ant:fileset dir="script/googleSearch"/>
-	</ant:copy> 
+            <ant:fileset dir="xdocs/googleSearch"/>
+        </ant:copy>
+        <ant:copy file="xdocs/readme.txt" tofile="${samples.dir}/googleSearch/readme.txt"/>
+        <ant:copy todir="${samples.dir}/googleSearch">
+            <ant:fileset dir="script/googleSearch"/>
+        </ant:copy>
         <jar destfile="${samples.dir}/googleSearch/googleSearch.jar">
             <fileset dir="target/classes">
                 <include name="sample/google/search/**"/>
                 <include name="sample/google/common/**"/>
-            </fileset>           
+            </fileset>
         </jar>
     </goal>
-  <!-- ================================================================ -->
-  <!--- Google SpellCheck Sample -->
-  <!-- ================================================================ -->
+    <!-- ================================================================ -->
+    <!--- Google SpellCheck Sample -->
+    <!-- ================================================================ -->
 
     <goal name="googleSpellcheck">
         <mkdir dir="${samples.dir}/googleSpellcheck"/>
         <mkdir dir="${samples.dir}/googleSpellcheck/src"/>
         <ant:copy todir="${samples.dir}/googleSpellcheck/src">
-        	<ant:fileset dir="src">
-        		<ant:include name="sample/google/spellcheck/**"/>
-        		<ant:include name="sample/google/common/**"/>
-        	</ant:fileset> 
-	</ant:copy> 
+            <ant:fileset dir="src">
+                <ant:include name="sample/google/spellcheck/**"/>
+                <ant:include name="sample/google/common/**"/>
+            </ant:fileset>
+        </ant:copy>
         <mkdir dir="${samples.dir}/googleSpellcheck/docs"/>
         <ant:copy todir="${samples.dir}/googleSpellcheck/docs">
-        	<ant:fileset dir="xdocs/googleSpellcheck"/>
-	</ant:copy> 
-    	<ant:copy file="xdocs/readme.txt" tofile="${samples.dir}/googleSpellcheck/readme.txt" />
-    <ant:copy todir="${samples.dir}/googleSpellcheck">
-        	<ant:fileset dir="script/googleSpellcheck"/>
-	</ant:copy> 
+            <ant:fileset dir="xdocs/googleSpellcheck"/>
+        </ant:copy>
+        <ant:copy file="xdocs/readme.txt" tofile="${samples.dir}/googleSpellcheck/readme.txt"/>
+        <ant:copy todir="${samples.dir}/googleSpellcheck">
+            <ant:fileset dir="script/googleSpellcheck"/>
+        </ant:copy>
         <jar destfile="${samples.dir}/googleSpellcheck/googleSpellcheck.jar">
             <fileset dir="target/classes">
                 <include name="sample/google/spellcheck/**"/>
                 <include name="sample/google/common/**"/>
-            </fileset>           
+            </fileset>
         </jar>
     </goal>
-    
-  <!-- ================================================================ -->
-  <!--- Google MTOM Sample -->
-  <!-- ================================================================ -->
+
+    <!-- ================================================================ -->
+    <!--- Google MTOM Sample -->
+    <!-- ================================================================ -->
 
     <goal name="mtomSample">
         <mkdir dir="${samples.dir}/mtom"/>
         <mkdir dir="${samples.dir}/mtom/src"/>
         <ant:copy todir="${samples.dir}/mtom/src">
-        	<ant:fileset dir="src">
-        		<ant:include name="sample/mtom/**"/>
-        	</ant:fileset> 
-	</ant:copy> 
-	 <jar destfile="${samples.dir}/mtom/mtomSample.aar">
+            <ant:fileset dir="src">
+                <ant:include name="sample/mtom/**"/>
+            </ant:fileset>
+        </ant:copy>
+        <jar destfile="${samples.dir}/mtom/mtomSample.aar">
             <fileset dir="src/sample/mtom/">
                 <include name="META-INF/**"/>
-            </fileset>           
+            </fileset>
             <fileset dir="target/classes">
                 <include name="sample/mtom/*.class"/>
-            </fileset>           
+            </fileset>
         </jar>
         <jar destfile="${samples.dir}/mtom/mtomClient.jar">
             <fileset dir="target/classes">
                 <include name="sample/mtom/**"/>
-            </fileset>           
+            </fileset>
         </jar>
     </goal>
-    
+
     <goal name="test-mtom">
-    		<echo message="running MTOM tests"/>
-    		<echo message="${maven.repo.local}"/>
-			<junit printsummary="yes" haltonfailure="yes">
-					<classpath>
-					      <fileset dir="${maven.repo.local}">
-        						<include name="j2ee/jars/***.jar"/>
-        						<include name="axis/jars/axis2-core-0.9.jar"/>
-        						<include name="axis/jars/axis2-xml-0.9.jar"/>
-        						<include name="axis/jars/axis2-wsdl-0.9.jar"/>
-        						<include name="axis/jars/axis-wsdl4j-1.2.jar"/>
-        						<include name="commons-logging/jars/commons-logging-1.0.3.jar"/>
-        						<include name="stax/jars/stax-1.1.1-dev.jar"/>
-        						<include name="stax/jars/stax-api-1.0.jar"/>
-					      </fileset>
-					      <pathelement location="target/test-classes" />
-				          <path refid="maven.dependency.classpath"/>
-					 </classpath>
-				   <formatter type="plain"/>
-				   <test name="org.apache.axis2.engine.EchoRawMTOMToBase64Test" />
-  				   <test name="org.apache.axis2.engine.EchoRawMTOMTest" />
-			</junit>
+        <echo message="running MTOM tests"/>
+        <echo message="${maven.repo.local}"/>
+        <junit printsummary="yes" haltonfailure="yes">
+            <classpath>
+                <fileset dir="${maven.repo.local}">
+                    <include name="j2ee/jars/***.jar"/>
+                    <include name="axis/jars/axis2-core-0.9.jar"/>
+                    <include name="axis/jars/axis2-xml-0.9.jar"/>
+                    <include name="axis/jars/axis2-wsdl-0.9.jar"/>
+                    <include name="axis/jars/axis-wsdl4j-1.2.jar"/>
+                    <include name="commons-logging/jars/commons-logging-1.0.3.jar"/>
+                    <include name="stax/jars/stax-1.1.1-dev.jar"/>
+                    <include name="stax/jars/stax-api-1.0.jar"/>
+                </fileset>
+                <pathelement location="target/test-classes"/>
+                <path refid="maven.dependency.classpath"/>
+            </classpath>
+            <formatter type="plain"/>
+            <test name="org.apache.axis2.engine.EchoRawMTOMToBase64Test"/>
+            <test name="org.apache.axis2.engine.EchoRawMTOMTest"/>
+        </junit>
     </goal>
 
     <goal name="test-mail">
-    		<echo message="running Mail tests"/>
-    		<echo message="${maven.repo.local}"/>
-			<junit printsummary="yes" haltonfailure="yes">
-					<classpath>
-					      <fileset dir="${maven.repo.local}">
-        						<include name="j2ee/jars/***.jar"/>
-        						<include name="axis/jars/axis2-core-0.9.jar"/>
-        						<include name="axis/jars/axis2-xml-0.9.jar"/>
-        						<include name="axis/jars/axis2-wsdl-0.9.jar"/>
-        						<include name="axis/jars/axis-wsdl4j-1.2.jar"/>
-        						<include name="commons-logging/jars/commons-logging-1.0.3.jar"/>
-        						<include name="stax/jars/stax-1.1.1-dev.jar"/>
-        						<include name="stax/jars/stax-api-1.0.jar"/>
-					      </fileset>
-					      <pathelement location="target/test-classes" />
-				          <path refid="maven.dependency.classpath"/>
-					 </classpath>
-				   <formatter type="plain"/>
-				   <test name="org.apache.axis2.mail.MailetRequestResponceRawXMLTest" />
-  				   <test name="org.apache.axis2.mail.MailOneWayRawXMLTest" />
-  				   <test name="org.apache.axis2.mail.MailRequestResponseRawXMLTest" />  				   
-			</junit>
+        <echo message="running Mail tests"/>
+        <echo message="${maven.repo.local}"/>
+        <junit printsummary="yes" haltonfailure="yes">
+            <classpath>
+                <fileset dir="${maven.repo.local}">
+                    <include name="j2ee/jars/***.jar"/>
+                    <include name="axis/jars/axis2-core-0.9.jar"/>
+                    <include name="axis/jars/axis2-xml-0.9.jar"/>
+                    <include name="axis/jars/axis2-wsdl-0.9.jar"/>
+                    <include name="axis/jars/axis-wsdl4j-1.2.jar"/>
+                    <include name="commons-logging/jars/commons-logging-1.0.3.jar"/>
+                    <include name="stax/jars/stax-1.1.1-dev.jar"/>
+                    <include name="stax/jars/stax-api-1.0.jar"/>
+                </fileset>
+                <pathelement location="target/test-classes"/>
+                <path refid="maven.dependency.classpath"/>
+            </classpath>
+            <formatter type="plain"/>
+            <test name="org.apache.axis2.mail.MailetRequestResponceRawXMLTest"/>
+            <test name="org.apache.axis2.mail.MailOneWayRawXMLTest"/>
+            <test name="org.apache.axis2.mail.MailRequestResponseRawXMLTest"/>
+        </junit>
     </goal>
 
-    
+
     <goal name="doInterop-test">
-             <taskdef name="wsdl2java"
-                classname="org.apache.axis2.tool.ant.AntCodegenTask"
-                    classpathref="maven.dependency.classpath"/>
-               <j:set var="interop3.dir" value="target/interop3"/>
-               <j:set var="work.dir" value="${interop3.dir}/work"/>
-               <j:set var="calss.dir" value="${interop3.dir}/classes"/>
-                 <j:set var="wsdl.dir" value="${basedir}/../wsdl/test-resources/"/>
-                     
-                 <mkdir dir="${interop3.dir}"/>  
-				<mkdir dir="${work.dir}"/>  
-				<mkdir dir="${calss.dir}"/>                       
-				
-		       <wsdl2java WSDLFileName="${wsdl.dir}compound2.wsdl" output="${work.dir}"/> 
-		       <!--
-		       <java classname="org.apache.axis2.wsdl.WSDL2Java">
-                  <classpath refid="maven.dependency.classpath"/>
-                  <arg value="-uri"/>
-                  <arg file="${wsdl.dir}/compound2.wsdl"/>
-                  <arg value="-o"/>
-                   <arg file="${work.dir}"/>
-               </java>
-               -->
-		       <copy file="${wsdl.dir}/InteropClient2.java" todir="${work.dir}" overwrite="true" />
-               <copy file="${wsdl.dir}/echoEmployeeDatabindingSupporter.java" todir="${work.dir}/org/soapinterop/databinding" overwrite="true" />
-               
-                <move todir="${classes.dir}/schema">
-            		<fileset dir="${work.dir}/schema"/>
-               </move>   
-    	
-              <javac srcdir="${work.dir}" destdir="${classes.dir}" debug="on">
-                  <classpath refid="maven.dependency.classpath" />
-              </javac>
-    	
-    	     <!-- Run the interop test -->
-    	     <java classname="Client">
-                <classpath refid="maven.dependency.classpath" />
-   		     </java>
-    	
-		    <junit dir="${classes.dir}" printsummary="yes" haltonfailure="yes">
-			    <classpath refid="maven.dependency.classpath" />
-			    <formatter type="plain"/>
-			    <test name="InteropClient2" />
-		    </junit>
+        <taskdef name="wsdl2java"
+            classname="org.apache.axis2.tool.ant.AntCodegenTask"
+            classpathref="maven.dependency.classpath"/>
+        <j:set var="interop3.dir" value="target/interop3"/>
+        <j:set var="work.dir" value="${interop3.dir}/work"/>
+        <j:set var="calss.dir" value="${interop3.dir}/classes"/>
+        <j:set var="wsdl.dir" value="${basedir}/../wsdl/test-resources/"/>
+
+        <mkdir dir="${interop3.dir}"/>
+        <mkdir dir="${work.dir}"/>
+        <mkdir dir="${calss.dir}"/>
+
+        <wsdl2java WSDLFileName="${wsdl.dir}compound2.wsdl" output="${work.dir}"/>
+        <!--
+        <java classname="org.apache.axis2.wsdl.WSDL2Java">
+<classpath refid="maven.dependency.classpath"/>
+<arg value="-uri"/>
+<arg file="${wsdl.dir}/compound2.wsdl"/>
+<arg value="-o"/>
+<arg file="${work.dir}"/>
+</java>
+        -->
+        <copy file="${wsdl.dir}/InteropClient2.java" todir="${work.dir}" overwrite="true"/>
+        <copy file="${wsdl.dir}/echoEmployeeDatabindingSupporter.java" todir="${work.dir}/org/soapinterop/databinding" overwrite="true"/>
+
+        <move todir="${classes.dir}/schema">
+            <fileset dir="${work.dir}/schema"/>
+        </move>
+
+        <javac srcdir="${work.dir}" destdir="${classes.dir}" debug="on">
+            <classpath refid="maven.dependency.classpath"/>
+        </javac>
+
+        <!-- Run the interop test -->
+        <java classname="Client">
+            <classpath refid="maven.dependency.classpath"/>
+        </java>
+
+        <junit dir="${classes.dir}" printsummary="yes" haltonfailure="yes">
+            <classpath refid="maven.dependency.classpath"/>
+            <formatter type="plain"/>
+            <test name="InteropClient2"/>
+        </junit>
     </goal>
- </project>
+</project>

Modified: webservices/axis/trunk/java/modules/samples/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/project.xml?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/project.xml (original)
+++ webservices/axis/trunk/java/modules/samples/project.xml Mon Jul 11 08:49:30 2005
@@ -62,42 +62,42 @@
                 <module>true</module>
             </properties>
         </dependency>
-	<dependency>
+        <dependency>
             <groupId>stax</groupId>
             <artifactId>stax</artifactId>
             <version>1.1.1-dev</version>
             <properties>
                 <module>true</module>
             </properties>
-		<url>http://dist.codehaus.org/stax/jars/</url>
+            <url>http://dist.codehaus.org/stax/jars/</url>
         </dependency>
         <dependency>
-           <groupId>commons-httpclient</groupId>
-           <artifactId>commons-httpclient</artifactId>
-           <version>3.0-rc2</version>
-           <properties>
-               <module>true</module>
-           </properties>
-       </dependency>
-        
-	<dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>3.0-rc2</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
+
+        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>1.2.8</version>
             <properties>
                 <module>true</module>
             </properties>
-		<url>http://dist.codehaus.org/stax/jars/</url>
+            <url>http://dist.codehaus.org/stax/jars/</url>
         </dependency>
 
-	<dependency>
+        <dependency>
             <groupId>stax</groupId>
             <artifactId>stax-api</artifactId>
             <version>1.0</version>
             <properties>
                 <module>true</module>
             </properties>
-		<url>http://dist.codehaus.org/stax/jars/</url>
+            <url>http://dist.codehaus.org/stax/jars/</url>
         </dependency>
         <dependency>
             <groupId>axis</groupId>
@@ -124,87 +124,87 @@
             </properties>
         </dependency>
         <dependency>
-      	    <groupId>xmlbeans</groupId>
-      	   <artifactId>xbean</artifactId>
-      	   <version>2.0.0-beta1</version>
-      	    <type>jar</type>
-      	    <properties>
-        		  <module>true</module>
-      	    </properties>
-    	 </dependency>	
-        
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+            <version>2.0.0-beta1</version>
+            <type>jar</type>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
+
     </dependencies>
 
     <!-- build information for the project -->
-  <build>
-    <nagEmailAddress>axis-dev@ws.apache.org</nagEmailAddress>
-    <sourceDirectory>src</sourceDirectory>
-    <unitTestSourceDirectory>test</unitTestSourceDirectory>
-
-    <unitTest>
-
-      <excludes>
-        <exclude>**/*Abstract*.java</exclude>
-	    <exclude>**/*Util*.java</exclude>
-		<exclude>**/*InteropStubTest.java</exclude>
-	    <exclude>**/*EchoRawXMLChunckedTest.java</exclude>
-		<exclude>**org/apache/axis2/mail/*.java</exclude>
-		<exclude>**org/apache/axis2/mtom/*.java</exclude>
-<!--		<exclude>**/*MailEchoRawXMLTest.java</exclude> 
-		<exclude>**/*MailOneWayRawXMLTest.java</exclude> 
-		<exclude>**/*MailRequestResponseRawXMLTest.java</exclude> 
-     	  <exclude>**/*CommonsHTTPEchoRawXMLTest.java</exclude>  
-		<exclude>**/*EchoRawMTOMTest.java</exclude>
-        <exclude>**/*EchoRawMTOMLoadTest.java</exclude>
-		<exclude>**/*EchoRawMTOMToBase64Test.java</exclude>  -->
-      </excludes>
-     <includes>
-        <include>**/*Test.java</include>
-      </includes>
-
-     <resources>
-         <resource>
-             <directory>${basedir}/test-resources</directory>
-          </resource>
-          <resource>
-        	<directory>conf</directory>
-       			 <includes>
-          			<include>**/*.properties</include>
-        		</includes>
-      </resource>
-      <resource>
-        <directory>src</directory>
-        <includes>
-          	<include>**/*.properties</include>
-          	<include>**/*.xml</include>
-        </includes>
-      </resource>
-     </resources>
-    </unitTest>
-
-    <resources>
-      <resource>
-        <directory>conf</directory>
-        <includes>
-          <include>**/*.properties</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>src</directory>
-        <includes>
-          <include>**/*.properties</include>
-          <include>**/*.xml</include>
-        </includes>
-      </resource>
- 	<resource>
-        <directory>test</directory>
-        <includes>
-          <include>**/*.jpg</include>
-        </includes>
-      </resource>
-    </resources>
-  </build>
-  
-  <reports/>
+    <build>
+        <nagEmailAddress>axis-dev@ws.apache.org</nagEmailAddress>
+        <sourceDirectory>src</sourceDirectory>
+        <unitTestSourceDirectory>test</unitTestSourceDirectory>
+
+        <unitTest>
+
+            <excludes>
+                <exclude>**/*Abstract*.java</exclude>
+                <exclude>**/*Util*.java</exclude>
+                <exclude>**/*InteropStubTest.java</exclude>
+                <exclude>**/*EchoRawXMLChunckedTest.java</exclude>
+                <exclude>**org/apache/axis2/mail/*.java</exclude>
+                <exclude>**org/apache/axis2/mtom/*.java</exclude>
+                <!--		<exclude>**/*MailEchoRawXMLTest.java</exclude>
+                        <exclude>**/*MailOneWayRawXMLTest.java</exclude>
+                        <exclude>**/*MailRequestResponseRawXMLTest.java</exclude>
+                           <exclude>**/*CommonsHTTPEchoRawXMLTest.java</exclude>
+                        <exclude>**/*EchoRawMTOMTest.java</exclude>
+                        <exclude>**/*EchoRawMTOMLoadTest.java</exclude>
+                        <exclude>**/*EchoRawMTOMToBase64Test.java</exclude>  -->
+            </excludes>
+            <includes>
+                <include>**/*Test.java</include>
+            </includes>
+
+            <resources>
+                <resource>
+                    <directory>${basedir}/test-resources</directory>
+                </resource>
+                <resource>
+                    <directory>conf</directory>
+                    <includes>
+                        <include>**/*.properties</include>
+                    </includes>
+                </resource>
+                <resource>
+                    <directory>src</directory>
+                    <includes>
+                        <include>**/*.properties</include>
+                        <include>**/*.xml</include>
+                    </includes>
+                </resource>
+            </resources>
+        </unitTest>
+
+        <resources>
+            <resource>
+                <directory>conf</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>test</directory>
+                <includes>
+                    <include>**/*.jpg</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
+
+    <reports/>
 
 </project>

Modified: webservices/axis/trunk/java/modules/samples/script/build.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/script/build.xml?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/script/build.xml (original)
+++ webservices/axis/trunk/java/modules/samples/script/build.xml Mon Jul 11 08:49:30 2005
@@ -1,31 +1,31 @@
 <project name="samples" default="alltests">
-<path id="axis.classpath">
-		<fileset dir="../lib">
-			<include name="*.jar"/>
-		</fileset>
-		<pathelement location="userguide/sample.jar"/>
-</path>
+    <path id="axis.classpath">
+        <fileset dir="../lib">
+            <include name="*.jar"/>
+        </fileset>
+        <pathelement location="userguide/sample.jar"/>
+    </path>
 
-<target name="alltests" depends="testEchoBlockingClient,testEchoBlockingDualClient,testEchoNonBlockingDualClient,testPingClient,testWebServiceWithModuleClient">
-</target>
+    <target name="alltests" depends="testEchoBlockingClient,testEchoBlockingDualClient,testEchoNonBlockingDualClient,testPingClient,testWebServiceWithModuleClient">
+    </target>
 
-<target name="testEchoBlockingClient">
-		<java classname="userguide.clients.EchoBlockingClient" classpathref="axis.classpath"/>
-</target>
-<target name="testEchoBlockingDualClient">
-		<java classname="userguide.clients.EchoBlockingDualClient" classpathref="axis.classpath"/>
-</target>
-<target name="testEchoNonBlockingDualClient">
-		<java classname="userguide.clients.EchoNonBlockingDualClient" classpathref="axis.classpath"/>
-</target>
-<target name="testPingClient">
-		<java classname="userguide.clients.PingClient" classpathref="axis.classpath"/>
-</target>
-<target name="testWebServiceWithModuleClient">
-		<java classname="userguide.clients.ClientForWebServiceWithModule" classpathref="axis.classpath"/>
-</target>
+    <target name="testEchoBlockingClient">
+        <java classname="userguide.clients.EchoBlockingClient" classpathref="axis.classpath"/>
+    </target>
+    <target name="testEchoBlockingDualClient">
+        <java classname="userguide.clients.EchoBlockingDualClient" classpathref="axis.classpath"/>
+    </target>
+    <target name="testEchoNonBlockingDualClient">
+        <java classname="userguide.clients.EchoNonBlockingDualClient" classpathref="axis.classpath"/>
+    </target>
+    <target name="testPingClient">
+        <java classname="userguide.clients.PingClient" classpathref="axis.classpath"/>
+    </target>
+    <target name="testWebServiceWithModuleClient">
+        <java classname="userguide.clients.ClientForWebServiceWithModule" classpathref="axis.classpath"/>
+    </target>
 
-<target name="testEchoNonBlockingClient">
-		<java classname="userguide.clients.EchoNonBlockingClient" classpathref="axis.classpath"/>
-</target>
+    <target name="testEchoNonBlockingClient">
+        <java classname="userguide.clients.EchoNonBlockingClient" classpathref="axis.classpath"/>
+    </target>
 </project>

Modified: webservices/axis/trunk/java/modules/samples/script/mtom-test.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/script/mtom-test.xml?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/script/mtom-test.xml (original)
+++ webservices/axis/trunk/java/modules/samples/script/mtom-test.xml Mon Jul 11 08:49:30 2005
@@ -1,59 +1,59 @@
 <?xml version="1.0"?>
-<!-- ====================================================================== 
-     Feb 11, 2005 1:04:21 PM                                                        
-
-      This build file is intended to compile and run the Axis2 samples
-      provided here with the service being deployed at Tomcat or by
-      running a simple Axis2 server.   
-     
-                   
-                                                                     
+<!-- ====================================================================== 
+     Feb 11, 2005 1:04:21 PM                                                        
+
+      This build file is intended to compile and run the Axis2 samples
+      provided here with the service being deployed at Tomcat or by
+      running a simple Axis2 server.   
+     
+                   
+                                                                     
      ====================================================================== -->
 <project name="samples" basedir=".." default="mtom-test">
-     <property name="maven.repo.local" value="${user.home}/.maven/repository/" />
-     <property name="class.dir" value="${basedir}/target/test-classes" />
-     <property name="report.dir" value="${basedir}/target/test-reports" />
-     <property name="src.dir" value="${basedir}/test" />
+    <property name="maven.repo.local" value="${user.home}/.maven/repository/"/>
+    <property name="class.dir" value="${basedir}/target/test-classes"/>
+    <property name="report.dir" value="${basedir}/target/test-reports"/>
+    <property name="src.dir" value="${basedir}/test"/>
 
-	<path id="test.classpath">
-		      <fileset dir="${maven.repo.local}">
-					<include name="j2ee/jars/activation.jar"/>
-					<include name="j2ee/jars/mailapi.jar"/>
-					<include name="axis/jars/axis2-core-0.9.jar"/>
-					<include name="axis/jars/axis2-xml-0.9.jar"/>
-					<include name="axis/jars/axis2-wsdl-0.9.jar"/>
-					<include name="axis/jars/axis-wsdl4j-1.2.jar"/>
-					<include name="commons-logging/jars/commons-logging-1.0.3.jar"/>
-					<include name="stax/jars/stax-1.1.1-dev.jar"/>
-					<include name="stax/jars/stax-api-1.0.jar"/>
-					<include name="log4j/jars/log4j-1.2.8.jar"/>
-					<include name="junit/jars/*.jar"/>
-		      </fileset>
-	</path>
-     
-	<target name="mtom-test" description="Delete all generated files">
-			<echo message="running MTOM tests"/>
-			<mkdir dir="${report.dir}"/>
-		    <mkdir dir="${class.dir}"/>
-			
-    		<javac srcdir="${src.dir}" destdir="${class.dir}">
-					<classpath refid="test.classpath" />
-			</javac>
-			<copy todir="${class.dir}">
-				<fileset dir="${src.dir}">
-				       <include name="**/*.jpg"/>
-				</fileset>
-			</copy>
-			<junit printsummary="yes" haltonfailure="yes">
-				   <formatter type="plain"/>
-				   <test name="org.apache.axis2.mtom.EchoRawMTOMTest" todir="${report.dir}" />
-				   <test name="org.apache.axis2.mtom.EchoRawMTOMLoadTest" todir="${report.dir}" />
-				   <test name="org.apache.axis2.mtom.EchoRawMTOMToBase64Test" todir="${report.dir}" />
-				   <classpath>
-		                <pathelement location="${class.dir}"/>
-    	                 <path refid="test.classpath"/>
-		           </classpath>
-			</junit>
-	</target>
+    <path id="test.classpath">
+        <fileset dir="${maven.repo.local}">
+            <include name="j2ee/jars/activation.jar"/>
+            <include name="j2ee/jars/mailapi.jar"/>
+            <include name="axis/jars/axis2-core-0.9.jar"/>
+            <include name="axis/jars/axis2-xml-0.9.jar"/>
+            <include name="axis/jars/axis2-wsdl-0.9.jar"/>
+            <include name="axis/jars/axis-wsdl4j-1.2.jar"/>
+            <include name="commons-logging/jars/commons-logging-1.0.3.jar"/>
+            <include name="stax/jars/stax-1.1.1-dev.jar"/>
+            <include name="stax/jars/stax-api-1.0.jar"/>
+            <include name="log4j/jars/log4j-1.2.8.jar"/>
+            <include name="junit/jars/*.jar"/>
+        </fileset>
+    </path>
+
+    <target name="mtom-test" description="Delete all generated files">
+        <echo message="running MTOM tests"/>
+        <mkdir dir="${report.dir}"/>
+        <mkdir dir="${class.dir}"/>
+
+        <javac srcdir="${src.dir}" destdir="${class.dir}">
+            <classpath refid="test.classpath"/>
+        </javac>
+        <copy todir="${class.dir}">
+            <fileset dir="${src.dir}">
+                <include name="**/*.jpg"/>
+            </fileset>
+        </copy>
+        <junit printsummary="yes" haltonfailure="yes">
+            <formatter type="plain"/>
+            <test name="org.apache.axis2.mtom.EchoRawMTOMTest" todir="${report.dir}"/>
+            <test name="org.apache.axis2.mtom.EchoRawMTOMLoadTest" todir="${report.dir}"/>
+            <test name="org.apache.axis2.mtom.EchoRawMTOMToBase64Test" todir="${report.dir}"/>
+            <classpath>
+                <pathelement location="${class.dir}"/>
+                <path refid="test.classpath"/>
+            </classpath>
+        </junit>
+    </target>
 </project>
 

Modified: webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/AmazonSimpleQueueServiceIn.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/AmazonSimpleQueueServiceIn.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/AmazonSimpleQueueServiceIn.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/AmazonSimpleQueueServiceIn.java Mon Jul 11 08:49:30 2005
@@ -27,53 +27,54 @@
 
 /**
  * GUI which handles the IN operations of the queue
- * @author Saminda Abeyruwan <sa...@opensource.lk>
  *
+ * @author Saminda Abeyruwan <sa...@opensource.lk>
  */
-public class AmazonSimpleQueueServiceIn extends JFrame{
+public class AmazonSimpleQueueServiceIn extends JFrame {
     private static final String HELP_FILE_NAME = "/docs/AmazonSimpleWebService.html";
     JTextField createQueue;
     JTextField queueCode;
     JTextField enqueue;
     JTextArea resuts;
 
-    public AmazonSimpleQueueServiceIn(){
-        this.setBounds(200,200,450,500);
+    public AmazonSimpleQueueServiceIn() {
+        this.setBounds(200, 200, 450, 500);
         this.setTitle("Amazon Simple Queue WS - In");
         this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         this.guiInit();
     }
-    private void guiInit(){
+
+    private void guiInit() {
         getContentPane().setLayout(new GridBagLayout());
         GridBagConstraints cons = new GridBagConstraints();
         cons.fill = GridBagConstraints.BOTH;
         JLabel lable1 = new JLabel("Create Queue");
-        cons.insets = new Insets(5,5,5,5);
-        this.add(lable1,cons,0,0,1,1);
+        cons.insets = new Insets(5, 5, 5, 5);
+        this.add(lable1, cons, 0, 0, 1, 1);
         JLabel lable2 = new JLabel("Queue Code");
-        this.add(lable2, cons, 1,0,1,1);
+        this.add(lable2, cons, 1, 0, 1, 1);
         cons.weightx = 100;
         createQueue = new JTextField("Test Queue LSF2");
-        this.add(createQueue,cons,0,1,1,1);
+        this.add(createQueue, cons, 0, 1, 1, 1);
         queueCode = new JTextField();
         queueCode.setEditable(false);
-        this.add(queueCode,cons,1,1,1,1);
+        this.add(queueCode, cons, 1, 1, 1, 1);
         JLabel lable3 = new JLabel("Enqueue");
-        this.add(lable3,cons,0,2,1,1);
+        this.add(lable3, cons, 0, 2, 1, 1);
         enqueue = new JTextField();
         enqueue.setEditable(false);
-        this.add(enqueue,cons,0,3,2,1);
+        this.add(enqueue, cons, 0, 3, 2, 1);
         JLabel label4 = new JLabel("Results");
-        this.add(label4,cons,0,5,1,1);
+        this.add(label4, cons, 0, 5, 1, 1);
         cons.weighty = 100;
         resuts = new JTextArea();
         resuts.setEditable(false);
         resuts.setLineWrap(true);
         resuts.setWrapStyleWord(true);
         JScrollPane resultpane = new JScrollPane(resuts);
-        this.add(resultpane,cons,0,6,2,2);
-        createQueue.addKeyListener(new ListenersIn(createQueue,queueCode,enqueue,resuts));
-        enqueue.addKeyListener(new ListenersIn(createQueue,queueCode,enqueue,resuts));
+        this.add(resultpane, cons, 0, 6, 2, 2);
+        createQueue.addKeyListener(new ListenersIn(createQueue, queueCode, enqueue, resuts));
+        enqueue.addKeyListener(new ListenersIn(createQueue, queueCode, enqueue, resuts));
 
         AddMenuItems();
 
@@ -82,11 +83,11 @@
     private void AddMenuItems() {
         //add the menus
         JMenuBar menuBar = new JMenuBar();
-        JMenu settingsMenu =  new JMenu("Settings");
+        JMenu settingsMenu = new JMenu("Settings");
         settingsMenu.setMnemonic(KeyEvent.VK_S);
-        JMenuItem amazonKeyMenu = new JMenuItem("Set Amazon Key",KeyEvent.VK_G);
+        JMenuItem amazonKeyMenu = new JMenuItem("Set Amazon Key", KeyEvent.VK_G);
         amazonKeyMenu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_G, ActionEvent.CTRL_MASK));
-        amazonKeyMenu.addActionListener(new ActionListener(){
+        amazonKeyMenu.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 setKey();
             }
@@ -108,9 +109,9 @@
         setJMenuBar(menuBar);
     }
 
-    private void setKey(){
-        String key = JOptionPane.showInputDialog(this,"Set the Amazon Key",QueueManager.getKey());
-        if (key!=null && !key.trim().equals("")){
+    private void setKey() {
+        String key = JOptionPane.showInputDialog(this, "Set the Amazon Key", QueueManager.getKey());
+        if (key != null && !key.trim().equals("")) {
             QueueManager.setKey(key);
         }
     }
@@ -120,15 +121,15 @@
      */
     private void showHelp() {
 
-        JFrame frame= new JFrame();
+        JFrame frame = new JFrame();
         Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-        frame.setLocation(screenSize.width/5,
-                screenSize.height/5);
-        frame.setSize(screenSize.width/2,screenSize.height/2);
+        frame.setLocation(screenSize.width / 5,
+                          screenSize.height / 5);
+        frame.setSize(screenSize.width / 2, screenSize.height / 2);
 
         BorderLayout layout = new BorderLayout();
 
-        JScrollPane jsp ;
+        JScrollPane jsp;
         JEditorPane jep;
 
         jep = new JEditorPane();
@@ -141,24 +142,24 @@
         Container contentPane = frame.getContentPane();
         contentPane.setLayout(layout);
         contentPane.add(jsp, BorderLayout.CENTER);
-        String helpDoc = System.getProperty("user.dir")+HELP_FILE_NAME;
+        String helpDoc = System.getProperty("user.dir") + HELP_FILE_NAME;
 
         try {
             jep.setPage(new File(helpDoc).toURL());
         } catch (IOException e) {
-            JOptionPane.showMessageDialog(this,"Help file not detected","Help file error",JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(this, "Help file not detected", "Help file error", JOptionPane.ERROR_MESSAGE);
             return;
         }
         frame.setVisible(true);
     }
 
 
-    private void add(Component c, GridBagConstraints cons, int x, int y, int w, int h){
+    private void add(Component c, GridBagConstraints cons, int x, int y, int w, int h) {
         cons.gridx = x;
         cons.gridy = y;
         cons.gridheight = h;
         cons.gridwidth = w;
-        this.getContentPane().add(c,cons);
+        this.getContentPane().add(c, cons);
     }
 
 }

Modified: webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/AmazonSimpleQueueServiceOut.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/AmazonSimpleQueueServiceOut.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/AmazonSimpleQueueServiceOut.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/AmazonSimpleQueueServiceOut.java Mon Jul 11 08:49:30 2005
@@ -85,13 +85,13 @@
         cons.weighty = 0;
         this.add(buttonPannel, cons, 0, 6, 2, 1);
         this.createQueue.addKeyListener(new ListenersOut(this.createQueue, this.queueCode,
-                this.read, this.resuts, this.loadButton, this.deleteButton));
+                                                         this.read, this.resuts, this.loadButton, this.deleteButton));
         this.loadButton.addActionListener(new ListenersOut(this.createQueue, this.queueCode,
-                this.read, this.resuts, this.loadButton, this.deleteButton));
+                                                           this.read, this.resuts, this.loadButton, this.deleteButton));
         this.resuts.addMouseMotionListener(new ListenersOut(this.createQueue, this.queueCode,
-                this.read, this.resuts, this.loadButton, this.deleteButton));
+                                                            this.read, this.resuts, this.loadButton, this.deleteButton));
         this.deleteButton.addActionListener(new ListenersOut(this.createQueue, this.queueCode,
-                this.read, this.resuts, this.loadButton, this.deleteButton));
+                                                             this.read, this.resuts, this.loadButton, this.deleteButton));
 
         AddMenuItems();
     }
@@ -105,76 +105,76 @@
     }
 
     private void AddMenuItems() {
-            //add the menus
-            JMenuBar menuBar = new JMenuBar();
-            JMenu settingsMenu =  new JMenu("Settings");
-            settingsMenu.setMnemonic(KeyEvent.VK_S);
-            JMenuItem amazonKeyMenu = new JMenuItem("Set Amazon Key",KeyEvent.VK_G);
-            amazonKeyMenu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_G, ActionEvent.CTRL_MASK));
-            amazonKeyMenu.addActionListener(new ActionListener(){
-                public void actionPerformed(ActionEvent e) {
-                    setKey();
-                }
-            });
-            settingsMenu.add(amazonKeyMenu);
-
-            JMenu helpMenu = new JMenu("Help");
-            JMenuItem mnuItemHelp = new JMenuItem("Show Help");
-            helpMenu.add(mnuItemHelp);
-
-            mnuItemHelp.addActionListener(new ActionListener() {
-                public void actionPerformed(ActionEvent e) {
-                    showHelp();
-                }
-            });
-
-            menuBar.add(settingsMenu);
-            menuBar.add(helpMenu);
-            setJMenuBar(menuBar);
-        }
+        //add the menus
+        JMenuBar menuBar = new JMenuBar();
+        JMenu settingsMenu = new JMenu("Settings");
+        settingsMenu.setMnemonic(KeyEvent.VK_S);
+        JMenuItem amazonKeyMenu = new JMenuItem("Set Amazon Key", KeyEvent.VK_G);
+        amazonKeyMenu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_G, ActionEvent.CTRL_MASK));
+        amazonKeyMenu.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                setKey();
+            }
+        });
+        settingsMenu.add(amazonKeyMenu);
 
-        private void setKey(){
-            String key = JOptionPane.showInputDialog(this,"Set the Amazon Key",QueueManager.getKey());
-            if (key!=null && !key.trim().equals("")){
-                QueueManager.setKey(key);
+        JMenu helpMenu = new JMenu("Help");
+        JMenuItem mnuItemHelp = new JMenuItem("Show Help");
+        helpMenu.add(mnuItemHelp);
+
+        mnuItemHelp.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                showHelp();
             }
+        });
+
+        menuBar.add(settingsMenu);
+        menuBar.add(helpMenu);
+        setJMenuBar(menuBar);
+    }
+
+    private void setKey() {
+        String key = JOptionPane.showInputDialog(this, "Set the Amazon Key", QueueManager.getKey());
+        if (key != null && !key.trim().equals("")) {
+            QueueManager.setKey(key);
         }
+    }
 
-        /**
-         * method showHelp
-         */
-        private void showHelp() {
-
-            JFrame frame= new JFrame();
-            Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-            frame.setLocation(screenSize.width/5,
-                    screenSize.height/5);
-            frame.setSize(screenSize.width/2,screenSize.height/2);
-
-            BorderLayout layout = new BorderLayout();
-
-            JScrollPane jsp ;
-            JEditorPane jep;
-
-            jep = new JEditorPane();
-            //jep.addHyperlinkListener(new LinkFollower());
-            jep.setEditable(false);
-            jep.setContentType("text/html");
-
-            jsp = new JScrollPane(jep);
-
-            Container contentPane = frame.getContentPane();
-            contentPane.setLayout(layout);
-            contentPane.add(jsp, BorderLayout.CENTER);
-            String helpDoc = System.getProperty("user.dir")+HELP_FILE_NAME;
-
-            try {
-                jep.setPage(new File(helpDoc).toURL());
-            } catch (IOException e) {
-                JOptionPane.showMessageDialog(this,"Help file not detected","Help file error",JOptionPane.ERROR_MESSAGE);
-                return;
-            }
-            frame.setVisible(true);
+    /**
+     * method showHelp
+     */
+    private void showHelp() {
+
+        JFrame frame = new JFrame();
+        Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+        frame.setLocation(screenSize.width / 5,
+                          screenSize.height / 5);
+        frame.setSize(screenSize.width / 2, screenSize.height / 2);
+
+        BorderLayout layout = new BorderLayout();
+
+        JScrollPane jsp;
+        JEditorPane jep;
+
+        jep = new JEditorPane();
+        //jep.addHyperlinkListener(new LinkFollower());
+        jep.setEditable(false);
+        jep.setContentType("text/html");
+
+        jsp = new JScrollPane(jep);
+
+        Container contentPane = frame.getContentPane();
+        contentPane.setLayout(layout);
+        contentPane.add(jsp, BorderLayout.CENTER);
+        String helpDoc = System.getProperty("user.dir") + HELP_FILE_NAME;
+
+        try {
+            jep.setPage(new File(helpDoc).toURL());
+        } catch (IOException e) {
+            JOptionPane.showMessageDialog(this, "Help file not detected", "Help file error", JOptionPane.ERROR_MESSAGE);
+            return;
         }
+        frame.setVisible(true);
+    }
 
 }

Modified: webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/ListenersIn.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/ListenersIn.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/ListenersIn.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/ListenersIn.java Mon Jul 11 08:49:30 2005
@@ -45,7 +45,7 @@
         if (e.getKeyCode() == KeyEvent.VK_ENTER) {
             runnable =
                     new RunnableCreateQueue(this.createQueue, this.queueCode, this.enqueue,
-                            this.result);
+                                            this.result);
             Thread tread = new Thread(runnable);
             tread.start();
         }

Modified: webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/ListenersOut.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/ListenersOut.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/ListenersOut.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/ListenersOut.java Mon Jul 11 08:49:30 2005
@@ -52,7 +52,7 @@
             this.result.setText("");
             this.createQueue.setEditable(false);
             this.runableCodeListMyQueues = new RunnableReadQueue(this.createQueue,
-                    this.queueCode, this.read, this.result);
+                                                                 this.queueCode, this.read, this.result);
             Thread thread = new Thread(this.runableCodeListMyQueues);
             thread.start();
         }
@@ -69,7 +69,7 @@
     public void actionPerformed(ActionEvent e) {
         if (e.getActionCommand().equals("1")) {
             this.runableCodeListMyQueues = new RunnableListMyQueues(this.createQueue, this.queueCode, this.read,
-                    this.result, this.buttonLoad);
+                                                                    this.result, this.buttonLoad);
             Thread thread1 = new Thread(this.runableCodeListMyQueues);
             thread1.start();
             this.createQueue.setEditable(true);
@@ -78,7 +78,7 @@
         if (e.getActionCommand().equals("2")) {
             this.buttonDelete.setText("Running");
             this.runnableCodeDequeue = new RunnableDeleteQueue(this.createQueue, this.queueCode, this.read,
-                    this.result, this.buttonDelete);
+                                                               this.result, this.buttonDelete);
             Thread thread2 = new Thread(this.runnableCodeDequeue);
             thread2.start();
         }

Modified: webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/OMElementCreator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/OMElementCreator.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/OMElementCreator.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/OMElementCreator.java Mon Jul 11 08:49:30 2005
@@ -29,8 +29,7 @@
 public class OMElementCreator {
     public static OMElement creatQueueElement(String createQueueElement, String key) {
         SOAPFactory factory = OMAbstractFactory.getSOAP11Factory();
-        OMNamespace opN = factory.createOMNamespace(
-                "http://webservices.amazon.com/AWSSimpleQueueService/2005-01-01", "nsQ");
+        OMNamespace opN = factory.createOMNamespace("http://webservices.amazon.com/AWSSimpleQueueService/2005-01-01", "nsQ");
         OMElement createQueue = factory.createOMElement("CreateQueue", opN);
         OMElement subID = factory.createOMElement("SubscriptionId", opN);
         OMElement request = factory.createOMElement("Request", opN);
@@ -45,10 +44,10 @@
         createQueue.addChild(request);
         return createQueue;
     }
+
     public static OMElement deleteQueueElement(String deleteQueueName, String key) {
         SOAPFactory factory = OMAbstractFactory.getSOAP11Factory();
-        OMNamespace opN = factory.createOMNamespace(
-                "http://webservices.amazon.com/AWSSimpleQueueService/2005-01-01", "nsQ");
+        OMNamespace opN = factory.createOMNamespace("http://webservices.amazon.com/AWSSimpleQueueService/2005-01-01", "nsQ");
         OMElement enque = factory.createOMElement("DeleteQueue", opN);
         OMElement subID = factory.createOMElement("SubscriptionId", opN);
         OMElement request = factory.createOMElement("Request", opN);
@@ -63,10 +62,10 @@
         enque.addChild(request);
         return enque;
     }
+
     public static OMElement enqueueElement(String queueEntyBody, String queueIden, String key) {
         SOAPFactory factory = OMAbstractFactory.getSOAP11Factory();
-        OMNamespace opN = factory.createOMNamespace(
-                "http://webservices.amazon.com/AWSSimpleQueueService/2005-01-01", "nsQ");
+        OMNamespace opN = factory.createOMNamespace("http://webservices.amazon.com/AWSSimpleQueueService/2005-01-01", "nsQ");
         OMElement enque = factory.createOMElement("Enqueue", opN);
         OMElement subID = factory.createOMElement("SubscriptionId", opN);
         OMElement request = factory.createOMElement("Request", opN);
@@ -86,11 +85,11 @@
         enque.addChild(request);
         return enque;
     }
+
     public static OMElement queueListElement(String key) {
         SOAPFactory factory = OMAbstractFactory.getSOAP11Factory();
-        OMNamespace opN = factory.createOMNamespace(
-                "http://webservices.amazon.com/AWSSimpleQueueService/2005-01-01",
-                "nsQ");
+        OMNamespace opN = factory.createOMNamespace("http://webservices.amazon.com/AWSSimpleQueueService/2005-01-01",
+                                                    "nsQ");
         OMElement listMyQueues = factory.createOMElement("ListMyQueues", opN);
         OMElement subID = factory.createOMElement("SubscriptionId", opN);
         OMElement request = factory.createOMElement("Request", opN);
@@ -99,10 +98,10 @@
         listMyQueues.addChild(request);
         return listMyQueues;
     }
-    public static OMElement read(String requiredQueueName,String key) {
+
+    public static OMElement read(String requiredQueueName, String key) {
         SOAPFactory factory = OMAbstractFactory.getSOAP11Factory();
-        OMNamespace opN = factory.createOMNamespace(
-                "http://webservices.amazon.com/AWSSimpleQueueService/2005-01-01", "nsQ");
+        OMNamespace opN = factory.createOMNamespace("http://webservices.amazon.com/AWSSimpleQueueService/2005-01-01", "nsQ");
         OMElement read = factory.createOMElement("Read", opN);
         OMElement subID = factory.createOMElement("SubscriptionId", opN);
         OMElement request = factory.createOMElement("Request", opN);

Modified: webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/RunGUICQ.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/RunGUICQ.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/RunGUICQ.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/RunGUICQ.java Mon Jul 11 08:49:30 2005
@@ -16,7 +16,6 @@
 package sample.amazon.amazonSimpleQueueService;
 
 
-
 /**
  * @author Saminda Abeyruwan <sa...@opensource.lk>
  */
@@ -25,5 +24,5 @@
         AmazonSimpleQueueServiceIn queue = new AmazonSimpleQueueServiceIn();
         queue.show();
     }
-    
+
 }

Modified: webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/RunGUIRQ.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/RunGUIRQ.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/RunGUIRQ.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/RunGUIRQ.java Mon Jul 11 08:49:30 2005
@@ -16,7 +16,6 @@
 package sample.amazon.amazonSimpleQueueService;
 
 
-
 /**
  * @author Saminda Abeyruwan <sa...@opensource.lk>
  */