[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 |-- Pluggable Administration Console and Extensions User's Guide was last edited by pkashyap (08:23 AM). | http://cwiki.apache.org/confluence/display/GMOxDEV/Pluggable+Administration+Console+and+Extensions+User%27s+Guide Apache Felix (FELIX) http://cwiki.apache.org/confluence/display/FELIX | |-Pages Added or Edited in This Space |-- iPOJO Advanced Tutorial was last edited by clement.escoffier (07:35 AM). | http://cwiki.apache.org/confluence/display/FELIX/iPOJO+Advanced+Tutorial OpenEJB (OPENEJB) http://cwiki.apache.org/confluence/display/OPENEJB | |-Pages Added or Edited in This Space |-- Application discovery via the classpath was created by dblevins (05:04 PM). | http://cwiki.apache.org/confluence/display/OPENEJB/Application+discovery+via+the+classpath |-- August2007 was created by dblevins (12:11 AM). | http://cwiki.apache.org/confluence/display/OPENEJB/August2007 Apache Roller (ROLLER) http://cwiki.apache.org/confluence/display/ROLLER | |-Pages Added or Edited in This Space |-- Proposal Tag Data API was created by snoopdave (08:17 AM). | http://cwiki.apache.org/confluence/display/ROLLER/Proposal+Tag+Data+API |-- Roller Proposals was last edited by snoopdave (08:07 AM). | http://cwiki.apache.org/confluence/display/ROLLER/Roller+Proposals Apache Struts 2 Plugin Registry (S2PLUGINS) http://cwiki.apache.org/confluence/display/S2PLUGINS | |-Pages Added or Edited in This Space |-- SmartURLs plugin was last edited by voidmain (01:00 PM). | http://cwiki.apache.org/confluence/display/S2PLUGINS/SmartURLs+plugin Apache Geronimo v2.0 (GMOxDOC20) http://cwiki.apache.org/confluence/display/GMOxDOC20 | |-Pages Added or Edited in This Space |-- Using J2G was last edited by ginemesis (08:06 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC20/Using+J2G |-- J2G Migration Tool was last edited by ginemesis (08:03 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC20/J2G+Migration+Tool |-- SPECjAppServer2004 was created by vmz (07:26 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC20/SPECjAppServer2004 Apache Geronimo v1.1 (GMOxDOC11) http://cwiki.apache.org/confluence/display/GMOxDOC11 | |-Pages Added or Edited in This Space |-- Using J2G was last edited by ginemesis (08:06 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC11/Using+J2G |-- J2G Migration Tool was last edited by ginemesis (08:03 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC11/J2G+Migration+Tool Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW | |-New Comments in This Space |-- http://cwiki.apache.org/confluence/display/WW/Zero+Configuration (1) Apache Ode (ODExSITE) http://cwiki.apache.org/confluence/display/ODExSITE | |-Pages Added or Edited in This Space |-- Index was last edited by mriou (04:53 PM). | http://cwiki.apache.org/confluence/display/ODExSITE/Index |-- Getting Ode was last edited by mriou (04:29 PM). | http://cwiki.apache.org/confluence/display/ODExSITE/Getting+Ode Apache Directory Studio (DIRxSTUDIO) http://cwiki.apache.org/confluence/display/DIRxSTUDIO | |-Pages Added or Edited in This Space |-- Building was last edited by seelmann (04:02 PM). | http://cwiki.apache.org/confluence/display/DIRxSTUDIO/Building - 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: r570496 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/components/ main/java/org/apache/struts2/views/annotations/ main/java/org/apache/struts2/views/jsp/ui/ main/resour
Author: jholmes
Date: Tue Aug 28 10:38:36 2007
New Revision: 570496
URL: http://svn.apache.org/viewvc?rev=570496&view=rev
Log:
WW-2132 Add support for JSP tag library dynamic attributes
Added:
struts/struts2/trunk/core/src/main/resources/template/simple/dynamic-attributes.ftl
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Anchor-2.txt
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Anchor.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Checkbox.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/File.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Form.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Hidden.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Label.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Password.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Reset.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Select.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Submit.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Text.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TextArea.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TextField.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/annotations/StrutsTag.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
struts/struts2/trunk/core/src/main/resources/template/simple/a.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/checkbox.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/div.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/file.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/form.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/hidden.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/label.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/optgroup.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/password.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/reset.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/submit.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/text.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/textarea.ftl
struts/struts2/trunk/core/src/site/resources/tags/ajax/a.html
struts/struts2/trunk/core/src/site/resources/tags/ajax/autocompleter.html
struts/struts2/trunk/core/src/site/resources/tags/ajax/datetimepicker.html
struts/struts2/trunk/core/src/site/resources/tags/ajax/div.html
struts/struts2/trunk/core/src/site/resources/tags/ajax/submit.html
struts/struts2/trunk/core/src/site/resources/tags/ajax/tabbedpanel.html
struts/struts2/trunk/core/src/site/resources/tags/ajax/tree.html
struts/struts2/trunk/core/src/site/resources/tags/ajax/treenode.html
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Anchor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Anchor.java?rev=570496&r1=570495&r2=570496&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Anchor.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Anchor.java
Tue Aug 28 10:38:36 2007
@@ -46,7 +46,11 @@
*
*
*/
[EMAIL PROTECTED](name="a",
tldTagClass="org.apache.struts2.views.jsp.ui.AnchorTag", description="Render a
HTML href element that when clicked can optionally call a URL via remote
XMLHttpRequest and updates its targets")
[EMAIL PROTECTED](
+name="a",
+tldTagClass="org.apache.struts2.views.jsp.ui.AnchorTag",
+description="Render a HTML href element that when clicked can optionally
call a URL via remote XMLHttpRequest and updates its targets",
+allowDynamicAttributes=true)
public class Anchor extends ClosingUIBean {
public static final String OPEN_TEMPLATE = "a";
public static final String TEMPLATE = "a-close";
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/c
svn commit: r570518 - in /struts/struts2/trunk: apps/showcase/src/main/java/org/apache/struts2/showcase/source/ core/src/main/java/org/apache/struts2/components/template/ core/src/main/java/org/apache
Author: jholmes
Date: Tue Aug 28 11:26:48 2007
New Revision: 570518
URL: http://svn.apache.org/viewvc?rev=570518&view=rev
Log:
WW-2142 input streams need to be explicitly closed
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java?rev=570518&r1=570517&r2=570518&view=diff
==
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java
Tue Aug 28 11:26:48 2007
@@ -72,6 +72,10 @@
}
}
pageLines = read(in, -1);
+
+if (in != null) {
+in.close();
+}
}
if (className != null && className.trim().length() > 0) {
@@ -81,6 +85,10 @@
in =
servletContext.getResourceAsStream("/WEB-INF/src"+className);
}
classLines = read(in, -1);
+
+if (in != null) {
+in.close();
+}
}
String rootPath =
ServletActionContext.getServletContext().getRealPath("/");
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java?rev=570518&r1=570517&r2=570518&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java
Tue Aug 28 11:26:48 2007
@@ -52,7 +52,7 @@
if (props == null) {
String propName = template.getDir() + "/" +
template.getTheme() + "/"+getThemePropertiesFileName();
-// WW-1292
+// WW-1292
// let's try getting it from the filesystem
File propFile = new File(propName);
InputStream is = null;
@@ -77,6 +77,12 @@
props.load(is);
} catch (IOException e) {
LOG.error("Could not load " + propName, e);
+} finally {
+try {
+is.close();
+} catch(IOException io) {
+LOG.warn("Unable to close input stream", io);
+}
}
}
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java?rev=570518&r1=570517&r2=570518&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java
Tue Aug 28 11:26:48 2007
@@ -33,7 +33,7 @@
/**
*
*
- * A custom Result type for send raw data (via an InputStream) directly to the
+ * A custom Result type for sending raw data (via an InputStream) directly to
the
* HttpServletResponse. Very useful for allowing users to download content.
*
*
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java?rev=570518&r1=570517&r2=570518&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
Tue Aug 28 11:26:48 2007
@@ -105,7 +105,7 @@
*/
public class FreemarkerManager {
-private static final Log log = LogFactory.getLog(FreemarkerManager.class);
+private static final Log LOG = LogFactory.getLog(FreemarkerManager.class);
svn commit: r570513 - in /struts/struts2/branches/STRUTS_2_0_X: apps/showcase/src/main/java/org/apache/struts2/showcase/source/ core/src/main/java/org/apache/struts2/components/template/ core/src/main
Author: jholmes
Date: Tue Aug 28 11:14:00 2007
New Revision: 570513
URL: http://svn.apache.org/viewvc?rev=570513&view=rev
Log:
WW-2142 input streams need to be explicitly closed
Modified:
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/tabbedPanel.html
struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/url.html
Modified:
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java?rev=570513&r1=570512&r2=570513&view=diff
==
---
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java
Tue Aug 28 11:14:00 2007
@@ -70,15 +70,23 @@
}
}
pageLines = read(in, -1);
+
+if (in != null) {
+in.close();
+}
}
if (className != null && className.trim().length() > 0) {
-className = "/"+className.replace('.', '/') + ".java";
+className = "/" + className.replace('.', '/') + ".java";
InputStream in = getClass().getResourceAsStream(className);
if (in == null) {
in =
servletContext.getResourceAsStream("/WEB-INF/src"+className);
}
classLines = read(in, -1);
+
+if (in != null) {
+in.close();
+}
}
if (config != null && config.trim().length() > 0) {
@@ -118,8 +126,6 @@
this.padding = padding;
}
-
-
/**
* @return the classLines
*/
@@ -215,6 +221,4 @@
public void setServletContext(ServletContext arg0) {
this.servletContext = arg0;
}
-
-
}
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java?rev=570513&r1=570512&r2=570513&view=diff
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java
Tue Aug 28 11:14:00 2007
@@ -52,7 +52,7 @@
if (props == null) {
String propName = template.getDir() + "/" +
template.getTheme() + "/"+getThemePropertiesFileName();
-// WW-1292
+// WW-1292
// let's try getting it from the filesystem
File propFile = new File(propName);
InputStream is = null;
@@ -77,6 +77,12 @@
props.load(is);
} catch (IOException e) {
LOG.error("Could not load " + propName, e);
+} finally {
+try {
+is.close();
+} catch(IOException io) {
+LOG.warn("Unable to close input stream", io);
+}
}
}
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java?rev=570513&r1=570512&r2=570513&view=diff
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java
Tue Aug 28 11:14:00 2007
@@ -33,7 +33,7 @@
/**
*
*
- * A custom Result type for send raw data (via an InputStream) directly to the
+ * A custom Result type for sending raw data (via an InputStream) directly to
the
* HttpServletResponse. Very useful for allowing users t
svn commit: r570529 - /struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
Author: jholmes
Date: Tue Aug 28 12:04:52 2007
New Revision: 570529
URL: http://svn.apache.org/viewvc?rev=570529&view=rev
Log:
WW-2135 The FreeMarker tag name for the DateTimePicker doesn't match TLD
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java?rev=570529&r1=570528&r2=570529&view=diff
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
Tue Aug 28 12:04:52 2007
@@ -242,7 +242,7 @@
return date;
}
-public DateTimePickerModel getDateTimePicker() {
+public DateTimePickerModel getDatetimepicker() {
if (dateTimePicker == null) {
dateTimePicker = new DateTimePickerModel(stack, req, res);
}
svn commit: r570628 - /struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorForm.java
Author: pbenedict
Date: Tue Aug 28 20:27:28 2007
New Revision: 570628
URL: http://svn.apache.org/viewvc?rev=570628&view=rev
Log:
STR-2020: Explain that NPE is caused by missing ActionServlet
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorForm.java
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorForm.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorForm.java?rev=570628&r1=570627&r2=570628&view=diff
==
---
struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorForm.java
(original)
+++
struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorForm.java
Tue Aug 28 20:27:28 2007
@@ -103,11 +103,20 @@
*/
public ActionErrors validate(ActionMapping mapping,
HttpServletRequest request) {
-ServletContext application = getServlet().getServletContext();
+
ActionErrors errors = new ActionErrors();
-
String validationKey = getValidationKey(mapping, request);
+ServletContext application;
+try {
+application = getServlet().getServletContext();
+} catch (NullPointerException e) {
+throw new IllegalStateException(
+"Missing ActionServlet instance for bean '" +
+mapping.getName() +
+"' (created outside of Struts?)", e);
+}
+
Validator validator =
Resources.initValidator(validationKey, this, application, request,
errors, getPage());
