Commit Graph

72 Commits

Author SHA1 Message Date
Rainer Hermanns 492ab02d97 WW-2660 Patches for WW-2203 prevented action parameters from other places than the request parameters from being included in ParameterAware map.
o applied patches by Dale Newfield to S2 and XW
o updated xwork dep to 2.1.2-SNAPSHOT

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@667420 13f79535-47bb-0310-9956-ffa450edef68
2008-06-13 08:33:23 +00:00
Donald J. Brown 06030a440c Fixing assembly pom version
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@652766 13f79535-47bb-0310-9956-ffa450edef68
2008-05-02 05:15:01 +00:00
Rainer Hermanns dd4b4c007e WW-2616 Adding missing plugins to assembly
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@651587 13f79535-47bb-0310-9956-ffa450edef68
2008-04-25 12:15:09 +00:00
Donald J. Brown 80bcbd0b3e Fixing version, adding missing plugins
WW-2604


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@649802 13f79535-47bb-0310-9956-ffa450edef68
2008-04-19 12:14:02 +00:00
Rainer Hermanns 3475f27cb0 WW-2421
Use XWork 2.1.1 release

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@643358 13f79535-47bb-0310-9956-ffa450edef68
2008-04-01 10:54:28 +00:00
Antonio Petrelli 113cde5b85 WW-2437
Added licenses to the "apps" distribution.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@615606 13f79535-47bb-0310-9956-ffa450edef68
2008-01-27 14:11:04 +00:00
Antonio Petrelli 3b3593d81e WW-2437
Added XWork, XStream, XPP3 licenses and notice.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@615603 13f79535-47bb-0310-9956-ffa450edef68
2008-01-27 14:06:24 +00:00
Antonio Petrelli f5a88391e1 WW-2437
Added Plexus and SiteMesh license and notice.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@615331 13f79535-47bb-0310-9956-ffa450edef68
2008-01-25 20:30:09 +00:00
Antonio Petrelli 42c8104e4e WW-2437
Added OGNL license and notice.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@615323 13f79535-47bb-0310-9956-ffa450edef68
2008-01-25 20:12:45 +00:00
Antonio Petrelli 89c19b8989 WW-2437
Fixed copyright notice in assembly descriptors.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@615299 13f79535-47bb-0310-9956-ffa450edef68
2008-01-25 18:26:44 +00:00
Antonio Petrelli 26122c63e6 WW-2437
I commented by mistake a piece of the assembly pom, fixed.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@614989 13f79535-47bb-0310-9956-ffa450edef68
2008-01-24 20:57:20 +00:00
Antonio Petrelli 420510aae3 WW-2437
Added FreeMarker, JSON-lib and EZMorph notices.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@614986 13f79535-47bb-0310-9956-ffa450edef68
2008-01-24 20:53:03 +00:00
Antonio Petrelli c6004e9c1a WW-2437
Added Classworlds notice.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@614969 13f79535-47bb-0310-9956-ffa450edef68
2008-01-24 20:12:19 +00:00
Antonio Petrelli 764877efeb WW-2437
Fixed the first bunch of license issues.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@614306 13f79535-47bb-0310-9956-ffa450edef68
2008-01-22 20:23:19 +00:00
Antonio Petrelli bda27dd5e1 WW-2379
Added the XWork retrotranslated artifact to the jdk14 distribution.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@611671 13f79535-47bb-0310-9956-ffa450edef68
2008-01-13 23:06:33 +00:00
Antonio Petrelli 7ab72009be WW-2379
Removed the dependencies from the jdk14 assembly.
Re-added the license of Retrotranslator.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@611289 13f79535-47bb-0310-9956-ffa450edef68
2008-01-11 20:16:43 +00:00
Donald J. Brown c54b64bf8a Adding the retrotranslated jars into the proper assemblies
WW-2379


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@604847 13f79535-47bb-0310-9956-ffa450edef68
2007-12-17 12:03:58 +00:00
Donald J. Brown affb31ab96 Updating assemblies, adding all plugins to jdk14 zip
WW-2379


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@604801 13f79535-47bb-0310-9956-ffa450edef68
2007-12-17 09:20:25 +00:00
Antonio Petrelli d37e1dd67e WW-2259
Added configuration to create "backport" and "docs" assemblies.
It must be corrected when the XWork backported artifacts will be available.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@598003 13f79535-47bb-0310-9956-ffa450edef68
2007-11-25 15:31:56 +00:00
Antonio Petrelli 1382694b0e WW-2329
Removed libs from source distribution.
Upgraded to Maven assembly plugin 2.2-beta-1.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@597482 13f79535-47bb-0310-9956-ffa450edef68
2007-11-22 19:37:13 +00:00
Antonio Petrelli 98e99fb820 WW-2327
Fixed Velocity related Maven references.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@595430 13f79535-47bb-0310-9956-ffa450edef68
2007-11-15 20:20:59 +00:00
Antonio Petrelli 84ef73c9a1 WW-2313
Now the assemblies contain plugin and all webapps source code.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@595403 13f79535-47bb-0310-9956-ffa450edef68
2007-11-15 19:26:13 +00:00
Antonio Petrelli 3bf7c239bf WW-2258
Changed classifier to "backport".
Configured the assemblies so they do not include backported packages.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@592882 13f79535-47bb-0310-9956-ffa450edef68
2007-11-07 20:33:26 +00:00
Antonio Petrelli 1aa93b6c65 WW-2288
Now the Struts 2 plugin depends on Tiles 2.0.5.
Assembly and Showcase have been changed accordingly.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@591630 13f79535-47bb-0310-9956-ffa450edef68
2007-11-03 15:11:59 +00:00
Antonio Petrelli 8dfaa6dd90 WW-2063
Fixed subversion properties.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@590812 13f79535-47bb-0310-9956-ffa450edef68
2007-10-31 20:32:54 +00:00
Ted Nathan Husted 8c2dfbd367 WW-1789, WW-2279 Update velocity to 1.5, velocity-tools to 1.3, and Spring to 2.0.7. Apply one-line change to VelocityManager suggested by Rod Vagg.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@590528 13f79535-47bb-0310-9956-ffa450edef68
2007-10-31 01:24:43 +00:00
Ted Nathan Husted 2151d7273c WW-1715 Update POMs and backport for 2.1.1-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@589617 13f79535-47bb-0310-9956-ffa450edef68
2007-10-29 13:12:30 +00:00
Ted Nathan Husted 82e768b673 WW-1715 Update POMs and backport for 2.1.0.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@589454 13f79535-47bb-0310-9956-ffa450edef68
2007-10-29 01:09:07 +00:00
Antonio Petrelli b25dc1b3c3 WW-2151
Resolved snapshot dependencies by using the latest released version available, with the exception of Plexus (using 1.0-alpha-10) and XWork (still using SNAPSHOT).

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@571941 13f79535-47bb-0310-9956-ffa450edef68
2007-09-02 10:41:16 +00:00
Antonio Petrelli 58051700ae WW-1992
tiles-jsp added to Struts 2 assembly.


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@547696 13f79535-47bb-0310-9956-ffa450edef68
2007-06-15 14:35:32 +00:00
Rainer Hermanns c0ef5221c7 Updating the xwork dependency to 2.1-SNAPSHOT to fix several problems reported to
XWork and S2:

WW-1635 struts.xml include dependant packages not loading properly
WW-1856 s18n tag appears to be broken

NOTE on XWork 2.x updates: All validators.xml files are now validated, a DTD header
is required.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@527815 13f79535-47bb-0310-9956-ffa450edef68
2007-04-12 07:33:52 +00:00
Ted Nathan Husted 419dc383a0 WW-1548 Remove continuation support from 2.1.x, and move continuations to the sandbox.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@517095 13f79535-47bb-0310-9956-ffa450edef68
2007-03-12 04:31:08 +00:00
Ted Nathan Husted 02249e0558 WW-1715 Update POMs for the 2.1.0 snapshot.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@504540 13f79535-47bb-0310-9956-ffa450edef68
2007-02-07 13:23:42 +00:00
Ted Nathan Husted 80d3f05fe7 WW-1685 Update POMs for the next shapshot.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@503763 13f79535-47bb-0310-9956-ffa450edef68
2007-02-05 16:48:39 +00:00
Ted Nathan Husted 6489ffdafb WW-1685 Update POMs for 2.0.5 tag.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@503710 13f79535-47bb-0310-9956-ffa450edef68
2007-02-05 14:57:11 +00:00
Ted Nathan Husted ac8b7404f1 Update POMs for Struts 2.0.5 SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@500934 13f79535-47bb-0310-9956-ffa450edef68
2007-01-29 03:51:53 +00:00
Ted Nathan Husted 238abc3d12 WW-1650 Update POMs for 2.0.4 release.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@500931 13f79535-47bb-0310-9956-ffa450edef68
2007-01-29 03:38:40 +00:00
Ted Nathan Husted bce0209ecc WW-1588 Update POMs for 2.0.4-SNAPSHOT (once again).
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@498062 13f79535-47bb-0310-9956-ffa450edef68
2007-01-20 03:49:06 +00:00
Ted Nathan Husted 8bf687db8f WW-1588 Update POMs for 2.0.3 (third try).
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@498041 13f79535-47bb-0310-9956-ffa450edef68
2007-01-20 01:50:47 +00:00
Ted Nathan Husted a97043519c WW-1588 Update POMs for 2.0.4-SNAPSHOT (as discussed).
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@497807 13f79535-47bb-0310-9956-ffa450edef68
2007-01-19 13:26:15 +00:00
Ted Nathan Husted c66b4ed34a WW-1588 Update POMs for 2.0.3 (second try).
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@497787 13f79535-47bb-0310-9956-ffa450edef68
2007-01-19 12:10:42 +00:00
Ted Nathan Husted 2573b581c9 WW-1588 Update POMs for 2.1.0-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@496766 13f79535-47bb-0310-9956-ffa450edef68
2007-01-16 17:01:40 +00:00
Ted Nathan Husted e563bd0e15 WW-1588 Update POMs for Struts 2.0.3 build.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@496715 13f79535-47bb-0310-9956-ffa450edef68
2007-01-16 14:55:03 +00:00
Donald J. Brown f3583fd38b Upping xwork dep to 2.0.0
WW-1588


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@493554 13f79535-47bb-0310-9956-ffa450edef68
2007-01-06 19:59:42 +00:00
Wendy Smoak b35ac5150d Download, unzip, and include the Confluence wiki docs in the -all release assembly.
WW-1585

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@491483 13f79535-47bb-0310-9956-ffa450edef68
2006-12-31 20:58:16 +00:00
Ted Nathan Husted b4c0159f22 WW-1588 Update Release Notes and XWork references.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@491467 13f79535-47bb-0310-9956-ffa450edef68
2006-12-31 19:13:40 +00:00
Ted Nathan Husted ef999fe8fc WW-1483 Update POM versions for Struts 2.0.3-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@491460 13f79535-47bb-0310-9956-ffa450edef68
2006-12-31 18:09:12 +00:00
Ted Nathan Husted ed450a698a WW-1483 Update POM versions for Struts 2.0.2 release. Update feature list.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@491439 13f79535-47bb-0310-9956-ffa450edef68
2006-12-31 16:10:19 +00:00
Donald J. Brown 6e070df2f9 Removing quickstart plugin from infrastructure
WW-1524


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@491067 13f79535-47bb-0310-9956-ffa450edef68
2006-12-29 18:06:29 +00:00
Ted Nathan Husted e7299853d6 WW-1483 Update dependency to XWork 2 Beta 2, but we need the -sources.jar or -javadoc.jar in the OS repository to run the final assembly:assembly stage.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@480823 13f79535-47bb-0310-9956-ffa450edef68
2006-11-30 04:01:27 +00:00