Return-Path: 
 <scm-return-13577-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 62408 invoked from network); 18 Jul 2006 18:19:50 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 18 Jul 2006 18:19:50 -0000
Received: (qmail 66000 invoked by uid 500); 18 Jul 2006 18:19:49 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 65964 invoked by uid 500); 18 Jul 2006 18:19:49 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 65953 invoked by uid 99); 18 Jul 2006 18:19:49 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Jul 2006 11:19:49 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Jul 2006 11:19:48 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 55AF31A981C; Tue, 18 Jul 2006 11:19:28 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r423168 - in /geronimo/sandbox/svkmerge/m2migration:
 configs/
 configs/remote-deploy-jetty/ configs/remote-deploy-tomcat/
 m2-assemblies/geronimo-jetty-j2ee/
 m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/
Date: Tue, 18 Jul 2006 18:19:27 -0000
To: scm@geronimo.apache.org
From: jdillon@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060718181928.55AF31A981C@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: jdillon
Date: Tue Jul 18 11:19:26 2006
New Revision: 423168

URL: http://svn.apache.org/viewvc?rev=423168&view=rev
Log:
Applied GERONIMO-2201, enables remote deploy and activemq for jetty j2ee

Added:
    geronimo/sandbox/svkmerge/m2migration/configs/remote-deploy-jetty/pom.xml   (with props)
    geronimo/sandbox/svkmerge/m2migration/configs/remote-deploy-tomcat/pom.xml   (with props)
Modified:
    geronimo/sandbox/svkmerge/m2migration/configs/pom.xml
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml

Modified: geronimo/sandbox/svkmerge/m2migration/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/pom.xml?rev=423168&r1=423167&r2=423168&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/pom.xml Tue Jul 18 11:19:26 2006
@@ -102,8 +102,8 @@
     </build>
     
     <modules>
-        <!-- <module>activemq</module> -->
-        <!-- <module>activemq-broker</module> -->
+        <module>activemq</module>
+        <module>activemq-broker</module>
         <module>axis</module>
         <module>axis-deployer</module>
         <module>client</module>
@@ -134,8 +134,8 @@
         <module>online-deployer</module>
         <module>openejb</module>
         <module>openejb-deployer</module>
-        <!-- <module>remote-deploy-jetty</module> -->
-        <!-- <module>remote-deploy-tomcat</module> -->
+        <module>remote-deploy-jetty</module>
+        <module>remote-deploy-tomcat</module>
         <module>rmi-naming</module>
         <!-- <module>servlets-examples-jetty</module> -->
         <!-- <module>servlets-examples-tomcat</module> -->

Added: geronimo/sandbox/svkmerge/m2migration/configs/remote-deploy-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/remote-deploy-jetty/pom.xml?rev=423168&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/remote-deploy-jetty/pom.xml (added)
+++ geronimo/sandbox/svkmerge/m2migration/configs/remote-deploy-jetty/pom.xml Tue Jul 18 11:19:26 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</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>remote-deploy-jetty</artifactId>
+    <name>Geronimo Configs :: Remote Deploy Jetty</name>
+    <packaging>car</packaging>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.applications</groupId>
+            <artifactId>geronimo-remote-deploy</artifactId>
+            <version>${pom.version}</version>
+            <type>war</type>
+        </dependency>
+
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${clientDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-remote-deploy/${geronimoVersion}/geronimo-remote-deploy-${geronimoVersion}.war</moduleFile>
+                    <geronimoPlugin>true</geronimoPlugin>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>

Propchange: geronimo/sandbox/svkmerge/m2migration/configs/remote-deploy-jetty/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/m2migration/configs/remote-deploy-jetty/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/m2migration/configs/remote-deploy-jetty/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/svkmerge/m2migration/configs/remote-deploy-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/remote-deploy-tomcat/pom.xml?rev=423168&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/remote-deploy-tomcat/pom.xml (added)
+++ geronimo/sandbox/svkmerge/m2migration/configs/remote-deploy-tomcat/pom.xml Tue Jul 18 11:19:26 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</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>remote-deploy-tomcat</artifactId>
+    <name>Geronimo Configs :: Remote Deploy Tomcat</name>
+    <packaging>car</packaging>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.applications</groupId>
+            <artifactId>geronimo-remote-deploy</artifactId>
+            <version>${pom.version}</version>
+            <type>war</type>
+        </dependency>
+
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${clientDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-remote-deploy/${geronimoVersion}/geronimo-remote-deploy-${geronimoVersion}.war</moduleFile>
+                    <geronimoPlugin>true</geronimoPlugin>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>

Propchange: geronimo/sandbox/svkmerge/m2migration/configs/remote-deploy-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/m2migration/configs/remote-deploy-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/m2migration/configs/remote-deploy-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml?rev=423168&r1=423167&r2=423168&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml Tue Jul 18 11:19:26 2006
@@ -121,7 +121,6 @@
             <type>car</type>
         </dependency>
         
-        <!--
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>activemq-broker</artifactId>
@@ -135,7 +134,6 @@
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
-        -->
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -269,14 +267,12 @@
         </dependency>
         -->
         
-        <!--
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>remote-deploy-jetty</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
-        -->
         
         <!--
         <dependency>

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml?rev=423168&r1=423167&r2=423168&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml Tue Jul 18 11:19:26 2006
@@ -67,16 +67,14 @@
         </gbean>
     </module>
     
-    <!--
     <module name="org.apache.geronimo.configs/activemq-broker/${pom.version}/car">
         <gbean name="ActiveMQ.tcp.default">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanActiveMQPort}</attribute>
         </gbean>
     </module>
-    -->
     
-    <!--<module name="org.apache.geronimo.configs/activemq/${pom.version}/car"/>-->
+    <module name="org.apache.geronimo.configs/activemq/${pom.version}/car"/>
     
     <module name="org.apache.geronimo.configs/jetty/${pom.version}/car">
         <gbean name="JettyWebConnector">
@@ -139,7 +137,7 @@
     
     <!--<module name="org.apache.geronimo.configs/uddi-jetty/${pom.version}/car" load="false"/>-->
     
-    <!--<module name="org.apache.geronimo.configs/remote-deploy-jetty/${pom.version}/car" />-->
+    <module name="org.apache.geronimo.configs/remote-deploy-jetty/${pom.version}/car" />
     
     <!--<module name="org.apache.geronimo.configs/hot-deployer/${pom.version}/car" />-->