[jboss-cvs] JBossAS SVN: r92451 - in trunk: main/src/assembly and 1 other directory.

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

Author: pgier
Date: 2009-08-17 17:37:54 -0400 (Mon, 17 Aug 2009)
New Revision: 92451

Modified:
   trunk/build/build.xml
   trunk/main/src/assembly/run.xml
Log:
Move jar update into appropriate module.

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2009-08-17 21:35:57 UTC (rev 92450)
+++ trunk/build/build.xml	2009-08-17 21:37:54 UTC (rev 92451)
@@ -214,7 +214,6 @@
   default and all configs with a minimal set of jars in the root lib dir.
   -->
   <target name="partition-build" depends="init">
-    <antcall target="addJmxToRunJar"/>
 
     <!-- Copy server/all to server/default and then remove the services 
          outside of the scope of the default config
@@ -2330,13 +2329,4 @@
     <!-- End varia stuff -->
   </target>
 
-   <!-- add JMX classes needed for startup time to run.jar (see JBAS-6185) -->
-  <target name="addJmxToRunJar">
-    <property name="moduleSource.output" value="${project.root}/system-jmx/target/classes"/>
-    <jar update="true" destfile="${install.bin}/run.jar"
-       basedir="${moduleSource.output}"
-       includes="org/jboss/system/server/jmx/MBeanServerBuilderImpl.class org/jboss/system/server/jmx/LazyMBeanServer.class"
-    />
-   </target>
-
 </project>

Modified: trunk/main/src/assembly/run.xml
===================================================================
--- trunk/main/src/assembly/run.xml	2009-08-17 21:35:57 UTC (rev 92450)
+++ trunk/main/src/assembly/run.xml	2009-08-17 21:37:54 UTC (rev 92451)
@@ -38,7 +38,7 @@
         <include>org.jboss.bootstrap:jboss-bootstrap-spi-as</include>
       </includes>
     </dependencySet>
-        <dependencySet>
+    <dependencySet>
       <unpack>true</unpack>
       <unpackOptions>
         <includes>
@@ -55,5 +55,17 @@
         <include>gnu-getopt:getopt</include>
       </includes>
     </dependencySet>
+    <dependencySet>
+      <includes>
+        <include>org.jboss.jbossas:jboss-as-system-jmx</include>
+      </includes>
+      <unpack>true</unpack>
+      <unpackOptions>
+        <includes>
+          <include>org/jboss/system/server/jmx/MBeanServerBuilderImpl.class</include>
+          <include>org/jboss/system/server/jmx/LazyMBeanServer.class</include>
+        </includes>
+      </unpackOptions>
+    </dependencySet>
   </dependencySets>
 </assembly>