[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache CXF 2.0 Documentation (CXF20DOC) http://cwiki.apache.org/confluence/display/CXF20DOC | |-Pages Added or Edited in This Space |-- MTOM was last edited by mazzag (10:09 PM). | http://cwiki.apache.org/confluence/display/CXF20DOC/MTOM |-- MTOM Attachments was last edited by mazzag (10:08 PM). | http://cwiki.apache.org/confluence/display/CXF20DOC/MTOM+Attachments |-- HTTP Binding was last edited by jeff.yu (09:43 PM). | http://cwiki.apache.org/confluence/display/CXF20DOC/HTTP+Binding Apache Struts 2 Plugin Registry (S2PLUGINS) http://cwiki.apache.org/confluence/display/S2PLUGINS | |-Pages Added or Edited in This Space |-- JSON Plugin was last edited by musachy (07:06 AM). | http://cwiki.apache.org/confluence/display/S2PLUGINS/JSON+Plugin Apache Geronimo Project Management (GMOxPMGT) http://cwiki.apache.org/confluence/display/GMOxPMGT | |-Pages Added or Edited in This Space |-- SNAPSHOT dependencies that need to be released for Geronimo 2.0 was last edited by pkashyap (09:57 AM). | http://cwiki.apache.org/confluence/display/GMOxPMGT/SNAPSHOT+dependencies+that+need+to+be+released+for+Geronimo+2.0 Apache ServiceMix (SM) http://cwiki.apache.org/confluence/display/SM | |-Pages Added or Edited in This Space |-- WSDL First was last edited by bsnyder (02:52 PM). | http://cwiki.apache.org/confluence/display/SM/WSDL+First |-- servicemix-file was last edited by gordonad (10:47 AM). | http://cwiki.apache.org/confluence/display/SM/servicemix-file Apache Web services (WS) http://cwiki.apache.org/confluence/display/WS | |-Pages Added or Edited in This Space |-- Configuration and Policy was created by [EMAIL PROTECTED] (08:40 AM). | http://cwiki.apache.org/confluence/display/WS/Configuration+and+Policy |-- Sandesha Architecture Home was last edited by [EMAIL PROTECTED] (08:30 AM). | http://cwiki.apache.org/confluence/display/WS/Sandesha+Architecture+Home UIMA (UIMA) http://cwiki.apache.org/confluence/display/UIMA | |-Pages Added or Edited in This Space |-- TestPlan2.2 was last edited by alally (01:43 PM). | http://cwiki.apache.org/confluence/display/UIMA/TestPlan2.2 Apache MINA (MINA) http://cwiki.apache.org/confluence/display/MINA | |-Pages Added or Edited in This Space |-- Navigation was created by trustin (10:42 PM). | http://cwiki.apache.org/confluence/display/MINA/Navigation |-- Site Template was created by trustin (11:41 PM). | http://cwiki.apache.org/confluence/display/MINA/Site+Template |-- Apache MINA 1.0.4 and 1.1.1 Released was created by trustin (11:30 PM). | http://cwiki.apache.org/confluence/display/MINA/2007/07/18/Apache+MINA+1.0.4+and+1.1.1+Released |-- Index was last edited by trustin (11:14 PM). | http://cwiki.apache.org/confluence/display/MINA/Index |-- FAQ was last edited by trustin (09:17 PM). | http://cwiki.apache.org/confluence/display/MINA/FAQ |-- Contact was last edited by trustin (09:04 PM). | http://cwiki.apache.org/confluence/display/MINA/Contact |-- Downloads was last edited by trustin (08:02 PM). | http://cwiki.apache.org/confluence/display/MINA/Downloads Apache Tuscany (TUSCANY) http://cwiki.apache.org/confluence/display/TUSCANY | |-Pages Added or Edited in This Space |-- SCA Java binding.jsonrpc was last edited by ant (02:53 PM). | http://cwiki.apache.org/confluence/display/TUSCANY/SCA+Java+binding.jsonrpc |-- SCA Java binding.ajax was last edited by ant (02:46 PM). | http://cwiki.apache.org/confluence/display/TUSCANY/SCA+Java+binding.ajax |-- Making releases was last edited by ant (06:00 AM). | http://cwiki.apache.org/confluence/display/TUSCANY/Making+releases Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET | |-Pages Added or Edited in This Space |-- Control where HTML files are loaded from was last edited by darose (11:20 PM). | http://cwiki.apache.org/confluence/display/WICKET/Control+where+HTML+files+are+loaded+from |-- FAQs was last edited by landtuna (06:35 PM). | http://cwiki.apache.org/confluence/display/WICKET/FAQs - 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: r557511 - /struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesPlugin.java
Author: pbenedict
Date: Thu Jul 19 00:43:03 2007
New Revision: 557511
URL: http://svn.apache.org/viewvc?view=rev&rev=557511
Log:
STR-1870: Add debug log message to explain initialization strategy (reinforce
javadoc explanation)
Modified:
struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesPlugin.java
Modified:
struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesPlugin.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesPlugin.java?view=diff&rev=557511&r1=557510&r2=557511
==
---
struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesPlugin.java
(original)
+++
struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesPlugin.java
Thu Jul 19 00:43:03 2007
@@ -151,6 +151,8 @@
private void initTilesUtil() throws ServletException {
if (TilesUtil.isTilesUtilImplSet()) {
+log.debug("Skipping re-init of Tiles Plugin. Values defined in the
" +
+"first initialized plugin take precedence.");
return;
}
svn commit: r557614 - /struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/URL.java
Author: jholmes
Date: Thu Jul 19 06:28:49 2007
New Revision: 557614
URL: http://svn.apache.org/viewvc?view=rev&rev=557614
Log:
Fix some typos and bad english.
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/URL.java
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/URL.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/URL.java?view=diff&rev=557614&r1=557613&r2=557614
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/URL.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/URL.java
Thu Jul 19 06:28:49 2007
@@ -293,7 +293,7 @@
this.value = value;
}
-@StrutsTagAttribute(description="he action generate url for, if not using
value")
+@StrutsTagAttribute(description="The action to generate the URL for, if
not using value")
public void setAction(String action) {
this.action = action;
}
@@ -313,7 +313,7 @@
this.encode = encode;
}
-@StrutsTagAttribute(description="Whether actual context should be included
in url", type="Boolean", defaultValue="true")
+@StrutsTagAttribute(description="Whether actual context should be included
in URL", type="Boolean", defaultValue="true")
public void setIncludeContext(boolean includeContext) {
this.includeContext = includeContext;
}
@@ -328,7 +328,7 @@
this.windowState = windowState;
}
-@StrutsTagAttribute(description="Specifies if this should be a portlet
render or action url")
+@StrutsTagAttribute(description="Specifies if this should be a portlet
render or action URL")
public void setPortletUrlType(String portletUrlType) {
this.portletUrlType = portletUrlType;
}
svn commit: r557616 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java
Author: jholmes
Date: Thu Jul 19 06:35:21 2007
New Revision: 557616
URL: http://svn.apache.org/viewvc?view=rev&rev=557616
Log:
Fix some typos and bad english.
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java?view=diff&rev=557616&r1=557615&r2=557616
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java
Thu Jul 19 06:35:21 2007
@@ -250,7 +250,7 @@
this.value = value;
}
-@StrutsTagAttribute(description="he action generate url for, if not using
value")
+@StrutsTagAttribute(description="The action to generate the URL for, if
not using value")
public void setAction(String action) {
this.action = action;
}
@@ -270,7 +270,7 @@
this.encode = encode;
}
-@StrutsTagAttribute(description="Whether actual context should be included
in url", type="Boolean", defaultValue="true")
+@StrutsTagAttribute(description="Whether actual context should be included
in URL", type="Boolean", defaultValue="true")
public void setIncludeContext(boolean includeContext) {
this.includeContext = includeContext;
}
@@ -285,7 +285,7 @@
this.windowState = windowState;
}
-@StrutsTagAttribute(description="Specifies if this should be a portlet
render or action url")
+@StrutsTagAttribute(description="Specifies if this should be a portlet
render or action URL")
public void setPortletUrlType(String portletUrlType) {
this.portletUrlType = portletUrlType;
}
svn commit: r557620 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java
Author: jholmes Date: Thu Jul 19 06:44:03 2007 New Revision: 557620 URL: http://svn.apache.org/viewvc?view=rev&rev=557620 Log: More doc fixes. Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java?view=diff&rev=557620&r1=557619&r2=557620 == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java Thu Jul 19 06:44:03 2007 @@ -47,16 +47,16 @@ * * This tag is used to create a URL. * - * You can use the "param" tag inside the body to provide + * You can use the tag inside the body to provide * additional request parameters. If the value of a param is an Array or * an Iterable all the values will be added to the URL. * * NOTE: - * When includeParams is 'all' or 'get', the parameter defined in param tag will take + * When includeParams is 'all' or 'get', the parameter defined in tag will take * precedence and will not be overriden if they exists in the parameter submitted. For * example, in Example 3 below, if there is a id parameter in the url where the page this - * tag is included like http://://editUser.action?id=&name=John - * the generated url will be http://:/context>/editUser.action?id=22&name=John + * tag is included like http://: / /editUser.action?id=&name=John + * the generated url will be http:// : / /editUser.action?id=22&name=John * cause the parameter defined in the param tag will take precedence. * *
svn commit: r557624 - /struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/resources/struts.xml
Author: jholmes
Date: Thu Jul 19 06:49:57 2007
New Revision: 557624
URL: http://svn.apache.org/viewvc?view=rev&rev=557624
Log:
WW-2020 bug in struts.xml of the portlet demo (bad result URL)
This is a backport of the fix made on the trunk for 2.1.
Modified:
struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/resources/struts.xml
Modified:
struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/resources/struts.xml?view=diff&rev=557624&r1=557623&r2=557624
==
---
struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/resources/struts.xml
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/resources/struts.xml
Thu Jul 19 06:49:57 2007
@@ -129,7 +129,7 @@
- /WEB-INF/edtt/formExampleInput.jsp
+ /WEB-INF/edit/formExampleInput.jsp
/edit/processFormExampleForward.action?firstName=${firstName}&lastName=${lastName}
svn commit: r557637 - /struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
Author: jholmes
Date: Thu Jul 19 07:20:13 2007
New Revision: 557637
URL: http://svn.apache.org/viewvc?view=rev&rev=557637
Log:
WW-1854 XSLTResult excludingPattern Property is Missing
This is a backport of the fix made on the trunk for 2.1.
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java?view=diff&rev=557637&r1=557636&r2=557637
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
Thu Jul 19 07:20:13 2007
@@ -100,7 +100,7 @@
*
*
*
- * Without it there would be an endless x/y/x/y/x/y/... elements.
+ * Without it there would be endless x/y/x/y/x/y/... elements.
*
*
*
@@ -231,7 +231,7 @@
private String matchingPattern;
/** Indicates the property name patterns which should be excluded from the
xml. */
-private String exludingPattern;
+private String excludingPattern;
/** Indicates the ognl expression respresenting the bean which is to be
exposed as xml. */
private String exposedValue;
@@ -285,12 +285,12 @@
this.matchingPattern = matchingPattern;
}
-public String getExludingPattern() {
-return exludingPattern;
+public String getExcludingPattern() {
+return excludingPattern;
}
-public void setExludingPattern(String exludingPattern) {
-this.exludingPattern = exludingPattern;
+public void setExcludingPattern(String excludingPattern) {
+this.excludingPattern = excludingPattern;
}
/**
svn commit: r557639 - /struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/struts-default.xml
Author: jholmes Date: Thu Jul 19 07:23:05 2007 New Revision: 557639 URL: http://svn.apache.org/viewvc?view=rev&rev=557639 Log: WW-1850 struts-default package in struts-default.xml should be abstract This is a backport of the fix made on the trunk for 2.1. Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/struts-default.xml Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/struts-default.xml URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/struts-default.xml?view=diff&rev=557639&r1=557638&r2=557639 == --- struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/struts-default.xml (original) +++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/struts-default.xml Thu Jul 19 07:23:05 2007 @@ -48,7 +48,7 @@ - +
svn commit: r557644 - /struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/select.ftl
Author: jholmes
Date: Thu Jul 19 07:47:28 2007
New Revision: 557644
URL: http://svn.apache.org/viewvc?view=rev&rev=557644
Log:
WW-1887 struts template/simple/select.ftl error/fix
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/select.ftl
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/select.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/select.ftl?view=diff&rev=557644&r1=557643&r2=557644
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/select.ftl
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/select.ftl
Thu Jul 19 07:47:28 2007
@@ -57,7 +57,8 @@
<#else>
<#assign itemValue = stack.findString('top')/>
-
+<#assign itemKeyStr = itemKey.toString()/>
+
<#if tag.contains(parameters.nameValue, itemKey) == true>
selected="selected"<#rt/>
svn commit: r557647 - /struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl
Author: jholmes
Date: Thu Jul 19 07:51:31 2007
New Revision: 557647
URL: http://svn.apache.org/viewvc?view=rev&rev=557647
Log:
WW-1887 struts template/simple/select.ftl error/fix
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl?view=diff&rev=557647&r1=557646&r2=557647
==
--- struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl Thu
Jul 19 07:51:31 2007
@@ -57,7 +57,8 @@
<#else>
<#assign itemValue = stack.findString('top')/>
-
+<#assign itemKeyStr = itemKey.toString()/>
+
<#if tag.contains(parameters.nameValue, itemKey) == true>
selected="selected"<#rt/>
svn commit: r557568 - in /struts/struts2/trunk/core/src/main/resources: struts-default.xml struts-portlet-default.xml
Author: nilsga Date: Thu Jul 19 03:56:57 2007 New Revision: 557568 URL: http://svn.apache.org/viewvc?view=rev&rev=557568 Log: WW-1645 Refactored portlet support into a plugin. Some missing files from last commit. Removed: struts/struts2/trunk/core/src/main/resources/struts-portlet-default.xml Modified: struts/struts2/trunk/core/src/main/resources/struts-default.xml Modified: struts/struts2/trunk/core/src/main/resources/struts-default.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/struts-default.xml?view=diff&rev=557568&r1=557567&r2=557568 == --- struts/struts2/trunk/core/src/main/resources/struts-default.xml (original) +++ struts/struts2/trunk/core/src/main/resources/struts-default.xml Thu Jul 19 03:56:57 2007 @@ -39,6 +39,8 @@ + +
svn commit: r557689 - /struts/struts2/trunk/apps/portlet/src/main/resources/struts.xml
Author: jholmes Date: Thu Jul 19 10:02:15 2007 New Revision: 557689 URL: http://svn.apache.org/viewvc?view=rev&rev=557689 Log: Update to conform to the Struts 2 DTD instead of the XWork DTD. Modified: struts/struts2/trunk/apps/portlet/src/main/resources/struts.xml Modified: struts/struts2/trunk/apps/portlet/src/main/resources/struts.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/resources/struts.xml?view=diff&rev=557689&r1=557688&r2=557689 == --- struts/struts2/trunk/apps/portlet/src/main/resources/struts.xml (original) +++ struts/struts2/trunk/apps/portlet/src/main/resources/struts.xml Thu Jul 19 10:02:15 2007 @@ -1,8 +1,9 @@ - -http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";> - + +http://struts.apache.org/dtds/struts-2.0.dtd";> + + /WEB-INF/help/index.jsp - +
svn commit: r557691 - /struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/resources/struts.xml
Author: jholmes Date: Thu Jul 19 10:05:24 2007 New Revision: 557691 URL: http://svn.apache.org/viewvc?view=rev&rev=557691 Log: Update to conform to the Struts 2 DTD instead of the XWork DTD. Modified: struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/resources/struts.xml Modified: struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/resources/struts.xml URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/resources/struts.xml?view=diff&rev=557691&r1=557690&r2=557691 == --- struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/resources/struts.xml (original) +++ struts/struts2/branches/STRUTS_2_0_X/apps/portlet/src/main/resources/struts.xml Thu Jul 19 10:05:24 2007 @@ -1,8 +1,9 @@ - -http://www.opensymphony.com/xwork/xwork-1.1.1.dtd";> - + +http://struts.apache.org/dtds/struts-2.0.dtd";> + + /WEB-INF/help/index.jsp - +
svn commit: r557701 - in /struts/struts2/branches/STRUTS_2_0_X: assembly/pom.xml backport/translate.bat backport/translate.sh core/pom.xml
Author: hermanns
Date: Thu Jul 19 10:31:26 2007
New Revision: 557701
URL: http://svn.apache.org/viewvc?view=rev&rev=557701
Log:
Updating to xwork 2.0.4 release
o xwork 2.0.4 contains the fix for the critical security issue
(see https://issues.apache.org/struts/browse/WW-2030 for details)
Note: The xwork group id changed from 'opensymphony' to 'com.opensymphony'
Issue Number: WW-2030
Modified:
struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml
struts/struts2/branches/STRUTS_2_0_X/backport/translate.bat
struts/struts2/branches/STRUTS_2_0_X/backport/translate.sh
struts/struts2/branches/STRUTS_2_0_X/core/pom.xml
Modified: struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml?view=diff&rev=557701&r1=557700&r2=557701
==
--- struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml Thu Jul 19 10:31:26
2007
@@ -100,10 +100,10 @@
-opensymphony
+com.opensymphony
xwork
javadoc
-2.0.3
+2.0.4
${project.build.directory}/xwork-apidocs
Modified: struts/struts2/branches/STRUTS_2_0_X/backport/translate.bat
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/backport/translate.bat?view=diff&rev=557701&r1=557700&r2=557701
==
--- struts/struts2/branches/STRUTS_2_0_X/backport/translate.bat (original)
+++ struts/struts2/branches/STRUTS_2_0_X/backport/translate.bat Thu Jul 19
10:31:26 2007
@@ -1,2 +1,2 @@
java -jar retrotranslator-transformer-1.2.0.jar -advanced -srcjar
../lib/struts2-core-2.0.8.jar -destjar struts2-core-j4-2.0.8.jar
-java -jar retrotranslator-transformer-1.2.0.jar -advanced -srcjar
../lib/xwork-2.0.3.jar -destjar xwork-j4-2.0.3.jar
+java -jar retrotranslator-transformer-1.2.0.jar -advanced -srcjar
../lib/xwork-2.0.4.jar -destjar xwork-j4-2.0.4.jar
Modified: struts/struts2/branches/STRUTS_2_0_X/backport/translate.sh
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/backport/translate.sh?view=diff&rev=557701&r1=557700&r2=557701
==
--- struts/struts2/branches/STRUTS_2_0_X/backport/translate.sh (original)
+++ struts/struts2/branches/STRUTS_2_0_X/backport/translate.sh Thu Jul 19
10:31:26 2007
@@ -1,3 +1,3 @@
#!/bin/sh
java -jar retrotranslator-transformer-1.2.0.jar -advanced -srcjar
../lib/struts2-core-2.0.8.jar -destjar struts2-core-j4-2.0.8.jar
-java -jar retrotranslator-transformer-1.2.0.jar -advanced -srcjar
../lib/xwork-2.0.3.jar -destjar xwork-j4-2.0.3.jar
+java -jar retrotranslator-transformer-1.2.0.jar -advanced -srcjar
../lib/xwork-2.0.4.jar -destjar xwork-j4-2.0.4.jar
Modified: struts/struts2/branches/STRUTS_2_0_X/core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/pom.xml?view=diff&rev=557701&r1=557700&r2=557701
==
--- struts/struts2/branches/STRUTS_2_0_X/core/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/pom.xml Thu Jul 19 10:31:26 2007
@@ -33,9 +33,9 @@
-opensymphony
+com.opensymphony
xwork
-2.0.3
+2.0.4
sources
@@ -251,9 +251,9 @@
-opensymphony
+com.opensymphony
xwork
-2.0.3
+2.0.4
svn commit: r557702 - /struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/url.html
Author: hermanns Date: Thu Jul 19 10:32:48 2007 New Revision: 557702 URL: http://svn.apache.org/viewvc?view=rev&rev=557702 Log: Tag doc update Issue Number: WW-1974 Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/url.html Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/url.html URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/url.html?view=diff&rev=557702&r1=557701&r2=557702 == --- struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/url.html (original) +++ struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/url.html Thu Jul 19 10:32:48 2007 @@ -33,7 +33,7 @@ true String - he action generate url for, if not using value + The action to generate the URL for, if not using value anchor @@ -65,7 +65,7 @@ true true Boolean - Whether actual context should be included in url + Whether actual context should be included in URL includeParams @@ -105,7 +105,7 @@ true String - Specifies if this should be a portlet render or action url + Specifies if this should be a portlet render or action URL scheme
svn commit: r557726 - /struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl
Author: jholmes
Date: Thu Jul 19 11:40:16 2007
New Revision: 557726
URL: http://svn.apache.org/viewvc?view=rev&rev=557726
Log:
Fix test failures caused by the fix for WW-1887. FreeMarker was complaining
about the toString() call when it was applied to the value created by this tag:
<#assign itemKey = ''/>.
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl?view=diff&rev=557726&r1=557725&r2=557726
==
--- struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl Thu
Jul 19 11:40:16 2007
@@ -42,11 +42,14 @@
<#if parameters.listKey?exists>
<#if stack.findValue(parameters.listKey)?exists>
<#assign itemKey = stack.findValue(parameters.listKey)/>
+ <#assign itemKeyStr =
stack.findValue(parameters.listKey).toString()/>
<#else>
<#assign itemKey = ''/>
+ <#assign itemKeyStr = ''/>
<#else>
<#assign itemKey = stack.findValue('top')/>
+<#assign itemKeyStr = stack.findValue('top').toString()/>
<#if parameters.listValue?exists>
<#if stack.findString(parameters.listValue)?exists>
@@ -57,7 +60,6 @@
<#else>
<#assign itemValue = stack.findString('top')/>
-<#assign itemKeyStr = itemKey.toString()/>
<#if tag.contains(parameters.nameValue, itemKey) == true>
selected="selected"<#rt/>
svn commit: r557736 - /struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/select.ftl
Author: jholmes
Date: Thu Jul 19 11:57:37 2007
New Revision: 557736
URL: http://svn.apache.org/viewvc?view=rev&rev=557736
Log:
Fix test failures caused by the fix for WW-1887. FreeMarker was complaining
about the toString() call when it was applied to the value created by this tag:
<#assign itemKey = ''/>.
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/select.ftl
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/select.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/select.ftl?view=diff&rev=557736&r1=557735&r2=557736
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/select.ftl
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/select.ftl
Thu Jul 19 11:57:37 2007
@@ -42,11 +42,14 @@
<#if parameters.listKey?exists>
<#if stack.findValue(parameters.listKey)?exists>
<#assign itemKey = stack.findValue(parameters.listKey)/>
+ <#assign itemKeyStr = itemKey.toString()/>
<#else>
<#assign itemKey = ''/>
+ <#assign itemKeyStr = ''/>
<#else>
<#assign itemKey = stack.findValue('top')/>
+<#assign itemKeyStr = itemKey.toString()/>
<#if parameters.listValue?exists>
<#if stack.findString(parameters.listValue)?exists>
@@ -57,7 +60,6 @@
<#else>
<#assign itemValue = stack.findString('top')/>
-<#assign itemKeyStr = itemKey.toString()/>
<#if tag.contains(parameters.nameValue, itemKey) == true>
selected="selected"<#rt/>
svn commit: r557737 - /struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl
Author: jholmes
Date: Thu Jul 19 12:00:27 2007
New Revision: 557737
URL: http://svn.apache.org/viewvc?view=rev&rev=557737
Log:
Call toString() on itemKey instead of the output of stack.findValue().
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl?view=diff&rev=557737&r1=557736&r2=557737
==
--- struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl Thu
Jul 19 12:00:27 2007
@@ -42,14 +42,14 @@
<#if parameters.listKey?exists>
<#if stack.findValue(parameters.listKey)?exists>
<#assign itemKey = stack.findValue(parameters.listKey)/>
- <#assign itemKeyStr =
stack.findValue(parameters.listKey).toString()/>
+ <#assign itemKeyStr = itemKey.toString()/>
<#else>
<#assign itemKey = ''/>
<#assign itemKeyStr = ''/>
<#else>
<#assign itemKey = stack.findValue('top')/>
-<#assign itemKeyStr = stack.findValue('top').toString()/>
+<#assign itemKeyStr = itemKey.toString()/>
<#if parameters.listValue?exists>
<#if stack.findString(parameters.listValue)?exists>
svn commit: r557862 - /struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesPlugin.java
Author: pbenedict
Date: Thu Jul 19 20:57:57 2007
New Revision: 557862
URL: http://svn.apache.org/viewvc?view=rev&rev=557862
Log:
STR-1870: Fail fast when definition is duplicated
Modified:
struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesPlugin.java
Modified:
struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesPlugin.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesPlugin.java?view=diff&rev=557862&r1=557861&r2=557862
==
---
struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesPlugin.java
(original)
+++
struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesPlugin.java
Thu Jul 19 20:57:57 2007
@@ -213,14 +213,12 @@
moduleConfig);
if (definitionFactory != null) {
-log.info(
+throw new UnavailableException(
"Factory already exists for module '"
+ moduleConfig.getPrefix()
-+ "'. The factory found is from module '"
-+ definitionFactory.getConfig().getFactoryName()
-+ "'. No new creation.");
-
-return;
++ "' and cannot be redefined. " +
+"The factory found is from module '"
++ definitionFactory.getConfig().getFactoryName() + "'.");
}
// Create configurable factory
svn commit: r557863 - /struts/struts1/trunk/core/src/main/java/org/apache/struts/upload/FormFile.java
Author: pbenedict Date: Thu Jul 19 21:22:56 2007 New Revision: 557863 URL: http://svn.apache.org/viewvc?view=rev&rev=557863 Log: STR-2098: Clarify FileNotFoundException depends on underlying implementation Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/upload/FormFile.java Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/upload/FormFile.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/upload/FormFile.java?view=diff&rev=557863&r1=557862&r2=557863 == --- struts/struts1/trunk/core/src/main/java/org/apache/struts/upload/FormFile.java (original) +++ struts/struts1/trunk/core/src/main/java/org/apache/struts/upload/FormFile.java Thu Jul 19 21:22:56 2007 @@ -99,7 +99,9 @@ * [EMAIL PROTECTED] #getInputStream() getInputStream}. * * @return The file data as a byte array. - * @throws FileNotFoundException if the uploaded file is not found. + * @throws FileNotFoundException if the uploaded file is not found. Some + * implementations may not deal with files and/or throw + * this exception. * @throws IOException if an error occurred while reading the * file. */ @@ -110,7 +112,9 @@ * Returns an input stream for this file. The caller must close the * stream when it is no longer needed. * - * @throws FileNotFoundException if the uploaded file is not found. + * @throws FileNotFoundException if the uploaded file is not found. Some + * implementations may not deal with files and/or throw + * this exception. * @throws IOException if an error occurred while reading the * file. */
svn commit: r557865 - in /struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib: ./ bean/ html/ logic/
Author: pbenedict
Date: Thu Jul 19 22:00:07 2007
New Revision: 557865
URL: http://svn.apache.org/viewvc?view=rev&rev=557865
Log:
STR-2437: Add root cause to JspException
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/TagUtils.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/IncludeTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/ResourceTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/BaseHandlerTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/BaseTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/ImgTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/JavascriptValidatorTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/LinkTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/MultiboxTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/OptionsTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/RewriteTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/SelectTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/CompareTagBase.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/ForwardTag.java
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/RedirectTag.java
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/TagUtils.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/TagUtils.java?view=diff&rev=557865&r1=557864&r2=557865
==
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/TagUtils.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/TagUtils.java
Thu Jul 19 22:00:07 2007
@@ -884,11 +884,11 @@
} catch (IllegalAccessException e) {
saveException(pageContext, e);
throw new JspException(messages.getMessage("lookup.access",
-property, name));
+property, name), e);
} catch (IllegalArgumentException e) {
saveException(pageContext, e);
throw new JspException(messages.getMessage("lookup.argument",
-property, name));
+property, name), e);
} catch (InvocationTargetException e) {
Throwable t = e.getTargetException();
@@ -898,7 +898,7 @@
saveException(pageContext, t);
throw new JspException(messages.getMessage("lookup.target",
-property, name));
+property, name), e);
} catch (NoSuchMethodException e) {
saveException(pageContext, e);
@@ -916,7 +916,7 @@
}
throw new JspException(messages.getMessage("lookup.method",
-property, beanName));
+property, beanName), e);
}
}
@@ -1152,7 +1152,7 @@
writer.print(text);
} catch (IOException e) {
saveException(pageContext, e);
-throw new JspException(messages.getMessage("write.io",
e.toString()));
+throw new JspException(messages.getMessage("write.io",
e.toString()), e);
}
}
@@ -1176,7 +1176,7 @@
writer.print(text);
} catch (IOException e) {
saveException(pageContext, e);
-throw new JspException(messages.getMessage("write.io",
e.toString()));
+throw new JspException(messages.getMessage("write.io",
e.toString()), e);
}
}
}
Modified:
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/IncludeTag.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/IncludeTag.java?view=diff&rev=557865&r1=557864&r2=557865
==
---
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/IncludeTag.java
(original)
+++
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/IncludeTag.java
Thu Jul 19 22:00:07 2007
@@ -188,7 +188,7 @@
} catch (MalformedURLException e) {
TagUtils.getInstance().saveException(pageContext, e);
throw new JspException(messages.getMessage("include.url",
-e.toString()));
+e.toString()), e);
}
URLConnection conn = null;
@@ -211,7 +211,7 @@
} catch (Exception e) {
TagUtils.getInstance()
