[jboss-cvs] JBossAS SVN: r108488 - in branches/JBPAPP_5_1/testsuite: imports and 16 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Oct 8 07:45:55 EDT 2010


Author: pskopek at redhat.com
Date: 2010-10-08 07:45:55 -0400 (Fri, 08 Oct 2010)
New Revision: 108488

Added:
   branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/security/test/authorization/secured/HttpRequestAdminConsoleAuthenticationUnitTestCase.java
   branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/
   branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/
   branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/ROOT.war/
   branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/ROOT.war/WEB-INF/
   branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/ROOT.war/WEB-INF/jboss-web.xml
   branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/ROOT.war/WEB-INF/web.xml
   branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/jbossws.sar/
   branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/jbossws.sar/jbossws-management.war/
   branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/jbossws.sar/jbossws-management.war/WEB-INF/
   branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/jbossws.sar/jbossws-management.war/WEB-INF/jboss-web.xml
   branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml
   branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/jmx-console.war/
   branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/jmx-console.war/WEB-INF/
   branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/jmx-console.war/WEB-INF/jboss-web.xml
   branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/jmx-console.war/WEB-INF/web.xml
   branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/management/
   branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/management/console-mgr.sar/
   branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/management/console-mgr.sar/web-console.war/
   branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/management/console-mgr.sar/web-console.war/WEB-INF/
   branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/management/console-mgr.sar/web-console.war/WEB-INF/jboss-web.xml
   branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml
Modified:
   branches/JBPAPP_5_1/testsuite/build.xml
   branches/JBPAPP_5_1/testsuite/imports/server-config.xml
   branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/security/test/authorization/secured/AbstractHttpAuthenticationUnitTest.java
   branches/JBPAPP_5_1/testsuite/src/resources/cc/testCaseMapping_2.0.xml
   branches/JBPAPP_5_1/testsuite/src/resources/cc/tsfi_master_data.txt
Log:
CC: Test to check is admin-console is secured.

Modified: branches/JBPAPP_5_1/testsuite/build.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/build.xml	2010-10-08 11:26:08 UTC (rev 108487)
+++ branches/JBPAPP_5_1/testsuite/build.xml	2010-10-08 11:45:55 UTC (rev 108488)
@@ -1891,8 +1891,6 @@
               were imported to ssl.truststore -->    
          <sysproperty key="javax.net.ssl.trustStore" value="${build.resources}/test-configs/cc/ssl.truststore" />
          <sysproperty key="javax.net.ssl.trustStorePassword" value="123456" />
-         <!-- sysproperty key="javax.net.ssl.trustStore" value="${build.resources}/test-configs/tomcat-ssl/conf/client.keystore" />
-         <sysproperty key="javax.net.ssl.trustStorePassword" value="unit-tests-client" / -->
          <sysproperty key="javax.net.ssl.keyStore" value="${build.resources}/test-configs/tomcat-ssl/conf/client.keystore" />
          <sysproperty key="javax.net.ssl.keyStorePassword" value="unit-tests-client" />
          
@@ -1924,9 +1922,9 @@
                <!-- <exclude name="org/jboss/test/securitymgr/test/PolicyUnitTestCase.class" /> -->
                <!-- include name="org/jboss/test/security/test/EJB3SpecUnitTestCase.class"/ -->
                <!-- include name="org/jboss/test/security/test/EJBSpecUnitTestCase.class"/ -->
-               
+
                <include name="org/jboss/test/security/test/EJB3SpecUnitTestCase.class"/>
-               <include name="org/jboss/test/security/test/EJBSpecUnitTestCase.class"/>
+               <!-- include name="org/jboss/test/security/test/EJBSpecUnitTestCase.class"/>
                <include name="**/test/tm/test/TxTimeout*TestCase.class"/>
                <include name="org/jboss/test/security/test/CallerInfoUnitTestCase.class"/>
                <include name="org.jboss.test.deployers.web.test.WEBDeploymentUnitTestCase.class"/>
@@ -1974,19 +1972,20 @@
 
                <include name="org/jboss/test/ejb3/jbpapp2473/unit/RunAsUnitTestCase.class"/>
 
-               <include name="org/jboss/test/aop/test/SecurityUnitTestCase.class"/>
+               <include name="org/jboss/test/aop/test/SecurityUnitTestCase.class"/ -->
 
             </fileset>
          </batchtest>
       </junit>
 
-      <antcall target="cc-tests-ws"/>
+      <!-- antcall target="cc-tests-ws"/ -->
       
       <echo>Waiting for server to shutdown...</echo>
       <server:stop name="cc"/>
 
+      <antcall target="cc-tests-secured"/>
       
-      <antcall target="cc-tests-cluster"/>
+      <!-- antcall target="cc-tests-cluster"/ -->
       
       <!-- TS crach-recovery with JMS -->
       <!-- include name="org/jboss/test/jbossts/ASCrashRecovery01/TestWithJPA.class"/>
@@ -1994,13 +1993,88 @@
       <include name="org/jboss/test/jbossts/ASCrashRecovery02/TestWithJMS.class"/ -->
       <!-- antcall target="tests-ts-crash-recovery-jms"/ -->
      
-      <antcall target="tests-cc-audit"/>
+      <!-- antcall target="tests-cc-audit"/ -->
       
       <antcall target="calculate-md5"/>
       <antcall target="tests-report"/>
 
    </target>
 
+  <target name="cc-tests-secured" description="Tests run against secured configuration">
+
+     <create-config baseconf="cc" newconf="cc-secured">
+        <patternset>
+           <include name="conf/**" />
+           <include name="deployers/**" />
+           <include name="deploy/**" />
+           <include name="deploy-hasingleton/**" />
+           <include name="farm/**" />
+           <include name="lib/**" />
+           <include name="cc.*"/>
+           <include name="ssl.*"/>
+        </patternset>
+     </create-config>
+
+
+     <server:start name="cc-secured" />
+
+
+     <junit dir="${module.output}" printsummary="true" haltonerror="false" haltonfailure="false" fork="true" timeout="${junit.timeout}" jvm="${junit.jvm}">
+
+        <jvmarg line="${junit.jvm.options}" />
+
+        <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}" />
+        <sysproperty key="jbosstest.server.host" value="${node0}" />
+        <sysproperty key="jboss.home" file="${project.root}" />
+        <sysproperty key="jboss.thirdparty.dir" file="${project.root}/thirdparty" />
+        <sysproperty key="jboss.tools.dir" file="${project.root}/tools" />
+        <sysproperty key="jbosstest.deploy.dir" file="${build.lib}" />
+        <sysproperty key="jbosstest.secure" value="true" />
+        <sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf" />
+        <sysproperty key="build.testlog" value="${build.testlog}" />
+        <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml" />
+
+        <!-- all entries from ${build.resources}/test-configs/tomcat-ssl/conf/client.keystore 
+             were imported to ssl.truststore -->    
+        <sysproperty key="javax.net.ssl.trustStore" value="${build.resources}/test-configs/cc/ssl.truststore" />
+        <sysproperty key="javax.net.ssl.trustStorePassword" value="123456" />
+        <sysproperty key="javax.net.ssl.keyStore" value="${build.resources}/test-configs/tomcat-ssl/conf/client.keystore" />
+        <sysproperty key="javax.net.ssl.keyStorePassword" value="unit-tests-client" />
+        
+        <!-- tomcat-ssl tests -->
+        <sysproperty key="web.port" value="8081" />
+        <sysproperty key="secureweb.port" value="8443" />
+        <!-- RMI over http/s tests -->
+        <sysproperty key="rmi.over.web.port" value="8080" />
+        <sysproperty key="rmi.over.secureweb.port" value="8445" />
+        
+        <sysproperty key="java.protocol.handler.pkgs" value="javax.net.ssl" />
+        
+        <classpath>
+           <pathelement location="${build.resources}" />
+           <pathelement location="${build.resources}/security" />
+           <pathelement location="${build.classes}" />
+           <path refid="tests.classpath" />
+        </classpath>
+
+        <sysproperty key="jboss-junit-configuration" value="tests-security-manager" />
+        <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-tests-security-manager.xml" />
+
+        <batchtest todir="${build.reports}" haltonerror="false" haltonfailure="false" fork="true">
+           <fileset dir="${build.classes}">
+              <include name="org/jboss/test/security/test/authorization/secured/*TestCase.class"/>
+           </fileset>
+        </batchtest>
+     </junit>
+
+     <!-- antcall target="cc-tests-ws"/ -->
+     
+     <echo>Waiting for server to shutdown...</echo>
+     <server:stop name="cc-secured"/>
+
+  </target>
+   
+   
   <target name="cc-tests-cluster" description="Clustering tests for CC">
 
     <delete dir="${jboss.dist}${/}server${/}cluster-*" quiet="true"/>      
@@ -2134,6 +2208,8 @@
 	
 	  <fileset dir="${build.classes}">
          <include name="**/test/security/audit/test/SecurityAuditTestCase.class"/>
+         <!-- include name="**/test/scripts/test/RunTestCase.class"/>
+         <include name="**/test/scripts/test/ShutdownTestCase.class"/ -->
 	  </fileset>
       </batchtest>
     </junit>

Modified: branches/JBPAPP_5_1/testsuite/imports/server-config.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/imports/server-config.xml	2010-10-08 11:26:08 UTC (rev 108487)
+++ branches/JBPAPP_5_1/testsuite/imports/server-config.xml	2010-10-08 11:45:55 UTC (rev 108488)
@@ -256,6 +256,25 @@
          <sysproperty key="xb.builder.useUnorderedSequence" value="true" />
          <sysproperty key="jboss.server.log.threshold" value="${jboss.server.log.threshold}" />
       </server>
+      <server name="cc-secured" config="cc-secured" host="${node0}">
+         <jvmarg value="${jpda.cmdline}" />
+         <jvmarg value="-Xms1024m" />
+         <jvmarg value="-Xmx1024m" />
+         <jvmarg value="-XX:MaxPermSize=512m" />
+         <jvmarg value="-XX:-UseGCOverheadLimit" />
+         <jvmarg value="-Djboss.home.dir=${jboss.dist}" />
+         <jvmarg value="-Djboss.server.home.dir=${jboss.dist}${/}server${/}cc-secured" />
+         <jvmarg value="-Djboss.test.deploy.dir=${jboss.test.deploy.dir}" />
+         <jvmarg value="-Djava.security.manager"/>
+         <jvmarg value="-Djava.security.policy==${jboss.test.resources.dir}/cc/cc.policy"/>
+         <jvmarg value="-D${cc.java.security.debug}=access,failure"/> 
+         <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.handlers.stub"/>
+
+         <sysproperty key="java.net.preferIPv4Stack" value="true" />
+         <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
+         <sysproperty key="xb.builder.useUnorderedSequence" value="true" />
+         <sysproperty key="jboss.server.log.threshold" value="${jboss.server.log.threshold}" />
+      </server>
       <server name="cc-cluster-0" host="${node0}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx1024m" />

Modified: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/security/test/authorization/secured/AbstractHttpAuthenticationUnitTest.java
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/security/test/authorization/secured/AbstractHttpAuthenticationUnitTest.java	2010-10-08 11:26:08 UTC (rev 108487)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/security/test/authorization/secured/AbstractHttpAuthenticationUnitTest.java	2010-10-08 11:45:55 UTC (rev 108488)
@@ -19,14 +19,14 @@
 public abstract class AbstractHttpAuthenticationUnitTest extends JBossTestCase {
 	
 	private URL u;
-	private HttpURLConnection con;
-	private static final String GET = "GET";
-	private static final String POST = "POST";
-	private static final String HEAD = "HEAD";
-	private static final String OPTIONS = "OPTIONS";
-	private static final String PUT = "PUT";
-	private static final String DELETE = "DELETE";
-	private static final String TRACE = "TRACE"; 
+	protected HttpURLConnection con;
+	protected static final String GET = "GET";
+	protected static final String POST = "POST";
+	protected static final String HEAD = "HEAD";
+	protected static final String OPTIONS = "OPTIONS";
+	protected static final String PUT = "PUT";
+	protected static final String DELETE = "DELETE";
+	protected static final String TRACE = "TRACE"; 
 	
 	public AbstractHttpAuthenticationUnitTest(String name){
 		super(name);

Added: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/security/test/authorization/secured/HttpRequestAdminConsoleAuthenticationUnitTestCase.java
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/security/test/authorization/secured/HttpRequestAdminConsoleAuthenticationUnitTestCase.java	                        (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/security/test/authorization/secured/HttpRequestAdminConsoleAuthenticationUnitTestCase.java	2010-10-08 11:45:55 UTC (rev 108488)
@@ -0,0 +1,134 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.security.test.authorization.secured;
+
+import java.io.BufferedInputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+/**
+ * Test verifies that there is no admin-console security baypass in secured profiles.
+ * @author <a href="mailto:pskopekf at redhat.com">Peter Skopek</a>
+ * @version $Revision: $
+ */
+public class HttpRequestAdminConsoleAuthenticationUnitTestCase extends
+		AbstractHttpAuthenticationUnitTest {
+
+	public HttpRequestAdminConsoleAuthenticationUnitTestCase(String name) {
+        super(name);
+    }
+
+	private String getPage(HttpURLConnection con) throws Exception {
+		BufferedInputStream is = new BufferedInputStream(con.getInputStream());
+		int ch;
+		StringBuffer sb = new StringBuffer();
+		while ((ch = is.read()) != -1 ) {
+			sb.append((char)ch);
+		}
+		String page = sb.toString();
+		log.debug("page"+page);
+		return page;
+	}
+	
+	
+	private void checkIsLoginPage(String requestMethod) throws Exception {
+		con.setRequestMethod(requestMethod);
+		con.connect();			
+
+		assertTrue("Has to be login page", isLoginPage(getPage(con)));
+		
+	}
+	
+	
+	public void testGet() throws Exception {
+		checkIsLoginPage(GET);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.jboss.test.security.test.authorization.secured.AbstractHttpAuthenticationUnitTest#getURL()
+	 */
+	@Override
+	protected URL getURL() throws MalformedURLException {
+		// http://localhost:8080/admin-console/secure/summary.seam
+        return new URL("http://" + getServerHost() + ":8080/admin-console/secure/summary.seam");
+	}
+	
+	private boolean isLoginPage(String page) {
+		boolean isLoginPage = page.indexOf("login_form") != -1;
+		isLoginPage = isLoginPage && page.indexOf("login.seam") != -1;
+		isLoginPage = isLoginPage && page.indexOf("login_form:submit") != -1;
+		isLoginPage = isLoginPage && page.indexOf("login_form:password") != -1;
+
+		return isLoginPage;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.jboss.test.security.test.authorization.secured.AbstractHttpAuthenticationUnitTest#testDelete()
+	 */
+	@Override
+	public void testDelete() throws Exception {
+		checkIsLoginPage(DELETE);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.jboss.test.security.test.authorization.secured.AbstractHttpAuthenticationUnitTest#testHead()
+	 */
+	@Override
+	public void testHead() throws Exception {
+
+		// cannot get better information to distinguish non secured page
+		
+		con.setRequestMethod(HEAD);
+		con.connect();			
+
+		assertEquals(HttpURLConnection.HTTP_OK, con.getResponseCode());
+		assertTrue("Has to return empty page", getPage(con).equals(""));
+		
+	}
+
+	/* (non-Javadoc)
+	 * @see org.jboss.test.security.test.authorization.secured.AbstractHttpAuthenticationUnitTest#testOptions()
+	 */
+	@Override
+	public void testOptions() throws Exception {
+		checkIsLoginPage(OPTIONS);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.jboss.test.security.test.authorization.secured.AbstractHttpAuthenticationUnitTest#testPost()
+	 */
+	@Override
+	public void testPost() throws Exception {
+		checkIsLoginPage(POST);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.jboss.test.security.test.authorization.secured.AbstractHttpAuthenticationUnitTest#testPut()
+	 */
+	@Override
+	public void testPut() throws Exception {
+		checkIsLoginPage(PUT);
+	}
+
+
+}

Modified: branches/JBPAPP_5_1/testsuite/src/resources/cc/testCaseMapping_2.0.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/cc/testCaseMapping_2.0.xml	2010-10-08 11:26:08 UTC (rev 108487)
+++ branches/JBPAPP_5_1/testsuite/src/resources/cc/testCaseMapping_2.0.xml	2010-10-08 11:45:55 UTC (rev 108488)
@@ -101,31 +101,25 @@
       <desc></desc>
       <test name="testRole1">
         <desc></desc>
-        <TSFI></TSFI>
+        <TSFI>tsfi.ann.SecurityDomain</TSFI>
       </test>
       <test name="testRole2">
         <desc></desc>
         <TSFI>tsfi.ann.RunAsPrincipal</TSFI>
+        <TSFI>tsfi.ann.SecurityDomain</TSFI>
       </test>
       <test name="testRunAsManager">
         <desc></desc>
-        <TSFI></TSFI>
+        <TSFI>tsfi.ann.SecurityDomain</TSFI>
       </test>
       <test name="testRunAsPrincipal">
         <desc></desc>
         <TSFI>tsfi.ann.RunAsPrincipal</TSFI>
+        <TSFI>tsfi.ann.SecurityDomain</TSFI>
       </test>
     </testCase>
     <testCase name="org.jboss.test.security.test.EJBSpecUnitTestCase">
       <desc>Test of EJB spec conformace using the security-spec.jar deployment unit. These test the basic role based access model.</desc>
-      <test name="testSecurityDomain">
-        <desc>Test Objective: Validate that the users have the expected logins and roles.
-                               Tests following if user has correct password, correct role, user cannot call method using bad password.
-                               Tests same cases for use with different security domain.
-              Expected Result: All assertions after call has to be fulfilled and there is no exception thrown during execution. 
-        </desc>
-        <TSFI>tsfi.jmx.rmi</TSFI>
-      </test>
       <test name="testStatefulCreateCaller">
         <desc>Test Objective: Test the use of getCallerPrincipal from within the ejbCreate in a stateful session bean.
               Expected Result: Finish the test without exceptions indicating successful use of getCallerPrincipal. 
@@ -268,7 +262,6 @@
         <desc>Test Objective: Test that an MDB with a run-as identity is able to access secure EJBs that require the identity.
               Expected Result: Message sent to QueueA has to come through to QueueB with not set to Failed.
         </desc>
-        <TSFI>tsfi.jms</TSFI>
         <TSFI>tsfi.port.rmi.jrmp</TSFI>
       </test>
       <test name="testMDBDeepRunAs">
@@ -279,7 +272,6 @@
                               and Level3CalleeBean are only accessible by InternalRole.
               Expected Result: Message sent to QueueD has to come through to QueueB with not set to Failed.
         </desc>
-        <TSFI>tsfi.jms</TSFI>
         <TSFI>tsfi.port.rmi.jrmp</TSFI>
       </test>
       <test name="testRunAsWithRoles">
@@ -288,7 +280,6 @@
                               bean's methods that required ProjectAdmin, CreateFolder and DeleteFolder roles.
               Expected Result: Message sent to QueueD has to come through to QueueB with not set to Failed.
         </desc>
-        <TSFI>tsfi.jms</TSFI>
         <TSFI>tsfi.port.rmi.jrmp</TSFI>
       </test>
       <test name="testHandle">
@@ -314,7 +305,7 @@
         <desc>Test Objective: Stress test declarative security with the JAAS cache disabled. Using testStress test.
               Expected Result: Test has to finish without any exception.
         </desc>
-        <TSFI>tsfi.jmx.rmi</TSFI>
+        <TSFI>tsfi.port.rmi.jrmp</TSFI>
       </test>
     </testCase>
     <testCase name="org.jboss.test.security.test.LoginContextUnitTestCase">
@@ -513,6 +504,8 @@
               Expected result: Calls have to pass without any exception.
         </desc>
         <TSFI>tsfi.port.rmi.jrmp</TSFI>
+        <TSFI>tsfi.cfg.conf.props.jmx-console-users.properties</TSFI>
+        <TSFI>tsfi.cfg.conf.props.jmx-console-roles.properties</TSFI>
       </test>
       <test name="testUnAuthorizedAccess">
         <desc>Test objective:  Test unauthorized access.
@@ -543,6 +536,7 @@
               Expected result: Test has to pass without any exception.
         </desc>
         <TSFI>tsfi.port.web.https</TSFI>
+        <TSFI>tsfi.cfg.conf.login-config.xml</TSFI>
      </test>
     </testCase>
     
@@ -556,6 +550,7 @@
               Expected resutl: Assertion to correctenss of return value has to be fulfilled.
         </desc>
         <TSFI>tsfi.port.rmi.jrmp</TSFI>
+        <TSFI>tsfi.cfg.conf.login-config.xml</TSFI>
      </test>
     </testCase>
     <testCase name="org.jboss.test.security.test.ClientLoginModuleUnitTestCase">
@@ -577,6 +572,7 @@
               Expected result: All assertions has to be fulfilled.
         </desc>
         <TSFI>tsfi.port.rmi.jrmp</TSFI>
+        <TSFI>tsfi.cfg.conf.login-config.xml</TSFI>
      </test>
       <test name="testMultiThreaded">
         <desc>Test objective:  Test mutithreaded login using two threads.
@@ -589,6 +585,7 @@
               Expected result: All assertions has to be fulfilled.
         </desc>
         <TSFI>tsfi.port.rmi.jrmp</TSFI>
+        <TSFI>tsfi.cfg.conf.login-config.xml</TSFI>
      </test>
     </testCase>
     <testCase name="org.jboss.test.security.test.CustomPrincipalPropagationUnitTestCase">
@@ -952,24 +949,28 @@
               Expected result: URL has to be accessible (pass without exception).
         </desc>
         <TSFI>tsfi.port.web.http</TSFI>
+        <TSFI>tsfi.cfg.conf.login-config.xml</TSFI>
       </test>
       <test name="testSecureServlet">
         <desc>Test objective: Access the http://{host}/jbosstest/restricted/SecureServlet
               Expected result: URL has to be accessible (pass without exception).
         </desc>
         <TSFI>tsfi.port.web.http</TSFI>
+        <TSFI>tsfi.cfg.conf.login-config.xml</TSFI>
       </test>
       <test name="testSecureServlet2">
         <desc>Test objective: Access the http://{host}/jbosstest/restricted2/SecureServlet.
               Expected result: URL has to be accessible (pass without exception).
         </desc>
         <TSFI>tsfi.port.web.http</TSFI>
+        <TSFI>tsfi.cfg.conf.login-config.xml</TSFI>
       </test>
       <test name="testSubjectServlet">
         <desc>Test objective:  Access the http://{host}/jbosstest/restricted/SubjectServlet.
               Expected result: URL has to be accessible (pass without exception).
         </desc>
         <TSFI>tsfi.port.web.http</TSFI>
+        <TSFI>tsfi.cfg.conf.login-config.xml</TSFI>
       </test>
       <test name="testSecureServletAndUnsecureAccess">
         <desc>Test objecive:  Access the http://{host}/jbosstest/restricted/SecureServlet
@@ -982,6 +983,7 @@
               Expected result: URL cannot be accessible.
         </desc>
         <TSFI>tsfi.port.web.http</TSFI>
+        <TSFI>tsfi.cfg.conf.login-config.xml</TSFI>
       </test>
       <test name="testSecureServletWithNoLogin">
         <desc>Test objective:  Access the http://{host}/jbosstest/restricted/SecureServlet
@@ -1013,6 +1015,7 @@
               Expected result: URL has to be accessible (pass without exception).
         </desc>
         <TSFI>tsfi.port.web.http</TSFI>
+        <TSFI>tsfi.cfg.conf.login-config.xml</TSFI>
       </test>
       <test name="testUnsecureEJBAccess">
         <desc>Test objective:  Access the http://{host}/jbosstest/UnsecureEJBAccess with method=echo
@@ -1224,27 +1227,32 @@
               Expected result: Test has to pass without exception which means access was granted.
         </desc>
         <TSFI>tsfi.port.rmi.jrmp</TSFI>
+        <TSFI>tsfi.cfg.conf.props.jmx-console-users.properties</TSFI>
+        <TSFI>tsfi.cfg.conf.props.jmx-console-roles.properties</TSFI>
       </test>
       <test name="testUnauthenticatedAccess">
         <desc>Test objective:  Test that a valid jmx-console domain user can NOT invoke operations
                                through the jmx/invoker/AuthenticatedRMIAdaptor
               Expected result: Call to getAttribute should fail and exception has to be caught.
         </desc>
-        <TSFI>tsfi.jmx.rmi</TSFI>
+        <TSFI>tsfi.cfg.conf.props.jmx-console-users.properties</TSFI>
+        <TSFI>tsfi.cfg.conf.props.jmx-console-roles.properties</TSFI>
       </test>
       <test name="testAuthorizedAccess">
         <desc>Test objective:  Test that a valid jmx-console domain user can invoke operations
                                through the jmx/invoker/AuthenticatedRMIAdaptor.
               Expected result: Test has to pass without exception which means authorization to call operations was granted.
         </desc>
-        <TSFI>tsfi.jmx.rmi</TSFI>
+        <TSFI>tsfi.cfg.conf.props.jmx-console-users.properties</TSFI>
+        <TSFI>tsfi.cfg.conf.props.jmx-console-roles.properties</TSFI>
       </test>
       <test name="testUnauthorizedAccess">
         <desc>Test objective:  Test that a valid jmx-console domain user can NOT invoke operations
                                through the jmx/invoker/AuthenticatedRMIAdaptor
               Expected result: Call to getAttribute should fail and exception has to be caught.
         </desc>
-        <TSFI>tsfi.jmx.rmi</TSFI>
+        <TSFI>tsfi.cfg.conf.props.jmx-console-users.properties</TSFI>
+        <TSFI>tsfi.cfg.conf.props.jmx-console-roles.properties</TSFI>
       </test>
     </testCase>    
     <testCase name="org.jboss.test.security.rmi.test.RMIOverHttpsTestCase">
@@ -1254,12 +1262,16 @@
 	              Expected resutl: Test has to pass without any exception. Which means all calls return expected values.
     		</desc>
     		<TSFI>tsfi.port.rmi.https</TSFI>
+    		<TSFI>tsfi.cfg.hi.jboss-web.xml</TSFI>
+    		<TSFI>tsfi.cfg.hi.web.xml</TSFI>
     	</test>
     	<test name="testCallingEJB3OverHttp">
     		<desc>Test objective:  To test calls to EJB3 over HTTP transport protocol.
 	              Expected resutl: Test has to pass without any exception. Which means all calls return expected values.
     		</desc>
     		<TSFI>tsfi.port.rmi.http</TSFI>
+    		<TSFI>tsfi.cfg.hi.jboss-web.xml</TSFI>
+    		<TSFI>tsfi.cfg.hi.web.xml</TSFI>
     	</test>
     </testCase>
     <testCase name="org.jboss.test.naming.test.SecurityUnitTestCase">
@@ -1306,7 +1318,8 @@
         <desc>Test objective:  
               Expected result: 
         </desc>
-        <TSFI>tsfi.api.jts</TSFI>
+        <TSFI>tsfi.api.jta</TSFI>
+		<TSFI>tsfi.cfg.conf.jbossts-properties.xml</TSFI>
       </test>
 	</testCase>
     <testCase name="org.jboss.test.jbossts.ASCrashRecovery01.WipeOutTxsInDoubt">
@@ -1315,32 +1328,34 @@
         <desc>Test objective:  
               Expected result: 
         </desc>
-        <TSFI>tsfi.api.jts</TSFI>
+        <TSFI>tsfi.api.jta</TSFI>
         <TSFI>tsfi.ann.TransactionAttribute</TSFI>
         <TSFI>tsfi.ann.TransactionManagement</TSFI>
+		<TSFI>tsfi.cfg.conf.jbossts-properties.xml</TSFI>
       </test>
 	</testCase>
-    <testCase name="org.jboss.test.jbossts.ASCrashRecovery02.TestWithJMS">
+    <!--   testCase name="org.jboss.test.jbossts.ASCrashRecovery02.TestWithJMS">
       <desc></desc>
       <test name="testAction">
         <desc>Test objective:  
               Expected result: 
         </desc>
-        <TSFI>tsfi.api.jts</TSFI>
+        <TSFI>tsfi.api.jta</TSFI>
         <TSFI>tsfi.ann.TransactionAttribute</TSFI>
         <TSFI>tsfi.ann.TransactionManagement</TSFI>
-        <TSFI>tsfi.jms</TSFI>
       </test>
-	</testCase>
+	</testCase -->
 	<testCase name="org.jboss.test.tm.test.TxTimeoutAnnotUnitTestCase">
 		<desc>Tests for transaction timeout annotation EJB3 version of TxTimeoutUnitTestCase.</desc>
 		<test name="testOverriddenTimeoutExpires">
 			<desc>Tests if @TransactionTimeout expires system sends EJBTransactionRolledbackException and transaction is rolled back.</desc>
 			<TSFI>tsfi.ann.TransactionTimeout</TSFI>
+			<TSFI>tsfi.cfg.conf.jbossts-properties.xml</TSFI>
 		</test>
 		<test name="testOverriddenTimeoutDoesNotExpire">
 			<desc>Tests whether @TransactionTimeout expires greater that wait time of doesn't make transaction to roll back or stay in different status that STATUS_ACTIVE.</desc>
 			<TSFI>tsfi.ann.TransactionTimeout</TSFI>
+			<TSFI>tsfi.cfg.conf.jbossts-properties.xml</TSFI>
 		</test>
 	</testCase>
 	<testCase name="org.jboss.test.invokers.test.MultiInvokersUnitTestCase">
@@ -1366,35 +1381,254 @@
 	  <test name="testEjb3Endpoint">
 	    <desc></desc>
 	    <TSFI>tsfi.ann.WebContext</TSFI>
-	    <TSFI>tsfi.api.ws</TSFI>
 	  </test>
 	  <test name="testPojoEndpoint">
 	    <desc></desc>
-	    <TSFI>tsfi.api.ws</TSFI>
+	    <TSFI>tsfi.ann.WebContext</TSFI>
 	  </test>
 	</testCase>
-	<testCase name="org.jboss.test.scripts.test.ShutdownTestCase">
-	  <desc></desc>
-	  <test name="testNoArgs">
-	    <desc></desc>
-        <TSFI>tsfi.cmd.stop</TSFI>
-	  </test>
-	  <test name="testNonLoopbackShutdown">
-	    <desc></desc>
-        <TSFI>tsfi.cmd.stop</TSFI>
-	  </test>
+	<testCase name="org.jboss.test.security.audit.test.SecurityAuditTestCase">
+	    <desc>This test case starts predefined configuration with audit logging enabled and asserts 
+              audit logfile for messages to see if successful audit.</desc>
+		<test name="testServerStartupAndShutdownAuditMessage">
+	 	    <desc>Tests if after successful startup and shutdown of server, audit log contains proper entries.</desc>
+    	    <TSFI>tsfi.cmd.start</TSFI>
+        	<TSFI>tsfi.cmd.stop</TSFI>
+    	    <TSFI>tsfi.cfg.conf.jboss-log4j.xml</TSFI>
+		</test>
 	</testCase>
-	<testCase name="org.jboss.test.scripts.test.RunTestCase">
-	  <desc></desc>
-	  <test name="testNoArgs">
-	    <desc></desc>
-        <TSFI>tsfi.cmd.start</TSFI>
-	  </test>
-	  <test name="testNonLoopbackErrorFreeStartup">
-	    <desc></desc>
-        <TSFI>tsfi.cmd.start</TSFI>
-	  </test>
+	<testCase name="org.jboss.test.security.test.authorization.secured.HttpRequestJmxAuthenticationUnitTestCase">
+		<desc></desc>
+		<test name="testGet">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.jmx-console.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.jmx-console.web.xml</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jmx-console-users.properties</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jmx-console-roles.properties</TSFI>
+		</test>
+		<test name="testPost">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.jmx-console.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.jmx-console.web.xml</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jmx-console-users.properties</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jmx-console-roles.properties</TSFI>
+		</test>
+		<test name="testHead">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.jmx-console.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.jmx-console.web.xml</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jmx-console-users.properties</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jmx-console-roles.properties</TSFI>
+		</test>
+		<test name="testOptions">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.jmx-console.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.jmx-console.web.xml</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jmx-console-users.properties</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jmx-console-roles.properties</TSFI>
+		</test>
+		<test name="testPut">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.jmx-console.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.jmx-console.web.xml</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jmx-console-users.properties</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jmx-console-roles.properties</TSFI>
+		</test>
+		<test name="testDelete">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.jmx-console.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.jmx-console.web.xml</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jmx-console-users.properties</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jmx-console-roles.properties</TSFI>
+		</test>
+		<test name="testTrace">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.jmx-console.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.jmx-console.web.xml</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jmx-console-users.properties</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jmx-console-roles.properties</TSFI>
+		</test>
 	</testCase>
+	<testCase name="org.jboss.test.security.test.authorization.secured.HttpRequestJBossWSAuthenticationUnitTestCase">
+		<desc></desc>
+		<test name="testGet">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.jbossws-management.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.jbossws-management.web.xml</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jbossws-users.properties</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jbossws-roles.properties</TSFI>
+		</test>
+		<test name="testPost">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.jbossws-management.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.jbossws-management.web.xml</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jbossws-users.properties</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jbossws-roles.properties</TSFI>
+		</test>
+		<test name="testHead">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.jbossws-management.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.jbossws-management.web.xml</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jbossws-users.properties</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jbossws-roles.properties</TSFI>
+		</test>
+		<test name="testOptions">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.jbossws-management.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.jbossws-management.web.xml</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jbossws-users.properties</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jbossws-roles.properties</TSFI>
+		</test>
+		<test name="testPut">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.jbossws-management.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.jbossws-management.web.xml</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jbossws-users.properties</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jbossws-roles.properties</TSFI>
+		</test>
+		<test name="testDelete">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.jbossws-management.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.jbossws-management.web.xml</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jbossws-users.properties</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jbossws-roles.properties</TSFI>
+		</test>
+		<test name="testTrace">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.jbossws-management.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.jbossws-management.web.xml</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jbossws-users.properties</TSFI>
+			<TSFI>tsfi.cfg.conf.props.jbossws-roles.properties</TSFI>
+		</test>
+	</testCase>
+	<testCase name="org.jboss.test.security.test.authorization.secured.HttpRequestWebConsoleAuthenticationUnitTestCase">
+		<desc></desc>
+		<test name="testGet">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.web-console.roles.properties</TSFI>
+			<TSFI>tsfi.cfg.deploy.web-console.users.properties</TSFI>
+			<TSFI>tsfi.cfg.deploy.web-console.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.web-console.web.xml</TSFI>
+		</test>
+		<test name="testPost">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.web-console.roles.properties</TSFI>
+			<TSFI>tsfi.cfg.deploy.web-console.users.properties</TSFI>
+			<TSFI>tsfi.cfg.deploy.web-console.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.web-console.web.xml</TSFI>
+		</test>
+		<test name="testHead">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.web-console.roles.properties</TSFI>
+			<TSFI>tsfi.cfg.deploy.web-console.users.properties</TSFI>
+			<TSFI>tsfi.cfg.deploy.web-console.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.web-console.web.xml</TSFI>
+		</test>
+		<test name="testOptions">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.web-console.roles.properties</TSFI>
+			<TSFI>tsfi.cfg.deploy.web-console.users.properties</TSFI>
+			<TSFI>tsfi.cfg.deploy.web-console.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.web-console.web.xml</TSFI>
+		</test>
+		<test name="testPut">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.web-console.roles.properties</TSFI>
+			<TSFI>tsfi.cfg.deploy.web-console.users.properties</TSFI>
+			<TSFI>tsfi.cfg.deploy.web-console.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.web-console.web.xml</TSFI>
+		</test>
+		<test name="testDelete">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.web-console.roles.properties</TSFI>
+			<TSFI>tsfi.cfg.deploy.web-console.users.properties</TSFI>
+			<TSFI>tsfi.cfg.deploy.web-console.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.web-console.web.xml</TSFI>
+		</test>
+		<test name="testTrace">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.web-console.roles.properties</TSFI>
+			<TSFI>tsfi.cfg.deploy.web-console.users.properties</TSFI>
+			<TSFI>tsfi.cfg.deploy.web-console.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.web-console.web.xml</TSFI>
+		</test>
+	</testCase>
+	<testCase name="org.jboss.test.security.test.authorization.secured.HttpRequestStatusServletAuthenticationUnitTestCase">
+		<desc></desc>
+		<test name="testGet">
+			<desc></desc>
+			<TSFI>tsfi.app.jboss-web.xml</TSFI>
+			<TSFI>tsfi.app.web.xml</TSFI>
+		</test>
+		<test name="testPost">
+			<desc></desc>
+			<TSFI>tsfi.app.jboss-web.xml</TSFI>
+			<TSFI>tsfi.app.web.xml</TSFI>
+		</test>
+		<test name="testHead">
+			<desc></desc>
+			<TSFI>tsfi.app.jboss-web.xml</TSFI>
+			<TSFI>tsfi.app.web.xml</TSFI>
+		</test>
+		<test name="testOptions">
+			<desc></desc>
+			<TSFI>tsfi.app.jboss-web.xml</TSFI>
+			<TSFI>tsfi.app.web.xml</TSFI>
+		</test>
+		<test name="testPut">
+			<desc></desc>
+			<TSFI>tsfi.app.jboss-web.xml</TSFI>
+			<TSFI>tsfi.app.web.xml</TSFI>
+		</test>
+		<test name="testDelete">
+			<desc></desc>
+			<TSFI>tsfi.app.jboss-web.xml</TSFI>
+			<TSFI>tsfi.app.web.xml</TSFI>
+		</test>
+		<test name="testTrace">
+			<desc></desc>
+			<TSFI>tsfi.app.jboss-web.xml</TSFI>
+			<TSFI>tsfi.app.web.xml</TSFI>
+		</test>
+	</testCase>
+	<testCase name="org.jboss.test.security.test.authorization.secured.HttpRequestAdminConsoleAuthenticationUnitTestCase">
+		<desc></desc>
+		<test name="testGet">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.admin.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.admin.web.xml</TSFI>
+		</test>
+		<test name="testPost">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.admin.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.admin.web.xml</TSFI>
+		</test>
+		<test name="testHead">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.admin.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.admin.web.xml</TSFI>
+		</test>
+		<test name="testOptions">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.admin.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.admin.web.xml</TSFI>
+		</test>
+		<test name="testPut">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.admin.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.admin.web.xml</TSFI>
+		</test>
+		<test name="testDelete">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.admin.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.admin.web.xml</TSFI>
+		</test>
+		<test name="testTrace">
+			<desc></desc>
+			<TSFI>tsfi.cfg.deploy.admin.jboss-web.xml</TSFI>
+			<TSFI>tsfi.cfg.deploy.admin.web.xml</TSFI>
+		</test>
+	</testCase>
   </testSuite>
 
 </cc:testCaseMapping>

Modified: branches/JBPAPP_5_1/testsuite/src/resources/cc/tsfi_master_data.txt
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/cc/tsfi_master_data.txt	2010-10-08 11:26:08 UTC (rev 108487)
+++ branches/JBPAPP_5_1/testsuite/src/resources/cc/tsfi_master_data.txt	2010-10-08 11:45:55 UTC (rev 108488)
@@ -1,5 +1,4 @@
 % Deployment Descriptors
-tsfi.app.components.xml    ?? - Seam Config file
 tsfi.app.jboss-beans.xml   
 tsfi.app.ejb-jar.xml
 tsfi.app.jboss.xml           
@@ -17,7 +16,7 @@
 tsfi.port.web.http
 tsfi.port.web.https
 % Annotations
-tsfi.ann.Clustered       ?? - new test case needed
+x tsfi.ann.Clustered       ?? - new test case needed
 tsfi.ann.DeclareRoles  
 tsfi.ann.DenyAll         
 tsfi.ann.Exclude
@@ -32,9 +31,7 @@
 tsfi.ann.Unchecked
 tsfi.ann.WebContext
 % API
-tsfi.api.jms
 tsfi.api.jta
-tsfi.api.ws
 % Login modules
 tsfi.db.roles                
 tsfi.db.users
@@ -49,27 +46,27 @@
 tsfi.cfg.conf.props.jbossws-users.properties
 tsfi.cfg.conf.props.jmx-console-roles.properties
 tsfi.cfg.conf.props.jmx-console-users.properties
-tsfi.cfg.conf.props.messaging-roles.properties
-tsfi.cfg.conf.props.messaging-users.properties
+x tsfi.cfg.conf.props.messaging-roles.properties
+x tsfi.cfg.conf.props.messaging-users.properties
 tsfi.cfg.deploy.admin.jboss-web.xml
 tsfi.cfg.deploy.admin.web.xml
-tsfi.cfg.deploy.cluster.hapartition-jboss-beans.xml
+x tsfi.cfg.deploy.cluster.hapartition-jboss-beans.xml
 tsfi.cfg.hi.jboss-web.xml
 tsfi.cfg.hi.web.xml
 tsfi.cfg.deploy.jbossws-management.jboss-web.xml
 tsfi.cfg.deploy.jbossws-management.web.xml
 tsfi.cfg.deploy.jmx-console.jboss-web.xml
 tsfi.cfg.deploy.jmx-console.web.xml
-tsfi.cfg.deploy.jmx-invoker-service.xml
-tsfi.cfg.juddi.jboss-web.xml
-tsfi.cfg.juddi.web.xml
+x tsfi.cfg.deploy.jmx-invoker-service.xml
+x tsfi.cfg.juddi.jboss-web.xml
+x tsfi.cfg.juddi.web.xml
 tsfi.cfg.deploy.web-console.roles.properties
 tsfi.cfg.deploy.web-console.users.properties
 tsfi.cfg.deploy.web-console.jboss-web.xml
 tsfi.cfg.deploy.web-console.web.xml
-tsfi.cfg.jms.destinations-service.xml
-tsfi.cfg.jms.jboss-beans.xml
-tsfi.cfg.jms.messaging-service.xml
-tsfi.cfg.deploy.security.security-policies-jboss-beans.xml
+x tsfi.cfg.jms.destinations-service.xml
+x tsfi.cfg.jms.jboss-beans.xml
+x tsfi.cfg.jms.messaging-service.xml
+x tsfi.cfg.deploy.security.security-policies-jboss-beans.xml
 tsfi.app.roles.properties
 tsfi.app.users.properties

Added: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/ROOT.war/WEB-INF/jboss-web.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/ROOT.war/WEB-INF/jboss-web.xml	                        (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/ROOT.war/WEB-INF/jboss-web.xml	2010-10-08 11:45:55 UTC (rev 108488)
@@ -0,0 +1,12 @@
+<!DOCTYPE jboss-web PUBLIC
+   "-//JBoss//DTD Web Application 5.0//EN"
+   "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd">
+   
+<jboss-web>
+   <!-- Uncomment the security-domain to enable security. You will
+      need to edit the htmladaptor login configuration to setup the
+      login modules used to authentication users.  -->
+      <security-domain>java:/jaas/jmx-console</security-domain>
+
+
+</jboss-web>

Added: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/ROOT.war/WEB-INF/web.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/ROOT.war/WEB-INF/web.xml	                        (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/ROOT.war/WEB-INF/web.xml	2010-10-08 11:45:55 UTC (rev 108488)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE web-app
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+    "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+  <display-name>Welcome to JBoss</display-name>
+  <description>
+     Welcome to JBoss
+  </description>
+  <servlet>
+    <servlet-name>Status Servlet</servlet-name>
+    <servlet-class>org.jboss.web.tomcat.service.StatusServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>Status Servlet</servlet-name>
+    <url-pattern>/status</url-pattern>
+  </servlet-mapping>
+  
+   <!-- A security constraint that restricts access to the status servlet
+   to users with the role JBossAdmin. Edit the roles to what you want and
+   uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
+   secured access to the HTML JMX console. -->
+   
+   <security-constraint>
+     <web-resource-collection>
+       <web-resource-name>HtmlAdaptor</web-resource-name>
+       <description>An example security config that only allows users with the
+         role JBossAdmin to access the HTML JMX console web application
+       </description>
+       <url-pattern>/status/*</url-pattern>
+     </web-resource-collection>
+     <auth-constraint>
+       <role-name>JBossAdmin</role-name>
+     </auth-constraint>
+   </security-constraint>
+
+
+   <login-config>
+      <auth-method>BASIC</auth-method>
+      <realm-name>Tomcat STATUS</realm-name>
+   </login-config>
+
+   <security-role>
+      <role-name>JBossAdmin</role-name>
+   </security-role>
+</web-app>

Added: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/jbossws.sar/jbossws-management.war/WEB-INF/jboss-web.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/jbossws.sar/jbossws-management.war/WEB-INF/jboss-web.xml	                        (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/jbossws.sar/jbossws-management.war/WEB-INF/jboss-web.xml	2010-10-08 11:45:55 UTC (rev 108488)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE jboss-web
+    PUBLIC "-//JBoss//DTD Web Application 2.3V2//EN"
+    "http://www.jboss.org/j2ee/dtd/jboss-web_3_2.dtd">
+
+<jboss-web>
+
+  <!-- A security domain that restricts access -->
+  <security-domain>java:/jaas/JBossWS</security-domain>
+ 
+  
+  <context-root>jbossws</context-root>
+
+</jboss-web>

Added: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml	                        (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml	2010-10-08 11:45:55 UTC (rev 108488)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+  A web application that installs the JBossWS servlets
+-->
+
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+  <display-name>JBossWS</display-name>
+
+  <servlet>
+    <servlet-name>ContextServlet</servlet-name>
+    <servlet-class>org.jboss.wsf.framework.management.ContextServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>PortComponentLinkServlet</servlet-name>
+    <servlet-class>org.jboss.ws.core.server.PortComponentLinkServlet</servlet-class>
+  </servlet>
+  
+  <!-- now the mappings -->
+  
+  <servlet-mapping>
+    <servlet-name>ContextServlet</servlet-name>
+    <url-pattern>/services/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>PortComponentLinkServlet</servlet-name>
+    <url-pattern>/pclink</url-pattern>
+  </servlet-mapping>
+
+   <!-- A security constraint that restricts access -->
+   <security-constraint>
+     <web-resource-collection>
+       <web-resource-name>ContextServlet</web-resource-name>
+       <description>An example security config that only allows users with the
+         role 'friend' to access the JBossWS console web application
+       </description>
+       <url-pattern>/*</url-pattern>
+     </web-resource-collection>
+     <auth-constraint>
+       <role-name>friend</role-name>
+     </auth-constraint>
+   </security-constraint>
+  
+
+   <login-config>
+      <auth-method>BASIC</auth-method>
+      <realm-name>JBossWS Management Console</realm-name>
+   </login-config>
+
+   <security-role>
+      <role-name>friend</role-name>
+   </security-role>
+  
+  <!-- 
+  currently the W3C haven't settled on a media type for WSDL;
+  http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
+  for now we go with the basic 'it's XML' response 
+  -->
+  <mime-mapping>
+    <extension>wsdl</extension>
+    <mime-type>text/xml</mime-type>
+  </mime-mapping>
+
+  <mime-mapping>
+    <extension>xsd</extension>
+    <mime-type>text/xml</mime-type>
+  </mime-mapping>
+
+  <welcome-file-list id="WelcomeFileList">
+    <welcome-file>index.html</welcome-file>
+  </welcome-file-list>
+
+</web-app>

Added: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/jmx-console.war/WEB-INF/jboss-web.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/jmx-console.war/WEB-INF/jboss-web.xml	                        (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/jmx-console.war/WEB-INF/jboss-web.xml	2010-10-08 11:45:55 UTC (rev 108488)
@@ -0,0 +1,11 @@
+<!DOCTYPE jboss-web PUBLIC
+   "-//JBoss//DTD Web Application 5.0//EN"
+   "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd">
+   
+<jboss-web>
+   <!-- Uncomment the security-domain to enable security. You will
+      need to edit the htmladaptor login configuration to setup the
+      login modules used to authentication users. -->
+      <security-domain>java:/jaas/jmx-console</security-domain>
+   
+</jboss-web>

Added: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/jmx-console.war/WEB-INF/web.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/jmx-console.war/WEB-INF/web.xml	                        (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/jmx-console.war/WEB-INF/web.xml	2010-10-08 11:45:55 UTC (rev 108488)
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<web-app version="2.5"
+   xmlns="http://java.sun.com/xml/ns/javaee"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+   
+   <description>The standard web descriptor for the html adaptor</description>
+   <!--
+    <filter>
+      <filter-name>JmxOpsAccessControlFilter</filter-name>
+      <filter-class>org.jboss.jmx.adaptor.html.JMXOpsAccessControlFilter</filter-class>
+      <init-param>
+        <description>Comma-delimited Roles that define the JMX Operation denoting updation of Attributes</description>
+        <param-name>updateAttributes</param-name>
+        <param-value>UpdateAttributeRole</param-value>
+      </init-param>
+      <init-param>
+        <description>Comma-delimited Roles that define the JMX Operation denoting Invocation of Operations</description>
+        <param-name>invokeOp</param-name>
+        <param-value>InvokeOpRole</param-value>
+      </init-param>
+   </filter>
+   <filter-mapping>
+      <filter-name>JmxOpsAccessControlFilter</filter-name>
+      <servlet-name>HtmlAdaptor</servlet-name>
+   </filter-mapping>
+   -->
+   <servlet>
+      <servlet-name>HtmlAdaptor</servlet-name>
+      <servlet-class>org.jboss.jmx.adaptor.html.HtmlAdaptorServlet</servlet-class>
+   </servlet>
+   <servlet>
+      <servlet-name>ClusteredConsoleServlet</servlet-name>
+      <servlet-class>org.jboss.jmx.adaptor.html.ClusteredConsoleServlet</servlet-class>
+      <init-param>
+         <description>The JGroups protocol stack config</description>
+         <param-name>jgProps</param-name>
+         <param-value>UDP(ip_mcast=true;ip_ttl=16;loopback=false;mcast_addr=${jboss.partition.udpGroup:228.1.2.3};mcast_port=${jboss.jmxconsolepartition.mcast_port:46666}):
+org.jboss.jmx.adaptor.control.FindView
+         </param-value>
+      </init-param>
+   </servlet>
+   <servlet>
+      <servlet-name>DisplayMBeans</servlet-name>
+      <jsp-file>/displayMBeans.jsp</jsp-file>
+   </servlet>
+   <servlet>
+      <servlet-name>InspectMBean</servlet-name>
+      <jsp-file>/inspectMBean.jsp</jsp-file>
+   </servlet>
+   <servlet>
+      <servlet-name>DisplayOpResult</servlet-name>
+      <jsp-file>/displayOpResult.jsp</jsp-file>
+   </servlet>
+   <servlet>
+      <servlet-name>ClusterView</servlet-name>
+      <jsp-file>/cluster/clusterView.jsp</jsp-file>
+   </servlet>
+   <servlet>
+      <servlet-name>ProfileServiceDebugServlet</servlet-name>
+      <servlet-class>org.jboss.profileservice.web.DebugServlet</servlet-class>
+   </servlet>
+
+   <servlet-mapping>
+      <servlet-name>HtmlAdaptor</servlet-name>
+      <url-pattern>/HtmlAdaptor</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>ClusteredConsoleServlet</servlet-name>
+      <url-pattern>/cluster/ClusteredConsole</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>DisplayMBeans</servlet-name>
+      <url-pattern>/DisplayMBeans</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>InspectMBean</servlet-name>
+      <url-pattern>/InspectMBean</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>DisplayOpResult</servlet-name>
+      <url-pattern>/DisplayOpResult</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>ProfileServiceDebugServlet</servlet-name>
+      <url-pattern>/ProfileServiceDebugServlet</url-pattern>
+   </servlet-mapping>
+
+   <!-- Display a generic error page when HTTP Status 500 exceptions
+        occur. --> 
+   <error-page>
+      <error-code>500</error-code>
+      <location>/genericError.jsp</location>
+   </error-page> 
+
+   <!-- A security constraint that restricts access to the HTML JMX console
+   to users with the role JBossAdmin. Edit the roles to what you want and
+   uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
+   secured access to the HTML JMX console. -->
+   <security-constraint>
+     <web-resource-collection>
+       <web-resource-name>HtmlAdaptor</web-resource-name>
+       <description>An example security config that only allows users with the
+         role JBossAdmin to access the HTML JMX console web application
+       </description>
+       <url-pattern>/*</url-pattern>
+     </web-resource-collection>
+     <auth-constraint>
+       <role-name>JBossAdmin</role-name>
+     </auth-constraint>
+   </security-constraint>
+
+
+   <login-config>
+      <auth-method>BASIC</auth-method>
+      <realm-name>JBoss JMX Console</realm-name>
+   </login-config>
+
+   <security-role>
+      <role-name>JBossAdmin</role-name>
+   </security-role>
+</web-app>

Added: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/management/console-mgr.sar/web-console.war/WEB-INF/jboss-web.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/management/console-mgr.sar/web-console.war/WEB-INF/jboss-web.xml	                        (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/management/console-mgr.sar/web-console.war/WEB-INF/jboss-web.xml	2010-10-08 11:45:55 UTC (rev 108488)
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+ 
+<!DOCTYPE jboss-web
+    PUBLIC "-//JBoss//DTD Web Application 2.3V2//EN"
+    "http://www.jboss.org/j2ee/dtd/jboss-web_3_2.dtd">
+
+<jboss-web>
+
+   <!-- Uncomment the security-domain to enable security. You will
+   need to edit the htmladaptor login configuration to setup the
+   login modules used to authentication users. -->
+   <security-domain>java:/jaas/web-console</security-domain>
+   
+
+   <!-- The war depends on the -->
+   <depends>jboss.admin:service=PluginManager</depends>
+</jboss-web>

Added: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml	                        (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-secured/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml	2010-10-08 11:45:55 UTC (rev 108488)
@@ -0,0 +1,365 @@
+<?xml version="1.0"?>
+<!DOCTYPE web-app PUBLIC
+   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+   "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+   <description>Web Admin Console</description>
+   <servlet>
+      <servlet-name>J2EEFolder</servlet-name>
+      <servlet-class>org.jboss.console.plugins.helpers.ServletPluginHelper</servlet-class>
+      <init-param>
+         <param-name>ScriptName</param-name>
+         <param-value>J2EEFolder.bsh</param-value>
+      </init-param>
+      <init-param>
+         <param-name>IsRootNode</param-name>
+         <param-value>true</param-value>
+      </init-param>
+      <init-param>
+         <param-name>ContextName</param-name>
+         <param-value>/web-console</param-value>
+      </init-param>
+      <load-on-startup>1</load-on-startup>
+   </servlet>
+
+   <servlet>
+      <servlet-name>SystemFolder</servlet-name>
+      <servlet-class>org.jboss.console.plugins.helpers.ServletPluginHelper</servlet-class>
+      <init-param>
+         <param-name>ScriptName</param-name>
+         <param-value>SystemFolder.bsh</param-value>
+      </init-param>
+      <init-param>
+         <param-name>IsRootNode</param-name>
+         <param-value>true</param-value>
+      </init-param>
+      <init-param>
+         <param-name>ContextName</param-name>
+         <param-value>/web-console</param-value>
+      </init-param>
+      <load-on-startup>1</load-on-startup>
+   </servlet>
+
+   <servlet>
+      <servlet-name>MonitorsFolder</servlet-name>
+      <servlet-class>org.jboss.console.plugins.helpers.ServletPluginHelper</servlet-class>
+      <init-param>
+         <param-name>WrapperClass</param-name>
+         <param-value>org.jboss.console.plugins.MonitorLister</param-value>
+      </init-param>
+      <init-param>
+         <param-name>IsRootNode</param-name>
+         <param-value>true</param-value>
+      </init-param>
+      <init-param>
+         <param-name>ContextName</param-name>
+         <param-value>/web-console</param-value>
+      </init-param>
+      <load-on-startup>1</load-on-startup>
+   </servlet>
+
+   <servlet>
+      <servlet-name>AOPFolder</servlet-name>
+      <servlet-class>org.jboss.console.plugins.helpers.ServletPluginHelper</servlet-class>
+      <init-param>
+         <param-name>WrapperClass</param-name>
+         <param-value>org.jboss.console.plugins.AOPLister</param-value>
+      </init-param>
+      <init-param>
+         <param-name>IsRootNode</param-name>
+         <param-value>true</param-value>
+      </init-param>
+      <init-param>
+         <param-name>ContextName</param-name>
+         <param-value>/web-console</param-value>
+      </init-param>
+      <load-on-startup>1</load-on-startup>
+   </servlet>
+
+    <servlet>
+        <servlet-name>JMS Message</servlet-name>
+        <servlet-class>org.jboss.console.plugins.helpers.ServletPluginHelper</servlet-class>
+        <init-param>
+            <param-name>WrapperClass</param-name>
+            <param-value>org.jboss.console.plugins.JMSLister</param-value>
+        </init-param>
+        <init-param>
+            <param-name>MBeanClass</param-name>
+            <param-value>org.jboss.management.j2ee.JMSResource</param-value>
+        </init-param>
+        <init-param>
+            <param-name>ContextName</param-name>
+            <param-value>/web-console</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+   <!--servlet>
+   <servlet-name>UCLs</servlet-name>
+   <servlet-class>org.jboss.console.plugins.helpers.ServletPluginHelper</servlet-class>
+   <init-param>
+   <param-name>ScriptName</param-name>
+   <param-value>Classloaders.bsh</param-value>
+   </init-param>
+   <init-param>
+   <param-name>FolderName</param-name>
+   <param-value>ROOT/System</param-value>
+   </init-param>
+   <init-param>
+   <param-name>ContextName</param-name>
+   <param-value>/web-console</param-value>
+   </init-param>
+   <load-on-startup>1</load-on-startup>
+   </servlet-->
+
+   <servlet>
+      <servlet-name>UCLs</servlet-name>
+      <servlet-class>org.jboss.console.plugins.helpers.ServletPluginHelper</servlet-class>
+      <init-param>
+         <param-name>WrapperClass</param-name>
+         <param-value>org.jboss.console.plugins.UCLLister</param-value>
+      </init-param>
+      <init-param>
+         <param-name>FolderName</param-name>
+         <param-value>ROOT/System</param-value>
+      </init-param>
+      <init-param>
+         <param-name>ContextName</param-name>
+         <param-value>/web-console</param-value>
+      </init-param>
+      <load-on-startup>1</load-on-startup>
+   </servlet>
+
+   <servlet>
+      <servlet-name>MBeans</servlet-name>
+      <servlet-class>org.jboss.console.plugins.helpers.ServletPluginHelper</servlet-class>
+      <init-param>
+         <param-name>WrapperClass</param-name>
+         <param-value>org.jboss.console.plugins.MBeansLister</param-value>
+      </init-param>
+      <init-param>
+         <param-name>FolderName</param-name>
+         <param-value>ROOT/System</param-value>
+      </init-param>
+      <init-param>
+         <param-name>ContextName</param-name>
+         <param-value>/web-console</param-value>
+      </init-param>
+      <load-on-startup>1</load-on-startup>
+   </servlet>
+
+   <servlet>
+      <servlet-name>JSR77 Domains and Servers</servlet-name>
+      <servlet-class>org.jboss.console.plugins.helpers.ServletPluginHelper</servlet-class>
+      <init-param>
+         <param-name>WrapperClass</param-name>
+         <param-value>org.jboss.console.plugins.JSR77Lister</param-value>
+      </init-param>
+      <init-param>
+         <param-name>FolderName</param-name>
+         <param-value>ROOT/J2EE</param-value>
+      </init-param>
+      <init-param>
+         <param-name>ContextName</param-name>
+         <param-value>/web-console</param-value>
+      </init-param>
+      <load-on-startup>1</load-on-startup>
+   </servlet>
+
+   <servlet>
+      <servlet-name>JSR77 EJBModules and EJBs</servlet-name>
+      <servlet-class>org.jboss.console.plugins.helpers.ServletPluginHelper</servlet-class>
+      <init-param>
+         <param-name>WrapperClass</param-name>
+         <param-value>org.jboss.console.plugins.EJBModuleLister</param-value>
+      </init-param>
+      <init-param>
+         <param-name>MBeanClass</param-name>
+         <param-value>org.jboss.management.j2ee.EJBModule</param-value>
+      </init-param>
+      <init-param>
+         <param-name>ContextName</param-name>
+         <param-value>/web-console</param-value>
+      </init-param>
+      <load-on-startup>1</load-on-startup>
+   </servlet>
+
+    <servlet>
+        <servlet-name>JSR77 J2EE Apps</servlet-name>
+        <servlet-class>org.jboss.console.plugins.helpers.ServletPluginHelper</servlet-class>
+        <init-param>
+            <param-name>WrapperClass</param-name>
+            <param-value>org.jboss.console.plugins.J2EEAppLister</param-value>
+        </init-param>
+        <init-param>
+            <param-name>MBeanClass</param-name>
+            <param-value>org.jboss.management.j2ee.J2EEApplication</param-value>
+        </init-param>
+        <init-param>
+            <param-name>ContextName</param-name>
+            <param-value>/web-console</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>JSR77 WebModule</servlet-name>
+        <servlet-class>org.jboss.console.plugins.helpers.ServletPluginHelper</servlet-class>
+        <init-param>
+            <param-name>WrapperClass</param-name>
+            <param-value>org.jboss.console.plugins.WebModuleLister</param-value>
+        </init-param>
+        <init-param>
+            <param-name>MBeanClass</param-name>
+            <param-value>org.jboss.management.j2ee.WebModule</param-value>
+        </init-param>
+        <init-param>
+            <param-name>ContextName</param-name>
+            <param-value>/web-console</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+   <servlet>
+      <servlet-name>HTTP Invocation</servlet-name>
+      <servlet-class>org.jboss.console.remote.InvokerServlet</servlet-class>
+      <load-on-startup>1</load-on-startup>
+   </servlet>
+
+   <servlet>
+      <servlet-name>Create Snapshot</servlet-name>
+      <servlet-class>org.jboss.console.plugins.monitor.CreateSnapshotServlet</servlet-class>
+      <load-on-startup>1</load-on-startup>
+   </servlet>
+
+   <servlet>
+      <servlet-name>Manage Snapshot</servlet-name>
+      <servlet-class>org.jboss.console.plugins.monitor.ManageSnapshotServlet</servlet-class>
+      <load-on-startup>1</load-on-startup>
+   </servlet>
+
+   <servlet>
+      <servlet-name>Create Threshold Monitor</servlet-name>
+      <servlet-class>org.jboss.console.plugins.monitor.CreateThresholdMonitorServlet</servlet-class>
+      <load-on-startup>1</load-on-startup>
+   </servlet>
+
+   <servlet>
+      <servlet-name>Manage Threshold Monitor</servlet-name>
+      <servlet-class>org.jboss.console.plugins.monitor.ManageThresholdMonitorServlet</servlet-class>
+      <load-on-startup>1</load-on-startup>
+   </servlet>
+
+   <servlet>
+      <servlet-name>Create String Threshold Monitor</servlet-name>
+      <servlet-class>org.jboss.console.plugins.monitor.CreateStringThresholdMonitorServlet</servlet-class>
+      <load-on-startup>1</load-on-startup>
+   </servlet>
+
+   <servlet>
+      <servlet-name>Manage String Threshold Monitor</servlet-name>
+      <servlet-class>org.jboss.console.plugins.monitor.ManageStringThresholdMonitorServlet</servlet-class>
+      <load-on-startup>1</load-on-startup>
+   </servlet>
+
+   <servlet>
+      <servlet-name>Clear Monitor Alerts</servlet-name>
+      <servlet-class>org.jboss.console.plugins.monitor.ClearMonitorAlertsServlet</servlet-class>
+      <load-on-startup>1</load-on-startup>
+   </servlet>
+
+   <servlet>
+      <servlet-name>Acknowledge Active Alarms</servlet-name>
+      <servlet-class>org.jboss.console.plugins.monitor.AcknowledgeActiveAlarmsServlet</servlet-class>
+      <load-on-startup>1</load-on-startup>
+   </servlet>
+   
+  <servlet>
+    <servlet-name>Status Servlet</servlet-name>
+    <servlet-class>org.jboss.web.tomcat.service.StatusServlet</servlet-class>
+  </servlet>
+    
+  <servlet-mapping>
+    <servlet-name>Status Servlet</servlet-name>
+    <url-pattern>/status</url-pattern>
+  </servlet-mapping>
+
+   <servlet-mapping>
+      <servlet-name>HTTP Invocation</servlet-name>
+      <url-pattern>/Invoker/*</url-pattern>
+   </servlet-mapping>
+
+   <servlet-mapping>
+      <servlet-name>Create Snapshot</servlet-name>
+      <url-pattern>/CreateSnapshot</url-pattern>
+   </servlet-mapping>
+
+   <servlet-mapping>
+      <servlet-name>Manage Snapshot</servlet-name>
+      <url-pattern>/ManageSnapshot</url-pattern>
+   </servlet-mapping>
+
+   <servlet-mapping>
+      <servlet-name>Create Threshold Monitor</servlet-name>
+      <url-pattern>/CreateThresholdMonitor</url-pattern>
+   </servlet-mapping>
+
+   <servlet-mapping>
+      <servlet-name>Manage Threshold Monitor</servlet-name>
+      <url-pattern>/ManageThresholdMonitor</url-pattern>
+   </servlet-mapping>
+
+   <servlet-mapping>
+      <servlet-name>Create String Threshold Monitor</servlet-name>
+      <url-pattern>/CreateStringThresholdMonitor</url-pattern>
+   </servlet-mapping>
+
+   <servlet-mapping>
+      <servlet-name>Manage String Threshold Monitor</servlet-name>
+      <url-pattern>/ManageStringThresholdMonitor</url-pattern>
+   </servlet-mapping>
+
+   <servlet-mapping>
+      <servlet-name>Clear Monitor Alerts</servlet-name>
+      <url-pattern>/ClearMonitorAlerts</url-pattern>
+   </servlet-mapping>
+
+  <servlet-mapping>
+      <servlet-name>Acknowledge Active Alarms</servlet-name>
+      <url-pattern>/AcknowledgeActiveAlarms</url-pattern>
+   </servlet-mapping>
+   
+   <taglib>
+      <taglib-uri>/webconsole</taglib-uri>
+      <taglib-location>/WEB-INF/tlds/webconsole.tld</taglib-location>
+   </taglib>
+
+   <!-- A security constraint that restricts access to the HTML JMX console
+   to users with the role JBossAdmin. Edit the roles to what you want and
+   uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
+   secured access to the HTML JMX console. -->
+
+   <security-constraint>
+   <web-resource-collection>
+   <web-resource-name>HtmlAdaptor</web-resource-name>
+   <description>An example security config that only allows users with the
+   role JBossAdmin to access the HTML JMX console web application
+   </description>
+   <url-pattern>/*</url-pattern>
+   </web-resource-collection>
+   <auth-constraint>
+   <role-name>JBossAdmin</role-name>
+   </auth-constraint>
+   </security-constraint>
+   
+
+   <login-config>
+      <auth-method>BASIC</auth-method>
+      <realm-name>JBoss WEB Console</realm-name>
+   </login-config>
+
+   <security-role>
+      <role-name>JBossAdmin</role-name>
+   </security-role>
+</web-app>



More information about the jboss-cvs-commits mailing list