You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mc...@apache.org on 2011/03/14 10:54:11 UTC

svn commit: r1081295 [1/3] - in /struts/struts2/trunk/plugins/javatemplates: ./ src/main/java/org/apache/struts2/views/java/simple/ src/main/resources/ src/test/java/org/apache/struts2/views/java/simple/

Author: mcucchiara
Date: Mon Mar 14 09:54:09 2011
New Revision: 1081295

URL: http://svn.apache.org/viewvc?rev=1081295&view=rev
Log:
Restored subversion properties

Modified:
    struts/struts2/trunk/plugins/javatemplates/pom.xml   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AbstractMessageListHandler.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/ActionErrorHandler.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/ActionMessageHandler.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AnchorHandler.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxHandler.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/DivHandler.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/DynamicAttributesHandler.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/FieldErrorHandler.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/FileHandler.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/HeadHandler.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/HiddenHandler.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/LabelHandler.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/PasswordHandler.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/RadioHandler.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/ResetHandler.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SubmitHandler.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/TextAreaHandler.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/TokenHandler.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/main/resources/struts-plugin.xml   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/AbstractCommonAttributesTest.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/AbstractTest.java
    struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/ActionErrorTest.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/ActionMessageTest.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/AnchorTest.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/CheckboxTest.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/DivTest.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/FieldErrorTest.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/FileTest.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/HeadTest.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/HiddenTest.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/LabelTest.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/PasswordTest.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/ResetTest.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/SubmitTest.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/TextAreaTest.java   (contents, props changed)
    struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/TokenTest.java   (contents, props changed)

Modified: struts/struts2/trunk/plugins/javatemplates/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/pom.xml?rev=1081295&r1=1081294&r2=1081295&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/javatemplates/pom.xml (original)
+++ struts/struts2/trunk/plugins/javatemplates/pom.xml Mon Mar 14 09:54:09 2011
@@ -1,4 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ $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.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

