[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Geronimo Development (GMOxDEV) http://cwiki.apache.org/confluence/display/GMOxDEV | |-Pages Added or Edited in This Space |-- Developing Geronimo in Eclipse was last edited by akulshre (05:21 AM). | http://cwiki.apache.org/confluence/display/GMOxDEV/Developing+Geronimo+in+Eclipse Apache Felix (FELIX) http://cwiki.apache.org/confluence/display/FELIX | |-Pages Added or Edited in This Space |-- Maven Bundle Plugin (BND) was last edited by mcculls (06:54 AM). | http://cwiki.apache.org/confluence/display/FELIX/Maven+Bundle+Plugin+%28BND%29 |-- How to use iPOJO Annotations was last edited by clement.escoffier (05:59 AM). | http://cwiki.apache.org/confluence/display/FELIX/How+to+use+iPOJO+Annotations Apache Geronimo (GMOxSITE) http://cwiki.apache.org/confluence/display/GMOxSITE | |-Pages Added or Edited in This Space |-- Geronimo Eclipse Plugin Usage Instructions was created by mcconne (02:39 PM). | http://cwiki.apache.org/confluence/display/GMOxSITE/Geronimo+Eclipse+Plugin+Usage+Instructions |-- Geronimo Eclipse Plugin Build Instructions was created by mcconne (02:39 PM). | http://cwiki.apache.org/confluence/display/GMOxSITE/Geronimo+Eclipse+Plugin+Build+Instructions |-- Geronimo Eclipse Plugin Installation Instructions was created by mcconne (02:37 PM). | http://cwiki.apache.org/confluence/display/GMOxSITE/Geronimo+Eclipse+Plugin+Installation+Instructions |-- Development Tools was last edited by mcconne (04:04 PM). | http://cwiki.apache.org/confluence/display/GMOxSITE/Development+Tools |-- Developing the Geronimo Eclipse Plugin in Eclipse was created by mcconne (02:40 PM). | http://cwiki.apache.org/confluence/display/GMOxSITE/Developing+the+Geronimo+Eclipse+Plugin+in+Eclipse |-- Committers was last edited by shivakumar (07:10 AM). | http://cwiki.apache.org/confluence/display/GMOxSITE/Committers Apache Geronimo Project Management (GMOxPMGT) http://cwiki.apache.org/confluence/display/GMOxPMGT | |-Pages Added or Edited in This Space |-- Release Eclipse Plugin Process was last edited by mcconne (01:29 PM). | http://cwiki.apache.org/confluence/display/GMOxPMGT/Release+Eclipse+Plugin+Process Apache ServiceMix (SM) http://cwiki.apache.org/confluence/display/SM | |-Pages Added or Edited in This Space |-- Maven archetypes was last edited by gertvanthienen (11:11 PM). | http://cwiki.apache.org/confluence/display/SM/Maven+archetypes |-- Configuring Maven was last edited by gertvanthienen (11:02 PM). | http://cwiki.apache.org/confluence/display/SM/Configuring+Maven |-- Classloaders was last edited by gnodet (02:59 AM). | http://cwiki.apache.org/confluence/display/SM/Classloaders Tuscany Wiki (TUSCANYWIKI) http://cwiki.apache.org/confluence/display/TUSCANYWIKI | |-Pages Added or Edited in This Space |-- Draft TLP Resolution was last edited by [EMAIL PROTECTED] (10:25 PM). | http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Draft+TLP+Resolution |-- Building SOA With Apache Tuscany SCA was last edited by slaws (09:28 AM). | http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Building+SOA+With+Apache+Tuscany+SCA |-- Tuscany Graduation Checklist was last edited by slaws (07:44 AM). | http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Tuscany+Graduation+Checklist Apache Wicket Website (WICKETxSITE) http://cwiki.apache.org/confluence/display/WICKETxSITE | |-Pages Added or Edited in This Space |-- Examples was last edited by gwynevans (11:46 AM). | http://cwiki.apache.org/confluence/display/WICKETxSITE/Examples |-- Index was last edited by gwynevans (11:45 AM). | http://cwiki.apache.org/confluence/display/WICKETxSITE/Index Apache CXF (CXF) http://cwiki.apache.org/confluence/display/CXF | |-Pages Added or Edited in This Space |-- People was last edited by [EMAIL PROTECTED] (04:02 PM). | http://cwiki.apache.org/confluence/display/CXF/People |-- Download was last edited by blin (01:04 AM). | http://cwiki.apache.org/confluence/display/CXF/Download Apache MINA (MINA) http://cwiki.apache.org/confluence/display/MINA | |-Pages Added or Edited in This Space |-- Logging Configuration was created by elihusmails (07:34 PM). | http://cwiki.apache.org/confluence/display/MINA/Logging+Configuration |-- Documentation was last edited by elihusmails (07:01 PM). | http://cwiki.apache.org/confluence/display/MINA/Documentation UIMA (UIMA) http://cwiki.apache.org/confluence/display/UIMA | |-Pages Added or Edited in This Space |-- TestPlanCasEditor2.2 was created by kottmann (10:55 PM). | http://cwiki.apache.org/confluence/display/UIMA/TestPlanCasEditor2.2 |-- UIMA Sandbox Components was last edited by holmberg (09:50 PM). | http:
svn commit: r580386 - in /struts/struts2/trunk/plugins/dojo/src: main/java/org/apache/struts2/dojo/components/ main/java/org/apache/struts2/dojo/views/jsp/ui/ main/resources/template/ajax/ test/java/o
Author: musachy
Date: Fri Sep 28 08:20:38 2007
New Revision: 580386
URL: http://svn.apache.org/viewvc?rev=580386&view=rev
Log:
WW-2220 Autocompleter tag does not provide a way to specify initial key value
Modified:
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-1.txt
Modified:
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java?rev=580386&r1=580385&r2=580386&view=diff
==
---
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java
Fri Sep 28 08:20:38 2007
@@ -228,6 +228,7 @@
protected String resultsLimit;
protected String transport;
protected String preload;
+protected String keyValue;
public Autocompleter(ValueStack stack, HttpServletRequest request,
HttpServletResponse response) {
@@ -303,8 +304,13 @@
if (preload != null)
addParameter("preload", findValue(preload, Boolean.class));
-String keyNameExpr = "%{" + keyName + "}";
-addParameter("key", findString(keyNameExpr));
+if (keyValue != null)
+addParameter("nameKeyValue", findString(keyValue));
+else {
+String keyNameExpr = "%{" + keyName + "}";
+addParameter("nameKeyValue", findString(keyNameExpr));
+}
+
if (beforeNotifyTopics != null)
addParameter("beforeNotifyTopics", findString(beforeNotifyTopics));
@@ -506,5 +512,10 @@
@StrutsTagAttribute(description="Load options when page is loaded",
type="Boolean", defaultValue="true")
public void setPreload(String preload) {
this.preload = preload;
+}
+
+@StrutsTagAttribute(description="Initial key value")
+public void setKeyValue(String keyValue) {
+this.keyValue = keyValue;
}
}
Modified:
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java?rev=580386&r1=580385&r2=580386&view=diff
==
---
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java
Fri Sep 28 08:20:38 2007
@@ -62,6 +62,7 @@
protected String resultsLimit;
protected String transport;
protected String preload;
+protected String keyValue;
public Component getBean(ValueStack stack, HttpServletRequest req,
HttpServletResponse res) {
return new Autocompleter(stack, req, res);
@@ -98,6 +99,7 @@
autocompleter.setResultsLimit(resultsLimit);
autocompleter.setTransport(transport);
autocompleter.setPreload(preload);
+autocompleter.setKeyValue(keyValue);
}
public void setAutoComplete(String autoComplete) {
@@ -210,5 +212,9 @@
public void setPreload(String preload) {
this.preload = preload;
+}
+
+public void setKeyValue(String keyValue) {
+this.keyValue = keyValue;
}
}
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl?rev=580386&r1=580385&r2=580386&view=diff
==
---
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
Fri Sep 28 08:20:38 2007
@@ -72,8 +72,8 @@
<#if parameters.nameValue?if_exists != "">
initialValue="${parameters.nameValue}"<#rt/>
-<#if parameters.key?if_exists != "">
- initialKey="${parameters.key}"<#rt/>
+<#if parameters.nameKeyValue?if_exists != "">
+ initialKey="${parameters.nameKeyValue}"<#rt/>
<#if parameters.readonly?default(false)>
readonly="readonly"<#rt/>
Modifi
svn commit: r580387 - /struts/struts2/trunk/core/src/site/resources/tags/ajax/autocompleter.html
Author: musachy Date: Fri Sep 28 08:21:15 2007 New Revision: 580387 URL: http://svn.apache.org/viewvc?rev=580387&view=rev Log: WW-2220 Autocompleter tag does not provide a way to specify initial key value Modified: struts/struts2/trunk/core/src/site/resources/tags/ajax/autocompleter.html Modified: struts/struts2/trunk/core/src/site/resources/tags/ajax/autocompleter.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/ajax/autocompleter.html?rev=580387&r1=580386&r2=580387&view=diff == --- struts/struts2/trunk/core/src/site/resources/tags/ajax/autocompleter.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/ajax/autocompleter.html Fri Sep 28 08:21:15 2007 @@ -228,6 +228,14 @@ Name of the field to which the selected key will be assigned + keyValue + false + + false + String + Initial key value + + label false
Issues Closed: week of 2007-09-28
Struts2 - Friday, September 28, 2007 29 closed in last 7 days [WW-2206] sx:submit does not evaluate expressions in the src attribute Musachy Barroso - Bug - [2.1.0] http://issues.apache.org/struts/browse/WW-2206 [WW-2214] wrong tag in docs Unassigned - Improvement - [2.1.0] http://issues.apache.org/struts/browse/WW-2214 [WW-2209] struts-2.0.dtd incorrectly permits param element child of default-interceptor-ref Don Brown - Bug - [2.0.12] http://issues.apache.org/struts/browse/WW-2209 [WW-2216] Improve/complete JavaDocs for IteratorStatus/ tag. Unassigned - Improvement - [2.1.0] http://issues.apache.org/struts/browse/WW-2216 [WW-2211] Add "portletMode" parameter to PortletActionRedirectResult Nils-Helge Garli - Improvement - [2.1.0] http://issues.apache.org/struts/browse/WW-2211 [WW-1661] Implementation of Freemarker caching for Struts2 Rene Gielen - Improvement - [2.0.10, 2.1.0] http://issues.apache.org/struts/browse/WW-1661 [WW-2201] Cannot call a method in an action class in portlet mode Unassigned - Bug - [2.0.10, 2.1.0] http://issues.apache.org/struts/browse/WW-2201 [WW-2212] Support the '!' character when configuring default action for a portlet mode in portlet.xml Nils-Helge Garli - Improvement - [2.1.0] http://issues.apache.org/struts/browse/WW-2212 [WW-1928] Problem with link from Struts2 wiki export page if specific path followed (reported at request of Laurie Harper) Don Brown - Bug - [2.0.11] http://issues.apache.org/struts/browse/WW-1928 [WW-2194] dojo plugin - property theme in sx:autocompleter is missing Unassigned - Bug - [2.1.0] http://issues.apache.org/struts/browse/WW-2194 [WW-2213] s:select tag doesn't work under resin 3.1.x Unassigned - Bug - [] http://issues.apache.org/struts/browse/WW-2213 [WW-2203] struts2 showcase throws NPE when starting app server Don Brown - Bug - [2.1.0] http://issues.apache.org/struts/browse/WW-2203 [WW-2173] with wrong value in 'value' attribute. Tag also generates an extra line HTML line. Don Brown - Bug - [] http://issues.apache.org/struts/browse/WW-2173 [WW-1856] s18n tag appears to be broken Don Brown - Bug - [2.1.0] http://issues.apache.org/struts/browse/WW-1856 [WW-2072] DefaultWorkflowInterceptor should not perform any validation, just direct flow based on validation errors available in the ValidationAware instance Musachy Barroso - Improvement - [2.1.0] http://issues.apache.org/struts/browse/WW-2072 [WW-2102] action-tag will not call action method from a jsp page that is rendered from an "input" result Don Brown - Bug - [2.1.0] http://issues.apache.org/struts/browse/WW-2102 [WW-1960] action tag violates ParameterAware contract Don Brown - Bug - [2.1.0] http://issues.apache.org/struts/browse/WW-1960 [WW-2208] unused import cleanup Don Brown - Improvement - [2.1.0] http://issues.apache.org/struts/browse/WW-2208 [WW-2177] struts2-blank-2.0.9 example cannot be deployed Unassigned - Bug - [2.0.12] http://issues.apache.org/struts/browse/WW-2177 [WW-2166] autoStart="false" of divs within tabbedPanel doesn't work Unassigned - Bug - [2.0.12] http://issues.apache.org/struts/browse/WW-2166 [WW-1713] Using 'url' tag library element with Action & Method doens't work. Nils-Helge Garli - Sub-task - [2.0.10, 2.1.0] http://issues.apache.org/struts/browse/WW-1713 [WW-2215] http://issues.apache.org/struts/browse/WW-2215 [WW-2160] Disable static method access in OGNL expressions by default Don Brown - Improvement - [2.1.0] http://issues.apache.org/struts/browse/WW-2160 [WW-2199] can't set action error text from global resource file Unassigned - Bug - [] http://issues.apache.org/struts/browse/WW-2199 [WW-2179] datetimepicker tag (type=time) does not allow time intervals of less than 5 minutes Unassigned - Improvement - [Future] http://issues.apache.org/struts/browse/WW-2179 [WW-2161] subscription of ajax anchor tag is called repeatedly Unassigned - Bug - [2.0.12] http://issues.apache.org/struts/browse/WW-2161 [WW-1653] Can't specify method to call on action in portlet mode Don Brown - Bug - [2.0.3] http://issues.apache.org/struts/browse/WW-1653 [WW-2107] Arbitrary user-submitted OGNL possible when using JSP EL or FreeMarker Don Brown - Bug - [2.0.10] http://issues.apache.org/struts/browse/WW-2107 [WW-2207] downloading a file Unassigned - Task - [] http://issues.apache.org/struts/browse/WW-2207
svn commit: r580368 [2/4] - in /struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo: ./ nls/
Added:
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/nls/dojo_zh-cn.js
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/nls/dojo_zh-cn.js?rev=580368&view=auto
==
---
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/nls/dojo_zh-cn.js
(added)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/nls/dojo_zh-cn.js
Fri Sep 28 07:31:04 2007
@@ -0,0 +1,11 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("nls.dojo_zh-cn");dojo.provide("dojo.i18n.calendar.nls.gregorian");dojo.i18n.calendar.nls.gregorian._built=true;dojo.provide("dojo.i18n.calendar.nls.gregorian.zh_cn");dojo.i18n.calendar.nls.gregorian.zh_cn={"dateFormat-medium":"-M-d","field-second":"ç§é","field-week":"å¨","timeFormat-full":"ahh'æ¶'mm'å'ss'ç§'
z","field-year":"å¹´","field-minute":"åé","timeFormat-medium":"ahh:mm:ss","field-hour":"å°?æ¶","dateFormat-long":"'å¹´'M'æ'd'æ¥'","field-day":"æ¥","field-dayperiod":"ä¸å?/ä¸å?","field-month":"æ","dateFormat-short":"yy-M-d","field-era":"æ¶æ","timeFormat-short":"ah:mm","timeFormat-long":"ahh'æ¶'mm'å'ss'ç§'","dateFormat-full":"'å¹´'M'æ'd'æ¥'","field-weekday":"å¨å¤©","field-zone":"åºå","days-standAlone-narrow":["æ¥","ä¸","äº","ä¸","å","äº","å
"],"eras":["å
Œ
å?","å
Œ
"],
"am":"ä¸å?","months-format-abbr":["ä¸æ","äºæ","ä¸æ","åæ","äºæ","å
æ","ä¸æ","å
«æ","ä¹?æ","å??æ","å??ä¸æ","å??äºæ"],"days-format-abbr":["å¨æ¥","å¨ä¸","å¨äº","å¨ä¸","å¨å","å¨äº","å¨å
"],"pm":"ä¸å?","months-format-wide":["ä¸æ","äºæ","ä¸æ","åæ","äºæ","å
æ","ä¸æ","å
«æ","ä¹?æ","å??æ","å??ä¸æ","å??äºæ"],"months-standAlone-narrow":["1æ","2æ","3æ","4æ","5æ","6æ","7æ","8æ","9æ","10æ","11æ","12æ"],"days-format-wide":["æææ¥","ææä¸","ææäº","ææä¸","ææå","ææäº","ææå
"]};dojo.provide("dojo.i18n.calendar.nls.gregorianExtras");dojo.i18n.calendar.nls.gregorianE
xtras._built=true;dojo.provide("dojo.i18n.calendar.nls.gregorianExtras.zh_cn");dojo.i18n.calendar.nls.gregorianExtras.zh_cn={"dateFormat-yearOnly":"'å¹´'"};dojo.provide("dojo.i18n.calendar.nls.gregorian");dojo.i18n.calendar.nls.gregorian._built=true;dojo.provide("dojo.i18n.calendar.nls.gregorian.zh_cn");dojo.i18n.calendar.nls.gregorian.zh_cn={"dateFormat-medium":"-M-d","field-second":"ç§é","field-week":"å¨","timeFormat-full":"ahh'æ¶'mm'å'ss'ç§'
z","field-year":"å¹´","field-minute":"åé","timeFormat-medium":"ahh:mm:ss","field-hour":"å°?æ¶","dateFormat-long":"'å¹´'M'æ'd'æ¥'","field-day":"æ¥","field-dayperiod":"ä¸å?/ä¸å?","field-month":"æ","dateFormat-short":"yy-M-d","field-era":"æ¶æ","timeFormat-short":"ah:mm","timeFormat-long":"ahh'æ¶'mm'å'ss'ç§'","dateFormat-full":"'å¹´'M'æ'd'æ¥'","field-weekday":"å¨å¤©","field-zone":"åºå","d
ays-standAlone-narrow":["æ¥","ä¸","äº","ä¸","å","äº","å
"],"eras":["å
Œ
å?","å
Œ
"],"am":"ä¸å?","months-format-abbr":["ä¸æ","äºæ","ä¸æ","åæ","äºæ","å
æ","ä¸æ","å
«æ","ä¹?æ","å??æ","å??ä¸æ","å??äºæ"],"days-format-abbr":["å¨æ¥","å¨ä¸","å¨äº","å¨ä¸","å¨å","å¨äº","å¨å
"],"pm":"ä¸å?","months-format-wide":["ä¸æ","äºæ","ä¸æ","åæ","äºæ","å
æ","ä¸æ","å
«æ","ä¹?æ","å??æ","å??ä¸æ","å??äºæ"],"months-standAlone-narrow":["1æ","2æ","3æ","4æ","5æ","6æ","7æ","8æ","9æ","10æ","11æ","12æ"],"days-format-wide":["æææ¥","ææä¸","ææäº","ææä¸","ææå",
"ææäº","ææå
"]};dojo.provide("dojo.widget.nls.TimePicker");dojo.widget.nls.TimePicker._built=true;dojo.provide("dojo.widget.nls.TimePicker.zh_cn");dojo.widget.nls.TimePicker.zh_cn={"any":"any"};dojo.provide("dojo.widget.nls.DropdownTimePicker");dojo.widget.nls.DropdownTimePicker._built=true;dojo.provide("dojo.widget.nls.DropdownTimePicker.zh_cn");dojo.widget.nls.DropdownTimePicker.zh_cn={"selectTime":"Select
time"};dojo.provide("dojo.widget.nls.DropdownDatePicker");dojo.widget.nls.DropdownDatePicker._built=true;dojo.provide("dojo.widget.nls.DropdownDatePicker.zh_cn");dojo.widget.nls.DropdownDatePicker.zh_cn={"selectDate":"Select
a date"};
\ No newline at end of file
Added:
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/nls/dojo_zh-tw.js
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/nls/dojo_
svn commit: r580368 [4/4] - in /struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo: ./ nls/
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js?rev=580368&r1=580367&r2=580368&view=diff
==
---
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js
Fri Sep 28 07:31:04 2007
@@ -90,7 +90,7 @@
dojo.version = {
// summary: version number of this instance of dojo.
major: 0, minor: 4, patch: 3, flag: "",
- revision: Number("$Rev: 7616 $".match(/[0-9]+/)[0]),
+ revision: Number("$Rev: 8617 $".match(/[0-9]+/)[0]),
toString: function(){
with(dojo.version){
return major + "." + minor + "." + patch + flag + " ("
+ revision + ")";// String
@@ -911,7 +911,7 @@
//These two functions are placed outside of preloadLocalizations
//So that the xd loading can use/override them.
-dojo.hostenv.localesGenerated /***BUILD:localesGenerated***/; // value will be
inserted here at build time, if necessary
+dojo.hostenv.localesGenerated
=["ROOT","es-es","es","it-it","pt-br","de","fr-fr","zh-cn","pt","en-us","zh","fr","zh-tw","it","en-gb","xx","de-de","ko-kr","ja-jp","ko","en","ja"];
// value will be inserted here at build time, if necessary
dojo.hostenv.registerNlsPrefix = function(){
// summary:
@@ -1380,8 +1380,10 @@
return true;
}
+ dojo.hostenv._djInitFired = false;
// BEGIN DOMContentLoaded, from Dean Edwards
(http://dean.edwards.name/weblog/2006/06/again/)
function dj_load_init(e){
+ dojo.hostenv._djInitFired = true;
// allow multiple calls, only first one will take effect
// A bug in khtml calls events callbacks for document for event
which isnt supported
// for example a created contextmenu event calls
DOMContentLoaded, workaround
@@ -2212,6 +2214,22 @@
/** Prevent the browser from caching this by adding a query string
argument to the URL */
preventCache: false,
+
+ jsonFilter: function(value){
+ if( (this.mimetype == "text/json-comment-filtered")||
+ (this.mimetype == "application/json-comment-filtered")
+ ){
+ var cStartIdx = value.indexOf("\/*");
+ var cEndIdx = value.lastIndexOf("*\/");
+ if((cStartIdx == -1)||(cEndIdx == -1)){
+ dojo.debug("your JSON wasn't comment
filtered!"); // FIXME: throw exception instead?
+ return "";
+ }
+ return value.substring(cStartIdx+2, cEndIdx);
+ }
+ dojo.debug("please consider using a mimetype of
text/json-comment-filtered to avoid potential security issues with JSON
endpoints");
+ return value;
+ },
// events stuff
load: function(/*String*/type, /*Object*/data,
/*Object*/transportImplementation, /*Object*/kwArgs){
@@ -2882,13 +2900,16 @@
dojo.provide("dojo.lang.func");
-dojo.lang.hitch = function(/*Object*/thisObject, /*Function|String*/method){
+dojo.lang.hitch = function(/*Object*/thisObject, /*Function|String*/method /*,
...*/){
// summary:
// Returns a function that will only ever execute in the a
given scope
// (thisObject). This allows for easy use of object member
functions
// in callbacks and other places in which the "this"
keyword may
- // otherwise not reference the expected scope. Note that
the order of
- // arguments may be reversed in a future version.
+ // otherwise not reference the expected scope. Any number
of default
+ // positional arguments may be passed as parameters beyond
"method".
+ // Each of these values will be used to "placehold"
(similar to curry)
+ // for the hitched function. Note that the order of
arguments may be
+ // reversed in a future version.
// thisObject: the scope to run the method in
// method:
// a function to be "bound" to thisObject or the name of
the method in
@@ -2897,12 +2918,18 @@
// dojo.lang.hitch(foo, "bar")(); // runs foo.bar() in the
scope of foo
// dojo.lang.hitch(foo, myFunction); // returns a function
that runs myFunction in the scope of foo
- // FIXME:
- // should this be extended to "f
svn commit: r580370 - /struts/struts2/trunk/plugins/dojo/src/profile/README
Author: musachy
Date: Fri Sep 28 07:34:42 2007
New Revision: 580370
URL: http://svn.apache.org/viewvc?rev=580370&view=rev
Log:
Add step to Dojo profile building (copy nls folder)
Modified:
struts/struts2/trunk/plugins/dojo/src/profile/README
Modified: struts/struts2/trunk/plugins/dojo/src/profile/README
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/profile/README?rev=580370&r1=580369&r2=580370&view=diff
==
--- struts/struts2/trunk/plugins/dojo/src/profile/README (original)
+++ struts/struts2/trunk/plugins/dojo/src/profile/README Fri Sep 28 07:34:42
2007
@@ -11,4 +11,4 @@
$ ant -Dversion=0.4.2 -Dprofile=struts clean release intern-strings
$ cp ../release/dojo/dojo.js
${struts}/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js
$ cp ../release/dojo/dojo.js.uncompressed.js
${struts}/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js
-
\ No newline at end of file
+ $ cp ../release/dojo/nls
${struts}/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/
\ No newline at end of file
svn commit: r580369 - /struts/struts2/trunk/plugins/dojo/src/profile/README
Author: musachy
Date: Fri Sep 28 07:33:13 2007
New Revision: 580369
URL: http://svn.apache.org/viewvc?rev=580369&view=rev
Log:
It seems like the building project was fixed on 0.4.3
Modified:
struts/struts2/trunk/plugins/dojo/src/profile/README
Modified: struts/struts2/trunk/plugins/dojo/src/profile/README
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/profile/README?rev=580369&r1=580368&r2=580369&view=diff
==
--- struts/struts2/trunk/plugins/dojo/src/profile/README (original)
+++ struts/struts2/trunk/plugins/dojo/src/profile/README Fri Sep 28 07:33:13
2007
@@ -7,12 +7,7 @@
3. Copy
/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/ComboBox.css
to
${dojo}/struts (Dojo build system doesn't resolve the relative paths that
well in 0.4.2)
-4. In ${dojo}/buildscripts/build.xml comment the call to the target
"-preload-resources" in the "compress"
- target. The problem with this is that the locales fail to load on our
profile. This has got to be
- a dojo bug, as the locales loading should be handled by the generated
javascript files. (the default dojo
- profile doesn't include the locales)
-
-5. Inside ${dojo}/buildscripts run:
+4. Inside ${dojo}/buildscripts run:
$ ant -Dversion=0.4.2 -Dprofile=struts clean release intern-strings
$ cp ../release/dojo/dojo.js
${struts}/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js
$ cp ../release/dojo/dojo.js.uncompressed.js
${struts}/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js
svn commit: r580449 - in /struts/struts2/trunk/plugins/dojo/src: main/resources/template/ajax/dojoRequire.js main/resources/template/ajax/head.ftl test/resources/org/apache/struts2/dojo/views/jsp/ui/H
Author: musachy
Date: Fri Sep 28 11:18:02 2007
New Revision: 580449
URL: http://svn.apache.org/viewvc?rev=580449&view=rev
Log:
WW-2017 dojo.hostenv.writeIncludes should pass the true parameter
* dojo.hostenv.writeIncludes will only be included if debug="true" on head tag
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/dojoRequire.js
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/dojoRequire.js
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/dojoRequire.js?rev=580449&r1=580448&r2=580449&view=diff
==
---
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/dojoRequire.js
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/dojoRequire.js
Fri Sep 28 11:18:02 2007
@@ -28,4 +28,3 @@
dojo.require("struts.widget.*");
dojo.require("dojo.widget.Editor2");
-dojo.hostenv.writeIncludes(); // not needed, but allows the Venkman debugger
to work with the includes
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl?rev=580449&r1=580448&r2=580449&view=diff
==
--- struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl
(original)
+++ struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl
Fri Sep 28 11:18:02 2007
@@ -69,7 +69,13 @@
+<#if parameters.debug?default(false)>
+
+dojo.hostenv.writeIncludes(true);
+
+
+
Modified:
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt?rev=580449&r1=580448&r2=580449&view=diff
==
---
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt
(original)
+++
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt
Fri Sep 28 11:18:02 2007
@@ -21,6 +21,10 @@
+
+dojo.hostenv.writeIncludes(true);
+
+
