[jboss-cvs] JBossAS SVN: r64729 - in branches/Branch_4_4/testsuite: imports and 1 other directory.

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

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

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

Modified: branches/Branch_4_4/testsuite/build.xml
===================================================================
--- branches/Branch_4_4/testsuite/build.xml	2007-08-21 11:07:05 UTC (rev 64728)
+++ branches/Branch_4_4/testsuite/build.xml	2007-08-21 11:20:31 UTC (rev 64729)
@@ -640,14 +640,6 @@
     <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 -->
   <patternset id="iiop.includes">
     <include name="org/jboss/test/*iiop/test/*TestCase.class"/>
@@ -815,7 +807,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"/>
@@ -2305,37 +2296,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}"/>
-    <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"

Modified: branches/Branch_4_4/testsuite/imports/server-config.xml
===================================================================
--- branches/Branch_4_4/testsuite/imports/server-config.xml	2007-08-21 11:07:05 UTC (rev 64728)
+++ branches/Branch_4_4/testsuite/imports/server-config.xml	2007-08-21 11:20:31 UTC (rev 64729)
@@ -294,7 +294,6 @@
       </server>
     <server name="jrmp-invoker" host="${node0}"/>
     <server name="minimal" host="${node0}" hasWebServer="false"/>
-    <server name="webservice-ssl" host="${node0}"/>
     <server name="deployment-service" host="${node0}"/>
     <server name="classloader-leak" host="${node0}">
        <jvmarg value="${jpda.cmdline}" />