Return-Path: Delivered-To: apmail-roller-commits-archive@www.apache.org Received: (qmail 40336 invoked from network); 18 May 2007 18:14:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 May 2007 18:14:00 -0000 Received: (qmail 9722 invoked by uid 500); 18 May 2007 18:14:06 -0000 Delivered-To: apmail-roller-commits-archive@roller.apache.org Received: (qmail 9690 invoked by uid 500); 18 May 2007 18:14:06 -0000 Mailing-List: contact commits-help@roller.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@roller.apache.org Delivered-To: mailing list commits@roller.apache.org Received: (qmail 9680 invoked by uid 99); 18 May 2007 18:14:06 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 May 2007 11:14:06 -0700 X-ASF-Spam-Status: No, hits=-99.5 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; Fri, 18 May 2007 11:13:59 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 111081A981A; Fri, 18 May 2007 11:13:39 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r539544 - in /roller/trunk: ./ apps/planet/ tools/struts-2.0.5/ tools/struts-2.0.6/ tools/struts-2.0.6/lib/ web/WEB-INF/jsps/ web/WEB-INF/jsps/authoring/struts2/ Date: Fri, 18 May 2007 18:13:38 -0000 To: commits@roller.apache.org From: agilliland@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070518181339.111081A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: agilliland Date: Fri May 18 11:13:36 2007 New Revision: 539544 URL: http://svn.apache.org/viewvc?view=rev&rev=539544 Log: upgrading struts2 libs from 2.0.5 to 2.0.6 which fixes a couple problems happening on the resources page. Added: roller/trunk/tools/struts-2.0.6/ roller/trunk/tools/struts-2.0.6/LICENSE.txt roller/trunk/tools/struts-2.0.6/NOTICE.txt roller/trunk/tools/struts-2.0.6/lib/ roller/trunk/tools/struts-2.0.6/lib/antlr-2.7.2.jar (with props) roller/trunk/tools/struts-2.0.6/lib/commons-beanutils-1.6.jar (with props) roller/trunk/tools/struts-2.0.6/lib/commons-chain-1.1.jar (with props) roller/trunk/tools/struts-2.0.6/lib/commons-fileupload-1.2.jar (with props) roller/trunk/tools/struts-2.0.6/lib/commons-io-1.3.1.jar (with props) roller/trunk/tools/struts-2.0.6/lib/commons-validator-1.3.0.jar (with props) roller/trunk/tools/struts-2.0.6/lib/freemarker-2.3.8.jar (with props) roller/trunk/tools/struts-2.0.6/lib/ognl-2.6.11.jar (with props) roller/trunk/tools/struts-2.0.6/lib/oro-2.0.8.jar (with props) roller/trunk/tools/struts-2.0.6/lib/struts2-core-2.0.6.jar (with props) roller/trunk/tools/struts-2.0.6/lib/struts2-spring-plugin-2.0.6.jar (with props) roller/trunk/tools/struts-2.0.6/lib/struts2-tiles-plugin-2.0.6.jar (with props) roller/trunk/tools/struts-2.0.6/lib/tiles-api-2.0-20070207.130156-4.jar (with props) roller/trunk/tools/struts-2.0.6/lib/tiles-core-2.0-20070207.130156-4.jar (with props) roller/trunk/tools/struts-2.0.6/lib/xwork-2.0.1.jar (with props) Removed: roller/trunk/tools/struts-2.0.5/ Modified: roller/trunk/apps/planet/build.xml roller/trunk/properties.xmlf roller/trunk/web/WEB-INF/jsps/authoring/struts2/Resources.jsp roller/trunk/web/WEB-INF/jsps/taglibs-struts2.jsp Modified: roller/trunk/apps/planet/build.xml URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/build.xml?view=diff&rev=539544&r1=539543&r2=539544 ============================================================================== --- roller/trunk/apps/planet/build.xml (original) +++ roller/trunk/apps/planet/build.xml Fri May 18 11:13:36 2007 @@ -84,7 +84,7 @@ - + Modified: roller/trunk/properties.xmlf URL: http://svn.apache.org/viewvc/roller/trunk/properties.xmlf?view=diff&rev=539544&r1=539543&r2=539544 ============================================================================== --- roller/trunk/properties.xmlf (original) +++ roller/trunk/properties.xmlf Fri May 18 11:13:36 2007 @@ -121,7 +121,7 @@ - + Added: roller/trunk/tools/struts-2.0.6/LICENSE.txt URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.0.6/LICENSE.txt?view=auto&rev=539544 ============================================================================== --- roller/trunk/tools/struts-2.0.6/LICENSE.txt (added) +++ roller/trunk/tools/struts-2.0.6/LICENSE.txt Fri May 18 11:13:36 2007 @@ -0,0 +1,174 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. Added: roller/trunk/tools/struts-2.0.6/NOTICE.txt URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.0.6/NOTICE.txt?view=auto&rev=539544 ============================================================================== --- roller/trunk/tools/struts-2.0.6/NOTICE.txt (added) +++ roller/trunk/tools/struts-2.0.6/NOTICE.txt Fri May 18 11:13:36 2007 @@ -0,0 +1,3 @@ +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). + Added: roller/trunk/tools/struts-2.0.6/lib/antlr-2.7.2.jar URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.0.6/lib/antlr-2.7.2.jar?view=auto&rev=539544 ============================================================================== Binary file - no diff available. Propchange: roller/trunk/tools/struts-2.0.6/lib/antlr-2.7.2.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: roller/trunk/tools/struts-2.0.6/lib/commons-beanutils-1.6.jar URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.0.6/lib/commons-beanutils-1.6.jar?view=auto&rev=539544 ============================================================================== Binary file - no diff available. Propchange: roller/trunk/tools/struts-2.0.6/lib/commons-beanutils-1.6.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: roller/trunk/tools/struts-2.0.6/lib/commons-chain-1.1.jar URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.0.6/lib/commons-chain-1.1.jar?view=auto&rev=539544 ============================================================================== Binary file - no diff available. Propchange: roller/trunk/tools/struts-2.0.6/lib/commons-chain-1.1.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: roller/trunk/tools/struts-2.0.6/lib/commons-fileupload-1.2.jar URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.0.6/lib/commons-fileupload-1.2.jar?view=auto&rev=539544 ============================================================================== Binary file - no diff available. Propchange: roller/trunk/tools/struts-2.0.6/lib/commons-fileupload-1.2.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: roller/trunk/tools/struts-2.0.6/lib/commons-io-1.3.1.jar URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.0.6/lib/commons-io-1.3.1.jar?view=auto&rev=539544 ============================================================================== Binary file - no diff available. Propchange: roller/trunk/tools/struts-2.0.6/lib/commons-io-1.3.1.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: roller/trunk/tools/struts-2.0.6/lib/commons-validator-1.3.0.jar URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.0.6/lib/commons-validator-1.3.0.jar?view=auto&rev=539544 ============================================================================== Binary file - no diff available. Propchange: roller/trunk/tools/struts-2.0.6/lib/commons-validator-1.3.0.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: roller/trunk/tools/struts-2.0.6/lib/freemarker-2.3.8.jar URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.0.6/lib/freemarker-2.3.8.jar?view=auto&rev=539544 ============================================================================== Binary file - no diff available. Propchange: roller/trunk/tools/struts-2.0.6/lib/freemarker-2.3.8.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: roller/trunk/tools/struts-2.0.6/lib/ognl-2.6.11.jar URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.0.6/lib/ognl-2.6.11.jar?view=auto&rev=539544 ============================================================================== Binary file - no diff available. Propchange: roller/trunk/tools/struts-2.0.6/lib/ognl-2.6.11.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: roller/trunk/tools/struts-2.0.6/lib/oro-2.0.8.jar URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.0.6/lib/oro-2.0.8.jar?view=auto&rev=539544 ============================================================================== Binary file - no diff available. Propchange: roller/trunk/tools/struts-2.0.6/lib/oro-2.0.8.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: roller/trunk/tools/struts-2.0.6/lib/struts2-core-2.0.6.jar URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.0.6/lib/struts2-core-2.0.6.jar?view=auto&rev=539544 ============================================================================== Binary file - no diff available. Propchange: roller/trunk/tools/struts-2.0.6/lib/struts2-core-2.0.6.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: roller/trunk/tools/struts-2.0.6/lib/struts2-spring-plugin-2.0.6.jar URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.0.6/lib/struts2-spring-plugin-2.0.6.jar?view=auto&rev=539544 ============================================================================== Binary file - no diff available. Propchange: roller/trunk/tools/struts-2.0.6/lib/struts2-spring-plugin-2.0.6.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: roller/trunk/tools/struts-2.0.6/lib/struts2-tiles-plugin-2.0.6.jar URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.0.6/lib/struts2-tiles-plugin-2.0.6.jar?view=auto&rev=539544 ============================================================================== Binary file - no diff available. Propchange: roller/trunk/tools/struts-2.0.6/lib/struts2-tiles-plugin-2.0.6.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: roller/trunk/tools/struts-2.0.6/lib/tiles-api-2.0-20070207.130156-4.jar URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.0.6/lib/tiles-api-2.0-20070207.130156-4.jar?view=auto&rev=539544 ============================================================================== Binary file - no diff available. Propchange: roller/trunk/tools/struts-2.0.6/lib/tiles-api-2.0-20070207.130156-4.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: roller/trunk/tools/struts-2.0.6/lib/tiles-core-2.0-20070207.130156-4.jar URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.0.6/lib/tiles-core-2.0-20070207.130156-4.jar?view=auto&rev=539544 ============================================================================== Binary file - no diff available. Propchange: roller/trunk/tools/struts-2.0.6/lib/tiles-core-2.0-20070207.130156-4.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: roller/trunk/tools/struts-2.0.6/lib/xwork-2.0.1.jar URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.0.6/lib/xwork-2.0.1.jar?view=auto&rev=539544 ============================================================================== Binary file - no diff available. Propchange: roller/trunk/tools/struts-2.0.6/lib/xwork-2.0.1.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: roller/trunk/web/WEB-INF/jsps/authoring/struts2/Resources.jsp URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/authoring/struts2/Resources.jsp?view=diff&rev=539544&r1=539543&r2=539544 ============================================================================== --- roller/trunk/web/WEB-INF/jsps/authoring/struts2/Resources.jsp (original) +++ roller/trunk/web/WEB-INF/jsps/authoring/struts2/Resources.jsp Fri May 18 11:13:36 2007 @@ -158,8 +158,8 @@ - - + + @@ -172,11 +172,10 @@ -  KB - " /> + " /> @@ -185,7 +184,7 @@ -  KB +  KB Modified: roller/trunk/web/WEB-INF/jsps/taglibs-struts2.jsp URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/taglibs-struts2.jsp?view=diff&rev=539544&r1=539543&r2=539544 ============================================================================== --- roller/trunk/web/WEB-INF/jsps/taglibs-struts2.jsp (original) +++ roller/trunk/web/WEB-INF/jsps/taglibs-struts2.jsp Fri May 18 11:13:36 2007 @@ -20,6 +20,6 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> -<%@ taglib uri="http://struts.apache.org/tags-tiles2" prefix="tiles" %> +<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %> <%@ taglib uri="/struts-tags" prefix="s" %> <%@ taglib uri="http://jakarta.apache.org/taglibs/string-1.0.1" prefix="str" %>