geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r396076 - in /geronimo/branches/1.1/configs: welcome-jetty/maven.xml welcome-jetty/src/conf/ welcome-jetty/src/conf/geronimo-plugin.xml welcome-tomcat/maven.xml welcome-tomcat/src/conf/ welcome-tomcat/src/conf/geronimo-plugin.xml
Date Sat, 22 Apr 2006 04:28:01 GMT
Author: ammulder
Date: Fri Apr 21 21:27:59 2006
New Revision: 396076

URL: http://svn.apache.org/viewcvs?rev=396076&view=rev
Log:
Add first plugin config files allowing these CARs to be downloaded
  directly as plugins.

Added:
    geronimo/branches/1.1/configs/welcome-jetty/src/conf/
    geronimo/branches/1.1/configs/welcome-jetty/src/conf/geronimo-plugin.xml   (with props)
    geronimo/branches/1.1/configs/welcome-tomcat/src/conf/
    geronimo/branches/1.1/configs/welcome-tomcat/src/conf/geronimo-plugin.xml   (with props)
Modified:
    geronimo/branches/1.1/configs/welcome-jetty/maven.xml
    geronimo/branches/1.1/configs/welcome-tomcat/maven.xml

Modified: geronimo/branches/1.1/configs/welcome-jetty/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/welcome-jetty/maven.xml?rev=396076&r1=396075&r2=396076&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/welcome-jetty/maven.xml (original)
+++ geronimo/branches/1.1/configs/welcome-jetty/maven.xml Fri Apr 21 21:27:59 2006
@@ -18,9 +18,15 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project default="default">
+<project default="default" xmlns:velocity="jelly:velocity">
 
     <goal name="default">
         <attainGoal name="car:install"/>
     </goal>
+
+    <preGoal name="car:install">
+        <velocity:merge basedir="${basedir}/src/conf"
+          template="geronimo-plugin.xml"
+          name="${geronimo.packaging.targetRepository}/${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/${pom.artifactId}-${pom.currentVersion}.car/META-INF/geronimo-plugin.xml"/>
+    </preGoal>
 </project>

Added: geronimo/branches/1.1/configs/welcome-jetty/src/conf/geronimo-plugin.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/welcome-jetty/src/conf/geronimo-plugin.xml?rev=396076&view=auto
==============================================================================
--- geronimo/branches/1.1/configs/welcome-jetty/src/conf/geronimo-plugin.xml (added)
+++ geronimo/branches/1.1/configs/welcome-jetty/src/conf/geronimo-plugin.xml Fri Apr 21 21:27:59
2006
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<geronimo-plugin>
+<configuration>
+<name>Geronimo Welcome Web App (Jetty)</name>
+<config-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</config-id>
+<category>Examples</category>
+<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>
+<license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
+<geronimo-version>1.1-SNAPSHOT</geronimo-version>
+<prerequisite>
+<id>geronimo/jetty//car</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>
+<dependency>geronimo/j2ee-server//car</dependency>
+</configuration>
+<source-repository>http://www.geronimoplugins.com/repository/</source-repository>
+<backup-repository>http://www.ibiblio.org/maven2/</backup-repository>
+</geronimo-plugin>

Propchange: geronimo/branches/1.1/configs/welcome-jetty/src/conf/geronimo-plugin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/branches/1.1/configs/welcome-tomcat/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/welcome-tomcat/maven.xml?rev=396076&r1=396075&r2=396076&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/welcome-tomcat/maven.xml (original)
+++ geronimo/branches/1.1/configs/welcome-tomcat/maven.xml Fri Apr 21 21:27:59 2006
@@ -18,9 +18,15 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project default="default">
+<project default="default" xmlns:velocity="jelly:velocity">
 
     <goal name="default">
         <attainGoal name="car:install"/>
     </goal>
+
+    <preGoal name="car:install">
+        <velocity:merge basedir="${basedir}/src/conf"
+          template="geronimo-plugin.xml"
+          name="${geronimo.packaging.targetRepository}/${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/${pom.artifactId}-${pom.currentVersion}.car/META-INF/geronimo-plugin.xml"/>
+    </preGoal>
 </project>

Added: geronimo/branches/1.1/configs/welcome-tomcat/src/conf/geronimo-plugin.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/welcome-tomcat/src/conf/geronimo-plugin.xml?rev=396076&view=auto
==============================================================================
--- geronimo/branches/1.1/configs/welcome-tomcat/src/conf/geronimo-plugin.xml (added)
+++ geronimo/branches/1.1/configs/welcome-tomcat/src/conf/geronimo-plugin.xml Fri Apr 21 21:27:59
2006
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<geronimo-plugin>
+<configuration>
+<name>Geronimo Welcome Web App (Tomcat)</name>
+<config-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</config-id>
+<category>Examples</category>
+<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>
+<license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
+<geronimo-version>1.1-SNAPSHOT</geronimo-version>
+<prerequisite>
+<id>geronimo/jetty//car</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>
+<dependency>geronimo/j2ee-server//car</dependency>
+</configuration>
+<source-repository>http://www.geronimoplugins.com/repository/</source-repository>
+<backup-repository>http://www.ibiblio.org/maven2/</backup-repository>
+</geronimo-plugin>

Propchange: geronimo/branches/1.1/configs/welcome-tomcat/src/conf/geronimo-plugin.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message