geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
Subject svn commit: r264061 - in /geronimo/trunk: applications/welcome/ applications/welcome/src/ applications/welcome/src/plan/ applications/welcome/src/webapp/ applications/welcome/src/webapp/WEB-INF/ assemblies/j2ee-server/ assemblies/j2ee-server/src/var/co...
Date Mon, 29 Aug 2005 04:35:41 GMT
Author: jboynes
Date: Sun Aug 28 21:35:25 2005
New Revision: 264061

URL: http://svn.apache.org/viewcvs?rev=264061&view=rev
Log:
move welcome app from Tomcat to its own application
extend the packaging plugin to deploy j2ee applications

Added:
    geronimo/trunk/applications/welcome/   (with props)
    geronimo/trunk/applications/welcome/LICENSE.txt
      - copied unchanged from r263897, geronimo/trunk/LICENSE.txt
    geronimo/trunk/applications/welcome/NOTICE.txt
      - copied unchanged from r263897, geronimo/trunk/NOTICE.txt
    geronimo/trunk/applications/welcome/maven.xml   (with props)
    geronimo/trunk/applications/welcome/project.properties   (with props)
    geronimo/trunk/applications/welcome/project.xml   (with props)
    geronimo/trunk/applications/welcome/src/
    geronimo/trunk/applications/welcome/src/plan/
    geronimo/trunk/applications/welcome/src/plan/plan.xml   (with props)
    geronimo/trunk/applications/welcome/src/webapp/
    geronimo/trunk/applications/welcome/src/webapp/WEB-INF/
    geronimo/trunk/applications/welcome/src/webapp/WEB-INF/geronimo-web.xml   (with props)
    geronimo/trunk/applications/welcome/src/webapp/WEB-INF/web.xml   (with props)
    geronimo/trunk/applications/welcome/src/webapp/geronimo-logo.png
      - copied unchanged from r263969, geronimo/trunk/modules/tomcat/src/var/ROOT/geronimo-logo.png
    geronimo/trunk/applications/welcome/src/webapp/geronimo-power.gif
      - copied unchanged from r263969, geronimo/trunk/modules/tomcat/src/var/ROOT/geronimo-power.gif
    geronimo/trunk/applications/welcome/src/webapp/index.jsp
      - copied, changed from r263969, geronimo/trunk/modules/tomcat/src/var/ROOT/index.jsp
    geronimo/trunk/configs/j2ee-deployer/
      - copied from r263897, geronimo/trunk/configs/geronimo-gbean-deployer/
    geronimo/trunk/configs/j2ee-deployer/LICENSE.txt
      - copied unchanged from r263984, geronimo/trunk/configs/geronimo-gbean-deployer/LICENSE.txt
    geronimo/trunk/configs/j2ee-deployer/NOTICE.txt
      - copied unchanged from r263984, geronimo/trunk/configs/geronimo-gbean-deployer/NOTICE.txt
    geronimo/trunk/configs/j2ee-deployer/maven.xml
      - copied, changed from r263984, geronimo/trunk/configs/geronimo-gbean-deployer/maven.xml
    geronimo/trunk/configs/j2ee-deployer/project.properties
      - copied, changed from r263984, geronimo/trunk/configs/geronimo-gbean-deployer/project.properties
    geronimo/trunk/configs/j2ee-deployer/project.xml
      - copied, changed from r263984, geronimo/trunk/configs/geronimo-gbean-deployer/project.xml
    geronimo/trunk/configs/j2ee-deployer/src/
      - copied from r263984, geronimo/trunk/configs/geronimo-gbean-deployer/src/
    geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml   (with props)
Modified:
    geronimo/trunk/assemblies/j2ee-server/project.xml
    geronimo/trunk/assemblies/j2ee-server/src/var/config/config.list
    geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml
    geronimo/trunk/modules/assembly/maven.xml
    geronimo/trunk/modules/assembly/project.xml
    geronimo/trunk/modules/assembly/src/var/config/config.list
    geronimo/trunk/modules/tomcat/src/var/ROOT/WEB-INF/web.xml
    geronimo/trunk/modules/tomcat/src/var/ROOT/index.jsp
    geronimo/trunk/plugins/geronimo-packaging-plugin/plugin.properties

Propchange: geronimo/trunk/applications/welcome/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Aug 28 21:35:25 2005
@@ -0,0 +1,7 @@
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+target

Added: geronimo/trunk/applications/welcome/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/welcome/maven.xml?rev=264061&view=auto
==============================================================================
--- geronimo/trunk/applications/welcome/maven.xml (added)
+++ geronimo/trunk/applications/welcome/maven.xml Sun Aug 28 21:35:25 2005
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright 2005 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 160900 $ $Date: 2005-04-11 08:09:38 -0700 (Mon, 11 Apr 2005) $ -->
+
+<project
+    default="default"
+    >
+
+    <goal name="default">
+        <attainGoal name="war:install"/>
+    </goal>
+    <postGoal name="war:install">
+        <attainGoal name="car:install"/>
+    </postGoal>
+</project>
\ No newline at end of file

