[jboss-cvs] JBossAS SVN: r64728 - in trunk/testsuite: imports and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-08-21 07:07:05 -0400 (Tue, 21 Aug 2007)
New Revision: 64728

Modified:
   trunk/testsuite/build.xml
   trunk/testsuite/imports/server-config.xml
Log:
[JBAS-4092] Clean up the tests-webservice-ssl target

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2007-08-21 03:51:05 UTC (rev 64727)
+++ trunk/testsuite/build.xml	2007-08-21 11:07:05 UTC (rev 64728)
@@ -754,14 +754,6 @@
    <patternset id="tomcat.webctx.includes">
       <include name="org/jboss/test/web/test/WebCtxLoaderTestCase.class"/>
    </patternset>
-  <!-- Webservice SSL Tests -->
-  <patternset id="webservice-ssl.includes">
-    <include name="org/jboss/test/webservice/secure/**/*TestCase.class"/>
-    <exclude name="org/jboss/test/webservice/secure/noenv/**/*TestCase.class"/>
-  </patternset>
-  <patternset id="webservice-ssl.noenv.includes">
-    <include name="org/jboss/test/webservice/secure/noenv/**/*TestCase.class"/>
-  </patternset>
   <patternset id="dtm.excludes">
      <exclude name="org/jboss/test/dtm/**"/>
   </patternset>
@@ -864,7 +856,6 @@
       <antcall target="tests-security-jaspi-unit"/>
 -->
       <antcall target="tests-compatibility"/>
-      <antcall target="tests-webservice-ssl"/>
       <antcall target="tests-aop-scoped"/>
       <antcall target="tests-classloader-leak"/>
       <antcall target="tests-report"/>
@@ -2718,36 +2709,6 @@
       </junit>
    </target>
 
-
-  <target name="tests-webservice-ssl"
-    description="Tomcat tests requiring an SSL connector">
-    <!-- Create the ssl enabled tomcat config -->
-    <create-config baseconf="default" newconf="webservice-ssl">
-      <patternset>
-        <include name="**/*"/>
-      </patternset>
-    </create-config>
-	<server:start name="webservice-ssl"/>
-     <!-- Specify the JSSE properties -->
-     <property name="javax.net.ssl.keyStore"
-        value="${build.resources}/test-configs/webservice-ssl/conf/client.keystore"/>
-     <property name="javax.net.ssl.keyStorePassword" value="unit-tests-client"/>
-     <property name="javax.net.ssl.trustStore"
-        value="${build.resources}/test-configs/webservice-ssl/conf/client.keystore"/>
-     <property name="javax.net.ssl.trustStorePassword" value="unit-tests-client"/>
-     <property name="rootDir" value="${build.resources}"/>
-     <propertyset id="tests-webservice-ssl-props">
-        <propertyref prefix="javax.net.ssl"/>
-        <propertyref name="rootDir"/>
-     </propertyset>
-     <run-junit junit.patternset="webservice-ssl.includes"
-        junit.syspropertyset="tests-webservice-ssl-props"
-	junit.configuration="tests-webservice-ssl" />
-     <run-junit junit.patternset="webservice-ssl.noenv.includes"
-	junit.configuration="webservice-ssl" />
-     <server:stop name="webservice-ssl"/>
-  </target>
-
    <!--
     | Standard jaxr tests that should run successfully against a
     | JBoss server distribution build that contains jaxr.

Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml	2007-08-21 03:51:05 UTC (rev 64727)
+++ trunk/testsuite/imports/server-config.xml	2007-08-21 11:07:05 UTC (rev 64728)
@@ -599,9 +599,6 @@
       </server>
       <server name="jrmp-invoker" host="${node0}"/>
       <server name="minimal" host="${node0}" hasWebServer="false"/>
-      <server name="webservice-ssl" host="${node0}">
-         <jvmarg value="-Xmx128m" />         
-      </server>
       <server name="deployment-service" host="${node0}"/>
       <server name="jbpm-bpel" host="${node0}">
          <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />