[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 |-- Java EE 5 Annotations was last edited by mcconne (08:44 PM). | http://cwiki.apache.org/confluence/display/GMOxDEV/Java+EE+5+Annotations Apache Geronimo SandBox (GMOxSBOX) http://cwiki.apache.org/confluence/display/GMOxSBOX | |-Pages Added or Edited in This Space |-- JasonTest3 was created by jdillon (02:49 PM). | http://cwiki.apache.org/confluence/display/GMOxSBOX/JasonTest3 |-- JasonTest2 was created by jdillon (02:23 PM). | http://cwiki.apache.org/confluence/display/GMOxSBOX/JasonTest2 |-- JasonTest was created by jdillon (02:22 PM). | http://cwiki.apache.org/confluence/display/GMOxSBOX/JasonTest Apache ActiveMQ CPP (AMQCPP) http://cwiki.apache.org/confluence/display/AMQCPP | |-Pages Added or Edited in This Space |-- QuickLinks was created by jstrachan (09:10 AM). | http://cwiki.apache.org/confluence/display/AMQCPP/QuickLinks |-- Navigation was created by jstrachan (09:06 AM). | http://cwiki.apache.org/confluence/display/AMQCPP/Navigation |-- SiteMap was created by jstrachan (09:11 AM). | http://cwiki.apache.org/confluence/display/AMQCPP/SiteMap |-- SiteIndex was created by jstrachan (09:11 AM). | http://cwiki.apache.org/confluence/display/AMQCPP/SiteIndex |-- Banner was created by jstrachan (09:05 AM). | http://cwiki.apache.org/confluence/display/AMQCPP/Banner |-- Source was created by jstrachan (09:04 AM). | http://cwiki.apache.org/confluence/display/AMQCPP/Source |-- Building was created by jstrachan (09:04 AM). | http://cwiki.apache.org/confluence/display/AMQCPP/Building |-- Are there more FAQ Entries was created by jstrachan (09:03 AM). | http://cwiki.apache.org/confluence/display/AMQCPP/Are+there+more+FAQ+Entries |-- What is ActiveMQ CPP was created by jstrachan (09:02 AM). | http://cwiki.apache.org/confluence/display/AMQCPP/What+is+ActiveMQ+CPP |-- FAQ was created by jstrachan (09:02 AM). | http://cwiki.apache.org/confluence/display/AMQCPP/FAQ |-- Getting Started was created by jstrachan (09:02 AM). | http://cwiki.apache.org/confluence/display/AMQCPP/Getting+Started |-- Download was created by jstrachan (08:59 AM). | http://cwiki.apache.org/confluence/display/AMQCPP/Download |-- Site was created by jstrachan (08:59 AM). | http://cwiki.apache.org/confluence/display/AMQCPP/Site |-- Overview was created by jstrachan (08:59 AM). | http://cwiki.apache.org/confluence/display/AMQCPP/Overview |-- Developers was created by jstrachan (08:58 AM). | http://cwiki.apache.org/confluence/display/AMQCPP/Developers |-- Community was created by jstrachan (08:58 AM). | http://cwiki.apache.org/confluence/display/AMQCPP/Community |-- Index was created by jstrachan (07:21 AM). | http://cwiki.apache.org/confluence/display/AMQCPP/Index Apache Tiles (TILES) http://cwiki.apache.org/confluence/display/TILES | |-Pages Added or Edited in This Space |-- tiles-2.0.1 was last edited by ddewolf (06:27 AM). | http://cwiki.apache.org/confluence/display/TILES/tiles-2.0.1 Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET | |-Pages Added or Edited in This Space |-- Adding Dynamic Field Prompts or Hints was last edited by ivaynberg (05:43 PM). | http://cwiki.apache.org/confluence/display/WICKET/Adding+Dynamic+Field+Prompts+or+Hints |-- Index was last edited by homchik (03:14 PM). | http://cwiki.apache.org/confluence/display/WICKET/Index |-- Wicket and JMeter was last edited by xfactor (02:17 AM). | http://cwiki.apache.org/confluence/display/WICKET/Wicket+and+JMeter Apache FTPServer Project (FTPSERVER) http://cwiki.apache.org/confluence/display/FTPSERVER | |-Pages Added or Edited in This Space |-- Building was last edited by ngn (02:55 PM). | http://cwiki.apache.org/confluence/display/FTPSERVER/Building |-- Documentation was last edited by ngn (02:25 PM). | http://cwiki.apache.org/confluence/display/FTPSERVER/Documentation |-- TLSSSL Support was last edited by ngn (02:24 PM). | http://cwiki.apache.org/confluence/display/FTPSERVER/TLSSSL+Support |-- Listeners was last edited by ngn (02:23 PM). | http://cwiki.apache.org/confluence/display/FTPSERVER/Listeners |-- Configuration was last edited by ngn (02:21 PM). | http://cwiki.apache.org/confluence/display/FTPSERVER/Configuration Apache ActiveMQ NMS (NMS) http://cwiki.apache.org/confluence/display/NMS | |-Pages Added or Edited in This Space |-- Are there more FAQ Entries was created by jstrachan (07:44 AM). | http://cwiki.apache.org/confluence/display/NMS/Are+there+more+FAQ+Entries |-- Site was last edited by jstrachan (
svn commit: r508776 - 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/org/apache/struts2/static/do
Author: musachy
Date: Sat Feb 17 08:33:57 2007
New Revision: 508776
URL: http://svn.apache.org/viewvc?view=rev&rev=508776
Log:
WW-1633 Add "keyName" attribute to autocompleter (defaults to "${name}Key")
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Autocompleter.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/ui/AutocompleterTag.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/ajax/autocompleter.ftl
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/autocompleter.ftl
struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/autocompleter.html
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-1.txt
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-2.txt
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Autocompleter.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Autocompleter.java?view=diff&rev=508776&r1=508775&r2=508776
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Autocompleter.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Autocompleter.java
Sat Feb 17 08:33:57 2007
@@ -72,6 +72,9 @@
* 'loadMinimumCount' minimum number of characters that will force the content
to be loaded
* 'showDownError' show or hide the down arrow button
* 'searchType' how the search must be performed, options are: "startstring",
"startword" and "substring"
+ * 'keyName' name of the field to which the selected key will be assigned
+ * 'iconPath' path of icon used for the dropdown
+ * 'templateCssPath' path to css file used to customize Dojo's widget
* 'notifyTopics' comma separated list of topics names, that will be
published. Three parameters are passed:
*
* data: selected value when type='valuechanged'
@@ -103,6 +106,7 @@
protected String showDownArrow;
protected String templateCssPath;
protected String iconPath;
+protected String keyName;
public Autocompleter(ValueStack stack, HttpServletRequest request,
HttpServletResponse response) {
@@ -165,11 +169,15 @@
addParameter("templateCssPath", findString(templateCssPath));
if(iconPath != null)
addParameter("iconPath", findString(iconPath));
-//get the key value
-if(name != null) {
-String keyNameExpr = "%{" + name + "Key}";
-addParameter("key", findString(keyNameExpr));
+if(keyName != null)
+addParameter("keyName", findString(keyName));
+else {
+keyName = name + "Key";
+addParameter("keyName", findString(keyName));
}
+
+String keyNameExpr = "%{" + keyName + "}";
+addParameter("key", findString(keyNameExpr));
}
protected Object findListValue() {
@@ -271,5 +279,10 @@
@StrutsTagAttribute(description="Path to icon used for the dropdown")
public void setIconPath(String iconPath) {
this.iconPath = iconPath;
+}
+
+@StrutsTagAttribute(description="Name of the field to which the selected
key will be assigned")
+public void setKeyName(String keyName) {
+ this.keyName = keyName;
}
}
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/ui/AutocompleterTag.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/ui/AutocompleterTag.java?view=diff&rev=508776&r1=508775&r2=508776
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/ui/AutocompleterTag.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/ui/AutocompleterTag.java
Sat Feb 17 08:33:57 2007
@@ -52,7 +52,8 @@
protected String showDownArrow;
protected String templateCssPath;
protected String iconPath;
-
+protected String keyName;
+
public Component getBean(ValueStack stack, HttpServletRequest req,
HttpServletResponse res) {
return new Autocompleter(stack, req, res);
}
@@ -79,6 +80,7 @@
autocompleter.setShowDownArrow(showDownArrow);
autocompleter.setTemplateCssPath(templateCssPath);
svn commit: r508777 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/components/ main/java/org/apache/struts2/views/jsp/ui/ main/resources/org/apache/struts2/static/dojo/struts/widget
Author: musachy
Date: Sat Feb 17 08:36:08 2007
New Revision: 508777
URL: http://svn.apache.org/viewvc?view=rev&rev=508777
Log:
WW-1633 Add "keyName" attribute to autocompleter (defaults to "${name}Key")
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Autocompleter.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AutocompleterTag.java
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js
struts/struts2/trunk/core/src/main/resources/template/ajax/autocompleter.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/autocompleter.ftl
struts/struts2/trunk/core/src/site/resources/tags/autocompleter.html
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-1.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-2.txt
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Autocompleter.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Autocompleter.java?view=diff&rev=508777&r1=508776&r2=508777
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Autocompleter.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Autocompleter.java
Sat Feb 17 08:36:08 2007
@@ -72,6 +72,9 @@
* 'loadMinimumCount' minimum number of characters that will force the content
to be loaded
* 'showDownError' show or hide the down arrow button
* 'searchType' how the search must be performed, options are: "startstring",
"startword" and "substring"
+ * 'keyName' name of the field to which the selected key will be assigned
+ * 'iconPath' path of icon used for the dropdown
+ * 'templateCssPath' path to css file used to customize Dojo's widget
* 'notifyTopics' comma separated list of topics names, that will be
published. Three parameters are passed:
*
* data: selected value when type='valuechanged'
@@ -103,6 +106,7 @@
protected String showDownArrow;
protected String templateCssPath;
protected String iconPath;
+protected String keyName;
public Autocompleter(ValueStack stack, HttpServletRequest request,
HttpServletResponse response) {
@@ -165,11 +169,15 @@
addParameter("templateCssPath", findString(templateCssPath));
if(iconPath != null)
addParameter("iconPath", findString(iconPath));
-//get the key value
-if(name != null) {
-String keyNameExpr = "%{" + name + "Key}";
-addParameter("key", findString(keyNameExpr));
+if(keyName != null)
+addParameter("keyName", findString(keyName));
+else {
+keyName = name + "Key";
+addParameter("keyName", findString(keyName));
}
+
+String keyNameExpr = "%{" + keyName + "}";
+addParameter("key", findString(keyNameExpr));
}
protected Object findListValue() {
@@ -271,5 +279,10 @@
@StrutsTagAttribute(description="Path to icon used for the dropdown")
public void setIconPath(String iconPath) {
this.iconPath = iconPath;
+}
+
+@StrutsTagAttribute(description="Name of the field to which the selected
key will be assigned")
+public void setKeyName(String keyName) {
+ this.keyName = keyName;
}
}
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AutocompleterTag.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AutocompleterTag.java?view=diff&rev=508777&r1=508776&r2=508777
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AutocompleterTag.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AutocompleterTag.java
Sat Feb 17 08:36:08 2007
@@ -52,7 +52,8 @@
protected String showDownArrow;
protected String templateCssPath;
protected String iconPath;
-
+protected String keyName;
+
public Component getBean(ValueStack stack, HttpServletRequest req,
HttpServletResponse res) {
return new Autocompleter(stack, req, res);
}
@@ -79,6 +80,7 @@
autocompleter.setShowDownArrow(showDownArrow);
autocompleter.setTemplateCssPath(templateCssPath);
autocompleter.setIconPath(iconPath);
+autocompleter.setKeyName(keyName);
}
public void setAutoComplete(String autoComplete) {
@@ -155,5 +157,9 @@
public void setIconPath(String iconPath) {
this.iconPath = iconPath;
+}
+
+p
svn commit: r508875 - in /struts/struts2/branches/STRUTS_2_0_X/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports: JasperReportConstants.java JasperReportsResult.java
Author: tschneider
Date: Sat Feb 17 22:02:23 2007
New Revision: 508875
URL: http://svn.apache.org/viewvc?view=rev&rev=508875
Log:
WW-1632 - added rtf support for jasper report result
Modified:
struts/struts2/branches/STRUTS_2_0_X/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportConstants.java
struts/struts2/branches/STRUTS_2_0_X/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
Modified:
struts/struts2/branches/STRUTS_2_0_X/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportConstants.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportConstants.java?view=diff&rev=508875&r1=508874&r2=508875
==
---
struts/struts2/branches/STRUTS_2_0_X/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportConstants.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportConstants.java
Sat Feb 17 22:02:23 2007
@@ -51,4 +51,9 @@
* CSV format constant
*/
public static final String FORMAT_CSV = "CSV";
+
+/**
+ * RTF format constant
+ */
+public static final String FORMAT_RTF = "RTF";
}
Modified:
struts/struts2/branches/STRUTS_2_0_X/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java?view=diff&rev=508875&r1=508874&r2=508875
==
---
struts/struts2/branches/STRUTS_2_0_X/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
Sat Feb 17 22:02:23 2007
@@ -32,22 +32,30 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sf.jasperreports.engine.*;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JRExporter;
+import net.sf.jasperreports.engine.JRExporterParameter;
+import net.sf.jasperreports.engine.JRParameter;
+import net.sf.jasperreports.engine.JasperExportManager;
+import net.sf.jasperreports.engine.JasperFillManager;
+import net.sf.jasperreports.engine.JasperPrint;
+import net.sf.jasperreports.engine.JasperReport;
import net.sf.jasperreports.engine.export.JRCsvExporter;
import net.sf.jasperreports.engine.export.JRCsvExporterParameter;
import net.sf.jasperreports.engine.export.JRHtmlExporter;
import net.sf.jasperreports.engine.export.JRHtmlExporterParameter;
+import net.sf.jasperreports.engine.export.JRRtfExporter;
import net.sf.jasperreports.engine.export.JRXlsExporter;
import net.sf.jasperreports.engine.export.JRXmlExporter;
import net.sf.jasperreports.engine.util.JRLoader;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import com.opensymphony.xwork2.util.TextUtils;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.dispatcher.StrutsResultSupport;
+
import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.util.TextUtils;
import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -286,6 +294,9 @@
} else if (format.equals(FORMAT_XML)) {
response.setContentType("text/xml");
exporter = new JRXmlExporter();
+} else if (format.equals(FORMAT_RTF)) {
+response.setContentType("application/rtf");
+exporter = new JRRtfExporter();
} else {
throw new ServletException("Unknown report format: " +
format);
}
svn commit: r508296 [1/3] - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/components/DoubleListUIBean.java main/resources/META-INF/struts-tags.tld site/resources/tags/doubleselect.ht
Author: musachy
Date: Thu Feb 15 19:10:38 2007
New Revision: 508296
URL: http://svn.apache.org/viewvc?view=rev&rev=508296
Log:
Remove redundant tag attribute annotation
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld
struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html
struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java?view=diff&rev=508296&r1=508295&r2=508296
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
Thu Feb 15 19:10:38 2007
@@ -514,7 +514,6 @@
return doubleList;
}
-@StrutsTagAttribute(description="Set the list key of the second attribute")
public String getDoubleListKey() {
return doubleListKey;
}
svn commit: r508296 [3/3] - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/components/DoubleListUIBean.java main/resources/META-INF/struts-tags.tld site/resources/tags/doubleselect.ht
Modified: struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html?view=diff&rev=508296&r1=508295&r2=508296 == --- struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html Thu Feb 15 19:10:38 2007 @@ -137,7 +137,7 @@ true String - Set the list key of the second attribute + The key expression to use for second list doubleListValue Modified: struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html?view=diff&rev=508296&r1=508295&r2=508296 == --- struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html Thu Feb 15 19:10:38 2007 @@ -241,7 +241,7 @@ true String - Set the list key of the second attribute + The key expression to use for second list doubleListValue
svn commit: r508293 - in /struts/struts2/branches/STRUTS_2_0_X/core/src: main/java/org/apache/struts2/components/DoubleListUIBean.java site/resources/tags/doubleselect.html site/resources/tags/optiont
Author: musachy
Date: Thu Feb 15 19:03:30 2007
New Revision: 508293
URL: http://svn.apache.org/viewvc?view=rev&rev=508293
Log:
Remove redundant tag attribute annotation
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/doubleselect.html
struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/optiontransferselect.html
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java?view=diff&rev=508293&r1=508292&r2=508293
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
Thu Feb 15 19:03:30 2007
@@ -514,7 +514,6 @@
return doubleList;
}
-@StrutsTagAttribute(description="Set the list key of the second attribute")
public String getDoubleListKey() {
return doubleListKey;
}
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/doubleselect.html
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/doubleselect.html?view=diff&rev=508293&r1=508292&r2=508293
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/doubleselect.html
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/doubleselect.html
Thu Feb 15 19:03:30 2007
@@ -137,7 +137,7 @@
true
String
- Set the
list key of the second attribute
+ The key
expression to use for second list
doubleListValue
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/optiontransferselect.html
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/optiontransferselect.html?view=diff&rev=508293&r1=508292&r2=508293
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/optiontransferselect.html
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/optiontransferselect.html
Thu Feb 15 19:03:30 2007
@@ -241,7 +241,7 @@
true
String
- Set the
list key of the second attribute
+ The key
expression to use for second list
doubleListValue
svn commit: r508876 - in /struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports: JasperReportConstants.java JasperReportsResult.java
Author: tschneider
Date: Sat Feb 17 22:17:25 2007
New Revision: 508876
URL: http://svn.apache.org/viewvc?view=rev&rev=508876
Log:
WW-1632 - added rtf support for jasper report result
Modified:
struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportConstants.java
struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
Modified:
struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportConstants.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportConstants.java?view=diff&rev=508876&r1=508875&r2=508876
==
---
struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportConstants.java
(original)
+++
struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportConstants.java
Sat Feb 17 22:17:25 2007
@@ -51,4 +51,9 @@
* CSV format constant
*/
public static final String FORMAT_CSV = "CSV";
+
+/**
+ * RTF format constant
+ */
+public static final String FORMAT_RTF = "RTF";
}
Modified:
struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java?view=diff&rev=508876&r1=508875&r2=508876
==
---
struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
(original)
+++
struts/struts2/trunk/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
Sat Feb 17 22:17:25 2007
@@ -37,6 +37,7 @@
import net.sf.jasperreports.engine.export.JRCsvExporterParameter;
import net.sf.jasperreports.engine.export.JRHtmlExporter;
import net.sf.jasperreports.engine.export.JRHtmlExporterParameter;
+import net.sf.jasperreports.engine.export.JRRtfExporter;
import net.sf.jasperreports.engine.export.JRXlsExporter;
import net.sf.jasperreports.engine.export.JRXmlExporter;
import net.sf.jasperreports.engine.util.JRLoader;
@@ -286,6 +287,9 @@
} else if (format.equals(FORMAT_XML)) {
response.setContentType("text/xml");
exporter = new JRXmlExporter();
+} else if (format.equals(FORMAT_RTF)) {
+response.setContentType("application/rtf");
+exporter = new JRRtfExporter();
} else {
throw new ServletException("Unknown report format: " +
format);
}
svn commit: r508280 - 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: Thu Feb 15 18:07:56 2007
New Revision: 508280
URL: http://svn.apache.org/viewvc?view=rev&rev=508280
Log:
WW-1570:
Add "showLoading" attribute to ajax tags
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Anchor.java
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/components/RemoteUICallBean.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Submit.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractRemoteCallUITag.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/ajax/ajax-common.ftl
struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/a.html
struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/div.html
struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/submit.html
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java
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/java/org/apache/struts2/views/jsp/ui/SubmitAjaxTest.java
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/div-1.txt
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/href-1.txt
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-1.txt
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java?view=diff&rev=508280&r1=508279&r2=508280
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java
Thu Feb 15 18:07:56 2007
@@ -49,6 +49,7 @@
protected String notifyTopics;
protected String showErrorTransportText;
protected String indicator;
+protected String showLoadingText;
public AbstractRemoteCallUIBean(ValueStack stack, HttpServletRequest
request,
HttpServletResponse response) {
@@ -86,6 +87,8 @@
addParameter("showErrorTransportText",
findValue(showErrorTransportText, Boolean.class));
else
addParameter("showErrorTransportText", true);
+if (showLoadingText != null)
+addParameter("showLoadingText", findString(showLoadingText));
}
@@ -165,4 +168,8 @@
this.indicator = indicator;
}
+@StrutsTagAttribute(description="Show loading text on targets",
type="Boolean", defaultValue="true")
+public void setShowLoadingText(String showLoadingText) {
+this.showLoadingText = showLoadingText;
+}
}
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Anchor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Anchor.java?view=diff&rev=508280&r1=508279&r2=508280
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Anchor.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Anchor.java
Thu Feb 15 18:07:56 2007
@@ -71,6 +71,7 @@
* '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:
*
* data: html or json object when type='load' or type='error'
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=508280&r1=508279&r2=508280
==
svn commit: r508879 - in /struts/struts2: branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.jav
Author: tschneider
Date: Sat Feb 17 22:32:02 2007
New Revision: 508879
URL: http://svn.apache.org/viewvc?view=rev&rev=508879
Log:
WW-1709 fixed nullpointer when scheme is null
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java?view=diff&rev=508879&r1=508878&r2=508879
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
Sat Feb 17 22:32:02 2007
@@ -103,10 +103,12 @@
link.append("://");
link.append(request.getServerName());
-if ((scheme.equals("http") && (httpPort != DEFAULT_HTTP_PORT)) ||
(scheme.equals("https") && httpsPort != DEFAULT_HTTPS_PORT))
-{
-link.append(":");
-link.append(scheme.equals("http") ? httpPort : httpsPort);
+if (scheme != null) {
+if ((scheme.equals("http") && (httpPort != DEFAULT_HTTP_PORT))
|| (scheme.equals("https") && httpsPort != DEFAULT_HTTPS_PORT))
+{
+link.append(":");
+link.append(scheme.equals("http") ? httpPort : httpsPort);
+}
}
}
else if (
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java?view=diff&rev=508879&r1=508878&r2=508879
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java
Sat Feb 17 22:32:02 2007
@@ -90,7 +90,26 @@
expectedUrl, url.toString());
}
+public void testForceAddNullSchemeHostAndPort() throws Exception {
+String expectedUrl =
"http://localhost/contextPath/path1/path2/myAction.action";;
+Mock mockHttpServletRequest = new Mock(HttpServletRequest.class);
+mockHttpServletRequest.expectAndReturn("getScheme", "http");
+mockHttpServletRequest.expectAndReturn("getServerName", "localhost");
+mockHttpServletRequest.expectAndReturn("getContextPath",
+"/contextPath");
+
+Mock mockHttpServletResponse = new Mock(HttpServletResponse.class);
+mockHttpServletResponse.expectAndReturn("encodeURL", expectedUrl,
+expectedUrl);
+
+String result = UrlHelper.buildUrl("/path1/path2/myAction.action",
+(HttpServletRequest) mockHttpServletRequest.proxy(),
+(HttpServletResponse) mockHttpServletResponse.proxy(), null,
+null, true, true, true);
+assertEquals(expectedUrl, result);
+mockHttpServletRequest.verify();
+}
public void testBuildWithRootContext() {
String expectedUrl = "/MyAction.action";
svn commit: r508880 - in /struts/struts2: branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java trunk/core/src/main/java/org/apache/struts2/views/util/UrlHelper.jav
Author: tschneider
Date: Sat Feb 17 22:33:26 2007
New Revision: 508880
URL: http://svn.apache.org/viewvc?view=rev&rev=508880
Log:
WW-1709 fixed nullpointer when scheme is null
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java?view=diff&rev=508880&r1=508879&r2=508880
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java
Sat Feb 17 22:33:26 2007
@@ -74,6 +74,26 @@
assertEquals(expectedUrl, result);
}
+public void testForceAddNullSchemeHostAndPort() throws Exception {
+String expectedUrl =
"http://localhost/contextPath/path1/path2/myAction.action";;
+
+Mock mockHttpServletRequest = new Mock(HttpServletRequest.class);
+mockHttpServletRequest.expectAndReturn("getScheme", "http");
+mockHttpServletRequest.expectAndReturn("getServerName", "localhost");
+mockHttpServletRequest.expectAndReturn("getContextPath",
+"/contextPath");
+
+Mock mockHttpServletResponse = new Mock(HttpServletResponse.class);
+mockHttpServletResponse.expectAndReturn("encodeURL", expectedUrl,
+expectedUrl);
+
+String result = UrlHelper.buildUrl("/path1/path2/myAction.action",
+(HttpServletRequest) mockHttpServletRequest.proxy(),
+(HttpServletResponse) mockHttpServletResponse.proxy(), null,
+null, true, true, true);
+assertEquals(expectedUrl, result);
+mockHttpServletRequest.verify();
+}
public void testBuildParametersStringWithUrlHavingSomeExistingParameters()
throws Exception {
String expectedUrl =
"http://localhost:8080/myContext/myPage.jsp?initParam=initValue¶m1=value1¶m2=value2";;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java?view=diff&rev=508880&r1=508879&r2=508880
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
Sat Feb 17 22:33:26 2007
@@ -103,10 +103,12 @@
link.append("://");
link.append(request.getServerName());
-if ((scheme.equals("http") && (httpPort != DEFAULT_HTTP_PORT)) ||
(scheme.equals("https") && httpsPort != DEFAULT_HTTPS_PORT))
-{
-link.append(":");
-link.append(scheme.equals("http") ? httpPort : httpsPort);
+if (scheme != null) {
+if ((scheme.equals("http") && (httpPort != DEFAULT_HTTP_PORT))
|| (scheme.equals("https") && httpsPort != DEFAULT_HTTPS_PORT))
+{
+link.append(":");
+link.append(scheme.equals("http") ? httpPort : httpsPort);
+}
}
}
else if (
svn commit: r508882 - /struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
Author: tschneider
Date: Sat Feb 17 22:42:39 2007
New Revision: 508882
URL: http://svn.apache.org/viewvc?view=rev&rev=508882
Log:
WW-1702 - fixed error handling in dispatcher
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java?view=diff&rev=508882&r1=508881&r2=508882
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
Sat Feb 17 22:42:39 2007
@@ -515,8 +515,7 @@
LOG.error("Could not find action or result", e);
sendError(request, response, context,
HttpServletResponse.SC_NOT_FOUND, e);
} catch (Exception e) {
-LOG.error("Could not execute action", e);
-sendError(request, response, context,
HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e);
+throw new ServletException(e);
} finally {
UtilTimerStack.pop(timerKey);
}
svn commit: r508883 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
Author: tschneider
Date: Sat Feb 17 22:43:12 2007
New Revision: 508883
URL: http://svn.apache.org/viewvc?view=rev&rev=508883
Log:
WW-1702 - fixed error handling in dispatcher
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java?view=diff&rev=508883&r1=508882&r2=508883
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
Sat Feb 17 22:43:12 2007
@@ -515,8 +515,7 @@
LOG.error("Could not find action or result", e);
sendError(request, response, context,
HttpServletResponse.SC_NOT_FOUND, e);
} catch (Exception e) {
-LOG.error("Could not execute action", e);
-sendError(request, response, context,
HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e);
+throw new ServletException(e);
} finally {
UtilTimerStack.pop(timerKey);
}
