[jboss-cvs] JBossAS SVN: r82550 - in projects/ejb3/trunk/docs/tutorial: common and 1 other directory.

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

Author: jaikiran
Date: 2008-12-26 02:14:44 -0500 (Fri, 26 Dec 2008)
New Revision: 82550

Modified:
   projects/ejb3/trunk/docs/tutorial/build.xml
   projects/ejb3/trunk/docs/tutorial/common/pom.xml
   projects/ejb3/trunk/docs/tutorial/pom.xml
Log:
EJBTHREE-1607 Included additional tutorials in the parent pom/build scripts

Modified: projects/ejb3/trunk/docs/tutorial/build.xml
===================================================================
--- projects/ejb3/trunk/docs/tutorial/build.xml	2008-12-26 07:10:28 UTC (rev 82549)
+++ projects/ejb3/trunk/docs/tutorial/build.xml	2008-12-26 07:14:44 UTC (rev 82550)
@@ -17,10 +17,12 @@
 	<target name="main">
 		<!-- TODO: Uncomment individual tutorials as and when they are ready -->
 		
-		
+		<antcall target="asynch" inheritRefs="true"/>
 		<antcall target="blob" inheritRefs="true"/>
 		<antcall target="callbacks" inheritRefs="true"/>
 		<antcall target="composite" inheritRefs="true"/>
+		<antcall target="consumer" inheritRefs="true"/>
+		<antcall target="consumer_deployment_descriptor" inheritRefs="true"/>
 		<antcall target="entity" inheritRefs="true"/>
 		<antcall target="extended_pc" inheritRefs="true"/>
 		<antcall target="injection" inheritRefs="true"/>
@@ -28,6 +30,7 @@
 		<antcall target="merge" inheritRefs="true"/>
 		<antcall target="relationships" inheritRefs="true"/>
 		<antcall target="secondary" inheritRefs="true"/>
+		<antcall target="security" inheritRefs="true"/>
 		<antcall target="singleinheritance" inheritRefs="true"/>
 		<antcall target="stateful" inheritRefs="true"/>
 		<antcall target="stateful_deployment_descriptor" inheritRefs="true"/>
@@ -75,7 +78,7 @@
 	<target name="asynch"> 
 		<echo message="---------------- Running asynch ------------"/>     
 		<ant dir="asynch" antfile="build.xml"/>
-		<sleep seconds="5"/>
+		<sleep seconds="10"/>
 		<ant dir="asynch" antfile="build.xml" target="run"/>
 		<sleep seconds="4"/>
 		<ant dir="asynch" antfile="build.xml" target="clean"/>
@@ -130,7 +133,7 @@
 	<target name="consumer">   
 		<echo message="---------------- Running consumer ------------"/>    
 		<ant dir="consumer" antfile="build.xml"/>
-		<sleep seconds="5"/>
+		<sleep seconds="10"/>
 		<ant dir="consumer" antfile="build.xml" target="run"/>
 		<sleep seconds="4"/>
 		<ant dir="consumer" antfile="build.xml" target="clean"/>
@@ -139,7 +142,7 @@
 	<target name="consumer_deployment_descriptor">   
 		<echo message="---------------- Running consumer_deployment_descriptor ------------"/>    
 		<ant dir="consumer_deployment_descriptor" antfile="build.xml"/>
-		<sleep seconds="5"/>
+		<sleep seconds="10"/>
 		<ant dir="consumer_deployment_descriptor" antfile="build.xml" target="run"/>
 		<sleep seconds="4"/>
 		<ant dir="consumer_deployment_descriptor" antfile="build.xml" target="clean"/>
@@ -309,7 +312,7 @@
 	<target name="security"> 
 		<echo message="---------------- Running security ------------"/>      
 		<ant dir="security" antfile="build.xml"/>
-		<sleep seconds="5"/>
+		<sleep seconds="10"/>
 		<ant dir="security" antfile="build.xml" target="run"/>
 		<sleep seconds="4"/>
 		<ant dir="security" antfile="build.xml" target="clean"/>

Modified: projects/ejb3/trunk/docs/tutorial/common/pom.xml
===================================================================
--- projects/ejb3/trunk/docs/tutorial/common/pom.xml	2008-12-26 07:10:28 UTC (rev 82549)
+++ projects/ejb3/trunk/docs/tutorial/common/pom.xml	2008-12-26 07:14:44 UTC (rev 82550)
@@ -78,7 +78,7 @@
             	
                 <executions>
               		   	<execution>
-        		        <id>deploy-tutorial</id>
+              		   	<id>deploy-tutorial</id>
                 		<goals>
                   			<goal>deploy</goal>
                 		</goals>
@@ -143,7 +143,7 @@
                 <executions>
               		   	<execution>
         		        <id>undeploy-tutorial</id>
-                		<goals>
+        		        <goals>
                   			<goal>undeploy</goal>
                 		</goals>
                 		<phase>post-integration-test</phase>
@@ -166,6 +166,8 @@
   
   		<!--  Include the jndi.properties and the log4j.xml in the classpath -->
    		<resources>
+   			<!-- Include files from the root of the tutorial into the
+   			root of output artifact jar -->
    			<resource>
    				<!--  Relative to each child tutorial -->
    				<directory>./</directory>
@@ -174,8 +176,11 @@
    					<include>log4j.xml</include>
    				</includes>
    			</resource>
+   			<!--  Include xml files from the META-INF of the tutorial into the
+   			META-INF folder of output artifact jar
+   			 -->
    			<resource>
-   				<!--  Relative to each child tutorial -->
+   				
    				<directory>./META-INF</directory>
    				<includes>
    					<include>*.xml</include>

Modified: projects/ejb3/trunk/docs/tutorial/pom.xml
===================================================================
--- projects/ejb3/trunk/docs/tutorial/pom.xml	2008-12-26 07:10:28 UTC (rev 82549)
+++ projects/ejb3/trunk/docs/tutorial/pom.xml	2008-12-26 07:14:44 UTC (rev 82550)
@@ -91,21 +91,26 @@
 			
 			<!-- The tutorials go here -->
 
+			<module>asynch</module>
 		  	<module>blob</module>
+		 	<module>callbacks</module>
 		 	<module>composite</module>
-			<module>callbacks</module>
+		 	<module>consumer</module> 
+		 	<module>consumer_deployment_descriptor</module>
 			<module>entity</module>
 			<module>extended_pc</module>
 			<module>injection</module>  
 			<module>jndibinding</module> 
+			<module>mdb_deployment_descriptor</module>
 			<module>merge</module>
 			<module>relationships</module>
 			<module>secondary</module>
+			<module>security</module>
 			<module>singleinheritance</module>
 			<module>stateful</module>
 			<module>stateful_deployment_descriptor</module>
 			<module>stateless</module>
-			<module>stateless_deployment_descriptor</module>
+			<module>stateless_deployment_descriptor</module>  
 
 			<!-- Responsible for JBossAS shutdown -->
 			<module>shutdown</module>