[webbeans-commits] Webbeans SVN: r3740 - examples/trunk.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-09-22 11:32:41 -0400 (Tue, 22 Sep 2009)
New Revision: 3740

Modified:
   examples/trunk/build.xml
Log:
ws

Modified: examples/trunk/build.xml
===================================================================
--- examples/trunk/build.xml	2009-09-22 15:30:12 UTC (rev 3739)
+++ examples/trunk/build.xml	2009-09-22 15:32:41 UTC (rev 3740)
@@ -1,122 +1,122 @@
 <project basedir="." name="example.build.script" default="restart">
 
 	<dirname property="wbexamples.dir" file="${ant.file.example.build.script}" />
-	
+
 	<property name="maven.dir" location="${wbexamples.dir}/lib/maven" />
-	
-	<property file="${wbexamples.dir}/../jboss-as/local.build.properties"/>
-	<property file="${wbexamples.dir}/local.build.properties"/>
-	<property file="${wbexamples.dir}/build.properties"/>
-	<property file="${wbexamples.dir}/../jboss-as/build.properties"/>
-	
+
+	<property file="${wbexamples.dir}/../jboss-as/local.build.properties" />
+	<property file="${wbexamples.dir}/local.build.properties" />
+	<property file="${wbexamples.dir}/build.properties" />
+	<property file="${wbexamples.dir}/../jboss-as/build.properties" />
+
 	<property name="final.url" value="http://localhost:8080/${example.name}" />
-	
+
 	<property name="pom.file" value="pom.xml" />
-	
+
 	<property name="type" value="war" />
-	
+
 	<condition property="war">
-		<equals arg1="${type}" arg2="war"/>
+		<equals arg1="${type}" arg2="war" />
 	</condition>
 	<condition property="ear">
-      <equals arg1="${type}" arg2="ear"/>
-   </condition>
-	
+		<equals arg1="${type}" arg2="ear" />
+	</condition>
+
 	<condition property="artifact.target.dir" value="${basedir}/target">
-		<equals arg1="${type}" arg2="war"/>
+		<equals arg1="${type}" arg2="war" />
 	</condition>
 	<condition property="artifact.target.dir" value="${basedir}/${example.name}-ear/target">
-      <equals arg1="${type}" arg2="ear"/>
-   </condition>
-	
+		<equals arg1="${type}" arg2="ear" />
+	</condition>
+
 	<property name="artifact.dir" value="${artifact.target.dir}/${example.name}" />
-	
+
 	<target name="package">
 		<maven target="package" basedir="${basedir}">
-		   <arg line="-f ${pom.file}" />
+			<arg line="-f ${pom.file}" />
 		</maven>
 	</target>
-	
+
 	<target name="explode" depends="package">
-		<mkdir dir="${jboss.home}/server/default/deploy/${example.name}.${type}"/>
+		<mkdir dir="${jboss.home}/server/default/deploy/${example.name}.${type}" />
 		<copy todir="${jboss.home}/server/default/deploy/${example.name}.${type}">
-		 	<fileset dir="${artifact.dir}" />
+			<fileset dir="${artifact.dir}" />
 		</copy>
 	</target>
-	
-   <target name="tomcat.explode" depends="package">
-      <mkdir dir="${tomcat.home}/webapps/${example.name}"/>
-      <copy todir="${tomcat.home}/webapps/${example.name}">
-         <fileset dir="${artifact.dir}" />
-      </copy>
-   </target>
-	
+
+	<target name="tomcat.explode" depends="package">
+		<mkdir dir="${tomcat.home}/webapps/${example.name}" />
+		<copy todir="${tomcat.home}/webapps/${example.name}">
+			<fileset dir="${artifact.dir}" />
+		</copy>
+	</target>
+
 	<target name="deploy" depends="package">
-		<copy todir="${jboss.home}/server/default/deploy/" file="${artifact.target.dir}/${example.name}.${type}"/>
+		<copy todir="${jboss.home}/server/default/deploy/" file="${artifact.target.dir}/${example.name}.${type}" />
 		<echo message="The app can be accessed at ${final.url}" />
 	</target>
