Return-Path: 
 <scm-return-17316-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 5610 invoked from network); 30 Jan 2007 18:55:09 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 30 Jan 2007 18:55:09 -0000
Received: (qmail 89561 invoked by uid 500); 30 Jan 2007 18:55:16 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 89433 invoked by uid 500); 30 Jan 2007 18:55:15 -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 89420 invoked by uid 99); 30 Jan 2007 18:55:15 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Jan 2007 10:55:15 -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; Tue, 30 Jan 2007 10:55:08 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 615891A981A; Tue, 30 Jan 2007 10:54:48 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r501515 - in /geronimo/server/trunk:
 configs/jetty6-deployer/src/plan/plan.xml configs/jetty6/pom.xml
 configs/tomcat6-deployer/src/plan/plan.xml configs/tomcat6/pom.xml pom.xml
 testsuite/web-testsuite/test-2.1-jsps/pom.xml
Date: Tue, 30 Jan 2007 18:54:47 -0000
To: scm@geronimo.apache.org
From: jbohn@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070130185448.615891A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jbohn
Date: Tue Jan 30 10:54:46 2007
New Revision: 501515

URL: http://svn.apache.org/viewvc?view=rev&rev=501515
Log:
Moved jstl integration from containers to defaultEnvironment on web deployers.  Also cleaned up references to jstl and removed references to 1.1.1 version

Modified:
    geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/jetty6/pom.xml
    geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/tomcat6/pom.xml
    geronimo/server/trunk/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml

Modified: geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml?view=diff&rev=501515&r1=501514&r2=501515
==============================================================================
--- geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml Tue Jan 30 10:54:46 2007
@@ -78,6 +78,10 @@
                         <artifactId>jetty6</artifactId>
                         <type>car</type>
                     </dependency>
+                   <dependency>
+                        <groupId>jstl</groupId>
+                        <artifactId>jstl</artifactId>
+                   </dependency>
                 </dependencies>
                 <hidden-classes>
                     <filter>antlr.</filter>

Modified: geronimo/server/trunk/configs/jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6/pom.xml?view=diff&rev=501515&r1=501514&r2=501515
==============================================================================
--- geronimo/server/trunk/configs/jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty6/pom.xml Tue Jan 30 10:54:46 2007
@@ -76,11 +76,6 @@
         </dependency>
 
         <dependency>
-            <groupId>jstl</groupId>
-            <artifactId>jstl</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-api</artifactId>
         </dependency>
@@ -98,18 +93,5 @@
         </dependency>
 
     </dependencies>
-
-    <!--
-    HACK: jstl:jstl:jar:1.2 is not available on a m2 repo, so include them here
-          to avoid needing to setup an m1 repo which causes problems resolving
-          dependencies.
-    -->
-    <repositories>
-        <repository>
-            <id>java.net</id>
-            <url>https://maven-repository.dev.java.net/nonav/repository</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
 
 </project>

Modified: geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml?view=diff&rev=501515&r1=501514&r2=501515
==============================================================================
--- geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml Tue Jan 30 10:54:46 2007
@@ -56,6 +56,10 @@
                         <artifactId>tomcat6</artifactId>
                         <type>car</type>
                     </dependency>
+                    <dependency>
+	                    <groupId>jstl</groupId>
+                        <artifactId>jstl</artifactId>
+                    </dependency>
                 </dependencies>
                 <hidden-classes/>
                 <non-overridable-classes>

Modified: geronimo/server/trunk/configs/tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat6/pom.xml?view=diff&rev=501515&r1=501514&r2=501515
==============================================================================
--- geronimo/server/trunk/configs/tomcat6/pom.xml (original)
+++ geronimo/server/trunk/configs/tomcat6/pom.xml Tue Jan 30 10:54:46 2007
@@ -63,11 +63,6 @@
         </dependency>
 
         <dependency>
-            <groupId>jstl</groupId>
-            <artifactId>jstl</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-api</artifactId>
         </dependency>
@@ -85,19 +80,6 @@
         </dependency>
 
     </dependencies>
-
-    <repositories>
-        <!--
-        HACK: jstl:jstl:jar:1.2 is not available on a m2 repo, so include them here
-              to avoid needing to setup an m1 repo which causes problems resolving
-              dependencies.
-        -->
-        <repository>
-            <id>java.net</id>
-            <url>https://maven-repository.dev.java.net/nonav/repository</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
 
     <build>
         <resources>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=501515&r1=501514&r2=501515
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Jan 30 10:54:46 2007
@@ -666,12 +666,6 @@
             </dependency>
 
             <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>jstl</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-
-            <dependency>
                 <groupId>jstl</groupId>
                 <artifactId>jstl</artifactId>
                 <version>1.2</version>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml?view=diff&rev=501515&r1=501514&r2=501515
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml Tue Jan 30 10:54:46 2007
@@ -52,6 +52,7 @@
         <dependency>
             <groupId>jstl</groupId>
             <artifactId>jstl</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>