[jboss-cvs] JBossAS SVN: r109118 - in branches/JBPAPP_5_1/testsuite: src/resources/cc and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: pskopek at redhat.com
Date: 2010-11-04 05:29:10 -0400 (Thu, 04 Nov 2010)
New Revision: 109118

Modified:
   branches/JBPAPP_5_1/testsuite/build.xml
   branches/JBPAPP_5_1/testsuite/src/resources/cc/cc.policy
Log:
cc: smaller memory consumption on some configuration + cc.policy crashrecovery fixies

Modified: branches/JBPAPP_5_1/testsuite/build.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/build.xml	2010-11-04 09:27:57 UTC (rev 109117)
+++ branches/JBPAPP_5_1/testsuite/build.xml	2010-11-04 09:29:10 UTC (rev 109118)
@@ -1889,11 +1889,11 @@
       
       <!-- prepare run.conf for audit testing -->
       <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 -Dcc.jdbc.driver=${cc.jdbc.driver}"</echo>
+      JAVA_OPTS="-Xms128m -Xmx512m -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 -Dcc.jdbc.driver=${cc.jdbc.driver}"</echo>
 
       <!-- prepare run.conf for later CXF testing -->
       <echo file="${jboss.dist}/server/cc-cxf/run.conf">
-      JAVA_OPTS="-Xms1024m -Xmx1024m -XX:MaxPermSize=512m -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-cxf -Djava.security.manager -Djava.security.policy==${jboss.dist}/server/cc-cxf/cc.policy -Dcc.jdbc.driver=${cc.jdbc.driver}"</echo>
+      JAVA_OPTS="-Xms128m -Xmx512m -XX:MaxPermSize=512m -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-cxf -Djava.security.manager -Djava.security.policy==${jboss.dist}/server/cc-cxf/cc.policy -Dcc.jdbc.driver=${cc.jdbc.driver}"</echo>
 
       <!-- JTA tests CC related config -->
       <copy todir="${build.resources}/jbossts/scripts/imports/" overwrite="true">

Modified: branches/JBPAPP_5_1/testsuite/src/resources/cc/cc.policy
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/cc/cc.policy	2010-11-04 09:27:57 UTC (rev 109117)
+++ branches/JBPAPP_5_1/testsuite/src/resources/cc/cc.policy	2010-11-04 09:29:10 UTC (rev 109118)
@@ -157,3 +157,36 @@
   permission java.security.AllPermission;
 };
 
+// JDBC driver for crash recovery tests
+grant codeBase "file:${jboss.server.home.dir}/lib/jconn4.jar" {
+  permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jboss.server.home.dir}/lib/postgresql-8.3.jar" {
+  permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jboss.server.home.dir}/lib/postgresql-8.2.jar" {
+  permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jboss.server.home.dir}/lib/sqljdbc4_2008.jar" {
+  permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jboss.server.home.dir}/lib/sqljdbc4_2005.jar" {
+  permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jboss.server.home.dir}/lib/ojdbc6.jar" {
+  permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jboss.server.home.dir}/lib/ojdbc6_rac.jar" {
+  permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jboss.server.home.dir}/lib/db2jcc.jar" {
+  permission java.security.AllPermission;
+};
+