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

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

Author: jaikiran
Date: 2008-12-08 09:49:00 -0500 (Mon, 08 Dec 2008)
New Revision: 82111

Modified:
   projects/ejb3/trunk/docs/tutorial/pom.xml
   projects/ejb3/trunk/docs/tutorial/stateless/stateless.html
Log:
Support for running the tutorial through just a mvn install

Modified: projects/ejb3/trunk/docs/tutorial/pom.xml
===================================================================
--- projects/ejb3/trunk/docs/tutorial/pom.xml	2008-12-08 13:55:29 UTC (rev 82110)
+++ projects/ejb3/trunk/docs/tutorial/pom.xml	2008-12-08 14:49:00 UTC (rev 82111)
@@ -62,9 +62,11 @@
      <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
+        
           <execution>
-          <!--  We want to copy the packaged jar files to the JBoss deploy folder during install -->
-            <phase>install</phase>
+          <id>deploy-tutorial</id>
+          <!--  We want to copy the packaged jar files to the JBoss deploy folder during package -->
+            <phase>package</phase>
             <configuration>
             	<!--  Copy the deployable to the deploy folder of the appropriate server
             	profile in JBoss. 
@@ -79,43 +81,52 @@
               <goal>run</goal>
             </goals>
           </execution>
-        </executions>
-      </plugin>
-      
-      <!--  Run the java client  -->
-      <!--  For some weird reason, this plugin is not resolved.
-      Looks like some issue with the repository that is being picked up for this plugin download.
-      The http://repository.jboss.org/maven2/ repository has the org.codehaus.mojo groupId but does
-      not have the exec-maven-plugin artifact. 
-      The http://repo1.maven.org/maven2 repository has this artifact, but Maven-2.0.9 for some
-      reason, does not download it. Needs more investigation. Commented out for the time-being.
-       -->
-     <!--   <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <version>1.1-beta-1</version>
-        <executions>
+          
           <execution>
+          <id>run-tutorial</id>
+          <!--  Run the client -->
+            <phase>install</phase>
+            <configuration>
+              <!--  Individual child tutorials, will provide the ${ejb3.tutorial.client} property value  -->
+              <tasks>
+              	<!--  The classpath for the tutorial client -->
+              	<path id="ejb3.tutorial.classpath">
+      				<!-- Only the jbossall-client.jar should ideally be sufficient -->
+	      			<fileset dir="${JBOSS_HOME}/client">
+	         			<include name="**/jbossall-client.jar"/>
+	      			</fileset>
+	      			<pathelement location="${build.outputDirectory}"/>
+   				</path>
+   				<echo message="*********************************** JBoss EJB3 Tutorials ***********************************" />
+   				<echo message="**** Running ${ejb3.tutorial.client}" />
+				<java classname="${ejb3.tutorial.client}" fork="yes" dir=".">
+         			<classpath refid="ejb3.tutorial.classpath"/> 
+      			</java>
+      			<echo message="**** Successful completion of tutorial!" />
+      			<echo message="********************************************************************************************" />
+              </tasks>
+            </configuration>
             <goals>
-              <goal>exec</goal>
+              <goal>run</goal>
             </goals>
           </execution>
+          
         </executions>
-        <configuration>
-          <executable>java</executable>
-          <arguments>
-            <argument>-classpath</argument>
-            
-            <classpath/>
-            <argument>${ejb3.tutorial.client}</argument>
-            
-          </arguments>
-        </configuration>
-        
-      </plugin> -->
+      </plugin>
+      
    </plugins>
-   
+   <!--  Include the jndi.properties and the log4j.xml in the classpath -->
+   <resources>
+   	<resource>
+   		<directory>./</directory>
+   		<includes>
+   			<include>jndi.properties</include>
+   			<include>log4j.xml</include>
+   		</includes>
+   	</resource>
+   </resources>
   </build>
+
   <dependencies>
   	  <dependency>
         <groupId>org.jboss.javaee</groupId>

Modified: projects/ejb3/trunk/docs/tutorial/stateless/stateless.html
===================================================================
--- projects/ejb3/trunk/docs/tutorial/stateless/stateless.html	2008-12-08 13:55:29 UTC (rev 82110)
+++ projects/ejb3/trunk/docs/tutorial/stateless/stateless.html	2008-12-08 14:49:00 UTC (rev 82111)
@@ -47,8 +47,6 @@
 <b> Maven Users: </b>
 <pre>
 $ mvn clean install
-TODO: This part needs to be fixed. In progress.
-$ mvn exec:exec
 </pre>
 
 <h4>Jar structure</h4>