You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2010/06/30 04:36:02 UTC
svn commit: r959169 - in /geronimo/samples/branches/3.0-M1:
geronimo-samples-archetype/src/main/resources/archetype-resources/
geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/src/main/plan/
geronimo-samples-archetype/src/...
Author: xiaming
Date: Wed Jun 30 02:36:01 2010
New Revision: 959169
URL: http://svn.apache.org/viewvc?rev=959169&view=rev
Log:
GERONIMO-5399 update samples archetype
Modified:
geronimo/samples/branches/3.0-M1/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml
geronimo/samples/branches/3.0-M1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/pom.xml
Modified: geronimo/samples/branches/3.0-M1/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml?rev=959169&r1=959168&r2=959169&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml Wed Jun 30 02:36:01 2010
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>javaee6</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
+ <version>3.0-M1</version>
</parent>
<artifactId>${artifactId}</artifactId>
Modified: geronimo/samples/branches/3.0-M1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/src/main/plan/plan.xml?rev=959169&r1=959168&r2=959169&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/src/main/plan/plan.xml Wed Jun 30 02:36:01 2010
@@ -22,13 +22,7 @@
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
<dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:moduleId>
- <dep:groupId>${pom.groupId}</dep:groupId>
- <dep:artifactId>${pom.artifactId}</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
-
+
</dep:environment>
</application>
Modified: geronimo/samples/branches/3.0-M1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-tomcat/src/main/plan/plan.xml?rev=959169&r1=959168&r2=959169&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-tomcat/src/main/plan/plan.xml Wed Jun 30 02:36:01 2010
@@ -21,13 +21,7 @@
<!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
- <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:moduleId>
- <dep:groupId>${pom.groupId}</dep:groupId>
- <dep:artifactId>${pom.artifactId}</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
+ <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
</dep:environment>
Modified: geronimo/samples/branches/3.0-M1/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/pom.xml?rev=959169&r1=959168&r2=959169&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/pom.xml Wed Jun 30 02:36:01 2010
@@ -155,48 +155,12 @@
</pluginManagement>
</build>
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>sample-datasource</module>
- <module>javaee5</module>
- <module>javaee6</module>
- <module>osgi</module>
- <module>daytrader</module>
- <module>all-samples</module>
- </modules>
- </profile>
- <profile>
- <id>no-plugin</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <property>
- <name>buildPlugin</name>
- <value>false</value>
- </property>
- </activation>
- <modules>
- <module>javaee5</module>
- <module>javaee6</module>
- <module>osgi</module>
- <module>daytrader</module>
- </modules>
- </profile>
- <profile>
- <id>all-subprojects</id>
-
- <modules>
- <module>sample-datasource</module>
- <module>javaee5</module>
- <module>javaee6</module>
- <module>osgi</module>
- <module>daytrader</module>
- <module>all-samples</module>
- </modules>
- </profile>
- </profiles>
+ <modules>
+ <module>sample-datasource</module>
+ <module>javaee5</module>
+ <module>javaee6</module>
+ <module>osgi</module>
+ <module>daytrader</module>
+ <module>all-samples</module>
+ </modules>
</project>