[jboss-cvs] JBossAS SVN: r62431 - in branches/Branch_4_2/testsuite: imports/config and 1 other directory.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Apr 19 16:54:01 EDT 2007


Author: rachmatowicz at jboss.com
Date: 2007-04-19 16:54:01 -0400 (Thu, 19 Apr 2007)
New Revision: 62431

Modified:
   branches/Branch_4_2/testsuite/build.xml
   branches/Branch_4_2/testsuite/imports/config/tests-jacc.xml
Log:
Changes required for JBAS-4286

Modified: branches/Branch_4_2/testsuite/build.xml
===================================================================
--- branches/Branch_4_2/testsuite/build.xml	2007-04-19 20:28:38 UTC (rev 62430)
+++ branches/Branch_4_2/testsuite/build.xml	2007-04-19 20:54:01 UTC (rev 62431)
@@ -1653,19 +1653,14 @@
 
     <!-- Replace the security manager classname -->
     <replace file="${jboss.dist}/server/custom-securitymgr/conf/jboss-service.xml">
-      <replacetoken><![CDATA[<attribute name="SecurityManagerClassName">org.jboss.security.plugins.JaasSecurityManager</attribute>]]>
-      </replacetoken>
-      <replacevalue><![CDATA[<attribute name="SecurityManagerClassName">org.jboss.test.security.test.CustomSecurityManager</attribute>]]>
-      </replacevalue>
+      <replacetoken><![CDATA[<attribute name="SecurityManagerClassName">org.jboss.security.plugins.JaasSecurityManager</attribute>]]></replacetoken>
+      <replacevalue><![CDATA[<attribute name="SecurityManagerClassName">org.jboss.test.security.test.CustomSecurityManager</attribute>]]></replacevalue>
     </replace>
     <server:start name="custom-securitymgr"/>
     <mkdir dir="${build.reports}"/>
     <mkdir dir="${build.testlog}"/>
-    <waitfor maxwait="60" maxwaitunit="second" checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout">
-      <http url="http://${node0}:8080/"/>
-    </waitfor>
-    <fail message="Timeout waiting for server to start" if="startup.timeout"/>
-    <property name="jbosstest.secure" value="true"/>
+
+	<property name="jbosstest.secure" value="true"/>
     <property name="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/>
     <propertyset id="security-tests-props">
       <propertyref prefix="java.security.auth"/>
@@ -1675,7 +1670,8 @@
     <param name="run-junit-config" value="custom-securitymgr"/>
     </antcall> -->
     <run-junit junit.patternset="custom-secmgr.includes" junit.configuration="tests-custom-securitymgr" junit.syspropertyset="jacc-tests-props"/>
-    <server:stop name="custom-securitymgr"/>
+
+	<server:stop name="custom-securitymgr"/>
   </target>
 
   <target name="x">

Modified: branches/Branch_4_2/testsuite/imports/config/tests-jacc.xml
===================================================================
--- branches/Branch_4_2/testsuite/imports/config/tests-jacc.xml	2007-04-19 20:28:38 UTC (rev 62430)
+++ branches/Branch_4_2/testsuite/imports/config/tests-jacc.xml	2007-04-19 20:54:01 UTC (rev 62431)
@@ -116,10 +116,7 @@
 
     <mkdir dir="${build.reports}"/>
     <mkdir dir="${build.testlog}"/>
-    <waitfor maxwait="60" maxwaitunit="second" checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout">
-      <http url="http://${node0}:8080/"/>
-    </waitfor>
-    <fail message="Timeout waiting for server to start" if="startup.timeout"/>
+
     <property name="jbosstest.secure" value="true"/>
     <property name="jboss.security.jacc" value="true"/>
     <property name="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/>
@@ -134,8 +131,7 @@
 
     <run-junit junit.patternset="jacc.includes" junit.configuration="JACC+SecurityMgr" junit.syspropertyset="jacc-tests-props"/>
 
-    <stop-jboss/>
-    <wait-on-shutdown conf="jacc-securitymgr"/>
+    <server:stop name="jacc-securitymgr"/>
   </target>
 
   <target name="tests-jacc-security-external"
@@ -178,28 +174,20 @@
     <copy todir="${jboss.dist}/server/jacc-security-external/lib" file="${build.lib}/jacc-securityconstraint.jar"/>
     <!-- Append extra attributes to the JACCAuthorizationRealm -->
     <replace file="${jboss.dist}/server/jacc-security-external/deploy/jboss-web.deployer/server.xml">
-      <replacetoken><![CDATA[className="org.jboss.web.tomcat.security.JaccAuthorizationRealm"]]>
-      </replacetoken>
-      <replacevalue>
-        <![CDATA[className="org.jboss.web.tomcat.security.JaccAuthorizationRealm" unprotectedResourceDelegation="true" securityConstraintProviderClass="org.jboss.test.security.test.CustomSecurityConstraintProvider" ]]>
-      </replacevalue>
+      <replacetoken><![CDATA[className="org.jboss.web.tomcat.security.JaccAuthorizationRealm"]]></replacetoken>
+      <replacevalue><![CDATA[className="org.jboss.web.tomcat.security.JaccAuthorizationRealm" unprotectedResourceDelegation="true" securityConstraintProviderClass="org.jboss.test.security.test.CustomSecurityConstraintProvider" ]]></replacevalue>
     </replace>
     <!-- Replace the policy provider with the test provider -->
     <replace file="${jboss.dist}/server/jacc-security-external/deploy/jacc-service.xml">
-      <replacetoken><![CDATA[org.jboss.security.jacc.DelegatingPolicy]]>
-      </replacetoken>
-      <replacevalue><![CDATA[org.jboss.test.jacc.test.external.TestExternalPolicyProvider]]>
-      </replacevalue>
+      <replacetoken><![CDATA[org.jboss.security.jacc.DelegatingPolicy]]></replacetoken>
+      <replacevalue><![CDATA[org.jboss.test.jacc.test.external.TestExternalPolicyProvider]]></replacevalue>
     </replace>
 
     <server:start name="jacc-security-external"/>
 
     <mkdir dir="${build.reports}"/>
     <mkdir dir="${build.testlog}"/>
-    <waitfor maxwait="60" maxwaitunit="second" checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout">
-      <http url="http://${node0}:8080/"/>
-    </waitfor>
-    <fail message="Timeout waiting for server to start" if="startup.timeout"/>
+
     <property name="jbosstest.secure" value="true"/>
     <property name="jboss.security.jacc" value="true"/>
     <property name="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/>
@@ -214,8 +202,7 @@
 
     <run-junit junit.patternset="jacc.external.includes" junit.configuration="jacc-security-external" junit.syspropertyset="jacc-tests-props"/>
 
-    <stop-jboss/>
-    <wait-on-shutdown conf="jacc-security-external"/>
+    <server:stop name="jacc-security-external"/>
   </target>
 
   <target name="tests-jacc-security-allstarrole"
@@ -258,21 +245,16 @@
     <copy todir="${jboss.dist}/server/jacc-security-allstarrole/lib" file="${build.lib}/jacc-allStarRolePolicyProvider.jar"/>
     <!-- Replace the policy provider with the test provider -->
     <replace file="${jboss.dist}/server/jacc-security-allstarrole/deploy/jacc-service.xml">
-      <replacetoken><![CDATA[code="org.jboss.security.jacc.DelegatingPolicy"]]>
-      </replacetoken>
-      <replacevalue><![CDATA[code="org.jboss.test.jacc.test.allstarrole.AllStarRoleJaccPolicy"]]>
-      </replacevalue>
+      <replacetoken><![CDATA[code="org.jboss.security.jacc.DelegatingPolicy"]]></replacetoken>
+      <replacevalue><![CDATA[code="org.jboss.test.jacc.test.allstarrole.AllStarRoleJaccPolicy"]]></replacevalue>
     </replace>
 
     <server:start name="jacc-security-allstarrole"/>
 
     <mkdir dir="${build.reports}"/>
     <mkdir dir="${build.testlog}"/>
-    <waitfor maxwait="60" maxwaitunit="second" checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout">
-      <http url="http://${node0}:8080/"/>
-    </waitfor>
-    <fail message="Timeout waiting for server to start" if="startup.timeout"/>
-    <property name="jbosstest.secure" value="true"/>
+
+  	<property name="jbosstest.secure" value="true"/>
     <property name="jboss.security.jacc" value="true"/>
     <property name="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/>
     <propertyset id="jacc-tests-props">
@@ -285,8 +267,8 @@
     </propertyset>
 
     <run-junit junit.patternset="jacc.allstarrole.includes" junit.configuration="jacc-security-allstarrole" junit.syspropertyset="jacc-tests-props"/>
-    <stop-jboss/>
-    <wait-on-shutdown conf="jacc-security-allstarrole"/>
+
+  	<server:stop name="jacc-security-allstarrole"/>
 </target>
 
 </project>




More information about the jboss-cvs-commits mailing list