[jboss-svn-commits] JBL Code SVN: r38218 - labs/jbossesb/tags/GSS-5.2-ROLLUP-10012012/product/install.

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

Author: tcunning
Date: 2012-10-04 11:33:33 -0400 (Thu, 04 Oct 2012)
New Revision: 38218

Modified:
   labs/jbossesb/tags/GSS-5.2-ROLLUP-10012012/product/install/build.xml
Log:
JBESB-3788
Back out changes to support the admin-console in the project on top of jboss-5.1.0.GA in the branch
for the platform.


Modified: labs/jbossesb/tags/GSS-5.2-ROLLUP-10012012/product/install/build.xml
===================================================================
--- labs/jbossesb/tags/GSS-5.2-ROLLUP-10012012/product/install/build.xml	2012-10-03 15:50:14 UTC (rev 38217)
+++ labs/jbossesb/tags/GSS-5.2-ROLLUP-10012012/product/install/build.xml	2012-10-04 15:33:33 UTC (rev 38218)
@@ -15,7 +15,6 @@
         <property name="server.lib.dir" value="${server.dir}/lib"/>
         <property name="hadeploy.dir" value="${server.dir}/deploy-hasingleton"/>
 
-        <property name="as6.jopr.console.dir" location="${org.jboss.esb.server.home}/common/deploy/admin-console.war"/>
         <property name="jopr.console.dir" location="${deploy.dir}/admin-console.war"/>
         <property name="jopr.plugin.base" value="rhq-jbossesb-plugin-"/>
         <property name="jopr.console.base" value="jopr-embedded-"/>
@@ -59,6 +58,7 @@
     </condition>
 
         <fail unless="hierarchy.recognised" message="Cannot determine build hierarchy"/>
+
         <target name="dependencies.jbossesb" if="hierarchy.jbossesb">
             <property name="org.jboss.esb.dist" location="${product.dir}"/>
             <property name="org.jboss.esb.dist.lib" location="${org.jboss.esb.dist}/lib"/>
@@ -75,14 +75,9 @@
         </target>
 
         <target name="dependencies" depends="dependencies.source, dependencies.jbossesb">
-	    <echo>as6.jopr.console.dir=${as6.jopr.console.dir}</echo>
             <condition property="jopr.console.exists">
-                <or>
-                  <available file="${jopr.console.dir}"/>
-                  <available file="${as6.jopr.console.dir}"/>
-                </or>
+                <available file="${jopr.console.dir}"/>
             </condition>
-		<echo>jopr.console.exists=${jopr.console.exists}</echo>
 
             <path id="jopr.as4.plugin">
                 <fileset dir="${org.jboss.esb.dist.lib}" includes="${jopr.plugin.base}*as4.jar"/>
@@ -115,44 +110,9 @@
             <unzip dest="${jopr.console.dir}" src="${jopr.console.war}"/>
         </target>
 
-        <target name="patch.as5.console" if="jbossas5" unless="jbossas6">
-		<delete dir="${jopr.console.dir}"/>
-                <unzip dest="${jopr.console.dir}" src="${jopr.as5.console}"/> 
-
-                <!-- Back the file up before replacement -->
-                <copy file="${server.dir}/deploy/profileservice-jboss-beans.xml"
-                        tofile="${server.dir}/deploy/profileservice-jboss-beans.xml.orig"
-                        overwrite="false"/>
-		<!-- Replace one reference in profileservice-jboss-beans.xml -->
-        	<replace file="${server.dir}/deploy/profileservice-jboss-beans.xml">
-			<replacetoken>&lt;property name="jndiName"&gt;ProfileService&lt;/property&gt;</replacetoken>	
-	                <replacevalue>&lt;property name="jndiName"&gt;java:ProfileService&lt;/property&gt;</replacevalue>
-		</replace>
-
-                <!-- Back up the file before replacement -->
-                <copy file="${server.dir}/deploy/profileservice-secured.jar/META-INF/ejb-jar.xml"
-                       tofile="${server.dir}/deploy/profileservice-secured.jar/META-INF/ejb-jar.xml.orig"
-                       overwrite="false"/>
-		<!-- Replace three references in ejb-jar.xml -->
-                <replace file="${server.dir}/deploy/profileservice-secured.jar/META-INF/ejb-jar.xml">
-		        <replacetoken>&lt;res-ref-name&gt;profileService&lt;/res-ref-name&gt;</replacetoken>
-			<replacevalue>&lt;res-ref-name&gt;profileService&lt;/res-ref-name&gt;</replacevalue>
-                </replace>
-        </target>
-
-        <target name="deploy.console" depends="install.base.console, patch.as5.console">
-            <condition property="console.dir"
-	      value="${jopr.console.dir}">
-               <available file="${jopr.console.dir}"/>
-            </condition>           
-
-            <condition property="console.dir"
-              value="${as6.jopr.console.dir}">
-               <available file="${as6.jopr.console.dir}"/>
-            </condition> 
- 
-	    <path id="plugin.location">
-                <fileset dir="${console.dir}" includes="**/jopr-jboss-as-*plugin*.jar"/>
+        <target name="deploy.console" depends="install.base.console">
+            <path id="plugin.location">
+                <fileset dir="${jopr.console.dir}" includes="**/jopr-jboss-as-*plugin*.jar"/>
             </path>
             <property name="plugin.location" refid="plugin.location"/>
             <dirname property="plugin.dir" file="${plugin.location}"/>
@@ -513,6 +473,9 @@
         <delete dir="${deploy.dir}/soapui-client.sar" quiet="true"/>
         <delete file="${deploy.dir}/contract.war" quiet="true"/>
         <delete file="${deploy.dir}/esb-console.war" quiet="true" />
+        <delete quiet="true">
+            <fileset dir="${deploy.dir}/admin-console.war" includes="**/rhq-jbossesb-plugin-*.jar"/>
+        </delete>
         <delete dir="${conf.dir}/action-templates.xml" quiet="true"/>
         <delete quiet="false">
 			<fileset dir="${server.lib.dir}" >
@@ -528,10 +491,6 @@
                 <include name="commons-httpclient-*.jar"/>
             </fileset>
         </delete>
-        <delete quiet="true">
-            <fileset dir="${deploy.dir}/admin-console.war" includes="**/rhq-jbossesb-plugin-*.jar"/>
-        </delete>
-
     </target>
 
     <target name="undeploy.jbossas6" if="jbossas6" >