axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hemap...@apache.org
Subject svn commit: r227326 - in /webservices/axis/trunk/java: ./ modules/core/src/org/apache/axis2/ modules/core/src/org/apache/axis2/clientapi/ modules/integration/ modules/integration/src/ modules/integration/test-resources/ modules/integration/test/ module...
Date Thu, 04 Aug 2005 09:07:44 GMT
Author: hemapani
Date: Thu Aug  4 02:06:41 2005
New Revision: 227326

URL: http://svn.apache.org/viewcvs?rev=227326&view=rev
Log:
move the samples to integration

Added:
    webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/RESTCall.java
    webservices/axis/trunk/java/modules/integration/
    webservices/axis/trunk/java/modules/integration/maven.xml
    webservices/axis/trunk/java/modules/integration/project.xml
    webservices/axis/trunk/java/modules/integration/src/
    webservices/axis/trunk/java/modules/integration/test/
    webservices/axis/trunk/java/modules/integration/test-resources/
      - copied from r227292, webservices/axis/trunk/java/modules/samples/test-resources/
    webservices/axis/trunk/java/modules/integration/test/org/
      - copied from r227292, webservices/axis/trunk/java/modules/samples/test/org/
Removed:
    webservices/axis/trunk/java/modules/core/src/org/apache/axis2/RESTCall.java
Modified:
    webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java
    webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/DefaultEntityResolver.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XMLUtils.java
    webservices/axis/trunk/java/project.properties

Added: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/RESTCall.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/RESTCall.java?rev=227326&view=auto
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/RESTCall.java
(added)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/RESTCall.java
Thu Aug  4 02:06:41 2005
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.axis2.clientapi;
+
+import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.OMAbstractFactory;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.context.ServiceContext;
+
+
+public class RESTCall extends Call {
+
+    public RESTCall() throws AxisFault {
+        super();
+    }
+
+    public RESTCall(ServiceContext service) throws AxisFault {
+        super(service);
+    }
+
+    public OMElement invokeBlocking()
+            throws AxisFault {
+        return super.invokeBlocking(
+                "nothing",
+                OMAbstractFactory.getOMFactory().createOMElement(
+                        "nothing", "nothing", "nothing"));
+
+    }
+
+    public void invokeNonBlocking(Callback callback)
+            throws AxisFault {
+        super.invokeNonBlocking(
+                "nothing",
+                OMAbstractFactory.getOMFactory().createOMElement(
+                        "nothing", "nothing", "nothing"), callback);
+
+    }
+}

Added: webservices/axis/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/maven.xml?rev=227326&view=auto
==============================================================================
--- webservices/axis/trunk/java/modules/integration/maven.xml (added)
+++ webservices/axis/trunk/java/modules/integration/maven.xml Thu Aug  4 02:06:41 2005
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Revision: 1.21 $ $Date: 2004-10-27 20:54:09 +0600 (Wed, 27 Oct 2004) $ -->
+
+<project default="jar"
+    xmlns:j="jelly:core"
+    xmlns:maven="jelly:maven"
+    xmlns:deploy="deploy"
+    xmlns:ant="jelly:ant">
+    <j:set var="samples.dir" value="target/samples"/>
+    <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"/>
+        <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"/>
+
+        <!-- Create Mail Client transport enabled Repository -->
+        <mkdir dir="target/test-resources/mail-transport-client-enabledRepository"/>
+        <mkdir dir="target/test-resources/mail-transport-client-enabledRepository/modules"/>
+        <copy file="test/org/apache/axis2/mail/mail-enabled-client-axis2.xml"
+            tofile="target/test-resources/mail-transport-client-enabledRepository/axis2.xml"/>
+        <copy file="../addressing/target/addressing.mar"
+            tofile="target/test-resources/mail-transport-client-enabledRepository/modules/addressing.mar"/>
+
+        <!-- Create Mail Server transport enabled Repository -->
+        <mkdir dir="target/test-resources/mail-transport-server-enabledRepository"/>
+        <mkdir dir="target/test-resources/mail-transport-server-enabledRepository/modules"/>
+        <copy file="test/org/apache/axis2/mail/mail-enabled-server-axis2.xml"
+            tofile="target/test-resources/mail-transport-server-enabledRepository/axis2.xml"/>
+        <copy file="../addressing/target/addressing.mar"
+            tofile="target/test-resources/mail-transport-server-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"/>
+
+        <!-- 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"/>
+            
+        <mkdir dir="target/groovyRepo"/>
+        <mkdir dir="target/groovyRepo/services"/>
+        <ant:copy file="../samples/target/samples/groovyService.aar" tofile="target/groovyRepo/services/groovyService.aar"/>
           
+
+        <j:jelly xmlns="jelly:ant">
+            <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/SOAP12Testing/SOAP12TestModuleB"/>
+            <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/SOAP12Testing/SOAP12TestModuleC"/>
+            <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/SOAP12Testing/SOAP12TestServiceB"/>
+            <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/SOAP12Testing/SOAP12TestServiceC"/>
+        </j:jelly>
+    </postGoal>
+
+    <postGoal name="test:test">
+        <attainGoal name="mail-tests"/>
+    </postGoal>
+    
+    <goal name="mail-tests">
+      <!--   	 TODO call the Mail tests if the mail jar is presents
+        <j:if test="${maven.repo.local}/j2ee/jars/mail.jar"> 
+            <ant:ant antfile="script/mail-test.xml" inheritall="true" inheritrefs="true"
dir="."/>
+         </j:if> 
+         maven -Dtestcase=org.foo.bar.MyTest test:single-test
+         -->
+    </goal>
+
+    <!-- ================================================================ -->
+    <!--- Google Mail Sample -->
+    <!-- ================================================================ -->
+
+    <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>
+    </goal>
+
+    <!-- ================================================================ -->
+    <!--- Run the Interop Tests -->
+    <!-- ================================================================ -->
+
+    <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>
+    </goal>
+    
+     <!-- ================================================================ -->
+    <!--- Run the Interop Tests -->
+    <!-- ================================================================ -->
+
+    <goal name="testWSDLs">
+        <taskdef name="wsdl2java"
+            classname="org.apache.axis2.tool.ant.AntCodegenTask"
+            classpathref="maven.dependency.classpath"/>
+        <j:set var="codeGen.dir" value="${basedir}/target/code-gen"/>
+        <j:set var="wsdl.dir" value="${basedir}/../wsdl/test-resources/"/>
+        
+        <mkdir dir="${codeGen.dir}/1"/>  
+       	<mkdir dir="${codeGen.dir}/1/src"/>  
+       	<mkdir dir="${codeGen.dir}/1/classes"/>  
+       	
+        <wsdl2java WSDLFileName="${wsdl.dir}/compound2.wsdl" 
+        	output="${codeGen.dir}/1/src"> 
+        	<classpath refid="maven.dependency.classpath" />
+        </wsdl2java>	
+        <move todir="${codeGen.dir}/1/classes/schema">
+    		<fileset dir="${codeGen.dir}/1/src/schema"/>
+       </move>
+        <javac srcdir="${codeGen.dir}/1/src" destdir="${codeGen.dir}/1/classes" debug="on">
+           <classpath refid="maven.dependency.classpath" />
+        </javac>
+
+        <mkdir dir="${codeGen.dir}/2"/>  
+       	<mkdir dir="${codeGen.dir}/2/src"/>  
+       	<mkdir dir="${codeGen.dir}/2/classes"/>  
+       	
+        <wsdl2java WSDLFileName="${wsdl.dir}/complex-doc-literal.wsdl" output="${codeGen.dir}/2/src"/>

+        <move todir="${codeGen.dir}/2/classes/schema">
+    		<fileset dir="${codeGen.dir}/2/src/schema"/>
+        </move>
+        <javac srcdir="${codeGen.dir}/2/src" destdir="${codeGen.dir}/2/classes" debug="on">
+           <classpath refid="maven.dependency.classpath" />
+        </javac>
+        
+        <mkdir dir="${codeGen.dir}/3"/>  
+       	<mkdir dir="${codeGen.dir}/3/src"/>  
+       	<mkdir dir="${codeGen.dir}/3/classes"/>  
+       	
+        <wsdl2java WSDLFileName="${wsdl.dir}/simple-doc-literal.wsdl" output="${codeGen.dir}/3/src"/>

+        <move todir="${codeGen.dir}/3/classes/schema">
+    		<fileset dir="${codeGen.dir}/3/src/schema"/>
+       </move>
+        <javac srcdir="${codeGen.dir}/3/src" destdir="${codeGen.dir}/3/classes" debug="on">
+           <classpath refid="maven.dependency.classpath" />
+        </javac>
+
+    </goal>
+    
+ 
+</project>

Added: webservices/axis/trunk/java/modules/integration/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/project.xml?rev=227326&view=auto
==============================================================================
--- webservices/axis/trunk/java/modules/integration/project.xml (added)
+++ webservices/axis/trunk/java/modules/integration/project.xml Thu Aug  4 02:06:41 2005
@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+* Copyright 2001-2004 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+ -->
+<project>
+    <pomVersion>3</pomVersion>
+    <extend>../../etc/project.xml</extend>
+
+    <id>axis2-integration</id>
+    <name>integration</name>
+    <description>Integration tests</description>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>axis</groupId>
+            <artifactId>axis2-core</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>axis</groupId>
+            <artifactId>axis2-samples</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>axis</groupId>
+            <artifactId>axis2-xml</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>axis</groupId>
+            <artifactId>axis2-wsdl</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>axis</groupId>
+            <artifactId>addressing</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>axis</groupId>
+            <artifactId>axis2-tools</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>axis</groupId>
+            <artifactId>axis2-common</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+        
+
+        <!-- external JARs -->
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.0.3</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </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>
+        </dependency>
+
+        <dependency>
+            <groupId>groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+            <version>1.0-jsr-01</version>
+            <properties>
+                <module>true</module>
+            </properties>
+            <url>http://dist.codehaus.org/groovy/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>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.8</version>
+            <properties>
+                <module>true</module>
+            </properties>
+            <url>http://dist.codehaus.org/stax/jars/</url>
+        </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>
+        </dependency>
+        <dependency>
+            <groupId>axis</groupId>
+            <artifactId>axis-wsdl4j</artifactId>
+            <version>1.2</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-javamail</artifactId>
+            <version>1.3.1-rc5</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-activation</artifactId>
+            <version>1.0.2-rc4</version>
+            <properties>
+                <module>true</module>
+            </properties>
+        </dependency>
+        <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>**/*Groovy*.java</exclude>
+                <!-- <exclude>**/*EchoRawXMLChunckedTest.java</exclude> -->
+                <exclude>**org/apache/axis2/mail/*.java</exclude>
+                 
+                
+                
+                <!--
+                <exclude>**/*EchoRawMTOMTest.java</exclude>
+                <exclude>**/*EchoRawMTOMLoadTest.java</exclude>
+                <exclude>**/*EchoRawMTOMToBase64Test.java</exclude>
+                
+                <exclude>**/*MTOMCommonsChunkingTest.java</exclude> 
+                <exclude>**/OneWayRawXMLTest.java</exclude>
+               
+                -->
+         
+                <!--
+         		<exclude>**/*SOAP12Test.java</exclude>
+                <exclude>**/*SOAP12TestWithFaults.java</exclude>
+                <exclude>**/*FaultHandlingTest.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/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java?rev=227326&r1=227292&r2=227326&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java
(original)
+++ webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java
Thu Aug  4 02:06:41 2005
@@ -1,29 +1,28 @@
 package org.apache.axis2.groovy;
 
+import java.io.ByteArrayInputStream;
+import java.io.StringWriter;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
 import junit.framework.TestCase;
+
 import org.apache.axis2.Constants;
-import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.description.ServiceDescription;
 import org.apache.axis2.engine.EchoRawXMLTest;
-import org.apache.axis2.integration.TestingUtils;
 import org.apache.axis2.integration.UtilServer;
 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.builder.StAXOMBuilder;
 import org.apache.axis2.om.impl.OMOutputImpl;
+import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
 import org.apache.axis2.soap.SOAPFactory;
 
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLOutputFactory;
-import java.io.ByteArrayInputStream;
-import java.io.StringWriter;
-
 /*
 * Copyright 2004,2005 The Apache Software Foundation.
 *
@@ -67,8 +66,7 @@
     }
 
     protected void setUp() throws Exception {
-         String repository = "target/groovyRepo";
-//        String repository = "D:\\Projects\\LSF\\Axis2\\Axis1.0\\modules\\samples\\target\\groovyRepo";
+        String repository = "target/groovyRepo";
         UtilServer.start(repository);
     }
 

Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java?rev=227326&r1=227325&r2=227326&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java
(original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java
Thu Aug  4 02:06:41 2005
@@ -4,8 +4,6 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URL;
-import java.net.URLClassLoader;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -18,8 +16,10 @@
 import org.apache.axis2.wsdl.codegen.CommandLineOptionConstants;
 import org.apache.axis2.wsdl.codegen.CommandLineOptionParser;
 import org.apache.axis2.wsdl.util.URLProcessor;
+import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.Path;
 import org.apache.wsdl.WSDLDescription;
 
 /*
@@ -52,10 +52,30 @@
     private boolean serverSide = false;
     private boolean testcase = false;
     private boolean generateServerXml = false;
-
+    private Path classpath;
  
  
     /**
+     * 
+     */
+    public AntCodegenTask() {
+        super();
+        // TODO Auto-generated constructor stub
+    }
+    
+    
+    /**
+      * set the classpath
+      * @return
+      */
+     public Path createClasspath() {
+         if (classpath == null) {
+             classpath = new Path(getProject());
+         }
+         return classpath.createPath();
+     }
+
+    /**
      *
      */
     private Map fillOptionMap() {
@@ -144,8 +164,19 @@
              * This needs the ClassLoader we use to load the task have all the dependancyies
set, hope that 
              * is ok for now
              */
-            ClassLoader cl = new URLClassLoader(new URL[]{new File(output).toURL()},getClass().getClassLoader());
+            
+            
+            AntClassLoader cl = new AntClassLoader(
+                                    null,
+                                    getProject(),
+                                    classpath,
+                                    false);
+            
+     //       log("path is "+cl.getClasspath());                                    
+//            ClassLoader cl = new URLClassLoader(new URL[]{new File(output).toURL()},getClass().getClassLoader());
             Thread.currentThread().setContextClassLoader(cl);
+            cl.addPathElement(output);
+            System.out.println("path is "+cl.getClasspath());    
 
             Map commandLineOptions = this.fillOptionMap();
             //System.out.println("options =" + commandLineOptions);
@@ -203,6 +234,20 @@
             "modules/samples/test-resources/wsdl/compound2.wsdl");
         task.setOutput("temp");
         task.execute();
