Return-Path: 
 <commits-return-927-apmail-shale-commits-archive=shale.apache.org@shale.apache.org>
Delivered-To: apmail-shale-commits-archive@locus.apache.org
Received: (qmail 77162 invoked from network); 11 Jan 2007 20:44:55 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 11 Jan 2007 20:44:55 -0000
Received: (qmail 56423 invoked by uid 500); 11 Jan 2007 20:45:02 -0000
Delivered-To: apmail-shale-commits-archive@shale.apache.org
Received: (qmail 56398 invoked by uid 500); 11 Jan 2007 20:45:02 -0000
Mailing-List: contact commits-help@shale.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@shale.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@shale.apache.org>
List-Post: <mailto:commits@shale.apache.org>
List-Id: <commits.shale.apache.org>
Reply-To: dev@shale.apache.org
Delivered-To: mailing list commits@shale.apache.org
Received: (qmail 56375 invoked by uid 99); 11 Jan 2007 20:45:02 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Jan 2007 12:45:02 -0800
X-ASF-Spam-Status: No, hits=-9.4 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, 11 Jan 2007 12:44:54 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 1446B1A981A; Thu, 11 Jan 2007 12:43:54 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r495368 - in /shale/framework/branches/SHALE_1_0_X:
 pom.xml
 shale-apps/mailreader-jpa/pom.xml shale-apps/pom.xml shale-test/pom.xml
Date: Thu, 11 Jan 2007 20:43:53 -0000
To: commits@shale.apache.org
From: rahul@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070111204354.1446B1A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rahul
Date: Thu Jan 11 12:43:53 2007
New Revision: 495368

URL: http://svn.apache.org/viewvc?view=rev&rev=495368
Log:
Backport r493540, r493901, (part of) r493913, r493917 and r493921 so the 1.0.x line is upto date with any interim changes made to trunk during the v1.0.4 release. POM changes from r493642 and (remainder of) r493913 are not included here since the JSF impl dependencies are needed for SHALE-262 which is not part of the 1.0.x line.
SHALE-380

Modified:
    shale/framework/branches/SHALE_1_0_X/pom.xml
    shale/framework/branches/SHALE_1_0_X/shale-apps/mailreader-jpa/pom.xml
    shale/framework/branches/SHALE_1_0_X/shale-apps/pom.xml
    shale/framework/branches/SHALE_1_0_X/shale-test/pom.xml

Modified: shale/framework/branches/SHALE_1_0_X/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/branches/SHALE_1_0_X/pom.xml?view=diff&rev=495368&r1=495367&r2=495368
==============================================================================
--- shale/framework/branches/SHALE_1_0_X/pom.xml (original)
+++ shale/framework/branches/SHALE_1_0_X/pom.xml Thu Jan 11 12:43:53 2007
@@ -56,6 +56,15 @@
             <url>http://people.apache.org/repo/m2-snapshot-repository</url>
             <releases><enabled>false</enabled></releases>
         </repository>
+        <repository>
+            <id>java.net</id>
+<!--
+            <url>https://maven-repository.dev.java.net/nonav/repository</url>
+-->
+            <!-- Mirror of standard repository that uses http not https -->
+            <url>http://maven1.glassfishwiki.org</url>
+            <layout>legacy</layout>
+        </repository>
     </repositories>
 
     <!-- http://jira.codehaus.org/browse/MNG-2136 -->

Modified: shale/framework/branches/SHALE_1_0_X/shale-apps/mailreader-jpa/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/branches/SHALE_1_0_X/shale-apps/mailreader-jpa/pom.xml?view=diff&rev=495368&r1=495367&r2=495368
==============================================================================
--- shale/framework/branches/SHALE_1_0_X/shale-apps/mailreader-jpa/pom.xml (original)
+++ shale/framework/branches/SHALE_1_0_X/shale-apps/mailreader-jpa/pom.xml Thu Jan 11 12:43:53 2007
@@ -35,6 +35,12 @@
   <packaging>jar</packaging>
   <name>MailReader JPA Entity Classes</name>
 
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/shale/framework/trunk/shale-apps/mailreader-jpa</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shale/framework/trunk/shale-apps/mailreader-jpa</developerConnection>
+    <url>http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/mailreader-jpa</url>
+  </scm>
+
   <dependencies>
 
     <dependency>

Modified: shale/framework/branches/SHALE_1_0_X/shale-apps/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/branches/SHALE_1_0_X/shale-apps/pom.xml?view=diff&rev=495368&r1=495367&r2=495368
==============================================================================
--- shale/framework/branches/SHALE_1_0_X/shale-apps/pom.xml (original)
+++ shale/framework/branches/SHALE_1_0_X/shale-apps/pom.xml Thu Jan 11 12:43:53 2007
@@ -228,16 +228,10 @@
                 <dependency>
                     <groupId>javax.el</groupId>
                     <artifactId>el-api</artifactId>
-                    <version>1</version>
+                    <version>1.0</version>
                     <scope>provided</scope> <!-- JSP 2.1 requires it -->
                 </dependency>
                 <dependency>
-                    <groupId>javax.el</groupId>
-                    <artifactId>el-ri</artifactId>
-                    <version>1</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <dependency>
                     <groupId>javax.faces</groupId>
                     <artifactId>jsf-api</artifactId>
                     <version>1.2_03</version>
@@ -276,7 +270,7 @@
                 <dependency>
                     <groupId>javax.el</groupId>
                     <artifactId>el-api</artifactId>
-                    <version>1</version>
+                    <version>1.0</version>
                     <scope>provided</scope>
                 </dependency>
                 <dependency>

Modified: shale/framework/branches/SHALE_1_0_X/shale-test/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/branches/SHALE_1_0_X/shale-test/pom.xml?view=diff&rev=495368&r1=495367&r2=495368
==============================================================================
--- shale/framework/branches/SHALE_1_0_X/shale-test/pom.xml (original)
+++ shale/framework/branches/SHALE_1_0_X/shale-test/pom.xml Thu Jan 11 12:43:53 2007
@@ -136,7 +136,7 @@
                 <dependency>
                     <groupId>javax.faces</groupId>
                     <artifactId>jsf-api</artifactId>
-                    <version>1.2_02</version>
+                    <version>1.2_03</version>
                     <scope>provided</scope>
                 </dependency>
                 <dependency>