[jboss-cvs] JBossAS SVN: r92777 - in tags/JBPAPP_5_0_0_CR3: varia and 1 other directory.

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

Author: fnasser at redhat.com
Date: 2009-08-25 00:19:03 -0400 (Tue, 25 Aug 2009)
New Revision: 92777

Modified:
   tags/JBPAPP_5_0_0_CR3/build/build-distr.xml
   tags/JBPAPP_5_0_0_CR3/build/build.xml
   tags/JBPAPP_5_0_0_CR3/varia/build.xml
Log:
Merge change 92771 to branch and hardcode proprty for not tag

Modified: tags/JBPAPP_5_0_0_CR3/build/build-distr.xml
===================================================================
--- tags/JBPAPP_5_0_0_CR3/build/build-distr.xml	2009-08-25 03:30:20 UTC (rev 92776)
+++ tags/JBPAPP_5_0_0_CR3/build/build-distr.xml	2009-08-25 04:19:03 UTC (rev 92777)
@@ -1169,14 +1169,6 @@
       </fileset>
     </copy>
 
-    <!-- copy the netboot war tool -->
-    <mkdir dir="${install.examples.netboot}"/>
-    <copy todir="${install.examples.netboot}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-        <include name="netboot.war"/>
-      </fileset>
-    </copy>
-
     <!-- copy the bsh.deployer and its associated beanshell lib from thirdparty -->
     <mkdir dir="${install.server}/all/deployers"/>
 

Modified: tags/JBPAPP_5_0_0_CR3/build/build.xml
===================================================================
--- tags/JBPAPP_5_0_0_CR3/build/build.xml	2009-08-25 03:30:20 UTC (rev 92776)
+++ tags/JBPAPP_5_0_0_CR3/build/build.xml	2009-08-25 04:19:03 UTC (rev 92777)
@@ -82,7 +82,8 @@
     <!-- Module name(s) & version -->
     <property name="module.name" value="jboss"/>
     <property name="module.Name" value="JBoss Build"/>
-    <condition property="module.version" value="${version.major}.${version.minor}.${version.revision}.${version.tag}">
+<!--    <condition property="module.version" value="${version.major}.${version.minor}.${version.revision}.${version.tag}"> -->
+    <condition property="module.version" value="${version.major}.${version.minor}.${version.revision}">
        <isset property="release.version.tag"/>
     </condition>
     <condition property="module.version" value="${version.major}.${version.minor}.${version.revision}">
@@ -262,7 +263,6 @@
     <property name="install.examples.jca" value="${install.docs}/examples/jca"/>
     <property name="install.examples.jms" value="${install.docs}/examples/jms"/>
     <property name="install.examples.jbossweb" value="${install.examples}/jbossweb"/>
-    <property name="install.examples.netboot" value="${install.examples}/netboot"/>
     <!--<property name="install.examples.binding-manager" value="${install.examples}/binding-manager"/>-->
     <property name="install.examples.varia" value="${install.examples}/varia"/>
     <property name="install.dtd" value="${install.docs}/dtd"/>

Modified: tags/JBPAPP_5_0_0_CR3/varia/build.xml
===================================================================
--- tags/JBPAPP_5_0_0_CR3/varia/build.xml	2009-08-25 03:30:20 UTC (rev 92776)
+++ tags/JBPAPP_5_0_0_CR3/varia/build.xml	2009-08-25 04:19:03 UTC (rev 92777)
@@ -517,14 +517,6 @@
       </fileset>
     </jar>
 
-    <!-- Build netboot.war -->
-    <war warfile="${build.lib}/netboot.war" webxml="${build.resources}/netboot/WEB-INF/web.xml">
-      <fileset dir="${build.resources}/netboot" excludes="WEB-INF/web.xml"/>
-      <classes dir="${build.classes}">
-        <include name="org/jboss/netboot/**"/>
-      </classes>
-    </war>
-
     <!-- bsh-deployer.jar -->
 
     <mkdir dir="${build.deployers}/bsh.deployer"/>