[jboss-svn-commits] JBL Code SVN: r27470 - labs/jbossesb/trunk/product/install/embedded-console.

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

Author: tcunning
Date: 2009-07-02 22:25:29 -0400 (Thu, 02 Jul 2009)
New Revision: 27470

Added:
   labs/jbossesb/trunk/product/install/embedded-console/jbas5-admin-console.war
Modified:
   labs/jbossesb/trunk/product/install/embedded-console/build.xml
Log:
JBESB-2577
Add console for jbossas5, remove admin-console.war if it exists, and make
sure to check whether we are installing on jbossas4 or jbossas5 and 
install the correct console.    Necessary for management console removal.


Modified: labs/jbossesb/trunk/product/install/embedded-console/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/embedded-console/build.xml	2009-07-03 02:14:40 UTC (rev 27469)
+++ labs/jbossesb/trunk/product/install/embedded-console/build.xml	2009-07-03 02:25:29 UTC (rev 27470)
@@ -1,12 +1,41 @@
-<project name="JBESB_Installer" default="replace" basedir=".">
+<project name="JBESB_Installer" default="copy-console" basedir=".">
 	<property name="deploy.dir" value="${org.jboss.esb.server.home}/server/${org.jbossesb.server.config}/deploy"/>
+        <property name="server.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/>
+
+        <!-- Check for JBossAS5 -->
+        <condition property="jbossas5">
+            <available file="${server.dir}/deployers" type="dir"/>
+        </condition>
+
+        <!-- Check for JBossAS4.x -->
+        <condition property="jbossas4">
+            <not>
+                <available file="${server.dir}/deployers" type="dir"/>
+            </not>
+        </condition>
+
 	<target name="replace">
+		<echo>server.dir=${server.dir}</echo>
+		<echo>JBAS4 [${jbossas4}] JBAS5 [${jbossas5}]"</echo>
 		<loadfile property="measurement.category"
 			srcFile="measurementpatch.txt"/>	
 		<replace file="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/conf/jboss-log4j.xml"
 			value="${measurement.category}">
 			<replacetoken><![CDATA[<!-- Limit the org.apache category to INFO as its DEBUG is verbose -->]]></replacetoken>	
 		</replace>
-	         <copy file="esb-console.war" todir="${deploy.dir}"/>
+		<delete dir="${deploy.dir}/admin-console.war"/>
 	</target>
+
+	<target name="copy-jbas4-console" if="jbossas4">
+		<echo>JBAS 4 CONSOLE COPY</echo>
+                <copy file="esb-console.war" todir="${deploy.dir}"/>
+	</target>
+
+	<target name="copy-jbas5-console" if="jbossas5">
+		<echo>JBAS 5 CONSOLE COPY</echo>
+                <copy file="jbas5-admin-console.war" todir="${deploy.dir}"/>
+	</target>
+
+	<target name="copy-console" depends="replace,copy-jbas4-console,copy-jbas5-console">
+	</target>
 </project>

Added: labs/jbossesb/trunk/product/install/embedded-console/jbas5-admin-console.war
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/install/embedded-console/jbas5-admin-console.war
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream