geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
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
Date Thu, 17 Mar 2005 01:14:22 GMT
Author: dblevins
Date: Wed Mar 16 17:14:21 2005
New Revision: 157843

URL: http://svn.apache.org/viewcvs?view=rev&rev=157843
Log:
Cleaned up the project.xml to still include the geronimo-service.xml and not add test-resources
to the geronimo-axis archive.  Cleaned out old test data 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/AxisWebServiceContainerTest.java

Modified: geronimo/trunk/modules/axis/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis/project.xml?view=diff&r1=157842&r2=157843
==============================================================================
--- geronimo/trunk/modules/axis/project.xml (original)
+++ geronimo/trunk/modules/axis/project.xml Wed Mar 16 17:14:21 2005
@@ -38,175 +38,20 @@
     <!-- ============ -->
     <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 -->
     <!-- =================== -->
     <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>  
-                <exclude>**/testUtils**</exclude>                           

-
-				<!-- This one runs EWS, can run IFF the tools.jar avalible -->
-                <exclude>**/*EWS*Test.java</exclude>            
-
-				<!-- Those are the ones we need to worry about -->                            
             
-                <exclude>**/SimpleEJB*Test.java</exclude>            
-                <exclude>**/*Complex*Test.java</exclude>            
-                <exclude>**/Echo**</exclude>                                
           
-            </excludes>
             <resources>
                 <resource>
                     <directory>${basedir}/src/test-resources</directory>

Modified: geronimo/trunk/modules/axis/src/test/org/apache/geronimo/axis/AxisWebServiceContainerTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis/src/test/org/apache/geronimo/axis/AxisWebServiceContainerTest.java?view=diff&r1=157842&r2=157843
==============================================================================
--- geronimo/trunk/modules/axis/src/test/org/apache/geronimo/axis/AxisWebServiceContainerTest.java
(original)
+++ geronimo/trunk/modules/axis/src/test/org/apache/geronimo/axis/AxisWebServiceContainerTest.java
Wed Mar 16 17:14:21 2005
@@ -49,7 +49,7 @@
     }
 
     public void testInvokeSOAP() throws Exception {
-	if (true) return; // TODO Get test working
+
         ClassLoader cl = Thread.currentThread().getContextClassLoader();
         JavaServiceDesc serviceDesc = new JavaServiceDesc();
         serviceDesc.setEndpointURL("http://127.0.0.1:8080/axis/services/echo");



Mime
View raw message