Propchange: struts/struts2/trunk/plugins/javatemplates/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/javatemplates/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AbstractMessageListHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AbstractMessageListHandler.java?rev=1081295&r1=1081294&r2=1081295&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AbstractMessageListHandler.java (original)
+++ struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AbstractMessageListHandler.java Mon Mar 14 09:54:09 2011
@@ -1,74 +1,74 @@
-/*
- * $Id: AbstractTagHandler.java 726340 2008-12-14 02:45:05Z musachy $
- *
- * 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.views.java.simple;
-
-import org.apache.struts2.util.MakeIterator;
-import org.apache.struts2.views.java.Attributes;
-import org.apache.struts2.views.java.TagGenerator;
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Map;
-
-/**
- * Base class for ActionError and ActionMessage
- */
-public abstract class AbstractMessageListHandler extends AbstractTagHandler implements TagGenerator {
-    public void generate() throws IOException {
-        Map<String, Object> params = context.getParameters();
-        Object errorsObj = findValue(getListExpression());
-
-        if (errorsObj != null) {
-            Iterator itt = MakeIterator.convert(errorsObj);
-            if (itt.hasNext()) {
-                Attributes attrs = new Attributes();
-                attrs.addIfExists("style", params.get("cssStyle"))
-                        .add("class", params.containsKey("cssClass") ? (String) params.get("cssClass") : getDefaultClass());
-                start("ul", attrs);
-                while (itt.hasNext()) {
-                    String error = (String) itt.next();
-
-                    //li for each error
-                    start("li", null);
-
-                    //span for error
-                    start("span", null);
-                    characters(error);
-                    end("span");
-                    end("li");
-
-                }
-                end("ul");
-            }
-        }
-    }
-
-    /*
-     * Expression used to get list from stack
-     */
-    protected abstract String getListExpression();
-
-    /*
-    * default class for UL element
-    */
-    protected abstract String getDefaultClass();
-}
-
+/*
+ * $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.views.java.simple;
+
+import org.apache.struts2.util.MakeIterator;
+import org.apache.struts2.views.java.Attributes;
+import org.apache.struts2.views.java.TagGenerator;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * Base class for ActionError and ActionMessage
+ */
+public abstract class AbstractMessageListHandler extends AbstractTagHandler implements TagGenerator {
+    public void generate() throws IOException {
+        Map<String, Object> params = context.getParameters();
+        Object errorsObj = findValue(getListExpression());
+
+        if (errorsObj != null) {
+            Iterator itt = MakeIterator.convert(errorsObj);
+            if (itt.hasNext()) {
+                Attributes attrs = new Attributes();
+                attrs.addIfExists("style", params.get("cssStyle"))
+                        .add("class", params.containsKey("cssClass") ? (String) params.get("cssClass") : getDefaultClass());
+                start("ul", attrs);
+                while (itt.hasNext()) {
+                    String error = (String) itt.next();
+
+                    //li for each error
+                    start("li", null);
+
+                    //span for error
+                    start("span", null);
+                    characters(error);
+                    end("span");
+                    end("li");
+
+                }
+                end("ul");
+            }
+        }
+    }
+
+    /*
+     * Expression used to get list from stack
+     */
+    protected abstract String getListExpression();
+
+    /*
+    * default class for UL element
+    */
+    protected abstract String getDefaultClass();
+}
+

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AbstractMessageListHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AbstractMessageListHandler.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/ActionErrorHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/ActionErrorHandler.java?rev=1081295&r1=1081294&r2=1081295&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/ActionErrorHandler.java (original)
+++ struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/ActionErrorHandler.java Mon Mar 14 09:54:09 2011
@@ -1,32 +1,32 @@
-/*
- * $Id: SelectHandler.java 726340 2008-12-14 02:45:05Z musachy $
- *
- * 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.views.java.simple;
-
-public class ActionErrorHandler extends AbstractMessageListHandler {
-    protected String getListExpression() {
-        return "actionErrors";
-    }
-
-    @Override
-    protected String getDefaultClass() {
-        return "errorMessage";
-    }
-}
+/*
+ * $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.views.java.simple;
+
+public class ActionErrorHandler extends AbstractMessageListHandler {
+    protected String getListExpression() {
+        return "actionErrors";
+    }
+
+    @Override
+    protected String getDefaultClass() {
+        return "errorMessage";
+    }
+}

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/ActionErrorHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/ActionErrorHandler.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/ActionMessageHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/ActionMessageHandler.java?rev=1081295&r1=1081294&r2=1081295&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/ActionMessageHandler.java (original)
+++ struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/ActionMessageHandler.java Mon Mar 14 09:54:09 2011
@@ -1,12 +1,33 @@
-package org.apache.struts2.views.java.simple;
-
-public class ActionMessageHandler extends AbstractMessageListHandler {
-    protected String getListExpression() {
-        return "actionMessages";
-    }
-
-    @Override
-    protected String getDefaultClass() {
-        return "actionMessage";
-    }
-}
+/*
+ * $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.views.java.simple;
+
+public class ActionMessageHandler extends AbstractMessageListHandler {
+    protected String getListExpression() {
+        return "actionMessages";
+    }
+
+    @Override
+    protected String getDefaultClass() {
+        return "actionMessage";
+    }
+}

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/ActionMessageHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/ActionMessageHandler.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AnchorHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AnchorHandler.java?rev=1081295&r1=1081294&r2=1081295&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AnchorHandler.java (original)
+++ struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AnchorHandler.java Mon Mar 14 09:54:09 2011
@@ -1,55 +1,55 @@
-/*
- * $Id: SelectHandler.java 726340 2008-12-14 02:45:05Z musachy $
- *
- * 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.views.java.simple;
-
-import org.apache.struts2.views.java.Attributes;
-import org.apache.struts2.views.java.TagGenerator;
-import org.apache.commons.lang.StringUtils;
-
-import java.io.IOException;
-import java.util.Map;
-
-public class AnchorHandler extends AbstractTagHandler implements TagGenerator {
-    public void generate() throws IOException {
-        //all rendering must happend at the end of the tag, so we can support nested params
-    }
-
-    public static class CloseHandler extends AbstractTagHandler implements TagGenerator {
-        public void generate() throws IOException {
-            Map<String, Object> params = context.getParameters();
-
-            Attributes attrs = new Attributes();
-
-            attrs.addIfExists("name", params.get("name"))
-                    .addIfExists("id", params.get("id"))
-                    .addIfExists("class", params.get("cssClass"))
-                    .addIfExists("style", params.get("cssStyle"))
-                    .addIfExists("href", params.get("href"), false)
-                    .addIfExists("title", params.get("title"))
-                    .addIfExists("tabindex", params.get("tabindex"));
-            start("a", attrs);
-            String body = (String) params.get("body");
-            if (StringUtils.isNotEmpty(body))
-                characters(body, false);
-            end("a");
-        }
-    }
-}
+/*
+ * $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.views.java.simple;
+
+import org.apache.struts2.views.java.Attributes;
+import org.apache.struts2.views.java.TagGenerator;
+import org.apache.commons.lang.StringUtils;
+
+import java.io.IOException;
+import java.util.Map;
+
+public class AnchorHandler extends AbstractTagHandler implements TagGenerator {
+    public void generate() throws IOException {
+        //all rendering must happend at the end of the tag, so we can support nested params
+    }
+
+    public static class CloseHandler extends AbstractTagHandler implements TagGenerator {
+        public void generate() throws IOException {
+            Map<String, Object> params = context.getParameters();
+
+            Attributes attrs = new Attributes();
+
+            attrs.addIfExists("name", params.get("name"))
+                    .addIfExists("id", params.get("id"))
+                    .addIfExists("class", params.get("cssClass"))
+                    .addIfExists("style", params.get("cssStyle"))
+                    .addIfExists("href", params.get("href"), false)
+                    .addIfExists("title", params.get("title"))
+                    .addIfExists("tabindex", params.get("tabindex"));
+            start("a", attrs);
+            String body = (String) params.get("body");
+            if (StringUtils.isNotEmpty(body))
+                characters(body, false);
+            end("a");
+        }
+    }
+}

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AnchorHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AnchorHandler.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxHandler.java?rev=1081295&r1=1081294&r2=1081295&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxHandler.java (original)
+++ struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxHandler.java Mon Mar 14 09:54:09 2011
@@ -1,45 +1,66 @@
-package org.apache.struts2.views.java.simple;
-
-import org.apache.struts2.views.java.Attributes;
-import org.apache.struts2.views.java.TagGenerator;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.StringEscapeUtils;
-
-import java.io.IOException;
-import java.util.Map;
-
-public class CheckboxHandler extends AbstractTagHandler implements TagGenerator {
-    public void generate() throws IOException {
-        Map<String, Object> params = context.getParameters();
-        Attributes attrs = new Attributes();
-
-        String fieldValue = (String) params.get("fieldValue");
-        String id = (String) params.get("id");
-        String name = (String) params.get("name");
-        Object disabled = params.get("disabled");
-
-        attrs.add("type", "checkbox")
-                .add("name", name)
-                .add("value", fieldValue)
-                .addIfTrue("checked", params.get("nameValue"))
-                .addIfTrue("readonly", params.get("readonly"))
-                .addIfTrue("disabled", disabled)
-                .addIfExists("tabindex", params.get("tabindex"))
-                .addIfExists("id", id)
-                .addIfExists("class", params.get("cssClass"))
-                .addIfExists("style", params.get("cssStyle"))
-                .addIfExists("title", params.get("title"));
-        start("input", attrs);
-        end("input");
-
-        //hidden input
-        attrs = new Attributes();
-        attrs.add("type", "hidden")
-                .add("id", "__checkbox_" + StringUtils.defaultString(StringEscapeUtils.escapeHtml(id)))
-                .add("name", "__checkbox_" + StringUtils.defaultString(StringEscapeUtils.escapeHtml(name)))
-                .add("value", "__checkbox_" + StringUtils.defaultString(StringEscapeUtils.escapeHtml(fieldValue)))
-                .addIfTrue("disabled", disabled);
-        start("input", attrs);
-        end("input");
-    }
-}
+/*
+ * $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.views.java.simple;
+
+import org.apache.struts2.views.java.Attributes;
+import org.apache.struts2.views.java.TagGenerator;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.StringEscapeUtils;
+
+import java.io.IOException;
+import java.util.Map;
+
+public class CheckboxHandler extends AbstractTagHandler implements TagGenerator {
+    public void generate() throws IOException {
+        Map<String, Object> params = context.getParameters();
+        Attributes attrs = new Attributes();
+
+        String fieldValue = (String) params.get("fieldValue");
+        String id = (String) params.get("id");
+        String name = (String) params.get("name");
+        Object disabled = params.get("disabled");
+
+        attrs.add("type", "checkbox")
+                .add("name", name)
+                .add("value", fieldValue)
+                .addIfTrue("checked", params.get("nameValue"))
+                .addIfTrue("readonly", params.get("readonly"))
+                .addIfTrue("disabled", disabled)
+                .addIfExists("tabindex", params.get("tabindex"))
+                .addIfExists("id", id)
+                .addIfExists("class", params.get("cssClass"))
+                .addIfExists("style", params.get("cssStyle"))
+                .addIfExists("title", params.get("title"));
+        start("input", attrs);
+        end("input");
+
+        //hidden input
+        attrs = new Attributes();
+        attrs.add("type", "hidden")
+                .add("id", "__checkbox_" + StringUtils.defaultString(StringEscapeUtils.escapeHtml(id)))
+                .add("name", "__checkbox_" + StringUtils.defaultString(StringEscapeUtils.escapeHtml(name)))
+                .add("value", "__checkbox_" + StringUtils.defaultString(StringEscapeUtils.escapeHtml(fieldValue)))
+                .addIfTrue("disabled", disabled);
+        start("input", attrs);
+        end("input");
+    }
+}

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxHandler.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java?rev=1081295&r1=1081294&r2=1081295&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java (original)
+++ struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java Mon Mar 14 09:54:09 2011
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/CheckboxListHandler.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/DivHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/DivHandler.java?rev=1081295&r1=1081294&r2=1081295&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/DivHandler.java (original)
+++ struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/DivHandler.java Mon Mar 14 09:54:09 2011
@@ -1,46 +1,46 @@
-/*
- * $Id: CommonAttributesHandler.java 726340 2008-12-14 02:45:05Z musachy $
- *
- * 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.views.java.simple;
-
-import org.apache.struts2.views.java.Attributes;
-import org.apache.struts2.views.java.TagGenerator;
-
-import java.io.IOException;
-import java.util.Map;
-
-public class DivHandler extends AbstractTagHandler implements TagGenerator {
-    public void generate() throws IOException {
-        Map<String, Object> params = context.getParameters();
-        Attributes attrs = new Attributes();
-        attrs.addIfExists("name", params.get("name"))
-                .addIfExists("id", params.get("id"))
-                .addIfExists("class", params.get("cssClass"))
-                .addIfExists("style", params.get("cssStyle"))
-                .addIfExists("title", params.get("title"));
-        super.start("div", attrs);
-    }
-
-    public static class CloseHandler extends AbstractTagHandler implements TagGenerator {
-        public void generate() throws IOException {
-            end("div");
-        }
-    }
-}
+/*
+ * $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.views.java.simple;
+
+import org.apache.struts2.views.java.Attributes;
+import org.apache.struts2.views.java.TagGenerator;
+
+import java.io.IOException;
+import java.util.Map;
+
+public class DivHandler extends AbstractTagHandler implements TagGenerator {
+    public void generate() throws IOException {
+        Map<String, Object> params = context.getParameters();
+        Attributes attrs = new Attributes();
+        attrs.addIfExists("name", params.get("name"))
+                .addIfExists("id", params.get("id"))
+                .addIfExists("class", params.get("cssClass"))
+                .addIfExists("style", params.get("cssStyle"))
+                .addIfExists("title", params.get("title"));
+        super.start("div", attrs);
+    }
+
+    public static class CloseHandler extends AbstractTagHandler implements TagGenerator {
+        public void generate() throws IOException {
+            end("div");
+        }
+    }
+}

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/DivHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/DivHandler.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/DynamicAttributesHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/DynamicAttributesHandler.java?rev=1081295&r1=1081294&r2=1081295&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/DynamicAttributesHandler.java (original)
+++ struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/DynamicAttributesHandler.java Mon Mar 14 09:54:09 2011
@@ -1,22 +1,43 @@
-package org.apache.struts2.views.java.simple;
-
-import org.apache.struts2.views.java.Attributes;
-
-import java.io.IOException;
-import java.util.Map;
-
-/**
- * Adds dynamic attributes
- */
-public class DynamicAttributesHandler extends AbstractTagHandler {
-
-    /* (non-Javadoc)
-     * @see org.apache.struts2.views.java.simple.AbstractTagHandler#start(java.lang.String, org.apache.struts2.views.java.Attributes)
-     */
-    @Override
-    public void start(String name, Attributes a) throws IOException {
-        a.putAll((Map<String, String>) context.getParameters().get("dynamicAttributes"));
-        super.start(name, a);
-    }
-
-}
+/*
+ * $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.views.java.simple;
+
+import org.apache.struts2.views.java.Attributes;
+
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * Adds dynamic attributes
+ */
+public class DynamicAttributesHandler extends AbstractTagHandler {
+
+    /* (non-Javadoc)
+     * @see org.apache.struts2.views.java.simple.AbstractTagHandler#start(java.lang.String, org.apache.struts2.views.java.Attributes)
+     */
+    @Override
+    public void start(String name, Attributes a) throws IOException {
+        a.putAll((Map<String, String>) context.getParameters().get("dynamicAttributes"));
+        super.start(name, a);
+    }
+
+}

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/DynamicAttributesHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/DynamicAttributesHandler.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/FieldErrorHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/FieldErrorHandler.java?rev=1081295&r1=1081294&r2=1081295&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/FieldErrorHandler.java (original)
+++ struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/FieldErrorHandler.java Mon Mar 14 09:54:09 2011
@@ -1,78 +1,78 @@
-/*
- * $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.views.java.simple;
-
-import org.apache.struts2.views.java.Attributes;
-import org.apache.struts2.views.java.TagGenerator;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-public class FieldErrorHandler extends AbstractTagHandler implements TagGenerator {
-    public void generate() throws IOException {
-        Map<String, Object> params = context.getParameters();
-        Map<String, List<String>> errors = (Map<String, List<String>>) findValue("fieldErrors");
-        List<String> fieldErrorFieldNames = (List<String>) params.get("errorFieldNames");
-
-        if (fieldErrorFieldNames != null && !fieldErrorFieldNames.isEmpty()) {
-            //wrapping ul
-            Attributes attrs = new Attributes();
-            attrs.addIfExists("style", params.get("cssStyle"))
-                    .add("class", params.containsKey("cssClass") ? (String) params.get("cssClass") : "errorMessage");
-            start("ul", attrs);
-
-            //iterate over field error names
-            for (String fieldErrorFieldName : fieldErrorFieldNames) {
-                List<String> fieldErrors = errors.get(fieldErrorFieldName);
-                if (fieldErrors != null) {
-                    for (String fieldError : fieldErrors) {
-                        start("li", null);
-                        start("span", null);
-                        characters(fieldError);
-                        end("span");
-                        end("li");
-                    }
-                }
-            }
-
-            end("ul");
-        } else if (errors != null && !errors.isEmpty()) {
-            //wrapping ul
-            Attributes attrs = new Attributes();
-            attrs.addIfExists("style", params.get("cssStyle"))
-                    .add("class", params.containsKey("cssClass") ? (String) params.get("cssClass") : "errorMessage");
-            start("ul", attrs);
-
-            for (Map.Entry<String, List<String>> errorEntry : errors.entrySet()) {
-                for (String fieldError : errorEntry.getValue()) {
-                    start("li", null);
-                    start("span", null);
-                    characters(fieldError);
-                    end("span");
-                    end("li");
-                }
-            }
-
-            end("ul");
-        }
-    }
-}
+/*
+ * $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.views.java.simple;
+
+import org.apache.struts2.views.java.Attributes;
+import org.apache.struts2.views.java.TagGenerator;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+public class FieldErrorHandler extends AbstractTagHandler implements TagGenerator {
+    public void generate() throws IOException {
+        Map<String, Object> params = context.getParameters();
+        Map<String, List<String>> errors = (Map<String, List<String>>) findValue("fieldErrors");
+        List<String> fieldErrorFieldNames = (List<String>) params.get("errorFieldNames");
+
+        if (fieldErrorFieldNames != null && !fieldErrorFieldNames.isEmpty()) {
+            //wrapping ul
+            Attributes attrs = new Attributes();
+            attrs.addIfExists("style", params.get("cssStyle"))
+                    .add("class", params.containsKey("cssClass") ? (String) params.get("cssClass") : "errorMessage");
+            start("ul", attrs);
+
+            //iterate over field error names
+            for (String fieldErrorFieldName : fieldErrorFieldNames) {
+                List<String> fieldErrors = errors.get(fieldErrorFieldName);
+                if (fieldErrors != null) {
+                    for (String fieldError : fieldErrors) {
+                        start("li", null);
+                        start("span", null);
+                        characters(fieldError);
+                        end("span");
+                        end("li");
+                    }
+                }
+            }
+
+            end("ul");
+        } else if (errors != null && !errors.isEmpty()) {
+            //wrapping ul
+            Attributes attrs = new Attributes();
+            attrs.addIfExists("style", params.get("cssStyle"))
+                    .add("class", params.containsKey("cssClass") ? (String) params.get("cssClass") : "errorMessage");
+            start("ul", attrs);
+
+            for (Map.Entry<String, List<String>> errorEntry : errors.entrySet()) {
+                for (String fieldError : errorEntry.getValue()) {
+                    start("li", null);
+                    start("span", null);
+                    characters(fieldError);
+                    end("span");
+                    end("li");
+                }
+            }
+
+            end("ul");
+        }
+    }
+}

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/FieldErrorHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/FieldErrorHandler.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/FileHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/FileHandler.java?rev=1081295&r1=1081294&r2=1081295&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/FileHandler.java (original)
+++ struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/FileHandler.java Mon Mar 14 09:54:09 2011
@@ -1,49 +1,49 @@
-/*
- * $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.views.java.simple;
-
-import org.apache.struts2.views.java.Attributes;
-import org.apache.struts2.views.java.TagGenerator;
-
-import java.io.IOException;
-import java.util.Map;
-
-public class FileHandler extends AbstractTagHandler implements TagGenerator {
-
-    public void generate() throws IOException {
-        Map<String, Object> params = context.getParameters();
-        Attributes a = new Attributes();
-
-        a.addDefaultToEmpty("name", params.get("name"))
-                .add("type", "file")
-                .addIfExists("size", params.get("size"))
-                .addIfExists("value", params.get("nameValue"), false)
-                .addIfTrue("disabled", params.get("disabled"))
-                .addIfExists("accept", params.get("accept"))
-                .addIfExists("tabindex", params.get("tabindex"))
-                .addIfExists("id", params.get("id"))
-                .addIfExists("class", params.get("cssClass"))
-                .addIfExists("style", params.get("cssStyle"))
-                .addIfExists("title", params.get("title"));
-        super.start("input", a);
-        super.end("input");
-    }
-}
+/*
+ * $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.views.java.simple;
+
+import org.apache.struts2.views.java.Attributes;
+import org.apache.struts2.views.java.TagGenerator;
+
+import java.io.IOException;
+import java.util.Map;
+
+public class FileHandler extends AbstractTagHandler implements TagGenerator {
+
+    public void generate() throws IOException {
+        Map<String, Object> params = context.getParameters();
+        Attributes a = new Attributes();
+
+        a.addDefaultToEmpty("name", params.get("name"))
+                .add("type", "file")
+                .addIfExists("size", params.get("size"))
+                .addIfExists("value", params.get("nameValue"), false)
+                .addIfTrue("disabled", params.get("disabled"))
+                .addIfExists("accept", params.get("accept"))
+                .addIfExists("tabindex", params.get("tabindex"))
+                .addIfExists("id", params.get("id"))
+                .addIfExists("class", params.get("cssClass"))
+                .addIfExists("style", params.get("cssStyle"))
+                .addIfExists("title", params.get("title"));
+        super.start("input", a);
+        super.end("input");
+    }
+}

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/FileHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/FileHandler.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/HeadHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/HeadHandler.java?rev=1081295&r1=1081294&r2=1081295&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/HeadHandler.java (original)
+++ struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/HeadHandler.java Mon Mar 14 09:54:09 2011
@@ -1,50 +1,50 @@
-/*
- * $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.views.java.simple;
-
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.views.java.Attributes;
-import org.apache.struts2.views.java.TagGenerator;
-
-import java.io.IOException;
-
-public class HeadHandler extends AbstractTagHandler implements TagGenerator {
-
-    public void generate() throws IOException {
-        Attributes attrs = new Attributes();
-        attrs.put("type", "text/javascript");
-
-        String base = ServletActionContext.getRequest().getContextPath();
-        attrs.put("base", base);
-        
-        StringBuilder sb = new StringBuilder();
-        if (base != null) {
-            sb.append(base);
-        }
-        
-        sb.append("/struts/utils.js");
-        attrs.put("src", sb.toString());
-
-        super.start("script", attrs);
-        super.end("script");
-    }
-}
+/*
+ * $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.views.java.simple;
+
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.views.java.Attributes;
+import org.apache.struts2.views.java.TagGenerator;
+
+import java.io.IOException;
+
+public class HeadHandler extends AbstractTagHandler implements TagGenerator {
+
+    public void generate() throws IOException {
+        Attributes attrs = new Attributes();
+        attrs.put("type", "text/javascript");
+
+        String base = ServletActionContext.getRequest().getContextPath();
+        attrs.put("base", base);
+        
+        StringBuilder sb = new StringBuilder();
+        if (base != null) {
+            sb.append(base);
+        }
+        
+        sb.append("/struts/utils.js");
+        attrs.put("src", sb.toString());
+
+        super.start("script", attrs);
+        super.end("script");
+    }
+}

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/HeadHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/HeadHandler.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/HiddenHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/HiddenHandler.java?rev=1081295&r1=1081294&r2=1081295&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/HiddenHandler.java (original)
+++ struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/HiddenHandler.java Mon Mar 14 09:54:09 2011
@@ -1,45 +1,45 @@
-/*
- * $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.views.java.simple;
-
-import org.apache.struts2.views.java.Attributes;
-import org.apache.struts2.views.java.TagGenerator;
-
-import java.io.IOException;
-import java.util.Map;
-
-public class HiddenHandler extends AbstractTagHandler implements TagGenerator {
-
-    public void generate() throws IOException {
-        Map<String, Object> params = context.getParameters();
-        Attributes a = new Attributes();
-
-        a.addDefaultToEmpty("name", params.get("name"))
-                .add("type", "hidden")
-                .addIfExists("value", params.get("nameValue"), false)
-                .addIfTrue("disabled", params.get("disabled"))
-                .addIfExists("id", params.get("id"))
-                .addIfExists("class", params.get("cssClass"))
-                .addIfExists("style", params.get("cssStyle"));
-        super.start("input", a);
-        super.end("input");
-    }
-}
+/*
+ * $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.views.java.simple;
+
+import org.apache.struts2.views.java.Attributes;
+import org.apache.struts2.views.java.TagGenerator;
+
+import java.io.IOException;
+import java.util.Map;
+
+public class HiddenHandler extends AbstractTagHandler implements TagGenerator {
+
+    public void generate() throws IOException {
+        Map<String, Object> params = context.getParameters();
+        Attributes a = new Attributes();
+
+        a.addDefaultToEmpty("name", params.get("name"))
+                .add("type", "hidden")
+                .addIfExists("value", params.get("nameValue"), false)
+                .addIfTrue("disabled", params.get("disabled"))
+                .addIfExists("id", params.get("id"))
+                .addIfExists("class", params.get("cssClass"))
+                .addIfExists("style", params.get("cssStyle"));
+        super.start("input", a);
+        super.end("input");
+    }
+}

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/HiddenHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/HiddenHandler.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/LabelHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/LabelHandler.java?rev=1081295&r1=1081294&r2=1081295&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/LabelHandler.java (original)
+++ struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/LabelHandler.java Mon Mar 14 09:54:09 2011
@@ -1,48 +1,48 @@
-/*
- * $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.views.java.simple;
-
-import org.apache.struts2.views.java.TagGenerator;
-import org.apache.struts2.views.java.Attributes;
-import org.apache.commons.lang.StringUtils;
-
-import java.io.IOException;
-import java.util.Map;
-
-public class LabelHandler extends AbstractTagHandler implements TagGenerator {
-
-    public void generate() throws IOException {
-        Map<String, Object> params = context.getParameters();
-        Attributes a = new Attributes();
-
-        a.addDefaultToEmpty("name", params.get("name"))
-                .addIfExists("for", params.get("for"))
-                .addIfExists("id", params.get("id"))
-                .addIfExists("class", params.get("cssClass"))
-                .addIfExists("style", params.get("cssStyle"))
-                .addIfExists("title", params.get("title"));
-        super.start("label", a);
-        String value = (String) params.get("nameValue");
-        if (StringUtils.isNotEmpty(value))
-            characters(value);
-        super.end("label");
-    }
-}
+/*
+ * $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.views.java.simple;
+
+import org.apache.struts2.views.java.TagGenerator;
+import org.apache.struts2.views.java.Attributes;
+import org.apache.commons.lang.StringUtils;
+
+import java.io.IOException;
+import java.util.Map;
+
+public class LabelHandler extends AbstractTagHandler implements TagGenerator {
+
+    public void generate() throws IOException {
+        Map<String, Object> params = context.getParameters();
+        Attributes a = new Attributes();
+
+        a.addDefaultToEmpty("name", params.get("name"))
+                .addIfExists("for", params.get("for"))
+                .addIfExists("id", params.get("id"))
+                .addIfExists("class", params.get("cssClass"))
+                .addIfExists("style", params.get("cssStyle"))
+                .addIfExists("title", params.get("title"));
+        super.start("label", a);
+        String value = (String) params.get("nameValue");
+        if (StringUtils.isNotEmpty(value))
+            characters(value);
+        super.end("label");
+    }
+}

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/LabelHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/LabelHandler.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/PasswordHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/PasswordHandler.java?rev=1081295&r1=1081294&r2=1081295&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/PasswordHandler.java (original)
+++ struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/PasswordHandler.java Mon Mar 14 09:54:09 2011
@@ -1,54 +1,54 @@
-/*
- * $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.views.java.simple;
-
-import org.apache.struts2.views.java.TagGenerator;
-import org.apache.struts2.views.java.Attributes;
-
-import java.io.IOException;
-import java.util.Map;
-
-public class PasswordHandler extends AbstractTagHandler implements TagGenerator {
-
-    public void generate() throws IOException {
-        Map<String, Object> params = context.getParameters();
-        Attributes attrs = new Attributes();
-
-        Boolean showPassword = (Boolean) params.get("showPassword");
-        if (showPassword != null && showPassword)
-           attrs.addIfExists("value",  params.get("nameValue"), false);
-
-        attrs.addDefaultToEmpty("name", params.get("name"))
-                .add("type", "password")
-                .addIfExists("size", params.get("size"))
-                .addIfExists("maxlength", params.get("maxlength"))
-                .addIfTrue("disabled", params.get("disabled"))
-                .addIfTrue("readonly", params.get("readonly"))
-                .addIfExists("tabindex", params.get("tabindex"))
-                .addIfExists("id", params.get("id"))
-                .addIfExists("class", params.get("cssClass"))
-                .addIfExists("style", params.get("cssStyle"))
-                .addIfExists("title", params.get("title"));
-        super.start("input", attrs);
-        super.end("input");
-    }
-}
-
+/*
+ * $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.views.java.simple;
+
+import org.apache.struts2.views.java.TagGenerator;
+import org.apache.struts2.views.java.Attributes;
+
+import java.io.IOException;
+import java.util.Map;
+
+public class PasswordHandler extends AbstractTagHandler implements TagGenerator {
+
+    public void generate() throws IOException {
+        Map<String, Object> params = context.getParameters();
+        Attributes attrs = new Attributes();
+
+        Boolean showPassword = (Boolean) params.get("showPassword");
+        if (showPassword != null && showPassword)
+           attrs.addIfExists("value",  params.get("nameValue"), false);
+
+        attrs.addDefaultToEmpty("name", params.get("name"))
+                .add("type", "password")
+                .addIfExists("size", params.get("size"))
+                .addIfExists("maxlength", params.get("maxlength"))
+                .addIfTrue("disabled", params.get("disabled"))
+                .addIfTrue("readonly", params.get("readonly"))
+                .addIfExists("tabindex", params.get("tabindex"))
+                .addIfExists("id", params.get("id"))
+                .addIfExists("class", params.get("cssClass"))
+                .addIfExists("style", params.get("cssStyle"))
+                .addIfExists("title", params.get("title"));
+        super.start("input", attrs);
+        super.end("input");
+    }
+}
+

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/PasswordHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/PasswordHandler.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/RadioHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/RadioHandler.java?rev=1081295&r1=1081294&r2=1081295&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/RadioHandler.java (original)
+++ struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/RadioHandler.java Mon Mar 14 09:54:09 2011
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/RadioHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/RadioHandler.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/ResetHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/ResetHandler.java?rev=1081295&r1=1081294&r2=1081295&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/ResetHandler.java (original)
+++ struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/ResetHandler.java Mon Mar 14 09:54:09 2011
@@ -1,59 +1,59 @@
-/*
- * $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.views.java.simple;
-
-import org.apache.struts2.views.java.TagGenerator;
-import org.apache.struts2.views.java.Attributes;
-import org.apache.commons.lang.StringUtils;
-
-import java.io.IOException;
-import java.util.Map;
-
-public class ResetHandler extends AbstractTagHandler implements TagGenerator {
-
-    public void generate() throws IOException {
-        Map<String, Object> params = context.getParameters();
-        Attributes attrs = new Attributes();
-
-        boolean isButton = "button".equals(params.get("type"));
-
-        attrs.addDefaultToEmpty("name", params.get("name"))
-                .add("type", "reset")
-                .addIfExists("value", params.get("nameValue"), false)
-                .addIfExists("tabindex", params.get("tabindex"))
-                .addIfExists("id", params.get("id"))
-                .addIfExists("class", params.get("cssClass"))
-                .addIfExists("style", params.get("cssStyle"));
-
-        if (!isButton)
-            attrs.addIfExists("title", params.get("title"));
-
-        super.start("input", attrs);
-        if (isButton) {
-            String label = (String) params.get("label");
-            if (StringUtils.isNotEmpty(label))
-                characters(label);
-        }
-
-        super.end("input");
-    }
-}
-
+/*
+ * $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.views.java.simple;
+
+import org.apache.struts2.views.java.TagGenerator;
+import org.apache.struts2.views.java.Attributes;
+import org.apache.commons.lang.StringUtils;
+
+import java.io.IOException;
+import java.util.Map;
+
+public class ResetHandler extends AbstractTagHandler implements TagGenerator {
+
+    public void generate() throws IOException {
+        Map<String, Object> params = context.getParameters();
+        Attributes attrs = new Attributes();
+
+        boolean isButton = "button".equals(params.get("type"));
+
+        attrs.addDefaultToEmpty("name", params.get("name"))
+                .add("type", "reset")
+                .addIfExists("value", params.get("nameValue"), false)
+                .addIfExists("tabindex", params.get("tabindex"))
+                .addIfExists("id", params.get("id"))
+                .addIfExists("class", params.get("cssClass"))
+                .addIfExists("style", params.get("cssStyle"));
+
+        if (!isButton)
+            attrs.addIfExists("title", params.get("title"));
+
+        super.start("input", attrs);
+        if (isButton) {
+            String label = (String) params.get("label");
+            if (StringUtils.isNotEmpty(label))
+                characters(label);
+        }
+
+        super.end("input");
+    }
+}
+

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/ResetHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/ResetHandler.java
------------------------------------------------------------------------------
    svn:keywords = Id