You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ap...@apache.org on 2007/10/31 21:35:03 UTC
svn commit: r590812 [5/48] - in /struts/struts2/trunk: apps/blank/
apps/blank/src/main/java/example/ apps/blank/src/main/resources/
apps/blank/src/main/resources/example/ apps/blank/src/main/webapp/
apps/mailreader/ apps/mailreader/src/main/java/ apps/...
Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.vm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/exampleSubmited.vm
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/images/backgroundImage.jpg
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/images/leopard.jpg
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/moreSelects.jsp
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Oct 31 13:32:54 2007
@@ -1 +1 @@
-Id Author Date Rev
+Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/moreSelectsSubmit.jsp
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Oct 31 13:32:54 2007
@@ -1 +1 @@
-Id Author Date Rev
+Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp Wed Oct 31 13:32:54 2007
@@ -1,22 +1,22 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
-
-<html>
-<head>
- <title>UI Tags Example</title>
- <sx:head extraLocales="en-us,nl-nl,de-de"/>
-</head>
-<body>
-<table>
-<sx:datetimepicker label="toggleType='wipe'" type="time" value="%{'10:30'}" toggleType="wipe" toggleDuration="300"/>
-<sx:datetimepicker label="toggleType='explode'" type="time" value="%{'13:00'}" toggleType="explode" toggleDuration="500"/>
-<sx:datetimepicker label="toggleType='fade'" type="time" value="%{'13:00'}" toggleType="fade" toggleDuration="500"/>
-<sx:datetimepicker label="With value='today'" name="dddp4" type="time" value="%{'today'}" />
-<sx:datetimepicker label="US format, empty" name="dddp5" type="time" language="en-us" />
-<sx:datetimepicker label="US format, 13:00 hours" name="dddp6" type="time" value="%{'13:00'}" language="en-us" />
-<sx:datetimepicker label="In German" name="dddp7" type="time" value="%{'13:00'}" language="de" />
-<sx:datetimepicker label="In Dutch" name="dddp8" type="time" value="%{'13:00'}" language="nl" />
-</table>
-</body>
-</html>
+
+<html>
+<head>
+ <title>UI Tags Example</title>
+ <sx:head extraLocales="en-us,nl-nl,de-de"/>
+</head>
+<body>
+<table>
+<sx:datetimepicker label="toggleType='wipe'" type="time" value="%{'10:30'}" toggleType="wipe" toggleDuration="300"/>
+<sx:datetimepicker label="toggleType='explode'" type="time" value="%{'13:00'}" toggleType="explode" toggleDuration="500"/>
+<sx:datetimepicker label="toggleType='fade'" type="time" value="%{'13:00'}" toggleType="fade" toggleDuration="500"/>
+<sx:datetimepicker label="With value='today'" name="dddp4" type="time" value="%{'today'}" />
+<sx:datetimepicker label="US format, empty" name="dddp5" type="time" language="en-us" />
+<sx:datetimepicker label="US format, 13:00 hours" name="dddp6" type="time" value="%{'13:00'}" language="en-us" />
+<sx:datetimepicker label="In German" name="dddp7" type="time" value="%{'13:00'}" language="de" />
+<sx:datetimepicker label="In Dutch" name="dddp8" type="time" value="%{'13:00'}" language="nl" />
+</table>
+</body>
+</html>
Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleAjaxDynamic.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleAjaxDynamic.ftl
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleAjaxDynamic.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/treeExampleAjaxDynamic.jsp
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/body.ftl
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/body.jsp
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Oct 31 13:32:54 2007
@@ -1 +1 @@
-Id Author Date Rev
+Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/header.jsp
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Oct 31 13:32:54 2007
@@ -1 +1 @@
-Id Author Date Rev
+Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Oct 31 13:32:54 2007
@@ -1 +1 @@
-Id Author Date Rev
+Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.jsp
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Oct 31 13:32:54 2007
@@ -1 +1 @@
-Id Author Date Rev
+Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/token/example4.ftl
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/validationExamplesStyles.css
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/validation/validationExamplesStyles.css
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/viewSource.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/viewSource.jsp
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/xslt/environment.xsl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/xslt/environment.xsl
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/apps/showcase/src/main/webapp/xslt/index.jsp
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Oct 31 13:32:54 2007
@@ -1 +1 @@
-Id Author Date Rev
+Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/assembly/src/main/resources/build.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/resources/build.xml?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/resources/build.xml (original)
+++ struts/struts2/trunk/assembly/src/main/resources/build.xml Wed Oct 31 13:32:54 2007
@@ -1,53 +1,53 @@
-<?xml version="1.0"?>
-<project name="struts2-core" default="default">
-
- <!-- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
- <!-- directories -->
- <!-- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
- <property name="src.dir" value="src/core/src/main/java"/>
- <property name="build.dir" value="build"/>
- <property name="build.classes.dir" value="${build.dir}/classes"/>
- <property name="dist.dir" value="dist"/>
- <property name="lib.dir" value="lib"/>
-
- <!-- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
- <!-- paths -->
- <!-- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
- <path id="compile.classpath">
- <pathelement location="${build.classes.dir}"/>
- <fileset dir="${lib.dir}">
- <include name="**/*.jar" />
- </fileset>
- </path>
-
- <!-- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
- <!-- targets -->
- <!-- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
- <target name="default"
- depends="dist"
- description="default: build everything"
- />
-
- <target name="clean" description="remove all built files">
- <delete dir="${build.dir}" />
- <delete dir="${dist.dir}" />
- </target>
-
- <target name="dist"
- depends="compile"
- description="create distributables (jars etc)">
- <mkdir dir="${dist.dir}" />
- <jar jarfile="${dist.dir}/struts2-core.jar">
- <fileset dir="${build.classes.dir}"/>
- </jar>
- </target>
- <target name="compile" description="compile java">
- <mkdir dir="${build.classes.dir}" />
- <javac srcdir="${src.dir}"
- destdir="${build.classes.dir}"
- classpathref="compile.classpath"
- debug="on"
- deprecation="on"/>
- </target>
-
-</project>
+<?xml version="1.0"?>
+<project name="struts2-core" default="default">
+
+ <!-- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+ <!-- directories -->
+ <!-- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+ <property name="src.dir" value="src/core/src/main/java"/>
+ <property name="build.dir" value="build"/>
+ <property name="build.classes.dir" value="${build.dir}/classes"/>
+ <property name="dist.dir" value="dist"/>
+ <property name="lib.dir" value="lib"/>
+
+ <!-- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+ <!-- paths -->
+ <!-- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+ <path id="compile.classpath">
+ <pathelement location="${build.classes.dir}"/>
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar" />
+ </fileset>
+ </path>
+
+ <!-- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+ <!-- targets -->
+ <!-- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+ <target name="default"
+ depends="dist"
+ description="default: build everything"
+ />
+
+ <target name="clean" description="remove all built files">
+ <delete dir="${build.dir}" />
+ <delete dir="${dist.dir}" />
+ </target>
+
+ <target name="dist"
+ depends="compile"
+ description="create distributables (jars etc)">
+ <mkdir dir="${dist.dir}" />
+ <jar jarfile="${dist.dir}/struts2-core.jar">
+ <fileset dir="${build.classes.dir}"/>
+ </jar>
+ </target>
+ <target name="compile" description="compile java">
+ <mkdir dir="${build.classes.dir}" />
+ <javac srcdir="${src.dir}"
+ destdir="${build.classes.dir}"
+ classpathref="compile.classpath"
+ debug="on"
+ deprecation="on"/>
+ </target>
+
+</project>
Propchange: struts/struts2/trunk/assembly/src/main/resources/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/assembly/src/main/resources/build.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/backport/ASM-LICENSE.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/backport/ASM-LICENSE.txt?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
--- struts/struts2/trunk/backport/ASM-LICENSE.txt (original)
+++ struts/struts2/trunk/backport/ASM-LICENSE.txt Wed Oct 31 13:32:54 2007
@@ -1,28 +1,28 @@
-
- ASM: a very small and fast Java bytecode manipulation framework
- Copyright (c) 2000-2005 INRIA, France Telecom
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. Neither the name of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- THE POSSIBILITY OF SUCH DAMAGE.
+
+ ASM: a very small and fast Java bytecode manipulation framework
+ Copyright (c) 2000-2005 INRIA, France Telecom
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGE.
Propchange: struts/struts2/trunk/backport/ASM-LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/backport/ASM-LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/backport/LICENSE.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/backport/LICENSE.txt?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
--- struts/struts2/trunk/backport/LICENSE.txt (original)
+++ struts/struts2/trunk/backport/LICENSE.txt Wed Oct 31 13:32:54 2007
@@ -1,26 +1,26 @@
- Copyright (c) 2005 - 2007 Taras Puchko
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. Neither the name of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- THE POSSIBILITY OF SUCH DAMAGE.
+ Copyright (c) 2005 - 2007 Taras Puchko
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGE.
Propchange: struts/struts2/trunk/backport/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/backport/LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/backport/RETROTRANSLATOR-LICENSE.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/backport/RETROTRANSLATOR-LICENSE.txt?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
--- struts/struts2/trunk/backport/RETROTRANSLATOR-LICENSE.txt (original)
+++ struts/struts2/trunk/backport/RETROTRANSLATOR-LICENSE.txt Wed Oct 31 13:32:54 2007
@@ -1,29 +1,29 @@
- Retrotranslator: a Java bytecode transformer that translates Java classes
- compiled with JDK 5.0 into classes that can be run on JVM 1.4.
-
- Copyright (c) 2005, 2006 Taras Puchko
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. Neither the name of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- THE POSSIBILITY OF SUCH DAMAGE.
+ Retrotranslator: a Java bytecode transformer that translates Java classes
+ compiled with JDK 5.0 into classes that can be run on JVM 1.4.
+
+ Copyright (c) 2005, 2006 Taras Puchko
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGE.
Propchange: struts/struts2/trunk/backport/RETROTRANSLATOR-LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/backport/RETROTRANSLATOR-LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/backport/S2-FOR-J4-README.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/backport/S2-FOR-J4-README.txt?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
--- struts/struts2/trunk/backport/S2-FOR-J4-README.txt (original)
+++ struts/struts2/trunk/backport/S2-FOR-J4-README.txt Wed Oct 31 13:32:54 2007
@@ -1,22 +1,22 @@
-STRUTS 2 FOR JAVA 4
-
-Struts 2 is targeted for Java 5, but a "backported" version to Java 4 is being made available,
-using the RetroTranslator tool.
-
-To use Struts 2 with Java 4 (preferably Java 1.4.2), place the enclosed Struts, XWork,
-RetroTranslator, and backport-util-concurrent JARs on your classpath. For complete details on
-using RetroTranslator JARs, see the RetroTranslator site.
-
-* http://retrotranslator.sourceforge.net/
-
-NOTE: The Struts 2 and XWork 2 JARs are complete replacements for the corresponding standard
-Java 5 JARs. Do not use both sets of JARs in the same environment!
-
-If you discover any issues using the Struts 2 for Java 4 JAR, please report them to the Struts
-Dev list or JIRA ticket ww-1391.
-
-* http://struts.apache.org/mail.html
-
-* https://issues.apache.org/struts/browse/WW-1391
-
-Cheers!
+STRUTS 2 FOR JAVA 4
+
+Struts 2 is targeted for Java 5, but a "backported" version to Java 4 is being made available,
+using the RetroTranslator tool.
+
+To use Struts 2 with Java 4 (preferably Java 1.4.2), place the enclosed Struts, XWork,
+RetroTranslator, and backport-util-concurrent JARs on your classpath. For complete details on
+using RetroTranslator JARs, see the RetroTranslator site.
+
+* http://retrotranslator.sourceforge.net/
+
+NOTE: The Struts 2 and XWork 2 JARs are complete replacements for the corresponding standard
+Java 5 JARs. Do not use both sets of JARs in the same environment!
+
+If you discover any issues using the Struts 2 for Java 4 JAR, please report them to the Struts
+Dev list or JIRA ticket ww-1391.
+
+* http://struts.apache.org/mail.html
+
+* https://issues.apache.org/struts/browse/WW-1391
+
+Cheers!
Propchange: struts/struts2/trunk/backport/S2-FOR-J4-README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/backport/S2-FOR-J4-README.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/backport/STRUTS-LICENSE.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/backport/STRUTS-LICENSE.txt?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
--- struts/struts2/trunk/backport/STRUTS-LICENSE.txt (original)
+++ struts/struts2/trunk/backport/STRUTS-LICENSE.txt Wed Oct 31 13:32:54 2007
@@ -1,174 +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.
+ 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.
Propchange: struts/struts2/trunk/backport/STRUTS-LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/backport/STRUTS-LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/backport/XWORK-LICENSE.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/backport/XWORK-LICENSE.txt?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
--- struts/struts2/trunk/backport/XWORK-LICENSE.txt (original)
+++ struts/struts2/trunk/backport/XWORK-LICENSE.txt Wed Oct 31 13:32:54 2007
@@ -1,50 +1,50 @@
-/* ====================================================================
- * The OpenSymphony Software License, Version 1.1
- *
- * (this license is derived and fully compatible with the Apache Software
- * License - see http://www.apache.org/LICENSE.txt)
- *
- * Copyright (c) 2001-2004 The OpenSymphony Group. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * OpenSymphony Group (http://www.opensymphony.com/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "OpenSymphony" and "The OpenSymphony Group"
- * must not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact license@opensymphony.com .
- *
- * 5. Products derived from this software may not be called "OpenSymphony"
- * or "XWork", nor may "OpenSymphony" or "XWork" appear in their
- * name, without prior written permission of the OpenSymphony Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
+/* ====================================================================
+ * The OpenSymphony Software License, Version 1.1
+ *
+ * (this license is derived and fully compatible with the Apache Software
+ * License - see http://www.apache.org/LICENSE.txt)
+ *
+ * Copyright (c) 2001-2004 The OpenSymphony Group. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * OpenSymphony Group (http://www.opensymphony.com/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "OpenSymphony" and "The OpenSymphony Group"
+ * must not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact license@opensymphony.com .
+ *
+ * 5. Products derived from this software may not be called "OpenSymphony"
+ * or "XWork", nor may "OpenSymphony" or "XWork" appear in their
+ * name, without prior written permission of the OpenSymphony Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
*/
Propchange: struts/struts2/trunk/backport/XWORK-LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/backport/XWORK-LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/backport/backport-util-concurrent-3.0.jar
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/backport/readme.html
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/backport/retrotranslator-runtime-1.2.3.jar
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/backport/retrotranslator-transformer-1.2.3.jar
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/backport/translate.bat
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/backport/translate.bat?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
--- struts/struts2/trunk/backport/translate.bat (original)
+++ struts/struts2/trunk/backport/translate.bat Wed Oct 31 13:32:54 2007
@@ -1,3 +1,3 @@
-java -jar retrotranslator-transformer-1.2.3.jar -advanced -srcjar ../lib/struts2-core-2.1.1-SNAPSHOT.jar -destjar struts2-core-backport-2.1.1-SNAPSHOT.jar
-java -jar retrotranslator-transformer-1.2.3.jar -advanced -srcjar ../lib/struts2-api-2.1.1-SNAPSHOT.jar -destjar struts2-api-backport-2.1.1-SNAPSHOT.jar
-java -jar retrotranslator-transformer-1.2.3.jar -advanced -srcjar ../lib/xwork-2.1.1-SNAPSHOT.jar -destjar xwork-backport-2.1.1-SNAPSHOT.jar
+java -jar retrotranslator-transformer-1.2.3.jar -advanced -srcjar ../lib/struts2-core-2.1.1-SNAPSHOT.jar -destjar struts2-core-backport-2.1.1-SNAPSHOT.jar
+java -jar retrotranslator-transformer-1.2.3.jar -advanced -srcjar ../lib/struts2-api-2.1.1-SNAPSHOT.jar -destjar struts2-api-backport-2.1.1-SNAPSHOT.jar
+java -jar retrotranslator-transformer-1.2.3.jar -advanced -srcjar ../lib/xwork-2.1.1-SNAPSHOT.jar -destjar xwork-backport-2.1.1-SNAPSHOT.jar
Propchange: struts/struts2/trunk/backport/translate.bat
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/backport/translate.bat
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ContextBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ContextBean.java?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ContextBean.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ContextBean.java Wed Oct 31 13:32:54 2007
@@ -1,62 +1,62 @@
-/*
- * $Id$
- *
- * 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.
- */
-package org.apache.struts2.components;
-
-import org.apache.struts2.views.annotations.StrutsTagAttribute;
-
-import com.opensymphony.xwork2.util.ValueStack;
-
-/**
- * Base class for control and data tags
- */
-public abstract class ContextBean extends Component {
- protected String var;
-
- public ContextBean(ValueStack stack) {
- super(stack);
- }
-
- protected void putInContext(Object value) {
- if (var != null && var.length() > 0) {
- stack.getContext().put(var, value);
- }
- }
-
- @StrutsTagAttribute(description="Name used to reference the value pushed into the Value Stack")
- public void setVar(String var) {
- if (var != null) {
- this.var = findString(var);
- }
- }
-
- /**
- * To keep backward compatibility
- * TODO remove after 2.1
- */
- @StrutsTagAttribute(description="Deprecated. Use 'var' instead")
- public void setId(String id) {
- setVar(id);
- }
-
- protected String getVar() {
- return this.var;
- }
-}
+/*
+ * $Id$
+ *
+ * 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.
+ */
+package org.apache.struts2.components;
+
+import org.apache.struts2.views.annotations.StrutsTagAttribute;
+
+import com.opensymphony.xwork2.util.ValueStack;
+
+/**
+ * Base class for control and data tags
+ */
+public abstract class ContextBean extends Component {
+ protected String var;
+
+ public ContextBean(ValueStack stack) {
+ super(stack);
+ }
+
+ protected void putInContext(Object value) {
+ if (var != null && var.length() > 0) {
+ stack.getContext().put(var, value);
+ }
+ }
+
+ @StrutsTagAttribute(description="Name used to reference the value pushed into the Value Stack")
+ public void setVar(String var) {
+ if (var != null) {
+ this.var = findString(var);
+ }
+ }
+
+ /**
+ * To keep backward compatibility
+ * TODO remove after 2.1
+ */
+ @StrutsTagAttribute(description="Deprecated. Use 'var' instead")
+ public void setId(String id) {
+ setVar(id);
+ }
+
+ protected String getVar() {
+ return this.var;
+ }
+}
Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ContextBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ContextBean.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java Wed Oct 31 13:32:54 2007
@@ -1,200 +1,200 @@
-/*
- * $Id$
- *
- * 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.
- */
-package org.apache.struts2.components;
-
-import java.io.IOException;
-import java.io.Writer;
-
-import org.apache.struts2.StrutsException;
-import org.apache.struts2.dispatcher.mapper.ActionMapping;
-import org.apache.struts2.views.util.UrlHelper;
-
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-
-/**
- * Implementation of the {@link UrlRenderer} interface that creates URLs suitable in a servlet environment.
- *
- */
-public class ServletUrlRenderer implements UrlRenderer {
- /**
- * Provide a logging instance.
- */
- private static final Logger LOG = LoggerFactory.getLogger(ServletUrlRenderer.class);
-
-
- /**
- * {@inheritDoc}
- */
- public void renderUrl(Writer writer, URL urlComponent) {
- String scheme = urlComponent.req.getScheme();
-
- if (urlComponent.scheme != null) {
- scheme = urlComponent.scheme;
- }
-
- String result;
- if (urlComponent.value == null && urlComponent.action != null) {
- result = urlComponent.determineActionURL(urlComponent.action, urlComponent.namespace, urlComponent.method, urlComponent.req, urlComponent.res, urlComponent.parameters, scheme, urlComponent.includeContext, urlComponent.encode, urlComponent.forceAddSchemeHostAndPort, urlComponent.escapeAmp);
- } else {
- String _value = urlComponent.value;
-
- // We don't include the request parameters cause they would have been
- // prioritised before this [in start(Writer) method]
- if (_value != null && _value.indexOf("?") > 0) {
- _value = _value.substring(0, _value.indexOf("?"));
- }
- result = UrlHelper.buildUrl(_value, urlComponent.req, urlComponent.res, urlComponent.parameters, scheme, urlComponent.includeContext, urlComponent.encode, urlComponent.forceAddSchemeHostAndPort, urlComponent.escapeAmp);
- }
- if ( urlComponent.anchor != null && urlComponent.anchor.length() > 0 ) {
- result += '#' + urlComponent.anchor;
- }
-
- String var = urlComponent.getVar();
-
- if (var != null) {
- urlComponent.putInContext(result);
-
- // add to the request and page scopes as well
- urlComponent.req.setAttribute(var, result);
- } else {
- try {
- writer.write(result);
- } catch (IOException e) {
- throw new StrutsException("IOError: " + e.getMessage(), e);
- }
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public void renderFormUrl(Form formComponent) {
- String namespace = formComponent.determineNamespace(formComponent.namespace, formComponent.getStack(),
- formComponent.request);
- String action;
-
- if(formComponent.action != null) {
- action = formComponent.findString(formComponent.action);
- } else {
- // no action supplied? ok, then default to the current request
- // (action or general URL)
- ActionInvocation ai = (ActionInvocation) formComponent.getStack().getContext().get(
- ActionContext.ACTION_INVOCATION);
- if (ai != null) {
- action = ai.getProxy().getActionName();
- namespace = ai.getProxy().getNamespace();
- } else {
- // hmm, ok, we need to just assume the current URL cut down
- String uri = formComponent.request.getRequestURI();
- action = uri.substring(uri.lastIndexOf('/'));
- }
- }
-
- String actionMethod = "";
- // FIXME: our implementation is flawed - the only concept of ! should be
- // in DefaultActionMapper
- // handle "name!method" convention.
- if (formComponent.enableDynamicMethodInvocation) {
- if (action.indexOf("!") != -1) {
- int endIdx = action.lastIndexOf("!");
- actionMethod = action.substring(endIdx + 1, action.length());
- action = action.substring(0, endIdx);
- }
- }
-
- final ActionConfig actionConfig = formComponent.configuration.getRuntimeConfiguration().getActionConfig(
- namespace, action);
- String actionName = action;
- if (actionConfig != null) {
-
- ActionMapping mapping = new ActionMapping(action, namespace, actionMethod, formComponent.parameters);
- String result = UrlHelper.buildUrl(formComponent.actionMapper.getUriFromActionMapping(mapping),
- formComponent.request, formComponent.response, null);
- formComponent.addParameter("action", result);
-
- // let's try to get the actual action class and name
- // this can be used for getting the list of validators
- formComponent.addParameter("actionName", actionName);
- try {
- Class clazz = formComponent.objectFactory.getClassInstance(actionConfig.getClassName());
- formComponent.addParameter("actionClass", clazz);
- } catch (ClassNotFoundException e) {
- // this is OK, we'll just move on
- }
-
- formComponent.addParameter("namespace", namespace);
-
- // if the name isn't specified, use the action name
- if (formComponent.name == null) {
- formComponent.addParameter("name", action);
- }
-
- // if the id isn't specified, use the action name
- if (formComponent.getId() == null && action!=null ) {
- formComponent.addParameter("id", formComponent.escape(action));
- }
- } else if (action != null) {
- // Since we can't find an action alias in the configuration, we just
- // assume the action attribute supplied is the path to be used as
- // the URI this form is submitting to.
-
- // Warn user that the specified namespace/action combo
- // was not found in the configuration.
- if (namespace != null) {
- LOG.warn("No configuration found for the specified action: '" + action + "' in namespace: '" + namespace + "'. Form action defaulting to 'action' attribute's literal value.");
- }
-
- String result = UrlHelper.buildUrl(action, formComponent.request, formComponent.response, null);
- formComponent.addParameter("action", result);
-
- // namespace: cut out anything between the start and the last /
- int slash = result.lastIndexOf('/');
- if (slash != -1) {
- formComponent.addParameter("namespace", result.substring(0, slash));
- } else {
- formComponent.addParameter("namespace", "");
- }
-
- // name/id: cut out anything between / and . should be the id and
- // name
- String id = formComponent.getId();
- if (id == null) {
- slash = result.lastIndexOf('/');
- int dot = result.indexOf('.', slash);
- if (dot != -1) {
- id = result.substring(slash + 1, dot);
- } else {
- id = result.substring(slash + 1);
- }
- formComponent.addParameter("id", formComponent.escape(id));
- }
- }
-
- // WW-1284
- // evaluate if client-side js is to be enabled. (if validation
- // interceptor does allow validation eg. method is not filtered out)
- formComponent.evaluateClientSideJsEnablement(actionName, namespace, actionMethod);
- }
-}
+/*
+ * $Id$
+ *
+ * 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.
+ */
+package org.apache.struts2.components;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import org.apache.struts2.StrutsException;
+import org.apache.struts2.dispatcher.mapper.ActionMapping;
+import org.apache.struts2.views.util.UrlHelper;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+
+/**
+ * Implementation of the {@link UrlRenderer} interface that creates URLs suitable in a servlet environment.
+ *
+ */
+public class ServletUrlRenderer implements UrlRenderer {
+ /**
+ * Provide a logging instance.
+ */
+ private static final Logger LOG = LoggerFactory.getLogger(ServletUrlRenderer.class);
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void renderUrl(Writer writer, URL urlComponent) {
+ String scheme = urlComponent.req.getScheme();
+
+ if (urlComponent.scheme != null) {
+ scheme = urlComponent.scheme;
+ }
+
+ String result;
+ if (urlComponent.value == null && urlComponent.action != null) {
+ result = urlComponent.determineActionURL(urlComponent.action, urlComponent.namespace, urlComponent.method, urlComponent.req, urlComponent.res, urlComponent.parameters, scheme, urlComponent.includeContext, urlComponent.encode, urlComponent.forceAddSchemeHostAndPort, urlComponent.escapeAmp);
+ } else {
+ String _value = urlComponent.value;
+
+ // We don't include the request parameters cause they would have been
+ // prioritised before this [in start(Writer) method]
+ if (_value != null && _value.indexOf("?") > 0) {
+ _value = _value.substring(0, _value.indexOf("?"));
+ }
+ result = UrlHelper.buildUrl(_value, urlComponent.req, urlComponent.res, urlComponent.parameters, scheme, urlComponent.includeContext, urlComponent.encode, urlComponent.forceAddSchemeHostAndPort, urlComponent.escapeAmp);
+ }
+ if ( urlComponent.anchor != null && urlComponent.anchor.length() > 0 ) {
+ result += '#' + urlComponent.anchor;
+ }
+
+ String var = urlComponent.getVar();
+
+ if (var != null) {
+ urlComponent.putInContext(result);
+
+ // add to the request and page scopes as well
+ urlComponent.req.setAttribute(var, result);
+ } else {
+ try {
+ writer.write(result);
+ } catch (IOException e) {
+ throw new StrutsException("IOError: " + e.getMessage(), e);
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void renderFormUrl(Form formComponent) {
+ String namespace = formComponent.determineNamespace(formComponent.namespace, formComponent.getStack(),
+ formComponent.request);
+ String action;
+
+ if(formComponent.action != null) {
+ action = formComponent.findString(formComponent.action);
+ } else {
+ // no action supplied? ok, then default to the current request
+ // (action or general URL)
+ ActionInvocation ai = (ActionInvocation) formComponent.getStack().getContext().get(
+ ActionContext.ACTION_INVOCATION);
+ if (ai != null) {
+ action = ai.getProxy().getActionName();
+ namespace = ai.getProxy().getNamespace();
+ } else {
+ // hmm, ok, we need to just assume the current URL cut down
+ String uri = formComponent.request.getRequestURI();
+ action = uri.substring(uri.lastIndexOf('/'));
+ }
+ }
+
+ String actionMethod = "";
+ // FIXME: our implementation is flawed - the only concept of ! should be
+ // in DefaultActionMapper
+ // handle "name!method" convention.
+ if (formComponent.enableDynamicMethodInvocation) {
+ if (action.indexOf("!") != -1) {
+ int endIdx = action.lastIndexOf("!");
+ actionMethod = action.substring(endIdx + 1, action.length());
+ action = action.substring(0, endIdx);
+ }
+ }
+
+ final ActionConfig actionConfig = formComponent.configuration.getRuntimeConfiguration().getActionConfig(
+ namespace, action);
+ String actionName = action;
+ if (actionConfig != null) {
+
+ ActionMapping mapping = new ActionMapping(action, namespace, actionMethod, formComponent.parameters);
+ String result = UrlHelper.buildUrl(formComponent.actionMapper.getUriFromActionMapping(mapping),
+ formComponent.request, formComponent.response, null);
+ formComponent.addParameter("action", result);
+
+ // let's try to get the actual action class and name
+ // this can be used for getting the list of validators
+ formComponent.addParameter("actionName", actionName);
+ try {
+ Class clazz = formComponent.objectFactory.getClassInstance(actionConfig.getClassName());
+ formComponent.addParameter("actionClass", clazz);
+ } catch (ClassNotFoundException e) {
+ // this is OK, we'll just move on
+ }
+
+ formComponent.addParameter("namespace", namespace);
+
+ // if the name isn't specified, use the action name
+ if (formComponent.name == null) {
+ formComponent.addParameter("name", action);
+ }
+
+ // if the id isn't specified, use the action name
+ if (formComponent.getId() == null && action!=null ) {
+ formComponent.addParameter("id", formComponent.escape(action));
+ }
+ } else if (action != null) {
+ // Since we can't find an action alias in the configuration, we just
+ // assume the action attribute supplied is the path to be used as
+ // the URI this form is submitting to.
+
+ // Warn user that the specified namespace/action combo
+ // was not found in the configuration.
+ if (namespace != null) {
+ LOG.warn("No configuration found for the specified action: '" + action + "' in namespace: '" + namespace + "'. Form action defaulting to 'action' attribute's literal value.");
+ }
+
+ String result = UrlHelper.buildUrl(action, formComponent.request, formComponent.response, null);
+ formComponent.addParameter("action", result);
+
+ // namespace: cut out anything between the start and the last /
+ int slash = result.lastIndexOf('/');
+ if (slash != -1) {
+ formComponent.addParameter("namespace", result.substring(0, slash));
+ } else {
+ formComponent.addParameter("namespace", "");
+ }
+
+ // name/id: cut out anything between / and . should be the id and
+ // name
+ String id = formComponent.getId();
+ if (id == null) {
+ slash = result.lastIndexOf('/');
+ int dot = result.indexOf('.', slash);
+ if (dot != -1) {
+ id = result.substring(slash + 1, dot);
+ } else {
+ id = result.substring(slash + 1);
+ }
+ formComponent.addParameter("id", formComponent.escape(id));
+ }
+ }
+
+ // WW-1284
+ // evaluate if client-side js is to be enabled. (if validation
+ // interceptor does allow validation eg. method is not filtered out)
+ formComponent.evaluateClientSideJsEnablement(actionName, namespace, actionMethod);
+ }
+}
Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UrlRenderer.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UrlRenderer.java?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UrlRenderer.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UrlRenderer.java Wed Oct 31 13:32:54 2007
@@ -1,43 +1,43 @@
-/*
- * $Id: AttributeMap.java 471756 2006-11-06 15:01:43Z husted $
- *
- * 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.
- */
-package org.apache.struts2.components;
-
-import java.io.Writer;
-
-/**
- * Implementations of this interface are responsible for rendering/creating URLs for a specific
- * environment (e.g. Servlet, Portlet).
- *
- */
-public interface UrlRenderer {
- /**
- * Render a URL.
- * @param writer A writer that the implementation can use to write the result to.
- * @param urlComponent The {@link URL} component that "owns" this renderer.
- */
- void renderUrl(Writer writer, URL urlComponent);
-
- /**
- * Render a Form URL.
- * @param formComponent The {@link Form} component that "owns" this renderer.
- */
- void renderFormUrl(Form formComponent);
-}
+/*
+ * $Id$
+ *
+ * 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.
+ */
+package org.apache.struts2.components;
+
+import java.io.Writer;
+
+/**
+ * Implementations of this interface are responsible for rendering/creating URLs for a specific
+ * environment (e.g. Servlet, Portlet).
+ *
+ */
+public interface UrlRenderer {
+ /**
+ * Render a URL.
+ * @param writer A writer that the implementation can use to write the result to.
+ * @param urlComponent The {@link URL} component that "owns" this renderer.
+ */
+ void renderUrl(Writer writer, URL urlComponent);
+
+ /**
+ * Render a Form URL.
+ * @param formComponent The {@link Form} component that "owns" this renderer.
+ */
+ void renderFormUrl(Form formComponent);
+}
Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UrlRenderer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UrlRenderer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/package.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/package.html?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/package.html (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/package.html Wed Oct 31 13:32:54 2007
@@ -1,6 +1,6 @@
<!--
/*
- * $Id: Action.java 502296 2007-02-01 17:33:39Z niallp $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/package.html
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ParameterAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ParameterAction.java?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ParameterAction.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ParameterAction.java Wed Oct 31 13:32:54 2007
@@ -1,5 +1,5 @@
/*
- * $Id: Action.java 502296 2007-02-01 17:33:39Z niallp $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ParameterAction.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ParameterAction.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ClearSessionInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ClearSessionInterceptor.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
(empty)
Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookiesAware.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookiesAware.java?rev=590812&r1=590811&r2=590812&view=diff
==============================================================================
(empty)
Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookiesAware.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookiesAware.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL