[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Directory Server v1.5 (DIRxSRVx11) http://cwiki.apache.org/confluence/display/DIRxSRVx11 | |-Pages Added or Edited in This Space |-- Mitosis was last edited by akarasulu (12:46 PM). | http://cwiki.apache.org/confluence/display/DIRxSRVx11/Mitosis |-- 3.3. How to enable SSL was last edited by szoerner (12:32 PM). | http://cwiki.apache.org/confluence/display/DIRxSRVx11/3.3.+How+to+enable+SSL Apache ActiveMQ (ACTIVEMQ) http://cwiki.apache.org/confluence/display/ACTIVEMQ | |-Pages Added or Edited in This Space |-- C Integration was last edited by [EMAIL PROTECTED] (06:44 PM). | http://cwiki.apache.org/confluence/display/ACTIVEMQ/C+Integration Apache ActiveMQ CPP (AMQCPP) http://cwiki.apache.org/confluence/display/AMQCPP | |-Pages Added or Edited in This Space |-- Source was last edited by tabish121 (12:43 PM). | http://cwiki.apache.org/confluence/display/AMQCPP/Source Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW | |-New Comments in This Space |-- http://cwiki.apache.org/confluence/display/WW/Selecting+Results (1) Apache Ode (ODExSITE) http://cwiki.apache.org/confluence/display/ODExSITE | |-Pages Added or Edited in This Space |-- JBI Integration Layer was created by [EMAIL PROTECTED] (07:52 PM). | http://cwiki.apache.org/confluence/display/ODExSITE/JBI+Integration+Layer Apache Tuscany (TUSCANY) http://cwiki.apache.org/confluence/display/TUSCANY | |-Pages Added or Edited in This Space |-- SCA Java binding.jms was created by slaws (09:44 AM). | http://cwiki.apache.org/confluence/display/TUSCANY/SCA+Java+binding.jms |-- Distributed Runtime was last edited by slaws (07:21 AM). | http://cwiki.apache.org/confluence/display/TUSCANY/Distributed+Runtime Apache Directory Server - Interoperability (DIRxINTEROP) http://cwiki.apache.org/confluence/display/DIRxINTEROP | |-Pages Added or Edited in This Space |-- Kerberos Authentication to Windows 2003 was last edited by erodriguez (11:36 PM). | http://cwiki.apache.org/confluence/display/DIRxINTEROP/Kerberos+Authentication+to+Windows+2003 |-- Samba SSO Examples was last edited by erodriguez (11:09 PM). | http://cwiki.apache.org/confluence/display/DIRxINTEROP/Samba+SSO+Examples |-- Kerberos Authentication to SSHD was last edited by erodriguez (11:07 PM). | http://cwiki.apache.org/confluence/display/DIRxINTEROP/Kerberos+Authentication+to+SSHD |-- Using Kerberos Credentials with smbclient was last edited by erodriguez (11:01 PM). | http://cwiki.apache.org/confluence/display/DIRxINTEROP/Using+Kerberos+Credentials+with+smbclient |-- Index was last edited by erodriguez (10:51 PM). | http://cwiki.apache.org/confluence/display/DIRxINTEROP/Index |-- Kerberos Authentication to OpenLDAP was last edited by erodriguez (10:09 PM). | http://cwiki.apache.org/confluence/display/DIRxINTEROP/Kerberos+Authentication+to+OpenLDAP |-- Kerberos Client Configuration was last edited by erodriguez (08:11 PM). | http://cwiki.apache.org/confluence/display/DIRxINTEROP/Kerberos+Client+Configuration |-- Kerberos Authentication to Wicket was last edited by erodriguez (06:37 PM). | http://cwiki.apache.org/confluence/display/DIRxINTEROP/Kerberos+Authentication+to+Wicket Apache Directory Studio (DIRxSTUDIO) http://cwiki.apache.org/confluence/display/DIRxSTUDIO | |-Pages Added or Edited in This Space |-- LDAP Browser Plugin was last edited by seelmann (08:58 AM). | http://cwiki.apache.org/confluence/display/DIRxSTUDIO/LDAP+Browser+Plugin Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET | |-Pages Added or Edited in This Space |-- Using custom converters was last edited by jardia (03:00 PM). | http://cwiki.apache.org/confluence/display/WICKET/Using+custom+converters - 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
Issues Opened: week of 2007-06-11
Struts2 - Monday, June 11, 2007 12 opened in last 7 days [WW-1977] Struts throws stack trace instead of 404 when an action doesn't exist Matt Raible - Bug - [] http://issues.apache.org/struts/browse/WW-1977 [WW-1966] struts.configuration.files doesn't work, or work incorrectly Jung Kwang Sun - Bug - [] http://issues.apache.org/struts/browse/WW-1966 [WW-1970] Error Message: Filter [struts2]: could not be initialized johana pin - Bug - [] http://issues.apache.org/struts/browse/WW-1970 [WW-1972] http://issues.apache.org/struts/browse/WW-1972 [WW-1969] Error in TagUtils (NullPointerException) when viewing a page which didn't go through Struts 2 interceptor stack Cyril Gambis - Bug - [] http://issues.apache.org/struts/browse/WW-1969 [WW-1978] NPE in XWorkConverter.loadConversionProperties after adding DateConverter Matt Raible - Bug - [] http://issues.apache.org/struts/browse/WW-1978 [WW-1967] Dynamic Method Invocation, validator with ActionName-aliasName-validation.xml files. Greg Huber - Bug - [] http://issues.apache.org/struts/browse/WW-1967 [WW-1976] FileUpload does not ignore 0 byte files when using Jakarta FileUpload impl Aymeric Levaux - Bug - [] http://issues.apache.org/struts/browse/WW-1976 [WW-1980] Ajax tags (most of them) are not working on IE 6 Musachy Barroso - Bug - [] http://issues.apache.org/struts/browse/WW-1980 [WW-1965] hopefully wildcard available for struts.configuration.files configuration Jung Kwang Sun - Improvement - [] http://issues.apache.org/struts/browse/WW-1965 [WW-1968] i18n problem with getText when calling some actions in same time Yves-Marie Lainé - Bug - [] http://issues.apache.org/struts/browse/WW-1968 [WW-1974] Struts 2.0.9 omnibus ticket Rainer Hermanns - Task - [] http://issues.apache.org/struts/browse/WW-1974
svn commit: r546216 - in /struts/struts2/trunk/apps/showcase/src/main/webapp/interactive: example-action.jsp index.jsp jsp_0.jsp jsp_1.jsp jsp_1.txt jsp_2.jsp
Author: musachy
Date: Mon Jun 11 11:33:11 2007
New Revision: 546216
URL: http://svn.apache.org/viewvc?view=rev&rev=546216
Log:
WW-1848 Showcase, create an interactive OGNL demo
Added:
struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/jsp_1.jsp
- copied, changed from r545989,
struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/jsp_1.txt
struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/jsp_2.jsp
Removed:
struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/jsp_1.txt
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/example-action.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/index.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/jsp_0.jsp
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/example-action.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/example-action.jsp?view=diff&rev=546216&r1=546215&r2=546216
==
---
struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/example-action.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/example-action.jsp
Mon Jun 11 11:33:11 2007
@@ -4,10 +4,11 @@
response.setHeader("Pragma","no-cache"); //HTTP 1.0
response.setDateHeader ("Expires", 0); //prevents caching at the proxy
server
%>
-
+
package org.apache.struts2.showcase.action;
import java.util.Arrays;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -15,28 +16,34 @@
import com.opensymphony.xwork2.ActionSupport;
public class ExampleAction extends ActionSupport {
-
+public static final String CONSTANT = "Struts Rocks!";
+
+public static Date getCurrentDate() {
+return new Date();
+}
+
public String getName() {
-return "John Galt";
+return "John Galt";
}
public String[] getBands() {
-return new String[] { "Pink Floyd", "Metallica",
"Guns & Roses" };
+return new String[] { "Pink Floyd", "Metallica", "Guns & Roses" };
}
-
-public Book getBook() {
-return new Book("Iliad", "Homer");
+
+public List getMovies() {
+return Arrays.asList("Lord of the Rings", "Matrix");
}
-public List getMovies() {
-return Arrays.asList("Lord of the Rings",
"Matrix");
+public Book getBook() {
+return new Book("Iliad", "Homer");
}
-public Map getBooks() {
-Map books = new HashMap();
-books.put("Iliad", new Book("Iliad",
"Homer"));
-books.put("The Republic", new Book("The
Replublic", "Plato"));
-books.put("Thus Spake Zarathustra", new Book("Thus
Spake Zarathustra", "Friedrich Nietzsche"));
+public Map getBooks() {
+Map books = new HashMap();
+books.put("Iliad", new Book("Iliad", "Homer"));
+books.put("The Republic", new Book("The Replublic", "Plato"));
+books.put("Thus Spake Zarathustra", new Book("Thus Spake Zarathustra",
+"Friedrich Nietzsche"));
return books;
}
}
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/index.jsp?view=diff&rev=546216&r1=546215&r2=546216
==
--- struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/index.jsp
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/index.jsp
Mon Jun 11 11:33:11 2007
@@ -19,7 +19,7 @@
var ognlBase = "${ognlBase}";
var jspBase = "${jspBase}";
var ognlCount = 10;
-var jspCount = 1;
+var jspCount = 3;
dojo.addOnLoad(function() {
var classSrc = dojo.byId("classSrc");
@@ -54,7 +54,7 @@
keyEvent({keyCode : 13}, '${jspEval}');
}
-function evalJSP(id) {
+function execJSP(id) {
var exp = dojo.string.trim(dojo.byId(id ? id :
"example").innerHTML);
dojo.byId("jsp").value = unscape(exp);
@@ -129,12 +129,12 @@
.jsp {
border-style: solid;
width: 100%;
-height: 300px;
+height: 200px;
}
.jspResult {
border-style: none;
width: 100%;
-height: 300px;
+height: 200px;
padding: 5px;
}
.jspResultHeader {
@@ -166,6 +166,10 @@
}
.guide {
padding: 5px;
+}
+pre {
+font-family:Verdana,Geneva,Arial,Helvetica,sans-serif;
+font-style: ital
svn commit: r546224 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Set.java
Author: musachy Date: Mon Jun 11 12:03:07 2007 New Revision: 546224 URL: http://svn.apache.org/viewvc?view=rev&rev=546224 Log: Fix typo Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Set.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Set.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Set.java?view=diff&rev=546224&r1=546223&r2=546224 == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Set.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Set.java Mon Jun 11 12:03:07 2007 @@ -41,7 +41,7 @@ * application - the value will be set in application scope according to servlet spec. using the name as its key * session - the value will be set in session scope according to servlet spec. using the name as key * request - the value will be set in request scope according to servlet spec. using the name as key - * page - the value will be set in request scope according to servlet sepc. using the name as key + * page - the value will be set in page scope according to servlet sepc. using the name as key * action - the value will be set in the request scope and Struts' action context using the name as key * *
svn commit: r546231 - in /struts/struts2/trunk/apps/showcase/src/main/webapp/interactive: example-action.jsp index.jsp jsp_3.jsp jsp_4.jsp ognl_9.jsp
Author: musachy
Date: Mon Jun 11 12:36:57 2007
New Revision: 546231
URL: http://svn.apache.org/viewvc?view=rev&rev=546231
Log:
WW-1848 Showcase, create an interactive OGNL demo
Added:
struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/jsp_3.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/jsp_4.jsp
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/example-action.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/index.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/ognl_9.jsp
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/example-action.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/example-action.jsp?view=diff&rev=546231&r1=546230&r2=546231
==
---
struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/example-action.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/example-action.jsp
Mon Jun 11 12:36:57 2007
@@ -5,41 +5,41 @@
response.setDateHeader ("Expires", 0); //prevents caching at the proxy
server
%>
-package org.apache.struts2.showcase.action;
+package org.apache.struts2.showcase.action;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
-import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
-public class ExampleAction extends ActionSupport {
-public static final String CONSTANT = "Struts Rocks!";
+public class ExampleAction extends ActionSupport {
+public static final String CONSTANT = "Struts
Rocks!";
-public static Date getCurrentDate() {
+public static Date getCurrentDate() {
return new Date();
}
-public String getName() {
+public String getName() {
return "John Galt";
}
-public String[] getBands() {
+public String[] getBands() {
return new String[] { "Pink Floyd", "Metallica", "Guns & Roses" };
}
-public List getMovies() {
+public List getMovies() {
return Arrays.asList("Lord of the Rings", "Matrix");
}
-public Book getBook() {
-return new Book("Iliad", "Homer");
+public Book getBook() {
+return new Book("Iliad", "Homer");
}
-public Map getBooks() {
-Map books = new HashMap();
+public Map getBooks() {
+Map books = new HashMap();
books.put("Iliad", new Book("Iliad", "Homer"));
books.put("The Republic", new Book("The Replublic", "Plato"));
books.put("Thus Spake Zarathustra", new Book("Thus Spake Zarathustra",
@@ -48,28 +48,28 @@
}
}
-class Book {
-private String title;
-private String author;
+class Book {
+private String title;
+private String author;
-public Book(String title, String author) {
+public Book(String title, String author) {
this.title = title;
this.author = author;
}
-public String getTitle() {
-return title;
+public String getTitle() {
+return title;
}
-public void setTitle(String title) {
+public void setTitle(String title) {
this.title = title;
}
-public String getAuthor() {
+public String getAuthor() {
return author;
}
-public void setAuthor(String author) {
+public void setAuthor(String author) {
this.author = author;
}
}
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/index.jsp?view=diff&rev=546231&r1=546230&r2=546231
==
--- struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/index.jsp
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/interactive/index.jsp
Mon Jun 11 12:36:57 2007
@@ -19,7 +19,7 @@
var ognlBase = "${ognlBase}";
var jspBase = "${jspBase}";
var ognlCount = 10;
-var jspCount = 3;
+var jspCount = 5;
dojo.addOnLoad(function() {
var classSrc = dojo.byId("classSrc");
@@ -33,6 +33,7 @@
});
function startOgnl() {
+selectOGNLTab();
index = -1;
runningOgnl = true;
change(1);
@@ -72,6 +73,10 @@
function selectJSPTab() {
dojo.widget.byId("mainTabContainer").selectTab("jspTab");
}
+
+function selectOGNLTab() {
+dojo.widge
svn commit: r546257 - /struts/struts1/branches/STRUTS_1_3_BRANCH/apps/pom.xml
Author: bayard Date: Mon Jun 11 13:19:40 2007 New Revision: 546257 URL: http://svn.apache.org/viewvc?view=rev&rev=546257 Log: Setting a defined (latest) version of the cargo plugin so the build completes Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/apps/pom.xml Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/apps/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/apps/pom.xml?view=diff&rev=546257&r1=546256&r2=546257 == --- struts/struts1/branches/STRUTS_1_3_BRANCH/apps/pom.xml (original) +++ struts/struts1/branches/STRUTS_1_3_BRANCH/apps/pom.xml Mon Jun 11 13:19:40 2007 @@ -72,6 +72,7 @@ org.codehaus.cargo cargo-maven2-plugin +0.3.1 tomcat5x
svn commit: r546273 - /struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/html-link.jsp
Author: bayard Date: Mon Jun 11 13:51:54 2007 New Revision: 546273 URL: http://svn.apache.org/viewvc?view=rev&rev=546273 Log: Improving readability of the html:link test. It's confusing why the tests are listed twice Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/html-link.jsp Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/html-link.jsp URL: http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/html-link.jsp?view=diff&rev=546273&r1=546272&r2=546273 == --- struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/html-link.jsp (original) +++ struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/html-link.jsp Mon Jun 11 13:51:54 2007 @@ -111,7 +111,7 @@ -Hyperlinks To Be Tested +Hyperlinks To Be Tested (via page attribtue) @@ -188,6 +188,12 @@ Float, int, and stringArray via name (Map) + + + + +Hyperlinks To Be Tested (via action attribtue) +
svn commit: r546274 - /struts/struts1/trunk/apps/el-example/src/main/webapp/html-link.jsp
Author: bayard Date: Mon Jun 11 13:52:15 2007 New Revision: 546274 URL: http://svn.apache.org/viewvc?view=rev&rev=546274 Log: Improving readability of the html:link test. It's confusing why the tests are listed twice Modified: struts/struts1/trunk/apps/el-example/src/main/webapp/html-link.jsp Modified: struts/struts1/trunk/apps/el-example/src/main/webapp/html-link.jsp URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/el-example/src/main/webapp/html-link.jsp?view=diff&rev=546274&r1=546273&r2=546274 == --- struts/struts1/trunk/apps/el-example/src/main/webapp/html-link.jsp (original) +++ struts/struts1/trunk/apps/el-example/src/main/webapp/html-link.jsp Mon Jun 11 13:52:15 2007 @@ -111,7 +111,7 @@ -Hyperlinks To Be Tested +Hyperlinks To Be Tested (via page attribtue) @@ -188,6 +188,12 @@ Float, int, and stringArray via name (Map) + + + + +Hyperlinks To Be Tested (via action attribtue) +
svn commit: r546270 - /struts/struts1/trunk/apps/pom.xml
Author: bayard Date: Mon Jun 11 13:49:20 2007 New Revision: 546270 URL: http://svn.apache.org/viewvc?view=rev&rev=546270 Log: Setting a defined (latest) version of the cargo plugin so the build completes Modified: struts/struts1/trunk/apps/pom.xml Modified: struts/struts1/trunk/apps/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/pom.xml?view=diff&rev=546270&r1=546269&r2=546270 == --- struts/struts1/trunk/apps/pom.xml (original) +++ struts/struts1/trunk/apps/pom.xml Mon Jun 11 13:49:20 2007 @@ -72,6 +72,7 @@ org.codehaus.cargo cargo-maven2-plugin +0.3.1 tomcat5x
svn commit: r546294 - /struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/html-setters.jsp
Author: bayard Date: Mon Jun 11 14:33:10 2007 New Revision: 546294 URL: http://svn.apache.org/viewvc?view=rev&rev=546294 Log: Disbling the two duplicated property fields on the bottom left too, otherwise it's confusing to the user Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/html-setters.jsp Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/html-setters.jsp URL: http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/html-setters.jsp?view=diff&rev=546294&r1=546293&r2=546294 == --- struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/html-setters.jsp (original) +++ struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/html-setters.jsp Mon Jun 11 14:33:10 2007 @@ -158,7 +158,8 @@ stringIndexed[1] - + nested.stringIndexed[1] @@ -170,7 +171,8 @@ stringIndexed[1] - + nested.stringIndexed[1]
svn commit: r546295 - in /struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp: html-file.jsp html-radio.jsp
Author: bayard
Date: Mon Jun 11 14:33:41 2007
New Revision: 546295
URL: http://svn.apache.org/viewvc?view=rev&rev=546295
Log:
Making it a (little) bit clearer what is going on in these two examples
Modified:
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/html-file.jsp
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/html-radio.jsp
Modified:
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/html-file.jsp
URL:
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/html-file.jsp?view=diff&rev=546295&r1=546294&r2=546295
==
---
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/html-file.jsp
(original)
+++
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/html-file.jsp
Mon Jun 11 14:33:41 2007
@@ -32,19 +32,22 @@
-
+
+As String property
+As String property, disabled if not empty pageScope
+Iterating over a collection as String properties
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/html-radio.jsp?view=diff&rev=546295&r1=546294&r2=546295
==
---
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/html-radio.jsp
(original)
+++
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/html-radio.jsp
Mon Jun 11 14:33:41 2007
@@ -39,7 +39,7 @@
title="Flag One" tabindex="3" accesskey="1"
disabled="${!empty pageScope}"/>
-flag one
+flag one (disabled if not empty pageScope)
svn commit: r546298 - /struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/html-multibox.jsp
Author: bayard Date: Mon Jun 11 14:51:21 2007 New Revision: 546298 URL: http://svn.apache.org/viewvc?view=rev&rev=546298 Log: In fact, the checkboxes are not selected by default. The code seems to back this up, so changing the description. Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/html-multibox.jsp Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/html-multibox.jsp URL: http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/html-multibox.jsp?view=diff&rev=546298&r1=546297&r2=546298 == --- struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/html-multibox.jsp (original) +++ struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/src/main/webapp/html-multibox.jsp Mon Jun 11 14:51:21 2007 @@ -31,7 +31,7 @@ Whatever changes you make to properties should be reflected when the page -is redisplayed. When first started, all of the listed checkboxes should +is redisplayed. When first started, all of the listed checkboxes should not be selected. Press "Save" to update, or "Cancel" to return to the main menu.
svn commit: r546299 - in /struts/struts1/trunk/apps/el-example/src/main/webapp: html-file.jsp html-multibox.jsp html-radio.jsp html-setters.jsp
Author: bayard
Date: Mon Jun 11 14:55:17 2007
New Revision: 546299
URL: http://svn.apache.org/viewvc?view=rev&rev=546299
Log:
Applying revisions 546294,546295,546298 from
https://svn.apache.org/repos/asf/struts/struts1/branches/STRUTS_1_3_BRANCH
Modified:
struts/struts1/trunk/apps/el-example/src/main/webapp/html-file.jsp
struts/struts1/trunk/apps/el-example/src/main/webapp/html-multibox.jsp
struts/struts1/trunk/apps/el-example/src/main/webapp/html-radio.jsp
struts/struts1/trunk/apps/el-example/src/main/webapp/html-setters.jsp
Modified: struts/struts1/trunk/apps/el-example/src/main/webapp/html-file.jsp
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/el-example/src/main/webapp/html-file.jsp?view=diff&rev=546299&r1=546298&r2=546299
==
--- struts/struts1/trunk/apps/el-example/src/main/webapp/html-file.jsp
(original)
+++ struts/struts1/trunk/apps/el-example/src/main/webapp/html-file.jsp Mon Jun
11 14:55:17 2007
@@ -32,19 +32,22 @@
-
+
+As String property
+As String property, disabled if not empty pageScope
+Iterating over a collection as String properties
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/el-example/src/main/webapp/html-multibox.jsp?view=diff&rev=546299&r1=546298&r2=546299
==
--- struts/struts1/trunk/apps/el-example/src/main/webapp/html-multibox.jsp
(original)
+++ struts/struts1/trunk/apps/el-example/src/main/webapp/html-multibox.jsp Mon
Jun 11 14:55:17 2007
@@ -31,7 +31,7 @@
Whatever changes you make to properties should be reflected when the page
-is redisplayed. When first started, all of the listed checkboxes should
+is redisplayed. When first started, all of the listed checkboxes should not
be selected. Press "Save" to update, or "Cancel" to return to the
main menu.
Modified: struts/struts1/trunk/apps/el-example/src/main/webapp/html-radio.jsp
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/el-example/src/main/webapp/html-radio.jsp?view=diff&rev=546299&r1=546298&r2=546299
==
--- struts/struts1/trunk/apps/el-example/src/main/webapp/html-radio.jsp
(original)
+++ struts/struts1/trunk/apps/el-example/src/main/webapp/html-radio.jsp Mon Jun
11 14:55:17 2007
@@ -39,7 +39,7 @@
title="Flag One" tabindex="3" accesskey="1"
disabled="${!empty pageScope}"/>
-flag one
+flag one (disabled if not empty pageScope)
Modified: struts/struts1/trunk/apps/el-example/src/main/webapp/html-setters.jsp
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/el-example/src/main/webapp/html-setters.jsp?view=diff&rev=546299&r1=546298&r2=546299
==
--- struts/struts1/trunk/apps/el-example/src/main/webapp/html-setters.jsp
(original)
+++ struts/struts1/trunk/apps/el-example/src/main/webapp/html-setters.jsp Mon
Jun 11 14:55:17 2007
@@ -158,7 +158,8 @@
stringIndexed[1]
-
+
nested.stringIndexed[1]
@@ -170,7 +171,8 @@
stringIndexed[1]
-
+
nested.stringIndexed[1]
svn commit: r546352 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java
Author: musachy Date: Mon Jun 11 18:46:27 2007 New Revision: 546352 URL: http://svn.apache.org/viewvc?view=rev&rev=546352 Log: WW-1853 Extend HttpHeaderResult to support HttpServletResponse.sendError() Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java?view=diff&rev=546352&r1=546351&r2=546352 == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java Mon Jun 11 18:46:27 2007 @@ -39,6 +39,7 @@ * * * A custom Result type for setting HTTP headers and status by optionally evaluating against the ValueStack. + * This result can also be used to send and error to the client. * * * @@ -53,7 +54,10 @@ * parse - true by default. If set to false, the headers param will not be parsed for Ognl expressions. * * headers - header values. + * + * error - the http servlet response error code that should be set on a response. * + * errorMessage - error message to be set on response if 'error' is set. * * * @@ -66,6 +70,11 @@ * a custom header value * another custom header value * + * + *+ * 305 + * this action must be accessed through a prozy + * * * */ @@ -80,7 +89,9 @@ private boolean parse = true; private Map headers; private int status = -1; - +private int error = -1; +private String errorMessage; + public HttpHeaderResult() { super(); headers = new HashMap(); @@ -94,6 +105,26 @@ /** + * Sets the http servlet error code that should be set on the reponse + * + * @param error the Http error code + * @see javax.servlet.http.HttpServletResponse#sendError(int) + */ +public void setError(int error) { +this.error = error; +} + +/** + * Sets the error message that should be set on the reponse + * + * @param errorMessage error message send to the client + * @see javax.servlet.http.HttpServletResponse#sendError(int, String) + */ +public void setErrorMessage(String errorMessage) { +this.errorMessage = errorMessage; +} + +/** * Returns a Map of all HTTP headers. * * @return a Map of all HTTP headers. @@ -140,14 +171,20 @@ */ public void execute(ActionInvocation invocation) throws Exception { HttpServletResponse response = ServletActionContext.getResponse(); - +ValueStack stack = ActionContext.getContext().getValueStack(); + if (status != -1) { response.setStatus(status); +} else if (error != -1) { +if (errorMessage != null) { +String finalMessage = parse ? TextParseUtil.translateVariables( +errorMessage, stack) : errorMessage; +response.sendError(error, finalMessage); +} else +response.sendError(error); } if (headers != null) { -ValueStack stack = ActionContext.getContext().getValueStack(); - for (Iterator iterator = headers.entrySet().iterator(); iterator.hasNext();) { Map.Entry entry = (Map.Entry) iterator.next(); Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java?view=diff&rev=546352&r1=546351&r2=546352 == --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java Mon Jun 11 18:46:27 2007 @@ -81,10 +81,38 @@ result.execute(invocation); responseMock.verify(); } + +public void testErrorMessageIsParsedAndSet() throws Exception { +ActionContext.getContext().getValueStack().set("errMsg", "abc"); +result.setError(404); +result.setErrorMessage("${errMsg}"); + +responseMock.expect("sendError", C.args(C.eq(404), C.eq("abc"))); +result.execute(invocation); +responseMock.verify(); +} + +