+    }
+
+    /**
+     * @return
+     */
+    public Path getClasspath() {
+        return classpath;
+    }
+
+    /**
+     * @param path
+     */
+    public void setClasspath(Path path) {
+        classpath = path;
     }
 
 }

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/DefaultEntityResolver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/DefaultEntityResolver.java?rev=227326&r1=227325&r2=227326&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/DefaultEntityResolver.java
(original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/DefaultEntityResolver.java
Thu Aug  4 02:06:41 2005
@@ -15,15 +15,10 @@
  */
 package org.apache.axis2.wsdl.util;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.xml.sax.InputSource;
 
 public class DefaultEntityResolver implements org.xml.sax.EntityResolver {
-    protected static Log log =
-        LogFactory.getLog(XMLUtils.class.getName());
-
-    public DefaultEntityResolver() {
+     public DefaultEntityResolver() {
     }
 
     public InputSource resolveEntity(String publicId, String systemId) {

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=227326&r1=227325&r2=227326&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
Thu Aug  4 02:06:41 2005
@@ -55,8 +55,8 @@
 
 
 public class XMLUtils {
-    protected static Log log =
-        LogFactory.getLog(XMLUtils.class.getName());
+//    protected Log log =
+//        LogFactory.getLog(getClass().getName());
         
     public static final String charEncoding = "ISO-8859-1";
     private static final String saxParserFactoryProperty =
@@ -166,7 +166,7 @@
                                        factoryClassName);
                 }
             } catch (Exception e) {
-                log.error(Messages.getMessage("exception00"), e);
+                //log.error(Messages.getMessage("exception00"), e);
                 saxFactory = null;
             }
        } else {
@@ -186,7 +186,7 @@
             dbf.setNamespaceAware(true);
         }
         catch( Exception e ) {
-            log.error(Messages.getMessage("exception00"), e );
+            //log.error(Messages.getMessage("exception00"), e );
             dbf = null;
         }
         return( dbf );
@@ -431,8 +431,8 @@
     
     public static class ParserErrorHandler implements ErrorHandler
     {
-        protected static Log log =
-            LogFactory.getLog(ParserErrorHandler.class.getName());
+//        protected static Log log =
+//            LogFactory.getLog(ParserErrorHandler.class.getName());
         /**
          * Returns a string describing parse exception details
          */
@@ -451,8 +451,8 @@
         // See SAX documentation for more info.
 
         public void warning(SAXParseException spe) throws SAXException {
-            if (log.isDebugEnabled())
-                log.debug( Messages.getMessage("warning00", getParseExceptionInfo(spe)));
+//            if (log.isDebugEnabled())
+//                log.debug( Messages.getMessage("warning00", getParseExceptionInfo(spe)));
         }
         
         public void error(SAXParseException spe) throws SAXException {

Modified: webservices/axis/trunk/java/project.properties
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/project.properties?rev=227326&r1=227325&r2=227326&view=diff
==============================================================================
--- webservices/axis/trunk/java/project.properties (original)
+++ webservices/axis/trunk/java/project.properties Thu Aug  4 02:06:41 2005
@@ -24,6 +24,7 @@
 modules/samples/project.xml,\
 modules/wsdl/project.xml,\
 modules/xml/project.xml,\
+modules/integration/project.xml,\
 modules/tool/project.xml
 
 



Mime
View raw message