Return-Path: 
 <scm-return-18264-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 27789 invoked from network); 1 Mar 2007 23:03:42 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 1 Mar 2007 23:03:42 -0000
Received: (qmail 63219 invoked by uid 500); 1 Mar 2007 23:03:50 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 63187 invoked by uid 500); 1 Mar 2007 23:03:50 -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 63176 invoked by uid 99); 1 Mar 2007 23:03:50 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Mar 2007 15:03:50 -0800
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Mar 2007 15:03:41 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 93C861A981A; Thu,  1 Mar 2007 15:03:20 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r513546 - in /geronimo/server/trunk:
 configs/jee-specs/pom.xml
 modules/geronimo-mail/pom.xml pom.xml
Date: Thu, 01 Mar 2007 23:03:20 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070301230320.93C861A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: djencks
Date: Thu Mar  1 15:03:19 2007
New Revision: 513546

URL: http://svn.apache.org/viewvc?view=rev&rev=513546
Log:
GERONIMO-2917 use the mail uber jar

Modified:
    geronimo/server/trunk/configs/jee-specs/pom.xml
    geronimo/server/trunk/modules/geronimo-mail/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/configs/jee-specs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jee-specs/pom.xml?view=diff&rev=513546&r1=513545&r2=513546
==============================================================================
--- geronimo/server/trunk/configs/jee-specs/pom.xml (original)
+++ geronimo/server/trunk/configs/jee-specs/pom.xml Thu Mar  1 15:03:19 2007
@@ -78,13 +78,10 @@
             <artifactId>geronimo-jacc_1.1_spec</artifactId>
         </dependency>
         
-        <!-- should this be here?? -->
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-javamail_1.4_spec</artifactId>
-        </dependency>
-
-        <!-- almost certainly either the spec or mail jar should leave -->
+        <!-- NOTA BENE: use the org.apache.geronimo.javamail/geronimo-javamail_1.4_mail uber jar
+        containing both the spec and the providers in order that users can actually use mail
+        without advanced degrees in geronimo classloading.  DO NOT add or replace this with
+        org.apache.geronimo.specs/geronimo-javamail_1.4_spec -->
         <dependency>
             <groupId>org.apache.geronimo.javamail</groupId>
             <artifactId>geronimo-javamail_1.4_mail</artifactId>

Modified: geronimo/server/trunk/modules/geronimo-mail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-mail/pom.xml?view=diff&rev=513546&r1=513545&r2=513546
==============================================================================
--- geronimo/server/trunk/modules/geronimo-mail/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-mail/pom.xml Thu Mar  1 15:03:19 2007
@@ -51,15 +51,11 @@
             <artifactId>geronimo-management</artifactId>
             <version>${version}</version>
         </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-javamail_1.4_spec</artifactId>
-        </dependency>
-        
+
+        <!-- for simplicity use the mail uber jar rather than its spec and provider components -->
         <dependency>
             <groupId>org.apache.geronimo.javamail</groupId>
-            <artifactId>geronimo-javamail_1.4_provider</artifactId>
+            <artifactId>geronimo-javamail_1.4_mail</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=513546&r1=513545&r2=513546
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Mar  1 15:03:19 2007
@@ -135,22 +135,14 @@
                 <version>1.0-SNAPSHOT</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-javamail_1.4_spec</artifactId>
-                <version>1.0-SNAPSHOT</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.javamail</groupId>
-                <artifactId>geronimo-javamail_1.4_provider</artifactId>
-                <version>1.0-SNAPSHOT</version>
-            </dependency>
-
+            <!-- NOTA BENE: use the org.apache.geronimo.javamail/geronimo-javamail_1.4_mail uber jar
+            containing both the spec and the providers in order that users can actually use mail
+            without advanced degrees in geronimo classloading.  DO NOT add or replace this with
+            org.apache.geronimo.specs/geronimo-javamail_1.4_spec -->
             <dependency>
                 <groupId>org.apache.geronimo.javamail</groupId>
                 <artifactId>geronimo-javamail_1.4_mail</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <version>1.1-SNAPSHOT</version>
             </dependency>
 
             <dependency>