[Jboss-cvs] JBoss Messaging SVN: r1234 - in branches/Branch_1_0: . util

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

Author: ovidiu.feodorov at jboss.com
Date: 2006-08-26 00:28:18 -0400 (Sat, 26 Aug 2006)
New Revision: 1234

Modified:
   branches/Branch_1_0/build-messaging.xml
   branches/Branch_1_0/util/release-admin.xml
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-532

Modified: branches/Branch_1_0/build-messaging.xml
===================================================================
--- branches/Branch_1_0/build-messaging.xml	2006-08-25 02:56:35 UTC (rev 1233)
+++ branches/Branch_1_0/build-messaging.xml	2006-08-26 04:28:18 UTC (rev 1234)
@@ -399,17 +399,25 @@
       <mkdir dir="${build.lib}"/>
       <jar jarfile="${build.lib}/jboss-${module.name}.jar" manifest="${build.etc}/default.mf">
          <fileset dir="${build.classes}" includes="**"/>
-         <fileset dir="${build.jar}" includes="**"/>
+         <fileset dir="${build.jar}">
+            <exclude name="*-service.xml"/>
+            <exclude name="*-ds.xml"/>
+            <exclude name="messaging-*.properties"/>
+         </fileset>
       </jar>
    </target>
 
-   <target name="scoped-sar" depends="compile, scoped-sar-structure, extract-server-dependencies">
+   <target name="scoped-sar" depends="compile, jar, scoped-sar-structure, extract-server-dependencies">
 
       <mkdir dir="${build.lib}"/>
       <jar jarfile="${build.lib}/jboss-${module.name}-scoped.sar" manifest="${build.etc}/default.mf">
-         <fileset dir="${build.classes}" includes="**"/>
+         <fileset dir="${build.lib}" includes="jboss-${module.name}.jar"/>
          <fileset dir="${build.scoped-sar}" includes="**"/>
-         <fileset dir="${build.jar}" includes="**"/>
+         <fileset dir="${build.jar}">
+            <exclude name="aop-messaging-*.xml"/>
+            <exclude name="VERSION"/>
+            <exclude name="xmdesc/**"/>
+         </fileset>
       </jar>
    </target>
 
@@ -434,7 +442,6 @@
    </target>
 
    <target name="scoped-sar-structure" depends="jar-structure, extract-server-dependencies">
-
       <copy todir="${build.scoped-sar}/META-INF" file="${source.etc}/server/default/deploy/jboss-service.xml"/>
    </target>
 

Modified: branches/Branch_1_0/util/release-admin.xml
===================================================================
--- branches/Branch_1_0/util/release-admin.xml	2006-08-25 02:56:35 UTC (rev 1233)
+++ branches/Branch_1_0/util/release-admin.xml	2006-08-26 04:28:18 UTC (rev 1234)
@@ -270,6 +270,7 @@
       </replaceregexp>
 
       <!-- mute org.jboss.serial DEBUG -->
+
       <replaceregexp file="${jboss.home}/server/${standalone.messaging.config.name}/conf/log4j.xml" flags="s">
          <regexp pattern="(\x3croot\x3e)"/>
          <substitution expression="&lt;category name=&quot;org.jboss.serial&quot;&gt;&#013;&#010;      &lt;priority value=&quot;INFO&quot;/&gt;&#013;&#010;   &lt;/category&gt;&#013;&#010;&#013;&#010;   \1"/>
@@ -299,6 +300,7 @@
 
       <move todir="${jboss.home}/server/${standalone.messaging.config.name}/lib">
          <fileset dir="${jboss.home}/server/${standalone.messaging.config.name}/deploy/jboss-messaging">
+            <include name="jboss-messaging.jar"/>
             <include name="javassist.jar"/>
             <include name="jboss-aop.jar"/>
             <include name="jboss-aspect-library.jar"/>
@@ -311,31 +313,21 @@
          </fileset>
       </move>
 
-      <jar jarfile="${jboss.home}/server/${standalone.messaging.config.name}/deploy/jboss-messaging/jboss-messaging.jar"
-           manifest="${jboss.home}/server/${standalone.messaging.config.name}/deploy/jboss-messaging/META-INF/MANIFEST.MF">
-         <fileset dir="${jboss.home}/server/${standalone.messaging.config.name}/deploy/jboss-messaging" includes="org/**,VERSION,aop-messaging*.xml"/>
-      </jar>
-      <delete>
-         <fileset dir="${jboss.home}/server/${standalone.messaging.config.name}/deploy/jboss-messaging">
-            <include name="VERSION"/>
-            <include name="aop-messaging*.xml"/>
-         </fileset>
-      </delete>
-      <delete dir="${jboss.home}/server/${standalone.messaging.config.name}/deploy/jboss-messaging/org"/>
-      <delete dir="${jboss.home}/server/${standalone.messaging.config.name}/deploy/jboss-messaging/META-INF"/>
-      <move file="${jboss.home}/server/${standalone.messaging.config.name}/deploy/jboss-messaging/jboss-messaging.jar"
-            todir="${jboss.home}/server/${standalone.messaging.config.name}/lib"/>
-      <move todir="${jboss.home}/server/${standalone.messaging.config.name}/conf/xmdesc">
-         <fileset dir="${jboss.home}/server/${standalone.messaging.config.name}/deploy/jboss-messaging/xmdesc">
-            <include name="*.xml"/>
-         </fileset>
-      </move>
+      <unjar src="${jboss.home}/server/${standalone.messaging.config.name}/lib/jboss-messaging.jar"
+             dest="${jboss.home}/server/${standalone.messaging.config.name}/conf">
+         <patternset>
+            <include name="xmdesc/**"/>
+         </patternset>
+      </unjar>
+
       <move todir="${jboss.home}/server/${standalone.messaging.config.name}/conf">
          <fileset dir="${jboss.home}/server/${standalone.messaging.config.name}/deploy/jboss-messaging">
             <include name="messaging-*.properties"/>
          </fileset>
       </move>
+
       <delete dir="${jboss.home}/server/${standalone.messaging.config.name}/deploy/jboss-messaging/xmdesc"/>
+      <delete dir="${jboss.home}/server/${standalone.messaging.config.name}/deploy/jboss-messaging/META-INF"/>
       <delete file="${jboss.home}/server/${standalone.messaging.config.name}/deploy/jboss-messaging/jms-ds.xml"/>
 
    </target>