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

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

Author: pgier
Date: 2010-12-13 10:41:52 -0500 (Mon, 13 Dec 2010)
New Revision: 109877

Modified:
   trunk/build/build.xml
   trunk/varia/src/assembly/deployment-service-sar.xml
   trunk/varia/src/assembly/snmp-adaptor-sar.xml
Log:
o Change assembly IDs to remove build warning and avoid conflict with non-sar assembly IDs

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2010-12-13 15:31:18 UTC (rev 109876)
+++ trunk/build/build.xml	2010-12-13 15:41:52 UTC (rev 109877)
@@ -1223,7 +1223,7 @@
     <unjar src="${varia.module.output}/jboss-as-varia-persistent-service.sar" dest="${install.examples}/jmx/persistent-service.sar"/>
 
     <mkdir dir="${install.examples.varia}/deployment-service"/>
-    <copy file="${varia.module.output}/jboss-as-varia-deployment-service.sar"
+    <copy file="${varia.module.output}/jboss-as-varia-deployment-service-sar.sar"
           tofile="${install.examples.varia}/deployment-service/deployment-service.sar"/>
     <copy todir="${install.examples.varia}/deployment-service">
       <fileset dir="${varia.module.output}/resources/services/deployment">
@@ -1263,7 +1263,7 @@
 
     <!-- copy snmp-adaptor.sar unpacked to deploy -->
     <mkdir dir="${install.server}/all/deploy/snmp-adaptor.sar"/>
-    <unjar src="${varia.module.output}/jboss-as-varia-snmp-adaptor.sar" 
+    <unjar src="${varia.module.output}/jboss-as-varia-snmp-adaptor-sar.sar" 
     	     dest="${install.server}/all/deploy/snmp-adaptor.sar">
       <mapper type="glob" from="jboss-as-varia-*.jar" to="*.jar"/>
     </unjar>

Modified: trunk/varia/src/assembly/deployment-service-sar.xml
===================================================================
--- trunk/varia/src/assembly/deployment-service-sar.xml	2010-12-13 15:31:18 UTC (rev 109876)
+++ trunk/varia/src/assembly/deployment-service-sar.xml	2010-12-13 15:41:52 UTC (rev 109877)
@@ -1,5 +1,5 @@
 <assembly>
-  <id>deployment-service</id>
+  <id>deployment-service-sar</id>
   <formats>
     <format>sar</format>
   </formats>

Modified: trunk/varia/src/assembly/snmp-adaptor-sar.xml
===================================================================
--- trunk/varia/src/assembly/snmp-adaptor-sar.xml	2010-12-13 15:31:18 UTC (rev 109876)
+++ trunk/varia/src/assembly/snmp-adaptor-sar.xml	2010-12-13 15:41:52 UTC (rev 109877)
@@ -1,5 +1,5 @@
 <assembly>
-  <id>snmp-adaptor</id>
+  <id>snmp-adaptor-sar</id>
   <formats>
     <format>sar</format>
   </formats>