You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2006/06/05 23:04:34 UTC

svn commit: r411916 - in /geronimo/trunk: ./ applications/ applications/demo/ applications/demo/src/webapp/WEB-INF/ applications/ldap-realm-demo/ applications/ldap-realm-demo/src/webapp/WEB-INF/ applications/remote-deploy/ applications/remote-deploy/sr...

Author: djencks
Date: Mon Jun  5 14:04:33 2006
New Revision: 411916

URL: http://svn.apache.org/viewvc?rev=411916&view=rev
Log:
GERONIMO-2071 apply small applications.patch, m2 builds apps that will stay where they are

Added:
    geronimo/trunk/applications/demo/pom.xml   (with props)
    geronimo/trunk/applications/ldap-realm-demo/pom.xml   (with props)
    geronimo/trunk/applications/pom.xml   (with props)
    geronimo/trunk/applications/remote-deploy/pom.xml   (with props)
    geronimo/trunk/applications/uddi-db/pom.xml   (with props)
    geronimo/trunk/applications/uddi-server/pom.xml   (with props)
    geronimo/trunk/applications/welcome/pom.xml   (with props)
Modified:
    geronimo/trunk/applications/demo/src/webapp/WEB-INF/web.xml
    geronimo/trunk/applications/ldap-realm-demo/src/webapp/WEB-INF/web.xml
    geronimo/trunk/applications/remote-deploy/src/webapp/WEB-INF/web.xml
    geronimo/trunk/applications/uddi-db/src/webapp/WEB-INF/web.xml
    geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/web.xml
    geronimo/trunk/applications/welcome/src/webapp/WEB-INF/web.xml
    geronimo/trunk/pom.xml

Added: geronimo/trunk/applications/demo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/demo/pom.xml?rev=411916&view=auto
==============================================================================
--- geronimo/trunk/applications/demo/pom.xml (added)
+++ geronimo/trunk/applications/demo/pom.xml Mon Jun  5 14:04:33 2006
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  
+    Copyright 2006 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$ -->
+
+<project>
+  <parent>
+    <groupId>org.apache.geronimo.applications</groupId>
+    <artifactId>applications-parent</artifactId>
+    <version>1.2-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <version>${geronimoVersion}</version>
+  <artifactId>demo</artifactId>
+  <packaging>war</packaging>
+  <name>Geronimo Demo Application</name>
+  <description>Geronimo Demo Application</description>
+
+
+  <!--
+  <build>
+     <plugins>
+       <plugin>
+         <groupId>org.codehaus.mojo</groupId>
+         <artifactId>jspc-maven-plugin</artifactId>
+         <executions>
+           <execution>
+               <id>jspc</id>
+              <goals>
+                  <goal>compile</goal>
+              </goals>
+             </execution>
+         </executions>
+       </plugin>
+     </plugins>
+   </build>
+   -->
+
+</project>

Propchange: geronimo/trunk/applications/demo/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/demo/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/applications/demo/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/trunk/applications/demo/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/demo/src/webapp/WEB-INF/web.xml?rev=411916&r1=411915&r2=411916&view=diff
==============================================================================
--- geronimo/trunk/applications/demo/src/webapp/WEB-INF/web.xml (original)
+++ geronimo/trunk/applications/demo/src/webapp/WEB-INF/web.xml Mon Jun  5 14:04:33 2006
@@ -26,6 +26,8 @@
         <welcome-file>index.html</welcome-file>
     </welcome-file-list>
 
+<!-- [INSERT FRAGMENT HERE] --> 
+
     <security-constraint>
       <web-resource-collection>
         <web-resource-name>Admin Role</web-resource-name>

Added: geronimo/trunk/applications/ldap-realm-demo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/ldap-realm-demo/pom.xml?rev=411916&view=auto
==============================================================================
--- geronimo/trunk/applications/ldap-realm-demo/pom.xml (added)
+++ geronimo/trunk/applications/ldap-realm-demo/pom.xml Mon Jun  5 14:04:33 2006
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  
+    Copyright 2006 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$ -->
+
+<project>
+  <parent>
+    <groupId>org.apache.geronimo.applications</groupId>
+    <artifactId>applications-parent</artifactId>
+    <version>1.2-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <version>${geronimoVersion}</version>
+  <artifactId>geronimo-ldap-demo</artifactId>
+  <packaging>war</packaging>
+  <name>Geronimo LDAP Demo Application</name>
+    <description>
+        This is a very simple application that is intended to demonstrate the ldap
+        security mechanism.
+    </description>
+
+    <!--
+    <build>
+      <plugins>
+        <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>jspc-maven-plugin</artifactId>
+        <executions>
+          <execution>
+              <id>jspc</id>
+              <goals>
+                  <goal>compile</goal>
+              </goals>
+            </execution>
+        </executions>
+      </plugin>
+      </plugins>
+    </build>
+   -->
+
+</project>