Propchange: geronimo/trunk/applications/welcome/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/welcome/maven.xml
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: geronimo/trunk/applications/welcome/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/welcome/project.properties?rev=264061&view=auto
==============================================================================
--- geronimo/trunk/applications/welcome/project.properties (added)
+++ geronimo/trunk/applications/welcome/project.properties Sun Aug 28 21:35:25 2005
@@ -0,0 +1,23 @@
+##
+##
+##   Copyright 2005 The Apache Software Foundation
+##
+##   Licensed under the Apache License, Version 2.0 (the "License");
+##   you may not use this file except in compliance with the License.
+##   You may obtain a copy of the License at
+##
+##       http://www.apache.org/licenses/LICENSE-2.0
+##
+##   Unless required by applicable law or agreed to in writing, software
+##   distributed under the License is distributed on an "AS IS" BASIS,
+##   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+##   See the License for the specific language governing permissions and
+##   limitations under the License.
+##
+
+##
+## $Rev: 151530 $ $Date: 2005-02-05 15:47:24 -0800 (Sat, 05 Feb 2005) $
+##
+
+maven.multiproject.type=war
+geronimo.packaging.moduleFile=${maven.build.dir}/${maven.final.name}.war

Propchange: geronimo/trunk/applications/welcome/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/welcome/project.properties
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: geronimo/trunk/applications/welcome/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/welcome/project.xml?rev=264061&view=auto
==============================================================================
--- geronimo/trunk/applications/welcome/project.xml (added)
+++ geronimo/trunk/applications/welcome/project.xml Sun Aug 28 21:35:25 2005
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright 2005 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 160900 $ $Date: 2005-04-11 08:09:38 -0700 (Mon, 11 Apr 2005) $ -->
+
+<project>
+    <pomVersion>3</pomVersion>
+    <extend>../../etc/project.xml</extend>
+
+    <name>Geronimo :: Welcome Application</name>
+    <id>geronimo-welcome</id>
+    <shortDescription>Geronimo Welcome Application</shortDescription>
+    <description>
+        This is a very simple application that is intended to serve as the default page
+        that can be viewed when the server is first installed so that someone can see
+        that the installation is working.
+    </description>
+
+    <dependencies>
+        <!-- todo these are here purely to force the deployer to be built - work out how to remove them --> 
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>j2ee-server</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+</project>

Propchange: geronimo/trunk/applications/welcome/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/welcome/project.xml
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: geronimo/trunk/applications/welcome/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/welcome/src/plan/plan.xml?rev=264061&view=auto
==============================================================================
--- geronimo/trunk/applications/welcome/src/plan/plan.xml (added)
+++ geronimo/trunk/applications/welcome/src/plan/plan.xml Sun Aug 28 21:35:25 2005
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2005 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 160900 $ $Date: 2005-04-11 08:09:38 -0700 (Mon, 11 Apr 2005) $ -->
+
+<web-app xmlns="http://geronimo.apache.org/xml/ns/web"
+         configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+         parentId="${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car"
+    >
+
+    <context-root>/</context-root>
+    <context-priority-classloader>false</context-priority-classloader>
+</web-app>

Propchange: geronimo/trunk/applications/welcome/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/welcome/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: geronimo/trunk/applications/welcome/src/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/welcome/src/webapp/WEB-INF/geronimo-web.xml?rev=264061&view=auto
==============================================================================
--- geronimo/trunk/applications/welcome/src/webapp/WEB-INF/geronimo-web.xml (added)
+++ geronimo/trunk/applications/welcome/src/webapp/WEB-INF/geronimo-web.xml Sun Aug 28 21:35:25 2005
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2005 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 160900 $ $Date: 2005-04-11 08:09:38 -0700 (Mon, 11 Apr 2005) $ -->
+
+<web-app xmlns="http://geronimo.apache.org/xml/ns/web"
+    configId="org/apache/geronimo/applications/Welcome"
+    parentId="org/apache/geronimo/Server"
+    >
+
+    <context-root>/</context-root>
+    <context-priority-classloader>false</context-priority-classloader>
+</web-app>

Propchange: geronimo/trunk/applications/welcome/src/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/welcome/src/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: geronimo/trunk/applications/welcome/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/welcome/src/webapp/WEB-INF/web.xml?rev=264061&view=auto
==============================================================================
--- geronimo/trunk/applications/welcome/src/webapp/WEB-INF/web.xml (added)
+++ geronimo/trunk/applications/welcome/src/webapp/WEB-INF/web.xml Sun Aug 28 21:35:25 2005
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.4"
+         xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+    <display-name>Welcome to Geronimo</display-name>
+    <description>
+        Welcome to Geronimo
+    </description>
+
+</web-app>

