[jboss-cvs] JBossAS SVN: r82451 - in projects/ejb3/trunk/docs/tutorial: common and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Dec 19 12:38:41 EST 2008
Author: jaikiran
Date: 2008-12-19 12:38:41 -0500 (Fri, 19 Dec 2008)
New Revision: 82451
Modified:
projects/ejb3/trunk/docs/tutorial/build.xml
projects/ejb3/trunk/docs/tutorial/common/pom.xml
projects/ejb3/trunk/docs/tutorial/init/pom.xml
projects/ejb3/trunk/docs/tutorial/jndibinding/src/org/jboss/tutorial/jndibinding/bean/CalculatorBean.java
projects/ejb3/trunk/docs/tutorial/pom.xml
projects/ejb3/trunk/docs/tutorial/shutdown/pom.xml
Log:
Support to run more tutorials from Maven and Ant. The new tutorials include stateful, jndibinding and injection (only for Ant users). This revision also includes a upgrade to newer version of the Maven JBossAS plugin
Modified: projects/ejb3/trunk/docs/tutorial/build.xml
===================================================================
--- projects/ejb3/trunk/docs/tutorial/build.xml 2008-12-19 17:28:47 UTC (rev 82450)
+++ projects/ejb3/trunk/docs/tutorial/build.xml 2008-12-19 17:38:41 UTC (rev 82451)
@@ -13,13 +13,23 @@
<project default="main" name="JBoss/EJB3 Tutorials">
+
<target name="main">
- <antcall target="asynch" inheritRefs="true"/>
+ <!-- TODO: Uncomment individual tutorials as and when they are ready -->
+
+
+
+ <antcall target="injection" inheritRefs="true"/>
+ <antcall target="jndibinding" inheritRefs="true"/>
+ <antcall target="stateful" inheritRefs="true"/>
+ <antcall target="stateless" inheritRefs="true"/>
+
+ <!-- <antcall target="asynch" inheritRefs="true"/>
<antcall target="blob" inheritRefs="true"/>
<antcall target="callbacks" inheritRefs="true"/>
- <antcall target="clusteredentity" inheritRefs="true"/>
+ <antcall target="clusteredentity" inheritRefs="true"/> -->
<!--antcall target="clustering" inheritRefs="true"/-->
- <antcall target="composite" inheritRefs="true"/>
+ <!-- <antcall target="composite" inheritRefs="true"/>
<antcall target="consumer" inheritRefs="true"/>
<antcall target="consumer_deployment_descriptor" inheritRefs="true"/>
<antcall target="dependency" inheritRefs="true"/>
@@ -30,9 +40,9 @@
<antcall target="extended_pc" inheritRefs="true"/>
<antcall target="injection" inheritRefs="true"/>
<antcall target="interceptor" inheritRefs="true"/>
- <antcall target="jboss_deployment_descriptor" inheritRefs="true"/>
+ <antcall target="jboss_deployment_descriptor" inheritRefs="true"/> -->
<!--antcall target="jca/inflow/swiftmq" inheritRefs="true"/-->
- <antcall target="jndibinding" inheritRefs="true"/>
+ <!-- <antcall target="jndibinding" inheritRefs="true"/>
<antcall target="joininheritance" inheritRefs="true"/>
<antcall target="mdb" inheritRefs="true"/>
<antcall target="jndibinding" inheritRefs="true"/>
@@ -49,7 +59,7 @@
<antcall target="stateless" inheritRefs="true"/>
<antcall target="stateless_deployment_descriptor" inheritRefs="true"/>
<antcall target="tableperinheritance" inheritRefs="true"/>
- <antcall target="timer" inheritRefs="true"/>
+ <antcall target="timer" inheritRefs="true"/> -->
</target>
<target name="asynch">
Modified: projects/ejb3/trunk/docs/tutorial/common/pom.xml
===================================================================
--- projects/ejb3/trunk/docs/tutorial/common/pom.xml 2008-12-19 17:28:47 UTC (rev 82450)
+++ projects/ejb3/trunk/docs/tutorial/common/pom.xml 2008-12-19 17:38:41 UTC (rev 82451)
@@ -22,6 +22,9 @@
-->
<jboss.home>${JBOSS_HOME}</jboss.home>
<jboss.server.config>default</jboss.server.config>
+
+ <!-- Versions -->
+ <version.maven-jboss-as-control-plugin>0.1.0</version.maven-jboss-as-control-plugin>
</properties>
<!-- Parent - The jboss-ejb3-tutorial-parent (Aggregator) will act as a parent
@@ -54,12 +57,12 @@
<sourceDirectory>./src</sourceDirectory>
<plugins>
- <!-- JBossAS Maven plugin for startup/shutdown
+ <!-- JBossAS Maven plugin for startup/shutdown/deploy/undeploy
and other AS control -->
<plugin>
<groupId>org.jboss.maven.plugins.jbossas</groupId>
<artifactId>maven-jboss-as-control-plugin</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>${version.maven-jboss-as-control-plugin}</version>
<!-- Executions -->
<!--
@@ -122,6 +125,39 @@
</executions>
</plugin>
+ <!-- Undeploy the tutorial after the client is run -->
+ <!-- FIXME: The ordering of the plugin execution is not working in 2.0.9 Maven.
+ For some reason, the "undeploy" is being triggered before the "deploy". This seems
+ to be happening if the same plugin has more than one execution for the same phase. Needs more
+ investigation. Commenting out for now
+ <plugin>
+ <groupId>org.jboss.maven.plugins.jbossas</groupId>
+ <artifactId>maven-jboss-as-control-plugin</artifactId>
+ <version>${version.maven-jboss-as-control-plugin}</version>
+
+
+ <executions>
+ <execution>
+ <id>undeploy-tutorial</id>
+ <goals>
+ <goal>undeploy</goal>
+ </goals>
+ <phase>install</phase>
+ <configuration>
+ <serverConfigName>${jboss.server.config}</serverConfigName>
+ <files>
+ ${pom.build.directory}/${pom.artifactId}.${pom.packaging}
+ </files>
+ <jboss.test.run>true</jboss.test.run>
+ </configuration>
+ </execution>
+
+
+
+ </executions>
+
+ </plugin> -->
+
<!-- Plugin to enforce JBOSS_HOME is set -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: projects/ejb3/trunk/docs/tutorial/init/pom.xml
===================================================================
--- projects/ejb3/trunk/docs/tutorial/init/pom.xml 2008-12-19 17:28:47 UTC (rev 82450)
+++ projects/ejb3/trunk/docs/tutorial/init/pom.xml 2008-12-19 17:38:41 UTC (rev 82451)
@@ -10,13 +10,20 @@
<!-- Model Version -->
<modelVersion>4.0.0</modelVersion>
+ <properties>
+
+ <!-- Versions -->
+ <version.maven-jboss-as-control-plugin>0.1.0</version.maven-jboss-as-control-plugin>
+ </properties>
+
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-tutorial-parent</artifactId>
<version>0.1.0-SNAPSHOT</version>
- <relativePath>../common/</relativePath>
+ <relativePath>../</relativePath>
</parent>
+
@@ -37,7 +44,7 @@
<plugin>
<groupId>org.jboss.maven.plugins.jbossas</groupId>
<artifactId>maven-jboss-as-control-plugin</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>${version.maven-jboss-as-control-plugin}</version>
<!-- Executions -->
<!--
Modified: projects/ejb3/trunk/docs/tutorial/jndibinding/src/org/jboss/tutorial/jndibinding/bean/CalculatorBean.java
===================================================================
--- projects/ejb3/trunk/docs/tutorial/jndibinding/src/org/jboss/tutorial/jndibinding/bean/CalculatorBean.java 2008-12-19 17:28:47 UTC (rev 82450)
+++ projects/ejb3/trunk/docs/tutorial/jndibinding/src/org/jboss/tutorial/jndibinding/bean/CalculatorBean.java 2008-12-19 17:38:41 UTC (rev 82451)
@@ -24,9 +24,10 @@
import javax.ejb.Local;
import javax.ejb.Remote;
import javax.ejb.Stateless;
-import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.ejb3.annotation.LocalBinding;
+import org.jboss.ejb3.annotation.RemoteBinding;
+
@Stateless
@RemoteBinding(jndiBinding="Calculator")
@LocalBinding(jndiBinding="CalculatorLocal")
Modified: projects/ejb3/trunk/docs/tutorial/pom.xml
===================================================================
--- projects/ejb3/trunk/docs/tutorial/pom.xml 2008-12-19 17:28:47 UTC (rev 82450)
+++ projects/ejb3/trunk/docs/tutorial/pom.xml 2008-12-19 17:38:41 UTC (rev 82451)
@@ -52,8 +52,13 @@
<module>init</module>
<!-- The tutorials go here -->
- <module>stateless</module>
-
+ <!-- FIXME: Temporarily commenting out the "injection" module, until one of the ordering issues
+ in maven plugin execution is resolved. See the comments in common/pom.xml for details
+ <module>injection</module> -->
+ <module>jndibinding</module>
+ <module>stateful</module>
+ <module>stateless</module>
+
<!-- Responsible for JBossAS shutdown -->
<module>shutdown</module>
Modified: projects/ejb3/trunk/docs/tutorial/shutdown/pom.xml
===================================================================
--- projects/ejb3/trunk/docs/tutorial/shutdown/pom.xml 2008-12-19 17:28:47 UTC (rev 82450)
+++ projects/ejb3/trunk/docs/tutorial/shutdown/pom.xml 2008-12-19 17:38:41 UTC (rev 82451)
@@ -10,11 +10,18 @@
<!-- Model Version -->
<modelVersion>4.0.0</modelVersion>
+ <properties>
+
+ <!-- Versions -->
+ <version.maven-jboss-as-control-plugin>0.1.0</version.maven-jboss-as-control-plugin>
+ </properties>
+
+
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-tutorial-parent</artifactId>
<version>0.1.0-SNAPSHOT</version>
- <relativePath>../common/</relativePath>
+ <relativePath>../</relativePath>
</parent>
@@ -37,7 +44,7 @@
<plugin>
<groupId>org.jboss.maven.plugins.jbossas</groupId>
<artifactId>maven-jboss-as-control-plugin</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>${version.maven-jboss-as-control-plugin}</version>
<!-- Executions -->
<!--
More information about the jboss-cvs-commits
mailing list