[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache CXF Documentation (CXF20DOC) http://cwiki.apache.org/confluence/display/CXF20DOC | |-Pages Added or Edited in This Space |-- AppServerGuide was last edited by dkulp (08:41 AM). | http://cwiki.apache.org/confluence/display/CXF20DOC/AppServerGuide OpenEJB (OPENEJB) http://cwiki.apache.org/confluence/display/OPENEJB | |-Pages Added or Edited in This Space |-- Mailing Lists was last edited by adc (02:04 PM). | http://cwiki.apache.org/confluence/display/OPENEJB/Mailing+Lists Apache Qpid (qpid) http://cwiki.apache.org/confluence/display/qpid | |-Pages Added or Edited in This Space |-- roadmap was last edited by cctrieloff (07:36 AM). | http://cwiki.apache.org/confluence/display/qpid/roadmap Apache ActiveMQ (ACTIVEMQ) http://cwiki.apache.org/confluence/display/ACTIVEMQ | |-Pages Added or Edited in This Space |-- Team was last edited by jstrachan (04:57 AM). | http://cwiki.apache.org/confluence/display/ACTIVEMQ/Team Apache JSecurity (JSEC) http://cwiki.apache.org/confluence/display/JSEC | |-Pages Added or Edited in This Space |-- Mailing Lists was created by adc (02:09 PM). | http://cwiki.apache.org/confluence/display/JSEC/Mailing+Lists Apache Geronimo v2.0 - JA (GMOxDOC20ja) http://cwiki.apache.org/confluence/display/GMOxDOC20ja | |-Pages Added or Edited in This Space |-- Documentation was last edited by ohnuki (11:37 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC20ja/Documentation Tuscany Wiki (TUSCANYWIKI) http://cwiki.apache.org/confluence/display/TUSCANYWIKI | |-Pages Added or Edited in This Space |-- Chinese Portal was created by rfeng (08:35 AM). | http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Chinese+Portal |-- Databinding Scope was last edited by vamsic007 (07:01 AM). | http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Databinding+Scope Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW | |-Pages Added or Edited in This Space |-- Zero Configuration was last edited by mrdon (09:26 PM). | http://cwiki.apache.org/confluence/display/WW/Zero+Configuration |-- UI Tag Reference was last edited by phil (12:10 AM). | http://cwiki.apache.org/confluence/display/WW/UI+Tag+Reference | |-New Comments in This Space |-- http://cwiki.apache.org/confluence/display/WW/PreResultListener (1) |-- http://cwiki.apache.org/confluence/display/WW/UI+Tag+Reference (1) Apache Wicket Website (WICKETxSITE) http://cwiki.apache.org/confluence/display/WICKETxSITE | |-Pages Added or Edited in This Space |-- Navigation was last edited by gwynevans (12:19 AM). | http://cwiki.apache.org/confluence/display/WICKETxSITE/Navigation - CONFLUENCE INFORMATION This message is automatically generated by Confluence Unsubscribe or edit your notifications preferences http://cwiki.apache.org/confluence/users/viewnotifications.action If you think it was sent incorrectly contact one of the administrators http://cwiki.apache.org/confluence/administrators.action If you want more information on Confluence, or have a bug to report see http://www.atlassian.com/software/confluence
svn commit: r667778 - in /struts/struts2/trunk/plugins/struts1: pom.xml src/main/java/org/apache/struts2/s1/WrapperModuleConfig.java
Author: hermanns
Date: Sat Jun 14 05:14:42 2008
New Revision: 667778
URL: http://svn.apache.org/viewvc?rev=667778&view=rev
Log:
XW-2586 Struts 1 plugin pom has dependancy on 1.3.5
o added missing method findActionConfigId(java.lang.String) in
org.apache.struts.config.ModuleConfig
o upgraded dependancy to Struts 1.3.9
Modified:
struts/struts2/trunk/plugins/struts1/pom.xml
struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperModuleConfig.java
Modified: struts/struts2/trunk/plugins/struts1/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/struts1/pom.xml?rev=667778&r1=66&r2=667778&view=diff
==
--- struts/struts2/trunk/plugins/struts1/pom.xml (original)
+++ struts/struts2/trunk/plugins/struts1/pom.xml Sat Jun 14 05:14:42 2008
@@ -43,7 +43,7 @@
org.apache.struts
struts-core
-1.3.5
+1.3.9
${pom.groupId}
Modified:
struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperModuleConfig.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperModuleConfig.java?rev=667778&r1=66&r2=667778&view=diff
==
---
struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperModuleConfig.java
(original)
+++
struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperModuleConfig.java
Sat Jun 14 05:14:42 2008
@@ -206,6 +206,10 @@
return (ForwardConfig[]) _actionForwards.values().toArray(new
ForwardConfig[_actionForwards.size()]);
}
+public ActionConfig findActionConfigId(String s) {
+throw new UnsupportedOperationException("NYI");
+}
+
public MessageResourcesConfig findMessageResourcesConfig(String key) {
throw new UnsupportedOperationException("NYI");
}
svn commit: r667779 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
Author: hermanns
Date: Sat Jun 14 05:19:07 2008
New Revision: 667779
URL: http://svn.apache.org/viewvc?rev=667779&view=rev
Log:
WW-1725 FileUploadInterceptor and localized messages problem
o implemented requested feature based on a new config parameter:
set useActionMessageBundle config parameter to true to use action message
bundles
The default behaviour is not changed at all, so this change is fully
backwards compliant.
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java?rev=667779&r1=667778&r2=667779&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
Sat Jun 14 05:19:07 2008
@@ -175,10 +175,18 @@
private static final String DEFAULT_DELIMITER = ",";
private static final String DEFAULT_MESSAGE = "no.message.found";
+protected boolean useActionMessageBundle;
+
protected Long maximumSize;
protected String allowedTypes;
protected Set allowedTypesSet = Collections.EMPTY_SET;
+
+
+public void setUseActionMessageBundle(String value) {
+this.useActionMessageBundle = Boolean.valueOf(value).booleanValue();
+}
+
/**
* Sets the allowed mimetypes
*
@@ -205,6 +213,7 @@
*/
public String intercept(ActionInvocation invocation) throws Exception {
ActionContext ac = invocation.getInvocationContext();
+
HttpServletRequest request = (HttpServletRequest)
ac.get(ServletActionContext.HTTP_REQUEST);
if (!(request instanceof MultiPartRequestWrapper)) {
@@ -216,9 +225,10 @@
return invocation.invoke();
}
-final Object action = invocation.getAction();
ValidationAware validation = null;
+Object action = invocation.getAction();
+
if (action instanceof ValidationAware) {
validation = (ValidationAware) action;
}
@@ -262,7 +272,7 @@
String contentTypeName = inputName + "ContentType";
String fileNameName = inputName + "FileName";
for (int index = 0; index < files.length; index++) {
-if (acceptFile(files[index], contentType[index],
inputName, validation, ac.getLocale())) {
+if (acceptFile(action, files[index],
contentType[index], inputName, validation, ac.getLocale())) {
acceptedFiles.add(files[index]);
acceptedContentTypes.add(contentType[index]);
acceptedFileNames.add(fileName[index]);
@@ -275,10 +285,10 @@
}
}
} else {
-LOG.error(getTextMessage("struts.messages.invalid.file",
new Object[]{inputName}, ActionContext.getContext().getLocale()));
+LOG.error(getTextMessage(action,
"struts.messages.invalid.file", new Object[]{inputName},
ActionContext.getContext().getLocale()));
}
} else {
-
LOG.error(getTextMessage("struts.messages.invalid.content.type", new
Object[]{inputName}, ActionContext.getContext().getLocale()));
+LOG.error(getTextMessage(action,
"struts.messages.invalid.content.type", new Object[]{inputName},
ActionContext.getContext().getLocale()));
}
}
@@ -293,7 +303,7 @@
for (int index = 0; index < file.length; index++) {
File currentFile = file[index];
if (LOG.isInfoEnabled()) {
-LOG.info(getTextMessage("struts.messages.removing.file",
new Object[]{inputValue, currentFile}, ActionContext.getContext().getLocale()));
+LOG.info(getTextMessage(action,
"struts.messages.removing.file", new Object[]{inputValue, currentFile},
ActionContext.getContext().getLocale()));
}
if ((currentFile != null) && currentFile.isFile()) {
currentFile.delete();
@@ -316,25 +326,42 @@
* @return true if the proposed file is acceptable by contentType and size.
*/
protected boolean acceptFile(File file, String contentType, String
inputName, ValidationAware validation, Locale locale) {
+return acceptFile(null, file, contentType, inputName, validation,
locale);
+
+}
+
+/**
+ * Override for added functionality. Checks if the proposed file is
acceptable based on contentType and size.
+ *
+ * @param ac
svn propchange: r667778 - svn:log
Author: hermanns Revision: 667778 Modified property: svn:log Modified: svn:log at Sat Jun 14 05:26:09 2008 -- --- svn:log (original) +++ svn:log Sat Jun 14 05:26:09 2008 @@ -1,3 +1,3 @@ -XW-2586 Struts 1 plugin pom has dependancy on 1.3.5 +WW-2586 Struts 1 plugin pom has dependancy on 1.3.5 o added missing method findActionConfigId(java.lang.String) in org.apache.struts.config.ModuleConfig o upgraded dependancy to Struts 1.3.9
svn commit: r667791 - /struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java
Author: hermanns
Date: Sat Jun 14 05:41:00 2008
New Revision: 667791
URL: http://svn.apache.org/viewvc?rev=667791&view=rev
Log:
WW-2480 Some OGNL expressions do not work with DateTimePicker component
o applied patch by Mike Calmus
Modified:
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java
Modified:
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java?rev=667791&r1=667790&r2=667791&view=diff
==
---
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java
Sat Jun 14 05:41:00 2008
@@ -258,10 +258,10 @@
// format the value to RFC 3399
if(parameters.containsKey("value")) {
-parameters.put("nameValue", parameters.get("value"));
+addParameter("nameValue", parameters.get("value"));
} else {
-if(name != null) {
-addParameter("nameValue", format(findValue(name)));
+if(parameters.containsKey("name")) {
+addParameter("nameValue",
format(findValue((String)parameters.get("name";
}
}
svn commit: r667793 - /struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/ContentPane.js
Author: hermanns
Date: Sat Jun 14 05:44:40 2008
New Revision: 667793
URL: http://svn.apache.org/viewvc?rev=667793&view=rev
Log:
WW-2520 IE bug on tabbedpanel with Enclosed ajax div on first tab
o applied patch by Stanislav Malishevskiy
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/ContentPane.js
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/ContentPane.js
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/ContentPane.js?rev=667793&r1=667792&r2=667793&view=diff
==
---
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/ContentPane.js
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/ContentPane.js
Sat Jun 14 05:44:40 2008
@@ -317,7 +317,7 @@
this._styleNodes = [];
try {
var node = this.containerNode || this.domNode;
- while (node.firstChild) {
+ while(node!=null && node.firstChild){
dojo.html.destroyNode(node.firstChild);
}
if (typeof cont != "string") {
svn commit: r667794 - /struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/ComboBox.js
Author: hermanns
Date: Sat Jun 14 05:48:21 2008
New Revision: 667794
URL: http://svn.apache.org/viewvc?rev=667794&view=rev
Log:
WW-2536 Autocompleted element don't publish topics when it changed
o applied patch by Stanislav Malishevskiy
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/ComboBox.js
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/ComboBox.js
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/ComboBox.js?rev=667794&r1=667793&r2=667794&view=diff
==
---
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/ComboBox.js
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/ComboBox.js
Sat Jun 14 05:48:21 2008
@@ -495,7 +495,8 @@
return false;
}
}
- this.selectedResult = [tgt.getAttribute("resultName"),
tgt.getAttribute("resultValue")];
+this.textInputNode.value="";
+this.selectedResult = [tgt.getAttribute("resultName"),
tgt.getAttribute("resultValue")];
this.setAllValues(tgt.getAttribute("resultName"),
tgt.getAttribute("resultValue"));
if (!evt.noHide) {
this._hideResultList();
svn commit: r667872 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ListUIBean.java
Author: jholmes Date: Sat Jun 14 13:23:44 2008 New Revision: 667872 URL: http://svn.apache.org/viewvc?rev=667872&view=rev Log: Quick grammar fix. Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ListUIBean.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ListUIBean.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ListUIBean.java?rev=667872&r1=667871&r2=667872&view=diff == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ListUIBean.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ListUIBean.java Sat Jun 14 13:23:44 2008 @@ -43,7 +43,7 @@ * * Note that the listkey and listvalue attribute will default to "key" and "value" * respectively only when the list attribute is evaluated to a Map or its decendant. - * Other thing else, will result in listkey and listvalue to be null and not used. + * Everything else will result in listkey and listvalue to be null and not used. * * *
svn commit: r667873 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
Author: jholmes
Date: Sat Jun 14 13:26:34 2008
New Revision: 667873
URL: http://svn.apache.org/viewvc?rev=667873&view=rev
Log:
Quick grammar fix.
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java?rev=667873&r1=667872&r2=667873&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
Sat Jun 14 13:26:34 2008
@@ -1044,7 +1044,7 @@
this.disabled = disabled;
}
-@StrutsTagAttribute(description="Label expression used for rendering a
element specific label")
+@StrutsTagAttribute(description="Label expression used for rendering an
element specific label")
public void setLabel(String label) {
this.label = label;
}
svn commit: r667876 - /struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl
Author: jholmes
Date: Sat Jun 14 13:44:48 2008
New Revision: 667876
URL: http://svn.apache.org/viewvc?rev=667876&view=rev
Log:
WW-2238 checkboxlist labels and values mixed up
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl?rev=667876&r1=667875&r2=667876&view=diff
==
---
struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl
(original)
+++
struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl
Sat Jun 14 13:44:48 2008
@@ -34,6 +34,11 @@
<#else>
<#assign itemValue = stack.findString('top')/>
+<#if parameters.label?exists>
+<#assign itemLabel = stack.findString(parameters.label)/>
+<#else>
+<#assign itemLabel = itemValue/>
+
<#assign itemKeyStr=itemKey.toString() />
<#if tag.contains(parameters.nameValue, itemKey)>
@@ -48,7 +53,7 @@
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
/>
-${itemValue?html}
+${itemLabel?html}
<#else>
svn commit: r667889 - /struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java
Author: jholmes
Date: Sat Jun 14 15:07:52 2008
New Revision: 667889
URL: http://svn.apache.org/viewvc?rev=667889&view=rev
Log:
Fix formatting.
Modified:
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java
Modified:
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java?rev=667889&r1=667888&r2=667889&view=diff
==
---
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java
(original)
+++
struts/maven/trunk/struts-annotations/src/main/java/org/apache/struts/annotations/taglib/apt/TagAnnotationProcessor.java
Sat Jun 14 15:07:52 2008
@@ -114,7 +114,7 @@
tag.setTldBodyContent((String) values.get("tldBodyContent"));
tag.setTldTagClass((String) values.get("tldTagClass"));
tag.setDeclaredType(typeName);
- tag.setAllowDynamicAttributes((Boolean)
values.get("allowDynamicAttributes"));
+tag.setAllowDynamicAttributes((Boolean)
values.get("allowDynamicAttributes"));
// add to map
tags.put(typeName, tag);
}
@@ -320,9 +320,9 @@
// taglib
Element tagLib = document.createElement("taglib");
tagLib.setAttribute("xmlns", "http://java.sun.com/xml/ns/j2ee";);
- tagLib.setAttribute("xmlns:xsi",
"http://www.w3.org/2001/XMLSchema-instance";);
- tagLib.setAttribute("xsi:schemaLocation",
"http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd";);
- tagLib.setAttribute("version", getOption("jspVersion"));
+tagLib.setAttribute("xmlns:xsi",
"http://www.w3.org/2001/XMLSchema-instance";);
+tagLib.setAttribute("xsi:schemaLocation",
"http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd";);
+tagLib.setAttribute("version", getOption("jspVersion"));
document.appendChild(tagLib);
// tag lib attributes
appendTextNode(document, tagLib, "description",
svn commit: r667895 - /struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl
Author: jholmes
Date: Sat Jun 14 15:45:47 2008
New Revision: 667895
URL: http://svn.apache.org/viewvc?rev=667895&view=rev
Log:
Update documentation that is generated for tags to include information about
whether a tag allows dynamic attributes.
WW-2132
Modified:
struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl
Modified:
struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl?rev=667895&r1=667894&r2=667895&view=diff
==
---
struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl
(original)
+++
struts/maven/trunk/struts-annotations/src/main/resources/org/apache/struts/annotations/taglib/apt/tag.ftl
Sat Jun 14 15:45:47 2008
@@ -20,6 +20,12 @@
+ Dynamic Attributes
Allowed: ${tag.allowDynamicAttributes}
+
+
+
+
+
Name
Required
Default
