[jboss-cvs] JBossAS SVN: r95196 - in tags/JBPAPP_5_0_0_GA: testsuite and 1 other directory.

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

Author: fnasser at redhat.com
Date: 2009-10-20 15:36:52 -0400 (Tue, 20 Oct 2009)
New Revision: 95196

Modified:
   tags/JBPAPP_5_0_0_GA/build/build-distr.xml
   tags/JBPAPP_5_0_0_GA/testsuite/build.xml
Log:
JBPAPP-2952 - Move deploy/jmx-remoting.sar to docs/examples

Modified: tags/JBPAPP_5_0_0_GA/build/build-distr.xml
===================================================================
--- tags/JBPAPP_5_0_0_GA/build/build-distr.xml	2009-10-20 18:49:33 UTC (rev 95195)
+++ tags/JBPAPP_5_0_0_GA/build/build-distr.xml	2009-10-20 19:36:52 UTC (rev 95196)
@@ -66,8 +66,8 @@
     <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
 
     <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
-    <copy todir="${install.all.lib}" filtering="no">
+    <mkdir dir="${install.examples}/${_module.name}"/>
+    <copy todir="${install.examples}/${_module.name}" filtering="no">
       <fileset dir="${_module.output}/lib">
         <include name="jboss-jmx-remoting.jar"/>
       </fileset>
@@ -76,8 +76,8 @@
 
   <target name="_module-jmx-remoting-all" depends="_module-jmx-remoting-most">
     <!-- Copy the generated javadocs -->
-    <mkdir dir="${install.api}/${_module.name}"/>
-    <copy todir="${install.api}/${_module.name}" filtering="no">
+    <mkdir dir="${install.examples}/${_module.name}"/>
+    <copy todir="${install.examples}/${_module.name}" filtering="no">
       <fileset dir="${_module.output}/api">
         <include name="**/*"/>
       </fileset>
@@ -87,8 +87,8 @@
 
   <target name="_module-jbossas/jmx-remoting-all" depends="_module-jbossas/jmx-remoting-most">
     <!-- Copy the generated javadocs -->
-    <mkdir dir="${install.api}/${_module.name}"/>
-    <copy todir="${install.api}/${_module.name}" filtering="no">
+    <mkdir dir="${install.examples}/$_module.name}"/>
+    <copy todir="${install.examples}/${_module.name}" filtering="no">
       <fileset dir="${_module.output}/api">
         <include name="**/*"/>
       </fileset>
@@ -100,9 +100,7 @@
     <property name="_module.name" value="jbossas/jmx-remoting" override="true"/>
     <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
 
-    <unjar src="${project.root}/${_module.name}/output/lib/jmx-remoting.sar" dest="${install.default}/deploy/jmx-remoting.sar"/>
-    <unjar src="${project.root}/${_module.name}/output/lib/jmx-remoting.sar" dest="${install.all}/deploy/jmx-remoting.sar"/>
-
+    <unjar src="${project.root}/${_module.name}/output/lib/jmx-remoting.sar" dest="${install.examples}/jmx-remoting/jmx-remoting.sar"/>
   </target>
 
   <!-- ======== -->
@@ -1254,7 +1252,6 @@
     <copy todir="${install.server}/all/deployers/jboss-threads.deployer/META-INF">
       <fileset dir="${_module.output}/resources/threads"/>
     </copy>
-
     <copy todir="${install.common.lib}">
       <fileset dir="${org.objectweb.asm.lib}">
          <include name="asm.jar" />

Modified: tags/JBPAPP_5_0_0_GA/testsuite/build.xml
===================================================================
--- tags/JBPAPP_5_0_0_GA/testsuite/build.xml	2009-10-20 18:49:33 UTC (rev 95195)
+++ tags/JBPAPP_5_0_0_GA/testsuite/build.xml	2009-10-20 19:36:52 UTC (rev 95196)
@@ -1345,6 +1345,9 @@
    	  <!-- JBAS-6792 fix temporarily reverted -->
       <!--exclude name="org/jboss/test/cluster/defaultcfg/test/HAServiceUnitTestCase.class"/>
       <exclude name="org/jboss/test/cluster/defaultcfg/test/HASingletonUnitTestCase.class"/-->
+
+      <!-- jmx-remoting.sar is now disabled for security reasons -->
+      <exclude name="org/jboss/test/jmx/test/JMXConnectorUnitTestCase.class"/>
    </patternset>
 
    <patternset id="aop-with-classloader.excludes">