You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/10/02 05:40:57 UTC

svn commit: r701000 - in /geronimo/samples/trunk/samples: all-samples/all-samples-jetty/ all-samples/all-samples-tomcat/ app-per-port/app-per-port-tomcat/ bank/bank-jetty/ bank/bank-tomcat/ calculator/calculator-jetty/ calculator/calculator-tomcat/ cus...

Author: gawor
Date: Wed Oct  1 20:40:56 2008
New Revision: 701000

URL: http://svn.apache.org/viewvc?rev=701000&view=rev
Log:
clean up poms

Modified:
    geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml
    geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml
    geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/pom.xml
    geronimo/samples/trunk/samples/bank/bank-jetty/pom.xml
    geronimo/samples/trunk/samples/bank/bank-tomcat/pom.xml
    geronimo/samples/trunk/samples/calculator/calculator-jetty/pom.xml
    geronimo/samples/trunk/samples/calculator/calculator-tomcat/pom.xml
    geronimo/samples/trunk/samples/customer/customer-jetty/pom.xml
    geronimo/samples/trunk/samples/customer/customer-tomcat/pom.xml
    geronimo/samples/trunk/samples/inventory/inventory-jetty/pom.xml
    geronimo/samples/trunk/samples/inventory/inventory-tomcat/pom.xml
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml
    geronimo/samples/trunk/samples/jms-mdb/jms-mdb-jetty/pom.xml
    geronimo/samples/trunk/samples/jms-mdb/jms-mdb-tomcat/pom.xml
    geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml
    geronimo/samples/trunk/samples/jsp-examples/jsp-examples-tomcat/pom.xml
    geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml
    geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml
    geronimo/samples/trunk/samples/myphonebook/myphonebook-jetty/pom.xml
    geronimo/samples/trunk/samples/myphonebook/myphonebook-tomcat/pom.xml
    geronimo/samples/trunk/samples/mytime/mytime-jetty/pom.xml
    geronimo/samples/trunk/samples/mytime/mytime-tomcat/pom.xml
    geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml
    geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/pom.xml
    geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml
    geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml
    geronimo/samples/trunk/samples/timereport/timereport-jetty/pom.xml
    geronimo/samples/trunk/samples/timereport/timereport-tomcat/pom.xml

Modified: geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml Wed Oct  1 20:40:56 2008
@@ -155,23 +155,6 @@
                         <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>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml Wed Oct  1 20:40:56 2008
@@ -162,23 +162,6 @@
                         <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>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/pom.xml Wed Oct  1 20:40:56 2008
@@ -118,23 +118,6 @@
                         <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>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/bank/bank-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-jetty/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/bank/bank-jetty/pom.xml Wed Oct  1 20:40:56 2008
@@ -146,23 +146,6 @@
                         <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>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/bank/bank-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-tomcat/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/bank/bank-tomcat/pom.xml Wed Oct  1 20:40:56 2008
@@ -145,23 +145,6 @@
                         <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>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/calculator/calculator-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator/calculator-jetty/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/calculator/calculator-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/calculator/calculator-jetty/pom.xml Wed Oct  1 20:40:56 2008
@@ -138,23 +138,6 @@
                         <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>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/calculator/calculator-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator/calculator-tomcat/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/calculator/calculator-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/calculator/calculator-tomcat/pom.xml Wed Oct  1 20:40:56 2008
@@ -136,23 +136,6 @@
                         <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>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/customer/customer-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/customer/customer-jetty/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/customer/customer-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/customer/customer-jetty/pom.xml Wed Oct  1 20:40:56 2008
@@ -154,23 +154,6 @@
                         <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>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/customer/customer-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/customer/customer-tomcat/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/customer/customer-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/customer/customer-tomcat/pom.xml Wed Oct  1 20:40:56 2008
@@ -154,23 +154,6 @@
                         <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>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/inventory/inventory-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/inventory/inventory-jetty/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/inventory/inventory-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/inventory/inventory-jetty/pom.xml Wed Oct  1 20:40:56 2008
@@ -113,23 +113,6 @@
                         <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>-->
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/inventory/inventory-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/inventory/inventory-tomcat/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/inventory/inventory-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/inventory/inventory-tomcat/pom.xml Wed Oct  1 20:40:56 2008
@@ -113,23 +113,6 @@
                         <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>-->
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml Wed Oct  1 20:40:56 2008
@@ -121,23 +121,6 @@
                         <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>-->
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml Wed Oct  1 20:40:56 2008
@@ -121,23 +121,6 @@
                         <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>-->
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/jms-mdb/jms-mdb-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jms-mdb/jms-mdb-jetty/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jms-mdb/jms-mdb-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-jetty/pom.xml Wed Oct  1 20:40:56 2008
@@ -130,23 +130,6 @@
                         <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>-->
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/jms-mdb/jms-mdb-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jms-mdb/jms-mdb-tomcat/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jms-mdb/jms-mdb-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/jms-mdb/jms-mdb-tomcat/pom.xml Wed Oct  1 20:40:56 2008
@@ -130,23 +130,6 @@
                         <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>-->
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml Wed Oct  1 20:40:56 2008
@@ -109,26 +109,6 @@
                         <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>-->
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-tomcat/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-tomcat/pom.xml Wed Oct  1 20:40:56 2008
@@ -109,26 +109,6 @@
                         <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>-->
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml Wed Oct  1 20:40:56 2008
@@ -119,23 +119,6 @@
                         <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>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml Wed Oct  1 20:40:56 2008
@@ -111,23 +111,6 @@
                         <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>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/myphonebook/myphonebook-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-jetty/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-jetty/pom.xml Wed Oct  1 20:40:56 2008
@@ -136,23 +136,6 @@
                         <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>-->
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/myphonebook/myphonebook-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-tomcat/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-tomcat/pom.xml Wed Oct  1 20:40:56 2008
@@ -135,23 +135,6 @@
                         <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>-->
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/mytime/mytime-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/mytime/mytime-jetty/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/mytime/mytime-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/mytime/mytime-jetty/pom.xml Wed Oct  1 20:40:56 2008
@@ -129,23 +129,6 @@
                         <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>-->
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/mytime/mytime-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/mytime/mytime-tomcat/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/mytime/mytime-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/mytime/mytime-tomcat/pom.xml Wed Oct  1 20:40:56 2008
@@ -129,23 +129,6 @@
                         <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>-->
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml Wed Oct  1 20:40:56 2008
@@ -112,23 +112,6 @@
                         <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>-->
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/pom.xml Wed Oct  1 20:40:56 2008
@@ -112,23 +112,6 @@
                         <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>-->
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml Wed Oct  1 20:40:56 2008
@@ -96,23 +96,6 @@
                         <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>-->
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml Wed Oct  1 20:40:56 2008
@@ -91,23 +91,6 @@
                         <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>-->
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/timereport/timereport-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/timereport/timereport-jetty/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/timereport/timereport-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/timereport/timereport-jetty/pom.xml Wed Oct  1 20:40:56 2008
@@ -112,23 +112,6 @@
                         <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>-->
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/timereport/timereport-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/timereport/timereport-tomcat/pom.xml?rev=701000&r1=700999&r2=701000&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/timereport/timereport-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/timereport/timereport-tomcat/pom.xml Wed Oct  1 20:40:56 2008
@@ -112,23 +112,6 @@
                         <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>-->
                 </configuration>
             </plugin>
         </plugins>