You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by pr...@apache.org on 2007/10/03 04:42:31 UTC
svn commit: r581479 - in /geronimo/server/trunk/configs:
servlet-examples-jetty/ servlet-examples-jetty/src/main/plan/
servlet-examples-jetty/src/main/resources/ servlet-examples-tomcat/
servlet-examples-tomcat/src/main/plan/ servlet-examples-tomcat/sr...
Author: prasad
Date: Tue Oct 2 19:42:30 2007
New Revision: 581479
URL: http://svn.apache.org/viewvc?rev=581479&view=rev
Log:
* create a plugin
Removed:
geronimo/server/trunk/configs/servlet-examples-jetty/src/main/resources/
geronimo/server/trunk/configs/servlet-examples-tomcat/src/main/resources/
geronimo/server/trunk/configs/welcome-jetty/src/main/resources/
geronimo/server/trunk/configs/welcome-tomcat/src/main/resources/
Modified:
geronimo/server/trunk/configs/servlet-examples-jetty/pom.xml
geronimo/server/trunk/configs/servlet-examples-jetty/src/main/plan/plan.xml
geronimo/server/trunk/configs/servlet-examples-tomcat/pom.xml
geronimo/server/trunk/configs/servlet-examples-tomcat/src/main/plan/plan.xml
geronimo/server/trunk/configs/welcome-jetty/pom.xml
geronimo/server/trunk/configs/welcome-jetty/src/main/plan/plan.xml
geronimo/server/trunk/configs/welcome-tomcat/pom.xml
geronimo/server/trunk/configs/welcome-tomcat/src/main/plan/plan.xml
Modified: geronimo/server/trunk/configs/servlet-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/servlet-examples-jetty/pom.xml?rev=581479&r1=581478&r2=581479&view=diff
==============================================================================
--- geronimo/server/trunk/configs/servlet-examples-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/servlet-examples-jetty/pom.xml Tue Oct 2 19:42:30 2007
@@ -32,15 +32,16 @@
<artifactId>servlet-examples-jetty</artifactId>
<name>Geronimo Configs :: Servlet Examples for Jetty</name>
<packaging>car</packaging>
+
+ <description>The Servlet examples originally developed for Tomcat. Can be found via HTTP at /servlets-examples/ after installation. These examples give a basic introduction to Servlet development along with sample code.</description>
<dependencies>
-
<!--<dependency>-->
- <!--<groupId>org.apache.geronimo.configs</groupId>-->
- <!--<artifactId>jetty-deployer</artifactId>-->
- <!--<version>${version}</version>-->
- <!--<type>car</type>-->
- <!--<scope>test</scope>-->
+ <!--<groupId>org.apache.geronimo.configs</groupId>-->
+ <!--<artifactId>jetty-deployer</artifactId>-->
+ <!--<version>${version}</version>-->
+ <!--<type>car</type>-->
+ <!--<scope>test</scope>-->
<!--</dependency>-->
<dependency>
@@ -48,8 +49,9 @@
<artifactId>geronimo-servlet-examples</artifactId>
<version>${version}</version>
<type>war</type>
+ <scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jetty6-deployer</artifactId>
@@ -72,7 +74,7 @@
<type>car</type>
</dependency>
</dependencies>
-
+
<build>
<resources>
<resource>
@@ -97,6 +99,28 @@
<version>${version}</version>
<type>war</type>
</module>
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ </useMavenDependencies>
+ <category>Example</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/server/trunk/configs/servlet-examples-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/servlet-examples-jetty/src/main/plan/plan.xml?rev=581479&r1=581478&r2=581479&view=diff
==============================================================================
--- geronimo/server/trunk/configs/servlet-examples-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/servlet-examples-jetty/src/main/plan/plan.xml Tue Oct 2 19:42:30 2007
@@ -15,23 +15,6 @@
limitations under the License.-->
<!--$Rev$ $Date$-->
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
- <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:moduleId>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>servlet-examples-jetty</dep:artifactId>
- <dep:version>2.1-SNAPSHOT</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
- <dep:dependencies>
- <dep:dependency>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>jasper</dep:artifactId>
- <dep:type>car</dep:type>
- </dep:dependency>
- </dep:dependencies>
- <dep:hidden-classes/>
- <dep:non-overridable-classes/>
- </dep:environment>
<context-root>/servlets-examples</context-root>
<security-realm-name>geronimo-admin</security-realm-name>
<security>
Modified: geronimo/server/trunk/configs/servlet-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/servlet-examples-tomcat/pom.xml?rev=581479&r1=581478&r2=581479&view=diff
==============================================================================
--- geronimo/server/trunk/configs/servlet-examples-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/servlet-examples-tomcat/pom.xml Tue Oct 2 19:42:30 2007
@@ -32,14 +32,16 @@
<artifactId>servlet-examples-tomcat</artifactId>
<name>Geronimo Configs :: Servlet Examples for Tomcat</name>
<packaging>car</packaging>
+
+ <description>The Servlet examples originally developed for Tomcat. Can be found via HTTP at /servlets-examples/ after installation. These examples give a basic introduction to Servlet development along with sample code.</description>
<dependencies>
-
<dependency>
<groupId>org.apache.geronimo.applications.examples</groupId>
<artifactId>geronimo-servlet-examples</artifactId>
<version>${version}</version>
<type>war</type>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -89,6 +91,28 @@
<version>${version}</version>
<type>war</type>
</module>
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ </useMavenDependencies>
+ <category>Example</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 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/server/trunk/configs/servlet-examples-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/servlet-examples-tomcat/src/main/plan/plan.xml?rev=581479&r1=581478&r2=581479&view=diff
==============================================================================
--- geronimo/server/trunk/configs/servlet-examples-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/servlet-examples-tomcat/src/main/plan/plan.xml Tue Oct 2 19:42:30 2007
@@ -15,23 +15,6 @@
limitations under the License.-->
<!--$Rev$ $Date$-->
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
- <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:moduleId>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>servlet-examples-tomcat</dep:artifactId>
- <dep:version>2.1-SNAPSHOT</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
- <dep:dependencies>
- <dep:dependency>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>jasper</dep:artifactId>
- <dep:type>car</dep:type>
- </dep:dependency>
- </dep:dependencies>
- <dep:hidden-classes/>
- <dep:non-overridable-classes/>
- </dep:environment>
<context-root>/servlets-examples</context-root>
<security-realm-name>geronimo-admin</security-realm-name>
<security>
Modified: geronimo/server/trunk/configs/welcome-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/welcome-jetty/pom.xml?rev=581479&r1=581478&r2=581479&view=diff
==============================================================================
--- geronimo/server/trunk/configs/welcome-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/welcome-jetty/pom.xml Tue Oct 2 19:42:30 2007
@@ -32,7 +32,14 @@
<artifactId>welcome-jetty</artifactId>
<name>Geronimo Configs :: Welcome app Jetty</name>
<packaging>car</packaging>
-
+
+ <description>
+ The welcome application for Geronimo.
+ This binds to / so it handles all requests that nothing else is bound to.
+ The main purpose is to greet users who are exploring Geronimo for the first time.
+ It should typically be removed or replaced for production applications.
+ </description>
+
<dependencies>
<!--<dependency>-->
@@ -48,6 +55,7 @@
<artifactId>geronimo-welcome</artifactId>
<version>${version}</version>
<type>war</type>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -98,6 +106,28 @@
<version>${version}</version>
<type>war</type>
</module>
+ <useMavenDependencies>
+ <value>true</value>
+ <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/configs/welcome-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/welcome-jetty/src/main/plan/plan.xml?rev=581479&r1=581478&r2=581479&view=diff
==============================================================================
--- geronimo/server/trunk/configs/welcome-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/welcome-jetty/src/main/plan/plan.xml Tue Oct 2 19:42:30 2007
@@ -15,22 +15,5 @@
limitations under the License.-->
<!--$Rev$ $Date$-->
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
- <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:moduleId>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>welcome-jetty</dep:artifactId>
- <dep:version>2.1-SNAPSHOT</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
- <dep:dependencies>
- <dep:dependency>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>jasper</dep:artifactId>
- <dep:type>car</dep:type>
- </dep:dependency>
- </dep:dependencies>
- <dep:hidden-classes/>
- <dep:non-overridable-classes/>
- </dep:environment>
<context-root>/</context-root>
</web-app>
Modified: geronimo/server/trunk/configs/welcome-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/welcome-tomcat/pom.xml?rev=581479&r1=581478&r2=581479&view=diff
==============================================================================
--- geronimo/server/trunk/configs/welcome-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/welcome-tomcat/pom.xml Tue Oct 2 19:42:30 2007
@@ -32,6 +32,13 @@
<artifactId>welcome-tomcat</artifactId>
<name>Geronimo Configs :: Welcome app Tomcat</name>
<packaging>car</packaging>
+
+ <description>
+ The welcome application for Geronimo.
+ This binds to / so it handles all requests that nothing else is bound to.
+ The main purpose is to greet users who are exploring Geronimo for the first time.
+ It should typically be removed or replaced for production applications.
+ </description>
<dependencies>
@@ -40,8 +47,8 @@
<artifactId>geronimo-welcome</artifactId>
<version>${version}</version>
<type>war</type>
+ <scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat6-deployer</artifactId>
@@ -90,6 +97,28 @@
<version>${version}</version>
<type>war</type>
</module>
+ <useMavenDependencies>
+ <value>true</value>
+ <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/configs/welcome-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/welcome-tomcat/src/main/plan/plan.xml?rev=581479&r1=581478&r2=581479&view=diff
==============================================================================
--- geronimo/server/trunk/configs/welcome-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/welcome-tomcat/src/main/plan/plan.xml Tue Oct 2 19:42:30 2007
@@ -15,22 +15,5 @@
limitations under the License.-->
<!--$Rev$ $Date$-->
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
- <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:moduleId>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>welcome-tomcat</dep:artifactId>
- <dep:version>2.1-SNAPSHOT</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
- <dep:dependencies>
- <dep:dependency>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>jasper</dep:artifactId>
- <dep:type>car</dep:type>
- </dep:dependency>
- </dep:dependencies>
- <dep:hidden-classes/>
- <dep:non-overridable-classes/>
- </dep:environment>
<context-root>/</context-root>
</web-app>