[embjopr-commits] EMBJOPR SVN: r140 - trunk/jsfunit.

[embjopr-commits at lists.jboss.org]

Author: ozizka at redhat.com
Date: 2009-02-06 15:12:35 -0500 (Fri, 06 Feb 2009)
New Revision: 140

Modified:
   trunk/jsfunit/pom.xml
Log:
Added to AS configuration:
 * server.xml - HTTP logging enabled
 * jboss-log4j.xml - logging limited

Modified: trunk/jsfunit/pom.xml
===================================================================
--- trunk/jsfunit/pom.xml	2009-02-06 19:45:05 UTC (rev 139)
+++ trunk/jsfunit/pom.xml	2009-02-06 20:12:35 UTC (rev 140)
@@ -130,21 +130,30 @@
                      <container>
                         <containerId>jboss42x</containerId>
                         <home>${JBOSS_HOME}</home>
-                        <!-- JVM location; currently doesn't work and isn't documented.
-                             I even don't know whether it should be here or on the other place. -->
-                        <!--<cargo.java.home>${JAVA_HOME}</cargo.java.home>-->
                         <log>${basedir}/target/jboss4.2.logs/cargo.log</log>
                         <timeout>300000</timeout>   <!-- 5 minutes -->
                         <systemProperties>
-                        <!-- snoops request and response from client side
-                             result is in server.log 
+                           <!-- snoops request and response from client side result is in server.log
                            <jsfunit.htmlunitsnooper>enabled</jsfunit.htmlunitsnooper> -->
                            <jsfunit.testdata>${basedir}/testdata</jsfunit.testdata>
                            <jsfunit.deploy.dir>${basedir}/target/jboss42x/deploy</jsfunit.deploy.dir>
-                           <!-- JVM location; see above. -->
-                           <!--<cargo.java.home>${JAVA_HOME}</cargo.java.home>-->
                         </systemProperties>
                      </container>
+
+                     <!-- Container configuration -->
+                     <configuration>
+                       <!-- Set where the configuration dir will be. -->
+                       <type>standalone</type>
+                       <home>target/jboss5x</home>
+                       <properties>
+                         <cargo.java.home>${JAVA_HOME}</cargo.java.home>
+                       </properties>
+                       <!-- Override Cargo's default files (some taken from cargo's .jar, some from 'default') -->
+                       <configfiles>
+                       </configfiles>
+                     </configuration>
+                     <!-- /Container configuration -->
+
                   </configuration>
                   <executions>
                      <execution>
@@ -249,17 +258,26 @@
                        <!-- TODO: Prepend ${basedir}/ and test; Copy to AS 4 and test.-->
                        <type>standalone</type>
                        <home>target/jboss5x</home>
-                       <!-- Raise permgen size, allow classes unloading and permgen sweep -->
                        <properties>
-                         <cargo.jvmargs>-XX:PermSize=512m -XX:MaxPermSize=1024 -XX:+UseConcMarkSweepGC -XX:+CMSPermGenSweepingEnabled -XX:+CMSClassUnloadingEnabled</cargo.jvmargs>
+                         <cargo.java.home>${JAVA_HOME}</cargo.java.home>
+                         <!-- Raise permgen size, allow classes unloading and permgen sweep -->
+                         <cargo.jvmargs>-XX:PermSize=128m -XX:MaxPermSize=128</cargo.jvmargs>
+                         <!-- -XX:+UseConcMarkSweepGC -XX:+CMSPermGenSweepingEnabled -XX:+CMSClassUnloadingEnabled  -->
+                         <!-- <com.sun.management.jmxremote></com.sun.management.jmxremote> -->
                        </properties>
-                       <!-- Override Cargo's default jboss-log4j.xml -->
+                       <!-- Override Cargo's default files (some taken from cargo's .jar, some from 'default') -->
                        <configfiles>
+                         <!-- Limit logging -->
                          <configfile>
-                           <file>${JBOSS_HOME}/server/default/conf/jboss-log4j.xml</file>
+                           <file>${basedir}/testdata/jboss-configuration/conf/jboss-log4j.xml</file>
                            <tofile>conf/jboss-log4j.xml</tofile>
                          </configfile>
+                         <!-- Open Tomcat's HTTP logging valve -->
                          <configfile>
+                           <file>${basedir}/testdata/jboss-configuration/deploy/jbossweb.sar/server.xml</file>
+                           <tofile>deploy/jbossweb.sar/server.xml</tofile>
+                         </configfile>
+                         <configfile>
                            <file>${basedir}/testdata/datasources/MultipleDatasources-ds.xml</file>
                            <toFile>deploy/MultipleDatasources-ds.xml</toFile>
                          </configfile>
@@ -323,6 +341,17 @@
          </build>
       </profile>
 
+      <!-- Hudson profile (commented - hesitating to hard-code version dir to pom.xml)
+      <profile>
+        <id>running-in-hudson</id>
+        <activation>
+          <property><name>user.name</name><value>hudson</value></property>
+        </activation>
+        <properties>
+          <JBOSS_HOME>${basedir}/jbossas-5.x/build/output/jboss-5.1.0.Beta1</JBOSS_HOME>
+        </properties>
+      </profile>-->
+
    </profiles>