[CONF] Confluence Changes in the last 24 hours
- 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 |-- Running Geronimo as a non-root user was last edited by hcunico (03:08 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC12/Running+Geronimo+as+a+non-root+user |-- Configuring Virtual Hosts in Geronimo-Tomcat was last edited by hcunico (03:05 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC12/Configuring+Virtual+Hosts+in+Geronimo-Tomcat |-- Configuring Virtual Hosts in Geronimo-Jetty was last edited by hcunico (12:12 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC12/Configuring+Virtual+Hosts+in+Geronimo-Jetty |-- Configuring DB2 datasource was last edited by hcunico (07:28 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC12/Configuring+DB2+datasource Apache Geronimo Development (GMOxDEV) http://cwiki.apache.org/confluence/display/GMOxDEV | |-Pages Added or Edited in This Space |-- GeronimoModuleView was last edited by ryan (08:34 PM). | http://cwiki.apache.org/confluence/display/GMOxDEV/GeronimoModuleView Apache FTPServer Project (FTPSERVER) http://cwiki.apache.org/confluence/display/FTPSERVER | |-Pages Added or Edited in This Space |-- Index was created by husted (04:08 AM). | http://cwiki.apache.org/confluence/display/FTPSERVER/Index Apache Qpid (qpid) http://cwiki.apache.org/confluence/display/qpid | |-Pages Added or Edited in This Space |-- Qpid Java Build How To was last edited by vinoski (02:05 PM). | http://cwiki.apache.org/confluence/display/qpid/Qpid+Java+Build+How+To |-- JMS Compliance was created by ritchiem (08:29 AM). | http://cwiki.apache.org/confluence/display/qpid/JMS+Compliance Apache Geronimo v1.1 (GMOxDOC11) http://cwiki.apache.org/confluence/display/GMOxDOC11 | |-Pages Added or Edited in This Space |-- openejb-jar.xml was last edited by [EMAIL PROTECTED] (10:18 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC11/openejb-jar.xml |-- Configuring Virtual Hosts in Geronimo-Tomcat was last edited by hcunico (12:28 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC11/Configuring+Virtual+Hosts+in+Geronimo-Tomcat Apache Directory Server v1.0 Documentation (DIRxSRVx10) http://cwiki.apache.org/confluence/display/DIRxSRVx10 | |-Pages Added or Edited in This Space |-- Basic configuration tasks was last edited by ck (05:09 PM). | http://cwiki.apache.org/confluence/display/DIRxSRVx10/Basic+configuration+tasks |-- ApacheDS tools was last edited by ck (03:30 PM). | http://cwiki.apache.org/confluence/display/DIRxSRVx10/ApacheDS+tools |-- ApacheDS v1.0 Basic User's Guide was last edited by ck (02:06 PM). | http://cwiki.apache.org/confluence/display/DIRxSRVx10/ApacheDS+v1.0+Basic+User%27s+Guide |-- Connecting to ApacheDS with graphical tools (3rd party) was last edited by szoerner (12:44 PM). | http://cwiki.apache.org/confluence/display/DIRxSRVx10/Connecting+to+ApacheDS+with+graphical+tools+%283rd+party%29 |-- Apache Tomcat was last edited by szoerner (12:26 PM). | http://cwiki.apache.org/confluence/display/DIRxSRVx10/Apache+Tomcat Apache MINA (MINA) http://cwiki.apache.org/confluence/display/MINA | |-Pages Added or Edited in This Space |-- Downloads was last edited by trustin (03:10 AM). | http://cwiki.apache.org/confluence/display/MINA/Downloads |-- Developer Guide was last edited by trustin (03:10 AM). | http://cwiki.apache.org/confluence/display/MINA/Developer+Guide |-- Index was last edited by trustin (02:19 AM). | http://cwiki.apache.org/confluence/display/MINA/Index |-- Artwork was last edited by jvermillard (01:18 AM). | http://cwiki.apache.org/confluence/display/MINA/Artwork UIMA (UIMA) http://cwiki.apache.org/confluence/display/UIMA | |-Pages Added or Edited in This Space |-- UIMA Sandbox Components was last edited by mbaessler (08:46 AM). | http://cwiki.apache.org/confluence/display/UIMA/UIMA+Sandbox+Components Apache Struts 2 Wiki (S2WIKI) http://cwiki.apache.org/confluence/display/S2WIKI | |-Pages Added or Edited in This Space |-- Ajax Tags was last edited by musachy (12:18 PM). | http://cwiki.apache.org/confluence/display/S2WIKI/Ajax+Tags Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET | |-Pages Added or Edited in This Space |-- Building your first Wicket webapp Using Netbeans was created by dabar (01:49 AM). | http://cwiki.apache.org/confluence/display/WICKET/Building+your+first+Wicket+webapp+Using+Netbeans |-- Wicket Netbeans Plugin was created by dabar (01:52 AM). | http://cwiki.apache.org/confluence/display/WICKET/Wicket+Netbeans+Plugin -
svn commit: r483873 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2: config/LegacyPropertiesConfigurationProvider.java dispatcher/Dispatcher.java
Author: mrdon
Date: Fri Dec 8 00:02:55 2006
New Revision: 483873
URL: http://svn.apache.org/viewvc?view=rev&rev=483873
Log:
Updating for new initialization of continuations (still broken though)
WW-1548
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java?view=diff&rev=483873&r1=483872&r2=483873
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java
Fri Dec 8 00:02:55 2006
@@ -68,9 +68,14 @@
for (Iterator i = settings.list(); i.hasNext(); ) {
String name = (String) i.next();
-props.put(name, settings.get(name));
+props.setProperty(name, settings.get(name),
settings.getLocation(name));
+
+// Convert struts properties into ones that xwork expects
if (StrutsConstants.STRUTS_DEVMODE.equals(name)) {
props.setProperty("devMode", settings.get(name),
settings.getLocation(name));
+}
+if (StrutsConstants.STRUTS_CONTINUATIONS_PACKAGE.equals(name)) {
+props.setProperty("continuations.package", settings.get(name),
settings.getLocation(name));
}
}
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=483873&r1=483872&r2=483873
==
---
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
Fri Dec 8 00:02:55 2006
@@ -370,12 +370,6 @@
private void init_CheckConfigurationReloading(Container container) {
FileManager.setReloadingConfigs("true".equals(container.getInstance(String.class,
StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD)));
-
-String pkg = container.getInstance(String.class,
StrutsConstants.STRUTS_CONTINUATIONS_PACKAGE);
-if (pkg != null) {
-ObjectFactory.setContinuationPackage(pkg);
-}
-
}
private void init_CheckWebLogicWorkaround(Container container) {
svn commit: r483876 - /struts/struts2/trunk/core/src/main/resources/template/xhtml/datepicker.ftl
Author: mrdon
Date: Fri Dec 8 00:21:50 2006
New Revision: 483876
URL: http://svn.apache.org/viewvc?view=rev&rev=483876
Log:
Fixed datepicker missing control headers and footers in xhtml theme
WW-1538
Modified:
struts/struts2/trunk/core/src/main/resources/template/xhtml/datepicker.ftl
Modified:
struts/struts2/trunk/core/src/main/resources/template/xhtml/datepicker.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/datepicker.ftl?view=diff&rev=483876&r1=483875&r2=483876
==
--- struts/struts2/trunk/core/src/main/resources/template/xhtml/datepicker.ftl
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/xhtml/datepicker.ftl
Fri Dec 8 00:21:50 2006
@@ -1,2 +1,4 @@
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
<#include "/${parameters.templateDir}/simple/datepicker.ftl" />
+<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" />
svn commit: r483877 - in /struts/struts2/trunk/apps/showcase/src/main: java/org/apache/struts2/showcase/UITagExample.java webapp/tags/ui/example.jsp
Author: mrdon
Date: Fri Dec 8 00:22:32 2006
New Revision: 483877
URL: http://svn.apache.org/viewvc?view=rev&rev=483877
Log:
Fixed favourite color with different spellings, exposed uploaded file
WW-1538
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java?view=diff&rev=483877&r1=483876&r2=483877
==
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
Fri Dec 8 00:22:32 2006
@@ -44,7 +44,7 @@
String name;
Date birthday;
String bio;
-String favoriteColor;
+String favouriteColor;
List friends;
boolean legalAge;
String state;
@@ -168,12 +168,12 @@
this.bio = bio;
}
-public String getFavoriteColor() {
-return favoriteColor;
+public String getFavouriteColor() {
+return favouriteColor;
}
-public void setFavoriteColor(String favoriteColor) {
-this.favoriteColor = favoriteColor;
+public void setFavouriteColor(String favoriteColor) {
+this.favouriteColor = favoriteColor;
}
public List getFriends() {
@@ -210,6 +210,10 @@
public void setPicture(File picture) {
this.picture = picture;
+}
+
+public File getPicture() {
+return this.picture;
}
public void setPictureContentType(String pictureContentType) {
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp?view=diff&rev=483877&r1=483876&r2=483877
==
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp Fri
Dec 8 00:22:32 2006
@@ -13,7 +13,7 @@
-
+
svn commit: r483878 - /struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.vm
Author: mrdon
Date: Fri Dec 8 00:23:19 2006
New Revision: 483878
URL: http://svn.apache.org/viewvc?view=rev&rev=483878
Log:
Fixed velocity favourite spelling
WW-1538
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.vm
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.vm
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.vm?view=diff&rev=483878&r1=483877&r2=483878
==
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.vm
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.vm Fri
Dec 8 00:23:19 2006
@@ -14,7 +14,7 @@
#stextfield ("label=Name" "name=name")
#sdatepicker ("label=Birthday" "name=birthday")
#stextarea ("label=Biograph" "name=bio" "cols=20" "rows=3")
-#sselect ("label=Favorite Color" "list={'Red', 'Blue', 'Green'}"
"name=favoriteColor" "emptyOption=true" "headerKey=None" "headerValue=None")
+#sselect ("label=Favourite Color" "list={'Red', 'Blue', 'Green'}"
"name=favouriteColor" "emptyOption=true" "headerKey=None" "headerValue=None")
#sselect ("label=Favourite Language" "list=favouriteLanguages"
"name=favouriteLanguage" "listKey=key" "listValue=description"
"emptyOption=true" "headerKey=None" "headerValue=None")
#scheckboxlist ("label=Friends" "list={'Patrick', 'Jason', 'Jay', 'Toby',
'Rene'}" "name=friends")
#scheckbox ("label=Age 18+" "name=legalAge")
svn commit: r483883 - /struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
Author: mrdon
Date: Fri Dec 8 00:36:25 2006
New Revision: 483883
URL: http://svn.apache.org/viewvc?view=rev&rev=483883
Log:
Fixed mis-loading of result types
WW-1538
Modified:
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
Modified:
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java?view=diff&rev=483883&r1=483882&r2=483883
==
---
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
(original)
+++
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
Fri Dec 8 00:36:25 2006
@@ -55,7 +55,7 @@
protected String defaultPackageName = "codebehind-default";
protected ServletContext servletContext;
-protected Map resultsByExtension = new
HashMap();
+protected Map resultsByExtension;
protected String templatePathPrefix = "/";
protected Configuration configuration;
protected ObjectFactory objectFactory;
@@ -70,6 +70,13 @@
@Inject
public void setConfiguration(Configuration config) {
this.configuration = config;
+resultsByExtension = new LinkedHashMap();
+PackageConfig parentPackage =
configuration.getPackageConfig(defaultPackageName);
+Map results =
parentPackage.getAllResultTypeConfigs();
+
+resultsByExtension.put("jsp", results.get("dispatcher"));
+resultsByExtension.put("vm", results.get("velocity"));
+resultsByExtension.put("ftl", results.get("freemarker"));
}
@Inject
@@ -82,22 +89,8 @@
this.objectFactory = objectFactory;
}
-protected Map loadResultTypes(Configuration
config) {
-Map resultTypes = new
LinkedHashMap();
-PackageConfig parentPackage =
config.getPackageConfig(defaultPackageName);
-Map results =
parentPackage.getAllResultTypeConfigs();
-
-resultTypes.put("jsp", results.get("dispatcher"));
-resultTypes.put("vm", results.get("velocity"));
-resultTypes.put("ftl", results.get("freemarker"));
-return resultTypes;
-}
-
public ActionConfig handleUnknownAction(String namespace, String
actionName)
throws XWorkException {
-if (resultsByExtension == null) {
-resultsByExtension = loadResultTypes(configuration);
-}
String pathPrefix = determinePath(templatePathPrefix, namespace);
ActionConfig actionConfig = null;
for (String ext : resultsByExtension.keySet()) {
@@ -118,9 +111,6 @@
}
protected ActionConfig buildActionConfig(String path, String namespace,
String actionName, ResultTypeConfig resultTypeConfig) {
-if (resultsByExtension == null) {
-resultsByExtension = loadResultTypes(configuration);
-}
Map results = new HashMap();
HashMap params = new HashMap();
if (resultTypeConfig.getParams() != null) {
svn commit: r483885 - /struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.ftl
Author: mrdon Date: Fri Dec 8 00:40:36 2006 New Revision: 483885 URL: http://svn.apache.org/viewvc?view=rev&rev=483885 Log: Fixed formatting of if tag test WW-1538 Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.ftl Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.ftl?view=diff&rev=483885&r1=483884&r2=483885 == --- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.ftl (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.ftl Fri Dec 8 00:40:36 2006 @@ -387,6 +387,7 @@ Bar + 27 - Foo - <@s.if test="true"> Foo @@ -404,6 +405,7 @@ Bar + 28 - MooFooFoo <@s.if test="false"> Foo @@ -421,7 +423,7 @@ Bar - + 29 - MooMooMoo <@s.if test="false"> Foo @@ -439,7 +441,7 @@ Bar - + 30 - Moo - <@s.if test="false"> Foo @@ -457,7 +459,7 @@ Bar - + 31 - BarFooFoo - <@s.if test="false"> Foo @@ -475,6 +477,7 @@ + 32 - BarMooMoo - <@s.if test="false"> Foo @@ -492,6 +495,7 @@ + 33 - Bar - <@s.if test="false"> Foo
svn commit: r483888 - /struts/struts2/trunk/core/src/main/resources/template/ajax/submit.ftl
Author: mrdon
Date: Fri Dec 8 00:53:35 2006
New Revision: 483888
URL: http://svn.apache.org/viewvc?view=rev&rev=483888
Log:
Fixed ajax submit button to include control headers/footers
Modified:
struts/struts2/trunk/core/src/main/resources/template/ajax/submit.ftl
Modified: struts/struts2/trunk/core/src/main/resources/template/ajax/submit.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/ajax/submit.ftl?view=diff&rev=483888&r1=483887&r2=483888
==
--- struts/struts2/trunk/core/src/main/resources/template/ajax/submit.ftl
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/ajax/submit.ftl Fri
Dec 8 00:53:35 2006
@@ -1,3 +1,9 @@
+
+
+<#if parameters.align?exists>
+align="${parameters.align?html}"<#t/>
+
+><#t/>
<#if parameters.type?exists && parameters.type=="button">
<#include "/${parameters.templateDir}/ajax/ajax-common.ftl"/>
@@ -30,3 +36,6 @@
<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
/>
+
+<#t/>
+<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" />
svn commit: r484626 - in /struts/struts2/trunk: apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/ apps/showcase/src/main/resources/ apps/showcase/src/main/webapp/xslt/ core/src/main/java/o
Author: ddewolf
Date: Fri Dec 8 07:02:24 2006
New Revision: 484626
URL: http://svn.apache.org/viewvc?view=rev&rev=484626
Log:
Providing a mechanism which allows only portions of the action to be
exposed/converted to XML by the XSLT result
Added:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java
(with props)
struts/struts2/trunk/apps/showcase/src/main/resources/struts-xslt.xml
(with props)
struts/struts2/trunk/apps/showcase/src/main/webapp/xslt/
struts/struts2/trunk/apps/showcase/src/main/webapp/xslt/environment.xsl
struts/struts2/trunk/apps/showcase/src/main/webapp/xslt/index.jsp (with
props)
Modified:
struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
Added:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java?view=auto&rev=484626
==
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java
(added)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java
Fri Dec 8 07:02:24 2006
@@ -0,0 +1,83 @@
+package org.apache.struts2.showcase.xslt;
+
+import java.util.Map;
+import java.util.Properties;
+
+import com.opensymphony.xwork2.ActionSupport;
+
+import org.apache.struts2.interceptor.ServletRequestAware;
+
+import javax.servlet.http.HttpServletRequest;
+
+public class JVMAction implements ServletRequestAware {
+
+private ImportantInfo info;
+private Map environment;
+
+/** Captured only to show that undesired data can creep into the result. */
+private HttpServletRequest servletRequest;
+
+
+public String execute() {
+environment = System.getenv();
+Properties props = System.getProperties();
+
+String classpath = environment.get("CLASSPATH");
+info = new ImportantInfo(classpath, props);
+
+return ActionSupport.SUCCESS;
+}
+
+
+public HttpServletRequest getServletRequest() {
+return servletRequest;
+}
+
+public void setServletRequest(HttpServletRequest servletRequest) {
+this.servletRequest = servletRequest;
+}
+
+public Map getEnvironment() {
+return environment;
+}
+
+public void setEnvironment(Map environment) {
+this.environment = environment;
+}
+
+
+public ImportantInfo getInfo() {
+return info;
+}
+
+public void setInfo(ImportantInfo info) {
+this.info = info;
+}
+
+public class ImportantInfo {
+private String classpath;
+private Properties systemProperties;
+
+
+public ImportantInfo(String classpath, Properties properties) {
+this.classpath = classpath;
+this.systemProperties = properties;
+}
+
+public String getClasspath() {
+return classpath;
+}
+
+public void setClasspath(String classpath) {
+this.classpath = classpath;
+}
+
+public Properties getSystemProperties() {
+return systemProperties;
+}
+
+public void setSystemProperties(Properties systemProperties) {
+this.systemProperties = systemProperties;
+}
+}
+}
Propchange:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java
--
svn:eol-style = native
Propchange:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java
--
svn:keywords = Id Author Date Rev
Added: struts/struts2/trunk/apps/showcase/src/main/resources/struts-xslt.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-xslt.xml?view=auto&rev=484626
==
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-xslt.xml
(added)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-xslt.xml Fri
Dec 8 07:02:24 2006
@@ -0,0 +1,40 @@
+
+
+http://struts.apache.org/dtds/struts-2.0.dtd";>
+
+
+
+
+
+
+index.jsp
+
+
+
+
+info.classpath
+
+
+
+
+
+info
+
+
+
+
+
+
+
+
+
+/xslt/environment.xsl
+
+
+
+
+
+
+
Propchange:
struts/struts
svn commit: r484628 - /struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java
Author: ddewolf Date: Fri Dec 8 07:03:59 2006 New Revision: 484628 URL: http://svn.apache.org/viewvc?view=rev&rev=484628 Log: Adding license to new class Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java?view=diff&rev=484628&r1=484627&r2=484628 == --- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java (original) +++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java Fri Dec 8 07:03:59 2006 @@ -1,3 +1,23 @@ +/* + * $Id$ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.struts2.showcase.xslt; import java.util.Map;
svn commit: r484629 - /struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs
Author: husted
Date: Fri Dec 8 07:04:55 2006
New Revision: 484629
URL: http://svn.apache.org/viewvc?view=rev&rev=484629
Log:
Extend support for flipping to a page in the datagrid, based on a key field.
Clients can override ExecuteList to specify the name of the key field.
Modified:
struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs
Modified: struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs?view=diff&rev=484629&r1=484628&r2=484629
==
--- struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs Fri Dec 8
07:04:55 2006
@@ -593,41 +593,56 @@
///
- /// Store the item key field name.
+ /// Obtain the item key field name.
///
/// The context to examine
- /// The name of the item key field
+ /// Name of key field
///
- protected void SetItemKey(IDictionary context, string key)
+ protected object GetItemKey(IDictionary context)
{
- context[ITEM_KEY] = key;
+ if (context==null) return null;
+ return context[ITEM_KEY];
}
///
- /// Obtain the item key field name.
+ /// Store the item key field name.
///
/// The context to examine
- /// Name of key field
+ /// The name of the item key field
///
- protected object GetItemKey(IDictionary context)
+ protected void SetItemKey(IDictionary context, string key)
{
- return context[ITEM_KEY];
+ if (context!=null) context[ITEM_KEY] = key;
}
///
- /// Obtain the item page from Helper, or zero if no page set.
+ /// Obtain the item key value for Helper.
///
/// The context to examine
/// Current page number within data set
///
protected object GetItemKeyValue(IDictionary context)
{
+ if (context==null) return null;
object key = context[ITEM_KEY];
if (key==null) return null;
return context[key];
}
///
+ /// Update the item key value for Helper, especially to clear
on Add.
+ ///
+ /// The context to examine
+ /// Current page number within data set
+ ///
+ protected void SetItemKeyValue(IDictionary context, string val)
+ {
+ if (context==null) return;
+ object key = context[ITEM_KEY];
+ if (key!=null) context[key] = val;
+ }
+
+ ///
/// Configure the DataGrid for initial display.
///
/// The Helper with an outcome to bind as
a DataSource
@@ -1315,6 +1330,7 @@
{
if (View_Add != null)
{
+ SetItemKeyValue(list_Criteria, null);
FindArgs f = new FindArgs(e, list_Criteria);
View_Add(sender, f);
}
svn commit: r484695 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
Author: mrdon
Date: Fri Dec 8 10:38:58 2006
New Revision: 484695
URL: http://svn.apache.org/viewvc?view=rev&rev=484695
Log:
Fixed max file size in file upload to actually limit files
WW-1549
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java?view=diff&rev=484695&r1=484694&r2=484695
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
Fri Dec 8 10:38:58 2006
@@ -77,7 +77,8 @@
public void parse(HttpServletRequest servletRequest, String saveDir)
throws IOException {
DiskFileItemFactory fac = new DiskFileItemFactory();
-fac.setSizeThreshold((int)maxSize);
+// Make sure that the data is written to file
+fac.setSizeThreshold(0);
if (saveDir != null) {
fac.setRepository(new File(saveDir));
}
@@ -85,6 +86,7 @@
// Parse the request
try {
ServletFileUpload upload = new ServletFileUpload(fac);
+upload.setSizeMax(maxSize);
List items =
upload.parseRequest(createRequestContext(servletRequest));
for (Object item1 : items) {
svn commit: r484717 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/dispatcher/ main/java/org/apache/struts2/views/velocity/ test/java/org/apache/struts2/dispatcher/ test/java/org/ap
Author: mrdon
Date: Fri Dec 8 11:57:59 2006
New Revision: 484717
URL: http://svn.apache.org/viewvc?view=rev&rev=484717
Log:
Fixed submit unit tests, file upload test, date picker test, improved
dispatcher cleanup
WW-1538 WW-1544
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/DatePickerTagTest-1.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-1.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-2.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-3.txt
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java?view=diff&rev=484717&r1=484716&r2=484717
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java
Fri Dec 8 11:57:59 2006
@@ -35,6 +35,7 @@
import org.apache.commons.logging.LogFactory;
import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.util.profiling.UtilTimerStack;
/**
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=484717&r1=484716&r2=484717
==
---
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
Fri Dec 8 11:57:59 2006
@@ -168,6 +168,17 @@
*/
public static void setInstance(Dispatcher instance) {
Dispatcher.instance.set(instance);
+
+if (instance != null) {
+Container cont = instance.getContainer();
+if (cont != null) {
+
ObjectFactory.setObjectFactory(cont.getInstance(ObjectFactory.class));
+} else {
+LOG.warn("This dispatcher instance doesn't have a container,
so the object factory won't be set.");
+}
+} else {
+ObjectFactory.setObjectFactory(null);
+}
}
/**
@@ -258,6 +269,7 @@
LOG.error("exception occurred while destroying ObjectFactory
["+objectFactory+"]", e);
}
}
+ObjectFactory.setObjectFactory(null);
// clean up Dispatcher itself
instance.set(null);
@@ -815,6 +827,16 @@
* @return Our dependency injection container
*/
public Container getContainer() {
-return getConfigurationManager().getConfiguration().getContainer();
+ConfigurationManager mgr = getConfigurationManager();
+if (mgr == null) {
+throw new IllegalStateException("The configuration manager
shouldn't be null");
+} else {
+Configuration config = mgr.getConfiguration();
+if (config == null) {
+throw new IllegalStateException("Unable to load
configuration");
+} else {
+return config.getContainer();
+}
+}
}
}
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java?view=diff&rev=484717&r1=484716&r2=484717
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
Fri Dec 8 11:57:59 2006
@@ -105,8 +105,8 @@
*/
public class VelocityManager {
private static final Log log = LogFactory.getLog(VelocityManager.class);
-private static VelocityManager instance;
public static final Strin
svn commit: r484718 - /struts/struts2/trunk/core/pom.xml
Author: mrdon Date: Fri Dec 8 11:58:24 2006 New Revision: 484718 URL: http://svn.apache.org/viewvc?view=rev&rev=484718 Log: Moving xwork dep to snapshot, since rc1 will be rolled tomorrow WW-1483 Modified: struts/struts2/trunk/core/pom.xml Modified: struts/struts2/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?view=diff&rev=484718&r1=484717&r2=484718 == --- struts/struts2/trunk/core/pom.xml (original) +++ struts/struts2/trunk/core/pom.xml Fri Dec 8 11:58:24 2006 @@ -139,7 +139,7 @@ opensymphony xwork -2.0-beta-3 +2.0-SNAPSHOT
svn commit: r484733 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
Author: mrdon
Date: Fri Dec 8 12:16:16 2006
New Revision: 484733
URL: http://svn.apache.org/viewvc?view=rev&rev=484733
Log:
Tied object factory instance to dispatcher instance
WW-1544
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=484733&r1=484732&r2=484733
==
---
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
Fri Dec 8 12:16:16 2006
@@ -169,6 +169,7 @@
public static void setInstance(Dispatcher instance) {
Dispatcher.instance.set(instance);
+// Tie the ObjectFactory threadlocal instance to this Dispatcher
instance
if (instance != null) {
Container cont = instance.getContainer();
if (cont != null) {
@@ -251,12 +252,12 @@
}
/**
- * Release local threads and destroy any DispatchListeners.
+ * Releases all instances bound to this dispatcher instance.
*/
public void cleanup() {
// clean up ObjectFactory
-ObjectFactory objectFactory = ObjectFactory.getObjectFactory();
+ObjectFactory objectFactory =
getContainer().getInstance(ObjectFactory.class);
if (objectFactory == null) {
LOG.warn("Object Factory is null, something is seriously wrong, no
clean up will be performed");
}
@@ -269,9 +270,8 @@
LOG.error("exception occurred while destroying ObjectFactory
["+objectFactory+"]", e);
}
}
-ObjectFactory.setObjectFactory(null);
-// clean up Dispatcher itself
+// clean up Dispatcher itself for this thread
instance.set(null);
// clean up DispatcherListeners
svn commit: r484741 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
Author: mrdon
Date: Fri Dec 8 12:22:37 2006
New Revision: 484741
URL: http://svn.apache.org/viewvc?view=rev&rev=484741
Log:
Fixed the filter test, ensured the portlet dispatcher cleans up after itself
WW-1544
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java?view=diff&rev=484741&r1=484740&r2=484741
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
Fri Dec 8 12:22:37 2006
@@ -390,12 +390,12 @@
Map sessionMap, Map applicationMap, String portletNamespace,
Integer phase) throws PortletException {
LOG.debug("serviceAction");
-Dispatcher.setInstance(dispatcherUtils);
HashMap extraContext = createContextMap(requestMap, parameterMap,
sessionMap, applicationMap, request, response,
getPortletConfig(), phase);
String actionName = mapping.getName();
String namespace = mapping.getNamespace();
+Dispatcher.setInstance(dispatcherUtils);
try {
LOG.debug("Creating action proxy for name = " + actionName
+ ", namespace = " + namespace);
@@ -431,6 +431,8 @@
LOG.error("Could not execute action", e);
throw new PortletException("Error executing action " + actionName,
e);
+} finally {
+Dispatcher.setInstance(null);
}
}
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java?view=diff&rev=484741&r1=484740&r2=484741
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
Fri Dec 8 12:22:37 2006
@@ -46,6 +46,8 @@
import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.inject.ContainerBuilder;
+import com.opensymphony.xwork2.inject.Context;
+import com.opensymphony.xwork2.inject.Factory;
/**
* FilterDispatcher TestCase.
@@ -83,11 +85,26 @@
public void testObjectFactoryDestroy() throws Exception {
-FilterDispatcher filterDispatcher = new FilterDispatcher();
+final InnerDestroyableObjectFactory destroyedObjectFactory = new
InnerDestroyableObjectFactory();
+FilterDispatcher filterDispatcher = new FilterDispatcher() {
+@Override
+protected Dispatcher createDispatcher(FilterConfig cfg) {
+return new Dispatcher(cfg.getServletContext(), new HashMap()) {
+Container cont = new ContainerBuilder()
+.factory(ObjectFactory.class, new Factory() {
+public Object create(Context context) throws
Exception { return destroyedObjectFactory; }
+})
+.create(false);
+
+@Override
+public Container getContainer() {
+return cont;
+}
+};
+}
+};
filterDispatcher.init(new MockFilterConfig((ServletContext) null));
-InnerDestroyableObjectFactory destroyedObjectFactory = new
InnerDestroyableObjectFactory();
-ObjectFactory.setObjectFactory(destroyedObjectFactory);
-
+
assertFalse(destroyedObjectFactory.destroyed);
filterDispatcher.destroy();
assertTrue(destroyedObjectFactory.destroyed);
[Struts Wiki] Update of "StrutsReleasePlans" by Paul Benedict
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Struts Wiki" for change notification. The following page has been changed by Paul Benedict: http://wiki.apache.org/struts/StrutsReleasePlans -- * StrutsActionRelease132 - ''Struts Action Version 1.3.2'' * StrutsActionRelease133 - ''Struts Action Version 1.3.3'' (Test Build) * StrutsActionRelease134 - ''Struts Action Version 1.3.4'' (Beta) - * StrutsRelease135 - ''Struts Version 1.3.5'' (Beta) + * StrutsRelease135 - ''Struts Version 1.3.5'' + * StrutsRelease136 - ''Struts Version 1.3.6'' = 1.2.x = * StrutsRelease122 - ''Struts Version 1.2.2''
[Struts Wiki] Update of "StrutsRelease136" by Paul Benedict
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Struts Wiki" for change notification. The following page has been changed by Paul Benedict: http://wiki.apache.org/struts/StrutsRelease136 New page: = Struts 1.3.6 Release = == Info == 1. Struts [http://struts.apache.org/releases.html#Releases Release Guidelines] 2. [http://wiki.apache.org/incubator/SigningReleases Signing Releases] 3. Apache [http://apache.org/dev/mirrors.html Mirroring Guidelines] == Release Manager == The release managers are '''Ted Husted''' == How to Help == Everyone in the Struts community, users, developers, and committers, is encouraged to test a release, report any issues, and post to dev@ any comments on the overall quality of the release. '''The Struts 1.3.6 distribution is available here:''' http://people.apache.org/builds/struts/1.3.6 To help everyone get started with Struts 1.3.6, here are the simplest installation instructions that can possibly work: * Download the Struts 1.3.6 distribution * Extract the distribution to a likely location (/opt/struts-1.3.6). * If possible, try the JARs in a 1.2.x application that already compiles WITHOUT deprecations. * Deploy and play-test the example applications from the /webapps folder to your web container * '''If you see any error messages,''' please do a quick search of the mail archives and/or post them on the Dev list, and if they appear to be newly introduced issues, a JIRA tickets will need to be created so we can track and resolve the issue as quickly as possible. * Vesion 1.3.6 is tagged. The issue can be logged against 1.3.6, but the fix would happen in 1.3.7 or later. * Change to the /docs directory and click-thru the documentation. If you notice anything awry, follow the "error messages" advice. To test building Struts 1.3.6 * Install Java 1.4 or later and set JAVA_HOME * Install Maven 2 and set MAVEN_HOME ** http://wiki.apache.org/struts/StrutsMaintenanceMaven * Change to the new folder (e.g., /opt/struts-1.3.5/src) * $ mvn install * Wait five minutes or more for Maven to download and build everything * $ cd assmbly * $ mvn assembly:assembly * The distribution will be deposited in 'assembly/target/assembly/out'. * If you encounter any problems with the build, follow the "error messages" advice. * Oh, and THANK YOU for your help. :) == Issues == * [http://issues.apache.org/struts/secure/IssueNavigator.jspa?reset=true&mode=hide&sorter/order=DESC&sorter/field=priority&resolution=-1&pid=10121&fixfor=21721 Unresolved Issues] (zero when tagged) * [https://issues.apache.org/struts/secure/ReleaseNote.jspa?projectId=10121&styleName=Html&version=21731 JIRA Release Notes] * [https://issues.apache.org/struts/secure/IssueNavigator.jspa?reset=true&pid=10121&fixfor=21731 All issues marked 'Affects 1.3.5'] == TO DO == == Preparation Checklist == || '''#''' || '''Description''' || '''Status''' || || 1. || Announce plan to dev@ list || || || 2. || Review/Resolve Outstanding Bugs || || || 3. || Update Release Notes || || || 4. || Check Dependencies || || The Commons [http://jakarta.apache.org/commons/releases/prepare.html Preparation Guide] is a helpful preparation backgrounder, but Commons uses the "beta/release-candidate/final" process. Likewise, the [http://httpd.apache.org/dev/release.html HTTPD Release Guidelines] is a helpful "overall process" backgrounder, but HTTPD does not use a test-build stage. External Dependency versions for this release: || '''Dependency''' || '''Version''' || '''Status''' ||'''Used In''' || || Antlr || 2.7.2 || Released || Struts Validator || || Bean Scripting Framework || 2.3.0 || Released || Scripting || || Commons !BeanUtils || 1.7.0 || Released || core (!ActionServlet, configuration, !DynaActionForm) || || Commons Chain || 1.0 || Released || core (!RequestProcessor) || || Commons Digester || 1.8 || Released || core (!ActionServlet, configuration) || || Commons !FileUpload || 1.1 || Released || Struts Upload || || Commons IO || 1.1 || Released || Required by Commons !FileUpload || || Commons Logging || 1.0.4 || Released || core (logging all over) || || Commons Validator || 1.3.0 || Released || Struts Validator || || Jakarta Oro || 2.0.8 || Released || Commons Validator || == Testing Checklist == === Testing Summary === || '''#''' || '''Description''' || '''Completed''' || || 1. || Run Unit Test targets || || || 2. || Run Cactus Tests (see below) || NA || || 3. || Play test applications (TC 5.5.x) || || '''Note:''' Cactus tests are not working and have been moved to the sandbox. == Test Build Checklist (A) == See also Commons [http://jakarta.apache.org/commons/releases/release.html Step-by-Step Guide] || '''#''' || '''Description''' || '''Completed''' || || A0. || Update all pom.xml files to omit "-SNAPSHOT" || || || A1. || Tag release in svn: STRUTS_1_3_6 || || || A2. || Check out a clean copy using the 'tag' created in A1 and see Str
[Struts Wiki] Update of "StrutsRelease136" by Paul Benedict
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Struts Wiki" for change notification. The following page has been changed by Paul Benedict: http://wiki.apache.org/struts/StrutsRelease136 -- == Release Manager == - The release managers are '''Ted Husted''' + The release managers are '''Ted Husted and Paul Benedict''' == How to Help == @@ -57, +57 @@ == Preparation Checklist == || '''#''' || '''Description''' || '''Status''' || - || 1. || Announce plan to dev@ list || || + || 1. || Announce plan to dev@ list || (./) || - || 2. || Review/Resolve Outstanding Bugs || || + || 2. || Review/Resolve Outstanding Bugs || (./) || - || 3. || Update Release Notes || || + || 3. || Update Release Notes || (./) || - || 4. || Check Dependencies || || + || 4. || Check Dependencies || (./) || The Commons [http://jakarta.apache.org/commons/releases/prepare.html Preparation Guide] is a helpful preparation backgrounder, but Commons uses the "beta/release-candidate/final" process. @@ -74, +74 @@ || Antlr || 2.7.2 || Released || Struts Validator || || Bean Scripting Framework || 2.3.0 || Released || Scripting || || Commons !BeanUtils || 1.7.0 || Released || core (!ActionServlet, configuration, !DynaActionForm) || - || Commons Chain || 1.0 || Released || core (!RequestProcessor) || + || Commons Chain || 1.1 || Released || core (!RequestProcessor) || || Commons Digester || 1.8 || Released || core (!ActionServlet, configuration) || - || Commons !FileUpload || 1.1 || Released || Struts Upload || + || Commons !FileUpload || 1.1.1 || Released || Struts Upload || || Commons IO || 1.1 || Released || Required by Commons !FileUpload || || Commons Logging || 1.0.4 || Released || core (logging all over) || - || Commons Validator || 1.3.0 || Released || Struts Validator || + || Commons Validator || 1.3.1 || Released || Struts Validator || || Jakarta Oro || 2.0.8 || Released || Commons Validator || == Testing Checklist == @@ -87, +87 @@ === Testing Summary === || '''#''' || '''Description''' || '''Completed''' || - || 1. || Run Unit Test targets || || + || 1. || Run Unit Test targets || (./) || || 2. || Run Cactus Tests (see below) || NA || || 3. || Play test applications (TC 5.5.x) || ||
svn commit: r484899 - /struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java
Author: mrdon
Date: Fri Dec 8 19:02:39 2006
New Revision: 484899
URL: http://svn.apache.org/viewvc?view=rev&rev=484899
Log:
Fixed token examples
WW-1538
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java?view=diff&rev=484899&r1=484898&r2=484899
==
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java
Fri Dec 8 19:02:39 2006
@@ -53,7 +53,7 @@
return SUCCESS;
}
-public String doInput() throws Exception {
+public String input() throws Exception {
// prepare input form
Integer balSource = (Integer)
ActionContext.getContext().getSession().get("balanceSource");
Integer balDest = (Integer)
ActionContext.getContext().getSession().get("balanceDestination");
