Modified: geronimo/samples/trunk/samples/inventory/inventory-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/inventory/inventory-jetty/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/inventory/inventory-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/inventory/inventory-jetty/pom.xml Tue May 27 09:29:53 2008
@@ -43,6 +43,13 @@
<artifactId>inventory-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,16 +73,14 @@
<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>
<build>
@@ -108,27 +113,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</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/inventory/inventory-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/inventory/inventory-jetty/src/main/plan/plan.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/inventory/inventory-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/inventory/inventory-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>InventoryPool.xml</alt-dd>
- </module>
-
</application>
Modified: geronimo/samples/trunk/samples/inventory/inventory-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/inventory/inventory-tomcat/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/inventory/inventory-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/inventory/inventory-tomcat/pom.xml Tue May 27 09:29:53 2008
@@ -43,8 +43,15 @@
<artifactId>inventory-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>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat6-deployer</artifactId>
@@ -66,16 +73,14 @@
<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>
<build>
@@ -130,5 +135,21 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>it</id>
+ <properties>
+ <it-server>tomcat</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/inventory/inventory-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/inventory/inventory-tomcat/src/main/plan/plan.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/inventory/inventory-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/inventory/inventory-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>InventoryPool.xml</alt-dd>
- </module>
-
</application>
Modified: geronimo/samples/trunk/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/trunk/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml Tue May 27 09:29:53 2008
@@ -35,6 +35,6 @@
<!-- define a reference name to the db pool-->
<resource-ref>
<ref-name>jdbc/InventoryDS</ref-name>
- <resource-link>InventoryPool</resource-link>
+ <resource-link>SampleTxDatasource</resource-link>
</resource-ref>
</web-app>
\ No newline at end of file
Modified: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml Tue May 27 09:29:53 2008
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
+ <artifactId>cxf-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
@@ -72,10 +72,21 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>cxf-deployer</artifactId>
+ <artifactId>jasper</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jetty6</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>cxf</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
- <scope>provided</scope>
</dependency>
</dependencies>
@@ -110,27 +121,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</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/jaxws-calculator/jaxws-calculator-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml Tue May 27 09:29:53 2008
@@ -43,6 +43,7 @@
<artifactId>jaxws-calculator-ear</artifactId>
<version>${version}</version>
<type>ear</type>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -63,7 +64,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
+ <artifactId>axis2-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
@@ -71,10 +72,21 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>axis2-deployer</artifactId>
+ <artifactId>jasper</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>tomcat6</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>axis2</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
- <scope>provided</scope>
</dependency>
</dependencies>
@@ -109,27 +121,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</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/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml Tue May 27 09:29:53 2008
@@ -43,6 +43,7 @@
<artifactId>jms-mdb-sample-ear</artifactId>
<version>${version}</version>
<type>ear</type>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -63,7 +64,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
+ <artifactId>openejb-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
@@ -71,7 +72,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb-deployer</artifactId>
+ <artifactId>persistence-jpa10-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
@@ -79,10 +80,21 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>persistence-jpa10-deployer</artifactId>
+ <artifactId>jasper</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jetty6</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
- <scope>provided</scope>
</dependency>
</dependencies>
@@ -118,27 +130,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</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/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml Tue May 27 09:29:53 2008
@@ -43,6 +43,7 @@
<artifactId>jms-mdb-sample-ear</artifactId>
<version>${version}</version>
<type>ear</type>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -63,7 +64,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
+ <artifactId>openejb-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
@@ -71,7 +72,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb-deployer</artifactId>
+ <artifactId>persistence-jpa10-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
@@ -79,10 +80,21 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>persistence-jpa10-deployer</artifactId>
+ <artifactId>jasper</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>tomcat6</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
- <scope>provided</scope>
</dependency>
</dependencies>
@@ -118,27 +130,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</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/jsp-examples/jsp-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml Tue May 27 09:29:53 2008
@@ -70,6 +70,12 @@
<version>${geronimoVersion}</version>
<type>car</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jetty6</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
</dependencies>
@@ -103,29 +109,45 @@
<value>true</value>
<includeVersion>true</includeVersion>
</useMavenDependencies>
- <instance>
- <plugin-artifact>
- <prerequisite>
- <id>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jetty6</artifactId>
- </id>
- <resource-type>Web Container</resource-type>
- <description>The Jetty web container</description>
- </prerequisite>
- <prerequisite>
- <id>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
- </id>
- <resource-type>Web Container</resource-type>
- <description>The Jasper subsystem</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>The Jetty web container</description>-->
+ <!--</prerequisite>-->
+ <!--<prerequisite>-->
+ <!--<id>-->
+ <!--<groupId>org.apache.geronimo.configs</groupId>-->
+ <!--<artifactId>jasper</artifactId>-->
+ <!--</id>-->
+ <!--<resource-type>Web Container</resource-type>-->
+ <!--<description>The Jasper subsystem</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/jsp-examples/jsp-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-tomcat/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-tomcat/pom.xml Tue May 27 09:29:53 2008
@@ -70,6 +70,12 @@
<version>${geronimoVersion}</version>
<type>car</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>tomcat6</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
</dependencies>
@@ -103,29 +109,45 @@
<value>true</value>
<includeVersion>true</includeVersion>
</useMavenDependencies>
- <instance>
- <plugin-artifact>
- <prerequisite>
- <id>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6</artifactId>
- </id>
- <resource-type>Web Container</resource-type>
- <description>The Tomcat web container</description>
- </prerequisite>
- <prerequisite>
- <id>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
- </id>
- <resource-type>Web Container</resource-type>
- <description>The Jasper subsystem</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>The Tomcat web container</description>-->
+ <!--</prerequisite>-->
+ <!--<prerequisite>-->
+ <!--<id>-->
+ <!--<groupId>org.apache.geronimo.configs</groupId>-->
+ <!--<artifactId>jasper</artifactId>-->
+ <!--</id>-->
+ <!--<resource-type>Web Container</resource-type>-->
+ <!--<description>The Jasper subsystem</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/ldap-sample-app/ldap-sample-app-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml Tue May 27 09:29:53 2008
@@ -48,6 +48,7 @@
<artifactId>ldap-sample-app-war</artifactId>
<version>${version}</version>
<type>war</type>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -79,6 +80,12 @@
<version>${geronimoVersion}</version>
<type>car</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jetty6</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
</dependencies>
@@ -113,19 +120,19 @@
<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>
+ <!--<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>
@@ -133,4 +140,21 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>it</id>
+ <!--<properties>-->
+ <!--<it-server>jetty-minimal</it-server>-->
+ <!--<it-server>framework</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/ldap-sample-app/ldap-sample-app-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml Tue May 27 09:29:53 2008
@@ -48,6 +48,7 @@
<artifactId>ldap-sample-app-war</artifactId>
<version>${version}</version>
<type>war</type>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -73,13 +74,19 @@
<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>
-
</dependencies>
<build>
@@ -113,19 +120,19 @@
<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>
+ <!--<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>
@@ -133,4 +140,21 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>it</id>
+ <!--<properties>-->
+ <!--<it-server>jetty-minimal</it-server>-->
+ <!--<it-server>framework</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/myphonebook/myphonebook-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-ear/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-ear/pom.xml (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-ear/pom.xml Tue May 27 09:29:53 2008
@@ -38,13 +38,6 @@
<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>
<artifactId>myphonebook-war</artifactId>
<version>${version}</version>
Modified: geronimo/samples/trunk/samples/myphonebook/myphonebook-ejb/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-ejb/src/main/resources/META-INF/persistence.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-ejb/src/main/resources/META-INF/persistence.xml (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-ejb/src/main/resources/META-INF/persistence.xml Tue May 27 09:29:53 2008
@@ -17,22 +17,17 @@
specific language governing permissions and limitations
under the License.
-->
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
- <persistence-unit name="PhonePU">
- <description>Phone Book</description>
- <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
- <class>org.apache.geronimo.samples.myphonebookpak.PhoneBook</class>
- <properties>
- <property name="openjpa.ConnectionURL" value="jdbc:derby:PhoneBookDB" />
- <property name="openjpa.ConnectionDriverName" value="org.apache.derby.jdbc.EmbeddedDriver" />
- <property name="ConnectionUserName" value="app" />
- <property name="openjpa.jdbc.SynchronizeMappings" value="false" />
- </properties>
- </persistence-unit>
- <!--
- <jta-data-source>PhoneBookPool</jta-data-source>
- <non-jta-data-source>PhoneBookPool</non-jta-data-source>
- -->
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
+ <persistence-unit name="PhonePU">
+ <description>Phone Book</description>
+ <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+ <jta-data-source>SampleTxDatasource</jta-data-source>
+ <non-jta-data-source>SampleNoTxDatasource</non-jta-data-source>
+ <class>org.apache.geronimo.samples.myphonebookpak.PhoneBook</class>
+ <properties>
+ <property name="openjpa.jdbc.SynchronizeMappings" value="false"/>
+ </properties>
+ </persistence-unit>
</persistence>
Modified: geronimo/samples/trunk/samples/myphonebook/myphonebook-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-jetty/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-jetty/pom.xml Tue May 27 09:29:53 2008
@@ -43,6 +43,13 @@
<artifactId>myphonebook-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>
@@ -63,7 +70,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
+ <artifactId>openejb-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
@@ -71,19 +78,30 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb-deployer</artifactId>
+ <artifactId>persistence-jpa10-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>persistence-jpa10-deployer</artifactId>
+ <artifactId>jasper</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jetty6</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
- <scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+
</dependencies>
<build>
@@ -118,27 +136,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</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/myphonebook/myphonebook-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-jetty/src/main/plan/plan.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-jetty/src/main/plan/plan.xml Tue May 27 09:29:53 2008
@@ -20,10 +20,5 @@
<!-- $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>PhoneBookPool.xml</alt-dd>
- </module>
</application>
Modified: geronimo/samples/trunk/samples/myphonebook/myphonebook-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-tomcat/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-tomcat/pom.xml Tue May 27 09:29:53 2008
@@ -43,6 +43,13 @@
<artifactId>myphonebook-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>
@@ -63,7 +70,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
+ <artifactId>openejb-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
@@ -71,18 +78,28 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb-deployer</artifactId>
+ <artifactId>persistence-jpa10-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>persistence-jpa10-deployer</artifactId>
+ <artifactId>jasper</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>tomcat6</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
- <scope>provided</scope>
</dependency>
</dependencies>
@@ -118,27 +135,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</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/myphonebook/myphonebook-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-tomcat/src/main/plan/plan.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-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>PhoneBookPool.xml</alt-dd>
- </module>
-
</application>
Modified: geronimo/samples/trunk/samples/mytime/mytime-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/mytime/mytime-jetty/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/mytime/mytime-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/mytime/mytime-jetty/pom.xml Tue May 27 09:29:53 2008
@@ -43,6 +43,7 @@
<artifactId>mytime-ear</artifactId>
<version>${version}</version>
<type>ear</type>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -63,7 +64,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
+ <artifactId>openejb-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
@@ -71,18 +72,28 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb-deployer</artifactId>
+ <artifactId>persistence-jpa10-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>persistence-jpa10-deployer</artifactId>
+ <artifactId>jasper</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jetty6</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
- <scope>provided</scope>
</dependency>
</dependencies>
@@ -118,27 +129,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</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/mytime/mytime-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/mytime/mytime-tomcat/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/mytime/mytime-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/mytime/mytime-tomcat/pom.xml Tue May 27 09:29:53 2008
@@ -43,6 +43,7 @@
<artifactId>mytime-ear</artifactId>
<version>${version}</version>
<type>ear</type>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -63,7 +64,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
+ <artifactId>openejb-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
@@ -71,18 +72,28 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb-deployer</artifactId>
+ <artifactId>persistence-jpa10-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>persistence-jpa10-deployer</artifactId>
+ <artifactId>jasper</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>tomcat6</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
- <scope>provided</scope>
</dependency>
</dependencies>
@@ -118,27 +129,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</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/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/pom.xml (original)
+++ geronimo/samples/trunk/samples/pom.xml Tue May 27 09:29:53 2008
@@ -31,7 +31,8 @@
</description>
<properties>
- <geronimoVersion>2.1</geronimoVersion>
+ <!--<geronimoVersion>2.1</geronimoVersion>-->
+ <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
<gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car</gbeanDeployerBootstrap>
<gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
@@ -51,6 +52,7 @@
</properties>
<modules>
+ <module>SampleDatasource</module>
<module>CustomerService</module>
<!--
<module>async-http</module>
@@ -69,7 +71,7 @@
<module>jsp-examples</module>
<module>servlet-examples</module>
<module>app-per-port</module>
- </modules>
+ </modules>
<dependencyManagement>
<dependencies>
Modified: geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml Tue May 27 09:29:53 2008
@@ -43,6 +43,7 @@
<artifactId>sendmail-ear</artifactId>
<version>${version}</version>
<type>ear</type>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -66,15 +67,18 @@
<artifactId>jasper</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
- <scope>provided</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jetty6</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>javamail</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/sendmail/sendmail-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/pom.xml Tue May 27 09:29:53 2008
@@ -43,6 +43,7 @@
<artifactId>sendmail-ear</artifactId>
<version>${version}</version>
<type>ear</type>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -66,15 +67,18 @@
<artifactId>jasper</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
- <scope>provided</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>tomcat6</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>javamail</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/servlet-examples/servlet-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml Tue May 27 09:29:53 2008
@@ -53,21 +53,26 @@
<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>
+ <artifactId>jasper</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
- <scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
+ <artifactId>jetty6</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
</dependency>
-
</dependencies>
<build>
@@ -99,26 +104,42 @@
<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>
|