Author: dain
Date: Mon Sep 24 14:10:58 2007
New Revision: 578973
URL: http://svn.apache.org/viewvc?rev=578973&view=rev
Log:
Merging 578971 from trunk
Added link to new jpa example
Modified:
openejb/branches/3.0-beta-1/assembly/openejb-tomcat/maven.xml
openejb/branches/3.0-beta-1/examples/ejb-examples/src/main/webapp/index.jsp
Modified: openejb/branches/3.0-beta-1/assembly/openejb-tomcat/maven.xml
URL:
http://svn.apache.org/viewvc/openejb/branches/3.0-beta-1/assembly/openejb-tomcat/maven.xml?rev=578973&r1=578972&r2=578973&view=diff
==============================================================================
--- openejb/branches/3.0-beta-1/assembly/openejb-tomcat/maven.xml (original)
+++ openejb/branches/3.0-beta-1/assembly/openejb-tomcat/maven.xml Mon Sep 24
14:10:58 2007
@@ -219,7 +219,7 @@
<attainGoal name="tomcat6"/>
<attainGoal name="setup:tomcat"/>
<attainGoal name="setup:loader-webapp"/>
- <!--<attainGoal name="setup:itests-war"/>-->
+ <attainGoal name="setup:itests-war"/>
<attainGoal name="setup:ejb-examples"/>
<attainGoal name="start:tomcat"/>
</goal>
@@ -228,7 +228,7 @@
<attainGoal name="tomcat6"/>
<attainGoal name="setup:tomcat"/>
<attainGoal name="setup:loader-webapp"/>
- <!--<attainGoal name="setup:itests-war"/>-->
+ <attainGoal name="setup:itests-war"/>
<attainGoal name="setup:ejb-examples"/>
<attainGoal name="start:tomcat-debug"/>
</goal>
Modified:
openejb/branches/3.0-beta-1/examples/ejb-examples/src/main/webapp/index.jsp
URL:
http://svn.apache.org/viewvc/openejb/branches/3.0-beta-1/examples/ejb-examples/src/main/webapp/index.jsp?rev=578973&r1=578972&r2=578973&view=diff
==============================================================================
--- openejb/branches/3.0-beta-1/examples/ejb-examples/src/main/webapp/index.jsp
(original)
+++ openejb/branches/3.0-beta-1/examples/ejb-examples/src/main/webapp/index.jsp
Mon Sep 24 14:10:58 2007
@@ -1,6 +1,7 @@
<html>
<body>
<h2>Hello World!</h2>
-<a href="annotated">Annotated Servlet</a>
+<a href="annotated">Annotated Servlet</a> <br>
+<a href="jpa">JPA Example</a> <br>
</body>
</html>