Propchange: geronimo/trunk/applications/ldap-realm-demo/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/ldap-realm-demo/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/applications/ldap-realm-demo/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/trunk/applications/ldap-realm-demo/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/ldap-realm-demo/src/webapp/WEB-INF/web.xml?rev=411916&r1=411915&r2=411916&view=diff
==============================================================================
--- geronimo/trunk/applications/ldap-realm-demo/src/webapp/WEB-INF/web.xml (original)
+++ geronimo/trunk/applications/ldap-realm-demo/src/webapp/WEB-INF/web.xml Mon Jun  5 14:04:33 2006
@@ -21,6 +21,8 @@
          xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
          version="2.4">
 
+  <!-- [INSERT FRAGMENT HERE] --> 
+
     <!-- Welcome File List -->
     <welcome-file-list>
         <welcome-file>index.html</welcome-file>

Added: geronimo/trunk/applications/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/pom.xml?rev=411916&view=auto
==============================================================================
--- geronimo/trunk/applications/pom.xml (added)
+++ geronimo/trunk/applications/pom.xml Mon Jun  5 14:04:33 2006
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  
+    Copyright 2006 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$ -->
+
+<project>
+  <parent>
+    <groupId>org.apache.geronimo</groupId>
+    <artifactId>geronimo-parent</artifactId>
+    <version>1.2-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.geronimo.applications</groupId>
+  <artifactId>applications-parent</artifactId>
+  <version>${geronimoVersion}</version>
+  <packaging>pom</packaging>
+  <name>Geronimo Applications</name>
+  <description>Geronimo Applications</description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <warSourceDirectory>${basedir}/src/webapp</warSourceDirectory>
+          <!-- classesArchiveName>classes.jar</classesArchiveName  -->
+          <!-- webXml>${basedir}/target/jspweb.xml</webXml  -->
+        </configuration>
+      </plugin>
+      <!--
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>jspc-maven-plugin</artifactId>
+        <configuration>
+          <warSourceDirectory>${basedir}/src/webapp</warSourceDirectory>
+          <inputWebXml>${basedir}/src/webapp/WEB-INF/web.xml</inputWebXml>
+        </configuration>
+      </plugin>
+      -->
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+        <groupId>tomcat</groupId>
+        <artifactId>jasper-runtime</artifactId>
+        <version>${jasperVersion}</version>
+        <scope>provided</scope>
+    </dependency>        
+  </dependencies>
+
+
+  <modules>
+    <module>demo</module>
+    <module>ldap-realm-demo</module>
+    <!-- module>magicGball</module  -->
+    <!-- module>remote-deploy</module  -->
+    <module>uddi-db</module>
+    <module>uddi-server</module>
+    <!-- module>console</module  -->
+    <module>welcome</module>
+  </modules>
+</project>

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

Propchange: geronimo/trunk/applications/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/applications/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/applications/remote-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/remote-deploy/pom.xml?rev=411916&view=auto
==============================================================================
--- geronimo/trunk/applications/remote-deploy/pom.xml (added)
+++ geronimo/trunk/applications/remote-deploy/pom.xml Mon Jun  5 14:04:33 2006
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  
+    Copyright 2006 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$ -->
+
+<project>
+  <parent>
+    <groupId>org.apache.geronimo.applications</groupId>
+    <artifactId>applications-parent</artifactId>
+    <version>1.2-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <version>${geronimoVersion}</version>
+  <artifactId>geronimo-remote-deploy</artifactId>
+  <packaging>war</packaging>
+  <name>Geronimo Remote Deploy Application</name>
+  <description>
+        This application is essentially a servlet that accepts file upload
+        requests from remote clients, which is necessary for remote
+        deployment operations to work properly.
+  </description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-servlet_2.4_spec</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.geronimo.applications</groupId>
+      <artifactId>geronimo-remote-deploy-lib</artifactId>
+      <version>${geronimoVersion}</version>
+    </dependency>
+  </dependencies>
+
+  <!--
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>jspc-maven-plugin</artifactId>
+        <executions>
+          <execution>
+              <id>jspc</id>
+              <goals>
+                  <goal>compile</goal>
+              </goals>
+            </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  -->
+
+</project>