-	
-   <target name="tomcat.deploy" depends="package">
-      <copy todir="${tomcat.home}/webapps/" file="${artifact.target.dir}/${example.name}.${type}"/>
-      <echo message="The app can be accessed at ${final.url}" />
-   </target>
-	
+
+	<target name="tomcat.deploy" depends="package">
+		<copy todir="${tomcat.home}/webapps/" file="${artifact.target.dir}/${example.name}.${type}" />
+		<echo message="The app can be accessed at ${final.url}" />
+	</target>
+
 	<target name="clean">
 		<maven target="clean" basedir="${basedir}">
 			<arg line="-f ${pom.file}" />
-	   </maven>
+		</maven>
 	</target>
-	
+
 	<target name="restart.war" depends="explode" if="war">
 		<touch file="${jboss.home}/server/default/deploy/${example.name}.war/WEB-INF/web.xml" />
 	</target>
-	
+
 	<target name="tomcat.restart" depends="tomcat.explode" if="war">
-      <touch file="${tomcat.home}/webapps/${example.name}/WEB-INF/web.xml" />
-   </target>
-	
+		<touch file="${tomcat.home}/webapps/${example.name}/WEB-INF/web.xml" />
+	</target>
+
 	<target name="restart.ear" depends="explode" if="ear">
-      <touch file="${jboss.home}/server/default/deploy/${example.name}.ear/META-INF/application.xml" />
-   </target>
-	
+		<touch file="${jboss.home}/server/default/deploy/${example.name}.ear/META-INF/application.xml" />
+	</target>
+
 	<target name="restart" depends="restart.war, restart.ear">
 		<echo message="The app can be accessed at ${final.url}" />
 	</target>
-	
+
 	<target name="undeploy">
 		<delete dir="${jboss.home}/server/default/deploy/${example.name}.${type}" failonerror="false" />
-      <delete file="${jboss.home}/server/default/deploy/${example.name}.${type}" failonerror="false" />
+		<delete file="${jboss.home}/server/default/deploy/${example.name}.${type}" failonerror="false" />
 	</target>
-	
-   <target name="tomcat.undeploy">
-      <delete file="${tomcat.home}/webapps/${example.name}.war" failonerror="false" />
-   </target>
 
-   <target name="tomcat.unexplode">
-      <delete dir="${tomcat.home}/webapps/${example.name}" failonerror="false" />
-   </target>
+	<target name="tomcat.undeploy">
+		<delete file="${tomcat.home}/webapps/${example.name}.war" failonerror="false" />
+	</target>
 
-	
-  <macrodef name="maven">
-      <attribute name="target" />
-      <attribute name="basedir" />
-      <element name="args" implicit="true" optional="true" />
-      <sequential>
-         <java classname="org.codehaus.classworlds.Launcher" fork="true" dir="@{basedir}" failonerror="true">
-            <classpath>
-               <fileset dir="${maven.dir}/boot">
-                  <include name="*.jar" />
-               </fileset>
-               <fileset dir="${maven.dir}/bin">
-                  <include name="*.*" />
-               </fileset>
-            </classpath>
-            <sysproperty key="classworlds.conf" value="${maven.dir}/bin/m2.conf" />
-            <sysproperty key="maven.home" value="${maven.dir}" />
-            <args />
-            <arg line="@{target}" />
-         </java>
-      </sequential>
-   </macrodef>
-	
+	<target name="tomcat.unexplode">
+		<delete dir="${tomcat.home}/webapps/${example.name}" failonerror="false" />
+	</target>
+
+
+	<macrodef name="maven">
+		<attribute name="target" />
+		<attribute name="basedir" />
+		<element name="args" implicit="true" optional="true" />
+		<sequential>
+			<java classname="org.codehaus.classworlds.Launcher" fork="true" dir="@{basedir}" failonerror="true">
+				<classpath>
+					<fileset dir="${maven.dir}/boot">
+						<include name="*.jar" />
+					</fileset>
+					<fileset dir="${maven.dir}/bin">
+						<include name="*.*" />
+					</fileset>
+				</classpath>
+				<sysproperty key="classworlds.conf" value="${maven.dir}/bin/m2.conf" />
+				<sysproperty key="maven.home" value="${maven.dir}" />
+				<args />
+				<arg line="@{target}" />
+			</java>
+		</sequential>
+	</macrodef>
+
 </project>