Propchange: geronimo/trunk/applications/welcome/src/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/welcome/src/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Copied: geronimo/trunk/applications/welcome/src/webapp/index.jsp (from r263969, geronimo/trunk/modules/tomcat/src/var/ROOT/index.jsp)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/welcome/src/webapp/index.jsp?p2=geronimo/trunk/applications/welcome/src/webapp/index.jsp&p1=geronimo/trunk/modules/tomcat/src/var/ROOT/index.jsp&r1=263969&r2=264061&rev=264061&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/var/ROOT/index.jsp (original)
+++ geronimo/trunk/applications/welcome/src/webapp/index.jsp Sun Aug 28 21:35:25 2005
@@ -1,3 +1,19 @@
+<%--
+    Copyright 2005 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+--%>
+<!-- $Rev$ $Date$ -->
 <!doctype html public "-//w3c//dtd html 4.0 transitional//en" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <%@ page session="false" %>
 <html>
@@ -47,7 +63,9 @@
                 <tr><td align="left" valign="top"><b><%= application.getServerInfo() %></b></td></tr>
             </table>
         </td>
+<%-- todo figure out if we're using Tomcat or Jetty and output the right thing
         <td align="right" width="130"><a href="http://jakarta.apache.org/tomcat/index.html"><img src="tomcat.gif" height="92" width="130" border="0" alt="The Mighty Tomcat - MEOW!"></td>
+--%>
     </tr>
 </table>
 
@@ -97,15 +115,9 @@
 
         <!-- Body -->
         <td align="left" valign="top">
-            <p><center><b>If you're seeing this page via a web browser, it means you've setup Tomcat under Geronimo successfully. Congratulations!</b></center></p>
-
-            <p>As you may have guessed by now, this is the default Tomcat home page for Geronimo. It can be found on the local filesystem at:
-            <blockquote>
-                <p class="code">$GERONIMO_HOME/var/catalina/ROOT/index.jsp</p>
-            </blockquote>
-            </p>
+            <p><center><b>If you're seeing this page via a web browser, it means you've setup Geronimo successfully. Congratulations!</b></center></p>
 
-            <p>where "$GERONIMO_HOME" is the root of the Geronimo installation directory. If you're seeing this page, and you don't think you should be, then either you're either a user who has arrived at new installation of Geronimo, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the <a href="http://geronimo.apache.org/documentation.html">Geronimo Documentation</a> for more detailed setup and administration information.</p>
+            <p>As you may have guessed by now, this is the default home page for Geronimo. If you're seeing this page, and you don't think you should be, then either you're either a user who has arrived at new installation of Geronimo, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the <a href="http://geronimo.apache.org/documentation.html">Geronimo Documentation</a> for more detailed setup and administration information.</p>
 
             <p>Geronimo mailing lists are available at the Geronimo project web site:</p>
 

Modified: geronimo/trunk/assemblies/j2ee-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-server/project.xml?rev=264061&r1=264060&r2=264061&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-server/project.xml Sun Aug 28 21:35:25 2005
@@ -1003,7 +1003,25 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>rmi-naming</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>j2ee-server</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-welcome</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>

Modified: geronimo/trunk/assemblies/j2ee-server/src/var/config/config.list
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-server/src/var/config/config.list?rev=264061&r1=264060&r2=264061&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-server/src/var/config/config.list (original)
+++ geronimo/trunk/assemblies/j2ee-server/src/var/config/config.list Sun Aug 28 21:35:25 2005
@@ -1,2 +1,4 @@
 geronimo/cars/j2ee-system-1.0-SNAPSHOT.car
+geronimo/cars/rmi-naming-1.0-SNAPSHOT.car
 geronimo/cars/j2ee-server-1.0-SNAPSHOT.car
+geronimo/cars/geronimo-welcome-1.0-SNAPSHOT.car

Modified: geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml?rev=264061&r1=264060&r2=264061&view=diff
==============================================================================
--- geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml Sun Aug 28 21:35:25 2005
@@ -17,10 +17,10 @@
 -->
 
 <configuration xmlns="http://geronimo.apache.org/xml/ns/deployment"
-    configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
-    domain="geronimo.maven"
-    server="geronimo"
-    >
+               configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+               domain="geronimo.maven"
+               server="geronimo"
+        >
 
     <dependency>
         <groupId>geronimo</groupId>
@@ -60,14 +60,25 @@
 
     <!-- Deployer used to process modules and plans -->
     <gbean gbeanName="geronimo.maven:name=Deployer,j2eeType=Deployer,J2EEModule=${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car" class="org.apache.geronimo.deployment.Deployer">
-        <reference name="Store"><gbean-name>geronimo.maven:name=MavenConfigStore</gbean-name></reference>
-        <reference name="Builders"><name>*</name></reference>
+        <reference name="Store">
+            <gbean-name>geronimo.maven:name=MavenConfigStore,j2eeType=ConfigurationStore</gbean-name>
+        </reference>
+        <reference name="Builders">
+            <gbean-name>geronimo.maven:j2eeType=ConfigBuilder,*</gbean-name>
+        </reference>
     </gbean>
 
     <!-- Builder for handling plans defining Geronimo configurations -->
     <gbean name="ServiceBuilder" class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
         <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
