[jboss-svn-commits] JBL Code SVN: r14781 - labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action.

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

Author: tcunning
Date: 2007-08-31 11:28:14 -0400 (Fri, 31 Aug 2007)
New Revision: 14781

Modified:
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/build.xml
Log:
bug:JBESB-721
Fix redeployment issues by moving shared code into ${org.jboss.esb.server.config}/lib.  This way we don't have problems with
the old detached classloader.


Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/build.xml	2007-08-31 13:51:05 UTC (rev 14780)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_hibernate_action/build.xml	2007-08-31 15:28:14 UTC (rev 14781)
@@ -20,16 +20,10 @@
 	<target name="package-deployment">
 	</target>
 
-	<target name="assert-ear-deployer">
-		<available type="file" property="ear.deployer.available" file="${org.jboss.esb.server.deploy.dir}/ear-deployer.xml"/>
-		<fail unless="ear.deployer.available">**** DEPLOYMENT FAILED... Sorry, this Quickstart requires a JBoss EAR deployable container.   '${org.jboss.esb.server.deploy.dir}' does not have an EAR deployer.     Check the 'org.jboss.esb.server.home' property in ../../../install/deployment.properties</fail>
-		<echo message="JBoss EAR deployer found on target '${org.jboss.esb.server.deploy.dir}'."/>
-	</target>
-
-	<target name="quickstart-specific-dependencies" depends="assert-ear-deployer"/>
-
 	<target name="deploy" depends="build-ear">
-		<copy file="${build.dir}/${ant.project.name}.ear"
+		<copy file="${build.dir}/esbhibernate-helloworld.jar"
+			todir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib"/>
+		<copy file="${build.dir}/${ant.project.name}.esb"
 			todir="${org.jboss.esb.server.deploy.dir}"/>
 	</target>
 
@@ -46,9 +40,9 @@
 	</target>
 
 	<target name="build-ear" depends="compile, config, package-deployment">
-		<jar destfile="${build.dir}/${ant.project.name}.jar">
+		<jar destfile="${build.dir}/esbhibernate-helloworld.jar">
 			<fileset dir="${build.dir}/classes">
-				<include name="**"/>
+				<exclude name="**/MyAction.class"/>
 			</fileset>
 			<fileset dir="${basedir}">
 				<include name="hibernate.cfg.xml"/>
@@ -58,6 +52,22 @@
 				<include name="**/*.xml"/>
 			</fileset>
 		</jar>
+
+		<jar destfile="${build.dir}/action.jar">
+			<fileset dir="${build.dir}/classes">
+				<include name="org/jboss/soa/esb/samples/quickstart/hibernateaction/MyAction.class"/>
+			</fileset>
+		</jar>
+
+		<war warfile="${build.dir}/hibernateaction.war"
+			webxml="${basedir}/resources/WEB-INF/web.xml">                        		<fileset dir="${basedir}/view">
+				<include name="**/*"/>
+			</fileset>
+			<lib dir="${basedir}/lib/ext">
+				<include name="mysql-connector-java-3.1.12-bin.jar"/>
+			</lib>
+		</war>
+
 		<!-- We build the .esb in a custom manner because
 		 	we are packaging it within an .ear -->
 		<mkdir dir="${build.dir}/META-INF"/>
@@ -66,27 +76,13 @@
 		<jar destfile="${build.dir}/${ant.project.name}.esb">
 			<fileset dir="${build.dir}">
 				<include name="META-INF/*"/>	
+				<include name="*.war"/>
+				<include name="action.jar"/>
 			</fileset>	
-		</jar>	
-
-		<war warfile="${build.dir}/${ant.project.name}.war"
-			webxml="${basedir}/resources/WEB-INF/web.xml">
-			<fileset dir="${basedir}/view">
-				<include name="**/*"/>
-			</fileset>
-		</war>
-
-		<ear destfile="${build.dir}/${ant.project.name}.ear"
-			appxml="${basedir}/resources/application.xml">
-			<fileset dir="${build.dir}">
+			<fileset dir="${basedir}/lib/ext">	
 				<include name="*.jar"/>
-				<include name="*.war"/>
-				<include name="*.esb"/>
 			</fileset>
-			<fileset dir="${basedir}/lib/ext">
-				<include name="mysql-connector-java-3.1.12-bin.jar"/>
-			</fileset>
-		</ear>	
+		</jar>	
 	</target>
   
 	<target name="dropdb"