Return-Path: 
 <scm-return-14005-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 96783 invoked from network); 9 Aug 2006 00:05:06 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 9 Aug 2006 00:05:06 -0000
Received: (qmail 50117 invoked by uid 500); 9 Aug 2006 00:05:05 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 50091 invoked by uid 500); 9 Aug 2006 00:05:05 -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 50073 invoked by uid 99); 9 Aug 2006 00:05:05 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Aug 2006 17:05:05 -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, 08 Aug 2006 17:05:04 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 9C6F81A981A; Tue,  8 Aug 2006 17:04:44 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r429894 - in /geronimo/trunk: configs/hot-deployer/
 m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/deploy/
 m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/
 m2-assemblies/geronimo-jetty-minimal/src/main/var/config/ m2-as...
Date: Wed, 09 Aug 2006 00:04:43 -0000
To: scm@geronimo.apache.org
From: jdillon@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060809000444.9C6F81A981A@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 Aug  8 17:04:42 2006
New Revision: 429894

URL: http://svn.apache.org/viewvc?rev=429894&view=rev
Log:
(GERONIMO-2302) Added jsr88 deps to hot-deployer, added deploy/ dir, enabled hot-deployer config in all assemblies

Added:
    geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/deploy/
    geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/deploy/README.txt   (with props)
Modified:
    geronimo/trunk/configs/hot-deployer/pom.xml
    geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
    geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml
    geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
    geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml

Modified: geronimo/trunk/configs/hot-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/hot-deployer/pom.xml?rev=429894&r1=429893&r2=429894&view=diff
==============================================================================
--- geronimo/trunk/configs/hot-deployer/pom.xml (original)
+++ geronimo/trunk/configs/hot-deployer/pom.xml Tue Aug  8 17:04:42 2006
@@ -56,6 +56,12 @@
             <version>${pom.version}</version>
         </dependency>
         
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
     </dependencies>
     
 </project>

Added: geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/deploy/README.txt
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/deploy/README.txt?rev=429894&view=auto
==============================================================================
--- geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/deploy/README.txt (added)
+++ geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/deploy/README.txt Tue Aug  8 17:04:42 2006
@@ -0,0 +1,4 @@
+This file is also included in the distribution to prevent problems with users
+who download the zip or tar.gz distribution and extract it with WinZip.
+Some versions of WinZIP decide it is not necessary to create the directory 
+because it is empty.
\ No newline at end of file

Propchange: geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/deploy/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/deploy/README.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/trunk/m2-assemblies/geronimo-boilerplate-minimal/src/main/resources/deploy/README.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml?rev=429894&r1=429893&r2=429894&view=diff
==============================================================================
--- geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml (original)
+++ geronimo/trunk/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml Tue Aug  8 17:04:42 2006
@@ -93,7 +93,6 @@
     </module>
     
     <!--
-    
     NOTE: n.b. be sure the gbean deployer is explicitly loaded before j2ee-deployer 
           so that defaultEnvironment overrides work properly
     -->
@@ -139,8 +138,6 @@
     
     <module name="org.apache.geronimo.configs/remote-deploy-jetty/${pom.version}/car"/>
     
-    <!--
     <module name="org.apache.geronimo.configs/hot-deployer/${pom.version}/car"/>
-    -->
     
 </attributes>

Modified: geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml?rev=429894&r1=429893&r2=429894&view=diff
==============================================================================
--- geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml (original)
+++ geronimo/trunk/m2-assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml Tue Aug  8 17:04:42 2006
@@ -78,8 +78,6 @@
 
     <module name="org.apache.geronimo.configs/remote-deploy-jetty/${pom.version}/car"/>
     
-    <!--
     <module name="org.apache.geronimo.configs/hot-deployer/${pom.version}/car"/>
-    -->
     
 </attributes>

Modified: geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml?rev=429894&r1=429893&r2=429894&view=diff
==============================================================================
--- geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml (original)
+++ geronimo/trunk/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml Tue Aug  8 17:04:42 2006
@@ -102,7 +102,6 @@
     </module>
     
     <!--
-    
     NOTE: n.b. be sure the gbean deployer is explicitly loaded before j2ee-deployer 
           so that defaultEnvironment overrides work properly
     -->
@@ -148,8 +147,6 @@
     
     <module name="org.apache.geronimo.configs/remote-deploy-tomcat/${pom.version}/car" />
     
-    <!--
     <module name="org.apache.geronimo.configs/hot-deployer/${pom.version}/car"/>
-    -->
     
 </attributes>

Modified: geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml?rev=429894&r1=429893&r2=429894&view=diff
==============================================================================
--- geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml (original)
+++ geronimo/trunk/m2-assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml Tue Aug  8 17:04:42 2006
@@ -80,8 +80,6 @@
 
     <module name="org.apache.geronimo.configs/remote-deploy-tomcat/${pom.version}/car"/>
     
-    <!--
     <module name="org.apache.geronimo.configs/hot-deployer/${pom.version}/car"/>
-    -->
     
 </attributes>