[jboss-cvs] JBossAS SVN: r82193 - in branches/JBPAPP_4_2_0_GA_CP: testsuite and 1 other directory.

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

Author: pskopek at redhat.com
Date: 2008-12-10 10:50:12 -0500 (Wed, 10 Dec 2008)
New Revision: 82193

Modified:
   branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
   branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml
Log:
JBOSSCC-35: Disable RMI/IIOP in CC evaluated configuration.

Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml	2008-12-10 14:12:33 UTC (rev 82192)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml	2008-12-10 15:50:12 UTC (rev 82193)
@@ -5252,7 +5252,13 @@
       <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"/>
 
-    	<!-- copy alternate part of configuration (cc-none, cc-db, cc-ldap) -->
+      <!-- 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}/server/cc/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="**/*"/>

Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml	2008-12-10 14:12:33 UTC (rev 82192)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml	2008-12-10 15:50:12 UTC (rev 82193)
@@ -885,6 +885,12 @@
     <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}/server/cc/lib/jboss-iiop.jar"/>
      
   	<!-- copy alternate part of configuration (cc-none, cc-db, cc-ldap) -->
     <copy todir="${jboss.dist}/server/cc" overwrite="true">