You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2008/05/30 21:20:19 UTC
svn commit: r661828 [2/2] - in /geronimo/samples/branches/2.1/samples: ./
CustomerService/CustomerService-ear/
CustomerService/CustomerService-ear/src/main/resources/
CustomerService/CustomerService-ear/src/main/resources/META-INF/
CustomerService/Cust...
Modified: geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml Fri May 30 12:20:17 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,24 +120,23 @@
<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>
</plugin>
</plugins>
</build>
-
</project>
Modified: geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml Fri May 30 12:20:17 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,24 +120,23 @@
<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>
</plugin>
</plugins>
</build>
-
</project>
Modified: geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ear/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ear/pom.xml Fri May 30 12:20:17 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/branches/2.1/samples/myphonebook/myphonebook-ejb/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ejb/src/main/resources/META-INF/persistence.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ejb/src/main/resources/META-INF/persistence.xml (original)
+++ geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ejb/src/main/resources/META-INF/persistence.xml Fri May 30 12:20:17 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/branches/2.1/samples/myphonebook/myphonebook-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-jetty/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-jetty/pom.xml Fri May 30 12:20:17 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>
- <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>openejb</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ </dependency>
+
</dependencies>
<build>
@@ -118,27 +136,26 @@
<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>
-
</project>
Modified: geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-jetty/src/main/plan/plan.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-jetty/src/main/plan/plan.xml Fri May 30 12:20:17 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/branches/2.1/samples/myphonebook/myphonebook-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-tomcat/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-tomcat/pom.xml Fri May 30 12:20:17 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,26 @@
<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>
-
</project>
Modified: geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-tomcat/src/main/plan/plan.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-tomcat/src/main/plan/plan.xml Fri May 30 12:20:17 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/branches/2.1/samples/mytime/mytime-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/mytime/mytime-jetty/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/mytime/mytime-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/mytime/mytime-jetty/pom.xml Fri May 30 12:20:17 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,26 @@
<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>
-
</project>
Modified: geronimo/samples/branches/2.1/samples/mytime/mytime-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/mytime/mytime-tomcat/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/mytime/mytime-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/mytime/mytime-tomcat/pom.xml Fri May 30 12:20:17 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,26 @@
<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>
-
</project>
Modified: geronimo/samples/branches/2.1/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/pom.xml Fri May 30 12:20:17 2008
@@ -52,6 +52,7 @@
</properties>
<modules>
+ <module>SampleDatasource</module>
<module>CustomerService</module>
<module>bank</module>
<module>calculator-stateless-pojo</module>
Modified: geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/pom.xml Fri May 30 12:20:17 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,26 +112,25 @@
<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>
-
</project>
Modified: geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/pom.xml Fri May 30 12:20:17 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,26 +112,25 @@
<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>
-
</project>
Modified: geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-jetty/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-jetty/pom.xml Fri May 30 12:20:17 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,25 @@
<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>
-
</project>
Modified: geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-tomcat/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-tomcat/pom.xml Fri May 30 12:20:17 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,25 @@
<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>
-
</project>
Modified: geronimo/samples/branches/2.1/samples/timereport/timereport-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/timereport-ear/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/timereport-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/timereport/timereport-ear/pom.xml Fri May 30 12:20:17 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/branches/2.1/samples/timereport/timereport-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/timereport-jetty/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/timereport-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/timereport/timereport-jetty/pom.xml Fri May 30 12:20:17 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,26 @@
<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>
-
</project>
Modified: geronimo/samples/branches/2.1/samples/timereport/timereport-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/timereport-jetty/src/main/plan/plan.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/timereport-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/timereport/timereport-jetty/src/main/plan/plan.xml Fri May 30 12:20:17 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/branches/2.1/samples/timereport/timereport-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/timereport-tomcat/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/timereport-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/timereport/timereport-tomcat/pom.xml Fri May 30 12:20:17 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,26 @@
<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>
-
</project>
Modified: geronimo/samples/branches/2.1/samples/timereport/timereport-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/timereport-tomcat/src/main/plan/plan.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/timereport-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/timereport/timereport-tomcat/src/main/plan/plan.xml Fri May 30 12:20:17 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>