You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2009/08/15 13:56:17 UTC

svn commit: r804458 - in /roller/trunk: apps/planet/ apps/weblogger/ apps/weblogger/nbproject/ apps/weblogger/web/WEB-INF/classes/ tools/struts-2.1.6/ tools/struts-2.1.6/lib/

Author: snoopdave
Date: Sat Aug 15 11:56:15 2009
New Revision: 804458

URL: http://svn.apache.org/viewvc?rev=804458&view=rev
Log:
Upgrading to Struts 2.1.6

Added:
    roller/trunk/tools/struts-2.1.6/
    roller/trunk/tools/struts-2.1.6/LICENSE.txt
    roller/trunk/tools/struts-2.1.6/NOTICE.txt
    roller/trunk/tools/struts-2.1.6/lib/
    roller/trunk/tools/struts-2.1.6/lib/antlr-2.7.2.jar   (with props)
    roller/trunk/tools/struts-2.1.6/lib/commons-beanutils-1.7.0.jar   (with props)
    roller/trunk/tools/struts-2.1.6/lib/commons-chain-1.2.jar   (with props)
    roller/trunk/tools/struts-2.1.6/lib/commons-fileupload-1.2.1.jar   (with props)
    roller/trunk/tools/struts-2.1.6/lib/commons-io-1.3.2.jar   (with props)
    roller/trunk/tools/struts-2.1.6/lib/commons-validator-1.3.1.jar   (with props)
    roller/trunk/tools/struts-2.1.6/lib/freemarker-2.3.13.jar   (with props)
    roller/trunk/tools/struts-2.1.6/lib/ognl-2.6.11.jar   (with props)
    roller/trunk/tools/struts-2.1.6/lib/oro-2.0.8.jar   (with props)
    roller/trunk/tools/struts-2.1.6/lib/struts2-core-2.1.6.jar   (with props)
    roller/trunk/tools/struts-2.1.6/lib/struts2-spring-plugin-2.1.6.jar   (with props)
    roller/trunk/tools/struts-2.1.6/lib/struts2-tiles-plugin-2.1.6.jar   (with props)
    roller/trunk/tools/struts-2.1.6/lib/tiles-api-2.0.6.jar   (with props)
    roller/trunk/tools/struts-2.1.6/lib/tiles-core-2.0.6.jar   (with props)
    roller/trunk/tools/struts-2.1.6/lib/tiles-jsp-2.0.6.jar   (with props)
    roller/trunk/tools/struts-2.1.6/lib/xwork-2.1.2.jar   (with props)
Modified:
    roller/trunk/apps/planet/build.xml
    roller/trunk/apps/weblogger/nbproject/project.xml
    roller/trunk/apps/weblogger/properties.xmlf
    roller/trunk/apps/weblogger/web/WEB-INF/classes/struts.xml

Modified: roller/trunk/apps/planet/build.xml
URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/build.xml?rev=804458&r1=804457&r2=804458&view=diff
==============================================================================
--- roller/trunk/apps/planet/build.xml (original)
+++ roller/trunk/apps/planet/build.xml Sat Aug 15 11:56:15 2009
@@ -92,7 +92,7 @@
         <include name="jakarta-taglibs-standard-1.1.2/lib/serializer.jar" />
         
         <!-- Struts 2 -->
-        <include name="struts-2.0.9/lib/*.jar"/>
+        <include name="struts-2.1.6/lib/*.jar"/>
         
         <!-- Struts 2 depends on Spring -->
         <include name="spring-2.5/spring-2.5.4.jar"/>

Modified: roller/trunk/apps/weblogger/nbproject/project.xml
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/nbproject/project.xml?rev=804458&r1=804457&r2=804458&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/nbproject/project.xml (original)
+++ roller/trunk/apps/weblogger/nbproject/project.xml Sat Aug 15 11:56:15 2009
@@ -42,7 +42,7 @@
             </folders>
             <ide-actions>
                 <action name="build">
-                    <target>build</target>
+                    <target>dist</target>
                 </action>
                 <action name="clean">
                     <target>clean</target>
@@ -132,7 +132,7 @@
                 <package-root>src/java</package-root>
                 <package-root>test/java</package-root>
                 <package-root>docs/examples/plugins/pluginmodel/src</package-root>
-                <classpath mode="compile">../../tools/roller-core/roller-core.jar:../../tools/roller-planet/roller-planet-business.jar:../../tools/buildtime/activation.jar:../../tools/buildtime/mail.jar:../../tools/buildtime/tomcat-5.0.28/jsp-api.jar:../../tools/buildtime/tomcat-5.0.28/servlet-api.jar:../../tools/lib/commons-codec-1.3.jar:../../tools/lib/commons-collections-3.2.jar:../../tools/lib/commons-digester-1.6.jar:../../tools/lib/commons-id-0.1-SNAPSHOT.jar:../../tools/lib/commons-lang-2.1.jar:../../tools/lib/commons-logging-1.0.4.jar:../../tools/lib/concurrent-1.3.2.jar:../../tools/lib/guice-1.0.jar:../../tools/lib/jaxen-full.jar:../../tools/lib/jdom.jar:../../tools/lib/log4j-1.2.11.jar:../../tools/lib/lucene-1.4.3.jar:../../tools/lib/rome-fetcher-0.9.jar:../../tools/lib/saxpath.jar:../../tools/lib/taglibs-string.jar:../../tools/lib/velocity-1.5.jar:../../tools/xmlrpc-3.0/lib/ws-commons-util-1.0.1.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-client-3.0.jar:../../tools/xmlr
 pc-3.0/lib/xmlrpc-common-3.0.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-server-3.0.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/jstl.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/serializer.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/standard.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/xalan.jar:../../tools/buildtime/junit-4.1.jar:../../tools/buildtime/ant-1.7.0/ant.jar:../../tools/buildtime/derbyclient.jar:../../tools/buildtime/derby.jar:../../tools/buildtime/derbynet.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:../../tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:../../tools/struts-2.0.9/lib/antlr-2.7.2.jar:../../tools/struts-2.0.9/lib/commons-beanutils-1.6.jar:../../tools/struts-2.0.9/lib/commons-chain-1.1.jar:../../tools/struts-2.0.9/lib/commons-fileupload-1.2.jar:../../tools/struts-2.0.9/lib/commons-io-1.3
 .1.jar:../../tools/struts-2.0.9/lib/commons-validator-1.3.0.jar:../../tools/struts-2.0.9/lib/freemarker-2.3.8.jar:../../tools/struts-2.0.9/lib/ognl-2.6.11.jar:../../tools/struts-2.0.9/lib/oro-2.0.8.jar:../../tools/struts-2.0.9/lib/struts2-core-2.0.9.jar:../../tools/struts-2.0.9/lib/struts2-spring-plugin-2.0.9.jar:../../tools/struts-2.0.9/lib/struts2-tiles-plugin-2.0.9.jar:../../tools/struts-2.0.9/lib/tiles-api-2.0.4.jar:../../tools/struts-2.0.9/lib/tiles-core-2.0.4.jar:../../tools/struts-2.0.9/lib/tiles-jsp-2.0.4.jar:../../tools/struts-2.0.9/lib/xwork-2.0.4.jar:../../tools/lib/commons-httpclient-3.0.1.jar:../../tools/lib/dom3-xercesImpl.jar:../../tools/lib/nekohtml.jar:../../tools/lib/openxri-syntax.jar:../../tools/lib/apache-xml-security.jar:../../tools/lib/dom3-xml-apis.jar:../../tools/lib/openxri-client.jar:../../tools/spring-2.5/spring-2.5.4.jar:../../tools/spring-2.5/spring-security-openid-2.0.3.jar:../../tools/spring-2.5/spring-ldap-1.2.1.jar:../../tools/spring-2.5/spr
 ing-security-taglibs-2.0.3.jar:../../tools/spring-2.5/spring-security-acl-2.0.3.jar:../../tools/spring-2.5/spring-web-2.5.4.jar:../../tools/spring-2.5/spring-security-core-2.0.3.jar:../../tools/oauth/commons-httpclient-3.1.jar:../../tools/oauth/httpclient-4.0-beta1.jar:../../tools/oauth/httpcore-4.0-beta2.jar:../../tools/oauth/oauth-core-20090121.jar:../../tools/lib/rome-1.0.jar:../../tools/lib/rome-fetcher-1.0.jar:../../tools/lib/rome-propono-1.0.jar:../../tools/openjpa-1.2.1/geronimo-jpa_3.0_spec-1.0.jar</classpath>
