svn commit: r523138 - 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

2007-03-27 Thread musachy 
Author: musachy
Date: Tue Mar 27 19:02:55 2007
New Revision: 523138

URL: http://svn.apache.org/viewvc?view=rev&rev=523138
Log:
WW-1861 Add "extraLocales" and "locale" to head tag on Dojo plugin

Modified:

struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head.java

struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/HeadTag.java
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl

struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest.java

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/java/org/apache/struts2/dojo/components/Head.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head.java?view=diff&rev=523138&r1=523137&r2=523138
==
--- 
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head.java
 (original)
+++ 
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head.java
 Tue Mar 27 19:02:55 2007
@@ -73,6 +73,8 @@
 private String debug;
 private String compressed;
 private String baseRelativePath;
+private String extraLocales;
+private String locale;
 
 public Head(ValueStack stack, HttpServletRequest request, 
HttpServletResponse response) {
 super(stack, request, response);
@@ -85,12 +87,18 @@
 public void evaluateParams() {
 super.evaluateParams();
 
-if(this.debug != null)
+if (this.debug != null)
 addParameter("debug", findValue(this.debug, Boolean.class));
-if(this.compressed != null)
+if (this.compressed != null)
 addParameter("compressed", findValue(this.compressed, 
Boolean.class));
-if(this.baseRelativePath != null)
+if (this.baseRelativePath != null)
 addParameter("baseRelativePath", 
findString(this.baseRelativePath));
+if (this.extraLocales != null) {
+String locales = findString(this.extraLocales);
+addParameter("extraLocales", locales.split(","));
+}
+if (this.locale != null)
+addParameter("locale", findString(this.locale));
 }
 
 @Override
@@ -121,5 +129,15 @@
 @StrutsTagAttribute(description="Context relative path of Dojo 
distribution folder", defaultValue="/struts/dojo")
 public void setBaseRelativePath(String baseRelativePath) {
 this.baseRelativePath = baseRelativePath;
+}
+
+@StrutsTagAttribute(description="Comma separated list of locale names to 
be loaded by Dojo, locale names must be specified as in RFC3066")
+public void setExtraLocales(String extraLocales) {
+this.extraLocales = extraLocales;
+}
+
+@StrutsTagAttribute(description="Default locale to be used by Dojo, locale 
name must be specified as in RFC3066")
+public void setLocale(String locale) {
+this.locale = locale;
 }
 }

Modified: 
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/HeadTag.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/HeadTag.java?view=diff&rev=523138&r1=523137&r2=523138
==
--- 
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/HeadTag.java
 (original)
+++ 
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/HeadTag.java
 Tue Mar 27 19:02:55 2007
@@ -39,7 +39,9 @@
 private String debug;
 private String compressed;
 private String baseRelativePath;
-
+private String extraLocales;
+private String locale;
+
 public Component getBean(ValueStack stack, HttpServletRequest req, 
HttpServletResponse res) {
 return new Head(stack, req, res);
 }
@@ -51,6 +53,8 @@
 head.setDebug(debug);
 head.setCompressed(compressed);
 head.setBaseRelativePath(baseRelativePath);
+head.setExtraLocales(extraLocales);
+head.setLocale(locale);
 }
 
 public void setDebug(String debug) {
@@ -63,5 +67,13 @@
 
 public void setCompressed(String compressed) {
 this.compressed = compressed;
+}
+
+public void setExtraLocales(String extraLocales) {
+this.extraLocales = extraLocales;
+}
+
+public void setLocale(String locale) {
+this.locale = locale;
 }
 }

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?view=diff&rev=523138&r1=523137&r2=523138

svn commit: r523142 - in /struts/struts2/trunk: apps/showcase/src/main/webapp/tags/ui/datepicker/ apps/showcase/src/main/webapp/tags/ui/timepicker/ plugins/dojo/src/main/resources/org/apache/struts2/s

2007-03-27 Thread musachy 
Author: musachy
Date: Tue Mar 27 19:20:03 2007
New Revision: 523142

URL: http://svn.apache.org/viewvc?view=rev&rev=523142
Log:
WW-1855 Upgrade bundled Dojo to 0.4.2


[This commit notification would consist of 61 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

[CONF] Confluence Changes in the last 24 hours

2007-03-27 Thread confluence 
-
This is a daily summary of all recent changes in Confluence.

-
Updated Spaces:
-

Apache Geronimo v1.2 (GMOxDOC12) 
http://cwiki.apache.org/confluence/display/GMOxDOC12
|
|-Pages Added or Edited in This Space
 |-- Apache Roller on Geronimo (1.2 Ok) was last edited by ppe (03:07 PM).
 |   
http://cwiki.apache.org/confluence/display/GMOxDOC12/Apache+Roller+on+Geronimo+%281.2+Ok%29

Apache Directory Triplesec (DIRxTRIPLESEC) 
http://cwiki.apache.org/confluence/display/DIRxTRIPLESEC
|
|-Pages Added or Edited in This Space
 |-- Administration Tool User's Guide was last edited by erodriguez (06:16 PM).
 |   
http://cwiki.apache.org/confluence/display/DIRxTRIPLESEC/Administration+Tool+User%27s+Guide
 |-- Simple Demo Servlet Application was last edited by erodriguez (06:16 PM).
 |   
http://cwiki.apache.org/confluence/display/DIRxTRIPLESEC/Simple+Demo+Servlet+Application
 |-- Simple Demo Swing Application was last edited by erodriguez (06:16 PM).
 |   
http://cwiki.apache.org/confluence/display/DIRxTRIPLESEC/Simple+Demo+Swing+Application
 |-- Test Connectivity with a Kerberos Client was last edited by erodriguez 
(06:16 PM).
 |   
http://cwiki.apache.org/confluence/display/DIRxTRIPLESEC/Test+Connectivity+with+a+Kerberos+Client
 |-- Authentication Using SafehausLoginModule was last edited by erodriguez 
(06:16 PM).
 |   
http://cwiki.apache.org/confluence/display/DIRxTRIPLESEC/Authentication+Using+SafehausLoginModule
 |-- User's Guide was last edited by erodriguez (06:05 PM).
 |   http://cwiki.apache.org/confluence/display/DIRxTRIPLESEC/User%27s+Guide
 |-- Developer's Guide was last edited by erodriguez (05:08 PM).
 |   
http://cwiki.apache.org/confluence/display/DIRxTRIPLESEC/Developer%27s+Guide

Felix (FELIX) http://cwiki.apache.org/confluence/display/FELIX
|
|-Pages Added or Edited in This Space
 |-- faq was last edited by [EMAIL PROTECTED] (09:37 AM).
 |   http://cwiki.apache.org/confluence/display/FELIX/faq

Apache Geronimo Documentation (geronimo) 
http://cwiki.apache.org/confluence/display/geronimo
|
|-Pages Added or Edited in This Space
 |-- Index was last edited by stephane.wacongne (02:36 AM).
 |   http://cwiki.apache.org/confluence/display/geronimo/Index

Apache Geronimo (GMOxSITE) http://cwiki.apache.org/confluence/display/GMOxSITE
|
|-Pages Added or Edited in This Space
 |-- Downloads was last edited by hcunico (10:31 AM).
 |   http://cwiki.apache.org/confluence/display/GMOxSITE/Downloads
 |-- SideNav Overview was last edited by hcunico (07:28 AM).
 |   http://cwiki.apache.org/confluence/display/GMOxSITE/SideNav+Overview
 |-- Project Policies was last edited by hcunico (07:26 AM).
 |   http://cwiki.apache.org/confluence/display/GMOxSITE/Project+Policies
 |-- Committers was last edited by chirino (07:17 AM).
 |   http://cwiki.apache.org/confluence/display/GMOxSITE/Committers

Apache Directory Server v1.5 (DIRxSRVx11) 
http://cwiki.apache.org/confluence/display/DIRxSRVx11
|
|-Pages Added or Edited in This Space
 |-- Server Bundles was last edited by erodriguez (05:08 PM).
 |   http://cwiki.apache.org/confluence/display/DIRxSRVx11/Server+Bundles

Apache Geronimo v2.0 (GMOxDOC20) 
http://cwiki.apache.org/confluence/display/GMOxDOC20
|
|-Pages Added or Edited in This Space
 |-- Import database pools from WebLogic 8.1 was created by hcunico (02:12 PM).
 |   
http://cwiki.apache.org/confluence/display/GMOxDOC20/Import+database+pools+from+WebLogic+8.1
 |-- Import database pools from JBoss 4 was created by hcunico (01:57 PM).
 |   
http://cwiki.apache.org/confluence/display/GMOxDOC20/Import+database+pools+from+JBoss+4
 |-- Configuring database pools was last edited by hcunico (01:55 PM).
 |   
http://cwiki.apache.org/confluence/display/GMOxDOC20/Configuring+database+pools
 |-- Configuring services was last edited by hcunico (01:54 PM).
 |   http://cwiki.apache.org/confluence/display/GMOxDOC20/Configuring+services

Apache Directory SandBox (DIRxSBOX) 
http://cwiki.apache.org/confluence/display/DIRxSBOX
|
|-Pages Added or Edited in This Space
 |-- Service Configuration was last edited by erodriguez (06:46 PM).
 |   http://cwiki.apache.org/confluence/display/DIRxSBOX/Service+Configuration
 |-- DHCP Protocol Provider was last edited by erodriguez (06:45 PM).
 |   http://cwiki.apache.org/confluence/display/DIRxSBOX/DHCP+Protocol+Provider
 |-- NTP Protocol Configuration was last edited by erodriguez (06:45 PM).
 |   
http://cwiki.apache.org/confluence/display/DIRxSBOX/NTP+Protocol+Configuration
 |-- DNS Protocol Configuration was last edited by erodriguez (06:44 PM).
 |   
http://cwiki.apache.org/confluence/display/DIRxSBOX/DNS+Protocol+Configuration
 |-- Kerberos Protocol Configuration was last edited by erodriguez (06:43 PM).
 |   
http://cwiki.apache.org/confluence/display/DIRxSBOX/Kerberos+Protocol+Configurati