[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 |-- faq was last edited by erodriguez (01:16 PM). | http://cwiki.apache.org/confluence/display/FELIX/faq Apache FTPServer Project (FTPSERVER) http://cwiki.apache.org/confluence/display/FTPSERVER | |-Pages Added or Edited in This Space |-- Building was last edited by ngn (08:28 AM). | http://cwiki.apache.org/confluence/display/FTPSERVER/Building Apache CXF 2.0 Documentation (CXF20DOC) http://cwiki.apache.org/confluence/display/CXF20DOC | |-Pages Added or Edited in This Space |-- JMS Transport was last edited by ericjohnson (09:04 AM). | http://cwiki.apache.org/confluence/display/CXF20DOC/JMS+Transport Apache Directory Server v1.5 (DIRxSRVx11) http://cwiki.apache.org/confluence/display/DIRxSRVx11 | |-Pages Added or Edited in This Space |-- OSGi and ApacheDS was last edited by erodriguez (09:44 PM). | http://cwiki.apache.org/confluence/display/DIRxSRVx11/OSGi+and+ApacheDS Apache HiveMind 2 (HIVEMIND2) http://cwiki.apache.org/confluence/display/HIVEMIND2 | |-Pages Added or Edited in This Space |-- NewIn2AnnotatedModules was last edited by ahuegen (08:11 AM). | http://cwiki.apache.org/confluence/display/HIVEMIND2/NewIn2AnnotatedModules Apache ActiveMQ (ACTIVEMQ) http://cwiki.apache.org/confluence/display/ACTIVEMQ | |-Pages Added or Edited in This Space |-- Blob Messages was created by jstrachan (09:11 AM). | http://cwiki.apache.org/confluence/display/ACTIVEMQ/Blob+Messages |-- REST was last edited by jstrachan (08:48 AM). | http://cwiki.apache.org/confluence/display/ACTIVEMQ/REST |-- Run Broker was last edited by jstrachan (02:08 AM). | http://cwiki.apache.org/confluence/display/ACTIVEMQ/Run+Broker |-- Discussion Forums was last edited by jstrachan (01:56 AM). | http://cwiki.apache.org/confluence/display/ACTIVEMQ/Discussion+Forums Apache Geronimo v1.1 (GMOxDOC11) http://cwiki.apache.org/confluence/display/GMOxDOC11 | |-Pages Added or Edited in This Space |-- geronimo-ra.xml was last edited by [EMAIL PROTECTED] (12:30 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC11/geronimo-ra.xml Apache ServiceMix (SM) http://cwiki.apache.org/confluence/display/SM | |-Pages Added or Edited in This Space |-- HTTP binding was last edited by [EMAIL PROTECTED] (08:39 AM). | http://cwiki.apache.org/confluence/display/SM/HTTP+binding Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW | |-Pages Added or Edited in This Space |-- Creating and Signing a Distribution was last edited by husted (04:29 AM). | http://cwiki.apache.org/confluence/display/WW/Creating+and+Signing+a+Distribution UIMA (UIMA) http://cwiki.apache.org/confluence/display/UIMA | |-Pages Added or Edited in This Space |-- TestPlan2.1 was last edited by alally (10:01 AM). | http://cwiki.apache.org/confluence/display/UIMA/TestPlan2.1 Apache Tuscany (TUSCANY) http://cwiki.apache.org/confluence/display/TUSCANY | |-Pages Added or Edited in This Space |-- Java Implementation was created by jboynes (04:52 PM). | http://cwiki.apache.org/confluence/display/TUSCANY/Java+Implementation |-- SCA Developer Guide was last edited by haleh (02:47 PM). | http://cwiki.apache.org/confluence/display/TUSCANY/SCA+Developer+Guide |-- SCA Java User Guide was last edited by jboynes (01:36 PM). | http://cwiki.apache.org/confluence/display/TUSCANY/SCA+Java+User+Guide |-- SCA Java Documentation was last edited by jboynes (01:36 PM). | http://cwiki.apache.org/confluence/display/TUSCANY/SCA+Java+Documentation |-- Index was last edited by danmurphy (03:10 AM). | http://cwiki.apache.org/confluence/display/TUSCANY/Index |-- Obtaining the SDO 2.1 CTS was created by danmurphy (02:51 AM). | http://cwiki.apache.org/confluence/display/TUSCANY/Obtaining+the+SDO+2.1+CTS |-- Contributing to the SDO CTS was created by danmurphy (03:08 AM). | http://cwiki.apache.org/confluence/display/TUSCANY/Contributing+to+the+SDO+CTS |-- SDO CTS Overview was created by danmurphy (02:15 AM). | http://cwiki.apache.org/confluence/display/TUSCANY/SDO+CTS+Overview Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET | |-Pages Added or Edited in This Space |-- Migrate-2.0 was last edited by jbq (02:36 AM). | http://cwiki.apache.org/confluence/display/WICKET/Migrate-2.0 |-- Migrate-1.3 was last edited by jbq (02:36 AM). | http://cwiki.apache.org/confluence/display/WICKET/Migrate-1.3 | |-New Comments in This Space |-- http://cwiki.apache.org/confluence/display/WICKET/Dyanamic+menu (2) - Updated User Profiles: --
svn commit: r511291 - /struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Div.java
Author: musachy Date: Sat Feb 24 08:12:38 2007 New Revision: 511291 URL: http://svn.apache.org/viewvc?view=rev&rev=511291 Log: Add breaklines to javadoc Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Div.java Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Div.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Div.java?view=diff&rev=511291&r1=511290&r2=511291 == --- struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Div.java (original) +++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Div.java Sat Feb 24 08:12:38 2007 @@ -69,15 +69,15 @@ * 'formFilter' is the name of a function which will be used to filter the fields that will be * seralized. This function takes as a parameter the element and returns true if the element * should be included. - * 'updateFreq' sets(in milliseconds) the update interval. - * 'autoStart' if set to true(true by default) starts the timer automatically - * 'startTimerListenTopics' is a comma-separated list of topics used to start the timer - * 'stopTimerListenTopics' is a comma-separated list of topics used to stop the timer - * 'listenTopics' comma separated list of topics names, that will trigger a request - * 'indicator' element to be shown while the request executing + * 'updateFreq' sets(in milliseconds) the update interval. + * 'autoStart' if set to true(true by default) starts the timer automatically + * 'startTimerListenTopics' is a comma-separated list of topics used to start the timer + * 'stopTimerListenTopics' is a comma-separated list of topics used to stop the timer + * 'listenTopics' comma separated list of topics names, that will trigger a request + * 'indicator' element to be shown while the request executing * 'showErrorTransportText': whether errors should be displayed (on 'targets') * 'showLoadingText' show loading text on targets - * 'notifyTopics' comma separated list of topics names, that will be published. Three parameters are passed: + * 'notifyTopics' comma separated list of topics names, that will be published. Three parameters are passed: * * data: html or json object when type='load' or type='error' * type: 'before' before the request is made, 'load' when the request succeeds, or 'error' when it fails
svn commit: r511295 - /struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js
Author: musachy Date: Sat Feb 24 08:23:00 2007 New Revision: 511295 URL: http://svn.apache.org/viewvc?view=rev&rev=511295 Log: WW-1589: Linked autocompleter reset on page reload Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js?view=diff&rev=511295&r1=511294&r2=511295 == --- struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js (original) +++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js Sat Feb 24 08:23:00 2007 @@ -21,6 +21,7 @@ this.formId = ""; this.formFilter = ""; + this.firstRequest = true; this.cbox = null; this.init = function(/*Widget*/ cbox, /*DomNode*/ node){ @@ -59,10 +60,14 @@ formNode: dojo.byId(this.formId), formFilter: window[this.formFilter], load: dojo.lang.hitch(this, function(type, data, evt) { - //show indicator - dojo.html.hide(this.cbox.indicator); +//show indicator +dojo.html.hide(this.cbox.indicator); -this.cbox.notify.apply(this.cbox, [data, type, evt]); +//if notifyTopics is published on the first request (onload) +//the value of listeners will be reset +if(!this.firstRequest) { + this.cbox.notify.apply(this.cbox, [data, type, evt]); +} if(!dojo.lang.isArray(data)) { //if there is a dataFieldName, take it if(!dojo.string.isBlank(this.cbox.dataFieldName) && data[this.cbox.dataFieldName] != null) { @@ -87,6 +92,7 @@ data = arrData; } this.setData(data); +this.firstRequest = false; }), mimetype: "text/json" });
svn commit: r511297 - in /struts/struts2/trunk/core/src/main: java/org/apache/struts2/components/Div.java resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js
Author: musachy Date: Sat Feb 24 08:25:27 2007 New Revision: 511297 URL: http://svn.apache.org/viewvc?view=rev&rev=511297 Log: WW-1589 Linked autocompleter reset on page reload Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java?view=diff&rev=511297&r1=511296&r2=511297 == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java Sat Feb 24 08:25:27 2007 @@ -69,15 +69,15 @@ * 'formFilter' is the name of a function which will be used to filter the fields that will be * seralized. This function takes as a parameter the element and returns true if the element * should be included. - * 'updateFreq' sets(in milliseconds) the update interval. - * 'autoStart' if set to true(true by default) starts the timer automatically - * 'startTimerListenTopics' is a comma-separated list of topics used to start the timer - * 'stopTimerListenTopics' is a comma-separated list of topics used to stop the timer - * 'listenTopics' comma separated list of topics names, that will trigger a request - * 'indicator' element to be shown while the request executing + * 'updateFreq' sets(in milliseconds) the update interval. + * 'autoStart' if set to true(true by default) starts the timer automatically + * 'startTimerListenTopics' is a comma-separated list of topics used to start the timer + * 'stopTimerListenTopics' is a comma-separated list of topics used to stop the timer + * 'listenTopics' comma separated list of topics names, that will trigger a request + * 'indicator' element to be shown while the request executing * 'showErrorTransportText': whether errors should be displayed (on 'targets') * 'showLoadingText' show loading text on targets - * 'notifyTopics' comma separated list of topics names, that will be published. Three parameters are passed: + * 'notifyTopics' comma separated list of topics names, that will be published. Three parameters are passed: * * data: html or json object when type='load' or type='error' * type: 'before' before the request is made, 'load' when the request succeeds, or 'error' when it fails Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js?view=diff&rev=511297&r1=511296&r2=511297 == --- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js (original) +++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js Sat Feb 24 08:25:27 2007 @@ -21,6 +21,7 @@ this.formId = ""; this.formFilter = ""; + this.firstRequest = true; this.cbox = null; this.init = function(/*Widget*/ cbox, /*DomNode*/ node){ @@ -59,10 +60,14 @@ formNode: dojo.byId(this.formId), formFilter: window[this.formFilter], load: dojo.lang.hitch(this, function(type, data, evt) { - //show indicator - dojo.html.hide(this.cbox.indicator); +//show indicator +dojo.html.hide(this.cbox.indicator); -this.cbox.notify.apply(this.cbox, [data, type, evt]); +//if notifyTopics is published on the first request (onload) +//the value of listeners will be reset +if(!this.firstRequest) { + this.cbox.notify.apply(this.cbox, [data, type, evt]); +} if(!dojo.lang.isArray(data)) { //if there is a dataFieldName, take it if(!dojo.string.isBlank(this.cbox.dataFieldName) && data[this.cbox.dataFieldName] != null) { @@ -87,6 +92,7 @@ data = arrData; } this.setData(data); +this.firstRequest = false; }), mimetype: "text/json" });
svn commit: r511299 - in /struts/struts2/branches/STRUTS_2_0_X/core/src: main/java/org/apache/struts2/components/ main/java/org/apache/struts2/views/jsp/ui/ main/resources/template/ajax/ site/resource
Author: musachy Date: Sat Feb 24 08:39:53 2007 New Revision: 511299 URL: http://svn.apache.org/viewvc?view=rev&rev=511299 Log: WW-1766 div tag needs the scriptSeparation attribute Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Div.java struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/ajax/div.ftl struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/div.html struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/DivTest.java struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/div-1.txt Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Div.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Div.java?view=diff&rev=511299&r1=511298&r2=511299 == --- struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Div.java (original) +++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Div.java Sat Feb 24 08:39:53 2007 @@ -77,6 +77,7 @@ * 'indicator' element to be shown while the request executing * 'showErrorTransportText': whether errors should be displayed (on 'targets') * 'showLoadingText' show loading text on targets + * 'separateScript' Run scripts in a separate scope, unique for each Div * 'notifyTopics' comma separated list of topics names, that will be published. Three parameters are passed: * * data: html or json object when type='load' or type='error' @@ -117,6 +118,7 @@ protected String startTimerListenTopics; protected String stopTimerListenTopics; protected String refreshOnShow; +protected String separateScripts; public Div(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); @@ -145,6 +147,8 @@ addParameter("startTimerListenTopics", findString(startTimerListenTopics)); if (stopTimerListenTopics != null) addParameter("stopTimerListenTopics", findString(stopTimerListenTopics)); +if (separateScripts != null) +addParameter("separateScripts", findValue(separateScripts, Boolean.class)); } @StrutsTagAttribute(description="Start timer automatically", type="Boolean", defaultValue="true") @@ -180,5 +184,10 @@ @StrutsTagAttribute(description="Deprecated. Use 'notifyTopics'. Javascript code execute after reload") public void setAfterLoading(String afterLoading) { this.afterLoading = afterLoading; +} + +@StrutsTagAttribute(description="Run scripts in a separate scope, unique for each Div", defaultValue="true") +public void setSeparateScripts(String separateScripts) { +this.separateScripts = separateScripts; } } Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java?view=diff&rev=511299&r1=511298&r2=511299 == --- struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java (original) +++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java Sat Feb 24 08:39:53 2007 @@ -38,7 +38,8 @@ protected String startTimerListenTopics; protected String stopTimerListenTopics; protected String refreshOnShow; - +protected String separateScripts; + public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { return new Div(stack, req, res); } @@ -53,6 +54,7 @@ div.setStartTimerListenTopics(startTimerListenTopics); div.setStopTimerListenTopics(stopTimerListenTopics); div.setRefreshOnShow(refreshOnShow); +div.setSeparateScripts(separateScripts); } public void setAutoStart(String autoStart) { @@ -77,5 +79,9 @@ public void setRefreshOnShow(String refreshOnShow) { this.refreshOnShow = refreshOnShow; +} + +public void setSeparateScripts(String separateScripts) { +this.separateScripts = separateScripts; } } Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/ajax/div.ftl URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/ajax/div.ftl?view=diff&rev=511299&r1=511298&r2=511299 == --- struts/struts2/branches
svn commit: r511300 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/components/ main/java/org/apache/struts2/views/jsp/ui/ main/resources/template/ajax/ site/resources/tags/ test/jav
Author: musachy Date: Sat Feb 24 08:41:38 2007 New Revision: 511300 URL: http://svn.apache.org/viewvc?view=rev&rev=511300 Log: WW-1766 div tag needs the scriptSeparation attribute Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java struts/struts2/trunk/core/src/main/resources/template/ajax/div.ftl struts/struts2/trunk/core/src/site/resources/tags/div.html struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DivTest.java struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/div-1.txt Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java?view=diff&rev=511300&r1=511299&r2=511300 == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java Sat Feb 24 08:41:38 2007 @@ -77,6 +77,7 @@ * 'indicator' element to be shown while the request executing * 'showErrorTransportText': whether errors should be displayed (on 'targets') * 'showLoadingText' show loading text on targets + * 'separateScript' Run scripts in a separate scope, unique for each Div * 'notifyTopics' comma separated list of topics names, that will be published. Three parameters are passed: * * data: html or json object when type='load' or type='error' @@ -117,6 +118,7 @@ protected String startTimerListenTopics; protected String stopTimerListenTopics; protected String refreshOnShow; +protected String separateScripts; public Div(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); @@ -145,6 +147,8 @@ addParameter("startTimerListenTopics", findString(startTimerListenTopics)); if (stopTimerListenTopics != null) addParameter("stopTimerListenTopics", findString(stopTimerListenTopics)); +if (separateScripts != null) +addParameter("separateScripts", findValue(separateScripts, Boolean.class)); } @StrutsTagAttribute(description="Start timer automatically", type="Boolean", defaultValue="true") @@ -180,5 +184,10 @@ @StrutsTagAttribute(description="Deprecated. Use 'notifyTopics'. Javascript code execute after reload") public void setAfterLoading(String afterLoading) { this.afterLoading = afterLoading; +} + +@StrutsTagAttribute(description="Run scripts in a separate scope, unique for each Div", defaultValue="true") +public void setSeparateScripts(String separateScripts) { +this.separateScripts = separateScripts; } } Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java?view=diff&rev=511300&r1=511299&r2=511300 == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java Sat Feb 24 08:41:38 2007 @@ -38,7 +38,8 @@ protected String startTimerListenTopics; protected String stopTimerListenTopics; protected String refreshOnShow; - +protected String separateScripts; + public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { return new Div(stack, req, res); } @@ -53,6 +54,7 @@ div.setStartTimerListenTopics(startTimerListenTopics); div.setStopTimerListenTopics(stopTimerListenTopics); div.setRefreshOnShow(refreshOnShow); +div.setSeparateScripts(separateScripts); } public void setAutoStart(String autoStart) { @@ -77,5 +79,9 @@ public void setRefreshOnShow(String refreshOnShow) { this.refreshOnShow = refreshOnShow; +} + +public void setSeparateScripts(String separateScripts) { +this.separateScripts = separateScripts; } } Modified: struts/struts2/trunk/core/src/main/resources/template/ajax/div.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/ajax/div.ftl?view=diff&rev=511300&r1=511299&r2=511300 == --- struts/struts2/trunk/core/src/main/resources/template/ajax/div.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/template/ajax/div.ftl Sat Feb 24 08:41:38 2007 @@ -17,6 +17,9 @@ <#if parameters.refreshOnShow?exists> refreshOnShow="${parameters.refreshOnShow?
svn commit: r511302 - in /struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template: ajax/form.ftl css_xhtml/form-validate.ftl xhtml/form-validate.ftl
Author: musachy Date: Sat Feb 24 08:49:02 2007 New Revision: 511302 URL: http://svn.apache.org/viewvc?view=rev&rev=511302 Log: WW-1671 templates don't specify type="text/javascript"; break W3C validation Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/ajax/form.ftl struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/form-validate.ftl struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/xhtml/form-validate.ftl Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/ajax/form.ftl URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/ajax/form.ftl?view=diff&rev=511302&r1=511301&r2=511302 == --- struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/ajax/form.ftl (original) +++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/ajax/form.ftl Sat Feb 24 08:49:02 2007 @@ -1,9 +1,9 @@ <#if parameters.validate?exists> - - - - - + + + + + <#if parameters.namespace?exists> Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/form-validate.ftl URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/form-validate.ftl?view=diff&rev=511302&r1=511301&r2=511302 == --- struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/form-validate.ftl (original) +++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/css_xhtml/form-validate.ftl Sat Feb 24 08:49:02 2007 @@ -1,5 +1,5 @@ <#if parameters.validate?default(false) == true> - + <#if parameters.onsubmit?exists> ${tag.addParameter('onsubmit', "${parameters.onsubmit}; return validateForm_${parameters.id}();")} <#else> Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/xhtml/form-validate.ftl URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/xhtml/form-validate.ftl?view=diff&rev=511302&r1=511301&r2=511302 == --- struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/xhtml/form-validate.ftl (original) +++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/xhtml/form-validate.ftl Sat Feb 24 08:49:02 2007 @@ -1,5 +1,5 @@ <#if parameters.validate?default(false) == true> - + <#if parameters.onsubmit?exists> ${tag.addParameter('onsubmit', "${parameters.onsubmit}; return validateForm_${parameters.id}();")} <#else>
svn commit: r511303 - in /struts/struts2/trunk/core/src/main/resources/template: ajax/form.ftl css_xhtml/form-validate.ftl xhtml/form-validate.ftl
Author: musachy Date: Sat Feb 24 08:50:09 2007 New Revision: 511303 URL: http://svn.apache.org/viewvc?view=rev&rev=511303 Log: WW-1671 templates don't specify type="text/javascript"; break W3C validation Modified: struts/struts2/trunk/core/src/main/resources/template/ajax/form.ftl struts/struts2/trunk/core/src/main/resources/template/css_xhtml/form-validate.ftl struts/struts2/trunk/core/src/main/resources/template/xhtml/form-validate.ftl Modified: struts/struts2/trunk/core/src/main/resources/template/ajax/form.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/ajax/form.ftl?view=diff&rev=511303&r1=511302&r2=511303 == --- struts/struts2/trunk/core/src/main/resources/template/ajax/form.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/template/ajax/form.ftl Sat Feb 24 08:50:09 2007 @@ -1,9 +1,9 @@ <#if parameters.validate?exists> - - - - - + + + + + <#if parameters.namespace?exists> Modified: struts/struts2/trunk/core/src/main/resources/template/css_xhtml/form-validate.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/css_xhtml/form-validate.ftl?view=diff&rev=511303&r1=511302&r2=511303 == --- struts/struts2/trunk/core/src/main/resources/template/css_xhtml/form-validate.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/template/css_xhtml/form-validate.ftl Sat Feb 24 08:50:09 2007 @@ -1,5 +1,5 @@ <#if parameters.validate?default(false) == true> - + <#if parameters.onsubmit?exists> ${tag.addParameter('onsubmit', "${parameters.onsubmit}; return validateForm_${parameters.id}();")} <#else> Modified: struts/struts2/trunk/core/src/main/resources/template/xhtml/form-validate.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/form-validate.ftl?view=diff&rev=511303&r1=511302&r2=511303 == --- struts/struts2/trunk/core/src/main/resources/template/xhtml/form-validate.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/template/xhtml/form-validate.ftl Sat Feb 24 08:50:09 2007 @@ -1,5 +1,5 @@ <#if parameters.validate?default(false) == true> - + <#if parameters.onsubmit?exists> ${tag.addParameter('onsubmit', "${parameters.onsubmit}; return validateForm_${parameters.id}();")} <#else>
svn commit: r511453 - /struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
Author: tschneider Date: Sat Feb 24 21:35:20 2007 New Revision: 511453 URL: http://svn.apache.org/viewvc?view=rev&rev=511453 Log: WW-1733 Fixed request not being wrapped issue Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java?view=diff&rev=511453&r1=511452&r2=511453 == --- struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java (original) +++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java Sat Feb 24 21:35:20 2007 @@ -320,20 +320,20 @@ // prepare the request no matter what - this ensures that the proper character encoding // is used before invoking the mapper (see WW-9127) dispatcher.prepare(request, response); - -try { -// Wrap request first, just in case it is multipart/form-data -// parameters might not be accessible through before encoding (ww-1278) -request = dispatcher.wrapRequest(request, getServletContext()); -} catch (IOException e) { -String message = "Could not wrap servlet request with MultipartRequestWrapper!"; -LOG.error(message, e); -throw new ServletException(message, e); -} -} -else { +} else { dispatcher = du; } + +try { +// Wrap request first, just in case it is multipart/form-data +// parameters might not be accessible through before encoding (ww-1278) +request = dispatcher.wrapRequest(request, getServletContext()); +} catch (IOException e) { +String message = "Could not wrap servlet request with MultipartRequestWrapper!"; +LOG.error(message, e); +throw new ServletException(message, e); +} + return request; }
svn commit: r511454 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
Author: tschneider Date: Sat Feb 24 21:35:51 2007 New Revision: 511454 URL: http://svn.apache.org/viewvc?view=rev&rev=511454 Log: WW-1733 Fixed request not being wrapped issue (merged from 2.0.x branch) Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java?view=diff&rev=511454&r1=511453&r2=511454 == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java Sat Feb 24 21:35:51 2007 @@ -320,20 +320,20 @@ // prepare the request no matter what - this ensures that the proper character encoding // is used before invoking the mapper (see WW-9127) dispatcher.prepare(request, response); - -try { -// Wrap request first, just in case it is multipart/form-data -// parameters might not be accessible through before encoding (ww-1278) -request = dispatcher.wrapRequest(request, getServletContext()); -} catch (IOException e) { -String message = "Could not wrap servlet request with MultipartRequestWrapper!"; -LOG.error(message, e); -throw new ServletException(message, e); -} -} -else { +} else { dispatcher = du; } + +try { +// Wrap request first, just in case it is multipart/form-data +// parameters might not be accessible through before encoding (ww-1278) +request = dispatcher.wrapRequest(request, getServletContext()); +} catch (IOException e) { +String message = "Could not wrap servlet request with MultipartRequestWrapper!"; +LOG.error(message, e); +throw new ServletException(message, e); +} + return request; }