Propchange: geronimo/trunk/applications/remote-deploy/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/remote-deploy/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/applications/remote-deploy/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/trunk/applications/remote-deploy/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/remote-deploy/src/webapp/WEB-INF/web.xml?rev=411916&r1=411915&r2=411916&view=diff
==============================================================================
--- geronimo/trunk/applications/remote-deploy/src/webapp/WEB-INF/web.xml (original)
+++ geronimo/trunk/applications/remote-deploy/src/webapp/WEB-INF/web.xml Mon Jun  5 14:04:33 2006
@@ -24,6 +24,8 @@
         <servlet-class>org.apache.geronimo.deployment.remote.BarfServlet</servlet-class>
     </servlet>
 
+    <!-- [INSERT FRAGMENT HERE] --> 
+
     <servlet-mapping>
         <servlet-name>404-error</servlet-name>
         <url-pattern>/</url-pattern>

Added: geronimo/trunk/applications/uddi-db/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/uddi-db/pom.xml?rev=411916&view=auto
==============================================================================
--- geronimo/trunk/applications/uddi-db/pom.xml (added)
+++ geronimo/trunk/applications/uddi-db/pom.xml Mon Jun  5 14:04:33 2006
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  
+    Copyright 2006 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$ -->
+
+<project>
+  <parent>
+    <groupId>org.apache.geronimo.applications</groupId>
+    <artifactId>applications-parent</artifactId>
+    <version>1.2-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>geronimo-uddi-db</artifactId>
+  <version>${geronimoVersion}</version>
+  <name>Geronimo UDDI Server Database</name>
+  <description>Geronimo UDDI Server Database</description>
+
+  <build>
+    
+
+    <resources>
+      <resource>
+        <!-- ${project.build.directory} doesn't work in the following line. -->
+        <directory>${basedir}/target/resources</directory>
+      </resource>
+    </resources>
+
+
+    <plugins>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>generate-resources</phase>
+            <configuration>
+              <tasks>
+                <property name="derby.system.home" value="${project.build.directory}/resources/META-INF/${pom.artifactId}/var/derby"/>
+                <property name="derby.storage.fileSyncTransactionLog" value="true"/>
+                <delete dir="${derby.system.home}"/>
+                <mkdir dir="${derby.system.home}"/>
+                <sql driver="org.apache.derby.jdbc.EmbeddedDriver"
+                  url="jdbc:derby:${derby.system.home}/UddiDatabase;create=true"
+                  userid="" password="" autocommit="true" onerror="abort" delimiter=";">
+                  <fileset dir="src/sql"/>
+                  <classpath>
+                    <fileset dir="${settings.localRepository}/org/apache/derby/derby/${derbyVersion}">
+                      <include name="**/derby-${derbyVersion}.jar" />
+                    </fileset>
+                  </classpath>
+                </sql>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <!--
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>jspc-maven-plugin</artifactId>
+        <executions>
+          <execution>
+              <id>jspc</id>
+              <goals>
+                  <goal>compile</goal>
+              </goals>
+            </execution>
+        </executions>
+      </plugin>
+      -->
+    </plugins>
+  </build>
+
+  </project>

Propchange: geronimo/trunk/applications/uddi-db/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/uddi-db/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/applications/uddi-db/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/trunk/applications/uddi-db/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/uddi-db/src/webapp/WEB-INF/web.xml?rev=411916&r1=411915&r2=411916&view=diff
==============================================================================
--- geronimo/trunk/applications/uddi-db/src/webapp/WEB-INF/web.xml (original)
+++ geronimo/trunk/applications/uddi-db/src/webapp/WEB-INF/web.xml Mon Jun  5 14:04:33 2006
@@ -54,6 +54,8 @@
         <servlet-class>org.apache.juddi.registry.PublishService</servlet-class>
     </servlet>
 
