Author: smcgowan(a)redhat.com Date: 2010-02-08 15:13:20 -0500 (Mon, 08 Feb 2010) New Revision: 874 Added: trunk/jsfunit/testdata/jboss6-configuration/ trunk/jsfunit/testdata/jboss6-configuration/conf/jboss-service.xml Removed: trunk/jsfunit/testdata/jboss6-configuration/conf/jboss-log4j.xml Modified: trunk/jsfunit/pom.xml trunk/jsfunit/testdata/jboss6-configuration/deploy/jbossweb.sar/server.xml Log: EMBJOPR-283 - first pass at tests against 6.0.0.M2 Modified: trunk/jsfunit/pom.xml =================================================================== --- trunk/jsfunit/pom.xml 2010-02-05 20:22:05 UTC (rev 873) +++ trunk/jsfunit/pom.xml 2010-02-08 20:13:20 UTC (rev 874) @@ -9,6 +9,7 @@ <mavenConflictResolvers>newest,nearest</mavenConflictResolvers> <cargo.plugin.version>1.0.1-SNAPSHOT</cargo.plugin.version> + <cargo.plugin.version.as6>1.0.1-alpha-2</cargo.plugin.version.as6> <jvm.args.debug></jvm.args.debug> <!-- Used by the -Pdebug profile. --> <jvm.args.profiler></jvm.args.profiler> <!-- Used by the -Pprofile profile. --> <jvm.args.exposejmx></jvm.args.exposejmx> <!-- Expose JMX - used to enable the Hibernate statistics. --> @@ -138,19 +139,19 @@ <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> - <version>2.0.1-FCS</version> <!-- 2.0 --> + <version>2.0.2-FCS</version> <!-- 2.0 --> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-j2se</artifactId> - <version>5.1.0.GA</version> <!-- 5.1.0.GA --> + <version>6.0.0.M1</version> <!-- 5.1.0.GA --> <scope>provided</scope> </dependency> <dependency> - <groupId>javax.servlet</groupId> + <groupId>jboss.web</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version> <!-- 2.5 --> + <version>3.0.0-beta-2</version> <!-- 2.5 --> <scope>provided</scope> </dependency> <dependency> @@ -178,25 +179,30 @@ <dependency> <groupId>org.jboss.integration</groupId> <artifactId>jboss-profileservice-spi</artifactId> - <version>5.1.0.GA</version> <!-- 5.1.0.SP1 --> + <version>6.0.0-Alpha8</version> <!-- 5.1.0.SP1 --> <scope>provided</scope> </dependency> + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <version>1.0.0.GA</version> + </dependency> <dependency> <groupId>org.jboss.man</groupId> <artifactId>jboss-metatype</artifactId> - <version>2.1.1.GA</version> <!-- 2.1.1.GA --> + <version>2.1.1.SP1</version> <!-- 2.1.1.GA --> <scope>provided</scope> </dependency> <dependency> <groupId>jboss.messaging</groupId> <artifactId>jboss-messaging-client</artifactId> - <version>1.4.3.GA</version> + <version>1.4.6.GA</version> <scope>provided</scope> </dependency> <dependency> <groupId>jboss.messaging</groupId> <artifactId>jboss-messaging</artifactId> - <version>1.4.3.GA</version> + <version>1.4.6.GA</version> <scope>provided</scope> </dependency> <dependency> @@ -703,6 +709,367 @@ </build> </profile> + <!-- JBoss AS 6.x --> + <profile> + <id>jboss6x</id> + <dependencies> + <dependency> + <groupId>org.jboss.jopr</groupId> + <artifactId>jopr-embedded-jbas5</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> + <scope>compile</scope> + </dependency> + </dependencies> + + <build> + <plugins> + + <!-- Enable message counters in messaging-service.xml --> + <plugin> + <groupId>bakersoftware</groupId> + <artifactId>maven-replacer-plugin</artifactId> + <version>0.0.9</version> + <executions> + <execution><id>mrp1</id> + <phase>initialize</phase><goals><goal>replace</goal></goals> + <configuration> + <file>${JBOSS_HOME}/server/default/deploy/messaging/messaging-service.xml</file> + <token>attribute name="EnableMessageCounters"&gt;false</token> + <value>attribute name="EnableMessageCounters"&gt;true</value> + </configuration> + </execution> + <execution><id>mrp2</id> + <phase>initialize</phase><goals><goal>replace</goal></goals> + <configuration> + <file>${JBOSS_HOME}/server/standard/deploy/messaging/messaging-service.xml</file> + <token>attribute name="EnableMessageCounters"&gt;false</token> + <value>attribute name="EnableMessageCounters"&gt;true</value> + </configuration> + </execution> + <execution><id>mrp3</id> + <phase>initialize</phase><goals><goal>replace</goal></goals> + <configuration> + <file>${JBOSS_HOME}/server/all/deploy/messaging/messaging-service.xml</file> + <token>attribute name="EnableMessageCounters"&gt;false</token> + <value>attribute name="EnableMessageCounters"&gt;true</value> + </configuration> + </execution> + </executions> + </plugin> + + <!-- AntRun - Exctract the war to let Cargo plugin deploy it. --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <!-- Extract WAR - SEAM bug. --> + <execution> + <id>extract_war_for_cargo</id> + <phase>package</phase> <goals><goal>run</goal></goals> + <configuration><tasks> + <echo>Exctracting war...</echo> + <move file="${project.build.directory}/${project.build.finalName}.${project.packaging}" + toFile="${project.build.directory}/${project.build.finalName}_archive.${project.packaging}"/> + <unzip src="${project.build.directory}/${project.build.finalName}_archive.${project.packaging}" + dest="${project.build.directory}/${project.build.finalName}.${project.packaging}"/> + </tasks></configuration> + </execution> + <!-- Write "Don't kill" to hudson log/ --> + <execution> + <id>dont_kill_appeal</id> + <phase>pre-integration-test</phase> <goals><goal>run</goal></goals> + <configuration><tasks> + <echo>########################## Please don't kill this job unless it takes more than six hours.</echo> + <echo>########################## There's no logging visible on Hudson during test run.</echo> + </tasks></configuration> + </execution> + <!-- Delete the exploded WAR and rename the archive back. --> + <execution> + <id>rename-the-artifact-back</id> + <phase>post-integration-test</phase> <goals><goal>run</goal></goals> + <configuration><tasks> + <echo>Renaming exploded war and renaming the zip back to the artifact name.</echo> + <move file="${project.build.directory}/${project.build.finalName}.${project.packaging}" toFile="${project.build.directory}/${project.build.finalName}_exploded.${project.packaging}"/> + <move file="${project.build.directory}/${project.build.finalName}_archive.${project.packaging}" + toFile="${project.build.directory}/${project.build.finalName}.${project.packaging}"/> + </tasks></configuration> + </execution> + </executions> + </plugin> + + <!-- Exctract the war to let Cargo plugin deploy it. + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>explode-war</id> + <phase>pre-integration-test</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/${project.build.finalName}_for_cargo_EMBJOPR-235.${project.packaging}</outputDirectory> + <overWriteReleases>true</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + <includes>**\/*</includes> + <excludes></excludes> + <artifactItems> + <artifactItem> + <groupId>org.jboss.jopr</groupId> + <artifactId>jopr-embedded-jsfunit</artifactId> + <version>${project.version}</version> + <type>war</type> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + --> + + + <!-- Cargo plugin (for AS 6) --> + <plugin> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-maven2-plugin</artifactId> + <version>${cargo.plugin.version.as6}</version> + <configuration> + <wait>false</wait> + <container> + <containerId>jboss6x</containerId> + <home>${JBOSS_HOME}</home> <!-- Binaries used by Cargo. --> + <log>${basedir}/target/jboss6.x.logs/cargo.log</log> + <timeout>420000</timeout> <!-- 7 minutes --> + <systemProperties> + <!-- Used in jboss-log4j.xml. See /testdata/... --> + <jboss.server.log.threshold>ALL</jboss.server.log.threshold> + <!-- Snoops request and response from client side. Result is in server.log + <jsfunit.htmlunitsnooper>enabled</jsfunit.htmlunitsnooper> --> + <jsfunit.testdata>${basedir}/testdata</jsfunit.testdata> + <jsfunit.tempdir>${basedir}/target/jboss6x/tmp</jsfunit.tempdir> + <jsfunit.deploy.dir>${basedir}/target/jboss6x/deploy</jsfunit.deploy.dir> + <jboss.configuration>${cargo.jboss.configuration}</jboss.configuration> + <!--<jboss.bind.address>${cargo.jboss.bind.address}</jboss.bind.address>--> + <!-- Home dir for Cargo's JBoss instance. --> + <jsfunit.jboss.home.dir>${basedir}/target/jboss6x</jsfunit.jboss.home.dir> + <htmlunit.browser>${htmlunit.browser}</htmlunit.browser> + <jsfunit.jboss.isSecured>${jboss.isSecured}</jsfunit.jboss.isSecured> + <jboss.platform.mbeanserver>true</jboss.platform.mbeanserver> <!-- Makes the JVM resource appear. --> + <jopr.version>${jopr.version}</jopr.version> + </systemProperties> + </container> + + <!-- Container configuration --> + <configuration> + <!-- Set where the configuration dir will be. --> + <!-- TODO: Prepend ${basedir}/ and test; Copy to AS 4 and test.--> + <type>standalone</type> + <home>target/jboss6x</home> + <properties> + <cargo.java.home>${JAVA_HOME}</cargo.java.home> + <!-- Raise permgen size, allow classes unloading and permgen sweep --> + <!-- xb.builder.useUnorderedSequence=true is the same what run.sh does. --> + <!-- See http://www.nabble.com/changes-in-parsing-with-xb-td22478176.html --> + <cargo.jvmargs>${jvm.args.debug} ${jvm.args.profiler} ${jvm.args.exposejmx} ${jvm.args.memory} ${jvm.args.common} ${jvm.args.vendor-specific} -Dxb.builder.useUnorderedSequence=true</cargo.jvmargs> + <!-- -XX:+UseConcMarkSweepGC -XX:+CMSPermGenSweepingEnabled -XX:+CMSClassUnloadingEnabled -XX:-UseGCOverheadLimit --> + <!-- JBoss configuration - default, all, standard --> + <cargo.jboss.configuration>${cargo.jboss.configuration}</cargo.jboss.configuration> + <!-- Set explicitely because of Cargo's bad port settings for JBoss. --> + <cargo.rmi.port>1099</cargo.rmi.port> + </properties> + <!-- Override Cargo's default files (some taken from cargo's .jar, some from 'default') --> + <configfiles> + <!-- Override jboss-service even with this cargo version --> + <configfile> + <file>${basedir}/testdata/jboss6-configuration/conf/jboss-service.xml</file> + <tofile>conf/jboss-service.xml</tofile> + </configfile> + <!-- Limit logging - need to limit using deploy/jboss-logging.xml in AS 6--> + <!-- Open Tomcat's HTTP logging valve --> + <configfile> + <file>${basedir}/testdata/jboss6-configuration/deploy/jbossweb.sar/server.xml</file> + <tofile>deploy/jbossweb.sar/server.xml</tofile> + </configfile> + <!-- JMX Console Users --> + <configfile> + <file>${basedir}/testdata/jboss6-configuration/conf/props/jmx-console-roles.properties</file> + <tofile>conf/props/jmx-console-roles.properties</tofile> + </configfile> + <configfile> + <file>${basedir}/testdata/jboss6-configuration/conf/props/jmx-console-users.properties</file> + <tofile>conf/props/jmx-console-users.properties</tofile> + </configfile> + <!-- Replaced with maven-replacer-plugin - see above. + <configfile> + <file>${basedir}/testdata/jboss6-configuration/deploy/messaging-service.xml</file> + <tofile>deploy/messaging/messaging-service.xml</tofile> + </configfile> + --> + </configfiles> + + <!-- Deploy the test files --> + <files> + <copy> + <file>${basedir}/testdata/destinations</file> + <toDir>deploy</toDir> + </copy> + <copy> + <file>${basedir}/testdata/datasources/testFiles</file> + <toDir>deploy</toDir> + </copy> + <copy> + <file>${basedir}/testdata/connfactories</file> + <toDir>deploy</toDir> + </copy> + <copy> + <file>${basedir}/testdata/rar/embjoprtestadapter.rar</file> + <toDir>deploy</toDir> + </copy> + </files> + </configuration> + <!-- /Container configuration --> + + </configuration> + <executions> + <execution> + <id>start-container</id> + <phase>pre-integration-test</phase> + <goals> <goal>start</goal> </goals> + </execution> + <execution> + <id>stop-container</id> + <phase>post-integration-test</phase> + <goals> <goal>stop</goal> </goals> + </execution> + </executions> + </plugin> + + <!-- Surefire plugin (for AS 6) --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <executions> + <execution> + <id>surefire-it</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + <failIfNoTests>true</failIfNoTests> + <testFailureIgnore>true</testFailureIgnore> + <includes> + <include>**/as5/*Test.java</include> + <include>**/jsfunit/*Test.java</include> + + <include>**/as5/connfactories/*Test.java</include> + <include>**/as5/datasources/*Test.java</include> + <include>**/as5/jmsDestinations/*Test.java</include> + + <include>**/as5/app/war/*Test.java</include> + <include>**/as5/app/embwar/*Test.java</include> + <include>**/as5/app/ear/*Test.java</include> + <include>**/as5/app/rar/*Test.java</include> + <include>**/as5/app/ejb/*Test.java</include> + + <include>**/as5/connectors/*Test.java</include> + <include>**/as5/sbm/*Test.java</include> + <include>**/as5/scripts/*Test.java</include> + <!--<include>**/as5/hbn/*Test.java</include>--> + <include>**/as5/jbcache/*Test.java</include> + + <!-- + --> + </includes> + <excludes> + <exclude>**/as4/**</exclude> + <exclude>**/*EarStressTest.java</exclude> + <!-- + --> + </excludes> + <systemProperties> + <property> + <name>cactus.contextURL</name> + <value>http://localhost:8080/admin-console</value> + </property> + <property> + <name>cactus.servletRedirectorName</name> + <value>ServletRedirector.jsfunit</value> + </property> + <property> + <name>htmlunit.browser</name> + <value>${htmlunit.browser}</value> + </property> + </systemProperties> + </configuration> + </execution> + </executions> + </plugin> + + <!-- XSLT plugin - To separate the reports by package. Each execution separates one. --> + <!-- Disabled - bug: + javax.xml.transform.TransformerException: javax.xml.transform.TransformerException: + com.sun.org.apache.xml.internal.utils.WrappedRuntimeException: Premature end of file. + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>xslt-maven-plugin</artifactId> + <executions> + <execution><id>xslt-as5</id><phase>post-integration-test</phase><goals><goal>transform</goal></goals> + <configuration> + <fileNameReplacement>TEST-org.jboss.jopr.jsfunit.as5.xml</fileNameReplacement> + <parameters><packageName>org.jboss.jopr.jsfunit.as5.</packageName></parameters> + </configuration> + </execution> + <execution><id>xslt-war</id><phase>post-integration-test</phase><goals><goal>transform</goal></goals> + <configuration> + <fileNameReplacement>TEST-org.jboss.jopr.jsfunit.as5.app.war.xml</fileNameReplacement> + <parameters><packageName>org.jboss.jopr.jsfunit.as5.app.war.</packageName></parameters> + </configuration> + </execution> + <execution><id>xslt-ear</id><phase>post-integration-test</phase><goals><goal>transform</goal></goals> + <configuration> + <fileNameReplacement>TEST-org.jboss.jopr.jsfunit.as5.app.ear.xml</fileNameReplacement> + <parameters><packageName>org.jboss.jopr.jsfunit.as5.app.ear.</packageName></parameters> + </configuration> + </execution> + <execution><id>xslt-rar</id><phase>post-integration-test</phase><goals><goal>transform</goal></goals> + <configuration> + <fileNameReplacement>TEST-org.jboss.jopr.jsfunit.as5.app.rar.xml</fileNameReplacement> + <parameters><packageName>org.jboss.jopr.jsfunit.as5.app.rar.</packageName></parameters> + </configuration> + </execution> + <execution><id>xslt-ejb</id><phase>post-integration-test</phase><goals><goal>transform</goal></goals> + <configuration> + <fileNameReplacement>TEST-org.jboss.jopr.jsfunit.as5.app.ejb.xml</fileNameReplacement> + <parameters><packageName>org.jboss.jopr.jsfunit.as5.app.ejb.</packageName></parameters> + </configuration> + </execution> + <execution><id>xslt-datasources</id><phase>post-integration-test</phase><goals><goal>transform</goal></goals> + <configuration> + <fileNameReplacement>TEST-org.jboss.jopr.jsfunit.as5.app.datasources.xml</fileNameReplacement> + <parameters><packageName>org.jboss.jopr.jsfunit.as5.app.datasources.</packageName></parameters> + </configuration> + </execution> + <execution><id>xslt-jmsDestinations</id><phase>post-integration-test</phase><goals><goal>transform</goal></goals> + <configuration> + <fileNameReplacement>TEST-org.jboss.jopr.jsfunit.as5.app.jmsDestinations.xml</fileNameReplacement> + <parameters><packageName>org.jboss.jopr.jsfunit.as5.app.jmsDestinations.</packageName></parameters> + </configuration> + </execution> + </executions> + </plugin> + --> + </plugins> + </build> + </profile> + <!-- Debug profile - waits for debugger connection at port 4000. The right time to connect is when Cargo plugin starts the server. --> <profile> Copied: trunk/jsfunit/testdata/jboss6-configuration (from rev 873, trunk/jsfunit/testdata/jboss-configuration) Deleted: trunk/jsfunit/testdata/jboss6-configuration/conf/jboss-log4j.xml =================================================================== --- trunk/jsfunit/testdata/jboss-configuration/conf/jboss-log4j.xml 2010-02-05 20:22:05 UTC (rev 873) +++ trunk/jsfunit/testdata/jboss6-configuration/conf/jboss-log4j.xml 2010-02-08 20:13:20 UTC (rev 874) @@ -1,409 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - -<!-- ===================================================================== --> -<!-- --> -<!-- Log4j Configuration --> -<!-- --> -<!-- ===================================================================== --> - -<!-- $Id: log4j.xml 64096 2007-07-17 14:36:23Z stan.silvert(a)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"> - - <appender name="EmbJopr" class="org.jboss.logging.appender.DailyRollingFileAppender"> - <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> - <param name="File" value="${jboss.server.log.dir}/embjopr.log"/> - <param name="Append" value="false"/> - <param name="Threshold" value="ALL"/> - <param name="DatePattern" value="'.'yyyy-MM-dd"/> - <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"/> - </layout> - </appender> - - - - <!-- ================================= --> - <!-- 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="false"/> - <!-- - Set the threshold 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. - --> - <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=&quot;admin(a)myhost.domain.com&quot;/&gt; - <param name="From" value=&quot;nobody(a)myhost.domain.com&quot;/&gt; - <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 --> - <!-- ================ --> - - - - <!-- === Embedded Jopr related === --> - - <!-- We don't care about CSS errors, do we? This cluttered log with CSS warning. --> - <category name="com.gargoylesoftware.htmlunit.DefaultCssErrorHandler"> - <priority value="ERROR"/> - </category> - - <category name="org.jboss.seam"> - <priority value="WARN"/> - </category> - <category name="org.ajax4jsf"> - <priority value="WARN"/> - </category> - <category name="httpclient.wire"> - <priority value="INFO"/> - </category> - <category name="facelets"> - <priority value="INFO"/> - </category> - <category name="com.gargoylesoftware.htmlunit.javascript.host"> - <priority value="INFO"/> - </category> - <category name="com.gargoylesoftware.htmlunit.html.HtmlScript"> - <priority value="INFO"/> - </category> - - <category name="org.jboss.managed.plugins.factory.AbstractManagedObjectFactory"> - <priority value="INFO"/> - </category> - <category name="org.jboss.deployers.plugins.managed.BeanMetaDataICF"> - <priority value="INFO"/> - </category> - <category name="org.jboss.profileservice.management.ManagementViewImpl"> - <priority value="INFO"/> - </category> - - - - <!-- We care much about JOPR and JSFUnit tests. --> - <category name="org.jboss.jopr.jsfunit"> - <priority value="DEBUG"/> - <appender-ref ref="EmbJopr"/> - </category> - - <category name="org.jboss.on.embedded"> - <priority value="DEBUG"/> - </category> - - <!-- Mute compareVersions()'s debug output. --> - <category name="org.jboss.jopr.jsfunit.util.EjtsEnvironmentInfo"> - <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 JSF logging to DEBUG. FINER and FINEST will not be logged --> - <category name="javax.enterprise.resource.webcontainer.jsf"> - <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 --> - <category name="javax.enterprise.resource.webcontainer.jsf"> - <priority value="INFO" /> - </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 JBoss categories - <category name="org.jboss"> - <priority value="INFO"/> - </category> - --> - - <!-- Limit the JSR77 categories --> - <category name="org.jboss.management"> - <priority value="INFO"/> - </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 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> - <appender-ref ref="CONSOLE"/> - <appender-ref ref="FILE"/> - </root> - -</log4j:configuration> Added: trunk/jsfunit/testdata/jboss6-configuration/conf/jboss-service.xml =================================================================== --- trunk/jsfunit/testdata/jboss6-configuration/conf/jboss-service.xml (rev 0) +++ trunk/jsfunit/testdata/jboss6-configuration/conf/jboss-service.xml 2010-02-08 20:13:20 UTC (rev 874) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- $Id: jboss-service.xml 96504 2009-11-18 19:01:09Z scott.stark(a)jboss.org $ --> + +<!-- ===================================================================== --> +<!-- JBoss Server Configuration --> +<!-- ===================================================================== --> + +<server> + + <!-- Load all jars from the JBOSS_HOME/server/<config>/lib directory and + the shared JBOSS_HOME/common/lib directory. This can be restricted to + specific jars by specifying them in the archives attribute. + TODO: Move this configuration elsewhere + --> + <classpath codebase="${jboss.server.lib.url}" archives="*"/> + <classpath codebase="${jboss.common.lib.url}" archives="*"/> + +</server> Modified: trunk/jsfunit/testdata/jboss6-configuration/deploy/jbossweb.sar/server.xml =================================================================== --- trunk/jsfunit/testdata/jboss-configuration/deploy/jbossweb.sar/server.xml 2010-02-05 20:22:05 UTC (rev 873) +++ trunk/jsfunit/testdata/jboss6-configuration/deploy/jbossweb.sar/server.xml 2010-02-08 20:13:20 UTC (rev 874) @@ -5,6 +5,9 @@ <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" /> <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html --> <Listener className="org.apache.catalina.core.JasperListener" /> + <!-- Required for mod_cluster integration, will be ignored if mod_cluster is not enabled --> + <Listener className="org.jboss.web.tomcat.service.deployers.MicrocontainerIntegrationLifecycleListener" + delegateBeanName="ModClusterListener" failIfBeanMissing="false" warnIfBeanMissing="false"/> <Service name="jboss.web">