-        <reference name="Repository"><gbean-name>geronimo.maven:name=Repository</gbean-name></reference>
-        <reference name="XmlAttributeBuilders"><name>*</name></reference>
+        <reference name="Repository">
+            <gbean-name>geronimo.maven:name=Repository</gbean-name>
+        </reference>
+        <reference name="XmlAttributeBuilders">
+            <name>*</name>
+        </reference>
+        <reference name="XmlReferenceBuilders">
+            <name>*</name>
+        </reference>
     </gbean>
 </configuration>

Copied: geronimo/trunk/configs/j2ee-deployer/maven.xml (from r263984, geronimo/trunk/configs/geronimo-gbean-deployer/maven.xml)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-deployer/maven.xml?p2=geronimo/trunk/configs/j2ee-deployer/maven.xml&p1=geronimo/trunk/configs/geronimo-gbean-deployer/maven.xml&r1=263984&r2=264061&rev=264061&view=diff
==============================================================================
--- geronimo/trunk/configs/geronimo-gbean-deployer/maven.xml (original)
+++ geronimo/trunk/configs/j2ee-deployer/maven.xml Sun Aug 28 21:35:25 2005
@@ -18,24 +18,9 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project default="default"
-         xmlns:ant="jelly:ant"
-         xmlns:define="jelly:define"
-        xmlns:boot="geronimo:gbean-deployer-boot"
-        >
+<project default="default">
 
-    <goal name="default" prereqs="car:install"/>
-
-    <goal name="car:package" prereqs="car:prepare-plan">
-        <define:taglib uri="geronimo:gbean-deployer-boot">
-            <define:jellybean name="boot" className="org.apache.geronimo.deployment.PluginBootstrap" method="bootstrap"/>
-        </define:taglib>
-
-        <boot:boot
-                localRepo="${maven.repo.local}"
-                plan="${geronimo.packaging.buildFile}"
-                buildDir="${maven.build.dir}"
-                carFile="${maven.build.dir}/${maven.final.name}.car"
-                />
+    <goal name="default">
+        <attainGoal name="car:install"/>
     </goal>
 </project>

Copied: geronimo/trunk/configs/j2ee-deployer/project.properties (from r263984, geronimo/trunk/configs/geronimo-gbean-deployer/project.properties)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-deployer/project.properties?p2=geronimo/trunk/configs/j2ee-deployer/project.properties&p1=geronimo/trunk/configs/geronimo-gbean-deployer/project.properties&r1=263984&r2=264061&rev=264061&view=diff
==============================================================================
--- geronimo/trunk/configs/geronimo-gbean-deployer/project.properties (original)
+++ geronimo/trunk/configs/j2ee-deployer/project.properties Sun Aug 28 21:35:25 2005
@@ -21,6 +21,5 @@
 
 maven.multiproject.type=car
 
-# override deploymentConfig to use bootstrap configuration
-geronimo.packaging.deploymentConfig=geronimo/cars/geronimo-gbean-deployer-0.2.car
-geronimo.packaging.deployerName=*:name=Deployer,j2eeType=Deployer,*
+# just use basic GBean deployer
+geronimo.packaging.deploymentConfig=geronimo/cars/geronimo-gbean-deployer-${geronimo_version}.car

Copied: geronimo/trunk/configs/j2ee-deployer/project.xml (from r263984, geronimo/trunk/configs/geronimo-gbean-deployer/project.xml)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-deployer/project.xml?p2=geronimo/trunk/configs/j2ee-deployer/project.xml&p1=geronimo/trunk/configs/geronimo-gbean-deployer/project.xml&r1=263984&r2=264061&rev=264061&view=diff
==============================================================================
--- geronimo/trunk/configs/geronimo-gbean-deployer/project.xml (original)
+++ geronimo/trunk/configs/j2ee-deployer/project.xml Sun Aug 28 21:35:25 2005
@@ -21,54 +21,18 @@
 <project>
     <pomVersion>3</pomVersion>
     <extend>../../etc/project.xml</extend>
-    <id>geronimo-gbean-deployer</id>
-    <name>Geronimo Configuration for performing service deployments</name>
+    <id>j2ee-deployer</id>
+    <name>Configuration for performing J2EE deployments</name>
 
     <dependencies>
-        <!-- dependencies referenced in plan -->
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-system</artifactId>
-            <version>${geronimo_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-common</artifactId>
-            <version>${geronimo_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-deployment</artifactId>
-            <version>${geronimo_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-j2ee</artifactId>
-            <version>${geronimo_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-service-builder</artifactId>
-            <version>${geronimo_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
-            <version>${xmlbeans_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>${stax_api_version}</version>
-        </dependency>
-
-        <!-- for bootstrap -->
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-deploy-tool</artifactId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
+            <type>car</type>
         </dependency>
 
+        <!-- dependencies from plan -->
     </dependencies>
 </project>
 

Added: geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml?rev=264061&view=auto
==============================================================================
--- geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml (added)
+++ geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml Sun Aug 28 21:35:25 2005
@@ -0,0 +1,325 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2005 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment"
+               configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+               parentId="${pom.groupId}/cars/geronimo-gbean-deployer-${pom.currentVersion}.car"
+        >
+
+    <!-- common libraries used by all builders -->
+    <dependency>
+        <groupId>geronimo-spec</groupId>
+        <artifactId>geronimo-spec-j2ee</artifactId>
+        <version>${geronimo_spec_j2ee_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo-spec</groupId>
+        <artifactId>geronimo-spec-corba</artifactId>
+        <version>${geronimo_spec_corba_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-j2ee-schema</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-core</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-management</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-transaction</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+
+
+    <!-- todo builder implementations - can we move these to sub-plans? -->
+    <!-- EAR, application-clients and other J2EE artifacts -->
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-j2ee-builder</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-client-builder</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-naming-builder</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-naming</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-security-builder</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-security</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-axis-builder</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-axis</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-webservices</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+
+    <!-- WARs using Jetty -->
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-web-builder</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-jetty-builder</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-jetty</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+
+    <!-- EJBs using OpenEJB -->
+    <dependency>
+        <groupId>openejb</groupId>
+        <artifactId>openejb-builder</artifactId>
+        <version>${openejb_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>openejb</groupId>
+        <artifactId>openejb-pkgen-builder</artifactId>
+        <version>${openejb_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>openejb</groupId>
+        <artifactId>openejb-core</artifactId>
+        <version>${openejb_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>tranql</groupId>
+        <artifactId>tranql</artifactId>
+        <version>${tranql_version}</version>
+    </dependency>
+
+    <!-- RARs using Geronimo Connector implementation -->
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-connector-builder</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-connector</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+
+    <!-- JBI using ServiceMix -->
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-servicemix-builder</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+
+    <gbean name="EARBuilder" class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
+        <attribute name="defaultParentId">${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car</attribute>
+        <!--domain set to wildcard so datasources may be deployed independently on client. -->
+        <!--a better solution is to get the domain and server from the parent configuration -->
+        <attribute name="transactionContextManagerObjectName">*:name=TransactionContextManager,*</attribute>
+        <attribute name="connectionTrackerObjectName">*:name=ConnectionTracker,*</attribute>
+        <attribute name="transactionalTimerObjectName">geronimo.server:name=TransactionalThreadPooledTimer,*</attribute>
+        <attribute name="nonTransactionalTimerObjectName">geronimo.server:name=NonTransactionalThreadPooledTimer,*</attribute>
+        <reference name="Repository">
+            <gbean-name>*:name=Repository,*</gbean-name>
+        </reference>
+        <reference name="WebConfigBuilder">
+            <name>WebBuilder</name>
+        </reference>
+        <reference name="EJBConfigBuilder">
+            <name>EJBBuilder</name>
+        </reference>
+        <reference name="ConnectorConfigBuilder">
+            <name>ConnectorBuilder</name>
+        </reference>
+        <reference name="AppClientConfigBuilder">
+            <name>AppClientBuilder</name>
+        </reference>
+        <reference name="ResourceReferenceBuilder">
+            <name>ConnectorBuilder</name>
+        </reference>
+        <reference name="ServiceReferenceBuilder">
+            <name>WebServiceBuilder</name>
+        </reference>
+        <reference name="EJBReferenceBuilder">
+            <name>ServerEJBReferenceBuilder</name>
+        </reference>
+    </gbean>
+
+    <gbean name="WebBuilder" class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder">
+        <attribute name="defaultParentId">${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car</attribute>
+        <attribute name="defaultSessionTimeoutSeconds">1800</attribute>
+        <attribute name="defaultContextPriorityClassloader">false</attribute>
+        <attribute name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
+        <attribute name="jettyContainerObjectName">geronimo.server:name=WebContainer,*</attribute>
+        <reference name="DefaultServlets">
+            <module>${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car</module>
+            <name>*</name>
+        </reference>
+        <reference name="PojoWebServiceTemplate">
+            <!-- todo replace with module/name reference -->
+            <gbean-name>geronimo.maven:J2EEApplication=null,J2EEModule=${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car,J2EEServer=geronimo,j2eeType=ServletWebServiceTemplate,name=POJOTemplate</gbean-name>
+        </reference>
+        <reference name="WebServiceBuilder">
+            <name>WebServiceBuilder</name>
+        </reference>
+        <reference name="Repository">
+            <gbean-name>*:name=Repository,*</gbean-name>
+        </reference>
+    </gbean>
+
+    <gbean name="EJBBuilder" class="org.openejb.deployment.OpenEJBModuleBuilder">
+        <attribute name="defaultParentId">${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car</attribute>
+        <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car,J2EEServer=geronimo,j2eeType=GBean,name=WebContainer</attribute>
+        <reference name="WebServiceLinkTemplate">
+            <name>WebServiceEJBLinkTemplate</name>
+        </reference>
+        <reference name="WebServiceBuilder">
+            <name>WebServiceBuilder</name>
+        </reference>
+        <reference name="Repository">
+            <gbean-name>*:name=Repository,*</gbean-name>
+        </reference>
+    </gbean>
+
+    <gbean name="ConnectorBuilder" class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
+        <attribute name="defaultParentId">${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car</attribute>
+        <attribute name="defaultMaxSize">10</attribute>
+        <attribute name="defaultMinSize">0</attribute>
+        <attribute name="defaultBlockingTimeoutMilliseconds">5000</attribute>
+        <attribute name="defaultIdleTimeoutMinutes">15</attribute>
+        <attribute name="defaultXATransactionCaching">true</attribute>
+        <attribute name="defaultXAThreadCaching">false</attribute>
+        <reference name="Repository">
+            <gbean-name>*:name=Repository,*</gbean-name>
+        </reference>
+    </gbean>
+
+    <gbean name="AppClientBuilder" class="org.apache.geronimo.client.builder.AppClientModuleBuilder">
+        <attribute name="defaultClientParentId">org/apache/geronimo/Client</attribute>
+        <attribute name="defaultServerParentId">${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car</attribute>
+        <attribute name="transactionContextManagerObjectName">geronimo.client:name=TransactionContextManager,*</attribute>
+        <attribute name="connectionTrackerObjectName">geronimo.client:name=ConnectionTracker,*</attribute>
+        <reference name="EJBReferenceBuilder">
+            <name>ClientEJBReferenceBuilder</name>
+        </reference>
+        <reference name="ConnectorModuleBuilder">
+            <name>ConnectorBuilder</name>
+        </reference>
+        <reference name="ResourceReferenceBuilder">
+            <name>ConnectorBuilder</name>
+        </reference>
+        <reference name="ServiceReferenceBuilder">
+            <name>WebServiceBuilder</name>
+        </reference>
+        <reference name="Store">
+            <!-- todo replace with a store the Client Builder can write to -->
+            <gbean-name>geronimo.maven:name=MavenConfigStore,j2eeType=ConfigurationStore</gbean-name>
+        </reference>
+        <reference name="Repository">
+            <gbean-name>*:name=Repository,*</gbean-name>
+        </reference>
+    </gbean>
+
+    <gbean name="JBIBuilder" class="org.apache.geronimo.servicemix.deployment.ServiceMixConfigBuilder">
+        <attribute name="defaultParentId">${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car</attribute>
+        <attribute name="deploymentDependencies">
+            servicemix/jars/spring-${servicemix_spring_version}.jar,
+            servicemix/jars/servicemix-${servicemix_version}.jar
+        </attribute>
+        <reference name="Repository">
+            <gbean-name>*:name=Repository,*</gbean-name>
+        </reference>
+    </gbean>
+
+    <gbean name="CSSAttributeBuilder" class="org.openejb.corba.security.config.css.CSSConfigEditor"/>
+    <gbean name="TSSAttributeBuilder" class="org.openejb.corba.security.config.tss.TSSConfigEditor"/>
+    <gbean name="LoginConfigurationBuilder" class="org.apache.geronimo.security.deployment.LoginConfigBuilder"/>
+    <gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
+        <attribute name="policyConfigurationFactory">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
+        <attribute name="policyProvider">org.apache.geronimo.security.jacc.GeronimoPolicy</attribute>
+    </gbean>
+    <gbean name="ClientEJBReferenceBuilder" class="org.openejb.deployment.RemoteEJBReferenceBuilder"/>
+    <gbean name="ServerEJBReferenceBuilder" class="org.openejb.deployment.OpenEJBReferenceBuilder"/>
+    <gbean name="WebServiceBuilder" class="org.apache.geronimo.axis.builder.AxisBuilder"/>
+    <gbean name="WebServiceEJBLinkTemplate" class="org.openejb.server.axis.WSContainerGBean"/>
+
+    <gbean name="StaticContent" class="org.apache.geronimo.jetty.JettyServletHolder">
+        <attribute name="servletName">default</attribute>
+        <attribute name="servletClass">org.mortbay.jetty.servlet.Default</attribute>
+        <attribute name="loadOnStartup">0</attribute>
+        <attribute name="initParams">
+            acceptRanges=true
+            dirAllowed=true
+            putAllowed=false
+            delAllowed=false
+            redirectWelcome=false
+            minGzipLength=8192
+        </attribute>
+        <attribute name="servletMappings">/</attribute>
+    </gbean>
+
+    <gbean name="JSPServlet" class="org.apache.geronimo.jetty.JettyServletHolder">
+        <attribute name="servletName">jsp</attribute>
+        <attribute name="servletClass">org.apache.jasper.servlet.JspServlet</attribute>
+        <attribute name="loadOnStartup">0</attribute>
+        <attribute name="initParams">
+            logVerbosityLevel=DEBUG
+            fork=false
+            xpoweredBy=false
+        </attribute>
+        <attribute name="servletMappings">*.jsp,*.jspf,*.jspx,*.xsp</attribute>
+    </gbean>
+
+    <gbean name="POJOTemplate" class="org.apache.geronimo.jetty.JettyPOJOWebServiceHolder">
+        <attribute name="servletName">dummy</attribute>
+    </gbean>
+</configuration>

Propchange: geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Modified: geronimo/trunk/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?rev=264061&r1=264060&r2=264061&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Sun Aug 28 21:35:25 2005
@@ -550,6 +550,18 @@
                 <ant:arg value="${maven.repo.local}/geronimo/wars/geronimo-demo-${pom.currentVersion}.war"/>
             </ant:java>
 
+            <!-- build the Welcome site configuration -->
+            <ant:echo>Building welcome website configuration</ant:echo>
+            <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
+                <ant:jvmarg value="-ea"/>
+                <ant:arg value="--user"/>
+                <ant:arg value="system"/>
+                <ant:arg value="--password"/>
+                <ant:arg value="manager"/>
+                <ant:arg value="distribute"/>
+                <ant:arg value="${maven.repo.local}/geronimo/wars/geronimo-welcome-${pom.currentVersion}.war"/>
+            </ant:java>
+
             <!-- build the Debug Tool configuration "org/apache/geronimo/DebugConsole"-->
             <ant:echo>Building debug tool configuration</ant:echo>
             <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">

Modified: geronimo/trunk/modules/assembly/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.xml?rev=264061&r1=264060&r2=264061&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml (original)
+++ geronimo/trunk/modules/assembly/project.xml Sun Aug 28 21:35:25 2005
@@ -510,6 +510,16 @@
         </dependency>
 
         <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-welcome</artifactId>
+            <version>${pom.currentVersion}</version>
+            <type>war</type>
+            <properties>
+                <installer>true</installer>
+            </properties>
+        </dependency>
+
+        <dependency>
             <groupId>tranql</groupId>
             <artifactId>tranql-connector</artifactId>
             <version>${tranql_connector_version}</version>

Modified: geronimo/trunk/modules/assembly/src/var/config/config.list
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/var/config/config.list?rev=264061&r1=264060&r2=264061&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/var/config/config.list (original)
+++ geronimo/trunk/modules/assembly/src/var/config/config.list Sun Aug 28 21:35:25 2005
@@ -4,4 +4,5 @@
 org/apache/geronimo/SystemDatabase
 org/apache/geronimo/SystemJMS
 org/apache/geronimo/RuntimeDeployer
+org/apache/geronimo/applications/Welcome
 org/apache/geronimo/Console

Modified: geronimo/trunk/modules/tomcat/src/var/ROOT/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/var/ROOT/WEB-INF/web.xml?rev=264061&r1=264060&r2=264061&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/var/ROOT/WEB-INF/web.xml (original)
+++ geronimo/trunk/modules/tomcat/src/var/ROOT/WEB-INF/web.xml Sun Aug 28 21:35:25 2005
@@ -20,9 +20,6 @@
     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
     version="2.4">
 
-  <display-name>Welcome to Geronimo</display-name>
-  <description>
-     Welcome to Geronimo
-  </description>
+  <display-name>Tomcat Fallback Application</display-name>
 
 </web-app>

Modified: geronimo/trunk/modules/tomcat/src/var/ROOT/index.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/var/ROOT/index.jsp?rev=264061&r1=264060&r2=264061&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/var/ROOT/index.jsp (original)
+++ geronimo/trunk/modules/tomcat/src/var/ROOT/index.jsp Sun Aug 28 21:35:25 2005
@@ -1,132 +1 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<%@ page session="false" %>
-<html>
-    <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <title>Apache Geronimo</title>
-    <style type="text/css">
-      <!--
-        body {
-            color: #000000;
-            background-color: #FFFFFF;
-            font-family: Arial, "Times New Roman", Times;
-            font-size: 16px;
-        }
-
-        A:link {
-            color: blue
-        }
-
-        A:visited {
-            color: blue
-        }
-
-        td {
-            color: #000000;
-            font-family: Arial, "Times New Roman", Times;
-            font-size: 16px;
-        }
-
-        .code {
-            color: #000000;
-            font-family: "Courier New", Courier;
-            font-size: 16px;
-        }
-      -->
-    </style>
-</head>
-
-<body>
-
-<!-- Header -->
-<table width="100%">
-    <tr>
-        <td align="left"><a href="http://geronimo.apache.org/"><img src="geronimo-logo.png" border="0" alt="The Geronimo Project"></a></td>
-        <td align="right" valign="top">
-            <table>
-                <tr><td align="left" valign="top"><b><%= application.getServerInfo() %></b></td></tr>
-            </table>
-        </td>
-        <td align="right" width="130"><a href="http://jakarta.apache.org/tomcat/index.html"><img src="tomcat.gif" height="92" width="130" border="0" alt="The Mighty Tomcat - MEOW!"></td>
-    </tr>
-</table>
-
-<br>
-
-<table>
-    <tr>
-
-        <!-- Table of Contents -->
-        <td valign="top">
-            <table width="100%" border="1" cellspacing="0" cellpadding="3" bordercolor="#000000">
-                <tr>
-                    <td bgcolor="#D2A41C" bordercolor="#000000" align="left" nowrap>
-                        <font face="Verdana" size="+1"><i>Documentation</i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</font>
-                    </td>
-                </tr>
-                <tr>
-                    <td bgcolor="#FFDC75" bordercolor="#000000" nowrap>
-                        <a href="http://geronimo.apache.org/faq.html">FAQ</a><br>
-                        <a href="http://wiki.apache.org/geronimo">Wiki</a><br>
-                        <a href="http://geronimo.apache.org/documentation.html">Geronimo Documentation</a><br>
-                        &nbsp;
-                    </td>
-                </tr>
-            </table>
-            <br>
-            <table width="100%" border="1" cellspacing="0" cellpadding="3" bordercolor="#000000">
-                <tr>
-                    <td bgcolor="#D2A41C" bordercolor="#000000" align="left" nowrap>
-                        <font face="Verdana" size="+1"><i>Geronimo Online</i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</font>
-                    </td>
-                </tr>
-                <tr>
-                    <td bgcolor="#FFDC75" bordercolor="#000000" nowrap>
-                        <a href="http://geronimo.apache.org/">Home Page</a><br>
-                        <a href="http://nagoya.apache.org/jira/secure/BrowseProject.jspa?id=10220">Bug Database</a><br>
-                        <a href="http://mail-archives.apache.org/mod_mbox/geronimo-user/">Users Mailing List</a><br>
-                        <a href="http://mail-archives.apache.org/mod_mbox/geronimo-dev/">Developers Mailing List</a><br>
-                        <a href="irc://irc.freenode.net/#geronimo">IRC</a><br>
-                        &nbsp;
-                    </td>
-                </tr>
-            </table>
-        </td>
-
-        <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-        <!-- Body -->
-        <td align="left" valign="top">
-            <p><center><b>If you're seeing this page via a web browser, it means you've setup Tomcat under Geronimo successfully. Congratulations!</b></center></p>
-
-            <p>As you may have guessed by now, this is the default Tomcat home page for Geronimo. It can be found on the local filesystem at:
-            <blockquote>
-                <p class="code">$GERONIMO_HOME/var/catalina/ROOT/index.jsp</p>
-            </blockquote>
-            </p>
-
-            <p>where "$GERONIMO_HOME" is the root of the Geronimo installation directory. If you're seeing this page, and you don't think you should be, then either you're either a user who has arrived at new installation of Geronimo, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the <a href="http://geronimo.apache.org/documentation.html">Geronimo Documentation</a> for more detailed setup and administration information.</p>
-
-            <p>Geronimo mailing lists are available at the Geronimo project web site:</p>
-
-           <ul>
-               <li><b><a href="mailto:user-subscribe@geronimo.apache.org">user@geronimo.apache.org</a></b> for general questions related to configuring and using Geronimo</li>
-               <li><b><a href="mailto:dev-subscribe@geronimo.apache.org">dev@geronimo.apache.org</a></b> for developers working on Geronimo</li>
-           </ul>
-
-            <p>Thanks for using Geronimo!</p>
-
-            <p align="right"><font size=-1><img src="geronimo-power.gif"></font><br>
-            &nbsp;
-            <font size=-1>Copyright &copy; 1999-2005 Apache Software Foundation</font><br>
-            <font size=-1>All Rights Reserved</font> <br>
-            &nbsp;</p>
-            <p align="right">&nbsp;</p>
-
-        </td>
-
-    </tr>
-</table>
-
-</body>
-<ohtml>
+<% response.sendError(404, "No application present at the context root"); %>

Modified: geronimo/trunk/plugins/geronimo-packaging-plugin/plugin.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-packaging-plugin/plugin.properties?rev=264061&r1=264060&r2=264061&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-packaging-plugin/plugin.properties (original)
+++ geronimo/trunk/plugins/geronimo-packaging-plugin/plugin.properties Sun Aug 28 21:35:25 2005
@@ -25,8 +25,8 @@
 geronimo.packaging.buildFile=${geronimo.packaging.buildDir}/${geronimo.packaging.planFile}
 
 geronimo.packaging.repository=${maven.repo.local}
-geronimo.packaging.deploymentConfig=org/apache/geronimo/J2EEDeployer
-geronimo.packaging.deployerName=*:name=Deployer,j2eeType=Deployer,J2EEModule=${geronimo.packaging.deploymentConfig},*
+geronimo.packaging.deploymentConfig=${pom.groupId}/cars/j2ee-deployer-${pom.currentVersion}.car
+geronimo.packaging.deployerName=geronimo.maven:name=Deployer,j2eeType=Deployer,J2EEModule=${pom.groupId}/cars/geronimo-gbean-deployer-${pom.currentVersion}.car,*
 
 geronimo.packaging.user=system
 geronimo.packaging.password=manager



Mime
View raw message