Return-Path: 
 <scm-return-16447-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 82485 invoked from network); 11 Dec 2006 15:45:54 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 11 Dec 2006 15:45:53 -0000
Received: (qmail 69763 invoked by uid 500); 11 Dec 2006 15:46:00 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 69729 invoked by uid 500); 11 Dec 2006 15:46:00 -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 69718 invoked by uid 99); 11 Dec 2006 15:45:59 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Dec 2006 07:45:59 -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; Mon, 11 Dec 2006 07:45:51 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id CFE611A9846; Mon, 11 Dec 2006 07:45:06 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r485719 - in /geronimo/server/trunk:
 applications/geronimo-examples/geronimo-jsp-examples/ configs/jetty6/
 configs/tomcat6/ configs/webconsole-jetty6/
 configs/webconsole-jetty6/src/plan/ configs/webconsole-tomcat/
 configs/webconsole-tomcat/...
Date: Mon, 11 Dec 2006 15:45:05 -0000
To: scm@geronimo.apache.org
From: jbohn@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061211154506.CFE611A9846@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jbohn
Date: Mon Dec 11 07:45:04 2006
New Revision: 485719

URL: http://svn.apache.org/viewvc?view=rev&rev=485719
Log:
GERONIMO-2536 moved dependency on jstl to web containers and web-2.5-builder and removed dependencies from console poms and deployment plans.  Not sure if this is the best approach but it can be changed later if necessary.

Modified:
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/pom.xml
    geronimo/server/trunk/configs/jetty6/pom.xml
    geronimo/server/trunk/configs/tomcat6/pom.xml
    geronimo/server/trunk/configs/webconsole-jetty6/pom.xml
    geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml
    geronimo/server/trunk/configs/webconsole-tomcat/pom.xml
    geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml

Modified: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/pom.xml?view=diff&rev=485719&r1=485718&r2=485719
==============================================================================
--- geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/pom.xml (original)
+++ geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/pom.xml Mon Dec 11 07:45:04 2006
@@ -55,6 +55,7 @@
         <dependency>
             <groupId>jstl</groupId>
             <artifactId>jstl</artifactId>
+            <scope>provided</scope>
         </dependency>
         
     </dependencies>

Modified: geronimo/server/trunk/configs/jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6/pom.xml?view=diff&rev=485719&r1=485718&r2=485719
==============================================================================
--- geronimo/server/trunk/configs/jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty6/pom.xml Mon Dec 11 07:45:04 2006
@@ -75,6 +75,24 @@
             <artifactId>xercesImpl</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>jstl</groupId>
+            <artifactId>jstl</artifactId>
+        </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/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat6/pom.xml?view=diff&rev=485719&r1=485718&r2=485719
==============================================================================
--- geronimo/server/trunk/configs/tomcat6/pom.xml (original)
+++ geronimo/server/trunk/configs/tomcat6/pom.xml Mon Dec 11 07:45:04 2006
@@ -62,6 +62,11 @@
             <version>${version}</version>
         </dependency>
         
+        <dependency>
+            <groupId>jstl</groupId>
+            <artifactId>jstl</artifactId>
+        </dependency>
+
     </dependencies>
     
     <repositories>
@@ -77,6 +82,16 @@
                 <checksumPolicy>ignore</checksumPolicy>
             </releases>
         </repository>
+        <!--
+        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>
@@ -101,5 +116,6 @@
         </plugins>
 -->
     </build>
+
 
 </project>

Modified: geronimo/server/trunk/configs/webconsole-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty6/pom.xml?view=diff&rev=485719&r1=485718&r2=485719
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty6/pom.xml Mon Dec 11 07:45:04 2006
@@ -181,11 +181,6 @@
         </dependency>
 
         <dependency>
-            <groupId>jstl</groupId>
-            <artifactId>jstl</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>dwr</groupId>
             <artifactId>dwr</artifactId>
         </dependency>
@@ -229,16 +224,4 @@
         </plugins>
     </build>
     
-    <!--
-    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/webconsole-jetty6/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml?view=diff&rev=485719&r1=485718&r2=485719
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml Mon Dec 11 07:45:04 2006
@@ -75,11 +75,6 @@
                     <type>jar</type>
                 </dependency>
                 <dependency>
-                    <groupId>jstl</groupId>
-                    <artifactId>jstl</artifactId>
-                    <type>jar</type>
-                </dependency>
-                <dependency>
                     <groupId>taglibs</groupId>
                     <artifactId>standard</artifactId>
                     <type>jar</type>

Modified: geronimo/server/trunk/configs/webconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-tomcat/pom.xml?view=diff&rev=485719&r1=485718&r2=485719
==============================================================================
--- geronimo/server/trunk/configs/webconsole-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/webconsole-tomcat/pom.xml Mon Dec 11 07:45:04 2006
@@ -182,11 +182,6 @@
         </dependency>
 
         <dependency>
-            <groupId>jstl</groupId>
-            <artifactId>jstl</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>dwr</groupId>
             <artifactId>dwr</artifactId>
         </dependency>
@@ -234,16 +229,4 @@
         </plugins>
     </build>
     
-    <!--
-    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/webconsole-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml?view=diff&rev=485719&r1=485718&r2=485719
==============================================================================
--- geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml Mon Dec 11 07:45:04 2006
@@ -91,11 +91,6 @@
                     <type>jar</type>
                 </dependency>
                 <dependency>
-                    <groupId>jstl</groupId>
-                    <artifactId>jstl</artifactId>
-                    <type>jar</type>
-                </dependency>
-                <dependency>
                     <groupId>taglibs</groupId>
                     <artifactId>standard</artifactId>
                     <type>jar</type>

Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml?view=diff&rev=485719&r1=485718&r2=485719
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml Mon Dec 11 07:45:04 2006
@@ -55,12 +55,35 @@
             <artifactId>testsupport-common</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>taglibs</groupId>
+            <artifactId>standard</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jstl</groupId>
+            <artifactId>jstl</artifactId>
+        </dependency>
+
     </dependencies>
     
     <build>
         <plugins>
         </plugins>
     </build>
+
+    <!--
+    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>