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 2007/01/23 06:26:02 UTC
svn commit: r498923 - in /gump/metadata: profile/ project/
Author: bodewig
Date: Mon Jan 22 21:25:55 2007
New Revision: 498923
URL: http://svn.apache.org/viewvc?view=rev&rev=498923
Log:
Add struts 1.3 along with 1.2
Added:
gump/metadata/project/packaged-struts-el12.xml
- copied, changed from r498921, gump/metadata/project/packaged-struts-el.xml
gump/metadata/project/packaged-struts12.xml
- copied, changed from r498921, gump/metadata/project/packaged-struts.xml
gump/metadata/project/packaged-struts13.xml (with props)
Removed:
gump/metadata/project/packaged-struts-el.xml
gump/metadata/project/packaged-struts.xml
Modified:
gump/metadata/profile/gump.xml
gump/metadata/project/jakarta-slide.xml
gump/metadata/project/jakarta-turbine-jcs.xml
gump/metadata/project/myfaces.xml
gump/metadata/project/portals-bridges.xml
gump/metadata/project/struts-sslext.xml
gump/metadata/project/strutstestcase.xml
gump/metadata/project/velocity-tools.xml
Modified: gump/metadata/profile/gump.xml
URL: http://svn.apache.org/viewvc/gump/metadata/profile/gump.xml?view=diff&rev=498923&r1=498922&r2=498923
==============================================================================
--- gump/metadata/profile/gump.xml (original)
+++ gump/metadata/profile/gump.xml Mon Jan 22 21:25:55 2007
@@ -121,8 +121,9 @@
<module href="project/jakarta-site2.xml"/>
<module href="project/jakarta-slide.xml"/>
<module href="project/struts.xml"/>
- <module href="project/packaged-struts.xml"/>
- <module href="project/packaged-struts-el.xml"/>
+ <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-taglibs-sandbox.xml"/>
<module href="project/jstl-jsp-12.xml"/>
@@ -556,8 +557,9 @@
<project name="packaged-jetty-all" package="jetty-5.0.RC4"/>
<project name="packaged-jetty-jaas" package="jetty-5.0.RC4"/>
<project name="packaged-jmock" package="jmock"/>
- <project name="packaged-struts" package="struts-1.2.9-lib"/>
- <project name="packaged-struts-el" package="struts-el"/>
+ <project name="packaged-struts12" package="struts-1.2.9-lib"/>
+ <project name="packaged-struts13" package="struts-1.3.5-lib"/>
+ <project name="packaged-struts-el12" package="struts-el"/>
<project name="packaged-strutstestcase" package="strutstest"/>
<project name="packaged-xom" package="xom-1.1"/>
<project name="picocontainer" package="picocontainer-1.1"/>
Modified: gump/metadata/project/jakarta-slide.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/jakarta-slide.xml?view=diff&rev=498923&r1=498922&r2=498923
==============================================================================
--- gump/metadata/project/jakarta-slide.xml (original)
+++ gump/metadata/project/jakarta-slide.xml Mon Jan 22 21:25:55 2007
@@ -73,7 +73,7 @@
<depend project="j2ee-connector"/>
<option project="jmx"/>
<depend project="jakarta-tomcat-4.0"/>
- <depend project="packaged-struts"/>
+ <depend project="packaged-struts13"/>
<depend project="jakarta-oro"/>
<depend project="jakarta-poi"/>
<depend project="xmlunit"/>
Modified: gump/metadata/project/jakarta-turbine-jcs.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/jakarta-turbine-jcs.xml?view=diff&rev=498923&r1=498922&r2=498923
==============================================================================
--- gump/metadata/project/jakarta-turbine-jcs.xml (original)
+++ gump/metadata/project/jakarta-turbine-jcs.xml Mon Jan 22 21:25:55 2007
@@ -54,7 +54,7 @@
<depend project="hsqldb"/>
<depend project="logging-log4j"/>
<depend project="jakarta-servletapi-4"/>
- <depend project="packaged-struts"/>
+ <depend project="packaged-struts13" ids="struts-core"/>
<depend project="jgroups"/>
<depend project="jisp"/>
<depend project="jakarta-tomcat-util"/>
Modified: gump/metadata/project/myfaces.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/myfaces.xml?view=diff&rev=498923&r1=498922&r2=498923
==============================================================================
--- gump/metadata/project/myfaces.xml (original)
+++ gump/metadata/project/myfaces.xml Mon Jan 22 21:25:55 2007
@@ -52,7 +52,7 @@
<depend project="jakarta-servletapi-5-servlet"/>
<depend project="jakarta-taglibs-standard" ids="jstl"/>
<depend project="portals-pluto-api-1.0"/>
- <depend project="packaged-struts"/>
+ <depend project="packaged-struts13"/>
<depend project="xdoclet"/>
<depend project="xml-apis"/>
<depend project="xml-xerces"/>
Copied: gump/metadata/project/packaged-struts-el12.xml (from r498921, gump/metadata/project/packaged-struts-el.xml)
URL: http://svn.apache.org/viewvc/gump/metadata/project/packaged-struts-el12.xml?view=diff&rev=498923&p1=gump/metadata/project/packaged-struts-el.xml&r1=498921&p2=gump/metadata/project/packaged-struts-el12.xml&r2=498923
==============================================================================
--- gump/metadata/project/packaged-struts-el.xml (original)
+++ gump/metadata/project/packaged-struts-el12.xml Mon Jan 22 21:25:55 2007
@@ -15,14 +15,14 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<module name="packaged-struts-el">
+<module name="packaged-struts-el12">
<url href="http://struts.apache.org/struts-action/struts-el/index.html"/>
<description>
An extension of the Struts tag library.
</description>
- <project name="packaged-struts-el">
+ <project name="packaged-struts-el12">
<package>org.apache.strutsel</package>
<jar name="struts-el-1.2.9.jar"/>
</project>
Copied: gump/metadata/project/packaged-struts12.xml (from r498921, gump/metadata/project/packaged-struts.xml)
URL: http://svn.apache.org/viewvc/gump/metadata/project/packaged-struts12.xml?view=diff&rev=498923&p1=gump/metadata/project/packaged-struts.xml&r1=498921&p2=gump/metadata/project/packaged-struts12.xml&r2=498923
==============================================================================
--- gump/metadata/project/packaged-struts.xml (original)
+++ gump/metadata/project/packaged-struts12.xml Mon Jan 22 21:25:55 2007
@@ -15,14 +15,14 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<module name="packaged-struts-taglib">
+<module name="packaged-struts12">
<url href="http://struts.apache.org/"/>
<description>
Model 2 Model-View-Controller framework for Servlets and JSP
</description>
- <project name="packaged-struts">
+ <project name="packaged-struts12">
<package>org.apache.struts</package>
<jar name="struts.jar"/>
<license name="LICENSE"/>
Added: gump/metadata/project/packaged-struts13.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/packaged-struts13.xml?view=auto&rev=498923
==============================================================================
--- gump/metadata/project/packaged-struts13.xml (added)
+++ gump/metadata/project/packaged-struts13.xml Mon Jan 22 21:25:55 2007
@@ -0,0 +1,38 @@
+<?xml version="1.0" ?>
+<!--
+ 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
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<module name="packaged-struts13">
+
+ <url href="http://struts.apache.org/"/>
+ <description>
+ Model 2 Model-View-Controller framework for Servlets and JSP
+ </description>
+
+ <project name="packaged-struts13">
+ <package>org.apache.struts</package>
+ <jar name="struts-core-1.3.5.jar" id="struts-core"/>
+ <jar name="struts-el-1.3.5.jar" id="struts-el"/>
+ <jar name="struts-extras-1.3.5.jar" id="struts-extras"/>
+ <jar name="struts-faces-1.3.5.jar" id="struts-faces"/>
+ <jar name="struts-mailreader-dao-1.3.5.jar" id="struts-mailreader-dao"/>
+ <jar name="struts-scripting-1.3.5.jar" id="struts-scripting"/>
+ <jar name="struts-taglib-1.3.5.jar" id="struts-taglib"/>
+ <jar name="struts-tiles-1.3.5.jar" id="struts-tiles"/>
+ <license name="LICENSE.txt"/>
+ </project>
+
+</module>
Propchange: gump/metadata/project/packaged-struts13.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: gump/metadata/project/portals-bridges.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/portals-bridges.xml?view=diff&rev=498923&r1=498922&r2=498923
==============================================================================
--- gump/metadata/project/portals-bridges.xml (original)
+++ gump/metadata/project/portals-bridges.xml Mon Jan 22 21:25:55 2007
@@ -99,18 +99,18 @@
id="api" reference="jarpath"/>
<property project="jakarta-servletapi-4"
name="maven.jar.servletapi" reference="jarpath" />
- <property name="maven.jar.struts" project="packaged-struts"
+ <property name="maven.jar.struts" project="packaged-struts12"
reference="jarpath"/>
- <property name="maven.jar.struts-el" project="packaged-struts-el"
+ <property name="maven.jar.struts-el" project="packaged-struts-el12"
reference="jarpath"/>
</maven>
<depend project="commons-digester"/>
<depend project="commons-logging"/>
<depend project="jakarta-servletapi-4" />
- <depend project="packaged-struts"/>
+ <depend project="packaged-struts12"/>
<!--depend project="struts-action"/-->
- <depend project="packaged-struts-el"/>
+ <depend project="packaged-struts-el12"/>
<depend project="portals-bridges-common"/>
<depend project="portals-pluto-api-1.0"/>
Modified: gump/metadata/project/struts-sslext.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/struts-sslext.xml?view=diff&rev=498923&r1=498922&r2=498923
==============================================================================
--- gump/metadata/project/struts-sslext.xml (original)
+++ gump/metadata/project/struts-sslext.xml Mon Jan 22 21:25:55 2007
@@ -38,7 +38,7 @@
<depend project="commons-digester"/>
<depend project="commons-logging"/>
<depend project="jakarta-servletapi-4"/>
- <depend project="packaged-struts"/>
+ <depend project="packaged-struts13"/>
<!--depend project="struts-action"/>
<depend project="struts-taglib"/>
<depend project="struts-tiles"/-->
Modified: gump/metadata/project/strutstestcase.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/strutstestcase.xml?view=diff&rev=498923&r1=498922&r2=498923
==============================================================================
--- gump/metadata/project/strutstestcase.xml (original)
+++ gump/metadata/project/strutstestcase.xml Mon Jan 22 21:25:55 2007
@@ -43,7 +43,7 @@
<depend project="jakarta-cactus-framework-13"/>
<depend project="jakarta-servletapi-4"/>
<depend project="junit"/>
- <depend project="packaged-struts"/>
+ <depend project="packaged-struts13"/>
<depend project="xml-xerces"/>
<depend project="xml-apis" />
Modified: gump/metadata/project/velocity-tools.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/velocity-tools.xml?view=diff&rev=498923&r1=498922&r2=498923
==============================================================================
--- gump/metadata/project/velocity-tools.xml (original)
+++ gump/metadata/project/velocity-tools.xml Mon Jan 22 21:25:55 2007
@@ -47,9 +47,9 @@
<property name="sslext.jar" project="struts-sslext" reference="jarpath" />
<!-- Move to struts-core, struts-taglib, struts-tiles from struts.xml at some point -->
- <property name="struts-core.jar" project="packaged-struts" reference="jarpath" />
- <property name="struts-taglib.jar" project="packaged-struts" reference="jarpath" />
- <property name="struts-tiles.jar" project="packaged-struts" reference="jarpath" />
+ <property name="struts-core.jar" project="packaged-struts13" reference="jarpath" id="struts-core"/>
+ <property name="struts-taglib.jar" project="packaged-struts13" reference="jarpath" id="struts-taglib"/>
+ <property name="struts-tiles.jar" project="packaged-struts13" reference="jarpath" id="struts-tiles"/>
</ant>
<depend project="ant" inherit="runtime"/>
@@ -64,7 +64,7 @@
<depend project="struts-sslext"/>
<!-- Move to struts-core, struts-taglib, struts-tiles from struts.xml at some point -->
- <depend project="packaged-struts"/>
+ <depend project="packaged-struts13"/>
<depend project="velocity-engine" id="velocity" inherit="runtime"/>
<depend project="velocity-dvsl" inherit="runtime"/>