svn commit: r1487783 - /struts/struts2/trunk/plugins/config-browser/src/main/resources/struts-plugin.xml
Author: lukaszlenart Date: Thu May 30 08:33:04 2013 New Revision: 1487783 URL: http://svn.apache.org/r1487783 Log: WW-4086 Adds empty action definition to support requests to / Modified: struts/struts2/trunk/plugins/config-browser/src/main/resources/struts-plugin.xml Modified: struts/struts2/trunk/plugins/config-browser/src/main/resources/struts-plugin.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/resources/struts-plugin.xml?rev=1487783&r1=1487782&r2=1487783&view=diff == --- struts/struts2/trunk/plugins/config-browser/src/main/resources/struts-plugin.xml (original) +++ struts/struts2/trunk/plugins/config-browser/src/main/resources/struts-plugin.xml Thu May 30 08:33:04 2013 @@ -42,6 +42,10 @@ /config-browser/error.ftl + +actionNames + + actionNames
svn commit: r1487806 - in /struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple: AnchorHandler.java SimpleTheme.java
Author: lukaszlenart
Date: Thu May 30 10:22:34 2013
New Revision: 1487806
URL: http://svn.apache.org/r1487806
Log:
WW-4084 Restores appending s to tag which was broken since
WW-3920
Modified:
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/AnchorHandler.java
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SimpleTheme.java
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=1487806&r1=1487805&r2=1487806&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
Thu May 30 10:22:34 2013
@@ -28,32 +28,28 @@ import java.io.IOException;
import java.util.Map;
public class AnchorHandler extends AbstractTagHandler implements TagGenerator {
-
public void generate() throws IOException {
-Map 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);
+//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 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)) {
+if (StringUtils.isNotEmpty(body))
characters(body, false);
-}
end("a");
}
-
}
-
}
Modified:
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SimpleTheme.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SimpleTheme.java?rev=1487806&r1=1487805&r2=1487806&view=diff
==
---
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SimpleTheme.java
(original)
+++
struts/struts2/trunk/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SimpleTheme.java
Thu May 30 10:22:34 2013
@@ -39,8 +39,8 @@ public class SimpleTheme extends Default
put("select", new FactoryList(SelectHandler.class,
ScriptingEventsHandler.class, CommonAttributesHandler.class,
DynamicAttributesHandler.class));
put("form", new FactoryList(FormHandler.class,
ScriptingEventsHandler.class, CommonAttributesHandler.class,
DynamicAttributesHandler.class));
put("form-close", new
FactoryList(FormHandler.CloseHandler.class));
-put("a", new FactoryList(AnchorHandler.class,
ScriptingEventsHandler.class, CommonAttributesHandler.class,
DynamicAttributesHandler.class));
-put("a-close", new
FactoryList(AnchorHandler.CloseHandler.class));
+put("a", new FactoryList(AnchorHandler.class));
+put("a-close", new
FactoryList(AnchorHandler.CloseHandler.class, ScriptingEventsHandler.class,
CommonAttributesHandler.class, DynamicAttributesHandler.class));
put("checkbox", new FactoryList(CheckboxHandler.class,
ScriptingEventsHandler.class, CommonAttributesHandler.class,
DynamicAttributesHandler.class));
put("file", new FactoryList(FileHandler.class,
ScriptingEventsHandler.class, CommonAttributesHandler.class,
DynamicAttributesHandler.class));
put("password", new FactoryList(PasswordHandler.class,
ScriptingEventsHandl
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL) Pages - SMPP edited by muellerc (05:40 PM) https://cwiki.apache.org/confluence/display/CAMEL/SMPP Camel 2.12.0 Release edited by muellerc (05:38 PM) https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.12.0+Release SEDA edited by davsclaus (09:08 AM) https://cwiki.apache.org/confluence/display/CAMEL/SEDA Component List edited by bvahdat (06:47 AM) https://cwiki.apache.org/confluence/display/CAMEL/Component+List Apache Cloudstack (https://cwiki.apache.org/confluence/display/CLOUDSTACK) Pages - Implement SolidFire (storage) plug-in and expose control of IOPS to admins and end users created by mike.tutkow...@solidfire.com (09:03 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Implement+SolidFire+%28storage%29+plug-in+and+expose+control+of+IOPS+to+admins+and+end+users KVM with OpenVSwitch created by h...@apache.org (03:34 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/KVM+with+OpenVSwitch Simple class for making API calls, Python edited by kdamage (05:36 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Simple+class+for+making+API+calls%2C+Python Palo Alto Firewall Integration edited by wstevens (05:31 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Palo+Alto+Firewall+Integration Internal load balancing between VPC tiers Execution results created by abhinavr (02:48 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Internal+load+balancing+between+VPC+tiers+Execution+results VM Disk IO Throttling edited by weizhou (01:16 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/VM+Disk+IO+Throttling Student Projects edited by teja (12:40 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Student+Projects Create a bootstrap based GUI for CloudStack created by teja (12:28 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Create+a+bootstrap+based+GUI+for+CloudStack Disk IO statistics for instances edited by weizhou (11:55 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Disk+IO+statistics+for+instances devcloud-kvm edited by mlsorensen (10:47 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/devcloud-kvm Ability to have better control over first class objects in CS edited by nitin.me...@citrix.com (09:39 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Ability+to+have+better+control+over+first+class+objects+in+CS Granular Global Configuration Parameters edited by prashantkm (08:31 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Granular+++Global+Configuration+Parameters Integration project to deploy and use Mesos on a CloudStack based cloud created by dharmesh.kakadia (03:21 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Integration+project+to+deploy+and+use+Mesos+on+a+CloudStack+based+cloud Stratosphere SSP Network Plugin edited by ka...@stratosphere.co.jp (02:26 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Stratosphere+SSP+Network+Plugin Integration project to deploy and use Apache Mesos on a CloudStack based Cloud edited by dharmesh.kakadia (01:41 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Integration+project+to+deploy+and+use+Apache+Mesos+on+a+CloudStack+based+Cloud Apache Maven (https://cwiki.apache.org/confluence/display/MAVEN) Pages - AetherClassNotFound created by hboutemy (02:19 PM) https://cwiki.apache.org/confluence/display/MAVEN/AetherClassNotFound OODT (https://cwiki.apache.org/confluence/display/OODT) Comments https://cwiki.apache.org/confluence/display/OODT/CAS-PGE+Learn+by+Example (1) Apache OpenOffice Community (https://cwiki.apache.org/confluence/display/OOOUSERS) Pages - Directory of Volunteers edited by joesch (04:00 PM) https://cwiki.apache.org/confluence/display/OOOUSERS/Directory+of+Volunteers Stage 2 Logo Refinement edited by christi (01:52 PM) https://cwiki.apache.org/confluence/display/OOOUSERS/Stage+2+Logo+Refinement Apache Sling (https://cwiki.apache.org/confluence/display/SLING) Pages - Use Cases created by justinedelson (08:32 PM) https://cwiki.apache.org/confluence/display/SLING/Use+Cases Sling IDE tooling edited by rombert (10:41 AM) https://cwiki.apache.org/confluence/display/SLING/Sling+IDE+tooling Apache Wave (https://cwiki.apache.org/confluence/display/WAVE) Pages ---
svn commit: r1488106 - /struts/struts2/trunk/plugins/config-browser/src/main/resources/struts-plugin.xml
Author: lukaszlenart Date: Fri May 31 06:24:35 2013 New Revision: 1488106 URL: http://svn.apache.org/r1488106 Log: WW-4086 Adds default-action-ref to Config Browser configuration instead of empty action name Modified: struts/struts2/trunk/plugins/config-browser/src/main/resources/struts-plugin.xml Modified: struts/struts2/trunk/plugins/config-browser/src/main/resources/struts-plugin.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/resources/struts-plugin.xml?rev=1488106&r1=1488105&r2=1488106&view=diff == --- struts/struts2/trunk/plugins/config-browser/src/main/resources/struts-plugin.xml (original) +++ struts/struts2/trunk/plugins/config-browser/src/main/resources/struts-plugin.xml Fri May 31 06:24:35 2013 @@ -30,21 +30,22 @@ + + + + /config-browser/error.ftl /config-browser/error.ftl - -actionNames - actionNames @@ -79,5 +80,7 @@ /config-browser/validatorDetails.ftl + +
svn commit: r1488108 - in /struts/struts2/trunk/archetypes: struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/ struts2-archetype-starter/src/main/resources/archetype-re
Author: lukaszlenart
Date: Fri May 31 06:30:45 2013
New Revision: 1488108
URL: http://svn.apache.org/r1488108
Log:
WW-4085 Adds default-action-ref to configuration of example apps
Modified:
struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml
struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/struts.xml
struts/struts2/trunk/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml
Modified:
struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml?rev=1488108&r1=1488107&r2=1488108&view=diff
==
---
struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml
(original)
+++
struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml
Fri May 31 06:30:45 2013
@@ -1,27 +1,30 @@
http://struts.apache.org/dtds/struts-2.3.dtd";>
+"-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
+"http://struts.apache.org/dtds/struts-2.3.dtd";>
-
-
- /example/HelloWorld.jsp
-
-
-
- /example/Login.jsp
- Menu
-
-
-
- /example/{1}.jsp
-
-
-
-
-
+
+
+
+
+
+/example/HelloWorld.jsp
+
+
+
+/example/Login.jsp
+Menu
+
+
+
+/example/{1}.jsp
+
+
+
+
+
Modified:
struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/struts.xml?rev=1488108&r1=1488107&r2=1488108&view=diff
==
---
struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/struts.xml
(original)
+++
struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/struts.xml
Fri May 31 06:30:45 2013
@@ -1,12 +1,25 @@
http://struts.apache.org/dtds/struts-2.3.dtd";>
+"-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
+"http://struts.apache.org/dtds/struts-2.3.dtd";>
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+HelloWorld
+/example
+
+
+
+
+
+
Modified:
struts/struts2/trunk/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml?rev=1488108&r1=1488107&r2=1488108&view=diff
==
---
struts/struts2/trunk/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml
(original)
+++
struts/struts2/trunk/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml
Fri May 31 06:30:45 2013
@@ -1,19 +1,25 @@
http://struts.apache.org/dtds/struts-2.3.dtd";>
+"-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
+"http://struts.apache.org/dtds/struts-2.3.dtd";>
-
-
- /jsp/index.jsp
-
-
- /jsp/index.jsp
- /jsp/helloWorld.jsp
-
-
+
+
+
+
+
+/jsp/index.jsp
+
+
+
+/jsp/index.jsp
+/jsp/helloWorld.jsp
+
+
+
+
