Return-Path: 
 <scm-return-6345-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 15079 invoked from network); 17 Mar 2005 01:14:26 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 17 Mar 2005 01:14:26 -0000
Received: (qmail 53453 invoked by uid 500); 17 Mar 2005 01:14:25 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 53336 invoked by uid 500); 17 Mar 2005 01:14:25 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 53319 invoked by uid 99); 17 Mar 2005 01:14:25 -0000
X-ASF-Spam-Status: No, hits=-9.7 required=10.0
	tests=ALL_TRUSTED,NORMAL_HTTP_TO_IP,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Wed, 16 Mar 2005 17:14:23 -0800
Received: (qmail 15063 invoked by uid 65534); 17 Mar 2005 01:14:22 -0000
Message-ID: <20050317011422.15062.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Thu, 17 Mar 2005 01:14:22 -0000
Subject: svn commit: r157843 - in geronimo/trunk/modules/axis: project.xml
 src/test-resources/deployables/ src/test-resources/echo-deploy.wsdd
 src/test/org/apache/geronimo/axis/AxisWebServiceContainerTest.java
To: scm@geronimo.apache.org
From: dblevins@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: dblevins
Date: Wed Mar 16 17:14:21 2005
New Revision: 157843

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D157843
Log:
Cleaned up the project.xml to still include the geronimo-service.xml and no=
t add test-resources to the geronimo-axis archive.  Cleaned out old test da=
ta and wsdd files that we don't need.

Removed:
    geronimo/trunk/modules/axis/src/test-resources/deployables/
    geronimo/trunk/modules/axis/src/test-resources/echo-deploy.wsdd
Modified:
    geronimo/trunk/modules/axis/project.xml
    geronimo/trunk/modules/axis/src/test/org/apache/geronimo/axis/AxisWebSe=
rviceContainerTest.java

Modified: geronimo/trunk/modules/axis/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis/project.xml?=
view=3Ddiff&r1=3D157842&r2=3D157843
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- geronimo/trunk/modules/axis/project.xml (original)
+++ geronimo/trunk/modules/axis/project.xml Wed Mar 16 17:14:21 2005
@@ -38,175 +38,20 @@
     <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
     <dependencies>
         <dependency>
