Repository: struts
Updated Branches:
  refs/heads/master 1056cf057 -> 9ab4b58f7


WW-4614 - Remove div and table tags (div)


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c95c347d
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c95c347d
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c95c347d

Branch: refs/heads/master
Commit: c95c347d4ebf9d3a97e6e4c0ad9fc57d6031e9e2
Parents: 1056cf0
Author: Aleksandr Mashchenko <amashche...@apache.org>
Authored: Fri Mar 25 21:23:18 2016 +0200
Committer: Aleksandr Mashchenko <amashche...@apache.org>
Committed: Fri Mar 25 21:23:18 2016 +0200

----------------------------------------------------------------------
 .../java/org/apache/struts2/components/Div.java | 59 -------------------
 .../apache/struts2/views/DefaultTagLibrary.java |  2 -
 .../struts2/views/freemarker/tags/DivModel.java | 43 --------------
 .../views/freemarker/tags/StrutsModels.java     |  9 ---
 .../org/apache/struts2/views/jsp/ui/DivTag.java | 39 -------------
 .../views/velocity/components/DivDirective.java | 47 ---------------
 .../resources/template/simple/div-close.ftl     | 23 --------
 core/src/main/resources/template/simple/div.ftl | 32 ----------
 .../struts2/components/UIComponentTest.java     | 23 --------
 .../apache/struts2/views/jsp/ui/DivTest.java    | 56 ------------------
 .../org/apache/struts2/views/jsp/ui/div-1.txt   |  3 -
 .../struts2/views/java/simple/DivHandler.java   | 46 ---------------
 .../struts2/views/java/simple/SimpleTheme.java  |  2 -
 .../struts2/views/java/simple/DivTest.java      | 61 --------------------
 14 files changed, 445 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/c95c347d/core/src/main/java/org/apache/struts2/components/Div.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/components/Div.java 
b/core/src/main/java/org/apache/struts2/components/Div.java
deleted file mode 100644
index 5967686..0000000
--- a/core/src/main/java/org/apache/struts2/components/Div.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * $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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts2.views.annotations.StrutsTag;
-
-import com.opensymphony.xwork2.util.ValueStack;
-
-/**
- * <!-- START SNIPPET: javadoc -->
- * Creates an HTML &lt;div&gt;
- * <!-- END SNIPPET: javadoc -->
- *
- */
-@StrutsTag(
-    name="div",
-    tldTagClass="org.apache.struts2.views.jsp.ui.DivTag",
-    description="Render an HTML div",
-    allowDynamicAttributes=true)
-public class Div extends ClosingUIBean {
-
-    public static final String TEMPLATE = "div";
-    public static final String TEMPLATE_CLOSE = "div-close";
-    public static final String COMPONENT_NAME = Div.class.getName();
-
-    public Div(ValueStack stack, HttpServletRequest request, 
HttpServletResponse response) {
-        super(stack, request, response);
-    }
-
-    public String getDefaultOpenTemplate() {
-        return TEMPLATE;
-    }
-
-    protected String getDefaultTemplate() {
-        return TEMPLATE_CLOSE;
-    }
-}

http://git-wip-us.apache.org/repos/asf/struts/blob/c95c347d/core/src/main/java/org/apache/struts2/views/DefaultTagLibrary.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/views/DefaultTagLibrary.java 
b/core/src/main/java/org/apache/struts2/views/DefaultTagLibrary.java
index 2c48370..3628eb9 100644
--- a/core/src/main/java/org/apache/struts2/views/DefaultTagLibrary.java
+++ b/core/src/main/java/org/apache/struts2/views/DefaultTagLibrary.java
@@ -38,7 +38,6 @@ import 
org.apache.struts2.views.velocity.components.CheckBoxListDirective;
 import org.apache.struts2.views.velocity.components.ComboBoxDirective;
 import org.apache.struts2.views.velocity.components.ComponentDirective;
 import org.apache.struts2.views.velocity.components.DateDirective;
-import org.apache.struts2.views.velocity.components.DivDirective;
 import org.apache.struts2.views.velocity.components.DoubleSelectDirective;
 import org.apache.struts2.views.velocity.components.FieldErrorDirective;
 import org.apache.struts2.views.velocity.components.FileDirective;
@@ -87,7 +86,6 @@ public class DefaultTagLibrary implements 
TagLibraryDirectiveProvider, TagLibrar
             ComboBoxDirective.class,
             ComponentDirective.class,
             DateDirective.class,
-            DivDirective.class,
             DoubleSelectDirective.class,
             FileDirective.class,
             FormDirective.class,

http://git-wip-us.apache.org/repos/asf/struts/blob/c95c347d/core/src/main/java/org/apache/struts2/views/freemarker/tags/DivModel.java
----------------------------------------------------------------------
diff --git 
a/core/src/main/java/org/apache/struts2/views/freemarker/tags/DivModel.java 
b/core/src/main/java/org/apache/struts2/views/freemarker/tags/DivModel.java
deleted file mode 100644
index 4471b64..0000000
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/DivModel.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * $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.freemarker.tags;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Div;
-
-import com.opensymphony.xwork2.util.ValueStack;
-
-/**
- * @see Div
- */
-public class DivModel extends TagModel {
-    public DivModel(ValueStack stack, HttpServletRequest req, 
HttpServletResponse res) {
-        super(stack, req, res);
-    }
-
-    protected Component getBean() {
-        return new Div(stack, req, res);
-    }
-}

