[jboss-svn-commits] JBL Code SVN: r29995 - in labs/jbossesb/trunk/product/install: embedded-console and 1 other directory.

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

Author: tcunning
Date: 2009-11-04 22:23:54 -0500 (Wed, 04 Nov 2009)
New Revision: 29995

Added:
   labs/jbossesb/trunk/product/install/embedded-console/
   labs/jbossesb/trunk/product/install/embedded-console/jbas5-admin-console.war
Modified:
   labs/jbossesb/trunk/product/install/build.xml
Log:
JBESB-2897
Add back the custom built jbas5-admin-console (the one that ships with 
5.1.0.GA does not load classes cross-plugin).    Integrate our plugin
into that WAR.


Modified: labs/jbossesb/trunk/product/install/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/build.xml	2009-11-05 03:23:09 UTC (rev 29994)
+++ labs/jbossesb/trunk/product/install/build.xml	2009-11-05 03:23:54 UTC (rev 29995)
@@ -9,6 +9,7 @@
 	
         <property name="server.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/>
         <property name="client.dir" value="${org.jboss.esb.server.home}/client"/>
+	<property name="install.dir" value="${basedir}"/>
         <property name="conf.dir" value="${server.dir}/conf"/>
         <property name="deploy.dir" value="${server.dir}/deploy"/>
         <property name="server.lib.dir" value="${server.dir}/lib"/>
@@ -83,7 +84,11 @@
             </path>
             <property name="jopr.as5.plugin" refid="jopr.as5.plugin"/>
             <path id="jopr.as5.console">
+		<fileset dir="${install.dir}/embedded-console"
+		   includes="jbas5-*.war"/>
+		<!--
                 <fileset dir="${org.jboss.esb.dist.lib}" includes="${jopr.console.base}jbas5*.war"/>
+		-->
             </path>
             <property name="jopr.as5.console" refid="jopr.as5.console"/>
 
@@ -95,7 +100,21 @@
             </condition>
         </target>
 
-        <target name="install.base.console" depends="dependencies" unless="jopr.console.exists">
+	<target name="check-console-exist">
+            <condition property="jopr.console.delete.exists">
+                <available file="${jopr.console.dir}"/>
+            </condition>
+	</target>
+
+	<!-- The JBoss 5.1.0.GA admin console contains a bug in which it will 
+	not load classes from the the jmx-plugin in the jbossesb plugin.  
+	This bug is fixed but we need to remove the existing AS5 admin console
+	for now. -->
+	<target name="remove-as5-console" depends="check-console-exist" if="jbossas5, jopr.console.delete.exists">
+		<delete dir="${jopr.console.dir}"/>	
+	</target>
+
+        <target name="install.base.console" depends="remove-as5-console, dependencies" unless="jopr.console.exists">
             <mkdir dir="${jopr.console.dir}"/>
             <unzip dest="${jopr.console.dir}" src="${jopr.console.war}"/>
         </target>

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