geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r612053 - in /geronimo/server/trunk: applications/ca-helper/ca-helper-jetty/ applications/ca-helper/ca-helper-tomcat/ applications/remote-deploy/remote-deploy-jetty/ applications/remote-deploy/remote-deploy-tomcat/ applications/welcome/welc...
Date Tue, 15 Jan 2008 09:13:07 GMT
Author: djencks
Date: Tue Jan 15 01:13:05 2008
New Revision: 612053

URL: http://svn.apache.org/viewvc?rev=612053&view=rev
Log:
GERONIMO-3698.  Eliminate abuse of plugin prerequisites that makes installing dependencies
unduely difficult

Modified:
    geronimo/server/trunk/applications/ca-helper/ca-helper-jetty/pom.xml
    geronimo/server/trunk/applications/ca-helper/ca-helper-tomcat/pom.xml
    geronimo/server/trunk/applications/remote-deploy/remote-deploy-jetty/pom.xml
    geronimo/server/trunk/applications/remote-deploy/remote-deploy-tomcat/pom.xml
    geronimo/server/trunk/applications/welcome/welcome-jetty/pom.xml
    geronimo/server/trunk/applications/welcome/welcome-tomcat/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml
    geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/pom.xml
    geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/pom.xml
    geronimo/server/trunk/plugins/dojo/dojo-jetty6/pom.xml
    geronimo/server/trunk/plugins/dojo/dojo-tomcat/pom.xml
    geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml
    geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml
    geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml
    geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml
    geronimo/server/trunk/plugins/system-database/system-database/pom.xml

Modified: geronimo/server/trunk/applications/ca-helper/ca-helper-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/ca-helper/ca-helper-jetty/pom.xml?rev=612053&r1=612052&r2=612053&view=diff
==============================================================================
--- geronimo/server/trunk/applications/ca-helper/ca-helper-jetty/pom.xml (original)
+++ geronimo/server/trunk/applications/ca-helper/ca-helper-jetty/pom.xml Tue Jan 15 01:13:05
2008
@@ -100,26 +100,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/server/trunk/applications/ca-helper/ca-helper-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/ca-helper/ca-helper-tomcat/pom.xml?rev=612053&r1=612052&r2=612053&view=diff
==============================================================================
--- geronimo/server/trunk/applications/ca-helper/ca-helper-tomcat/pom.xml (original)
+++ geronimo/server/trunk/applications/ca-helper/ca-helper-tomcat/pom.xml Tue Jan 15 01:13:05
2008
@@ -100,27 +100,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/server/trunk/applications/remote-deploy/remote-deploy-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/remote-deploy/remote-deploy-jetty/pom.xml?rev=612053&r1=612052&r2=612053&view=diff
==============================================================================
--- geronimo/server/trunk/applications/remote-deploy/remote-deploy-jetty/pom.xml (original)
+++ geronimo/server/trunk/applications/remote-deploy/remote-deploy-jetty/pom.xml Tue Jan 15
01:13:05 2008
@@ -99,18 +99,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>
-                        </plugin-artifact>
-                    </instance>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/applications/remote-deploy/remote-deploy-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/remote-deploy/remote-deploy-tomcat/pom.xml?rev=612053&r1=612052&r2=612053&view=diff
==============================================================================
--- geronimo/server/trunk/applications/remote-deploy/remote-deploy-tomcat/pom.xml (original)
+++ geronimo/server/trunk/applications/remote-deploy/remote-deploy-tomcat/pom.xml Tue Jan
15 01:13:05 2008
@@ -99,18 +99,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>
-                        </plugin-artifact>
-                    </instance>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/applications/welcome/welcome-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/welcome/welcome-jetty/pom.xml?rev=612053&r1=612052&r2=612053&view=diff
==============================================================================
--- geronimo/server/trunk/applications/welcome/welcome-jetty/pom.xml (original)
+++ geronimo/server/trunk/applications/welcome/welcome-jetty/pom.xml Tue Jan 15 01:13:05 2008
@@ -109,23 +109,6 @@
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
                     <category>Administration</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 Welcome 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 Welcome application
that works with Tomcat. 
-                                    Please install the version appropriate to your Geronimo
distribution.
-                                </description> 
-                            </prerequisite>
-                        </plugin-artifact>
-                    </instance>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/applications/welcome/welcome-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/welcome/welcome-tomcat/pom.xml?rev=612053&r1=612052&r2=612053&view=diff
==============================================================================
--- geronimo/server/trunk/applications/welcome/welcome-tomcat/pom.xml (original)
+++ geronimo/server/trunk/applications/welcome/welcome-tomcat/pom.xml Tue Jan 15 01:13:05
2008
@@ -108,23 +108,6 @@
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
                     <category>Administration</category>
