[jboss-cvs] JBossAS SVN: r70484 - in branches/JBPAPP_4_2_0_GA_CP/testsuite: src/resources/test-configs and 1 other directory.

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

Author: mmalina at redhat.com
Date: 2008-03-06 10:24:43 -0500 (Thu, 06 Mar 2008)
New Revision: 70484

Removed:
   branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/test-configs/webservice-ssl/
Modified:
   branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml
Log:
JBPAPP-654 Removing the tests-webservice-ssl target as it actually doesn't run any test cases - the patern sets return zero test case classes.

Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml	2008-03-06 14:06:03 UTC (rev 70483)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml	2008-03-06 15:24:43 UTC (rev 70484)
@@ -652,15 +652,7 @@
     <include name="org/jboss/test/web/test/WebCtxLoaderTestCase.class"/>
     <include name="org/jboss/test/web/test/MultipleTomcatServicesTestCase.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>
-  <!-- Tests needing IIOP setup -->
+ <!-- Tests needing IIOP setup -->
   <patternset id="iiop.includes">
     <include name="org/jboss/test/*iiop/test/*TestCase.class"/>
     <exclude name="org/jboss/test/txiiop/test/*TestCase.class"/>
@@ -832,7 +824,6 @@
     <antcall target="tests-jacc-security-external"/>
     <antcall target="tests-custom-securitymgr"/>
     <antcall target="tests-compatibility"/>
-    <antcall target="tests-webservice-ssl"/>
     <antcall target="tests-unified"/>
     <antcall target="tests-aop-scoped"/>
     <antcall target="tests-classloader-leak"/>
@@ -2489,39 +2480,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="conf/**"/>
-          <include name="deploy/**"/>
-          <include name="lib/**"/>
-       </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}"/>
-    <property name="org.jboss.security.ignoreHttpsHost" value="true"/>
-
-    <propertyset id="tests-webservice-ssl-props">
-      <propertyref prefix="javax.net.ssl"/>
-      <propertyref prefix="org.jboss.security"/>
-      <propertyref name="rootDir"/>
-    </propertyset>
-    <!-- No javax.net.ssl.* props, but we need ignoreHost -->
-    <propertyset id="tests-webservice-ssl-noenv-props">
-      <propertyref prefix="org.jboss.security"/>
-      <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.syspropertyset="tests-webservice-ssl-noenv-props" junit.configuration="webservice-ssl"/>
-    <server:stop name="webservice-ssl"/>
-  </target>
-
    <!-- The scoped AOP tests need a classloader hook -->
    <target name="tests-aop-scoped"
       description="AOP tests requiring a native classloader hook"