[jboss-cvs] JBossAS SVN: r108473 - in branches/JBPAPP_5_1/testsuite: src/main/org/jboss/test/scripts/test and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Oct 7 02:09:22 EDT 2010
Author: pskopek at redhat.com
Date: 2010-10-07 02:09:21 -0400 (Thu, 07 Oct 2010)
New Revision: 108473
Added:
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/jboss-log4j.xml
Removed:
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-audit/conf/jboss-log4j.xml
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/jboss-log4j.xml
Modified:
branches/JBPAPP_5_1/testsuite/build.xml
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/scripts/test/RunTestCase.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/scripts/test/ScriptsTestBase.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/scripts/test/ShutdownTestCase.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/security/audit/test/SecurityAuditTestCase.java
Log:
CC: integrated audit testcase to CC testsuite
Modified: branches/JBPAPP_5_1/testsuite/build.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/build.xml 2010-10-07 06:05:42 UTC (rev 108472)
+++ branches/JBPAPP_5_1/testsuite/build.xml 2010-10-07 06:09:21 UTC (rev 108473)
@@ -1777,22 +1777,13 @@
</target>
-
- <!--
- | Tests for Common Criteria Evaluation. The JBoss server must be running with a security manager for those tests
- | This target has to run with jboss.test.sign.jars property set to true.
- -->
- <target name="tests-common-criteria" description="Tests run against a jboss server configured according to CC Guide" depends="init">
+ <!-- This target creates CC configuration -->
+ <target name="create-cc-config" description="Creates CC configuration">
+
+ <delete dir="${jboss.dist}${/}server${/}cc" quiet="true"/>
+ <delete dir="${jboss.dist}${/}server${/}cc-audit" quiet="true"/>
- <!--
- <condition property="cc.java.security.debug" value="java.security.debug" else="java.security.NODEBUG">
- <istrue value="${cc.sm.debug}"/>
- </condition>
- -->
- <property name="cc-testify" value="true"/>
- <delete dir="${jboss.dist}${/}server${/}cc" quiet="true"/>
- <delete dir="${jboss.dist}${/}server${/}cc-audit" quiet="true"/>
-
+ <!-- Create the CC config starting with the production config -->
<create-config baseconf="production" newconf="cc">
<patternset>
<include name="conf/**" />
@@ -1812,27 +1803,74 @@
<include name="deploy-hasingleton/**" />
<include name="farm/**" />
<include name="lib/**" />
+ <include name="cc.*"/>
+ <include name="ssl.*"/>
</patternset>
</create-config>
+ <copy file="${build.resources}/cc/cc.policy" todir="${jboss.dist}/server/cc-audit" />
+
+ <!-- prepare run.conf for audit testing -->
+ <copy file="${build.resources}/cc/cc.policy" todir="${jboss.dist}/server/cc-audit" />
+ <echo file="${jboss.dist}/server/cc-audit/run.conf">
+ JAVA_OPTS="-Xms1024m -Xmx1024m -XX:MaxPermSize=256m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Dsun.lang.ClassLoader.allowArraySyntax=true -Djboss.home.dir=${jboss.dist} -Djboss.server.home.dir=${jboss.dist}${/}server${/}cc-audit -Djava.security.manager -Djava.security.policy==${jboss.dist}${/}server${/}cc-audit/cc.policy"</echo>
+
+ <!-- delete SNMP adapter, because it is not allowed in CC config -->
+ <delete dir="${jboss.dist}/server/cc/deploy/snmp-adaptor.sar"/>
+
+ <!-- delete HSQL DB which is not allowed in CC config
+ Alternate configuration at test-configs/cc/deploy contains DefaultDS
+ file called oracle-ds.xml for default Oracle DB.
+ -->
+ <!--
+ <delete file="${jboss.dist}/server/cc/lib/hsqldb.jar"/>
+ <delete file="${jboss.dist}/server/cc/lib/hsqldb-plugin.jar"/>
+ <delete file="${jboss.dist}/server/cc/deploy/hsqldb-ds.xml"/>
+ <delete file="${jboss.dist}/server/cc/deploy/jboss-messaging.sar/clustered-hsqldb-persistence-service.xml"/>
+ -->
+
+ <!-- Disable Remote Method Invocation (RMI) under the Internet Inter-ORB Protocol (IIOP) -->
+ <delete file="${jboss.dist}/server/cc/conf/jacorb.properties"/>
+ <delete file="${jboss.dist}/server/cc/deploy/iiop-service.xml"/>
+ <delete file="${jboss.dist}/server/cc/lib/jacorb.jar"/>
+ <!-- delete file="${jboss.dist}/common/lib/jboss-iiop.jar"/ -->
+
+ <!-- copy alternate part of configuration (cc-none, cc-db, cc-ldap) -->
+ <!-- copy todir="${jboss.dist}/server/cc" overwrite="true">
+ <fileset dir="${build.resources}/test-configs/${alternate-config}">
+ <include name="**/*"/>
+ </fileset>
+ </copy -->
+
+ <!-- DB config patch (copy JDBC driver library) -->
+ <!-- copy todir="${jboss.dist}/server/cc/lib" overwrite="true" failonerror="false">
+ <fileset dir="/qa/tools/opt/opt/jdbc-drivers">
+ <include name="${jdbc-driver.pattern}"/>
+ </fileset>
+ </copy -->
+
+ </target>
+
+
+ <!--
+ | Tests for Common Criteria Evaluation. The JBoss server must be running with a security manager for those tests
+ | This target has to run with jboss.test.sign.jars property set to true.
+ -->
+ <target name="tests-common-criteria" description="Tests run against a jboss server configured according to CC Guide" depends="init">
+
+ <property name="cc-testify" value="true"/>
+
+ <antcall target="create-cc-config" />
+
<echo message="Starting CC with policy ${build.resources}/test-configs/cc/cc.policy" />
<echo message="jboss.home.dir=${jboss.dist}" />
<echo message="jboss.server.home.dir=${jboss.dist}${/}server${/}cc" />
<echo message="java.naming.provider.url=${node0.jndi.url}" />
<echo message="jbosstest.server.host=${node0}" />
<echo message="cc.java.security.debug=${cc.java.security.debug}" />
-
+
<server:start name="cc" />
- <!--
- <property name="javax.net.ssl.keyStore"
- value="${build.resources}/test-configs/tomcat-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/tomcat-ssl/conf/client.keystore"/>
- <property name="javax.net.ssl.trustStorePassword" value="unit-tests-client"/>
-
- -->
<junit dir="${module.output}" printsummary="true" haltonerror="false" haltonfailure="false" fork="true" timeout="${junit.timeout}" jvm="${junit.jvm}">
@@ -1857,6 +1895,9 @@
<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" />
+
+ <!-- Disable test -->
+ <sysproperty key="cc.disabled.test.methods" value="testSecurityDomain" />
<!-- tomcat-ssl tests -->
<sysproperty key="web.port" value="8081" />
@@ -1884,13 +1925,13 @@
<!-- 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="**/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"/>
<include name="org/jboss/test/security/test/SubjectContextUnitTestCase.class"/>
<include name="org/jboss/test/security/test/DeepCopySubjectUnitTestCase.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/LoginContextUnitTestCas.class"/>
<include name="org/jboss/test/security/test/NamespacePermissionsUnitTestCase.class"/>
<include name="org/jboss/test/security/test/PermissionNameUnitTestCase.class"/>
@@ -1953,6 +1994,8 @@
<include name="org/jboss/test/jbossts/ASCrashRecovery02/TestWithJMS.class"/ -->
<!-- antcall target="tests-ts-crash-recovery-jms"/ -->
+ <antcall target="tests-cc-audit"/>
+
<antcall target="calculate-md5"/>
<antcall target="tests-report"/>
@@ -2051,6 +2094,50 @@
</target>
+ <!-- Common Criteria Audit test -->
+ <target name="tests-cc-audit">
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+
+ <!-- script tests which start their own servers -->
+ <junit dir="${module.output}" printsummary="${junit.printsummary}" haltonerror="${junit.haltonerror}" haltonfailure="${junit.haltonfailure}" fork="${junit.fork}"
+ timeout="${junit.timeout}" jvm="${junit.jvm}">
+
+ <jvmarg value="${junit.jvm.options}"/>
+ <!-- Used for JGroups -->
+ <jvmarg value="-Dbind.address=${node0}"/>
+ <sysproperty key="jboss.dist" value="${jboss.dist}"/>
+ <sysproperty key="jbosstest.server.config" value="cc-audit"/>
+ <sysproperty key="jboss.server.home.dir" value="${jboss.dist}${/}server${/}cc-audit"/>
+ <sysproperty key="jbosstest.deploy.dir" value="${build.lib}"/>
+ <sysproperty key="build.testlog" value="${build.testlog}"/>
+ <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+ <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
+ <sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
+ <!-- Pass along any jbosstest.* system properties -->
+ <syspropertyset>
+ <propertyref prefix="jbosstest."/>
+ </syspropertyset>
+ <classpath>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${build.resources}"/>
+ <path refid="tests.classpath"/>
+ </classpath>
+
+ <!--sysproperty key="jboss-junit-configuration" value="classloader-leak"/-->
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-security-audit.xml"/>
+
+ <batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
+
+ <fileset dir="${build.classes}">
+ <include name="**/test/security/audit/test/SecurityAuditTestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
<target name="tests-cluster-ec2" description="Runs the various test targets, but against cluster-ec2 config" depends="init">
<record name="${basedir}/output/tests.log" append="no" action="start" loglevel="info"/>
@@ -4980,58 +5067,5 @@
</target>
<target name="check-build-type"><echo message="build.ewp is ${build.ewp} and version is ${version} and version.name is ${version.name}"/></target>
-
- <!-- Common Criteria Targets -->
- <target name="tests-cc-audit">
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.testlog}"/>
-
- <create-config baseconf="default" newconf="cc-audit">
- <patternset>
- <include name="conf/**"/>
- <include name="deploy/**"/>
- <include name="deployers/**"/>
- <include name="lib/**"/>
- </patternset>
- </create-config>
-
- <!-- script tests which start their own servers -->
- <junit dir="${module.output}" printsummary="${junit.printsummary}" haltonerror="${junit.haltonerror}" haltonfailure="${junit.haltonfailure}" fork="${junit.fork}"
- timeout="${junit.timeout}" jvm="${junit.jvm}">
-
- <jvmarg value="${junit.jvm.options}"/>
- <!-- Used for JGroups -->
- <jvmarg value="-Dbind.address=${node0}"/>
- <sysproperty key="jboss.dist" value="${jboss.dist}"/>
- <sysproperty key="jbosstest.server.config" value="cc-audit"/>
- <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
- <sysproperty key="build.testlog" value="${build.testlog}"/>
- <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
- <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
- <sysproperty key="jbosstest.server.host" value="${node0}"/>
- <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
- <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
- <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
- <!-- Pass along any jbosstest.* system properties -->
- <syspropertyset>
- <propertyref prefix="jbosstest."/>
- </syspropertyset>
- <classpath>
- <pathelement location="${build.classes}"/>
- <pathelement location="${build.resources}"/>
- <path refid="tests.classpath"/>
- </classpath>
-
- <!--sysproperty key="jboss-junit-configuration" value="classloader-leak"/-->
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-security-audit.xml"/>
-
- <batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
-
- <fileset dir="${build.classes}">
- <include name="**/test/security/audit/test/SecurityAuditTestCase.class"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
+
</project>
Modified: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/scripts/test/RunTestCase.java
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/scripts/test/RunTestCase.java 2010-10-07 06:05:42 UTC (rev 108472)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/scripts/test/RunTestCase.java 2010-10-07 06:09:21 UTC (rev 108473)
@@ -158,7 +158,7 @@
// waitForServerStart kills the process and throws an exception if server does not start
try {
- ScriptsTestBase.waitForServerStart(getAsyncShellScriptExecutor(), getServerHost(), START_TIMEOUT) ;
+ waitForServerStart(getAsyncShellScriptExecutor(), getServerHost(), START_TIMEOUT) ;
System.out.println("Server started successfully") ;
}
catch(IOException e) {
@@ -177,7 +177,7 @@
// waitForServerStop kills the process and throws an exception if server does not stop
try {
- ScriptsTestBase.waitForServerStop(getAsyncShellScriptExecutor(), STOP_TIMEOUT) ;
+ waitForServerStop(getAsyncShellScriptExecutor(), STOP_TIMEOUT) ;
System.out.println("Server stopped successfully") ;
}
catch(IOException e) {
Modified: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/scripts/test/ScriptsTestBase.java
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/scripts/test/ScriptsTestBase.java 2010-10-07 06:05:42 UTC (rev 108472)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/scripts/test/ScriptsTestBase.java 2010-10-07 06:09:21 UTC (rev 108473)
@@ -46,6 +46,7 @@
import org.jboss.test.scripts.support.AsyncShellScriptExecutor ;
import org.jboss.test.JBossTestCase ;
+
import junit.framework.Assert ;
/**
@@ -70,6 +71,12 @@
LogFileAssertionChecker systemLogChecker = null ;
LogFileAssertionChecker auditLogChecker = null ;
+ /**
+ * There are cases one doesn't want to check for ERRORs or Exceptions in the logs.
+ * Default set to true to not to interfere with previous behaviour.
+ */
+ private boolean checkLogsForErrors = true;
+
public ScriptsTestBase(String name)
{
super(name);
@@ -250,14 +257,17 @@
}
/* check if there is a Tomcat connection to the server */
- private static boolean isServerStarted(String host) throws MalformedURLException {
+ private boolean isServerStarted(String host) throws MalformedURLException {
// URL to Tomcat
URL url = new URL("http", host, 8080, "/") ;
try {
+ log.trace("Trying to open the connection to host " + host);
URLConnection conn = url.openConnection() ;
+ log.trace("URLConnection class name="+conn.getClass().getName());
if (conn instanceof HttpURLConnection) {
HttpURLConnection http = (HttpURLConnection) conn ;
int responseCode = http.getResponseCode();
+ log.trace("responseCode="+responseCode);
if (responseCode > 0 && responseCode < 400) {
return true ;
@@ -285,7 +295,7 @@
*
* NOTE: this is a hack, and assumes the process has been started using the AsynchShellExecutor
*/
- protected static void waitForServerStart(AsyncShellScriptExecutor ase, String host, int timeout) throws IOException {
+ protected void waitForServerStart(AsyncShellScriptExecutor ase, String host, int timeout) throws IOException {
boolean serverStarted = false ;
boolean logsExceptionFree = true ;
@@ -316,7 +326,8 @@
// may contain ERROR log entries corresponding to exceptions
// (ii) other exceptions in the AS should get written to System.err if not handled
// via log4j
- if (ase.getOutput().indexOf("ERROR") > -1 || ase.getError().indexOf("Exception") > -1) {
+ if (isCheckLogsForErrors() &&
+ ((ase.getOutput().indexOf("ERROR") > -1) || ase.getError().indexOf("Exception") > -1)) {
logsExceptionFree = false ;
}
@@ -352,7 +363,7 @@
* This will wait for one second and then attempt to shutdown both the server and the bash shell,
* before throwing an exception.
*/
- protected static void waitForServerStop(AsyncShellScriptExecutor ase, int timeout) throws IOException {
+ protected void waitForServerStop(AsyncShellScriptExecutor ase, int timeout) throws IOException {
boolean serverStopped = false ;
boolean logsExceptionFree = true ;
boolean haltCalled = false ;
@@ -369,6 +380,7 @@
String currentOutput = ase.getOutput() ;
if (currentOutput.indexOf(SERVER_STOPPED_MESSAGE) > -1 || currentOutput.indexOf(SERVER_HALTED_MESSAGE) > -1) {
serverStopped = true ;
+ break;
}
// wait for a sec
@@ -389,7 +401,9 @@
if (ase.getOutput().indexOf(SERVER_HALTED_MESSAGE) > -1)
haltCalled = true ;
- if (!haltCalled && (ase.getOutput().indexOf("ERROR") > -1 || ase.getError().indexOf("Exception") > -1)) {
+ if (!haltCalled
+ && (isCheckLogsForErrors()
+ && (ase.getOutput().indexOf("ERROR") > -1 || ase.getError().indexOf("Exception") > -1))) {
logsExceptionFree = false ;
}
@@ -414,5 +428,19 @@
}
catch(InterruptedException e) {
}
+ }
+
+ /**
+ * @return the checkLogsForErrors
+ */
+ public boolean isCheckLogsForErrors() {
+ return checkLogsForErrors;
+ }
+
+ /**
+ * @param checkLogsForErrors the checkLogsForErrors to set
+ */
+ public void setCheckLogsForErrors(boolean checkLogsForErrors) {
+ this.checkLogsForErrors = checkLogsForErrors;
}
}
Modified: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/scripts/test/ShutdownTestCase.java
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/scripts/test/ShutdownTestCase.java 2010-10-07 06:05:42 UTC (rev 108472)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/scripts/test/ShutdownTestCase.java 2010-10-07 06:09:21 UTC (rev 108473)
@@ -133,7 +133,7 @@
// waitForServerStart kills the process and throws an exception if server does not start
try {
- ScriptsTestBase.waitForServerStart(getAsyncShellScriptExecutor(), getServerHost(), START_TIMEOUT) ;
+ waitForServerStart(getAsyncShellScriptExecutor(), getServerHost(), START_TIMEOUT) ;
System.out.println("Server started successfully") ;
}
catch(IOException e) {
@@ -154,7 +154,7 @@
// waitForServerStop kills the process and throws an exception if server does not stop
try {
- ScriptsTestBase.waitForServerStop(getAsyncShellScriptExecutor(), STOP_TIMEOUT) ;
+ waitForServerStop(getAsyncShellScriptExecutor(), STOP_TIMEOUT) ;
System.out.println("Server stopped successfully") ;
getAsyncShellScriptExecutor().assertOnOutputStream(SERVER_STOPPED_MESSAGE,"Server shutdown message did not appear in logs") ;
}
Modified: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/security/audit/test/SecurityAuditTestCase.java
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/security/audit/test/SecurityAuditTestCase.java 2010-10-07 06:05:42 UTC (rev 108472)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/security/audit/test/SecurityAuditTestCase.java 2010-10-07 06:09:21 UTC (rev 108473)
@@ -21,8 +21,8 @@
public class SecurityAuditTestCase extends ScriptsTestBase {
private ObjectName SERVER_OBJ_NAME = null ;
- private int START_TIMEOUT = 120 ;
- private int STOP_TIMEOUT = 120 ;
+ private int START_TIMEOUT = 2400 ;
+ private int STOP_TIMEOUT = 240 ;
private String command = null;
private String options = null;
@@ -39,10 +39,14 @@
protected void setUp() throws Exception {
super.setUp();
-
+
+ // Do not check for errors in the log files. Doesn't make sense when checking audit log.
+ setCheckLogsForErrors(false);
+
command = "run" ;
- options = " -c " + getServerConfig() + " -b " + getServerHost() ;
+ options = " -c " + getServerConfig() + " -b " + getServerHost();
args = null ;
+ log.debug("command="+command+" options="+options+" args="+args);
shellCommand = getShellCommand(command, options, args) ;
// set the environment if necessary
@@ -100,7 +104,7 @@
// waitForServerStart kills the process and throws an exception if server does not start
try {
- ScriptsTestBase.waitForServerStart(getAsyncShellScriptExecutor(), getServerHost(), START_TIMEOUT) ;
+ waitForServerStart(getAsyncShellScriptExecutor(), getServerHost(), START_TIMEOUT) ;
getLog().debug("Server started successfully");
}
catch(IOException e) {
@@ -119,7 +123,7 @@
// waitForServerStop kills the process and throws an exception if server does not stop
try {
- ScriptsTestBase.waitForServerStop(getAsyncShellScriptExecutor(), STOP_TIMEOUT) ;
+ waitForServerStop(getAsyncShellScriptExecutor(), STOP_TIMEOUT) ;
getLog().debug("Server stopped successfully") ;
}
catch(IOException e) {
Deleted: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/jboss-log4j.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/jboss-log4j.xml 2010-10-07 06:05:42 UTC (rev 108472)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/jboss-log4j.xml 2010-10-07 06:09:21 UTC (rev 108473)
@@ -1,403 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Log4j Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id: jboss-log4j.xml 87678 2009-04-22 16:47:08Z bstansberry at jboss.com $ -->
-
-<!--
- | For more configuration information and examples see the Jakarta Log4j
- | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <!-- ================================= -->
- <!-- Preserve messages in a local file -->
- <!-- ================================= -->
-
- <!-- A time/date based rolling appender -->
- <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="File" value="${jboss.server.log.dir}/server.log"/>
- <param name="Append" value="true"/>
- <!-- In AS 5.0.x the server log threshold was set by a system
- property. In 5.1 and later we are instead using the system
- property to set the priority on the root logger (see <root/> below)
- <param name="Threshold" value="${jboss.server.log.threshold}"/>
- -->
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
- <!-- Rollover at the top of each hour
- <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
- -->
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] (Thread) Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n"/>
-
- <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
- <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
- -->
- </layout>
- </appender>
-
- <!-- A size based file rolling appender
- <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="File" value="${jboss.server.log.dir}/server.log"/>
- <param name="Append" value="false"/>
- <param name="MaxFileSize" value="500KB"/>
- <param name="MaxBackupIndex" value="1"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
- </layout>
- </appender>
- -->
-
- <!-- ============================== -->
- <!-- Append messages to the console -->
- <!-- ============================== -->
-
- <!--
- Console logger commented out to improve performance.
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="Target" value="System.out"/>
- <param name="Threshold" value="INFO"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
- </layout>
- </appender>
- -->
-
- <!-- ====================== -->
- <!-- More Appender examples -->
- <!-- ====================== -->
-
- <!-- Buffer events and log them asynchronously -->
- <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <appender-ref ref="FILE"/>
- <!--
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="SMTP"/>
- -->
- </appender>
-
-
- <!-- EMail events to an administrator
- <appender name="SMTP" class="org.apache.log4j.net.SMTPAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="Threshold" value="ERROR"/>
- <param name="To" value="admin at myhost.domain.com"/>
- <param name="From" value="nobody at myhost.domain.com"/>
- <param name="Subject" value="JBoss Sever Errors"/>
- <param name="SMTPHost" value="localhost"/>
- <param name="BufferSize" value="10"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
- </layout>
- </appender>
- -->
-
- <!-- Syslog events
- <appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="Facility" value="LOCAL7"/>
- <param name="FacilityPrinting" value="true"/>
- <param name="SyslogHost" value="localhost"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
- </layout>
- </appender>
- -->
-
- <!-- Log events to JMS (requires a topic to be created)
- <appender name="JMS" class="org.apache.log4j.net.JMSAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="Threshold" value="ERROR"/>
- <param name="TopicConnectionFactoryBindingName" value="java:/ConnectionFactory"/>
- <param name="TopicBindingName" value="topic/MyErrorsTopic"/>
- </appender>
- -->
-
- <!-- Log events through SNMP
- <appender name="TRAP_LOG" class="org.apache.log4j.ext.SNMPTrapAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="ImplementationClassName" value="org.apache.log4j.ext.JoeSNMPTrapSender"/>
- <param name="ManagementHost" value="127.0.0.1"/>
- <param name="ManagementHostTrapListenPort" value="162"/>
- <param name="EnterpriseOID" value="1.3.6.1.4.1.24.0"/>
- <param name="LocalIPAddress" value="127.0.0.1"/>
- <param name="LocalTrapSendPort" value="161"/>
- <param name="GenericTrapType" value="6"/>
- <param name="SpecificTrapType" value="12345678"/>
- <param name="CommunityString" value="public"/>
- <param name="ForwardStackTraceWithTrap" value="true"/>
- <param name="Threshold" value="DEBUG"/>
- <param name="ApplicationTrapOID" value="1.3.6.1.4.1.24.12.10.22.64"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d,%p,[%t],[%c],%m%n"/>
- </layout>
- </appender>
- -->
-
- <!-- Emit events as JMX notifications
- <appender name="JMX" class="org.jboss.monitor.services.JMXNotificationAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-
- <param name="Threshold" value="WARN"/>
- <param name="ObjectName" value="jboss.system:service=Logging,type=JMXNotificationAppender"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] %m"/>
- </layout>
- </appender>
- -->
- <!-- Clustering logging -->
- <!-- Will redirect the org.jgroups and
- org.jboss.ha categories to a cluster.log file.
- -->
- <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="File" value="${jboss.server.log.dir}/cluster.log"/>
- <param name="Append" value="false"/>
- <param name="MaxFileSize" value="500KB"/>
- <param name="MaxBackupIndex" value="1"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
- </layout>
- </appender>
- <category name="org.jgroups">
- <priority value="WARN" />
- <appender-ref ref="CLUSTER"/>
- </category>
- <category name="org.jboss.ha">
- <priority value="INFO" />
- <appender-ref ref="CLUSTER"/>
- </category>
-
- <!-- Security AUDIT Appender
- <appender name="AUDIT" class="org.jboss.logging.appender.DailyRollingFileAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="File" value="${jboss.server.log.dir}/audit.log"/>
- <param name="Append" value="true"/>
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] (%t:%x) %m%n"/>
- </layout>
- </appender>
- -->
-
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
- <category name="org.jboss.web">
- <priority value="INFO" />
- </category>
- <category name="com.arjuna">
- <priority value="INFO" />
- </category>
-
-
- <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
- <category name="org.apache">
- <priority value="INFO"/>
- </category>
-
- <!-- Limit the jacorb category to WARN as its INFO is verbose -->
- <category name="jacorb">
- <priority value="WARN"/>
- </category>
-
- <!-- Set the logging level of the JSF implementation that uses
- | java.util.logging. The jdk logging levels can be controlled
- | through the org.jboss.logging.log4j.JDKLevel class that
- | in addition to the standard log4j levels it adds support for
- | SEVERE, WARNING, CONFIG, FINE, FINER, FINEST
- -->
- <category name="javax.enterprise.resource.webcontainer.jsf">
- <priority value="INFO" class="org.jboss.logging.log4j.JDKLevel"/>
- </category>
-
- <!-- Limit the org.jgroups category to WARN as its INFO is verbose -->
- <category name="org.jgroups">
- <priority value="WARN"/>
- </category>
-
- <category name="org.hibernate">
- <priority value="INFO" />
- </category>
-
- <!-- Limit the org.quartz category to INFO as its DEBUG is verbose -->
- <category name="org.quartz">
- <priority value="INFO"/>
- </category>
-
- <!-- Limit the com.sun category to INFO as its FINE is verbose -->
- <category name="com.sun">
- <priority value="INFO"/>
- </category>
-
- <!-- Limit the sun category to INFO as its FINE is verbose -->
- <category name="sun">
- <priority value="INFO"/>
- </category>
-
- <!-- Limit the javax.xml.bind category to INFO as its FINE is verbose -->
- <category name="javax.xml.bind">
- <priority value="INFO"/>
- </category>
-
- <!-- Limit the springframework category to WARN-->
- <category name="org.springframework">
- <priority value="WARN"/>
- </category>
-
- <!-- Limit JBoss categories
- <category name="org.jboss">
- <priority value="INFO"/>
- </category>
- -->
-
- <!-- Limit the JSR77 categories -->
- <category name="org.jboss.management">
- <priority value="INFO"/>
- </category>
-
- <!-- Limit the verbose facelets compiler -->
- <category name="facelets.compiler">
- <priority value="WARN"/>
- </category>
-
- <!-- Limit the verbose ajax4jsf cache initialization -->
- <category name="org.ajax4jsf.cache">
- <priority value="WARN"/>
- </category>
-
- <!-- Limit the verbose embedded jopr categories -->
- <category name="org.rhq">
- <priority value="WARN"/>
- </category>
-
- <!-- Limit the verbose seam categories -->
- <category name="org.jboss.seam">
- <priority value="WARN"/>
- </category>
-
- <!-- Limit the verbose MC4J EMS (lib used by admin-console) categories -->
- <category name="org.mc4j.ems">
- <priority value="WARN"/>
- </category>
-
- <!-- Show the evolution of the DataSource pool in the logs [inUse/Available/Max]
- <category name="org.jboss.resource.connectionmanager.JBossManagedConnectionPool">
- <priority value="TRACE"/>
- </category>
- -->
-
- <!-- Category specifically for Security Audit Provider
- <category name="org.jboss.security.audit.providers.LogAuditProvider" additivity="false">
- <priority value="TRACE"/>
- <appender-ref ref="AUDIT"/>
- </category>
- -->
-
- <!-- Limit the org.jboss.serial (jboss-serialization) to WARN as its INFO is verbose -->
- <category name="org.jboss.serial">
- <priority value="WARN"/>
- </category>
-
- <category name="org.jboss.security">
- <priority value="TRACE"/>
- </category>
-
- <!-- Decrease the priority threshold for the org.jboss.varia category
- <category name="org.jboss.varia">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- Enable JBossWS message tracing
- <category name="org.jboss.ws.core.MessageTrace">
- <priority value="TRACE"/>
- </category>
- -->
-
- <!--
- | An example of enabling the custom TRACE level priority that is used
- | by the JBoss internals to diagnose low level details. This example
- | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
- | subpackages. This will produce A LOT of logging output.
- |
- | Note: since jboss AS 4.2.x, the trace level is supported natively by
- | log4j, so although the custom org.jboss.logging.XLevel priority will
- | still work, there is no need to use it. The two examples that follow
- | will both enable trace logging.
- <category name="org.jboss.system">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
- <category name="org.jboss.ejb.plugins">
- <priority value="TRACE"/>
- </category>
- -->
-
- <!--
- | Logs these events to SNMP:
- - server starts/stops
- - cluster evolution (node death/startup)
- - When an EJB archive is deployed (and associated verified messages)
- - When an EAR archive is deployed
-
- <category name="org.jboss.system.server.Server">
- <priority value="INFO" />
- <appender-ref ref="TRAP_LOG"/>
- </category>
-
- <category name="org.jboss.ha.framework.interfaces.HAPartition.lifecycle">
- <priority value="INFO" />
- <appender-ref ref="TRAP_LOG"/>
- </category>
-
- <category name="org.jboss.deployment.MainDeployer">
- <priority value="ERROR" />
- <appender-ref ref="TRAP_LOG"/>
- </category>
-
- <category name="org.jboss.ejb.EJBDeployer">
- <priority value="INFO" />
- <appender-ref ref="TRAP_LOG"/>
- </category>
-
- <category name="org.jboss.deployment.EARDeployer">
- <priority value="INFO" />
- <appender-ref ref="TRAP_LOG"/>
- </category>
- -->
-
- <!-- ======================= -->
- <!-- Setup the Root category -->
- <!-- ======================= -->
-
- <root>
- <!--
- Set the root logger priority via a system property. Note this is parsed by log4j,
- so the full JBoss system property format is not supported; e.g.
- setting a default via ${jboss.server.log.threshold:WARN} will not work.
- -->
- <priority value="${jboss.server.log.threshold}"/>
- <!-- appender-ref ref="CONSOLE"/ -->
- <appender-ref ref="ASYNC"/>
- </root>
-
-</log4j:configuration>
Copied: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/jboss-log4j.xml (from rev 108461, branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-audit/conf/jboss-log4j.xml)
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/jboss-log4j.xml (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/jboss-log4j.xml 2010-10-07 06:09:21 UTC (rev 108473)
@@ -0,0 +1,391 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id: jboss-log4j.xml 96076 2009-11-06 02:32:38Z jim.ma $ -->
+
+<!--
+ | For more configuration information and examples see the Jakarta Log4j
+ | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- A time/date based rolling appender -->
+ <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${jboss.server.log.dir}/server.log"/>
+ <param name="Append" value="true"/>
+ <!-- In AS 5.0.x the server log threshold was set by a system
+ property. In 5.1 and later we are instead using the system
+ property to set the priority on the root logger (see <root/> below)
+ <param name="Threshold" value="${jboss.server.log.threshold}"/>
+ -->
+
+ <!-- Rollover at midnight each day -->
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <!-- Rollover at the top of each hour
+ <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
+ -->
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] (Thread) Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n"/>
+
+ <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
+ <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+ -->
+ </layout>
+ </appender>
+
+ <!-- A size based file rolling appender
+ <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${jboss.server.log.dir}/server.log"/>
+ <param name="Append" value="false"/>
+ <param name="MaxFileSize" value="500KB"/>
+ <param name="MaxBackupIndex" value="1"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Target" value="System.out"/>
+ <param name="Threshold" value="INFO"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ====================== -->
+ <!-- More Appender examples -->
+ <!-- ====================== -->
+
+ <!-- Buffer events and log them asynchronously
+ <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <appender-ref ref="FILE"/>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="SMTP"/>
+ </appender>
+ -->
+
+ <!-- EMail events to an administrator
+ <appender name="SMTP" class="org.apache.log4j.net.SMTPAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Threshold" value="ERROR"/>
+ <param name="To" value="admin at myhost.domain.com"/>
+ <param name="From" value="nobody at myhost.domain.com"/>
+ <param name="Subject" value="JBoss Sever Errors"/>
+ <param name="SMTPHost" value="localhost"/>
+ <param name="BufferSize" value="10"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- Syslog events
+ <appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Facility" value="LOCAL7"/>
+ <param name="FacilityPrinting" value="true"/>
+ <param name="SyslogHost" value="localhost"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- Log events to JMS (requires a topic to be created)
+ <appender name="JMS" class="org.apache.log4j.net.JMSAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Threshold" value="ERROR"/>
+ <param name="TopicConnectionFactoryBindingName" value="java:/ConnectionFactory"/>
+ <param name="TopicBindingName" value="topic/MyErrorsTopic"/>
+ </appender>
+ -->
+
+ <!-- Log events through SNMP
+ <appender name="TRAP_LOG" class="org.apache.log4j.ext.SNMPTrapAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="ImplementationClassName" value="org.apache.log4j.ext.JoeSNMPTrapSender"/>
+ <param name="ManagementHost" value="127.0.0.1"/>
+ <param name="ManagementHostTrapListenPort" value="162"/>
+ <param name="EnterpriseOID" value="1.3.6.1.4.1.24.0"/>
+ <param name="LocalIPAddress" value="127.0.0.1"/>
+ <param name="LocalTrapSendPort" value="161"/>
+ <param name="GenericTrapType" value="6"/>
+ <param name="SpecificTrapType" value="12345678"/>
+ <param name="CommunityString" value="public"/>
+ <param name="ForwardStackTraceWithTrap" value="true"/>
+ <param name="Threshold" value="DEBUG"/>
+ <param name="ApplicationTrapOID" value="1.3.6.1.4.1.24.12.10.22.64"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d,%p,[%t],[%c],%m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- Emit events as JMX notifications
+ <appender name="JMX" class="org.jboss.monitor.services.JMXNotificationAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+
+ <param name="Threshold" value="WARN"/>
+ <param name="ObjectName" value="jboss.system:service=Logging,type=JMXNotificationAppender"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] %m"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- Security AUDIT Appender -->
+ <appender name="AUDIT" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${jboss.server.log.dir}/audit.log"/>
+ <param name="Append" value="true"/>
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] (%t:%x) %m%n"/>
+ </layout>
+ </appender>
+
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
+ <category name="org.apache">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Limit the jacorb category to WARN as its INFO is verbose -->
+ <category name="jacorb">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Set the logging level of the JSF implementation that uses
+ | java.util.logging. The jdk logging levels can be controlled
+ | through the org.jboss.logging.log4j.JDKLevel class that
+ | in addition to the standard log4j levels it adds support for
+ | SEVERE, WARNING, CONFIG, FINE, FINER, FINEST
+ -->
+ <category name="javax.enterprise.resource.webcontainer.jsf">
+ <priority value="INFO" class="org.jboss.logging.log4j.JDKLevel"/>
+ </category>
+
+ <!-- Limit the org.jgroups category to WARN as its INFO is verbose -->
+ <category name="org.jgroups">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Limit the org.quartz category to INFO as its DEBUG is verbose -->
+ <category name="org.quartz">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Limit the com.sun category to INFO as its FINE is verbose -->
+ <category name="com.sun">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Limit the sun category to INFO as its FINE is verbose -->
+ <category name="sun">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Limit the javax.xml.bind category to INFO as its FINE is verbose -->
+ <category name="javax.xml.bind">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Limit the springframework category to WARN-->
+ <category name="org.springframework">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Limit JBoss categories
+ <category name="org.jboss">
+ <priority value="INFO"/>
+ </category>
+ -->
+
+ <!-- Limit the JSR77 categories -->
+ <category name="org.jboss.management">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Limit the verbose facelets compiler -->
+ <category name="facelets.compiler">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Limit the verbose ajax4jsf cache initialization -->
+ <category name="org.ajax4jsf.cache">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Limit the verbose embedded jopr categories -->
+ <category name="org.rhq">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Limit the verbose seam categories -->
+ <category name="org.jboss.seam">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Limit the verbose MC4J EMS (lib used by admin-console) categories -->
+ <category name="org.mc4j.ems">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Show the evolution of the DataSource pool in the logs [inUse/Available/Max]
+ <category name="org.jboss.resource.connectionmanager.JBossManagedConnectionPool">
+ <priority value="TRACE"/>
+ </category>
+ -->
+
+ <!-- Category specifically for Security Audit Provider -->
+ <category name="org.jboss.security.audit.providers.LogAuditProvider" additivity="false">
+ <priority value="TRACE"/>
+ <appender-ref ref="AUDIT"/>
+ </category>
+
+ <!-- Category specifically for Security Audit Provider -->
+ <category name="org.jboss.bootstrap.microcontainer">
+ <priority value="INFO"/>
+ <appender-ref ref="AUDIT"/>
+ </category>
+
+ <!-- Limit the org.jboss.serial (jboss-serialization) to INFO as its DEBUG is verbose -->
+ <category name="org.jboss.serial">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Decrease the priority threshold for the org.jboss.varia category
+ <category name="org.jboss.varia">
+ <priority value="DEBUG"/>
+ </category>
+ -->
+
+ <!-- Enable JBossWS message tracing
+ <category name="org.jboss.ws.core.MessageTrace">
+ <priority value="TRACE"/>
+ </category>
+ -->
+
+ <!--
+ | An example of enabling the custom TRACE level priority that is used
+ | by the JBoss internals to diagnose low level details. This example
+ | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
+ | subpackages. This will produce A LOT of logging output.
+ |
+ | Note: since jboss AS 4.2.x, the trace level is supported natively by
+ | log4j, so although the custom org.jboss.logging.XLevel priority will
+ | still work, there is no need to use it. The two examples that follow
+ | will both enable trace logging.
+ <category name="org.jboss.system">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ </category>
+ <category name="org.jboss.ejb.plugins">
+ <priority value="TRACE"/>
+ </category>
+ -->
+
+ <!--
+ | Logs these events to SNMP:
+ - server starts/stops
+ - cluster evolution (node death/startup)
+ - When an EJB archive is deployed (and associated verified messages)
+ - When an EAR archive is deployed
+
+ <category name="org.jboss.system.server.Server">
+ <priority value="INFO" />
+ <appender-ref ref="TRAP_LOG"/>
+ </category>
+
+ <category name="org.jboss.ha.framework.interfaces.HAPartition.lifecycle">
+ <priority value="INFO" />
+ <appender-ref ref="TRAP_LOG"/>
+ </category>
+
+ <category name="org.jboss.deployment.MainDeployer">
+ <priority value="ERROR" />
+ <appender-ref ref="TRAP_LOG"/>
+ </category>
+
+ <category name="org.jboss.ejb.EJBDeployer">
+ <priority value="INFO" />
+ <appender-ref ref="TRAP_LOG"/>
+ </category>
+
+ <category name="org.jboss.deployment.EARDeployer">
+ <priority value="INFO" />
+ <appender-ref ref="TRAP_LOG"/>
+ </category>
+ -->
+
+ <!-- Clustering logging -->
+ <!-- Uncomment the following to redirect the org.jgroups and
+ org.jboss.ha categories to a cluster.log file.
+
+ <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${jboss.server.log.dir}/cluster.log"/>
+ <param name="Append" value="false"/>
+ <param name="MaxFileSize" value="500KB"/>
+ <param name="MaxBackupIndex" value="1"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+ </layout>
+ </appender>
+ <category name="org.jgroups">
+ <priority value="DEBUG" />
+ <appender-ref ref="CLUSTER"/>
+ </category>
+ <category name="org.jboss.ha">
+ <priority value="DEBUG" />
+ <appender-ref ref="CLUSTER"/>
+ </category>
+ -->
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <!--
+ Set the root logger priority via a system property. Note this is parsed by log4j,
+ so the full JBoss system property format is not supported; e.g.
+ setting a default via ${jboss.server.log.threshold:WARN} will not work.
+ -->
+ <priority value="${jboss.server.log.threshold}"/>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
Deleted: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-audit/conf/jboss-log4j.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-audit/conf/jboss-log4j.xml 2010-10-07 06:05:42 UTC (rev 108472)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc-audit/conf/jboss-log4j.xml 2010-10-07 06:09:21 UTC (rev 108473)
@@ -1,391 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Log4j Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id: jboss-log4j.xml 96076 2009-11-06 02:32:38Z jim.ma $ -->
-
-<!--
- | For more configuration information and examples see the Jakarta Log4j
- | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <!-- ================================= -->
- <!-- Preserve messages in a local file -->
- <!-- ================================= -->
-
- <!-- A time/date based rolling appender -->
- <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="File" value="${jboss.server.log.dir}/server.log"/>
- <param name="Append" value="true"/>
- <!-- In AS 5.0.x the server log threshold was set by a system
- property. In 5.1 and later we are instead using the system
- property to set the priority on the root logger (see <root/> below)
- <param name="Threshold" value="${jboss.server.log.threshold}"/>
- -->
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
- <!-- Rollover at the top of each hour
- <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
- -->
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] (Thread) Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n"/>
-
- <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
- <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
- -->
- </layout>
- </appender>
-
- <!-- A size based file rolling appender
- <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="File" value="${jboss.server.log.dir}/server.log"/>
- <param name="Append" value="false"/>
- <param name="MaxFileSize" value="500KB"/>
- <param name="MaxBackupIndex" value="1"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
- </layout>
- </appender>
- -->
-
- <!-- ============================== -->
- <!-- Append messages to the console -->
- <!-- ============================== -->
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="Target" value="System.out"/>
- <param name="Threshold" value="INFO"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
- </layout>
- </appender>
-
- <!-- ====================== -->
- <!-- More Appender examples -->
- <!-- ====================== -->
-
- <!-- Buffer events and log them asynchronously
- <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <appender-ref ref="FILE"/>
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="SMTP"/>
- </appender>
- -->
-
- <!-- EMail events to an administrator
- <appender name="SMTP" class="org.apache.log4j.net.SMTPAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="Threshold" value="ERROR"/>
- <param name="To" value="admin at myhost.domain.com"/>
- <param name="From" value="nobody at myhost.domain.com"/>
- <param name="Subject" value="JBoss Sever Errors"/>
- <param name="SMTPHost" value="localhost"/>
- <param name="BufferSize" value="10"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
- </layout>
- </appender>
- -->
-
- <!-- Syslog events
- <appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="Facility" value="LOCAL7"/>
- <param name="FacilityPrinting" value="true"/>
- <param name="SyslogHost" value="localhost"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
- </layout>
- </appender>
- -->
-
- <!-- Log events to JMS (requires a topic to be created)
- <appender name="JMS" class="org.apache.log4j.net.JMSAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="Threshold" value="ERROR"/>
- <param name="TopicConnectionFactoryBindingName" value="java:/ConnectionFactory"/>
- <param name="TopicBindingName" value="topic/MyErrorsTopic"/>
- </appender>
- -->
-
- <!-- Log events through SNMP
- <appender name="TRAP_LOG" class="org.apache.log4j.ext.SNMPTrapAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="ImplementationClassName" value="org.apache.log4j.ext.JoeSNMPTrapSender"/>
- <param name="ManagementHost" value="127.0.0.1"/>
- <param name="ManagementHostTrapListenPort" value="162"/>
- <param name="EnterpriseOID" value="1.3.6.1.4.1.24.0"/>
- <param name="LocalIPAddress" value="127.0.0.1"/>
- <param name="LocalTrapSendPort" value="161"/>
- <param name="GenericTrapType" value="6"/>
- <param name="SpecificTrapType" value="12345678"/>
- <param name="CommunityString" value="public"/>
- <param name="ForwardStackTraceWithTrap" value="true"/>
- <param name="Threshold" value="DEBUG"/>
- <param name="ApplicationTrapOID" value="1.3.6.1.4.1.24.12.10.22.64"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d,%p,[%t],[%c],%m%n"/>
- </layout>
- </appender>
- -->
-
- <!-- Emit events as JMX notifications
- <appender name="JMX" class="org.jboss.monitor.services.JMXNotificationAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-
- <param name="Threshold" value="WARN"/>
- <param name="ObjectName" value="jboss.system:service=Logging,type=JMXNotificationAppender"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] %m"/>
- </layout>
- </appender>
- -->
-
- <!-- Security AUDIT Appender -->
- <appender name="AUDIT" class="org.jboss.logging.appender.DailyRollingFileAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="File" value="${jboss.server.log.dir}/audit.log"/>
- <param name="Append" value="true"/>
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] (%t:%x) %m%n"/>
- </layout>
- </appender>
-
-
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
-
- <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
- <category name="org.apache">
- <priority value="INFO"/>
- </category>
-
- <!-- Limit the jacorb category to WARN as its INFO is verbose -->
- <category name="jacorb">
- <priority value="WARN"/>
- </category>
-
- <!-- Set the logging level of the JSF implementation that uses
- | java.util.logging. The jdk logging levels can be controlled
- | through the org.jboss.logging.log4j.JDKLevel class that
- | in addition to the standard log4j levels it adds support for
- | SEVERE, WARNING, CONFIG, FINE, FINER, FINEST
- -->
- <category name="javax.enterprise.resource.webcontainer.jsf">
- <priority value="INFO" class="org.jboss.logging.log4j.JDKLevel"/>
- </category>
-
- <!-- Limit the org.jgroups category to WARN as its INFO is verbose -->
- <category name="org.jgroups">
- <priority value="WARN"/>
- </category>
-
- <!-- Limit the org.quartz category to INFO as its DEBUG is verbose -->
- <category name="org.quartz">
- <priority value="INFO"/>
- </category>
-
- <!-- Limit the com.sun category to INFO as its FINE is verbose -->
- <category name="com.sun">
- <priority value="INFO"/>
- </category>
-
- <!-- Limit the sun category to INFO as its FINE is verbose -->
- <category name="sun">
- <priority value="INFO"/>
- </category>
-
- <!-- Limit the javax.xml.bind category to INFO as its FINE is verbose -->
- <category name="javax.xml.bind">
- <priority value="INFO"/>
- </category>
-
- <!-- Limit the springframework category to WARN-->
- <category name="org.springframework">
- <priority value="WARN"/>
- </category>
-
- <!-- Limit JBoss categories
- <category name="org.jboss">
- <priority value="INFO"/>
- </category>
- -->
-
- <!-- Limit the JSR77 categories -->
- <category name="org.jboss.management">
- <priority value="INFO"/>
- </category>
-
- <!-- Limit the verbose facelets compiler -->
- <category name="facelets.compiler">
- <priority value="WARN"/>
- </category>
-
- <!-- Limit the verbose ajax4jsf cache initialization -->
- <category name="org.ajax4jsf.cache">
- <priority value="WARN"/>
- </category>
-
- <!-- Limit the verbose embedded jopr categories -->
- <category name="org.rhq">
- <priority value="WARN"/>
- </category>
-
- <!-- Limit the verbose seam categories -->
- <category name="org.jboss.seam">
- <priority value="WARN"/>
- </category>
-
- <!-- Limit the verbose MC4J EMS (lib used by admin-console) categories -->
- <category name="org.mc4j.ems">
- <priority value="WARN"/>
- </category>
-
- <!-- Show the evolution of the DataSource pool in the logs [inUse/Available/Max]
- <category name="org.jboss.resource.connectionmanager.JBossManagedConnectionPool">
- <priority value="TRACE"/>
- </category>
- -->
-
- <!-- Category specifically for Security Audit Provider -->
- <category name="org.jboss.security.audit.providers.LogAuditProvider" additivity="false">
- <priority value="TRACE"/>
- <appender-ref ref="AUDIT"/>
- </category>
-
- <!-- Category specifically for Security Audit Provider -->
- <category name="org.jboss.bootstrap.microcontainer">
- <priority value="INFO"/>
- <appender-ref ref="AUDIT"/>
- </category>
-
- <!-- Limit the org.jboss.serial (jboss-serialization) to INFO as its DEBUG is verbose -->
- <category name="org.jboss.serial">
- <priority value="INFO"/>
- </category>
-
- <!-- Decrease the priority threshold for the org.jboss.varia category
- <category name="org.jboss.varia">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- Enable JBossWS message tracing
- <category name="org.jboss.ws.core.MessageTrace">
- <priority value="TRACE"/>
- </category>
- -->
-
- <!--
- | An example of enabling the custom TRACE level priority that is used
- | by the JBoss internals to diagnose low level details. This example
- | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
- | subpackages. This will produce A LOT of logging output.
- |
- | Note: since jboss AS 4.2.x, the trace level is supported natively by
- | log4j, so although the custom org.jboss.logging.XLevel priority will
- | still work, there is no need to use it. The two examples that follow
- | will both enable trace logging.
- <category name="org.jboss.system">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
- <category name="org.jboss.ejb.plugins">
- <priority value="TRACE"/>
- </category>
- -->
-
- <!--
- | Logs these events to SNMP:
- - server starts/stops
- - cluster evolution (node death/startup)
- - When an EJB archive is deployed (and associated verified messages)
- - When an EAR archive is deployed
-
- <category name="org.jboss.system.server.Server">
- <priority value="INFO" />
- <appender-ref ref="TRAP_LOG"/>
- </category>
-
- <category name="org.jboss.ha.framework.interfaces.HAPartition.lifecycle">
- <priority value="INFO" />
- <appender-ref ref="TRAP_LOG"/>
- </category>
-
- <category name="org.jboss.deployment.MainDeployer">
- <priority value="ERROR" />
- <appender-ref ref="TRAP_LOG"/>
- </category>
-
- <category name="org.jboss.ejb.EJBDeployer">
- <priority value="INFO" />
- <appender-ref ref="TRAP_LOG"/>
- </category>
-
- <category name="org.jboss.deployment.EARDeployer">
- <priority value="INFO" />
- <appender-ref ref="TRAP_LOG"/>
- </category>
- -->
-
- <!-- Clustering logging -->
- <!-- Uncomment the following to redirect the org.jgroups and
- org.jboss.ha categories to a cluster.log file.
-
- <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="File" value="${jboss.server.log.dir}/cluster.log"/>
- <param name="Append" value="false"/>
- <param name="MaxFileSize" value="500KB"/>
- <param name="MaxBackupIndex" value="1"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
- </layout>
- </appender>
- <category name="org.jgroups">
- <priority value="DEBUG" />
- <appender-ref ref="CLUSTER"/>
- </category>
- <category name="org.jboss.ha">
- <priority value="DEBUG" />
- <appender-ref ref="CLUSTER"/>
- </category>
- -->
-
- <!-- ======================= -->
- <!-- Setup the Root category -->
- <!-- ======================= -->
-
- <root>
- <!--
- Set the root logger priority via a system property. Note this is parsed by log4j,
- so the full JBoss system property format is not supported; e.g.
- setting a default via ${jboss.server.log.threshold:WARN} will not work.
- -->
- <priority value="${jboss.server.log.threshold}"/>
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="FILE"/>
- </root>
-
-</log4j:configuration>
More information about the jboss-cvs-commits
mailing list