+                <classpath mode="compile">../../tools/roller-core/roller-core.jar:../../tools/roller-planet/roller-planet-business.jar:../../tools/buildtime/activation.jar:../../tools/buildtime/mail.jar:../../tools/buildtime/tomcat-5.0.28/jsp-api.jar:../../tools/buildtime/tomcat-5.0.28/servlet-api.jar:../../tools/lib/commons-codec-1.3.jar:../../tools/lib/commons-collections-3.2.jar:../../tools/lib/commons-digester-1.6.jar:../../tools/lib/commons-id-0.1-SNAPSHOT.jar:../../tools/lib/commons-lang-2.1.jar:../../tools/lib/commons-logging-1.0.4.jar:../../tools/lib/concurrent-1.3.2.jar:../../tools/lib/guice-1.0.jar:../../tools/lib/jaxen-full.jar:../../tools/lib/jdom.jar:../../tools/lib/log4j-1.2.11.jar:../../tools/lib/lucene-1.4.3.jar:../../tools/lib/rome-fetcher-0.9.jar:../../tools/lib/saxpath.jar:../../tools/lib/taglibs-string.jar:../../tools/lib/velocity-1.5.jar:../../tools/xmlrpc-3.0/lib/ws-commons-util-1.0.1.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-client-3.0.jar:../../tools/xmlr
 pc-3.0/lib/xmlrpc-common-3.0.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-server-3.0.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/jstl.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/serializer.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/standard.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/xalan.jar:../../tools/buildtime/junit-4.1.jar:../../tools/buildtime/ant-1.7.0/ant.jar:../../tools/buildtime/derbyclient.jar:../../tools/buildtime/derby.jar:../../tools/buildtime/derbynet.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:../../tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:../../tools/lib/commons-httpclient-3.0.1.jar:../../tools/lib/dom3-xercesImpl.jar:../../tools/lib/nekohtml.jar:../../tools/lib/openxri-syntax.jar:../../tools/lib/apache-xml-security.jar:../../tools/lib/dom3-xml-apis.jar:../../tools/lib/openxri-client.
 jar:../../tools/spring-2.5/spring-2.5.4.jar:../../tools/spring-2.5/spring-security-openid-2.0.3.jar:../../tools/spring-2.5/spring-ldap-1.2.1.jar:../../tools/spring-2.5/spring-security-taglibs-2.0.3.jar:../../tools/spring-2.5/spring-security-acl-2.0.3.jar:../../tools/spring-2.5/spring-web-2.5.4.jar:../../tools/spring-2.5/spring-security-core-2.0.3.jar:../../tools/oauth/commons-httpclient-3.1.jar:../../tools/oauth/httpclient-4.0-beta1.jar:../../tools/oauth/httpcore-4.0-beta2.jar:../../tools/oauth/oauth-core-20090121.jar:../../tools/lib/rome-1.0.jar:../../tools/lib/rome-fetcher-1.0.jar:../../tools/lib/rome-propono-1.0.jar:../../tools/openjpa-1.2.1/geronimo-jpa_3.0_spec-1.0.jar:../../tools/struts-2.1.6/lib/antlr-2.7.2.jar:../../tools/struts-2.1.6/lib/commons-beanutils-1.7.0.jar:../../tools/struts-2.1.6/lib/commons-chain-1.2.jar:../../tools/struts-2.1.6/lib/commons-fileupload-1.2.1.jar:../../tools/struts-2.1.6/lib/commons-io-1.3.2.jar:../../tools/struts-2.1.6/lib/commons-validato
 r-1.3.1.jar:../../tools/struts-2.1.6/lib/freemarker-2.3.13.jar:../../tools/struts-2.1.6/lib/ognl-2.6.11.jar:../../tools/struts-2.1.6/lib/oro-2.0.8.jar:../../tools/struts-2.1.6/lib/struts2-core-2.1.6.jar:../../tools/struts-2.1.6/lib/struts2-tiles-plugin-2.1.6.jar:../../tools/struts-2.1.6/lib/tiles-api-2.0.6.jar:../../tools/struts-2.1.6/lib/tiles-core-2.0.6.jar:../../tools/struts-2.1.6/lib/tiles-jsp-2.0.6.jar:../../tools/struts-2.1.6/lib/xwork-2.1.2.jar</classpath>
                 <source-level>1.5</source-level>
             </compilation-unit>
         </java-data>

Modified: roller/trunk/apps/weblogger/properties.xmlf
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/properties.xmlf?rev=804458&r1=804457&r2=804458&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/properties.xmlf (original)
+++ roller/trunk/apps/weblogger/properties.xmlf Sat Aug 15 11:56:15 2009
@@ -56,7 +56,7 @@
 <property name="build.jspc"               value="${ro.build}/jspc"/>
 
 <!-- various libraries used by Roller -->
-<property name="tools.struts2"       value="${ro.tools}/struts-2.0.9" />
+<property name="tools.struts2"       value="${ro.tools}/struts-2.1.6" />
 <property name="tools.jpa"           value="${ro.tools}/openjpa-1.2.1" />
 <property name="tools.spring"        value="${ro.tools}/spring-2.5" />
 <property name="tools.jstl"          value="${ro.tools}/jakarta-taglibs-standard-1.1.2" />

Modified: roller/trunk/apps/weblogger/web/WEB-INF/classes/struts.xml
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/classes/struts.xml?rev=804458&r1=804457&r2=804458&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/classes/struts.xml (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/classes/struts.xml Sat Aug 15 11:56:15 2009
@@ -28,17 +28,17 @@
             <interceptor-stack name="rollerStack">
                 <interceptor-ref name="exception"/>
                 <interceptor-ref name="alias"/>
-                <interceptor-ref name="servlet-config"/>
+                <interceptor-ref name="servletConfig"/>
                 <interceptor-ref name="prepare"/>
                 <interceptor-ref name="i18n"/>
                 <interceptor-ref name="chain"/>
                 <interceptor-ref name="debugging"/>
                 <interceptor-ref name="profiling"/>
-                <interceptor-ref name="scoped-model-driven"/>
-                <interceptor-ref name="model-driven"/>
+                <interceptor-ref name="scopedModelDriven"/>
+                <interceptor-ref name="modelDriven"/>
                 <interceptor-ref name="fileUpload"/>
                 <interceptor-ref name="checkbox"/>
-                <interceptor-ref name="static-params"/>
+                <interceptor-ref name="staticParams"/>
                 <interceptor-ref name="params">
                   <param name="excludeParams">dojo\..*</param>
                 </interceptor-ref>
@@ -104,7 +104,7 @@
         <action name="profile!*" method="{1}"
                 class="org.apache.roller.weblogger.ui.struts2.core.Profile">
             <result name="input" type="tiles">.Profile</result>
-            <result name="cancel" type="redirect-action">menu</result>
+            <result name="cancel" type="redirectAction">menu</result>
             <result name="success" type="tiles">.Profile</result>
         </action>
 

Added: roller/trunk/tools/struts-2.1.6/LICENSE.txt
URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.1.6/LICENSE.txt?rev=804458&view=auto
==============================================================================
--- roller/trunk/tools/struts-2.1.6/LICENSE.txt (added)
+++ roller/trunk/tools/struts-2.1.6/LICENSE.txt Sat Aug 15 11:56:15 2009
@@ -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.1.6/NOTICE.txt
URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.1.6/NOTICE.txt?rev=804458&view=auto
==============================================================================
--- roller/trunk/tools/struts-2.1.6/NOTICE.txt (added)
+++ roller/trunk/tools/struts-2.1.6/NOTICE.txt Sat Aug 15 11:56:15 2009
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Added: roller/trunk/tools/struts-2.1.6/lib/antlr-2.7.2.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.1.6/lib/antlr-2.7.2.jar?rev=804458&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/struts-2.1.6/lib/antlr-2.7.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/struts-2.1.6/lib/commons-beanutils-1.7.0.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.1.6/lib/commons-beanutils-1.7.0.jar?rev=804458&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/struts-2.1.6/lib/commons-beanutils-1.7.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/struts-2.1.6/lib/commons-chain-1.2.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.1.6/lib/commons-chain-1.2.jar?rev=804458&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/struts-2.1.6/lib/commons-chain-1.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/struts-2.1.6/lib/commons-fileupload-1.2.1.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.1.6/lib/commons-fileupload-1.2.1.jar?rev=804458&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/struts-2.1.6/lib/commons-fileupload-1.2.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/struts-2.1.6/lib/commons-io-1.3.2.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.1.6/lib/commons-io-1.3.2.jar?rev=804458&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/struts-2.1.6/lib/commons-io-1.3.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/struts-2.1.6/lib/commons-validator-1.3.1.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.1.6/lib/commons-validator-1.3.1.jar?rev=804458&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/struts-2.1.6/lib/commons-validator-1.3.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/struts-2.1.6/lib/freemarker-2.3.13.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.1.6/lib/freemarker-2.3.13.jar?rev=804458&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/struts-2.1.6/lib/freemarker-2.3.13.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/struts-2.1.6/lib/ognl-2.6.11.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.1.6/lib/ognl-2.6.11.jar?rev=804458&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/struts-2.1.6/lib/ognl-2.6.11.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/struts-2.1.6/lib/oro-2.0.8.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.1.6/lib/oro-2.0.8.jar?rev=804458&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/struts-2.1.6/lib/oro-2.0.8.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/struts-2.1.6/lib/struts2-core-2.1.6.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.1.6/lib/struts2-core-2.1.6.jar?rev=804458&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/struts-2.1.6/lib/struts2-core-2.1.6.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/struts-2.1.6/lib/struts2-spring-plugin-2.1.6.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.1.6/lib/struts2-spring-plugin-2.1.6.jar?rev=804458&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/struts-2.1.6/lib/struts2-spring-plugin-2.1.6.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/struts-2.1.6/lib/struts2-tiles-plugin-2.1.6.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.1.6/lib/struts2-tiles-plugin-2.1.6.jar?rev=804458&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/struts-2.1.6/lib/struts2-tiles-plugin-2.1.6.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/struts-2.1.6/lib/tiles-api-2.0.6.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.1.6/lib/tiles-api-2.0.6.jar?rev=804458&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/struts-2.1.6/lib/tiles-api-2.0.6.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/struts-2.1.6/lib/tiles-core-2.0.6.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.1.6/lib/tiles-core-2.0.6.jar?rev=804458&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/struts-2.1.6/lib/tiles-core-2.0.6.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/struts-2.1.6/lib/tiles-jsp-2.0.6.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.1.6/lib/tiles-jsp-2.0.6.jar?rev=804458&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/struts-2.1.6/lib/tiles-jsp-2.0.6.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/struts-2.1.6/lib/xwork-2.1.2.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/struts-2.1.6/lib/xwork-2.1.2.jar?rev=804458&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/struts-2.1.6/lib/xwork-2.1.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream