You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2008/09/16 19:36:04 UTC
svn commit: r695987 - in
/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources:
META-INF/archetype.xml
archetype-resources/sample-ear/src/main/resources/META-INF/geronimo-application.xml
Author: jbohn
Date: Tue Sep 16 10:36:03 2008
New Revision: 695987
URL: http://svn.apache.org/viewvc?rev=695987&view=rev
Log:
merge 695985 from branches/2.1 - remove geronimo-application.xml from archetype
Removed:
geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/geronimo-application.xml
Modified:
geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/META-INF/archetype.xml
Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/META-INF/archetype.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/META-INF/archetype.xml?rev=695987&r1=695986&r2=695987&view=diff
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/META-INF/archetype.xml (original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/META-INF/archetype.xml Tue Sep 16 10:36:03 2008
@@ -26,7 +26,6 @@
<resources>
<resource>pom.xml</resource>
<resource>sample-ear/pom.xml</resource>
- <resource>sample-ear/src/main/resources/META-INF/geronimo-application.xml</resource>
<resource>sample-ejb/pom.xml</resource>
<resource>sample-ejb/src/main/java/org/apache/geronimo/samples/ejb/SampleBean.java</resource>
<resource>sample-ejb/src/main/java/org/apache/geronimo/samples/ejb/SampleBeanLocal.java</resource>