You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by bo...@apache.org on 2010/04/16 17:20:52 UTC

svn commit: r934956 - in /gump/metadata: profile/gump.xml project/commons-jelly.xml project/jakarta-taglibs.xml project/jakarta-tomcat-5.xml project/portals-pluto-trunk.xml project/tomcat-taglibs.xml

Author: bodewig
Date: Fri Apr 16 15:20:52 2010
New Revision: 934956

URL: http://svn.apache.org/viewvc?rev=934956&view=rev
Log:
jakarta-taglibs actually is tomcat-taglibs by now

Added:
    gump/metadata/project/tomcat-taglibs.xml
      - copied, changed from r934892, gump/metadata/project/jakarta-taglibs.xml
Removed:
    gump/metadata/project/jakarta-taglibs.xml
Modified:
    gump/metadata/profile/gump.xml
    gump/metadata/project/commons-jelly.xml
    gump/metadata/project/jakarta-tomcat-5.xml
    gump/metadata/project/portals-pluto-trunk.xml

Modified: gump/metadata/profile/gump.xml
URL: http://svn.apache.org/viewvc/gump/metadata/profile/gump.xml?rev=934956&r1=934955&r2=934956&view=diff
==============================================================================
--- gump/metadata/profile/gump.xml (original)
+++ gump/metadata/profile/gump.xml Fri Apr 16 15:20:52 2010
@@ -132,7 +132,6 @@
   <module href="project/packaged-struts12.xml"/>
   <module href="project/packaged-struts13.xml"/>
   <module href="project/packaged-struts-el12.xml"/>
-  <module href="project/jakarta-taglibs.xml"/>
   <module href="project/jakarta-tomcat-40.xml"/>
   <module href="project/jakarta-tomcat-catalina.xml"/>
   <module href="project/jakarta-tomcat-5.xml"/>
@@ -142,6 +141,7 @@
   <module href="project/jakarta-tomcat-33.xml"/>
   <module href="project/tomcat-connectors-native.xml" />
   <module href="project/tomcat-jasper_tc6.xml" />
+  <module href="project/tomcat-taglibs.xml"/>
   <module href="project/tomcat-tc6.xml" />
   <module href="project/tomcat-trunk.xml" />
 

Modified: gump/metadata/project/commons-jelly.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/commons-jelly.xml?rev=934956&r1=934955&r2=934956&view=diff
==============================================================================
--- gump/metadata/project/commons-jelly.xml (original)
+++ gump/metadata/project/commons-jelly.xml Fri Apr 16 15:20:52 2010
@@ -40,7 +40,7 @@
       <property name="maven.final.name" value="commons-jelly-@@DATE@@"/>
       
       <property project="jakarta-servletapi-5-servlet" name="maven.jar.servletapi" reference="jarpath" />
-      <property project="jakarta-taglibs-standard" name="maven.jar.jstl" reference="jarpath" id="jstl" />
+      <property project="tomcat-taglibs-standard" name="maven.jar.jstl" reference="jarpath" id="jstl" />
       <property project="xml-xerces" name="maven.jar.xerces" reference="jarpath" />
       <property project="commons-jexl-1.x" name="maven.jar.commons-jexl" reference="jarpath" />
     </maven>
@@ -55,7 +55,7 @@
     <depend project="dom4j" />
     <depend project="forehead" />
     <depend project="jakarta-servletapi-5-servlet" />
-    <depend project="jakarta-taglibs-standard" ids="jstl" />
+    <depend project="tomcat-taglibs-standard" ids="jstl" />
     <depend project="jaxen" />
     <depend project="junit" />
     <depend project="xml-apis" />
@@ -76,7 +76,7 @@
       <property name="maven.final.name" value="commons-jelly-@@DATE@@"/>
 
       <property project="jakarta-servletapi-5-servlet" name="maven.jar.servletapi" reference="jarpath" />
-      <property project="jakarta-taglibs-standard" name="maven.jar.jstl" reference="jarpath" id="jstl" />
+      <property project="tomcat-taglibs-standard" name="maven.jar.jstl" reference="jarpath" id="jstl" />
       <property project="xml-xerces" name="maven.jar.xerces" reference="jarpath"/>
       <property project="commons-jexl-1.x" name="maven.jar.commons-jexl" reference="jarpath" />
     </maven>

Modified: gump/metadata/project/jakarta-tomcat-5.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/jakarta-tomcat-5.xml?rev=934956&r1=934955&r2=934956&view=diff
==============================================================================
--- gump/metadata/project/jakarta-tomcat-5.xml (original)
+++ gump/metadata/project/jakarta-tomcat-5.xml Fri Apr 16 15:20:52 2010
@@ -111,7 +111,7 @@
     <depend project="jakarta-tomcat-util" runtime="true"/>
     <depend project="jakarta-servletapi-5-servlet"/>
     <depend project="jakarta-servletapi-5-jsp"/>
-    <depend project="jakarta-taglibs-standard" runtime="true"/>
+    <depend project="tomcat-taglibs-standard" runtime="true"/>
     <depend project="commons-el"/>
     <depend project="commons-modeler"/>
     <depend project="txt2html-task" />

Modified: gump/metadata/project/portals-pluto-trunk.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/portals-pluto-trunk.xml?rev=934956&r1=934955&r2=934956&view=diff
==============================================================================
--- gump/metadata/project/portals-pluto-trunk.xml (original)
+++ gump/metadata/project/portals-pluto-trunk.xml Fri Apr 16 15:20:52 2010
@@ -38,7 +38,7 @@
    <option project="ant" />
    <option project="junit" />
    <option project="stax" />
-   <option project="jakarta-taglibs-standard" />
+   <option project="tomcat-taglibs-standard" />
    <option project="castor" />
    <option project="portals-pom" />
    <option project="commons-digester" />

Copied: gump/metadata/project/tomcat-taglibs.xml (from r934892, gump/metadata/project/jakarta-taglibs.xml)
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-taglibs.xml?p2=gump/metadata/project/tomcat-taglibs.xml&p1=gump/metadata/project/jakarta-taglibs.xml&r1=934892&r2=934956&rev=934956&view=diff
==============================================================================
--- gump/metadata/project/jakarta-taglibs.xml (original)
+++ gump/metadata/project/tomcat-taglibs.xml Fri Apr 16 15:20:52 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!--
- Licensed to the Apache Software Foundation (ASF) under one or more
+  Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
   The ASF licenses this file to You under the Apache License, Version 2.0
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<module name="jakarta-taglibs">
+<module name="tomcat-taglibs">
 
-  <url href="http://jakarta.apache.org/taglibs/index.html"/>
+  <url href="http://tomcat.apache.org/taglibs/index.html"/>
   <description>
     JSP Taglibs
   </description>
@@ -25,7 +25,7 @@
   <svn repository="asf" dir="tomcat/taglibs/trunks"/>
 
   <!-- Parent POM -->
-  <project name="jakarta-taglibs-parent">
+  <project name="tomcat-taglibs-parent">
     <description>Taglib Parent POM</description>
     <mvn basedir="taglibs-parent" goal="install"/>
     <option project="velocity-engine"/>
@@ -37,7 +37,7 @@
     <nag to="dev@tomcat.apache.org" from="Gump &lt;bayard@tomcat.apache.org&gt;"/>
   </project>
 
-  <project name="jakarta-taglibs-standard">
+  <project name="tomcat-taglibs-standard">
     <package>org.apache.taglibs.standard</package>
     <description>Standard Taglib</description>
     <mvn basedir="standard" goal="install"/>