-            <groupId>ews</groupId>
-            <artifactId>ews</artifactId>
-            <version>${ews_version}</version>
-            <properties>
-                <module>true</module>
-            </properties>
-        </dependency>
-         <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-xmlbeans-plugin</artifactId>
-            <version>${pom.currentVersion}</version>
-            <type>plugin</type>
-        </dependency>
-
-        <!-- needed for xmlbeans runtime-->
-        <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean-apache</artifactId>
-            <version>${xmlbeans_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-core</artifactId>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <module>true</module>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-jetty</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-deployment</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-naming</artifactId>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <xmlbeans>true</xmlbeans>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-naming-builder</artifactId>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <repository>true</repository>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-j2ee</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-         <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-j2ee-builder</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-security</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-security-builder</artifactId>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <xmlbeans>true</xmlbeans>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-service-builder</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-transaction</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-connector</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-common</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-system</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-timer</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
             <artifactId>geronimo-webservices</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jta</artifactId>
-            <version>${geronimo_spec_jta_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-jacc</artifactId>
-            <version>${geronimo_spec_j2ee_jacc_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-connector</artifactId>
-            <version>${geronimo_spec_j2ee_connector_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-deployment</artifactId>
-            <version>${geronimo_spec_j2ee_deployment_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-j2ee-schema</artifactId>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <xmlbeans>true</xmlbeans>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo-spec</groupId>
             <artifactId>geronimo-spec-ejb</artifactId>
             <version>${geronimo_spec_ejb_version}</version>
         </dependency>
-        <dependency>
-            <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
-            <version>${jetty_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j</artifactId>
-            <version>${mx4j_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-            <version>${dom4j_version}</version>
-            <properties>
-                <module>true</module>
-            </properties>
-        </dependency>
-
         <!-- these are just needed to run the unit tests -->
         <dependency>
             <groupId>geronimo-spec</groupId>
@@ -214,66 +59,18 @@
             <version>${geronimo_spec_servlet_version}</version>
         </dependency>
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jsp</artifactId>
-            <version>${geronimo_spec_jsp_version}</version>
-        </dependency>
-        <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
             <version>${commons_logging_version}</version>
             <url>http://jakarta.apache.org/commons/logging/</url>
         </dependency>
         <dependency>
-            <groupId>tomcat</groupId>
-            <artifactId>jasper-compiler</artifactId>
-            <version>${tomcat_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>tomcat</groupId>
-            <artifactId>jasper-runtime</artifactId>
-            <version>${tomcat_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-el</groupId>
-            <artifactId>commons-el</artifactId>
-            <version>${commons_el_version}</version>
-            <url>http://jakarta.apache.org/commons/el/</url>
-        </dependency>
-        <dependency>
-            <groupId>ant</groupId>
-            <artifactId>ant</artifactId>
-            <version>${ant_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>${xerces_version}</version>
-        </dependency>
-        <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib-full</artifactId>
             <version>${cglib_version}</version>
             <url>http://cglib.sf.net/</url>
         </dependency>
         <dependency>
-            <groupId>concurrent</groupId>
-            <artifactId>concurrent</artifactId>
-            <version>${concurrent_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>regexp</groupId>
-            <artifactId>regexp</artifactId>
-            <version>${regexp_version}</version>
-            <url>http://jakarta.apache.org/regexp</url>
-        </dependency>
-        <dependency>
-            <groupId>tranql</groupId>
-            <artifactId>tranql</artifactId>
-            <version>${tranql_version}</version>
-            <url>http://tranql.codehaus.org</url>
-        </dependency>
-        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>${log4j_version}</version>
@@ -327,7 +124,7 @@
                 <runtime>true</runtime>
             </properties>
         </dependency>
-
+<!--
         <dependency>
             <groupId>ant</groupId>
             <artifactId>ant</artifactId>
@@ -336,7 +133,7 @@
                 <module>true</module>
             </properties>
         </dependency>
-<!--
+
         <dependency>
             <groupId>openejb</groupId>
             <artifactId>openejb-core</artifactId>
@@ -361,33 +158,10 @@
     <!-- Build Specification -->
     <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
     <build>
-	 <sourceDirectory>src/java</sourceDirectory>
-	 <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-        <resources>
-            <resource>
-                <directory>src/test-resources</directory>
-                <includes>schema/**</includes>
-            </resource>
-        </resources>
-
         <unitTest>
             <includes>
-	            <include>**/**Test.java</include>
-                <include>**/SimplePOJO*Test.java</include>
+	        <include>**/**Test.java</include>
             </includes>
-            <excludes>
-				<!-- these are none testing classes need not to worry about -->
-                <exclude>**/*Abstract**.java</exclude> =20
-                <exclude>**/testUtils**</exclude>                         =
  =20
-
-				<!-- This one runs EWS, can run IFF the tools.jar avalible -->
-                <exclude>**/*EWS*Test.java</exclude>           =20
-
-				<!-- Those are the ones we need to worry about -->                    =
                     =20
-                <exclude>**/SimpleEJB*Test.java</exclude>           =20
-                <exclude>**/*Complex*Test.java</exclude>           =20
-                <exclude>**/Echo**</exclude>                              =
             =20
-            </excludes>
             <resources>
                 <resource>
                     <directory>${basedir}/src/test-resources</directory>

Modified: geronimo/trunk/modules/axis/src/test/org/apache/geronimo/axis/Axi=
sWebServiceContainerTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis/src/test/org=
/apache/geronimo/axis/AxisWebServiceContainerTest.java?view=3Ddiff&r1=3D157=
842&r2=3D157843
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- geronimo/trunk/modules/axis/src/test/org/apache/geronimo/axis/AxisWebSe=
rviceContainerTest.java (original)
+++ geronimo/trunk/modules/axis/src/test/org/apache/geronimo/axis/AxisWebSe=
rviceContainerTest.java Wed Mar 16 17:14:21 2005
@@ -49,7 +49,7 @@
     }
=20
     public void testInvokeSOAP() throws Exception {
-	if (true) return; // TODO Get test working
+
         ClassLoader cl =3D Thread.currentThread().getContextClassLoader();
         JavaServiceDesc serviceDesc =3D new JavaServiceDesc();
         serviceDesc.setEndpointURL("http://127.0.0.1:8080/axis/services/ec=
ho");