[jboss-cvs] JBossAS SVN: r90706 - in branches/dml-log-service-integration: testsuite and 2 other directories.

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

Author: david.lloyd at jboss.com
Date: 2009-06-30 15:51:31 -0400 (Tue, 30 Jun 2009)
New Revision: 90706

Modified:
   branches/dml-log-service-integration/component-matrix/pom.xml
   branches/dml-log-service-integration/testsuite/build.xml
   branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/jmx/test/UndeployBrokenPackageUnitTestCase.java
   branches/dml-log-service-integration/testsuite/src/resources/securitymgr/server.policy
Log:
Merge from trunk: -r90672:90705

Modified: branches/dml-log-service-integration/component-matrix/pom.xml
===================================================================
--- branches/dml-log-service-integration/component-matrix/pom.xml	2009-06-30 19:38:01 UTC (rev 90705)
+++ branches/dml-log-service-integration/component-matrix/pom.xml	2009-06-30 19:51:31 UTC (rev 90706)
@@ -71,13 +71,13 @@
     <version.org.jboss.common.core>2.2.14.GA</version.org.jboss.common.core>
     <version.org.jboss.deployers>2.0.8.GA</version.org.jboss.deployers>
     <version.org.jboss.ejb3.common.client>1.0.0</version.org.jboss.ejb3.common.client>
-    <version.org.jboss.ejb3.core.client>1.1.7</version.org.jboss.ejb3.core.client>
+    <version.org.jboss.ejb3.core.client>1.1.8</version.org.jboss.ejb3.core.client>
     <version.org.jboss.ejb3.endpoint.deployer>0.1.3</version.org.jboss.ejb3.endpoint.deployer>
     <version.org.jboss.ejb3.proxy.impl.client>1.0.2</version.org.jboss.ejb3.proxy.impl.client>
     <version.org.jboss.ejb3.proxy.spi.client>1.0.0</version.org.jboss.ejb3.proxy.spi.client>
     <version.org.jboss.ejb3.proxy.clustered.client>1.0.1</version.org.jboss.ejb3.proxy.clustered.client>
     <version.org.jboss.ejb3.security.client>1.0.0</version.org.jboss.ejb3.security.client>
-    <version.org.jboss.ejb3>1.1.7</version.org.jboss.ejb3>
+    <version.org.jboss.ejb3>1.1.8</version.org.jboss.ejb3>
     <version.org.jboss.integration>5.1.0.SP1</version.org.jboss.integration>
     <version.org.jboss.jbossxb>2.0.1.GA</version.org.jboss.jbossxb>
     <version.org.jboss.jpa>1.0.0</version.org.jboss.jpa>

Modified: branches/dml-log-service-integration/testsuite/build.xml
===================================================================
--- branches/dml-log-service-integration/testsuite/build.xml	2009-06-30 19:38:01 UTC (rev 90705)
+++ branches/dml-log-service-integration/testsuite/build.xml	2009-06-30 19:51:31 UTC (rev 90706)
@@ -3224,7 +3224,7 @@
       | of the unit test using the test property, -Dtest=org.jboss.test....
       | Here you specify the testcase class, not the directory
     -->
-   <target name="one-test" if="test"
+   <target name="one-test" depends="init" if="test"
       description="Execute a single test.">
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>

Modified: branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/jmx/test/UndeployBrokenPackageUnitTestCase.java
===================================================================
--- branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/jmx/test/UndeployBrokenPackageUnitTestCase.java	2009-06-30 19:38:01 UTC (rev 90705)
+++ branches/dml-log-service-integration/testsuite/src/main/org/jboss/test/jmx/test/UndeployBrokenPackageUnitTestCase.java	2009-06-30 19:51:31 UTC (rev 90706)
@@ -112,7 +112,9 @@
 
    /** Deploy an ejb that has an invalid ejb-jar.xml descriptor and then
     reploy a valid version after undeploying the invalid jar.
-    */
+    JBAS-6773 - temporarily comment out test case to avoid VM crash so
+       full test runs can complete 
+
    public void testBadEjbRedeployment() throws Exception
    {
       getLog().info("+++ testBadEjbRedeployment");
@@ -170,6 +172,7 @@
          undeploy(testPackage);
       }
    }
+*/
 
    /** Deploy an ejb that has an invalid ejb-jar.xml descriptor and then
     deploy a completely unrelated service to test that the failed deployment

Modified: branches/dml-log-service-integration/testsuite/src/resources/securitymgr/server.policy
===================================================================
--- branches/dml-log-service-integration/testsuite/src/resources/securitymgr/server.policy	2009-06-30 19:38:01 UTC (rev 90705)
+++ branches/dml-log-service-integration/testsuite/src/resources/securitymgr/server.policy	2009-06-30 19:51:31 UTC (rev 90706)
@@ -121,12 +121,18 @@
    permission java.lang.RuntimePermission "getClassLoader";
 };
 
-grant codeBase "jar:file:${jboss.server.home.dir}/conf/bindingservice.beans/jboss-bindingservice.jar!/"{
+grant codeBase "jar:file:${jboss.server.home.dir}/conf/bindingservice.beans/jboss-service-binding-core.jar!/"{
    permission java.util.PropertyPermission "*", "write";
    permission java.io.FilePermission "${jboss.server.home.dir}/deploy/jbossweb.sar/server.xml", "read";
    permission java.io.FilePermission "${jboss.server.home.dir}/tmp/-", "write,delete";
 };
 
+grant codeBase "jar:file:${jboss.server.home.dir}/conf/bindingservice.beans/jboss-service-binding-mgmt.jar!/"{
+   permission java.util.PropertyPermission "*", "write";
+   permission java.io.FilePermission "${jboss.server.home.dir}/deploy/jbossweb.sar/server.xml", "read";
+   permission java.io.FilePermission "${jboss.server.home.dir}/tmp/-", "write,delete";
+};
+
 grant codeBase "jar:file:${jboss.server.home.dir}/deploy/jboss-local-jdbc.rar!/jboss-local-jdbc.jar" {
    permission java.lang.RuntimePermission "getClassLoader";
 };