[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Camel (CAMEL) http://cwiki.apache.org/confluence/display/CAMEL | |-Pages Added or Edited in This Space |-- MINA was last edited by davsclaus (08:28 AM). | http://cwiki.apache.org/confluence/display/CAMEL/MINA |-- Camel 2.0.0 Release was last edited by davsclaus (03:45 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Camel+2.0.0+Release |-- Wire Tap was last edited by davsclaus (03:11 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Wire+Tap |-- JMS was last edited by davsclaus (01:31 AM). | http://cwiki.apache.org/confluence/display/CAMEL/JMS Apache Struts 2 Plugin Registry (S2PLUGINS) http://cwiki.apache.org/confluence/display/S2PLUGINS | |-New Comments in This Space |-- http://cwiki.apache.org/confluence/display/S2PLUGINS/Guice+Plugin (1) Apache ActiveMQ CPP (AMQCPP) http://cwiki.apache.org/confluence/display/AMQCPP | |-Pages Added or Edited in This Space |-- CMS API Overview was last edited by tabish121 (02:54 PM). | http://cwiki.apache.org/confluence/display/AMQCPP/CMS+API+Overview Apache Geronimo v2.2 (GMOxDOC22) http://cwiki.apache.org/confluence/display/GMOxDOC22 | |-Pages Added or Edited in This Space |-- Deploying and running JPA application client was last edited by sophia (06:40 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC22/Deploying+and+running+JPA+application+client |-- Command Geronimo Options was last edited by chirun...@gmail.com (02:05 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC22/Command+Geronimo+Options |-- Clustering and farming was last edited by chirun...@gmail.com (02:02 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC22/Clustering+and+farming |-- Configure secure JMX server was last edited by chirun...@gmail.com (12:32 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC22/Configure+secure+JMX+server Apache Pivot (PIVOT) http://cwiki.apache.org/confluence/display/PIVOT | |-Pages Added or Edited in This Space |-- Kitchen Sink Demo was created by gkbr...@mac.com (10:48 AM). | http://cwiki.apache.org/confluence/display/PIVOT/Kitchen+Sink+Demo |-- Platform Overview was last edited by gkbr...@mac.com (11:34 AM). | http://cwiki.apache.org/confluence/display/PIVOT/Platform+Overview |-- Sample Application was last edited by gkbr...@mac.com (11:32 AM). | http://cwiki.apache.org/confluence/display/PIVOT/Sample+Application |-- Large Data Sets Demo was created by gkbr...@mac.com (10:57 AM). | http://cwiki.apache.org/confluence/display/PIVOT/Large+Data+Sets+Demo |-- Google Contacts Demo was created by gkbr...@mac.com (11:26 AM). | http://cwiki.apache.org/confluence/display/PIVOT/Google+Contacts+Demo |-- Scripting Demo was created by gkbr...@mac.com (11:15 AM). | http://cwiki.apache.org/confluence/display/PIVOT/Scripting+Demo |-- Stock Tracker Demo was created by gkbr...@mac.com (10:49 AM). | http://cwiki.apache.org/confluence/display/PIVOT/Stock+Tracker+Demo |-- Fixed Column Table Demo was created by gkbr...@mac.com (11:12 AM). | http://cwiki.apache.org/confluence/display/PIVOT/Fixed+Column+Table+Demo |-- Decorator Demo was created by gkbr...@mac.com (11:11 AM). | http://cwiki.apache.org/confluence/display/PIVOT/Decorator+Demo |-- Demos was created by gkbr...@mac.com (09:14 AM). | http://cwiki.apache.org/confluence/display/PIVOT/Demos |-- Charting Demo was created by gkbr...@mac.com (10:52 AM). | http://cwiki.apache.org/confluence/display/PIVOT/Charting+Demo |-- Apache Pivot was last edited by gkbr...@mac.com (10:41 AM). | http://cwiki.apache.org/confluence/display/PIVOT/Apache+Pivot |-- Scripting was created by gkbr...@mac.com (10:37 AM). | http://cwiki.apache.org/confluence/display/PIVOT/Scripting |-- Background Tasks was created by gkbr...@mac.com (10:37 AM). | http://cwiki.apache.org/confluence/display/PIVOT/Background+Tasks |-- Effects was created by gkbr...@mac.com (10:37 AM). | http://cwiki.apache.org/confluence/display/PIVOT/Effects |-- User Preferences was created by gkbr...@mac.com (10:37 AM). | http://cwiki.apache.org/confluence/display/PIVOT/User+Preferences |-- Drag and Drop was created by gkbr...@mac.com (10:37 AM). | http://cwiki.apache.org/confluence/display/PIVOT/Drag+and+Drop |-- The Clipboard was created by gkbr...@mac.com (10:37 AM). | http://cwiki.apache.org/confluence/display/PIVOT/The+Clipboard |-- File Browsing was created by gkbr...@mac.com (10:37 AM). | http://cwiki.apache.org/confluence/display/PIVOT/File+Browsing |-- Tree Views was created by gkbr...@mac.com (10:36 AM). | http://cwiki.apache.org/confluence/display/PIVOT/Tree+Views |-- Table Views was created by gkbr...@mac.com (10:36 AM). |
svn commit: r752105 - /struts/sandbox/trunk/s2-jquery-showcase/src/main/java/org/apache/struts2/jquery/actions/form/DateAction.java
Author: musachy
Date: Tue Mar 10 13:13:18 2009
New Revision: 752105
URL: http://svn.apache.org/viewvc?rev=752105&view=rev
Log:
Add datepicker input action
Added:
struts/sandbox/trunk/s2-jquery-showcase/src/main/java/org/apache/struts2/jquery/actions/form/DateAction.java
Added:
struts/sandbox/trunk/s2-jquery-showcase/src/main/java/org/apache/struts2/jquery/actions/form/DateAction.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/s2-jquery-showcase/src/main/java/org/apache/struts2/jquery/actions/form/DateAction.java?rev=752105&view=auto
==
---
struts/sandbox/trunk/s2-jquery-showcase/src/main/java/org/apache/struts2/jquery/actions/form/DateAction.java
(added)
+++
struts/sandbox/trunk/s2-jquery-showcase/src/main/java/org/apache/struts2/jquery/actions/form/DateAction.java
Tue Mar 10 13:13:18 2009
@@ -0,0 +1,41 @@
+/*
+ * $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.jquery.actions.form;
+
+import com.opensymphony.xwork2.ActionSupport;
+
+import java.util.Date;
+
+import org.apache.struts2.convention.annotation.Namespace;
+
+...@namespace("/form")
+public class DateAction extends ActionSupport{
+
+public Date getDate() {
+return date;
+}
+
+public void setDate(Date date) {
+this.date = date;
+}
+
+private Date date;
+}
svn commit: r752123 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java
Author: wesw
Date: Tue Mar 10 14:46:22 2009
New Revision: 752123
URL: http://svn.apache.org/viewvc?rev=752123&view=rev
Log:
We advertise this attribute being available, but we really didn't have it
WW-3031
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java?rev=752123&r1=752122&r2=752123&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java
Tue Mar 10 14:46:22 2009
@@ -44,6 +44,7 @@
protected String namespace;
protected String validate;
protected String onsubmit;
+protected String onreset;
protected String portletMode;
protected String windowState;
protected String acceptcharset;
@@ -98,6 +99,10 @@
this.onsubmit = onsubmit;
}
+public void setOnreset(String onreset) {
+this.onreset = onreset;
+}
+
public void setPortletMode(String portletMode) {
this.portletMode = portletMode;
}
[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 756 has FAILED (0 tests failed). Change made by Wes Wannemacher
--- STRUTS-MAINJ6-756 failed. --- Code has been updated by Wes Wannemacher. No failed tests found, a possible compilation error. http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-756/ -- Code Changes -- Wes Wannemacher (752123): >We advertise this attribute being available, but we really didn't have it >WW-3031 -- Error Summary -- [INFO] [ERROR] BUILD ERROR [INFO] [INFO] Unable to find artifact. Embedded error: Unable to download the artifact from any repository Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=com.opensymphony -DartifactId=xwork -Dversion=2.1.3-SNAPSHOT -Dclassifier=sources -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=com.opensymphony -DartifactId=xwork -Dversion=2.1.3-SNAPSHOT -Dclassifier=sources -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] com.opensymphony:xwork:jar:2.1.3-SNAPSHOT from the specified remote repositories: apache.snapshots (http://people.apache.org/maven-snapshot-repository), central (https://m2proxy.atlassian.com/repository/public) [INFO] [INFO] For more information, run Maven with the -e switch -- This message is automatically generated by Atlassian Bamboo
[OSS Bamboo] Struts 2 SVN - Main Build build 1043 has FAILED (0 tests failed). Change made by Wes Wannemacher
--- STRUTS-MAIN-1043 failed. --- Code has been updated by Wes Wannemacher. No failed tests found, a possible compilation error. http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-1043/ -- Code Changes -- Wes Wannemacher (752123): >We advertise this attribute being available, but we really didn't have it >WW-3031 -- Error Summary -- [INFO] [ERROR] BUILD ERROR [INFO] [INFO] Failed to resolve artifact. GroupId: com.opensymphony ArtifactId: xwork Version: 2.1.3-SNAPSHOT Reason: Unable to download the artifact from any repository Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=com.opensymphony -DartifactId=xwork -Dversion=2.1.3-SNAPSHOT -Dclassifier=sources -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=com.opensymphony -DartifactId=xwork -Dversion=2.1.3-SNAPSHOT -Dclassifier=sources -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] com.opensymphony:xwork:jar:2.1.3-SNAPSHOT from the specified remote repositories: central (https://m2proxy.atlassian.com/repository/public), apache.snapshots (http://people.apache.org/maven-snapshot-repository) [INFO] [INFO] For more information, run Maven with the -e switch -- This message is automatically generated by Atlassian Bamboo
svn commit: r752126 [1/4] - in /struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources: org/apache/struts2/static/css/ org/apache/struts2/static/css/smoothness/ org/apache/struts2/static/css/sm
Author: musachy Date: Tue Mar 10 14:56:36 2009 New Revision: 752126 URL: http://svn.apache.org/viewvc?rev=752126&view=rev Log: Add theme Added: struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/ struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/ struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/images/ struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/images/ui-bg_flat_0_aa_40x100.png (with props) struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/images/ui-bg_flat_75_ff_40x100.png (with props) struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png (with props) struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/images/ui-bg_glass_65_ff_1x400.png (with props) struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png (with props) struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png (with props) struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png (with props) struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/images/ui-bg_highlight-soft_75_cc_1x100.png (with props) struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/images/ui-icons_22_256x240.png (with props) struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/images/ui-icons_2e83ff_256x240.png (with props) struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/images/ui-icons_454545_256x240.png (with props) struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/images/ui-icons_88_256x240.png (with props) struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/images/ui-icons_cd0a0a_256x240.png (with props) struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/jquery-ui-1.7.custom.css struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/main.css struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/images/ struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/images/dateIcon.gif (with props) struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/js/ struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/js/jquery-1.3.2.min.js struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/js/jquery-ui-1.7.custom.min.js Modified: struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery-simple/datepicker.ftl struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery-simple/head.ftl Added: struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/images/ui-bg_flat_0_aa_40x100.png URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/images/ui-bg_flat_0_aa_40x100.png?rev=752126&view=auto == Binary file - no diff available. Propchange: struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/images/ui-bg_flat_0_aa_40x100.png -- svn:mime-type = application/octet-stream Added: struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/images/ui-bg_flat_75_ff_40x100.png URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/images/ui-bg_flat_75_ff_40x100.png?rev=752126&view=auto == Binary file - no diff available. Propchange: struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/images/ui-bg_flat_75_ff_40x100.png -
svn commit: r752126 [4/4] - in /struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources: org/apache/struts2/static/css/ org/apache/struts2/static/css/smoothness/ org/apache/struts2/static/css/sm
Added:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/js/jquery-ui-1.7.custom.min.js
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/js/jquery-ui-1.7.custom.min.js?rev=752126&view=auto
==
---
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/js/jquery-ui-1.7.custom.min.js
(added)
+++
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/js/jquery-ui-1.7.custom.min.js
Tue Mar 10 14:56:36 2009
@@ -0,0 +1,20 @@
+/*
+ * jQuery UI 1.7
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI
+ */
jQuery.ui||(function(c){var
i=c.fn.remove,d=c.browser.mozilla&&(parseFloat(c.browser.version)<1.9);c.ui={version:"1.7",plugin:{add:function(k,l,n){var
m=c.ui[k].prototype;for(var j in
n){m.plugins[j]=m.plugins[j]||[];m.plugins[j].push([l,n[j]])}},call:function(j,l,k){var
n=j.plugins[l];if(!n||!j.element[0].parentNode){return}for(var
m=0;m0){return
true}m[j]=1;l=(m[j]>0);m[j]=0;return
l},isOverAxis:function(k,j,l){return(k>j)&&(k<(j+l))},isOver:function(o,k,n,m,j,l){return
c.ui.isOverAxis(o,n,j)&&c.ui.isOverAxis(k,m,l)},keyCode:{BACKSPACE:8,CAPS_LOCK:20,COMMA:188,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,NUMPAD_ADD:107,
NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38}};if(d){var
f=c.attr,e=c.fn.removeAttr,h="http://www.w3.org/2005/07/aaa",a=/^aria-/,b=/^wairole:/;c.attr=function(k,j,l){var
m=l!==undefined;return(j=="role"?(m?f.call(this,k,j,"wairole:"+l):(f.apply(this,arguments)||"").replace(b,"")):(a.test(j)?(m?k.setAttributeNS(h,j.replace(a,"aaa:"),l):f.call(this,k,j.replace(a,"aaa:"))):f.apply(this,arguments)))};c.fn.removeAttr=function(j){return(a.test(j)?this.each(function(){this.removeAttributeNS(h,j.replace(a,""))}):e.call(this,j))}}c.fn.extend({remove:function(){c("*",this).add(this).each(function(){c(this).triggerHandler("remove")});return
i.apply(this,arguments)},enableSelection:function(){return
this.attr("unselectable","off").css("MozUserSelect","").unbind("selectstart.ui")},disableSelection:function(){return
this.attr("unselectable","on").css("MozUserSelect","
none").bind("selectstart.ui",function(){return
false})},scrollParent:function(){var
j;if((c.browser.msie&&(/(static|relative)/).test(this.css("position")))||(/absolute/).test(this.css("position"))){j=this.parents().filter(function(){return(/(relative|absolute|fixed)/).test(c.curCSS(this,"position",1))&&(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}else{j=this.parents().filter(function(){return(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}return(/fixed/).test(this.css("position"))||!j.length?c(document):j}});c.extend(c.expr[":"],{data:function(l,k,j){return
!!c.data(l,j[3])},focusable:function(k){var
l=k.nodeName.toLowerCase(),j=c.attr(k,"tabindex");return(/input|select|textarea|button|object/.test(l)?!k.disabled:"a"==l||"area"==l?k.href||!isNaN(j):!isNaN(j))&&!c(k)["area"==l?"parents":"closest"](":hidden").length},tabbable:functi
on(k){var
j=c.attr(k,"tabindex");return(isNaN(j)||j>=0)&&c(k).is(":focusable")}});function
g(m,n,o,l){function k(q){var p=c[m][n][q]||[];return(typeof
p=="string"?p.split(/,?\s+/):p)}var j=k("getter");if(l.length==1&&typeof
l[0]=="string"){j=j.concat(k("getterSetter"))}return(c.inArray(o,j)!=-1)}c.widget=function(k,j){var
l=k.split(".")[0];k=k.split(".")[1];c.fn[k]=function(p){var n=(typeof
p=="string"),o=Array.prototype.slice.call(arguments,1);if(n&&p.substring(0,1)=="_"){return
this}if(n&&g(l,k,p,o)){var
m=c.data(this[0],k);return(m?m[p].apply(m,o):undefined)}return
this.each(function(){var q=c.data(this,k);(!q&&!n&&c.data(this,k,new
c[l][k](this,p))._init());(q&&n&&c.isFunction(q[p])&&q[p].apply(q,o))})};c[l]=c[l]||{};c[l][k]=function(o,n){var
m=this;this.namespace=l;this.widgetName=k;this.widgetEventPrefix=c[l][k].eventPrefix||k;this.widgetBaseClass=l+"-"+k;this.options=c.extend({},c.widget.defaults,c[l][k].defaults,c.metadata&&c.metadata.get(o)[k],n);this.element=c(o).b
ind("setData."+k,function(q,p,r){if(q.target==o){return
m._setData(p,r)}}).bind("getData."+k,function(q,p){if(q.target==o){return
m._getData(p)}}).bind("remove",function(){return
m.destroy()})};c[l][k].prototype=c.extend({},c.widget.prototype,j);c[l][k].getterSetter="option"};c.widget.prototype={_init:function(){},destroy:function(){this.element.removeData(this.widgetName).removeClass(this.widgetBaseClass+"-disabled
"+
svn commit: r752126 [3/4] - in /struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources: org/apache/struts2/static/css/ org/apache/struts2/static/css/smoothness/ org/apache/struts2/static/css/sm
Added:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/main.css
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/main.css?rev=752126&view=auto
==
---
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/main.css
(added)
+++
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/main.css
Tue Mar 10 14:56:36 2009
@@ -0,0 +1,3 @@
+.ui-datepicker {
+font-size: 65% !important;
+}
\ No newline at end of file
Added:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/images/dateIcon.gif
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/images/dateIcon.gif?rev=752126&view=auto
==
Binary file - no diff available.
Propchange:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/images/dateIcon.gif
--
svn:mime-type = application/octet-stream
Added:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/js/jquery-1.3.2.min.js
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/js/jquery-1.3.2.min.js?rev=752126&view=auto
==
---
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/js/jquery-1.3.2.min.js
(added)
+++
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/js/jquery-1.3.2.min.js
Tue Mar 10 14:56:36 2009
@@ -0,0 +1,19 @@
+/*
+ * jQuery JavaScript Library v1.3.2
+ * http://jquery.com/
+ *
+ * Copyright (c) 2009 John Resig
+ * Dual licensed under the MIT and GPL licenses.
+ * http://docs.jquery.com/License
+ *
+ * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009)
+ * Revision: 6246
+ */
+(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return
new
o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return
this}if(typeof E==="string"){var
G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var
I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var
F=o(I||[]);F.context=document;F.selector=E;return F}}else{return
o(H).find(E)}}else{if(o.isFunction(E)){return
o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return
this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return
this.length},get:function(E){return
E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var
G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?"
":"")+E}else{if(H
){G.selector=this.selector+"."+H+"("+E+")"}}return
G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return
this},each:function(F,E){return o.each(this,F,E)},index:function(E){return
o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof
F==="string"){if(H===g){return
this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return
this.each(function(I){for(F in
E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return
this.attr(E,F,"curCSS")},text:function(F){if(typeof
F!=="object"&&F!=null){return
this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var
E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return
E},wrapAll:function(E){if(this[0]){var
F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(funct
ion(){var G=this;while(G.firstChild){G=G.firstChild}return
G}).append(this)}return this},wrapInner:function(E){return
this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return
this.each(function(){o(this).wrapAll(E)})},append:function(){return
this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return
this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return
this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return
this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,thi
svn commit: r752138 - in /struts/sandbox/trunk/struts2-jquery-plugin/src: main/java/org/apache/struts2/jquery/components/ main/java/org/apache/struts2/jquery/views/jsp/ui/ main/resources/template/jque
Author: musachy
Date: Tue Mar 10 15:23:08 2009
New Revision: 752138
URL: http://svn.apache.org/viewvc?rev=752138&view=rev
Log:
Add image tolltip and url parameters to datepicker
Modified:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/components/JQueryDatepicker.java
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/views/jsp/ui/JQueryDatepickerTag.java
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery-simple/datepicker.ftl
struts/sandbox/trunk/struts2-jquery-plugin/src/site/docs/datepicker.html
Modified:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/components/JQueryDatepicker.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/components/JQueryDatepicker.java?rev=752138&r1=752137&r2=752138&view=diff
==
---
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/components/JQueryDatepicker.java
(original)
+++
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/components/JQueryDatepicker.java
Tue Mar 10 15:23:08 2009
@@ -52,6 +52,8 @@
//see http://docs.jquery.com/UI/Datepicker/%24.datepicker.formatDate
private String displayFormat;
+private String imageUrl;
+private String imageTooltip;
public JQueryDatepicker(ValueStack stack, HttpServletRequest request,
HttpServletResponse response) {
super(stack, request, response);
@@ -66,6 +68,14 @@
else
addParameter("displayFormat", "yy-mm-dd");
+if (imageUrl != null)
+addParameter("imageUrl", findString(imageUrl));
+
+if (imageTooltip != null)
+addParameter("imageTooltip", findString(imageTooltip));
+else
+addParameter("imageTooltip", "Pick a date");
+
Object currentValue = null;
if (parameters.containsKey("value")) {
addParameter("displayValue", parameters.get("value"));
@@ -154,4 +164,15 @@
public void setDisplayFormat(String displayFormat) {
this.displayFormat = displayFormat;
}
+
+@StrutsTagAttribute(description = "Tooltip for the calendar image",
defaultValue = "Pick a date")
+public void setImageTooltip(String imageTooltip) {
+this.imageTooltip = imageTooltip;
+}
+
+@StrutsTagAttribute(description = "Image used for the calendar button")
+public void setImageUrl(String imageUrl) {
+this.imageUrl = imageUrl;
+}
+
}
Modified:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/views/jsp/ui/JQueryDatepickerTag.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/views/jsp/ui/JQueryDatepickerTag.java?rev=752138&r1=752137&r2=752138&view=diff
==
---
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/views/jsp/ui/JQueryDatepickerTag.java
(original)
+++
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/views/jsp/ui/JQueryDatepickerTag.java
Tue Mar 10 15:23:08 2009
@@ -30,6 +30,8 @@
public class JQueryDatepickerTag extends JQueryTextFieldTag {
private String displayFormat;
+private String imageUrl;
+private String imageTooltip;
public Component getBean(ValueStack stack, HttpServletRequest req,
HttpServletResponse res) {
return new JQueryDatepicker(stack, req, res);
@@ -39,9 +41,19 @@
super.populateParams();
JQueryDatepicker picker = ((JQueryDatepicker) component);
picker.setDisplayFormat(displayFormat);
+picker.setImageTooltip(imageTooltip);
+picker.setImageUrl(imageUrl);
}
public void setDisplayFormat(String displayFormat) {
this.displayFormat = displayFormat;
}
+
+public void setImageTooltip(String imageTooltip) {
+this.imageTooltip = imageTooltip;
+}
+
+public void setImageUrl(String imageUrl) {
+this.imageUrl = imageUrl;
+}
}
Modified:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery-simple/datepicker.ftl
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery-simple/datepicker.ftl?rev=752138&r1=752137&r2=752138&view=diff
==
---
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery-simple/datepicker.ftl
(original)
+++
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery-simple/datepicker.ftl
Tue Mar 10 15:23:08 2009
@@ -64,8 +64,14 @@
altField: "#${parameters.id?html}_hidden",
altFor
svn commit: r752139 - in /struts/sandbox/trunk/s2-jquery-showcase: pom.xml src/main/resources/log4j.properties src/main/webapp/WEB-INF/content/form/date-input.jsp
Author: musachy Date: Tue Mar 10 15:25:43 2009 New Revision: 752139 URL: http://svn.apache.org/viewvc?rev=752139&view=rev Log: Add log4j dep Added: struts/sandbox/trunk/s2-jquery-showcase/src/main/resources/log4j.properties Modified: struts/sandbox/trunk/s2-jquery-showcase/pom.xml struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/date-input.jsp Modified: struts/sandbox/trunk/s2-jquery-showcase/pom.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/s2-jquery-showcase/pom.xml?rev=752139&r1=752138&r2=752139&view=diff == --- struts/sandbox/trunk/s2-jquery-showcase/pom.xml (original) +++ struts/sandbox/trunk/s2-jquery-showcase/pom.xml Tue Mar 10 15:25:43 2009 @@ -14,12 +14,12 @@ org.apache.struts struts2-core -2.1.6 +2.1.7-SNAPSHOT org.apache.struts struts2-convention-plugin -2.1.6 +2.1.7-SNAPSHOT org.apache.struts @@ -44,6 +44,11 @@ 4.5 test + +log4j +log4j +1.2.9 + s2-jquery-showcase Added: struts/sandbox/trunk/s2-jquery-showcase/src/main/resources/log4j.properties URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/s2-jquery-showcase/src/main/resources/log4j.properties?rev=752139&view=auto == --- struts/sandbox/trunk/s2-jquery-showcase/src/main/resources/log4j.properties (added) +++ struts/sandbox/trunk/s2-jquery-showcase/src/main/resources/log4j.properties Tue Mar 10 15:25:43 2009 @@ -0,0 +1,8 @@ +log4j.rootLogger=ERROR, Console + +log4j.appender.Console=org.apache.log4j.ConsoleAppender + +log4j.appender.Console.layout=org.apache.log4j.PatternLayout +log4j.appender.Console.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n + +log4j.logger.org.apache.struts2.convention=DEBUG \ No newline at end of file Modified: struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/date-input.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/date-input.jsp?rev=752139&r1=752138&r2=752139&view=diff == --- struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/date-input.jsp (original) +++ struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/date-input.jsp Tue Mar 10 15:25:43 2009 @@ -9,7 +9,7 @@ - +
svn commit: r752143 - /struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/main.css
Author: musachy
Date: Tue Mar 10 15:36:54 2009
New Revision: 752143
URL: http://svn.apache.org/viewvc?rev=752143&view=rev
Log:
style datepicker trigger
Modified:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/main.css
Modified:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/main.css
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/main.css?rev=752143&r1=752142&r2=752143&view=diff
==
---
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/main.css
(original)
+++
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/org/apache/struts2/static/css/smoothness/main.css
Tue Mar 10 15:36:54 2009
@@ -1,3 +1,9 @@
.ui-datepicker {
font-size: 65% !important;
+}
+
+.ui-datepicker-trigger {
+padding-bottom: 2px;
+padding-left: 4px;
+vertical-align: middle;
}
\ No newline at end of file
svn commit: r752149 - /struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/date-input.jsp
Author: musachy Date: Tue Mar 10 15:51:47 2009 New Revision: 752149 URL: http://svn.apache.org/viewvc?rev=752149&view=rev Log: Add more examples Modified: struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/date-input.jsp Modified: struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/date-input.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/date-input.jsp?rev=752149&r1=752148&r2=752149&view=diff == --- struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/date-input.jsp (original) +++ struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/date-input.jsp Tue Mar 10 15:51:47 2009 @@ -9,7 +9,9 @@ - + + +
svn commit: r752150 - /struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/components/JQueryDatepicker.java
Author: musachy
Date: Tue Mar 10 15:52:23 2009
New Revision: 752150
URL: http://svn.apache.org/viewvc?rev=752150&view=rev
Log: (empty)
Modified:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/components/JQueryDatepicker.java
Modified:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/components/JQueryDatepicker.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/components/JQueryDatepicker.java?rev=752150&r1=752149&r2=752150&view=diff
==
---
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/components/JQueryDatepicker.java
(original)
+++
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/components/JQueryDatepicker.java
Tue Mar 10 15:52:23 2009
@@ -77,9 +77,8 @@
addParameter("imageTooltip", "Pick a date");
Object currentValue = null;
-if (parameters.containsKey("value")) {
-addParameter("displayValue", parameters.get("value"));
-currentValue = parameters.get("value");
+if (parameters.containsKey("nameValue")) {
+currentValue = parameters.get("nameValue");
} else if (parameters.containsKey("name")) {
currentValue = findValue((String) parameters.get("name"));
}
svn commit: r752217 - in /struts/sandbox/trunk/struts2-jquery-plugin/src: main/java/org/apache/struts2/jquery/components/ main/java/org/apache/struts2/jquery/views/jsp/ui/ main/resources/template/jque
Author: musachy
Date: Tue Mar 10 19:07:20 2009
New Revision: 752217
URL: http://svn.apache.org/viewvc?rev=752217&view=rev
Log:
add dynamic options
Modified:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/components/JQueryDatepicker.java
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/views/jsp/ui/JQueryDatepickerTag.java
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery-simple/datepicker.ftl
struts/sandbox/trunk/struts2-jquery-plugin/src/site/docs/datepicker.html
Modified:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/components/JQueryDatepicker.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/components/JQueryDatepicker.java?rev=752217&r1=752216&r2=752217&view=diff
==
---
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/components/JQueryDatepicker.java
(original)
+++
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/components/JQueryDatepicker.java
Tue Mar 10 19:07:20 2009
@@ -22,6 +22,7 @@
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.TextUtils;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.struts2.jquery.JQueryPluginConstants;
@@ -37,6 +38,7 @@
import java.util.Calendar;
import java.util.Date;
import java.util.List;
+import java.util.Map;
@StrutsTag(
name = "datepicker",
@@ -54,6 +56,7 @@
private String displayFormat;
private String imageUrl;
private String imageTooltip;
+private String options;
public JQueryDatepicker(ValueStack stack, HttpServletRequest request,
HttpServletResponse response) {
super(stack, request, response);
@@ -76,6 +79,12 @@
else
addParameter("imageTooltip", "Pick a date");
+if (this.options != null) {
+String ops = findString(this.options);
+if (TextUtils.stringSet(ops))
+addParameter("options", TextUtils.escapeJavaScript(ops));
+}
+
Object currentValue = null;
if (parameters.containsKey("nameValue")) {
currentValue = parameters.get("nameValue");
@@ -93,12 +102,19 @@
addParameter("year", calendar.get(Calendar.YEAR));
addParameter("day", calendar.get(Calendar.DAY_OF_MONTH));
addParameter("month", calendar.get(Calendar.MONTH));
+} else {
+//the value could not be parsed into a Date, display as is
+addParameter("displayValue", currentValue.toString());
}
}
}
+@Override
+protected Class getValueClassType() {
+return Object.class;
+}
+
private Date getDate(Object obj) {
-SimpleDateFormat simpleDisplayFormat = new
SimpleDateFormat(displayFormat);
if (obj == null)
return null;
@@ -113,8 +129,6 @@
return new Date();
}
-
-Date date = null;
//formats used to parse the date
List formats = new ArrayList();
formats.add(new SimpleDateFormat(RFC3339_FORMAT));
@@ -134,7 +148,7 @@
for (DateFormat format : formats) {
try {
-date = format.parse(dateStr);
+Date date = format.parse(dateStr);
if (date != null)
return date;
} catch (Exception e) {
@@ -149,6 +163,9 @@
}
}
+public static void main(String[] s) {
+
System.out.print(SimpleDateFormat.getDateInstance(DateFormat.SHORT).format(new
Date()));
+}
protected String getDefaultTemplate() {
return TEMPLATE;
}
@@ -174,4 +191,9 @@
this.imageUrl = imageUrl;
}
+@StrutsTagAttribute(description = "The name of a variable(or a javascript
map) that contains additional options to be passed to JQuery" +
+" Datepicker")
+public void setOptions(String options) {
+this.options = options;
+}
}
Modified:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/views/jsp/ui/JQueryDatepickerTag.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/views/jsp/ui/JQueryDatepickerTag.java?rev=752217&r1=752216&r2=752217&view=diff
==
---
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/views/jsp/ui/JQueryDatepickerTag.java
(original)
+++
struts/sandbox/trunk/struts2-jquery-pl
svn commit: r752218 - in /struts/sandbox/trunk/s2-jquery-showcase/src/main: java/org/apache/struts2/jquery/actions/form/MessageAction.java webapp/WEB-INF/content/index.jsp
Author: wesw
Date: Tue Mar 10 19:07:39 2009
New Revision: 752218
URL: http://svn.apache.org/viewvc?rev=752218&view=rev
Log:
fixing problem with conventions urls, adding simple theme examples to index page
Modified:
struts/sandbox/trunk/s2-jquery-showcase/src/main/java/org/apache/struts2/jquery/actions/form/MessageAction.java
struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/index.jsp
Modified:
struts/sandbox/trunk/s2-jquery-showcase/src/main/java/org/apache/struts2/jquery/actions/form/MessageAction.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/s2-jquery-showcase/src/main/java/org/apache/struts2/jquery/actions/form/MessageAction.java?rev=752218&r1=752217&r2=752218&view=diff
==
---
struts/sandbox/trunk/s2-jquery-showcase/src/main/java/org/apache/struts2/jquery/actions/form/MessageAction.java
(original)
+++
struts/sandbox/trunk/s2-jquery-showcase/src/main/java/org/apache/struts2/jquery/actions/form/MessageAction.java
Tue Mar 10 19:07:39 2009
@@ -24,12 +24,22 @@
@Action("SimpleFormPostNonAjaxResponse"),
@Action("FormWithResetGetReqAjaxResp"),
@Action("FormWithResetPostReqAjaxResp")
-})
+}) @Override
public String execute() {
return ActionSupport.SUCCESS;
}
-@SkipValidation
+@Actions({
+@Action("/simple-theme/SimpleFormPostAjaxResponse-input"),
+@Action("/simple-theme/SimpleFormPostNonAjaxResponse-input"),
+@Action("/simple-theme/FormWithResetPostReqAjaxResp-input"),
+@Action("SimpleFormGetAjaxResponse-input"),
+@Action("SimpleFormPostAjaxResponse-input"),
+@Action("SimpleFormGetNonAjaxResponse-input"),
+@Action("SimpleFormPostNonAjaxResponse-input"),
+@Action("FormWithResetGetReqAjaxResp-input"),
+@Action("FormWithResetPostReqAjaxResp-input")
+}) @SkipValidation @Override
public String input() {
return ActionSupport.INPUT;
}
Modified:
struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/index.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/index.jsp?rev=752218&r1=752217&r2=752218&view=diff
==
---
struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/index.jsp
(original)
+++
struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/index.jsp
Tue Mar 10 19:07:39 2009
@@ -30,7 +30,18 @@
Form With Reset Post Ajax Response
-
+
+
+ Form With Reset Post Request Ajax Response
(simple theme)
+
+
+
+ Simple Form Post Ajax Response (simple
theme)
+
+
+
+ Simple Form Post Non-Ajax Response (simple
theme)
+
Date Picker
svn commit: r752219 - in /struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form: date-input.jsp date.jsp
Author: musachy
Date: Tue Mar 10 19:07:56 2009
New Revision: 752219
URL: http://svn.apache.org/viewvc?rev=752219&view=rev
Log:
Add dynamic options
Modified:
struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/date-input.jsp
struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/date.jsp
Modified:
struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/date-input.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/date-input.jsp?rev=752219&r1=752218&r2=752219&view=diff
==
---
struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/date-input.jsp
(original)
+++
struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/date-input.jsp
Tue Mar 10 19:07:56 2009
@@ -6,12 +6,28 @@
Date Picker
+
+
+var ops = {"maxDate" : "+1m"};
+
+
+.someClass {
+background-color: #c3d9ff;
+}
+
-
-
-
+Tooltip from a Date:
+Read only from a Calendar:
+CSS Style:
+CSS Class:
+Short Format:
+Medium Format:
+Large Format:
+Unparsable Date:
+Options from an inline map:
+Options from an object:
Modified:
struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/date.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/date.jsp?rev=752219&r1=752218&r2=752219&view=diff
==
---
struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/date.jsp
(original)
+++
struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/date.jsp
Tue Mar 10 19:07:56 2009
@@ -5,8 +5,9 @@
Posted Date
+
-Date:
+
\ No newline at end of file
svn commit: r752222 - in /struts/sandbox/trunk/struts2-jquery-plugin/src: main/java/org/apache/struts2/jquery/components/ main/java/org/apache/struts2/jquery/views/jsp/ui/ main/resources/template/jque
Author: musachy
Date: Tue Mar 10 19:27:09 2009
New Revision: 75
URL: http://svn.apache.org/viewvc?rev=75&view=rev
Log:
Add changeMonth and changeYear attributes
Modified:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/components/JQueryDatepicker.java
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/views/jsp/ui/JQueryDatepickerTag.java
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery-simple/datepicker.ftl
struts/sandbox/trunk/struts2-jquery-plugin/src/site/docs/datepicker.html
Modified:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/components/JQueryDatepicker.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/components/JQueryDatepicker.java?rev=75&r1=752221&r2=75&view=diff
==
---
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/components/JQueryDatepicker.java
(original)
+++
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/components/JQueryDatepicker.java
Tue Mar 10 19:27:09 2009
@@ -57,6 +57,8 @@
private String imageUrl;
private String imageTooltip;
private String options;
+private String changeYear;
+private String changeMonth;
public JQueryDatepicker(ValueStack stack, HttpServletRequest request,
HttpServletResponse response) {
super(stack, request, response);
@@ -79,6 +81,16 @@
else
addParameter("imageTooltip", "Pick a date");
+if (this.changeMonth != null)
+addParameter("changeMonth", findString(this.changeMonth));
+else
+addParameter("changeMonth", "true");
+
+if (this.changeYear != null)
+addParameter("changeYear", findString(this.changeYear));
+else
+addParameter("changeYear", "true");
+
if (this.options != null) {
String ops = findString(this.options);
if (TextUtils.stringSet(ops))
@@ -166,6 +178,7 @@
public static void main(String[] s) {
System.out.print(SimpleDateFormat.getDateInstance(DateFormat.SHORT).format(new
Date()));
}
+
protected String getDefaultTemplate() {
return TEMPLATE;
}
@@ -196,4 +209,14 @@
public void setOptions(String options) {
this.options = options;
}
+
+@StrutsTagAttribute(description = "Allows you to change the month by
selecting from a drop-down list", type = "Boolean", defaultValue = "true")
+public void setChangeMonth(String changeMonth) {
+this.changeMonth = changeMonth;
+}
+
+@StrutsTagAttribute(description = "Allows you to change the year by
selecting from a drop-down list", type = "Boolean", defaultValue = "true")
+public void setChangeYear(String changeYear) {
+this.changeYear = changeYear;
+}
}
Modified:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/views/jsp/ui/JQueryDatepickerTag.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/views/jsp/ui/JQueryDatepickerTag.java?rev=75&r1=752221&r2=75&view=diff
==
---
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/views/jsp/ui/JQueryDatepickerTag.java
(original)
+++
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/views/jsp/ui/JQueryDatepickerTag.java
Tue Mar 10 19:27:09 2009
@@ -33,6 +33,8 @@
private String imageUrl;
private String imageTooltip;
private String options;
+private String changeYear;
+private String changeMonth;
public Component getBean(ValueStack stack, HttpServletRequest req,
HttpServletResponse res) {
return new JQueryDatepicker(stack, req, res);
@@ -45,6 +47,8 @@
picker.setImageTooltip(imageTooltip);
picker.setImageUrl(imageUrl);
picker.setOptions(options);
+picker.setChangeMonth(changeMonth);
+picker.setChangeYear(changeYear);
}
public void setDisplayFormat(String displayFormat) {
@@ -62,4 +66,12 @@
public void setOptions(String options) {
this.options = options;
}
+
+public void setChangeYear(String changeYear) {
+this.changeYear = changeYear;
+}
+
+public void setChangeMonth(String changeMonth) {
+this.changeMonth = changeMonth;
+}
}
Modified:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery-simple/datepicker.ftl
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery-simple/datepicker.ftl?rev=75&r1=752221&r2=75&view=diff
svn commit: r752223 - /struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/date-input.jsp
Author: musachy Date: Tue Mar 10 19:27:29 2009 New Revision: 752223 URL: http://svn.apache.org/viewvc?rev=752223&view=rev Log: more examples Modified: struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/date-input.jsp Modified: struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/date-input.jsp URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/date-input.jsp?rev=752223&r1=75&r2=752223&view=diff == --- struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/date-input.jsp (original) +++ struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/date-input.jsp Tue Mar 10 19:27:29 2009 @@ -28,6 +28,7 @@ Unparsable Date: Options from an inline map: Options from an object: +No Month or Year dropdown:
svn commit: r752225 - in /struts/sandbox/trunk/s2-jquery-showcase/src/main: java/org/apache/struts2/jquery/actions/form/ resources/org/apache/struts2/jquery/actions/form/ webapp/WEB-INF/content/form/
Author: wesw
Date: Tue Mar 10 19:34:15 2009
New Revision: 752225
URL: http://svn.apache.org/viewvc?rev=752225&view=rev
Log:
adding datepicker to jquery theme, simple example -
form with textfield and datepicker + ajax validation + ajax response handling
Added:
struts/sandbox/trunk/s2-jquery-showcase/src/main/java/org/apache/struts2/jquery/actions/form/SimpleFormWithDatePickerAction.java
struts/sandbox/trunk/s2-jquery-showcase/src/main/resources/org/apache/struts2/jquery/actions/form/SimpleFormWithDatePickerAction-validation.xml
- copied, changed from r752220,
struts/sandbox/trunk/s2-jquery-showcase/src/main/resources/org/apache/struts2/jquery/actions/form/MessageAction-validation.xml
struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/simple-form-with-date-picker-input.jsp
struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/simple-form-with-date-picker.jsp
- copied, changed from r752220,
struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/FormWithResetPostReqAjaxResp.jsp
Added:
struts/sandbox/trunk/s2-jquery-showcase/src/main/java/org/apache/struts2/jquery/actions/form/SimpleFormWithDatePickerAction.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/s2-jquery-showcase/src/main/java/org/apache/struts2/jquery/actions/form/SimpleFormWithDatePickerAction.java?rev=752225&view=auto
==
---
struts/sandbox/trunk/s2-jquery-showcase/src/main/java/org/apache/struts2/jquery/actions/form/SimpleFormWithDatePickerAction.java
(added)
+++
struts/sandbox/trunk/s2-jquery-showcase/src/main/java/org/apache/struts2/jquery/actions/form/SimpleFormWithDatePickerAction.java
Tue Mar 10 19:34:15 2009
@@ -0,0 +1,48 @@
+package org.apache.struts2.jquery.actions.form;
+
+import com.opensymphony.xwork2.ActionSupport;
+
+import java.util.Date;
+
+import org.apache.struts2.convention.annotation.Action;
+import org.apache.struts2.convention.annotation.InterceptorRef;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: wesw
+ * Date: Mar 10, 2009
+ * Time: 3:18:06 PM
+ * To change this template use File | Settings | File Templates.
+ */
+...@interceptorref("jsonValidationWorkflowStack")
+public class SimpleFormWithDatePickerAction extends ActionSupport {
+
+private String msg ;
+private Date date ;
+
+@Override @Action("/form/simple-form-with-date-picker")
+public String execute() {
+return ActionSupport.SUCCESS;
+}
+
+@Override @Action("/form/simple-form-with-date-picker-input")
+public String input() {
+return ActionSupport.INPUT;
+}
+
+public Date getDate() {
+return date;
+}
+
+public void setDate(Date date) {
+this.date = date;
+}
+
+public void setMsg(String msg) {
+this.msg = msg;
+}
+
+public String getMsg() {
+return msg;
+}
+}
Copied:
struts/sandbox/trunk/s2-jquery-showcase/src/main/resources/org/apache/struts2/jquery/actions/form/SimpleFormWithDatePickerAction-validation.xml
(from r752220,
struts/sandbox/trunk/s2-jquery-showcase/src/main/resources/org/apache/struts2/jquery/actions/form/MessageAction-validation.xml)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/s2-jquery-showcase/src/main/resources/org/apache/struts2/jquery/actions/form/SimpleFormWithDatePickerAction-validation.xml?p2=struts/sandbox/trunk/s2-jquery-showcase/src/main/resources/org/apache/struts2/jquery/actions/form/SimpleFormWithDatePickerAction-validation.xml&p1=struts/sandbox/trunk/s2-jquery-showcase/src/main/resources/org/apache/struts2/jquery/actions/form/MessageAction-validation.xml&r1=752220&r2=752225&rev=752225&view=diff
==
---
struts/sandbox/trunk/s2-jquery-showcase/src/main/resources/org/apache/struts2/jquery/actions/form/MessageAction-validation.xml
(original)
+++
struts/sandbox/trunk/s2-jquery-showcase/src/main/resources/org/apache/struts2/jquery/actions/form/SimpleFormWithDatePickerAction-validation.xml
Tue Mar 10 19:34:15 2009
@@ -6,4 +6,11 @@
You must enter a message.
+
+
+ 01/01/1900
+ 01/01/2000
+ You must enter a date before 2000.
+
+
Added:
struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/simple-form-with-date-picker-input.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/simple-form-with-date-picker-input.jsp?rev=752225&view=auto
==
---
struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/simple-form-with-date-picker-input.jsp
(added)
+++
struts/sandbox/trunk/s2-jquery-showcase/src/main/webapp/WEB-INF/content/form/simple-form-with-date-picker-input.jsp
Tue Mar 10 19:34:15 2009
@@ -0,0 +1
svn commit: r752226 - /struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery/datepicker.ftl
Author: wesw
Date: Tue Mar 10 19:34:38 2009
New Revision: 752226
URL: http://svn.apache.org/viewvc?rev=752226&view=rev
Log:
adding datepicker to jquery theme
Added:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery/datepicker.ftl
- copied, changed from r752220,
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery/text.ftl
Copied:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery/datepicker.ftl
(from r752220,
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery/text.ftl)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery/datepicker.ftl?p2=struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery/datepicker.ftl&p1=struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery/text.ftl&r1=752220&r2=752226&rev=752226&view=diff
==
---
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery/text.ftl
(original)
+++
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery/datepicker.ftl
Tue Mar 10 19:34:38 2009
@@ -21,5 +21,5 @@
*/
-->
<#include "/${parameters.templateDir}/xhtml/controlheader.ftl" />
-<#include "/${parameters.templateDir}/jquery-simple/text.ftl" />
+<#include "/${parameters.templateDir}/jquery-simple/datepicker.ftl" />
<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" />
svn commit: r752227 - /struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery-simple/datepicker.ftl
Author: musachy
Date: Tue Mar 10 19:38:34 2009
New Revision: 752227
URL: http://svn.apache.org/viewvc?rev=752227&view=rev
Log:
formatting fix
Modified:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery-simple/datepicker.ftl
Modified:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery-simple/datepicker.ftl
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery-simple/datepicker.ftl?rev=752227&r1=752226&r2=752227&view=diff
==
---
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery-simple/datepicker.ftl
(original)
+++
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery-simple/datepicker.ftl
Tue Mar 10 19:38:34 2009
@@ -59,34 +59,35 @@
/>
-$(function() {
-var ops = {
-altField: "#${parameters.id?html}_hidden",
-altFormat: "yy-mm-dd'T'00:00:00",
-dateFormat : "${parameters.displayFormat?html}",
-<#if parameters.imageUrl??>
-buttonImage: "${parameters.imageUrl}",
-<#else>
-buttonImage: "${base}/struts/images/dateIcon.gif",
-
-buttonImageOnly: true,
-showOn: "both",
-buttonText: "${parameters.imageTooltip}",
-changeMonth: ${parameters.changeMonth},
-changeYear: ${parameters.changeYear}
-};
-
-<#if parameters.options??>
-var ops2 = window["${parameters.options}"];
-if (!ops2) {
-ops2 = eval ("( ${parameters.options} )" );
-}
-$.extend(ops, ops2);
+$(function() {
+var ops = {
+altField: "#${parameters.id?html}_hidden",
+altFormat: "yy-mm-dd'T'00:00:00",
+dateFormat : "${parameters.displayFormat?html}",
+<#if parameters.imageUrl??>
+buttonImage: "${parameters.imageUrl}",
+<#else>
+buttonImage: "${base}/struts/images/dateIcon.gif",
+buttonImageOnly: true,
+showOn: "both",
+buttonText: "${parameters.imageTooltip}",
+changeMonth: ${parameters.changeMonth},
+changeYear: ${parameters.changeYear}
+};
-$("#${parameters.id?html}").datepicker(ops);
-<#if parameters.year?? && parameters.month?? && parameters.day??>
-
$("#${parameters.id?html}").val($.datepicker.formatDate("${parameters.displayFormat?html}",
new Date(${parameters.year?c}, ${parameters.month}, ${parameters.day})));
-
-});
+<#if parameters.options??>
+var opsStr = "${parameters.options}";
+var ops2 = window[opsStr];
+if (!ops2) {
+ops2 = eval ("( " + opsStr + " )" );
+}
+$.extend(ops, ops2);
+
+
+$("#${parameters.id?html}").datepicker(ops);
+<#if parameters.year?? && parameters.month?? && parameters.day??>
+
$("#${parameters.id?html}").val($.datepicker.formatDate("${parameters.displayFormat?html}",
new Date(${parameters.year?c}, ${parameters.month}, ${parameters.day})));
+
+});
\ No newline at end of file
