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/04/09 11:35:31 UTC
svn commit: r932316 - in /geronimo/samples/trunk: ./ samples/
samples/javaee5/ samples/javaee5/DataCDInfo/ samples/javaee5/app-per-port/
samples/javaee5/async-http/ samples/javaee5/bank/
samples/javaee5/bank/bank-client/ samples/javaee5/bank/bank-war/ ...
Author: xiaming
Date: Fri Apr 9 09:35:30 2010
New Revision: 932316
URL: http://svn.apache.org/viewvc?rev=932316&view=rev
Log:
GERONIMO-5239 update java ee 5 samples and add no-plugin profile
Added:
geronimo/samples/trunk/samples/pom.xml (with props)
Modified:
geronimo/samples/trunk/pom.xml
geronimo/samples/trunk/samples/javaee5/DataCDInfo/pom.xml
geronimo/samples/trunk/samples/javaee5/app-per-port/pom.xml
geronimo/samples/trunk/samples/javaee5/async-http/pom.xml
geronimo/samples/trunk/samples/javaee5/bank/bank-client/pom.xml
geronimo/samples/trunk/samples/javaee5/bank/bank-war/pom.xml
geronimo/samples/trunk/samples/javaee5/bank/pom.xml
geronimo/samples/trunk/samples/javaee5/calculator/pom.xml
geronimo/samples/trunk/samples/javaee5/csa-activemq/pom.xml
geronimo/samples/trunk/samples/javaee5/customer/customer-client/pom.xml
geronimo/samples/trunk/samples/javaee5/customer/pom.xml
geronimo/samples/trunk/samples/javaee5/dbtester/dbtester-war/pom.xml
geronimo/samples/trunk/samples/javaee5/dbtester/pom.xml
geronimo/samples/trunk/samples/javaee5/inventory/pom.xml
geronimo/samples/trunk/samples/javaee5/jaxws-calculator/pom.xml
geronimo/samples/trunk/samples/javaee5/jms-mdb/pom.xml
geronimo/samples/trunk/samples/javaee5/jsp-examples/pom.xml
geronimo/samples/trunk/samples/javaee5/ldap-sample-app/pom.xml
geronimo/samples/trunk/samples/javaee5/myphonebook/pom.xml
geronimo/samples/trunk/samples/javaee5/mytime/pom.xml
geronimo/samples/trunk/samples/javaee5/pom.xml
geronimo/samples/trunk/samples/javaee5/sample-datasource/pom.xml
geronimo/samples/trunk/samples/javaee5/sendmail/pom.xml
geronimo/samples/trunk/samples/javaee5/servlet-examples/pom.xml
geronimo/samples/trunk/samples/javaee5/timereport/pom.xml
Modified: geronimo/samples/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/pom.xml?rev=932316&r1=932315&r2=932316&view=diff
==============================================================================
--- geronimo/samples/trunk/pom.xml (original)
+++ geronimo/samples/trunk/pom.xml Fri Apr 9 09:35:30 2010
@@ -49,7 +49,7 @@
<geronimoVersion>3.0-SNAPSHOT</geronimoVersion>
<siteId>geronimo-samples</siteId>
<projectName>Apache Geronimo Samples</projectName>
- <jetty>jetty7</jetty>
+ <jetty>jetty8</jetty>
</properties>
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
@@ -268,7 +268,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-alpha-3</version>
<executions>
<execution>
<phase>validate</phase>
@@ -316,6 +315,5 @@
</configuration>
</plugin>
</plugins>
- </reporting>
-
+ </reporting>
</project>
Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/pom.xml?rev=932316&r1=932315&r2=932316&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/pom.xml Fri Apr 9 09:35:30 2010
@@ -26,26 +26,19 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>samples</artifactId>
+ <artifactId>javaee5</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
<artifactId>DataCDInfo</artifactId>
<name>Geronimo Samples :: DataCDInfo</name>
<packaging>pom</packaging>
- <version>${geronimoVersion}</version>
<description>
Geronimo DataCDInfo sample created from an archetype.
</description>
- <modules>
- <module>DataCDInfo-JTA-ejb</module>
- <module>DataCDInfo-JTA-war</module>
- <module>DataCDInfo-JTA-ear</module>
- <module>DataCDInfo-JTA-jetty</module>
- <module>DataCDInfo-JTA-tomcat</module>
- </modules>
+
<build>
<plugins>
@@ -57,5 +50,36 @@
</configuration>
</plugin>
</plugins>
- </build>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>DataCDInfo-JTA-ejb</module>
+ <module>DataCDInfo-JTA-war</module>
+ <module>DataCDInfo-JTA-ear</module>
+ <module>DataCDInfo-JTA-jetty</module>
+ <module>DataCDInfo-JTA-tomcat</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>no-plugin</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>buildPlugin</name>
+ <value>false</value>
+ </property>
+ </activation>
+ <modules>
+ <module>DataCDInfo-JTA-ejb</module>
+ <module>DataCDInfo-JTA-war</module>
+ <module>DataCDInfo-JTA-ear</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/samples/trunk/samples/javaee5/app-per-port/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/app-per-port/pom.xml?rev=932316&r1=932315&r2=932316&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/app-per-port/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/app-per-port/pom.xml Fri Apr 9 09:35:30 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>samples</artifactId>
+ <artifactId>javaee5</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -37,15 +37,38 @@
<description>
Geronimo app-per-port sample created from an archetype.
</description>
-
- <modules>
- <module>app-per-port-war1</module>
- <module>app-per-port-war2</module>
- <module>app-per-port-connector-war</module>
- <module>app-per-port-ear</module>
- <module>app-per-port-war1-jetty</module>
- <module>app-per-port-jetty</module>
- <module>app-per-port-tomcat</module>
- </modules>
-
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>app-per-port-war1</module>
+ <module>app-per-port-war2</module>
+ <module>app-per-port-connector-war</module>
+ <module>app-per-port-ear</module>
+ <module>app-per-port-war1-jetty</module>
+ <module>app-per-port-jetty</module>
+ <module>app-per-port-tomcat</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>no-plugin</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>buildPlugin</name>
+ <value>false</value>
+ </property>
+ </activation>
+ <modules>
+ <module>app-per-port-war1</module>
+ <module>app-per-port-war2</module>
+ <module>app-per-port-connector-war</module>
+ <module>app-per-port-ear</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/samples/trunk/samples/javaee5/async-http/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/async-http/pom.xml?rev=932316&r1=932315&r2=932316&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/async-http/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/async-http/pom.xml Fri Apr 9 09:35:30 2010
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>samples</artifactId>
+ <artifactId>javaee5</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
<artifactId>async-http</artifactId>
@@ -33,11 +33,6 @@
Geronimo Samples for a servlet referencing a stateless session bean using dependency injection.
</description>
- <modules>
- <module>http-local-app</module>
- <module>http-remote-app</module>
- </modules>
-
<build>
<plugins>
<plugin>
@@ -67,4 +62,17 @@
</repository>
</repositories>
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>http-local-app</module>
+ <module>http-remote-app</module>
+ </modules>
+ </profile>
+ </profiles>
+
</project>
Modified: geronimo/samples/trunk/samples/javaee5/bank/bank-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/bank/bank-client/pom.xml?rev=932316&r1=932315&r2=932316&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/bank/bank-client/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/bank/bank-client/pom.xml Fri Apr 9 09:35:30 2010
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ <artifactId>geronimo-jpa_1.0_spec</artifactId>
</dependency>
</dependencies>
Modified: geronimo/samples/trunk/samples/javaee5/bank/bank-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/bank/bank-war/pom.xml?rev=932316&r1=932315&r2=932316&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/bank/bank-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/bank/bank-war/pom.xml Fri Apr 9 09:35:30 2010
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ <artifactId>geronimo-jpa_1.0_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: geronimo/samples/trunk/samples/javaee5/bank/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/bank/pom.xml?rev=932316&r1=932315&r2=932316&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/bank/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/bank/pom.xml Fri Apr 9 09:35:30 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>samples</artifactId>
+ <artifactId>javaee5</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -37,13 +37,37 @@
<description>
Geronimo bank sample created from an archetype.
</description>
-
- <modules>
- <module>bank-ejb</module>
- <module>bank-war</module>
- <module>bank-ear</module>
- <module>bank-jetty</module>
- <module>bank-tomcat</module>
- <module>bank-client</module>
- </modules>
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>bank-ejb</module>
+ <module>bank-war</module>
+ <module>bank-ear</module>
+ <module>bank-jetty</module>
+ <module>bank-tomcat</module>
+ <module>bank-client</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>no-plugin</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>buildPlugin</name>
+ <value>false</value>
+ </property>
+ </activation>
+ <modules>
+ <module>bank-ejb</module>
+ <module>bank-war</module>
+ <module>bank-ear</module>
+ <module>bank-client</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/samples/trunk/samples/javaee5/calculator/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/calculator/pom.xml?rev=932316&r1=932315&r2=932316&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/calculator/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/calculator/pom.xml Fri Apr 9 09:35:30 2010
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>samples</artifactId>
+ <artifactId>javaee5</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
<artifactId>calculator</artifactId>
@@ -34,12 +34,34 @@
Geronimo Samples for a servlet referencing a stateless session bean using dependency injection.
</description>
- <modules>
- <module>calculator-ejb</module>
- <module>calculator-war</module>
- <module>calculator-ear</module>
- <module>calculator-jetty</module>
- <module>calculator-tomcat</module>
- </modules>
-
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>calculator-ejb</module>
+ <module>calculator-war</module>
+ <module>calculator-ear</module>
+ <module>calculator-jetty</module>
+ <module>calculator-tomcat</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>no-plugin</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>buildPlugin</name>
+ <value>false</value>
+ </property>
+ </activation>
+ <modules>
+ <module>calculator-ejb</module>
+ <module>calculator-war</module>
+ <module>calculator-ear</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/samples/trunk/samples/javaee5/csa-activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/csa-activemq/pom.xml?rev=932316&r1=932315&r2=932316&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/csa-activemq/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/csa-activemq/pom.xml Fri Apr 9 09:35:30 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>samples</artifactId>
+ <artifactId>javaee5</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -42,5 +42,6 @@
<modules>
<module>csa-activemq-jetty</module>
<module>csa-activemq-tomcat</module>
- </modules>
+ </modules>
+
</project>
Modified: geronimo/samples/trunk/samples/javaee5/customer/customer-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/customer/customer-client/pom.xml?rev=932316&r1=932315&r2=932316&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/customer/customer-client/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/customer/customer-client/pom.xml Fri Apr 9 09:35:30 2010
@@ -48,7 +48,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ <artifactId>geronimo-jpa_1.0_spec</artifactId>
</dependency>
</dependencies>
Modified: geronimo/samples/trunk/samples/javaee5/customer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/customer/pom.xml?rev=932316&r1=932315&r2=932316&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/customer/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/customer/pom.xml Fri Apr 9 09:35:30 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>samples</artifactId>
+ <artifactId>javaee5</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -36,16 +36,7 @@
<description>
Geronimo customer sample created from an archetype.
- </description>
-
- <modules>
- <module>customer-ejb</module>
- <module>customer-war</module>
- <module>customer-ear</module>
- <module>customer-jetty</module>
- <module>customer-tomcat</module>
- <module>customer-client</module>
- </modules>
+ </description>
<dependencies>
<dependency>
@@ -55,9 +46,40 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ <artifactId>geronimo-jpa_1.0_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
-
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>customer-ejb</module>
+ <module>customer-war</module>
+ <module>customer-ear</module>
+ <module>customer-jetty</module>
+ <module>customer-tomcat</module>
+ <module>customer-client</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>no-plugin</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>buildPlugin</name>
+ <value>false</value>
+ </property>
+ </activation>
+ <modules>
+ <module>customer-ejb</module>
+ <module>customer-war</module>
+ <module>customer-ear</module>
+ <module>customer-client</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/samples/trunk/samples/javaee5/dbtester/dbtester-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/dbtester/dbtester-war/pom.xml?rev=932316&r1=932315&r2=932316&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/dbtester/dbtester-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/dbtester/dbtester-war/pom.xml Fri Apr 9 09:35:30 2010
@@ -40,19 +40,19 @@
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
- <version>${geronimoVersion}</version>
+ <version>${geronimoJavaEE5Version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-connector</artifactId>
- <version>${geronimoVersion}</version>
+ <version>${geronimoJavaEE5Version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-management</artifactId>
- <version>${geronimoVersion}</version>
+ <version>${geronimoJavaEE5Version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: geronimo/samples/trunk/samples/javaee5/dbtester/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/dbtester/pom.xml?rev=932316&r1=932315&r2=932316&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/dbtester/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/dbtester/pom.xml Fri Apr 9 09:35:30 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>samples</artifactId>
+ <artifactId>javaee5</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -38,10 +38,31 @@
Geronimo dbtester sample created from an archetype.
</description>
- <modules>
- <module>dbtester-war</module>
- <module>dbtester-jetty</module>
- <module>dbtester-tomcat</module>
- </modules>
-
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>dbtester-war</module>
+ <module>dbtester-jetty</module>
+ <module>dbtester-tomcat</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>no-plugin</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>buildPlugin</name>
+ <value>false</value>
+ </property>
+ </activation>
+ <modules>
+ <module>dbtester-war</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/samples/trunk/samples/javaee5/inventory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/inventory/pom.xml?rev=932316&r1=932315&r2=932316&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/inventory/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/inventory/pom.xml Fri Apr 9 09:35:30 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>samples</artifactId>
+ <artifactId>javaee5</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -38,10 +38,31 @@
Geronimo inventory sample created from an archetype.
</description>
- <modules>
- <module>inventory-war</module>
- <module>inventory-jetty</module>
- <module>inventory-tomcat</module>
- </modules>
-
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>inventory-war</module>
+ <module>inventory-jetty</module>
+ <module>inventory-tomcat</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>no-plugin</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>buildPlugin</name>
+ <value>false</value>
+ </property>
+ </activation>
+ <modules>
+ <module>inventory-war</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/samples/trunk/samples/javaee5/jaxws-calculator/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/jaxws-calculator/pom.xml?rev=932316&r1=932315&r2=932316&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/jaxws-calculator/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/jaxws-calculator/pom.xml Fri Apr 9 09:35:30 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>samples</artifactId>
+ <artifactId>javaee5</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -37,11 +37,31 @@
<description>
Geronimo jaxws-calculator sample created from an archetype.
</description>
-
- <modules>
- <module>jaxws-calculator-war</module>
- <module>jaxws-calculator-jetty</module>
- <module>jaxws-calculator-tomcat</module>
- </modules>
-
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>jaxws-calculator-war</module>
+ <module>jaxws-calculator-jetty</module>
+ <module>jaxws-calculator-tomcat</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>no-plugin</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>buildPlugin</name>
+ <value>false</value>
+ </property>
+ </activation>
+ <modules>
+ <module>jaxws-calculator-war</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/samples/trunk/samples/javaee5/jms-mdb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/jms-mdb/pom.xml?rev=932316&r1=932315&r2=932316&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/jms-mdb/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/jms-mdb/pom.xml Fri Apr 9 09:35:30 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>samples</artifactId>
+ <artifactId>javaee5</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -38,13 +38,7 @@
Geronimo jms-mdb sample created from an archetype.
</description>
- <modules>
- <module>jms-mdb-ejb</module>
- <module>jms-mdb-war</module>
- <module>jms-mdb-ear</module>
- <module>jms-mdb-jetty</module>
- <module>jms-mdb-tomcat</module>
- </modules>
+
<dependencies>
<dependency>
@@ -58,5 +52,34 @@
<scope>provided</scope>
</dependency>
</dependencies>
-
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>jms-mdb-ejb</module>
+ <module>jms-mdb-war</module>
+ <module>jms-mdb-ear</module>
+ <module>jms-mdb-jetty</module>
+ <module>jms-mdb-tomcat</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>no-plugin</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>buildPlugin</name>
+ <value>false</value>
+ </property>
+ </activation>
+ <modules>
+ <module>jms-mdb-ejb</module>
+ <module>jms-mdb-war</module>
+ <module>jms-mdb-ear</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/samples/trunk/samples/javaee5/jsp-examples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/jsp-examples/pom.xml?rev=932316&r1=932315&r2=932316&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/jsp-examples/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/jsp-examples/pom.xml Fri Apr 9 09:35:30 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>samples</artifactId>
+ <artifactId>javaee5</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -37,11 +37,31 @@
<description>
Geronimo JSP Examples
</description>
-
- <modules>
- <module>jsp-examples-war</module>
- <module>jsp-examples-jetty</module>
- <module>jsp-examples-tomcat</module>
- </modules>
-
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>jsp-examples-war</module>
+ <module>jsp-examples-jetty</module>
+ <module>jsp-examples-tomcat</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>no-plugin</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>buildPlugin</name>
+ <value>false</value>
+ </property>
+ </activation>
+ <modules>
+ <module>jsp-examples-war</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/samples/trunk/samples/javaee5/ldap-sample-app/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/ldap-sample-app/pom.xml?rev=932316&r1=932315&r2=932316&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/ldap-sample-app/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/ldap-sample-app/pom.xml Fri Apr 9 09:35:30 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>samples</artifactId>
+ <artifactId>javaee5</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -38,11 +38,32 @@
Geronimo ldap-sample-app sample created from an archetype.
</description>
- <modules>
- <module>ldap-sample-app-war</module>
- <module>ldap-sample-app-realm</module>
- <module>ldap-sample-app-jetty</module>
- <module>ldap-sample-app-tomcat</module>
- </modules>
-
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>ldap-sample-app-war</module>
+ <module>ldap-sample-app-realm</module>
+ <module>ldap-sample-app-jetty</module>
+ <module>ldap-sample-app-tomcat</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>no-plugin</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>buildPlugin</name>
+ <value>false</value>
+ </property>
+ </activation>
+ <modules>
+ <module>ldap-sample-app-war</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/samples/trunk/samples/javaee5/myphonebook/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/myphonebook/pom.xml?rev=932316&r1=932315&r2=932316&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/myphonebook/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/myphonebook/pom.xml Fri Apr 9 09:35:30 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>samples</artifactId>
+ <artifactId>javaee5</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -38,18 +38,12 @@
Geronimo myphonebook sample created from an archetype.
</description>
- <modules>
- <module>myphonebook-ejb</module>
- <module>myphonebook-war</module>
- <module>myphonebook-ear</module>
- <module>myphonebook-jetty</module>
- <module>myphonebook-tomcat</module>
- </modules>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ <artifactId>geronimo-jpa_1.0_spec</artifactId>
<scope>provided</scope>
</dependency>
@@ -59,5 +53,34 @@
<scope>provided</scope>
</dependency>
</dependencies>
-
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>myphonebook-ejb</module>
+ <module>myphonebook-war</module>
+ <module>myphonebook-ear</module>
+ <module>myphonebook-jetty</module>
+ <module>myphonebook-tomcat</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>no-plugin</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>buildPlugin</name>
+ <value>false</value>
+ </property>
+ </activation>
+ <modules>
+ <module>myphonebook-ejb</module>
+ <module>myphonebook-war</module>
+ <module>myphonebook-ear</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/samples/trunk/samples/javaee5/mytime/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/mytime/pom.xml?rev=932316&r1=932315&r2=932316&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/mytime/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/mytime/pom.xml Fri Apr 9 09:35:30 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>samples</artifactId>
+ <artifactId>javaee5</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -38,12 +38,35 @@
Geronimo mytime sample created from an archetype.
</description>
- <modules>
- <module>mytime-ejb</module>
- <module>mytime-war</module>
- <module>mytime-ear</module>
- <module>mytime-jetty</module>
- <module>mytime-tomcat</module>
- </modules>
-
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>mytime-ejb</module>
+ <module>mytime-war</module>
+ <module>mytime-ear</module>
+ <module>mytime-jetty</module>
+ <module>mytime-tomcat</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>no-plugin</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>buildPlugin</name>
+ <value>false</value>
+ </property>
+ </activation>
+ <modules>
+ <module>mytime-ejb</module>
+ <module>mytime-war</module>
+ <module>mytime-ear</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/samples/trunk/samples/javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/pom.xml?rev=932316&r1=932315&r2=932316&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/pom.xml Fri Apr 9 09:35:30 2010
@@ -23,17 +23,18 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>samples-parent</artifactId>
+ <artifactId>samples</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
- <artifactId>samples</artifactId>
- <name>Geronimo Samples :: Samples</name>
+ <artifactId>javaee5</artifactId>
+ <name>Geronimo Samples :: Java EE 5 Samples</name>
<packaging>pom</packaging>
<description>
- Geronimo Samples.
+ Geronimo Samples - Java EE 5
</description>
<properties>
+ <geronimoJavaEE5Version>2.2</geronimoJavaEE5Version>
<gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car</gbeanDeployerBootstrap>
<gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
<j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
@@ -51,48 +52,72 @@
</properties>
- <modules>
- <module>sample-datasource</module>
- <module>customer</module>
- <!--
- <module>async-http</module>
- -->
- <module>bank</module>
- <module>calculator</module>
- <module>dbtester</module>
- <module>inventory</module>
- <module>jaxws-calculator</module>
- <module>jms-mdb</module>
- <module>ldap-sample-app</module>
- <module>myphonebook</module>
- <module>mytime</module>
- <module>sendmail</module>
- <module>timereport</module>
- <module>jsp-examples</module>
- <module>servlet-examples</module>
- <module>app-per-port</module>
- <module>csa-activemq</module>
- <module>DataCDInfo</module>
- <module>all-samples</module>
- </modules>
-
+ <dependencyManagement>
+ <dependencies>
+ <!-- Import Geronimo Server used dependency versions -->
+ <dependency>
+ <groupId>org.apache.geronimo</groupId>
+ <artifactId>geronimo</artifactId>
+ <version>${geronimoJavaEE5Version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <!-- Import ActiveMQ dependency versions
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>activemq</artifactId>
+ <version>${geronimoJavaEE5Version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>-->
+ <!-- Java EE 5 specs
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_1.0_spec</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.1_spec</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.2</version>
+ </dependency>-->
+ <!-- Java EE 5 specs -->
+ <!--<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>1.1.1</version>
+ </dependency>-->
+ </dependencies>
+ </dependencyManagement>
<dependencies>
+ <!-- Java EE 5 specs common for all samples -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <scope>provided</scope>
</dependency>
+ <!-- Java EE 5 specs common for all samples -->
</dependencies>
<build>
@@ -105,153 +130,91 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.samples</groupId>
- <artifactId>buildutil</artifactId>
- <version>${version}</version>
- </dependency>
- </dependencies>
- </plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <version>${geronimoVersion}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <category>Java EE 5 Samples</category>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <warSourceDirectory>${pom.basedir}/src/main/webapp</warSourceDirectory>
- <archiveClasses>true</archiveClasses>
- <archive>
- <!-- Do not include META-INF/maven to avoid long file problems on windows -->
- <addMavenDescriptor>false</addMavenDescriptor>
- </archive>
-
- <!--
- HACK: Include legal files explicity, otherwise they will end up in the wrong path
- or in another jar file in the war.
-
- NOTE: targetPath is broken for webResources (as documented)
- -->
- <webResources>
- <resource>
- <directory>${project.build.outputDirectory}</directory>
- <includes>
- <include>META-INF/LICENSE*</include>
- <include>META-INF/NOTICE*</include>
- <include>META-INF/DISCLAIMER*</include>
- </includes>
- </resource>
- </webResources>
- </configuration>
+ <artifactId>maven-war-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ear-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <archive>
- <!-- Do not include META-INF/maven to avoid long file problems on windows -->
- <addMavenDescriptor>false</addMavenDescriptor>
- </archive>
- </configuration>
+ <artifactId>maven-ear-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <version>${geronimoVersion}</version>
- <!-- Install as extention to allow 'car' packaging to be used. -->
- <extensions>true</extensions>
- <configuration>
- <archive>
- <!-- Do not include META-INF/maven to avoid long file problems on windows -->
- <addMavenDescriptor>false</addMavenDescriptor>
- </archive>
- <osiApproved>true</osiApproved>
- <commonInstance>
- <plugin-artifact>
- <jvm-version>1.5</jvm-version>
- <jvm-version>1.6</jvm-version>
- <source-repository>~/.m2/repository/</source-repository>
- <source-repository>http://repo1.maven.org/maven2/</source-repository>
- <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
- <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
- </plugin-artifact>
- </commonInstance>
- </configuration>
+ <artifactId>car-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
<profiles>
- <!-- This profile creates a sample template.
- Use -DsampleName to specify the name of your sample.
- Use -DsampleVersion to specify the version for your sample
- -->
<profile>
- <id>create</id>
- <build>
- <defaultGoal>validate</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <dependencies>
- <dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>2.0.8</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-apache-oro</artifactId>
- <version>1.6.4</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-optional</artifactId>
- <version>1.5.3-1</version>
- </dependency>
- </dependencies>
- <inherited>false</inherited>
- <executions>
- <execution>
- <phase>validate</phase>
- <configuration>
- <tasks>
- <condition property="mvn.exe" value="mvn.bat" else="mvn">
- <os family="windows" />
- </condition>
- <exec executable="${mvn.exe}">
- <arg value="archetype:create" />
- <arg value="-DarchetypeGroupId=org.apache.geronimo.samples" />
- <arg value="-DarchetypeArtifactId=geronimo-samples-archetype" />
- <arg value="-DarchetypeVersion=${version}" />
- <arg value="-DartifactId=${sampleName}" />
- <arg value="-Dversion=${sampleVersion}" />
- </exec>
- <move file="${sampleName}/sample-ear" tofile="${sampleName}/${sampleName}-ear" />
- <move file="${sampleName}/sample-ejb" tofile="${sampleName}/${sampleName}-ejb" />
- <move file="${sampleName}/sample-war" tofile="${sampleName}/${sampleName}-war" />
- <move file="${sampleName}/sample-jetty" tofile="${sampleName}/${sampleName}-jetty" />
- <move file="${sampleName}/sample-tomcat" tofile="${sampleName}/${sampleName}-tomcat" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>sample-datasource</module>
+ <module>customer</module>
+ <!--<module>async-http</module>-->
+ <module>bank</module>
+ <module>calculator</module>
+ <module>dbtester</module>
+ <module>inventory</module>
+ <module>jaxws-calculator</module>
+ <module>jms-mdb</module>
+ <module>ldap-sample-app</module>
+ <module>myphonebook</module>
+ <module>mytime</module>
+ <module>sendmail</module>
+ <module>timereport</module>
+ <module>jsp-examples</module>
+ <module>servlet-examples</module>
+ <module>app-per-port</module>
+ <module>csa-activemq</module>
+ <module>DataCDInfo</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>no-plugin</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>buildPlugin</name>
+ <value>false</value>
+ </property>
+ </activation>
+ <modules>
+ <module>customer</module>
+ <!--<module>async-http</module>-->
+ <module>bank</module>
+ <module>calculator</module>
+ <module>dbtester</module>
+ <module>inventory</module>
+ <module>jaxws-calculator</module>
+ <module>jms-mdb</module>
+ <module>ldap-sample-app</module>
+ <module>myphonebook</module>
+ <module>mytime</module>
+ <module>sendmail</module>
+ <module>timereport</module>
+ <module>jsp-examples</module>
+ <module>servlet-examples</module>
+ <module>app-per-port</module>
+ <module>DataCDInfo</module>
+ </modules>
</profile>
- </profiles>
+ </profiles>
</project>
Modified: geronimo/samples/trunk/samples/javaee5/sample-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/sample-datasource/pom.xml?rev=932316&r1=932315&r2=932316&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/sample-datasource/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/sample-datasource/pom.xml Fri Apr 9 09:35:30 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>samples</artifactId>
+ <artifactId>javaee5</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -104,7 +104,6 @@
<value>true</value>
<includeVersion>true</includeVersion>
</useMavenDependencies>
- <category>Sample</category>
<instance>
<plugin-artifact>
</plugin-artifact>
@@ -113,4 +112,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: geronimo/samples/trunk/samples/javaee5/sendmail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/sendmail/pom.xml?rev=932316&r1=932315&r2=932316&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/sendmail/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/sendmail/pom.xml Fri Apr 9 09:35:30 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>samples</artifactId>
+ <artifactId>javaee5</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -38,10 +38,31 @@
Geronimo sendmail sample created from an archetype.
</description>
- <modules>
- <module>sendmail-war</module>
- <module>sendmail-jetty</module>
- <module>sendmail-tomcat</module>
- </modules>
-
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>sendmail-war</module>
+ <module>sendmail-jetty</module>
+ <module>sendmail-tomcat</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>no-plugin</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>buildPlugin</name>
+ <value>false</value>
+ </property>
+ </activation>
+ <modules>
+ <module>sendmail-war</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/samples/trunk/samples/javaee5/servlet-examples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/servlet-examples/pom.xml?rev=932316&r1=932315&r2=932316&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/servlet-examples/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/servlet-examples/pom.xml Fri Apr 9 09:35:30 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>samples</artifactId>
+ <artifactId>javaee5</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -38,9 +38,31 @@
Geronimo Servlet Examples
</description>
- <modules>
- <module>servlet-examples-war</module>
- <module>servlet-examples-jetty</module>
- <module>servlet-examples-tomcat</module>
- </modules>
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>servlet-examples-war</module>
+ <module>servlet-examples-jetty</module>
+ <module>servlet-examples-tomcat</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>no-plugin</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>buildPlugin</name>
+ <value>false</value>
+ </property>
+ </activation>
+ <modules>
+ <module>servlet-examples-war</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/samples/trunk/samples/javaee5/timereport/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/timereport/pom.xml?rev=932316&r1=932315&r2=932316&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/timereport/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/timereport/pom.xml Fri Apr 9 09:35:30 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
- <artifactId>samples</artifactId>
+ <artifactId>javaee5</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
@@ -38,10 +38,31 @@
Geronimo timereport sample created from an archetype.
</description>
- <modules>
- <module>timereport-war</module>
- <module>timereport-jetty</module>
- <module>timereport-tomcat</module>
- </modules>
-
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>timereport-war</module>
+ <module>timereport-jetty</module>
+ <module>timereport-tomcat</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>no-plugin</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>buildPlugin</name>
+ <value>false</value>
+ </property>
+ </activation>
+ <modules>
+ <module>timereport-war</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Added: geronimo/samples/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/pom.xml?rev=932316&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/pom.xml (added)
+++ geronimo/samples/trunk/samples/pom.xml Fri Apr 9 09:35:30 2010
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>samples-parent</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>samples</artifactId>
+ <name>Geronimo Samples :: Samples</name>
+ <packaging>pom</packaging>
+ <description>
+ Geronimo Samples.
+ </description>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>buildutil</artifactId>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <warSourceDirectory>${pom.basedir}/src/main/webapp</warSourceDirectory>
+ <archiveClasses>true</archiveClasses>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+
+ <webResources>
+ <resource>
+ <directory>${project.build.outputDirectory}</directory>
+ <includes>
+ <include>META-INF/LICENSE*</include>
+ <include>META-INF/NOTICE*</include>
+ <include>META-INF/DISCLAIMER*</include>
+ </includes>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <configuration>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <version>${geronimoVersion}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ <osiApproved>true</osiApproved>
+ <commonInstance>
+ <plugin-artifact>
+ <jvm-version>1.5</jvm-version>
+ <jvm-version>1.6</jvm-version>
+ <source-repository>~/.m2/repository/</source-repository>
+ <source-repository>http://repo1.maven.org/maven2/</source-repository>
+ <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
+ <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
+ </plugin-artifact>
+ </commonInstance>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <profiles>
+ <!-- This profile creates a sample template.
+ Use -DsampleName to specify the name of your sample.
+ Use -DsampleVersion to specify the version for your sample
+ -->
+ <profile>
+ <id>create</id>
+ <build>
+ <defaultGoal>validate</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-apache-oro</artifactId>
+ <version>1.6.4</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-optional</artifactId>
+ <version>1.5.3-1</version>
+ </dependency>
+ </dependencies>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <configuration>
+ <tasks>
+ <condition property="mvn.exe" value="mvn.bat" else="mvn">
+ <os family="windows" />
+ </condition>
+ <exec executable="${mvn.exe}">
+ <arg value="archetype:create" />
+ <arg value="-DarchetypeGroupId=org.apache.geronimo.samples" />
+ <arg value="-DarchetypeArtifactId=geronimo-samples-archetype" />
+ <arg value="-DarchetypeVersion=${version}" />
+ <arg value="-DartifactId=${sampleName}" />
+ <arg value="-Dversion=${sampleVersion}" />
+ </exec>
+ <move file="${sampleName}/sample-ear" tofile="${sampleName}/${sampleName}-ear" />
+ <move file="${sampleName}/sample-ejb" tofile="${sampleName}/${sampleName}-ejb" />
+ <move file="${sampleName}/sample-war" tofile="${sampleName}/${sampleName}-war" />
+ <move file="${sampleName}/sample-jetty" tofile="${sampleName}/${sampleName}-jetty" />
+ <move file="${sampleName}/sample-tomcat" tofile="${sampleName}/${sampleName}-tomcat" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <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>
+ </profiles>
+</project>
Propchange: geronimo/samples/trunk/samples/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/samples/trunk/samples/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/samples/trunk/samples/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml