geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r413472 - in /geronimo/trunk: ./ configs/ configs/activemq-broker/ configs/activemq/ configs/console-jetty/ configs/console-tomcat/ configs/javamail/ configs/jsp-examples-jetty/ configs/jsp-examples-tomcat/ configs/ldap-demo-jetty/ configs/...
Date Sun, 11 Jun 2006 16:26:31 GMT
Author: djencks
Date: Sun Jun 11 09:26:28 2006
New Revision: 413472

URL: http://svn.apache.org/viewvc?rev=413472&view=rev
Log:
GERONIMO-2067 Make most of the remaining configs build in m2

Added:
    geronimo/trunk/configs/activemq-broker/pom.xml   (with props)
    geronimo/trunk/configs/activemq/pom.xml   (with props)
    geronimo/trunk/configs/console-jetty/pom.xml   (with props)
    geronimo/trunk/configs/console-tomcat/pom.xml   (with props)
    geronimo/trunk/configs/javamail/pom.xml   (with props)
    geronimo/trunk/configs/jsp-examples-jetty/pom.xml   (with props)
    geronimo/trunk/configs/jsp-examples-tomcat/pom.xml   (with props)
    geronimo/trunk/configs/ldap-demo-jetty/pom.xml   (with props)
    geronimo/trunk/configs/ldap-demo-tomcat/pom.xml   (with props)
    geronimo/trunk/configs/servlets-examples-jetty/pom.xml   (with props)
    geronimo/trunk/configs/servlets-examples-tomcat/pom.xml   (with props)
    geronimo/trunk/configs/welcome-jetty/pom.xml   (with props)
    geronimo/trunk/configs/welcome-tomcat/pom.xml   (with props)
Modified:
    geronimo/trunk/configs/pom.xml
    geronimo/trunk/configs/system-database/pom.xml
    geronimo/trunk/configs/tomcat-deployer/pom.xml
    geronimo/trunk/configs/tomcat/pom.xml
    geronimo/trunk/modules/axis/pom.xml
    geronimo/trunk/modules/pom.xml
    geronimo/trunk/modules/tomcat-builder/pom.xml
    geronimo/trunk/modules/tomcat/pom.xml
    geronimo/trunk/pom.xml

Added: geronimo/trunk/configs/activemq-broker/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/activemq-broker/pom.xml?rev=413472&view=auto
==============================================================================
--- geronimo/trunk/configs/activemq-broker/pom.xml (added)
+++ geronimo/trunk/configs/activemq-broker/pom.xml Sun Jun 11 09:26:28 2006
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+  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>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>activemq-broker</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>car</packaging>
+    <name>ActiveMQ Broker Configuration</name>
+
+    <build>
+        <plugins>
+            <!-- This plugin needed to support package type car -->
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <extensions>true</extensions>
+                <!-- uses default geronimo-gbean-deployer -->                  
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+        <!-- parent config -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>system-database</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>${activeMqVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>activemq</groupId>
+            <artifactId>activemq-gbean-g1_1</artifactId>
+            <version>${activeMqVersion}</version>
+        </dependency>
+       
+        <dependency>
+            <groupId>activemq</groupId>
+            <artifactId>activemq-gbean-management-g1_1</artifactId>
+            <version>${activeMqVersion}</version>
+        </dependency>
+        <!-- removed activeio -->
+    </dependencies>
+</project>

Propchange: geronimo/trunk/configs/activemq-broker/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/configs/activemq-broker/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/configs/activemq-broker/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/configs/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/activemq/pom.xml?rev=413472&view=auto
==============================================================================
--- geronimo/trunk/configs/activemq/pom.xml (added)
+++ geronimo/trunk/configs/activemq/pom.xml Sun Jun 11 09:26:28 2006
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+  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>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>activemq</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>car</packaging>
+    <name>Activemq Configuration</name>
+
+    <build>
+        <plugins>
+            <!-- This plugin needed to support package type car -->
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <deploymentConfig>${j2eeNowebServer}</deploymentConfig>  <!-- no web deployer -->
+                   <moduleFile>${settings.localRepository}/org/apache/geronimo/modules/ge-activemq-rar/${geronimoVersion}/ge-activemq-rar-${geronimoVersion}.rar</moduleFile> 
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+  
+    <properties>
+        <PlanServerHostname>localhost</PlanServerHostname>
+        <PlanActiveMQPort>61616</PlanActiveMQPort>
+    </properties>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+        <!-- parent config -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>activemq-broker</artifactId>
+            <type>car</type>
+        </dependency>
+        <!-- To enforce build order -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>system-database</artifactId>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>ge-activemq-rar</artifactId>
+            <type>rar</type>
+        </dependency>
+
+    </dependencies>
+</project>

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

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

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

Added: geronimo/trunk/configs/console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/console-jetty/pom.xml?rev=413472&view=auto
==============================================================================
--- geronimo/trunk/configs/console-jetty/pom.xml (added)
+++ geronimo/trunk/configs/console-jetty/pom.xml Sun Jun 11 09:26:28 2006
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+  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>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>webconsole-jetty</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>car</packaging>
+    <name>Web console deployed on jetty</name>
+
+    <build>
+        <plugins>
+            <!-- This plugin needed to support package type car -->
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <deploymentConfig>${j2eeJettyServer}</deploymentConfig>
+<moduleFile>${settings.localRepository}/org/apache/geronimo/applications/console/geronimo-console/${geronimoVersion}/geronimo-console-${geronimoVersion}.ear</moduleFile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+    <dependencies>
+        <!-- parent config --> 
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-server</artifactId>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>system-database</artifactId>
+            <type>car</type>
+        </dependency>
+        <!-- for login module manager -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-security</artifactId>
+            <type>car</type>
+        </dependency>
+        <!-- To enforce build order -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty-deployer</artifactId>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto</artifactId>
+            <version>${plutoVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>portlet-api</groupId>
+            <artifactId>portlet-api</artifactId>
+            <version>${portletApiVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.applications.console</groupId>
+            <artifactId>geronimo-console-core</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.applications.console</groupId>
+            <artifactId>geronimo-console</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>ear</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-converter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-connector-builder</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-config</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee-schema</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-jetty</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-management</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-naming-builder</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-security-builder</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-test-ddbean</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-upgrade</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-util</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>activemq</groupId>
+            <artifactId>activemq-gbean-g1_1</artifactId>
+            <version>${activeMqVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>activemq</groupId>
+            <artifactId>activemq-gbean-management-g1_1</artifactId>
+            <version>${activeMqVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jdom</groupId>
+            <artifactId>jdom</artifactId>
+            <version>${jdomVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+            <version>${xmlbeansVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>${staxApiVersion}</version>
+        </dependency>
+    </dependencies>
+</project>

Propchange: geronimo/trunk/configs/console-jetty/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/configs/console-jetty/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/configs/console-jetty/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/configs/console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/console-tomcat/pom.xml?rev=413472&view=auto
==============================================================================
--- geronimo/trunk/configs/console-tomcat/pom.xml (added)
+++ geronimo/trunk/configs/console-tomcat/pom.xml Sun Jun 11 09:26:28 2006
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+  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>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>webconsole-tomcat</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>car</packaging>
+    <name>Web console deployed on tomcat</name>
+
+    <build>
+        <plugins>
+            <!-- This plugin needed to support package type car -->
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <deploymentConfig>${j2eeTomcatServer}</deploymentConfig>
+<moduleFile>${settings.localRepository}/org/apache/geronimo/applications/console/geronimo-console/${geronimoVersion}/geronimo-console-${geronimoVersion}.ear</moduleFile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+    <dependencies>
+        <!-- parent configs --> 
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-server</artifactId>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>system-database</artifactId>
+            <type>car</type>
+        </dependency>
+        <!-- for login module manager -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-security</artifactId>
+            <type>car</type>
+        </dependency>
+        <!-- to enforce build order -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat-deployer</artifactId>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto</artifactId>
+            <version>${plutoVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>portlet-api</groupId>
+            <artifactId>portlet-api</artifactId>
+            <version>${portletApiVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.applications.console</groupId>
+            <artifactId>geronimo-console-core</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.applications.console</groupId>
+            <artifactId>geronimo-console</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>ear</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-converter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-connector-builder</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-config</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee-schema</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-tomcat</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-management</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-naming-builder</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-security-builder</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-test-ddbean</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-upgrade</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-util</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>activemq</groupId>
+            <artifactId>activemq-gbean-g1_1</artifactId>
+            <version>${activeMqVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>activemq</groupId>
+            <artifactId>activemq-gbean-management-g1_1</artifactId>
+            <version>${activeMqVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jdom</groupId>
+            <artifactId>jdom</artifactId>
+            <version>${jdomVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+            <version>${xmlbeansVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>${staxApiVersion}</version>
+        </dependency>
+    </dependencies>
+</project>

Propchange: geronimo/trunk/configs/console-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/configs/console-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/configs/console-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/configs/javamail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/javamail/pom.xml?rev=413472&view=auto
==============================================================================
--- geronimo/trunk/configs/javamail/pom.xml (added)
+++ geronimo/trunk/configs/javamail/pom.xml Sun Jun 11 09:26:28 2006
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+  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>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>javamail</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>car</packaging>
+    <name>Security Configuration for the J2EE server</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <!-- uses geronimo-gbean-deployer -->
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+        <!-- parent -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>rmi-naming</artifactId>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-javamail-transport</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-mail</artifactId>
+        </dependency>
+    </dependencies>
+</project>

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

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

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

Added: geronimo/trunk/configs/jsp-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/jsp-examples-jetty/pom.xml?rev=413472&view=auto
==============================================================================
--- geronimo/trunk/configs/jsp-examples-jetty/pom.xml (added)
+++ geronimo/trunk/configs/jsp-examples-jetty/pom.xml Sun Jun 11 09:26:28 2006
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+  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>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>jsp-examples-jetty</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>car</packaging>
+    <name>JSP Examples Jetty</name>
+
+    <build>
+        <plugins>
+            <!-- This plugin needed to support package type car -->
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <deploymentConfig>${j2eeJettyServer}</deploymentConfig>
+<moduleFile>${settings.localRepository}/geronimo-samples/geronimo-jsp-examples-tomcat/${tomcatVersion}/geronimo-jsp-examples-tomcat-${tomcatVersion}.war</moduleFile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+    <dependencies>
+        <!-- to enforce build order --> 
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty</artifactId>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo-samples</groupId>
+            <artifactId>geronimo-jsp-examples-tomcat</artifactId>
+            <version>${tomcatVersion}</version>
+            <type>war</type>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>${commonsCollectionsVersion}</version>
+        </dependency>
+    </dependencies>
+</project>

Propchange: geronimo/trunk/configs/jsp-examples-jetty/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/configs/jsp-examples-jetty/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/configs/jsp-examples-jetty/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/configs/jsp-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/jsp-examples-tomcat/pom.xml?rev=413472&view=auto
==============================================================================
--- geronimo/trunk/configs/jsp-examples-tomcat/pom.xml (added)
+++ geronimo/trunk/configs/jsp-examples-tomcat/pom.xml Sun Jun 11 09:26:28 2006
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+  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>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>jsp-examples-tomcat</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>car</packaging>
+    <name>JSP Examples Tomcat</name>
+
+    <build>
+        <plugins>
+            <!-- This plugin needed to support package type car -->
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <deploymentConfig>${j2eeTomcatServer}</deploymentConfig>
+<moduleFile>${settings.localRepository}/geronimo-samples/geronimo-jsp-examples-tomcat/${tomcatVersion}/geronimo-jsp-examples-tomcat-${tomcatVersion}.war</moduleFile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+        <!-- To enforce build order -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat-deployer</artifactId>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo-samples</groupId>
+            <artifactId>geronimo-jsp-examples-tomcat</artifactId>
+            <version>${tomcatVersion}</version>
+            <type>war</type>
+        </dependency>
+    </dependencies>
+</project>

Propchange: geronimo/trunk/configs/jsp-examples-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/configs/jsp-examples-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/configs/jsp-examples-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/configs/ldap-demo-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/ldap-demo-jetty/pom.xml?rev=413472&view=auto
==============================================================================
--- geronimo/trunk/configs/ldap-demo-jetty/pom.xml (added)
+++ geronimo/trunk/configs/ldap-demo-jetty/pom.xml Sun Jun 11 09:26:28 2006
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+  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>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>ldap-demo-jetty</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>car</packaging>
+    <name>LDAP Demo for Jetty</name>
+
+    <build>
+        <plugins>
+            <!-- This plugin needed to support package type car -->
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <deploymentConfig>${j2eeJettyServer}</deploymentConfig>
+<moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-ldap-demo/${geronimoVersion}/geronimo-ldap-demo-${geronimoVersion}.war</moduleFile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+        <!-- to enforce build order --> 
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty</artifactId>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.applications</groupId>
+            <artifactId>geronimo-ldap-demo</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>war</type>
+        </dependency>
+    </dependencies>
+</project>

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

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

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

Added: geronimo/trunk/configs/ldap-demo-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/ldap-demo-tomcat/pom.xml?rev=413472&view=auto
==============================================================================
--- geronimo/trunk/configs/ldap-demo-tomcat/pom.xml (added)
+++ geronimo/trunk/configs/ldap-demo-tomcat/pom.xml Sun Jun 11 09:26:28 2006
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+  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>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>ldap-demo-tomcat</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>car</packaging>
+    <name>LDAP Demo for Tomcat</name>
+
+    <build>
+        <plugins>
+            <!-- This plugin needed to support package type car -->
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <deploymentConfig>${j2eeTomcatServer}</deploymentConfig>
+<moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-ldap-demo/${geronimoVersion}/geronimo-ldap-demo-${geronimoVersion}.war</moduleFile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+        <dependency>
+            <!-- To enforce build order -->
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat-deployer</artifactId>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.applications</groupId>
+            <artifactId>geronimo-ldap-demo</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>war</type>
+        </dependency>
+    </dependencies>
+</project>

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

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

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

Modified: geronimo/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/pom.xml?rev=413472&r1=413471&r2=413472&view=diff
==============================================================================
--- geronimo/trunk/configs/pom.xml (original)
+++ geronimo/trunk/configs/pom.xml Sun Jun 11 09:26:28 2006
@@ -33,6 +33,7 @@
   <packaging>pom</packaging>
   <name>Geronimo Configs</name>
   <description>Geronimo Configs</description>
+
   <properties>
       <pom.currentVersion>${pom.version}</pom.currentVersion>
       <!-- add from etc/explicit_version.properties here to use filter-->
@@ -45,7 +46,10 @@
 
 <j2eeTomcatServer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/tomcat-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</j2eeTomcatServer>
 <j2eeJettyServer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/jetty-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</j2eeJettyServer>
+<!-- no web deployer -->
+<j2eeNowebServer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</j2eeNowebServer>
   </properties>
+
   <build>
     <pluginManagement>
       <plugins>
@@ -57,6 +61,7 @@
       </plugins>
     </pluginManagement>
   </build>
+
   <profiles>
     <profile>
       <id>default</id>
@@ -74,8 +79,8 @@
           <module>client-security</module>
           <module>client-system</module>
 <!--          <module>console-jetty</module>
-          <module>console-tomcat</module>
-          <module>daytrader-jetty</module>
+          <module>console-tomcat</module> -->
+<!--          <module>daytrader-jetty</module>
           <module>daytrader-tomcat</module> -->
           <module>directory</module>
           <module>geronimo-gbean-deployer</module>
@@ -85,13 +90,13 @@
           <module>j2ee-security</module>
           <module>j2ee-server</module>
           <module>j2ee-system</module>
-<!--          <module>javamail</module> -->
+          <module>javamail</module>
           <module>jetty</module>
           <module>jetty-deployer</module>
-<!--          <module>jsp-examples-jetty</module>
+          <module>jsp-examples-jetty</module>
           <module>jsp-examples-tomcat</module>
           <module>ldap-demo-jetty</module>
-          <module>ldap-demo-tomcat</module> -->
+          <module>ldap-demo-tomcat</module>
           <module>ldap-realm</module>
           <module>online-deployer</module>
           <module>openejb</module>
@@ -99,13 +104,13 @@
 <!--          <module>remote-deploy-jetty</module>
           <module>remote-deploy-tomcat</module> -->
           <module>rmi-naming</module>
-<!--          <module>servlets-examples-jetty</module>
-          <module>servlets-examples-tomcat</module> -->
+          <module>servlets-examples-jetty</module>
+          <module>servlets-examples-tomcat</module>
           <module>sharedlib</module>
           <module>shutdown</module>
           <module>system-database</module>
           <module>tomcat</module>
-          <module>tomcat-deployer</module>
+          <module>tomcat-deployer</module>          
 <!--          <module>uddi-jetty</module>
           <module>uddi-tomcat</module> -->
           <module>unavailable-client-deployer</module>
@@ -113,8 +118,8 @@
           <module>unavailable-webservices-deployer</module>
           <module>upgrade</module>
           <module>upgrade-cli</module>
-<!--          <module>welcome-jetty</module>
-          <module>welcome-tomcat</module> -->
+          <module>welcome-jetty</module>
+          <module>welcome-tomcat</module>
       </modules>
     </profile>
     <profile>

Added: geronimo/trunk/configs/servlets-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/servlets-examples-jetty/pom.xml?rev=413472&view=auto
==============================================================================
--- geronimo/trunk/configs/servlets-examples-jetty/pom.xml (added)
+++ geronimo/trunk/configs/servlets-examples-jetty/pom.xml Sun Jun 11 09:26:28 2006
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+  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>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>servlet-examples-jetty</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>car</packaging>
+    <name>Servlet Examples for Jetty</name>
+
+    <build>
+        <plugins>
+            <!-- This plugin needed to support package type car -->
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <deploymentConfig>${j2eeJettyServer}</deploymentConfig>
+<moduleFile>${settings.localRepository}/geronimo-samples/geronimo-servlet-examples-tomcat/${tomcatVersion}/geronimo-servlet-examples-tomcat-${tomcatVersion}.war</moduleFile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+        <!-- to enforce build order --> 
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty</artifactId>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo-samples</groupId>
+            <artifactId>geronimo-servlet-examples-tomcat</artifactId>
+            <version>${tomcatVersion}</version>
+            <type>war</type>
+        </dependency>
+    </dependencies>
+</project>

Propchange: geronimo/trunk/configs/servlets-examples-jetty/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/configs/servlets-examples-jetty/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/configs/servlets-examples-jetty/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/configs/servlets-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/servlets-examples-tomcat/pom.xml?rev=413472&view=auto
==============================================================================
--- geronimo/trunk/configs/servlets-examples-tomcat/pom.xml (added)
+++ geronimo/trunk/configs/servlets-examples-tomcat/pom.xml Sun Jun 11 09:26:28 2006
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+  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>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>servlet-examples-tomcat</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>car</packaging>
+    <name>Servlet Examples for Tomcat</name>
+
+    <build>
+        <plugins>
+            <!-- This plugin needed to support package type car -->
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <deploymentConfig>${j2eeTomcatServer}</deploymentConfig>
+<moduleFile>${settings.localRepository}/geronimo-samples/geronimo-servlet-examples-tomcat/${tomcatVersion}/geronimo-servlet-examples-tomcat-${tomcatVersion}.war</moduleFile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+        <!-- To enforce build order --> 
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat-deployer</artifactId>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo-samples</groupId>
+            <artifactId>geronimo-servlet-examples-tomcat</artifactId>
+            <version>${tomcatVersion}</version>
+            <type>war</type>
+        </dependency>
+    </dependencies>
+</project>

Propchange: geronimo/trunk/configs/servlets-examples-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/configs/servlets-examples-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/trunk/configs/servlets-examples-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/trunk/configs/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/system-database/pom.xml?rev=413472&r1=413471&r2=413472&view=diff
==============================================================================
--- geronimo/trunk/configs/system-database/pom.xml (original)
+++ geronimo/trunk/configs/system-database/pom.xml Sun Jun 11 09:26:28 2006
@@ -46,7 +46,7 @@
                 <artifactId>geronimo-packaging-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
-                    <deploymentConfig>${gbeanDeployer},${j2eeDeployer},${clientDeployer},${openejbDeployer},${axisDeployer}</deploymentConfig>
+                    <deploymentConfig>${j2eeNowebServer}</deploymentConfig>
                     <moduleFile>${settings.localRepository}/tranql/tranql-connector-derby-embed-xa/${tranqlVendorsVersion}/tranql-connector-derby-embed-xa-${tranqlVendorsVersion}.rar</moduleFile>
                 </configuration>
             </plugin>
@@ -62,8 +62,28 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
-            <version>${geronimoVersion}</version>
             <type>car</type>
+        </dependency>
+        <!-- make sure all the deployers are available -->
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis-deployer</artifactId>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client-deployer</artifactId>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <type>car</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

Modified: geronimo/trunk/configs/tomcat-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/tomcat-deployer/pom.xml?rev=413472&r1=413471&r2=413472&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat-deployer/pom.xml (original)
+++ geronimo/trunk/configs/tomcat-deployer/pom.xml Sun Jun 11 09:26:28 2006
@@ -52,14 +52,19 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
-            <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
+        <!-- import classes -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat</artifactId>
+            <type>car</type>
+            <scope>compile</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-tomcat-builder</artifactId>
-            <version>${geronimoVersion}</version>
         </dependency>
     </dependencies>
 </project>

Modified: geronimo/trunk/configs/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/tomcat/pom.xml?rev=413472&r1=413471&r2=413472&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat/pom.xml (original)
+++ geronimo/trunk/configs/tomcat/pom.xml Sun Jun 11 09:26:28 2006
@@ -58,16 +58,15 @@
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
-        <!-- this should go to g-parent -->
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-tomcat</artifactId>
-            <version>${geronimoVersion}</version>
         </dependency>
-        <!-- this should have come via g-tomcat -->
+        <!-- this should have come via g-tomcat
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-webservices</artifactId>
-        </dependency>
+        </dependency> -->
     </dependencies>
 </project>

Added: geronimo/trunk/configs/welcome-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/welcome-jetty/pom.xml?rev=413472&view=auto
==============================================================================
--- geronimo/trunk/configs/welcome-jetty/pom.xml (added)
+++ geronimo/trunk/configs/welcome-jetty/pom.xml Sun Jun 11 09:26:28 2006
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+  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>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>welcome-jetty</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>car</packaging>
+    <name>Welcome app Jetty</name>
+
+    <build>
+        <plugins>
+            <!-- This plugin needed to support package type car -->
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <deploymentConfig>${j2eeJettyServer}</deploymentConfig>
+<moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-welcome/${geronimoVersion}/geronimo-welcome-${geronimoVersion}.war</moduleFile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+        <!-- to enforce build order --> 
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty</artifactId>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.applications</groupId>
+            <artifactId>geronimo-welcome</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>war</type>
+        </dependency>
+    </dependencies>
+</project>

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

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

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

Added: geronimo/trunk/configs/welcome-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/welcome-tomcat/pom.xml?rev=413472&view=auto
==============================================================================
--- geronimo/trunk/configs/welcome-tomcat/pom.xml (added)
+++ geronimo/trunk/configs/welcome-tomcat/pom.xml Sun Jun 11 09:26:28 2006
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  
+  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>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>welcome-tomcat</artifactId>
+    <version>${geronimoVersion}</version>
+    <packaging>car</packaging>
+    <name>Welcome app Tomcat</name>
+
+    <build>
+        <plugins>
+            <!-- This plugin needed to support package type car -->
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-packaging-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <deploymentConfig>${j2eeTomcatServer}</deploymentConfig>
+<moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-welcome/${geronimoVersion}/geronimo-welcome-${geronimoVersion}.war</moduleFile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+
+    <dependencies>
+        <!-- to enforce build order -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat-deployer</artifactId>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.applications</groupId>
+            <artifactId>geronimo-welcome</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>war</type>
+        </dependency>
+    </dependencies>
+</project>

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

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

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

Modified: geronimo/trunk/modules/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/axis/pom.xml?rev=413472&r1=413471&r2=413472&view=diff
==============================================================================
--- geronimo/trunk/modules/axis/pom.xml (original)
+++ geronimo/trunk/modules/axis/pom.xml Sun Jun 11 09:26:28 2006
@@ -30,7 +30,13 @@
     <packaging>jar</packaging>
     <name>Geronimo :: Axis</name>
     <description>Geronimo Axis Integration</description>
-
+    <build>
+        <resources>
+            <resource>
+                <directory>src/resources2</directory>
+            </resource>
+        </resources>
+    </build>
     <!-- ============ -->
     <!-- Dependencies -->
     <!-- ============ -->

Modified: geronimo/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/pom.xml?rev=413472&r1=413471&r2=413472&view=diff
==============================================================================
--- geronimo/trunk/modules/pom.xml (original)
+++ geronimo/trunk/modules/pom.xml Sun Jun 11 09:26:28 2006
@@ -64,7 +64,7 @@
                 <module>j2ee-schema</module>
                 <module>jetty</module>
                 <module>jetty-builder</module>
-<!--                <module>javamail-transport</module>  -->
+                <module>javamail-transport</module>
                 <module>jmx-remoting</module>
                 <module>kernel</module>
                 <module>management</module>

Modified: geronimo/trunk/modules/tomcat-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/tomcat-builder/pom.xml?rev=413472&r1=413471&r2=413472&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat-builder/pom.xml (original)
+++ geronimo/trunk/modules/tomcat-builder/pom.xml Sun Jun 11 09:26:28 2006
@@ -151,29 +151,24 @@
             <artifactId>geronimo-naming-builder</artifactId>
         </dependency>
 
-        <!-- These require dependencies.dependency.version -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-tomcat</artifactId>
-            <version>${geronimoVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-service-builder</artifactId>
-            <version>${geronimoVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee-builder</artifactId>
-            <version>${geronimoVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security-builder</artifactId>
-            <version>${geronimoVersion}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/trunk/modules/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/tomcat/pom.xml?rev=413472&r1=413471&r2=413472&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/pom.xml (original)
+++ geronimo/trunk/modules/tomcat/pom.xml Sun Jun 11 09:26:28 2006
@@ -31,7 +31,6 @@
     <description>Geronimo Tomcat integration</description>
 
     <properties>
-        <wadiVersion>2.0M1</wadiVersion>
         <buildDir>${project.build.directory}</buildDir>
         <endorsedDir>${buildDir}/endorsed</endorsedDir>
         <localRepoDir>${settings.localRepository}</localRepoDir>
@@ -40,7 +39,7 @@
     <build>
         <resources>
             <resource>
-                <directory>src/resources</directory>
+                <directory>src/resources2</directory>
             </resource>
         </resources>
 
@@ -136,7 +135,7 @@
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security</artifactId>
         </dependency>
-
+        <!-- cglib, commons-logging, log4j, mx4j coming from kernel --> 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
@@ -150,33 +149,11 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-webservices</artifactId>
-            <!-- ws uses dependencies.dependency.version -->
-            <version>${geronimoVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security-builder</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib-nodep</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/pom.xml?rev=413472&r1=413471&r2=413472&view=diff
==============================================================================
--- geronimo/trunk/pom.xml (original)
+++ geronimo/trunk/pom.xml Sun Jun 11 09:26:28 2006
@@ -527,6 +527,13 @@
              -->
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>ge-activemq-rar</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>rar</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-activation</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
@@ -563,6 +570,12 @@
 
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-converter</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-core</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
@@ -605,6 +618,12 @@
 
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-javamail-transport</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-j2ee</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
@@ -713,6 +732,12 @@
 
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-tomcat-builder</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-transaction</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
@@ -1056,12 +1081,6 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>velocity.log</artifactId>
-                <type>car</type>
-                <version>${geronimoVersion}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
                 <artifactId>welcome-jetty</artifactId>
                 <type>car</type>
                 <version>${geronimoVersion}</version>
@@ -1178,6 +1197,11 @@
                         </execution>
                     </executions>
                 </plugin>
+
+                <plugin>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>2.0</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <extensions>
@@ -1231,9 +1255,9 @@
                 <checksumPolicy>ignore</checksumPolicy>
             </snapshots>
         </repository>
-
+        <!-- this is the default repository -->
         <repository>
-            <id>maven2-central</id>
+            <id>central</id>
             <name>Maven2 Central Repository</name>
             <url>http://repo1.maven.org/maven2</url>
             <layout>default</layout>
@@ -1278,9 +1302,10 @@
             <modules>
                 <module>modules</module>
                 <module>m2-plugins</module>
+                <module>applications</module>
                 <module>openejb/modules</module>
                 <module>configs</module>
-                <module>applications</module>
+
                 <!--
                 <module>assemblies</module>
                 -->



Mime
View raw message