You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/05/27 18:30:21 UTC
svn commit: r660588 [3/3] - in /geronimo/samples/trunk: ./ samples/
samples/CustomerService/CustomerService-ear/
samples/CustomerService/CustomerService-ear/src/main/resources/
samples/CustomerService/CustomerService-ear/src/main/resources/META-INF/
sa...
Modified: geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml Tue May 27 09:29:53 2008
@@ -53,17 +53,23 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper-deployer</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.configs</groupId>-->
+ <!--<artifactId>jasper-deployer</artifactId>-->
+ <!--<version>${geronimoVersion}</version>-->
+ <!--<type>car</type>-->
+ <!--<scope>provided</scope>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.configs</groupId>-->
+ <!--<artifactId>jasper</artifactId>-->
+ <!--<version>${geronimoVersion}</version>-->
+ <!--<type>car</type>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
+ <artifactId>tomcat6</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
</dependency>
@@ -99,26 +105,42 @@
<includeVersion>true</includeVersion>
</useMavenDependencies>
<category>Sample</category>
- <instance>
- <plugin-artifact>
- <prerequisite>
- <id>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6</artifactId>
- </id>
- <resource-type>Web Container</resource-type>
- <description>
- This version of the application works with the Geronimo/Tomcat distribution.
- It is not intended to run in the Geronimo/Jetty distribution.
- There is a separate version of the application that works with Jetty.
- Please install the version appropriate to your Geronimo distribution.
- </description>
- </prerequisite>
- </plugin-artifact>
- </instance>
+ <!--<instance>-->
+ <!--<plugin-artifact>-->
+ <!--<prerequisite>-->
+ <!--<id>-->
+ <!--<groupId>org.apache.geronimo.configs</groupId>-->
+ <!--<artifactId>tomcat6</artifactId>-->
+ <!--</id>-->
+ <!--<resource-type>Web Container</resource-type>-->
+ <!--<description>-->
+ <!--This version of the application works with the Geronimo/Tomcat distribution. -->
+ <!--It is not intended to run in the Geronimo/Jetty distribution. -->
+ <!--There is a separate version of the application that works with Jetty. -->
+ <!--Please install the version appropriate to your Geronimo distribution.-->
+ <!--</description> -->
+ <!--</prerequisite>-->
+ <!--</plugin-artifact>-->
+ <!--</instance>-->
</configuration>
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>it</id>
+ <!--<properties>-->
+ <!--<it-server>tomcat-minimal</it-server>-->
+ <!--</properties>-->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/samples/trunk/samples/timereport/timereport-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/timereport/timereport-ear/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/timereport/timereport-ear/pom.xml (original)
+++ geronimo/samples/trunk/samples/timereport/timereport-ear/pom.xml Tue May 27 09:29:53 2008
@@ -37,12 +37,6 @@
<description>Geronimo Samples. EAR Module</description>
<dependencies>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-ra</artifactId>
- <version>1.3</version>
- <type>rar</type>
- </dependency>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
Modified: geronimo/samples/trunk/samples/timereport/timereport-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/timereport/timereport-jetty/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/timereport/timereport-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/timereport/timereport-jetty/pom.xml Tue May 27 09:29:53 2008
@@ -43,6 +43,13 @@
<artifactId>timereport-ear</artifactId>
<version>${version}</version>
<type>ear</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>SampleDatasource</artifactId>
+ <version>${version}</version>
+ <type>car</type>
</dependency>
<dependency>
@@ -66,15 +73,12 @@
<artifactId>jasper</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
- <scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>system-database</artifactId>
+ <artifactId>jetty6</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
- <scope>provided</scope>
</dependency>
</dependencies>
@@ -108,27 +112,43 @@
<includeVersion>true</includeVersion>
</useMavenDependencies>
<category>Sample</category>
- <instance>
- <plugin-artifact>
- <prerequisite>
- <id>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jetty6</artifactId>
- </id>
- <resource-type>Web Container</resource-type>
- <description>
- This version of the application works with the Geronimo/Jetty distribution.
- It is not intended to run in the Geronimo/Tomcat distribution.
- There is a separate version of the application that works with Tomcat.
- Please install the version appropriate to your Geronimo distribution.
- </description>
- </prerequisite>
- </plugin-artifact>
- </instance>
+ <!--<instance>-->
+ <!--<plugin-artifact>-->
+ <!--<prerequisite>-->
+ <!--<id>-->
+ <!--<groupId>org.apache.geronimo.configs</groupId>-->
+ <!--<artifactId>jetty6</artifactId>-->
+ <!--</id>-->
+ <!--<resource-type>Web Container</resource-type>-->
+ <!--<description>-->
+ <!--This version of the application works with the Geronimo/Jetty distribution. -->
+ <!--It is not intended to run in the Geronimo/Tomcat distribution. -->
+ <!--There is a separate version of the application that works with Tomcat. -->
+ <!--Please install the version appropriate to your Geronimo distribution.-->
+ <!--</description> -->
+ <!--</prerequisite>-->
+ <!--</plugin-artifact>-->
+ <!--</instance>-->
</configuration>
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>it</id>
+ <!--<properties>-->
+ <!--<it-server>jetty-minimal</it-server>-->
+ <!--</properties>-->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/samples/trunk/samples/timereport/timereport-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/timereport/timereport-jetty/src/main/plan/plan.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/timereport/timereport-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/timereport/timereport-jetty/src/main/plan/plan.xml Tue May 27 09:29:53 2008
@@ -21,9 +21,4 @@
<!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
- <module>
- <connector>tranql-connector-ra-1.3.rar</connector>
- <alt-dd>TimeReportPool.xml</alt-dd>
- </module>
-
</application>
Modified: geronimo/samples/trunk/samples/timereport/timereport-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/timereport/timereport-tomcat/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/timereport/timereport-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/timereport/timereport-tomcat/pom.xml Tue May 27 09:29:53 2008
@@ -43,6 +43,13 @@
<artifactId>timereport-ear</artifactId>
<version>${version}</version>
<type>ear</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>SampleDatasource</artifactId>
+ <version>${version}</version>
+ <type>car</type>
</dependency>
<dependency>
@@ -66,15 +73,12 @@
<artifactId>jasper</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
- <scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>system-database</artifactId>
+ <artifactId>tomcat6</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
- <scope>provided</scope>
</dependency>
</dependencies>
@@ -108,27 +112,43 @@
<includeVersion>true</includeVersion>
</useMavenDependencies>
<category>Sample</category>
- <instance>
- <plugin-artifact>
- <prerequisite>
- <id>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6</artifactId>
- </id>
- <resource-type>Web Container</resource-type>
- <description>
- This version of the application works with the Geronimo/Tomcat distribution.
- It is not intended to run in the Geronimo/Jetty distribution.
- There is a separate version of the application that works with Jetty.
- Please install the version appropriate to your Geronimo distribution.
- </description>
- </prerequisite>
- </plugin-artifact>
- </instance>
+ <!--<instance>-->
+ <!--<plugin-artifact>-->
+ <!--<prerequisite>-->
+ <!--<id>-->
+ <!--<groupId>org.apache.geronimo.configs</groupId>-->
+ <!--<artifactId>tomcat6</artifactId>-->
+ <!--</id>-->
+ <!--<resource-type>Web Container</resource-type>-->
+ <!--<description>-->
+ <!--This version of the application works with the Geronimo/Tomcat distribution. -->
+ <!--It is not intended to run in the Geronimo/Jetty distribution. -->
+ <!--There is a separate version of the application that works with Jetty. -->
+ <!--Please install the version appropriate to your Geronimo distribution.-->
+ <!--</description> -->
+ <!--</prerequisite>-->
+ <!--</plugin-artifact>-->
+ <!--</instance>-->
</configuration>
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>it</id>
+ <!--<properties>-->
+ <!--<it-server>tomcat-minimal</it-server>-->
+ <!--</properties>-->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: geronimo/samples/trunk/samples/timereport/timereport-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/timereport/timereport-tomcat/src/main/plan/plan.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/timereport/timereport-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/timereport/timereport-tomcat/src/main/plan/plan.xml Tue May 27 09:29:53 2008
@@ -21,9 +21,4 @@
<!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
- <module>
- <connector>tranql-connector-ra-1.3.rar</connector>
- <alt-dd>TimeReportPool.xml</alt-dd>
- </module>
-
</application>