-                    <instance>
-                        <plugin-artifact>
-                            <prerequisite>
-                                <id>
-                                    <groupId>org.apache.geronimo.configs</groupId>
-                                    <artifactId>tomcat</artifactId>
-                                </id>
-                                <resource-type>Web Container</resource-type>
-                                <description>
-                                    This version of the Welcome 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 Welcome application
that works with Jetty. 
-                                    Please install the version appropriate to your Geronimo
distribution.
-                                </description> 
-                            </prerequisite>
-                        </plugin-artifact>
-                    </instance>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml?rev=612053&r1=612052&r2=612053&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml Tue Jan 15 01:13:05
2008
@@ -165,20 +165,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>
-                                    This version of the plugin works with the Geronimo/Jetty
distribution.
-                                </description>
-                            </prerequisite>
-                        </plugin-artifact>
-                    </instance>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml?rev=612053&r1=612052&r2=612053&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml Tue Jan 15 01:13:05
2008
@@ -157,20 +157,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>
-                                    This version of the plugin works with the Geronimo/Tomcat
distribution.
-                                </description>
-                            </prerequisite>
-                        </plugin-artifact>
-                    </instance>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/pom.xml?rev=612053&r1=612052&r2=612053&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/pom.xml (original)
+++ geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/pom.xml Tue Jan 15 01:13:05
2008
@@ -95,26 +95,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/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/pom.xml?rev=612053&r1=612052&r2=612053&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/pom.xml Tue Jan 15 01:13:05
2008
@@ -94,26 +94,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/server/trunk/plugins/dojo/dojo-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo/dojo-jetty6/pom.xml?rev=612053&r1=612052&r2=612053&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/dojo/dojo-jetty6/pom.xml (original)
+++ geronimo/server/trunk/plugins/dojo/dojo-jetty6/pom.xml Tue Jan 15 01:13:05 2008
@@ -95,26 +95,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/server/trunk/plugins/dojo/dojo-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo/dojo-tomcat/pom.xml?rev=612053&r1=612052&r2=612053&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/dojo/dojo-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/dojo/dojo-tomcat/pom.xml Tue Jan 15 01:13:05 2008
@@ -94,26 +94,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/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml?rev=612053&r1=612052&r2=612053&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml Tue Jan 15
01:13:05 2008
@@ -147,20 +147,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>
-                                    This version of the plugin works with the Geronimo/Jetty
distribution.
-                                </description>
-                            </prerequisite>
-                        </plugin-artifact>
-                    </instance>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml?rev=612053&r1=612052&r2=612053&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml Tue Jan 15
01:13:05 2008
@@ -142,20 +142,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>
-                                    This version of the plugin works with the Geronimo/Tomcat
distribution.
-                                </description>
-                            </prerequisite>
-                        </plugin-artifact>
-                    </instance>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml?rev=612053&r1=612052&r2=612053&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml Tue Jan 15 01:13:05
2008
@@ -261,20 +261,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>
-                                    This version of the plugin works with the Geronimo/Jetty
distribution.
-                                </description>
-                            </prerequisite>
-                        </plugin-artifact>
-                    </instance>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml?rev=612053&r1=612052&r2=612053&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml Tue Jan 15
01:13:05 2008
@@ -248,20 +248,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>
-                                    This version of the plugin works with the Geronimo/Tomcat
distribution.
-                                </description>
-                            </prerequisite>
-                        </plugin-artifact>
-                    </instance>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/system-database/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database/pom.xml?rev=612053&r1=612052&r2=612053&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/system-database/pom.xml Tue Jan 15 01:13:05
2008
@@ -131,26 +131,6 @@
                                    <attribute name="port">#{DerbyPort + PortOffset}</attribute>
                                </gbean>
                            </config-xml-content>
-                           <prerequisite>
-                               <id>
-                                   <groupId>org.apache.geronimo.configs</groupId>
-                                   <artifactId>transaction</artifactId>
-                               </id>
-                               <resource-type>Transaction</resource-type>
-                               <description>
-                                  Transaction configuration for Geronimo.
-                               </description>
-                            </prerequisite>
-                           <prerequisite>
-                             <id>
-                                 <groupId>org.apache.geronimo.configs</groupId>
-                                 <artifactId>connector-deployer</artifactId>
-                             </id>
-                               <resource-type>Deployment</resource-type>
-                               <description>
-                                  Connector deployer configuration for Geronimo.
-                               </description>
-                           </prerequisite>
                         </plugin-artifact>
                      </instance>
                 </configuration>



Mime
View raw message