geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
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 GMT
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>
 



Mime
View raw message