Author: dain
Date: Mon Sep 24 13:37:06 2007
New Revision: 578953
URL: http://svn.apache.org/viewvc?rev=578953&view=rev
Log:
Merging 578896 from trunk
Renamed servet-samples to ejb-examples
Added:
openejb/branches/3.0-beta-1/examples/ejb-examples/ (props changed)
- copied from r578896, openejb/trunk/openejb3/examples/ejb-examples/
openejb/branches/3.0-beta-1/examples/ejb-examples/pom.xml
- copied unchanged from r578896,
openejb/trunk/openejb3/examples/ejb-examples/pom.xml
openejb/branches/3.0-beta-1/examples/ejb-examples/src/
- copied from r578896, openejb/trunk/openejb3/examples/ejb-examples/src/
openejb/branches/3.0-beta-1/examples/ejb-examples/src/main/
- copied from r578896,
openejb/trunk/openejb3/examples/ejb-examples/src/main/
openejb/branches/3.0-beta-1/examples/ejb-examples/src/main/java/
- copied from r578896,
openejb/trunk/openejb3/examples/ejb-examples/src/main/java/
openejb/branches/3.0-beta-1/examples/ejb-examples/src/main/java/org/
- copied from r578896,
openejb/trunk/openejb3/examples/ejb-examples/src/main/java/org/
openejb/branches/3.0-beta-1/examples/ejb-examples/src/main/java/org/apache/
- copied from r578896,
openejb/trunk/openejb3/examples/ejb-examples/src/main/java/org/apache/
openejb/branches/3.0-beta-1/examples/ejb-examples/src/main/java/org/apache/openejb/
- copied from r578896,
openejb/trunk/openejb3/examples/ejb-examples/src/main/java/org/apache/openejb/
openejb/branches/3.0-beta-1/examples/ejb-examples/src/main/java/org/apache/openejb/examples/
- copied from r578896,
openejb/trunk/openejb3/examples/ejb-examples/src/main/java/org/apache/openejb/examples/
openejb/branches/3.0-beta-1/examples/ejb-examples/src/main/java/org/apache/openejb/examples/servlet/
- copied from r578896,
openejb/trunk/openejb3/examples/ejb-examples/src/main/java/org/apache/openejb/examples/servlet/
openejb/branches/3.0-beta-1/examples/ejb-examples/src/main/java/org/apache/openejb/examples/servlet/AnnotatedEJB.java
- copied unchanged from r578896,
openejb/trunk/openejb3/examples/ejb-examples/src/main/java/org/apache/openejb/examples/servlet/AnnotatedEJB.java
openejb/branches/3.0-beta-1/examples/ejb-examples/src/main/java/org/apache/openejb/examples/servlet/AnnotatedEJBLocal.java
- copied unchanged from r578896,
openejb/trunk/openejb3/examples/ejb-examples/src/main/java/org/apache/openejb/examples/servlet/AnnotatedEJBLocal.java
openejb/branches/3.0-beta-1/examples/ejb-examples/src/main/java/org/apache/openejb/examples/servlet/AnnotatedEJBRemote.java
- copied unchanged from r578896,
openejb/trunk/openejb3/examples/ejb-examples/src/main/java/org/apache/openejb/examples/servlet/AnnotatedEJBRemote.java
openejb/branches/3.0-beta-1/examples/ejb-examples/src/main/java/org/apache/openejb/examples/servlet/AnnotatedServlet.java
- copied unchanged from r578896,
openejb/trunk/openejb3/examples/ejb-examples/src/main/java/org/apache/openejb/examples/servlet/AnnotatedServlet.java
openejb/branches/3.0-beta-1/examples/ejb-examples/src/main/resources/
- copied from r578896,
openejb/trunk/openejb3/examples/ejb-examples/src/main/resources/
openejb/branches/3.0-beta-1/examples/ejb-examples/src/main/webapp/
- copied from r578896,
openejb/trunk/openejb3/examples/ejb-examples/src/main/webapp/
openejb/branches/3.0-beta-1/examples/ejb-examples/src/main/webapp/WEB-INF/
- copied from r578896,
openejb/trunk/openejb3/examples/ejb-examples/src/main/webapp/WEB-INF/
openejb/branches/3.0-beta-1/examples/ejb-examples/src/main/webapp/WEB-INF/web.xml
- copied unchanged from r578896,
openejb/trunk/openejb3/examples/ejb-examples/src/main/webapp/WEB-INF/web.xml
openejb/branches/3.0-beta-1/examples/ejb-examples/src/main/webapp/index.jsp
- copied unchanged from r578896,
openejb/trunk/openejb3/examples/ejb-examples/src/main/webapp/index.jsp
Removed:
openejb/branches/3.0-beta-1/examples/servlet-samples/
Modified:
openejb/branches/3.0-beta-1/examples/pom.xml
Propchange: openejb/branches/3.0-beta-1/examples/ejb-examples/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 24 13:37:06 2007
@@ -0,0 +1,10 @@
+*.iws
+*.ipr
+*.iml
+.classpath
+.project
+.settings
+*.log
+junit*.properties
+target
+bin
Modified: openejb/branches/3.0-beta-1/examples/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/branches/3.0-beta-1/examples/pom.xml?rev=578953&r1=578952&r2=578953&view=diff
==============================================================================
--- openejb/branches/3.0-beta-1/examples/pom.xml (original)
+++ openejb/branches/3.0-beta-1/examples/pom.xml Mon Sep 24 13:37:06 2007
@@ -37,6 +37,6 @@
<module>resource-injection</module>
<module>telephone-stateful</module>
<module>expanded-env-entries</module>
- <module>servlet-samples</module>
+ <module>ejb-examples</module>
</modules>
</project>
