[jboss-svn-commits] JBL Code SVN: r28900 - labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/systinet.

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

Author: tcunning
Date: 2009-08-11 07:56:42 -0400 (Tue, 11 Aug 2009)
New Revision: 28900

Removed:
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/systinet/systinet.properties
Modified:
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/systinet/build.xml
Log:
JBESB-2781
Don't compile against Systinet JARs - they are no longer needed on the classpath.


Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/systinet/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/systinet/build.xml	2009-08-11 10:36:30 UTC (rev 28899)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/systinet/build.xml	2009-08-11 11:56:42 UTC (rev 28900)
@@ -1,5 +1,10 @@
 <project name="jon-build" default="deploy" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
 
+    <property name="product.dir" value="${pwd}/../../.."/>
+    <property name="install.dir" value="${product.dir}/install"/>
+    <property file="${install.dir}/deployment.properties"/> 
+    <property name="org.jboss.esb.server.home" location="${pwd}/../../.."/>
+
     <property name="build.dir" location="build"/>
     <property name="classes.dir" value="${build.dir}/classes"/>
     <property name="classpath.dir" location="../../../antlib"/>
@@ -21,14 +26,41 @@
         <delete dir="${build.dir}"/>
     </target>
 
-    <path id="classpath">
-    	<fileset dir="/home/tcunning/jboss-4.2.2.GA/server/default/lib"
-    		includes="**/*.jar"/>
-    	<fileset dir="${systinet.reg.dir}/lib" includes="**/*.jar"/>
-    	<fileset dir="${systinet.reg.dir}/app/uddi" includes="**/*.jar"/>
-    </path>
+    <target name="initialise-config" unless="org.jboss.esb.server.config">
+	<condition property="jbossesb-server-production">
+   		<available file="${org.jboss.esb.server.home}/server/production/deploy/jbossesb.sar"/>
+	</condition>
+	<condition property="jbossesb-server-default">
+		<available file="${org.jboss.esb.server.home}/server/default/deploy/jbossesb.sar"/>
+	</condition>
 
-    <target name="compile-transport">
+	<echo>${org.jboss.esb.server.home}/server/default/deploy/jbossesb.sar</echo>
+
+	<condition property="jbossesb-server-recognised">
+		<or>
+			<isset property="jbossesb-server-production"/>
+			<isset property="jbossesb-server-default"/>
+		</or>
+	</condition>
+
+	<fail unless="jbossesb-server-recognised" message="Could not detect default ESB server instance"/>
+
+	<condition property="org.jboss.esb.server.config"
+		value="production">
+		<isset property="jbossesb-server-production"/>
+	</condition>
+	<condition property="org.jboss.esb.server.config"
+		value="default">
+		<isset property="jbossesb-server-default"/>
+	</condition>
+   </target>
+
+    <target name="compile-transport" depends="initialise-config">
+        <path id="classpath">
+           <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib"
+                includes="**/*.jar"/>    
+	</path>
+
    	<mkdir dir="build"/> 
 	<mkdir dir="${classes.dir}"/>
         <javac deprecation="off" nowarn="on" debug="on" srcdir="${java.dir}" destdir="${classes.dir}" classpathref="classpath" source="1.5"/>
@@ -52,10 +84,10 @@
     <target name="deploy" depends="jar-transport">
     	<copy file="${esb.transport.jar}"
     		overwrite="true"
-    		todir="/home/tcunning/jboss-4.2.2.GA/server/default/deploy/registry.war/WEB-INF/lib"/>
+    		todir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/registry.war/WEB-INF/lib"/>
     	<copy file="${esb.client.transport.jar}"
     		overwrite="true"
-    		todir="/home/tcunning/jboss-4.2.2.GA/server/default/deploy/jbossesb.sar/lib"/>
+    		todir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib"/>
     </target>
 
 </project>

Deleted: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/systinet/systinet.properties
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/systinet/systinet.properties	2009-08-11 10:36:30 UTC (rev 28899)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/systinet/systinet.properties	2009-08-11 11:56:42 UTC (rev 28900)
@@ -1,2 +0,0 @@
-systinet.reg.dir=/opt/hp/registry
-jboss.home.dir=/home/tcunning/jboss-4.2.2.GA