http://git-wip-us.apache.org/repos/asf/struts/blob/c95c347d/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
----------------------------------------------------------------------
diff --git 
a/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java 
b/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
index e1fb93c..89960e5 100644
--- 
a/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
+++ 
b/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
@@ -42,7 +42,6 @@ public class StrutsModels {
     protected ComboBoxModel comboBox;
     protected ComponentModel component;
     protected DateModel date;
-    protected DivModel div;
     protected DoubleSelectModel doubleselect;
     protected FileModel file;
     protected FormModel form;
@@ -284,14 +283,6 @@ public class StrutsModels {
         return a;
     }
 
-    public DivModel getDiv() {
-        if (div == null) {
-            div = new DivModel(stack, req, res);
-        }
-
-        return div;
-    }
-
     public TextModel getText() {
         if (text == null) {
             text = new TextModel(stack, req, res);

http://git-wip-us.apache.org/repos/asf/struts/blob/c95c347d/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java 
b/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java
deleted file mode 100644
index 31d21e6..0000000
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * $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.jsp.ui;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Div;
-
-import com.opensymphony.xwork2.util.ValueStack;
-
-public class DivTag extends AbstractClosingTag {
-
-    private static final long serialVersionUID = 5309231035916461758L;
-    
-    public Component getBean(ValueStack stack, HttpServletRequest req, 
HttpServletResponse res) {
-        return new Div(stack, req, res);
-    }
-}

http://git-wip-us.apache.org/repos/asf/struts/blob/c95c347d/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java
----------------------------------------------------------------------
diff --git 
a/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java
 
b/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java
deleted file mode 100644
index 1a488b8..0000000
--- 
a/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * $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.velocity.components;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Div;
-
-import com.opensymphony.xwork2.util.ValueStack;
-
-/**
- * @see Div
- */
-public class DivDirective extends AbstractDirective {
-    public String getBeanName() {
-        return "div";
-    }
-
-    protected Component getBean(ValueStack stack, HttpServletRequest req, 
HttpServletResponse res) {
-        return new Div(stack, req, res);
-    }
-
-    public int getType() {
-        return BLOCK;
-    }
-}

http://git-wip-us.apache.org/repos/asf/struts/blob/c95c347d/core/src/main/resources/template/simple/div-close.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/simple/div-close.ftl 
b/core/src/main/resources/template/simple/div-close.ftl
deleted file mode 100644
index 1957b64..0000000
--- a/core/src/main/resources/template/simple/div-close.ftl
+++ /dev/null
@@ -1,23 +0,0 @@
-<#--
-/*
- * $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.
- */
--->
-</div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts/blob/c95c347d/core/src/main/resources/template/simple/div.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/simple/div.ftl 
b/core/src/main/resources/template/simple/div.ftl
deleted file mode 100644
index 5c9365a..0000000
--- a/core/src/main/resources/template/simple/div.ftl
+++ /dev/null
@@ -1,32 +0,0 @@
-<#--
-/*
- * $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.
- */
--->
-<div<#rt/>
-<#if parameters.id??> id="${parameters.id?html}"<#rt/></#if>
-<#if parameters.name??> name="${parameters.name?html}"<#rt/></#if>
-<#if parameters.cssClass??> class="${parameters.cssClass?html}"<#rt/></#if>
-<#if parameters.cssStyle??> style="${parameters.cssStyle?html}"<#rt/></#if>
-<#if parameters.title??> title="${parameters.title?html}"<#rt/></#if>
-<#include 
"/${parameters.templateDir}/${parameters.expandTheme}/scripting-events.ftl" />
-<#include 
"/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" />
-<#include 
"/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" />
->
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts/blob/c95c347d/core/src/test/java/org/apache/struts2/components/UIComponentTest.java
----------------------------------------------------------------------
diff --git 
a/core/src/test/java/org/apache/struts2/components/UIComponentTest.java 
b/core/src/test/java/org/apache/struts2/components/UIComponentTest.java
index 82d5138..0a6c215 100644
--- a/core/src/test/java/org/apache/struts2/components/UIComponentTest.java
+++ b/core/src/test/java/org/apache/struts2/components/UIComponentTest.java
@@ -28,7 +28,6 @@ import org.apache.struts2.views.jsp.ui.ActionMessageTag;
 import org.apache.struts2.views.jsp.ui.AnchorTag;
 import org.apache.struts2.views.jsp.ui.CheckboxTag;
 import org.apache.struts2.views.jsp.ui.ComboBoxTag;
-import org.apache.struts2.views.jsp.ui.DivTag;
 import org.apache.struts2.views.jsp.ui.DoubleSelectTag;
 import org.apache.struts2.views.jsp.ui.FieldErrorTag;
 import org.apache.struts2.views.jsp.ui.FileTag;
@@ -171,28 +170,6 @@ public class UIComponentTest extends AbstractUITagTest {
         }
     }
 
-    // div
-    public void testDivComponentDisposeItselfFromComponentStack() throws 
Exception {
-        ActionErrorTag t = new ActionErrorTag();
-        t.setPageContext(pageContext);
-
-        try {
-            t.doStartTag();
-            DivTag tag = new DivTag();
-            tag.setPageContext(pageContext);
-            tag.doStartTag();
-            assertEquals(tag.getComponent().getComponentStack().peek(), 
tag.getComponent());
-            tag.doEndTag();
-            assertEquals(t.getComponent().getComponentStack().peek(), 
t.getComponent());
-
-            t.doEndTag();
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-            fail(e.toString());
-        }
-    }
-
     // doubleselect
     public void testDoubleselectComponentDisposeItselfFromComponentStack() 
throws Exception {
         ActionErrorTag t = new ActionErrorTag();

http://git-wip-us.apache.org/repos/asf/struts/blob/c95c347d/core/src/test/java/org/apache/struts2/views/jsp/ui/DivTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/DivTest.java 
b/core/src/test/java/org/apache/struts2/views/jsp/ui/DivTest.java
deleted file mode 100644
index 6340940..0000000
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/DivTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * $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.jsp.ui;
-
-import org.apache.struts2.TestAction;
-import org.apache.struts2.views.jsp.AbstractUITagTest;
-
-
-/**
- */
-public class DivTest extends AbstractUITagTest {
-
-
-    public void testGenericSimple() throws Exception {
-        DivTag tag = new DivTag();
-        verifyGenericProperties(tag, "simple", new 
String[]{"value","tabindex","disabled"});
-    }
-
-    public void testGenericXhtml() throws Exception {
-        DivTag tag = new DivTag();
-        verifyGenericProperties(tag, "xhtml", new 
String[]{"value","tabindex","disabled"});
-    }
-
-    public void testSimple() throws Exception {
-        TestAction testAction = (TestAction) action;
-        testAction.setFoo("bar");
-
-        DivTag tag = new DivTag();
-        tag.setPageContext(pageContext);
-        tag.setId("mylabel");
-        tag.doStartTag();
-        tag.doEndTag();
-
-        verify(DivTest.class.getResource("div-1.txt"));
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/struts/blob/c95c347d/core/src/test/resources/org/apache/struts2/views/jsp/ui/div-1.txt
----------------------------------------------------------------------
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/div-1.txt 
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/div-1.txt
deleted file mode 100644
index 4793fe9..0000000
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/div-1.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-<div
-  id="mylabel">
-</div>

http://git-wip-us.apache.org/repos/asf/struts/blob/c95c347d/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/DivHandler.java
----------------------------------------------------------------------
diff --git 
a/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/DivHandler.java
 
b/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/DivHandler.java
deleted file mode 100644
index edd2828..0000000
--- 
a/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/DivHandler.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * $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");
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/struts/blob/c95c347d/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SimpleTheme.java
----------------------------------------------------------------------
diff --git 
a/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SimpleTheme.java
 
b/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SimpleTheme.java
index 4c9ba29..0a00b2a 100644
--- 
a/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SimpleTheme.java
+++ 
b/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SimpleTheme.java
@@ -58,8 +58,6 @@ public class SimpleTheme extends DefaultTheme {
                 put("head", new FactoryList(HeadHandler.class));
                 put("hidden", new FactoryList(HiddenHandler.class));
                 put("fielderror", new FactoryList(FieldErrorHandler.class));
-                put("div", new FactoryList(DivHandler.class, 
ScriptingEventsHandler.class, CommonAttributesHandler.class, 
DynamicAttributesHandler.class));
-                put("div-close", new 
FactoryList(DivHandler.CloseHandler.class));
                 put("empty", new FactoryList(EmptyHandler.class));
            }
         });

http://git-wip-us.apache.org/repos/asf/struts/blob/c95c347d/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/DivTest.java
----------------------------------------------------------------------
diff --git 
a/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/DivTest.java
 
b/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/DivTest.java
deleted file mode 100644
index 20619cd..0000000
--- 
a/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/DivTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * $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.components.Div;
-import org.apache.struts2.components.UIBean;
-
-public class DivTest extends AbstractCommonAttributesTest {
-    private Div tag;
-
-    public void testRenderAnchor() {
-        tag.setName("name_");
-        tag.setDisabled("true");
-        tag.setId("id_");
-        tag.setCssClass("class");
-        tag.setCssStyle("style");
-        tag.setTitle("title");
-
-        tag.evaluateParams();
-        map.putAll(tag.getParameters());
-        theme.renderTag(getTagName(), context);
-        theme.renderTag(getTagName() + "-close", context);
-        String output = writer.getBuffer().toString();
-        String expected = s("<div name='name_' id='id_' class='class' 
style='style' title='title'></div>");
-        assertEquals(expected, output);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        this.tag = new Div(stack, request, response);
-    }
-
-    @Override
-    protected UIBean getUIBean() {
-        return tag;
-    }
-
-    @Override
-    protected String getTagName() {
-        return "div";
-    }
-}

Reply via email to