geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r661828 [1/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...
Date Fri, 30 May 2008 19:20:19 GMT
Author: jbohn
Date: Fri May 30 12:20:17 2008
New Revision: 661828

URL: http://svn.apache.org/viewvc?rev=661828&view=rev
Log:
merge datasource plugin portion of rev 660588 into branches/2.1 - GERONIMO-4084 add separate datasource plugin

Added:
    geronimo/samples/branches/2.1/samples/SampleDatasource/
      - copied from r660588, geronimo/samples/trunk/samples/SampleDatasource/
    geronimo/samples/branches/2.1/samples/SampleDatasource/pom.xml
      - copied, changed from r660588, geronimo/samples/trunk/samples/SampleDatasource/pom.xml
    geronimo/samples/branches/2.1/samples/SampleDatasource/src/
      - copied from r660588, geronimo/samples/trunk/samples/SampleDatasource/src/
    geronimo/samples/branches/2.1/samples/SampleDatasource/src/main/
      - copied from r660588, geronimo/samples/trunk/samples/SampleDatasource/src/main/
    geronimo/samples/branches/2.1/samples/SampleDatasource/src/main/plan/
      - copied from r660588, geronimo/samples/trunk/samples/SampleDatasource/src/main/plan/
    geronimo/samples/branches/2.1/samples/SampleDatasource/src/main/plan/plan.xml
      - copied unchanged from r660588, geronimo/samples/trunk/samples/SampleDatasource/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/SampleDatasource/src/main/resources/
      - copied from r660588, geronimo/samples/trunk/samples/SampleDatasource/src/main/resources/
Modified:
    geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ear/pom.xml
    geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ear/src/main/resources/CustomerServicePool.xml
    geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ejb/src/main/resources/META-INF/persistence.xml
    geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-jetty/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-tomcat/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/bank/bank-ear/pom.xml
    geronimo/samples/branches/2.1/samples/bank/bank-ejb/src/main/resources/META-INF/persistence.xml
    geronimo/samples/branches/2.1/samples/bank/bank-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/bank/bank-jetty/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/bank/bank-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/bank/bank-tomcat/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/dbtester/dbtester-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/dbtester/dbtester-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/inventory/inventory-ear/pom.xml
    geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ear/pom.xml
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ejb/src/main/resources/META-INF/persistence.xml
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-jetty/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-tomcat/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/mytime/mytime-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/mytime/mytime-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/pom.xml
    geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/timereport/timereport-ear/pom.xml
    geronimo/samples/branches/2.1/samples/timereport/timereport-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/timereport/timereport-jetty/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/timereport/timereport-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/timereport/timereport-tomcat/src/main/plan/plan.xml

Modified: geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ear/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-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>CustomerService-war</artifactId>
             <version>${version}</version>

Modified: geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ear/src/main/resources/CustomerServicePool.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ear/src/main/resources/CustomerServicePool.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ear/src/main/resources/CustomerServicePool.xml (original)
+++ geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ear/src/main/resources/CustomerServicePool.xml Fri May 30 12:20:17 2008
@@ -21,7 +21,7 @@
     <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
         <dep:moduleId>
             <dep:groupId>console.dbpool</dep:groupId>
-            <dep:artifactId>CustomerServicePool</dep:artifactId>
+            <dep:artifactId>SampleDatasource</dep:artifactId>
             <dep:version>1.0</dep:version>
             <dep:type>rar</dep:type>
         </dep:moduleId>
@@ -38,7 +38,7 @@
             <connection-definition>
                 <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
                 <connectiondefinition-instance>
-                    <name>CustomerServicePool</name>
+                    <name>SampleDatasource</name>
                     <config-property-setting name="Driver">org.apache.derby.jdbc.EmbeddedDriver</config-property-setting>
                     <config-property-setting name="ConnectionURL">jdbc:derby:CustomerDB</config-property-setting>
                     <connectionmanager>

Modified: geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ear/src/main/resources/META-INF/geronimo-application.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ear/src/main/resources/META-INF/geronimo-application.xml Fri May 30 12:20:17 2008
@@ -29,9 +29,9 @@
       <dep:non-overridable-classes/>
    </dep:environment>
    
-   <module>
-        <connector>tranql-connector-ra-1.3.rar</connector>
-        <alt-dd>CustomerServicePool.xml</alt-dd>
-   </module>
+   <!--<module>-->
+        <!--<connector>tranql-connector-ra-1.3.rar</connector>-->
+        <!--<alt-dd>CustomerServicePool.xml</alt-dd>-->
+   <!--</module>-->
    
 </application>

Modified: geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ejb/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ejb/src/main/resources/META-INF/persistence.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ejb/src/main/resources/META-INF/persistence.xml (original)
+++ geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ejb/src/main/resources/META-INF/persistence.xml Fri May 30 12:20:17 2008
@@ -23,11 +23,11 @@
     <persistence-unit name="CustomerPU">
         <description>Entity Beans for Customer</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>com.service.customer.ejb.Customer</class>
         <properties>
             <property name="openjpa.jdbc.SynchronizeMappings" value="false"/>
         </properties>
-        <jta-data-source>CustomerServicePool</jta-data-source>
-        <non-jta-data-source>CustomerServicePool</non-jta-data-source>
     </persistence-unit>
 </persistence>

Modified: geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-jetty/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-jetty/pom.xml Fri May 30 12:20:17 2008
@@ -43,11 +43,19 @@
             <artifactId>CustomerService-ear</artifactId>
             <version>${version}</version>
             <type>ear</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <groupId>org.apache.geronimo.samples</groupId>
+            <artifactId>SampleDatasource</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -55,7 +63,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper-deployer</artifactId>
+            <artifactId>jetty6-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -63,7 +71,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper</artifactId>
+            <artifactId>jasper-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -84,6 +92,34 @@
             <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>jasper</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-server</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>
@@ -120,25 +156,24 @@
                     <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/CustomerService/CustomerService-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-jetty/src/main/plan/plan.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-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>CustomerServicePool.xml</alt-dd>
-   </module>
    
 </application>

Modified: geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-tomcat/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-tomcat/pom.xml Fri May 30 12:20:17 2008
@@ -43,11 +43,19 @@
             <artifactId>CustomerService-ear</artifactId>
             <version>${version}</version>
             <type>ear</type>
+            <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6-deployer</artifactId>
+            <groupId>org.apache.geronimo.samples</groupId>
+            <artifactId>SampleDatasource</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -55,7 +63,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper-deployer</artifactId>
+            <artifactId>tomcat6-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -63,7 +71,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper</artifactId>
+            <artifactId>jasper-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -84,6 +92,34 @@
             <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>jasper</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-server</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>
@@ -120,25 +156,24 @@
                     <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/CustomerService/CustomerService-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-tomcat/src/main/plan/plan.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-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>CustomerServicePool.xml</alt-dd>
-   </module>
-
 </application>

Copied: geronimo/samples/branches/2.1/samples/SampleDatasource/pom.xml (from r660588, geronimo/samples/trunk/samples/SampleDatasource/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/SampleDatasource/pom.xml?p2=geronimo/samples/branches/2.1/samples/SampleDatasource/pom.xml&p1=geronimo/samples/trunk/samples/SampleDatasource/pom.xml&r1=660588&r2=661828&rev=661828&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/SampleDatasource/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/SampleDatasource/pom.xml Fri May 30 12:20:17 2008
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>samples</artifactId>
         <groupId>org.apache.geronimo.samples</groupId>
-        <version>2.2-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/2.1/samples/bank/bank-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/bank/bank-ear/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/bank/bank-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/bank/bank-ear/pom.xml Fri May 30 12:20:17 2008
@@ -37,13 +37,7 @@
     <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>
             <artifactId>bank-war</artifactId>

Modified: geronimo/samples/branches/2.1/samples/bank/bank-ejb/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/bank/bank-ejb/src/main/resources/META-INF/persistence.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/bank/bank-ejb/src/main/resources/META-INF/persistence.xml (original)
+++ geronimo/samples/branches/2.1/samples/bank/bank-ejb/src/main/resources/META-INF/persistence.xml Fri May 30 12:20:17 2008
@@ -17,19 +17,19 @@
     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="BankPU">
-		<description>Entity Beans for Bank</description>
-		<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-		<class>org.apache.geronimo.samples.bank.ejb.Account</class>
-		<class>org.apache.geronimo.samples.bank.ejb.Customer</class>
-		<class>org.apache.geronimo.samples.bank.ejb.ExchangeRate</class>
-		<properties>
-			<property name="openjpa.jdbc.SynchronizeMappings" value="false" />
-		</properties>
-		<jta-data-source>BankPool</jta-data-source>
-		<non-jta-data-source>BankPool</non-jta-data-source>
-	</persistence-unit>
+<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="BankPU">
+        <description>Entity Beans for Bank</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.bank.ejb.Account</class>
+        <class>org.apache.geronimo.samples.bank.ejb.Customer</class>
+        <class>org.apache.geronimo.samples.bank.ejb.ExchangeRate</class>
+        <properties>
+            <property name="openjpa.jdbc.SynchronizeMappings" value="false"/>
+        </properties>
+    </persistence-unit>
 </persistence>

Modified: geronimo/samples/branches/2.1/samples/bank/bank-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/bank/bank-jetty/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/bank/bank-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/bank/bank-jetty/pom.xml Fri May 30 12:20:17 2008
@@ -43,6 +43,13 @@
             <artifactId>bank-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,7 +78,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,11 +86,30 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>persistence-jpa10-deployer</artifactId>
+            <artifactId>jetty6</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </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>openejb</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
-            <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openjpa</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -120,25 +146,24 @@
                     <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/bank/bank-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/bank/bank-jetty/src/main/plan/plan.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/bank/bank-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/bank/bank-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>BankPool.xml</alt-dd>
-   </module>
-
 </application>

Modified: geronimo/samples/branches/2.1/samples/bank/bank-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/bank/bank-tomcat/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/bank/bank-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/bank/bank-tomcat/pom.xml Fri May 30 12:20:17 2008
@@ -43,8 +43,15 @@
             <artifactId>bank-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>
@@ -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,7 +78,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,11 +86,30 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>persistence-jpa10-deployer</artifactId>
+            <artifactId>tomcat6</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>openejb</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openjpa</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -120,25 +146,24 @@
                     <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/bank/bank-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/bank/bank-tomcat/src/main/plan/plan.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/bank/bank-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/bank/bank-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>BankPool.xml</alt-dd>
-   </module>
-
 </application>

Modified: geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-jetty/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-jetty/pom.xml Fri May 30 12:20:17 2008
@@ -43,6 +43,7 @@
             <artifactId>calculator-stateless-ear</artifactId>
             <version>${version}</version>
             <type>ear</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -63,14 +64,6 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
@@ -84,6 +77,31 @@
             <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>jasper</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>
+         <dependency>
+             <groupId>org.apache.geronimo.configs</groupId>
+             <artifactId>openjpa</artifactId>
+             <version>${geronimoVersion}</version>
+             <type>car</type>
+         </dependency>
     </dependencies>
 
     <build>
@@ -120,25 +138,24 @@
                     <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/calculator-stateless-pojo/calculator-stateless-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-tomcat/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-tomcat/pom.xml Fri May 30 12:20:17 2008
@@ -43,6 +43,7 @@
             <artifactId>calculator-stateless-ear</artifactId>
             <version>${version}</version>
             <type>ear</type>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
@@ -63,14 +64,6 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
@@ -84,6 +77,31 @@
             <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>jasper</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>
+         <dependency>
+             <groupId>org.apache.geronimo.configs</groupId>
+             <artifactId>openjpa</artifactId>
+             <version>${geronimoVersion}</version>
+             <type>car</type>
+         </dependency>
     </dependencies>
 
     <build>
@@ -120,25 +138,24 @@
                     <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/dbtester/dbtester-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/dbtester/dbtester-jetty/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/dbtester/dbtester-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/dbtester/dbtester-jetty/pom.xml Fri May 30 12:20:17 2008
@@ -43,6 +43,7 @@
             <artifactId>dbtester-war</artifactId>
             <version>${version}</version>
             <type>war</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -66,7 +67,12 @@
             <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>
     </dependencies>
 
@@ -121,6 +127,5 @@
             </plugin>
         </plugins>
     </build>
-
 </project>
 

Modified: geronimo/samples/branches/2.1/samples/dbtester/dbtester-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/dbtester/dbtester-tomcat/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/dbtester/dbtester-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/dbtester/dbtester-tomcat/pom.xml Fri May 30 12:20:17 2008
@@ -43,6 +43,7 @@
             <artifactId>dbtester-war</artifactId>
             <version>${version}</version>
             <type>war</type>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
@@ -66,7 +67,12 @@
             <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>
     </dependencies>
 
@@ -121,6 +127,5 @@
             </plugin>
         </plugins>
     </build>
-    
 </project>
 

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-ear/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-ear/pom.xml Fri May 30 12:20:17 2008
@@ -38,12 +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>inventory-war</artifactId>
             <version>${version}</version>

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/pom.xml Fri May 30 12:20:17 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,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/inventory/inventory-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/src/main/plan/plan.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-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>InventoryPool.xml</alt-dd>
-   </module>
-   
 </application>

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/pom.xml Fri May 30 12:20:17 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>
@@ -129,6 +134,5 @@
             </plugin>
         </plugins>
     </build>
-    
 </project>
 

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/src/main/plan/plan.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-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>InventoryPool.xml</alt-dd>
-   </module>
-
 </application>

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml Fri May 30 12:20:17 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/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml Fri May 30 12:20:17 2008
@@ -63,7 +63,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper</artifactId>
+            <artifactId>cxf-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -71,10 +71,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>
 
@@ -109,23 +120,23 @@
                         <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>

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml Fri May 30 12:20:17 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,26 +121,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/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml Fri May 30 12:20:17 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,26 +130,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/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml Fri May 30 12:20:17 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,26 +130,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/jsp-examples/jsp-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-jetty/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-jetty/pom.xml Fri May 30 12:20:17 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,28 @@
                         <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>
-
 </project>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-tomcat/pom.xml?rev=661828&r1=661827&r2=661828&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-tomcat/pom.xml Fri May 30 12:20:17 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,28 @@
                         <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>
-
 </project>



Mime
View raw message