+    <!-- [INSERT FRAGMENT HERE] --> 
+
     <servlet-mapping>
         <servlet-name>jUDDIAdminService</servlet-name>
         <url-pattern>/admin</url-pattern>

Added: geronimo/trunk/applications/uddi-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/uddi-server/pom.xml?rev=411916&view=auto
==============================================================================
--- geronimo/trunk/applications/uddi-server/pom.xml (added)
+++ geronimo/trunk/applications/uddi-server/pom.xml Mon Jun  5 14:04:33 2006
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  
+    Copyright 2006 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$ -->
+
+<project>
+  <parent>
+    <groupId>org.apache.geronimo.applications</groupId>
+    <artifactId>applications-parent</artifactId>
+    <version>1.2-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <version>${geronimoVersion}</version>
+  <artifactId>geronimo-uddi-server</artifactId>
+  <packaging>war</packaging>
+  <name>Geronimo UDDI Server</name>
+  <description>Geronimo UDDI Server</description>
+
+  <!--
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>jspc-maven-plugin</artifactId>
+        <executions>
+          <execution>
+              <id>jspc</id>
+              <goals>
+                  <goal>compile</goal>
+              </goals>
+            </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  -->
+
+</project>

Propchange: geronimo/trunk/applications/uddi-server/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/uddi-server/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/applications/uddi-server/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/web.xml?rev=411916&r1=411915&r2=411916&view=diff
==============================================================================
--- geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/web.xml (original)
+++ geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/web.xml Mon Jun  5 14:04:33 2006
@@ -59,6 +59,8 @@
         <servlet-class>org.apache.juddi.registry.PublishService</servlet-class>
     </servlet>
 
+    <!-- [INSERT FRAGMENT HERE] --> 
+
     <servlet-mapping>
         <servlet-name>jUDDIAdminService</servlet-name>
         <url-pattern>/admin</url-pattern>

Added: geronimo/trunk/applications/welcome/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/welcome/pom.xml?rev=411916&view=auto
==============================================================================
--- geronimo/trunk/applications/welcome/pom.xml (added)
+++ geronimo/trunk/applications/welcome/pom.xml Mon Jun  5 14:04:33 2006
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  
+    Copyright 2006 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$ -->
+
+<project>
+  <parent>
+    <groupId>org.apache.geronimo.applications</groupId>
+    <artifactId>applications-parent</artifactId>
+    <version>1.2-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <version>${geronimoVersion}</version>
+  <artifactId>geronimo-welcome</artifactId>
+  <packaging>war</packaging>
+  <name>Geronimo Welcome Application</name>
+  <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>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-system</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <!--
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>jspc-maven-plugin</artifactId>
+        <executions>
+          <execution>
+              <id>jspc</id>
+              <goals>
+                  <goal>compile</goal>
+              </goals>
+            </execution>
+        </executions>
+      </plugin>
+      -->
+    </plugins>
+  </build>
+
+</project>

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

Propchange: geronimo/trunk/applications/welcome/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/applications/welcome/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/trunk/applications/welcome/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/welcome/src/webapp/WEB-INF/web.xml?rev=411916&r1=411915&r2=411916&view=diff
==============================================================================
--- geronimo/trunk/applications/welcome/src/webapp/WEB-INF/web.xml (original)
+++ geronimo/trunk/applications/welcome/src/webapp/WEB-INF/web.xml Mon Jun  5 14:04:33 2006
@@ -37,6 +37,8 @@
         </init-param>
     </servlet>
 
+    <!-- [INSERT FRAGMENT HERE] --> 
+
     <servlet-mapping>
         <servlet-name>jsp_sample_installer</servlet-name>
         <url-pattern>/jsp-examples/*</url-pattern>

Modified: geronimo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/pom.xml?rev=411916&r1=411915&r2=411916&view=diff
==============================================================================
--- geronimo/trunk/pom.xml (original)
+++ geronimo/trunk/pom.xml Mon Jun  5 14:04:33 2006
@@ -946,8 +946,8 @@
                 <module>m2-plugins</module>
                 <module>openejb/modules</module>
                 <module>configs</module>
-                <!--
                 <module>applications</module>
+                <!--
                 <module>assemblies</module>
                 -->
             </modules>