[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Felix (FELIX) http://cwiki.apache.org/confluence/display/FELIX | |-Pages Added or Edited in This Space |-- iPOJO Tutorial (0.7) was last edited by clement.escoffier (01:16 AM). | http://cwiki.apache.org/confluence/display/FELIX/iPOJO+Tutorial+%280.7%29 Apache Roller (ROLLER) http://cwiki.apache.org/confluence/display/ROLLER | |-Pages Added or Edited in This Space |-- Roller FAQ was created by bayard (06:21 PM). | http://cwiki.apache.org/confluence/display/ROLLER/Roller+FAQ |-- ContributorFAQs was created by bayard (06:44 PM). | http://cwiki.apache.org/confluence/display/ROLLER/ContributorFAQs |-- UserFAQs was created by bayard (06:44 PM). | http://cwiki.apache.org/confluence/display/ROLLER/UserFAQs |-- DevelopmentFAQs was created by bayard (06:43 PM). | http://cwiki.apache.org/confluence/display/ROLLER/DevelopmentFAQs |-- InstallationFAQs was created by bayard (06:54 PM). | http://cwiki.apache.org/confluence/display/ROLLER/InstallationFAQs Apache Struts 2 Plugin Registry (S2PLUGINS) http://cwiki.apache.org/confluence/display/S2PLUGINS | |-Pages Added or Edited in This Space |-- Spring Webflow Plugin was last edited by [EMAIL PROTECTED] (08:16 PM). | http://cwiki.apache.org/confluence/display/S2PLUGINS/Spring+Webflow+Plugin Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW | |-Pages Added or Edited in This Space |-- subset was last edited by mrdon (11:54 PM). | http://cwiki.apache.org/confluence/display/WW/subset |-- sort was last edited by mrdon (11:53 PM). | http://cwiki.apache.org/confluence/display/WW/sort |-- property was last edited by mrdon (10:20 PM). | http://cwiki.apache.org/confluence/display/WW/property |-- url was last edited by mrdon (10:20 PM). | http://cwiki.apache.org/confluence/display/WW/url |-- text was last edited by mrdon (10:20 PM). | http://cwiki.apache.org/confluence/display/WW/text |-- set was last edited by mrdon (10:19 PM). | http://cwiki.apache.org/confluence/display/WW/set |-- push was last edited by mrdon (10:19 PM). | http://cwiki.apache.org/confluence/display/WW/push |-- param was last edited by mrdon (10:19 PM). | http://cwiki.apache.org/confluence/display/WW/param |-- include was last edited by mrdon (10:18 PM). | http://cwiki.apache.org/confluence/display/WW/include |-- i18n was last edited by mrdon (10:18 PM). | http://cwiki.apache.org/confluence/display/WW/i18n |-- date was last edited by mrdon (10:17 PM). | http://cwiki.apache.org/confluence/display/WW/date |-- bean was last edited by mrdon (10:11 PM). | http://cwiki.apache.org/confluence/display/WW/bean |-- action was last edited by mrdon (10:11 PM). | http://cwiki.apache.org/confluence/display/WW/action |-- a was last edited by mrdon (10:11 PM). | http://cwiki.apache.org/confluence/display/WW/a |-- merge was last edited by mrdon (10:08 PM). | http://cwiki.apache.org/confluence/display/WW/merge |-- iterator was last edited by mrdon (10:08 PM). | http://cwiki.apache.org/confluence/display/WW/iterator |-- generator was last edited by mrdon (10:05 PM). | http://cwiki.apache.org/confluence/display/WW/generator |-- append was last edited by mrdon (10:01 PM). | http://cwiki.apache.org/confluence/display/WW/append |-- else was last edited by mrdon (10:00 PM). | http://cwiki.apache.org/confluence/display/WW/else |-- elseIf was last edited by mrdon (10:00 PM). | http://cwiki.apache.org/confluence/display/WW/elseIf |-- if was last edited by mrdon (10:00 PM). | http://cwiki.apache.org/confluence/display/WW/if |-- treenode was last edited by mrdon (09:59 PM). | http://cwiki.apache.org/confluence/display/WW/treenode |-- tree was last edited by mrdon (09:59 PM). | http://cwiki.apache.org/confluence/display/WW/tree |-- tabbedPanel was last edited by mrdon (09:58 PM). | http://cwiki.apache.org/confluence/display/WW/tabbedPanel |-- table was last edited by mrdon (09:58 PM). | http://cwiki.apache.org/confluence/display/WW/table |-- fielderror was last edited by mrdon (09:57 PM). | http://cwiki.apache.org/confluence/display/WW/fielderror |-- div was last edited by mrdon (09:51 PM). | http://cwiki.apache.org/confluence/display/WW/div |-- component was last edited by mrdon (09:51 PM). | http://cwiki.apache.org/confluence/display/WW/component |-- actionmessage was last edited by mrdon (09:50 PM). | http://cwiki.apache.org/confluence/display/WW/actionmessage |-- actionerror was last edited by mrdon (09:50 PM). | http://cwiki.apache.org/confluence/display/WW/actionerror |-- updownselect was last edited by mrdon (09:44 PM). | http://cwiki.apache.org/confluence/display/WW/updo
svn commit: r493716 - in /struts/struts2/trunk/core/src: main/resources/template/simple/datepicker.ftl test/resources/org/apache/struts2/views/jsp/ui/DatePickerTagTest-1.txt
Author: mrdon
Date: Sun Jan 7 05:14:02 2007
New Revision: 493716
URL: http://svn.apache.org/viewvc?view=rev&rev=493716
Log:
Fixing date picker tests and adding dojo import for non-ajax themes
WW-1596
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/DatePickerTagTest-1.txt
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl?view=diff&rev=493716&r1=493715&r2=493716
==
--- struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl
Sun Jan 7 05:14:02 2007
@@ -1,3 +1,7 @@
+
+dojo.require("dojo.widget.DatePicker");
+
+
value="${parameters.nameValue?html}"<#rt/>
@@ -6,7 +10,7 @@
name="${parameters.name?html}"<#rt/>
id="struts_${parameters.name?html}"<#rt/>
->
+ />
id="${parameters.id?html}"<#rt/>
Modified:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/DatePickerTagTest-1.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/DatePickerTagTest-1.txt?view=diff&rev=493716&r1=493715&r2=493716
==
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/DatePickerTagTest-1.txt
(original)
+++
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/DatePickerTagTest-1.txt
Sun Jan 7 05:14:02 2007
@@ -3,10 +3,11 @@
dojo.require("dojo.widget.DatePicker");
-
+
svn commit: r493849 - /struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java
Author: mrdon
Date: Sun Jan 7 13:26:22 2007
New Revision: 493849
URL: http://svn.apache.org/viewvc?view=rev&rev=493849
Log:
Added lexical ordering for tags
Modified:
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java
Modified:
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java?view=diff&rev=493849&r1=493848&r2=493849
==
---
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java
(original)
+++
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java
Sun Jan 7 13:26:22 2007
@@ -28,6 +28,7 @@
import java.io.PrintWriter;
import java.util.Collection;
import java.util.HashMap;
+import java.util.TreeMap;
import java.util.Map;
import javax.xml.parsers.DocumentBuilder;
@@ -65,7 +66,7 @@
private AnnotationProcessorEnvironment environment;
private AnnotationTypeDeclaration tagDeclaration;
private AnnotationTypeDeclaration tagAttributeDeclaration;
-private Map tags = new HashMap();
+private Map tags = new TreeMap();
public TagAnnotationProcessor(AnnotationProcessorEnvironment env) {
environment = env;
@@ -90,7 +91,7 @@
// type
TypeDeclaration typeDeclaration = (TypeDeclaration) declaration;
String typeName = typeDeclaration.getQualifiedName();
-HashMap values = getValues(typeDeclaration,
+Map values = getValues(typeDeclaration,
tagDeclaration);
// create Tag and apply values found
Tag tag = new Tag();
@@ -109,7 +110,7 @@
MethodDeclaration methodDeclaration = (MethodDeclaration)
declaration;
String typeName = methodDeclaration.getDeclaringType()
.getQualifiedName();
-HashMap values = getValues(methodDeclaration,
+Map values = getValues(methodDeclaration,
tagAttributeDeclaration);
// create Attribute and apply values found
TagAttribute attribute = new TagAttribute();
@@ -346,9 +347,9 @@
*The type of the annotation
* @return name->value map of annotation values
*/
-private HashMap getValues(Declaration declaration,
+private Map getValues(Declaration declaration,
AnnotationTypeDeclaration type) {
-HashMap values = new HashMap();
+Map values = new TreeMap();
Collection annotations = declaration
.getAnnotationMirrors();
// iterate over the mirrors.
svn commit: r493848 [1/3] - in /struts/struts2/trunk: apps/showcase/src/main/webapp/tags/ui/ core/src/main/resources/META-INF/ core/src/main/resources/template/simple/ core/src/main/resources/template
Author: mrdon
Date: Sun Jan 7 13:26:00 2007
New Revision: 493848
URL: http://svn.apache.org/viewvc?view=rev&rev=493848
Log:
Fixing dropdowndatetimepicker in xhtml theme, changed to use correct input id,
changed showcase to use the drop down date picker, added lexical ordering to
tld
WW-1358
Added:
struts/struts2/trunk/core/src/main/resources/template/xhtml/dropdowndatetimepicker.ftl
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.vm
struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld
struts/struts2/trunk/core/src/main/resources/template/simple/dropdowndatetimepicker.ftl
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp?view=diff&rev=493848&r1=493847&r2=493848
==
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp Sun
Jan 7 13:26:00 2007
@@ -19,7 +19,7 @@
name="name"
tooltip="Enter your Name here" />
-
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.vm
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.vm?view=diff&rev=493848&r1=493847&r2=493848
==
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.vm
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.vm Sun
Jan 7 13:26:00 2007
@@ -12,7 +12,7 @@
#sform ("action=exampleSubmitVelocity" "method=post"
"enctype=multipart/form-data")
#stextfield ("label=Name" "name=name")
-#sdatepicker ("label=Birthday" "name=birthday")
+#sdropdowndatetimepicker ("label=Birthday" "name=birthday")
#stextarea ("label=Biograph" "name=bio" "cols=20" "rows=3")
#sselect ("label=Favourite Color" "list={'Red', 'Blue', 'Green'}"
"name=favouriteColor" "emptyOption=true" "headerKey=None" "headerValue=None")
#sselect ("label=Favourite Language" "list=favouriteLanguages"
"name=favouriteLanguage" "listKey=key" "listValue=description"
"emptyOption=true" "headerKey=None" "headerValue=None")
svn commit: r493848 [3/3] - in /struts/struts2/trunk: apps/showcase/src/main/webapp/tags/ui/ core/src/main/resources/META-INF/ core/src/main/resources/template/simple/ core/src/main/resources/template
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/dropdowndatetimepicker.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/dropdowndatetimepicker.ftl?view=diff&rev=493848&r1=493847&r2=493848
==
---
struts/struts2/trunk/core/src/main/resources/template/simple/dropdowndatetimepicker.ftl
(original)
+++
struts/struts2/trunk/core/src/main/resources/template/simple/dropdowndatetimepicker.ftl
Sun Jan 7 13:26:00 2007
@@ -14,8 +14,8 @@
lang="${parameters.language?html}"<#rt/>
<#if parameters.name?if_exists != "">
-name="${parameters.name?html}"<#rt/>
-inputName="dojo.${parameters.name?html}"<#rt/>
+name="dojo.${parameters.name?html}"<#rt/>
+inputName="${parameters.name?html}"<#rt/>
<#if parameters.displayWeeks?if_exists != "">
displayWeeks="${parameters.displayWeeks?html}"<#rt/>
Added:
struts/struts2/trunk/core/src/main/resources/template/xhtml/dropdowndatetimepicker.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/dropdowndatetimepicker.ftl?view=auto&rev=493848
==
---
struts/struts2/trunk/core/src/main/resources/template/xhtml/dropdowndatetimepicker.ftl
(added)
+++
struts/struts2/trunk/core/src/main/resources/template/xhtml/dropdowndatetimepicker.ftl
Sun Jan 7 13:26:00 2007
@@ -0,0 +1,4 @@
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
+<#include "/${parameters.templateDir}/simple/dropdowndatetimepicker.ftl" />
+<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" />
+
svn commit: r493884 - /struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example8.jsp
Author: husted Date: Sun Jan 7 16:22:13 2007 New Revision: 493884 URL: http://svn.apache.org/viewvc?view=rev&rev=493884 Log: example8 - swap buttons to make use case more obvious. Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example8.jsp Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example8.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example8.jsp?view=diff&rev=493884&r1=493883&r2=493884 == --- struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example8.jsp (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotediv/example8.jsp Sun Jan 7 16:22:13 2007 @@ -30,8 +30,8 @@ - +
svn commit: r493903 - in /struts/struts2/trunk/apps/showcase/src/main/webapp/ajax: datepicker/ datepicker/index.jsp index.jsp tabbedpanel/index.jsp timepicker/ timepicker/index.jsp
Author: husted Date: Sun Jan 7 18:04:37 2007 New Revision: 493903 URL: http://svn.apache.org/viewvc?view=rev&rev=493903 Log: WW-1588 - showcase tweaks. Add back datepicker and timepicker examples Added: struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/ struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/index.jsp struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/timepicker/ struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/timepicker/index.jsp Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp Added: struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/index.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/index.jsp?view=auto&rev=493903 == --- struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/index.jsp (added) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/index.jsp Sun Jan 7 18:04:37 2007 @@ -0,0 +1,72 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + + +Ajax Examples + + + + + + + + + + + + +toggleType="wipe" + + + + +toggleType="explode" + + + + +toggleType="fade" + + + + +With value="today" + + + + +US format, empty + + + + +US format with initial date of 2006-06-26 + + + + +With initial date of 1969-04-25 and a custom format dd/MM/ + + + + +In German + + + + +In Dutch + + + + +US format with initial date of 2006-06-26 and long formatting (parse not supported) + + + + +German format with initial date of 2006-06-26 and long formatting (parse not supported) + + + + Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp?view=diff&rev=493903&r1=493902&r2=493903 == --- struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp Sun Jan 7 18:04:37 2007 @@ -12,6 +12,8 @@ Autocompleter combobox tag Remote link tag Remote button tag +DateTime picker tag - Pick a date +DateTime picker tag - Pick a time Tabbed panel Remote forms Widgets (experimental - may not work in all browsers Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp?view=diff&rev=493903&r1=493902&r2=493903 == --- struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp Sun Jan 7 18:04:37 2007 @@ -14,8 +14,8 @@ A local tabbed panel width fixed size (doLayout="true") A remote(href != "") and local tabbed panel Various remote and local tabbed panels (with enclosed tabbed pannels) with layout (doLayout="false") -A local tabbed panel width fixed size (doLayout="true") with close button on tabs(closeButton="tab"), and tabs on the right (labelposition="righ") -A local tabbed panel width fixed size (doLayout="true") with close button on the tab pane(closeButton="pane"), and tabs on the bottom (labelposition="bottom") +A local tabbed panel width fixed size (doLayout="true") with close button on tabs(closeButton="tab"), and tabs on the right (labelposition="right") +A local tabbed panel width fixed size (doLayout="true") with close button on the tab pane (closeButton="pane"), and tabs on the bottom (labelposition="bottom") Added: struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/timepicker/index.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/timepicker/index.jsp?view=auto&rev=493903 == --- struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/timepicker/index.jsp (added) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/timepicker/index.jsp Sun Jan 7 18:04:37 2007 @@ -0,0 +1,53 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + + +Ajax Examples + + + + + + + + + + + + +toggleType="wipe" + + + + +toggleTye="explode" + + + + +toggleType="fade" + + + + +With value="today" + + + + +US format, empty + + + + +In German + + + + +In Dutch + + + + +
svn commit: r493906 - /struts/maven/trunk/struts-annotations/pom.xml
Author: mrdon
Date: Sun Jan 7 18:14:20 2007
New Revision: 493906
URL: http://svn.apache.org/viewvc?view=rev&rev=493906
Log:
Fixing pom for osx users
WW-1392
Modified:
struts/maven/trunk/struts-annotations/pom.xml
Modified: struts/maven/trunk/struts-annotations/pom.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts-annotations/pom.xml?view=diff&rev=493906&r1=493905&r2=493906
==
--- struts/maven/trunk/struts-annotations/pom.xml (original)
+++ struts/maven/trunk/struts-annotations/pom.xml Sun Jan 7 18:14:20 2007
@@ -35,6 +35,27 @@
+
+
+default-tools.jar
+
+
+java.vendor
+Sun Microsystems Inc.
+
+
+
+
+com.sun
+tools
+1.5.0
+system
+${java.home}/../lib/tools.jar
+
+
+
+
+
apache.snapshots
@@ -54,14 +75,6 @@
-
-
-com.sun
-tools
-1.5.0
-system
-${java.home}/../lib/tools.jar
-
junit
svn commit: r493907 - in /struts/struts2/trunk/apps/showcase/src/main/webapp: ajax/datepicker/ ajax/index.jsp ajax/timepicker/ tags/ui/datepicker/ tags/ui/index.jsp tags/ui/timepicker/
Author: husted Date: Sun Jan 7 18:16:42 2007 New Revision: 493907 URL: http://svn.apache.org/viewvc?view=rev&rev=493907 Log: WW-1588 - showcase tweaks. Move datepicker and timepicker examples to tags/ui Added: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/datepicker/ - copied from r493903, struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/ - copied from r493903, struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/timepicker/ Removed: struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/ struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/timepicker/ Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/index.jsp Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp?view=diff&rev=493907&r1=493906&r2=493907 == --- struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp Sun Jan 7 18:16:42 2007 @@ -12,8 +12,6 @@ Autocompleter combobox tag Remote link tag Remote button tag -DateTime picker tag - Pick a date -DateTime picker tag - Pick a time Tabbed panel Remote forms Widgets (experimental - may not work in all browsers Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/index.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/index.jsp?view=diff&rev=493907&r1=493906&r2=493907 == --- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/index.jsp (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/index.jsp Sun Jan 7 18:16:42 2007 @@ -14,6 +14,8 @@ Tree Example (static) Tree Example (dynamic) Component Tag Example +DateTime picker tag - Pick a date +DateTime picker tag - Pick a time <%--li>UI population using iterator tag
svn commit: r493908 - /struts/struts2/trunk/core/src/main/resources/template/xhtml/datetimepicker.ftl
Author: mrdon
Date: Sun Jan 7 18:17:16 2007
New Revision: 493908
URL: http://svn.apache.org/viewvc?view=rev&rev=493908
Log:
Adding missing datetimepicker template
WW-1596
Added:
struts/struts2/trunk/core/src/main/resources/template/xhtml/datetimepicker.ftl
Added:
struts/struts2/trunk/core/src/main/resources/template/xhtml/datetimepicker.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/datetimepicker.ftl?view=auto&rev=493908
==
---
struts/struts2/trunk/core/src/main/resources/template/xhtml/datetimepicker.ftl
(added)
+++
struts/struts2/trunk/core/src/main/resources/template/xhtml/datetimepicker.ftl
Sun Jan 7 18:17:16 2007
@@ -0,0 +1,4 @@
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
+<#include "/${parameters.templateDir}/simple/datetimepicker.ftl" />
+<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" />
+
svn commit: r493915 - in /struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui: datepicker/index.jsp timepicker/index.jsp
Author: husted Date: Sun Jan 7 18:42:58 2007 New Revision: 493915 URL: http://svn.apache.org/viewvc?view=rev&rev=493915 Log: WW-1588 - showcase tweaks. Move datepicker and timepicker examples to tags/ui Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/datepicker/index.jsp struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/datepicker/index.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/datepicker/index.jsp?view=diff&rev=493915&r1=493914&r2=493915 == --- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/datepicker/index.jsp (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/datepicker/index.jsp Sun Jan 7 18:42:58 2007 @@ -2,71 +2,65 @@ <%@ taglib prefix="s" uri="/struts-tags" %> -Ajax Examples - - - - - +UI Tag Example - + toggleType="wipe" - + toggleType="explode" - + toggleType="fade" - + With value="today" - + US format, empty - + US format with initial date of 2006-06-26 - + With initial date of 1969-04-25 and a custom format dd/MM/ - + In German - + In Dutch - + US format with initial date of 2006-06-26 and long formatting (parse not supported) - + German format with initial date of 2006-06-26 and long formatting (parse not supported) - Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp?view=diff&rev=493915&r1=493914&r2=493915 == --- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp Sun Jan 7 18:42:58 2007 @@ -13,37 +13,37 @@ - + toggleType="wipe" - + toggleTye="explode" - + toggleType="fade" - + With value="today" - + US format, empty - + In German - + In Dutch
svn commit: r493922 - in /struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui: datepicker/index.jsp timepicker/index.jsp
Author: husted Date: Sun Jan 7 19:11:59 2007 New Revision: 493922 URL: http://svn.apache.org/viewvc?view=rev&rev=493922 Log: WW-1588 - showcase tweaks. Move datepicker and timepicker examples to tags/ui Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/datepicker/index.jsp struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/datepicker/index.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/datepicker/index.jsp?view=diff&rev=493922&r1=493921&r2=493922 == --- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/datepicker/index.jsp (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/datepicker/index.jsp Sun Jan 7 19:11:59 2007 @@ -2,9 +2,8 @@ <%@ taglib prefix="s" uri="/struts-tags" %> -UI Tag Example +UI Tags Example - Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp?view=diff&rev=493922&r1=493921&r2=493922 == --- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp Sun Jan 7 19:11:59 2007 @@ -2,14 +2,8 @@ <%@ taglib prefix="s" uri="/struts-tags" %> -Ajax Examples - - - - - +UI Tags Example -
svn commit: r493964 - in /struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui: datepicker/index.jsp timepicker/index.jsp
Author: mrdon Date: Sun Jan 7 22:43:02 2007 New Revision: 493964 URL: http://svn.apache.org/viewvc?view=rev&rev=493964 Log: Fixed showcase examples of datetimepicker tags WW-1588 Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/datepicker/index.jsp struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/datepicker/index.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/datepicker/index.jsp?view=diff&rev=493964&r1=493963&r2=493964 == --- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/datepicker/index.jsp (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/datepicker/index.jsp Sun Jan 7 22:43:02 2007 @@ -3,63 +3,21 @@ UI Tags Example + - - - -toggleType="wipe" - - - - -toggleType="explode" - - - - -toggleType="fade" - - - - -With value="today" - - - - -US format, empty - - - - -US format with initial date of 2006-06-26 - - - - -With initial date of 1969-04-25 and a custom format dd/MM/ - - - - -In German - - - - -In Dutch - - - - -US format with initial date of 2006-06-26 and long formatting (parse not supported) - - - - -German format with initial date of 2006-06-26 and long formatting (parse not supported) + + + + + + + + + + + Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp?view=diff&rev=493964&r1=493963&r2=493964 == --- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/timepicker/index.jsp Sun Jan 7 22:43:02 2007 @@ -3,45 +3,17 @@ UI Tags Example + - - - -toggleType="wipe" - - - - -toggleTye="explode" - - - - -toggleType="fade" - - - - -With value="today" - - - - -US format, empty - - - - -In German - - - - -In Dutch - + + + + + + + -
svn commit: r493965 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DateTimePicker.java
Author: mrdon
Date: Sun Jan 7 22:43:35 2007
New Revision: 493965
URL: http://svn.apache.org/viewvc?view=rev&rev=493965
Log:
Set default date parsing to the RFC 3399 standard
WW-1588
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DateTimePicker.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DateTimePicker.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DateTimePicker.java?view=diff&rev=493965&r1=493964&r2=493965
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DateTimePicker.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DateTimePicker.java
Sun Jan 7 22:43:35 2007
@@ -297,11 +297,11 @@
SimpleDateFormat format = new SimpleDateFormat(
this.displayFormat);
date = format.parse(dateStr);
+return RFC3399_FORMAT.format(date);
} else {
-// last resource
-date = SimpleDateFormat.getInstance().parse(dateStr);
+// last resource to assume already in correct/default
format
+return dateStr;
}
-return RFC3399_FORMAT.format(date);
} catch (ParseException e) {
LOG.error("Could not parse date", e);
return dateStr;
