[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Camel (CAMEL) http://cwiki.apache.org/confluence/display/CAMEL | |-Pages Added or Edited in This Space |-- Tutorial-JmsRemoting was last edited by pledge (08:26 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Tutorial-JmsRemoting |-- Building was last edited by jstrachan (04:25 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Building Apache Directory Server v1.5 (DIRxSRVx11) http://cwiki.apache.org/confluence/display/DIRxSRVx11 | |-Pages Added or Edited in This Space |-- Navigation was last edited by szoerner (07:50 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx11/Navigation Apache Struts 2 Plugin Registry (S2PLUGINS) http://cwiki.apache.org/confluence/display/S2PLUGINS | |-Pages Added or Edited in This Space |-- HDIV Plugin was last edited by gorka (01:28 AM). | http://cwiki.apache.org/confluence/display/S2PLUGINS/HDIV+Plugin Apache Struts 2 Wiki (S2WIKI) http://cwiki.apache.org/confluence/display/S2WIKI | |-Pages Added or Edited in This Space |-- Troubleshooting guide migrating from Struts 2.0.x to 2.1.x was last edited by jeromyevans (11:26 PM). | http://cwiki.apache.org/confluence/display/S2WIKI/Troubleshooting+guide+migrating+from+Struts+2.0.x+to+2.1.x Apache Geronimo v2.1 (GMOxDOC21) http://cwiki.apache.org/confluence/display/GMOxDOC21 | |-Pages Added or Edited in This Space |-- Documentation was last edited by gianny (10:07 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Documentation |-- Clustering was last edited by gianny (10:01 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Clustering |-- WADI Clustering Support was created by gianny (09:58 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/WADI+Clustering+Support |-- Farming was created by gianny (09:56 PM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Farming |-- Deployment plans was last edited by phanibalaji (04:18 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC21/Deployment+plans Apache Directory Website (DIRxSITE) http://cwiki.apache.org/confluence/display/DIRxSITE | |-Pages Added or Edited in This Space |-- Navigation was last edited by akarasulu (07:30 AM). | http://cwiki.apache.org/confluence/display/DIRxSITE/Navigation |-- ApacheDS 1.5.2 Released was created by akarasulu (07:28 AM). | http://cwiki.apache.org/confluence/display/DIRxSITE/2008/04/18/ApacheDS+1.5.2+Released Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET | |-Pages Added or Edited in This Space |-- Spring was last edited by [EMAIL PROTECTED] (11:54 PM). | http://cwiki.apache.org/confluence/display/WICKET/Spring |-- my new Stuff to learn! was created by [EMAIL PROTECTED] (08:44 PM). | http://cwiki.apache.org/confluence/display/WICKET/my+new+Stuff+to+learn%21 |-- Error Pages and Feedback Messages was last edited by [EMAIL PROTECTED] (04:18 AM). | http://cwiki.apache.org/confluence/display/WICKET/Error+Pages+and+Feedback+Messages Apache Felix (FELIX) http://cwiki.apache.org/confluence/display/FELIX | |-Pages Added or Edited in This Space |-- Navigation was last edited by [EMAIL PROTECTED] (02:52 PM). | http://cwiki.apache.org/confluence/display/FELIX/Navigation |-- Contributing was last edited by [EMAIL PROTECTED] (02:52 PM). | http://cwiki.apache.org/confluence/display/FELIX/Contributing |-- mailinglists was last edited by [EMAIL PROTECTED] (02:36 PM). | http://cwiki.apache.org/confluence/display/FELIX/mailinglists Apache Qpid (qpid) http://cwiki.apache.org/confluence/display/qpid | |-Pages Added or Edited in This Space |-- Qpid Java Meeting Minutes 2008-04-18 was created by godfrer (04:09 AM). | http://cwiki.apache.org/confluence/display/qpid/Qpid+Java+Meeting+Minutes+2008-04-18 |-- Developer Pages was last edited by godfrer (04:06 AM). | http://cwiki.apache.org/confluence/display/qpid/Developer+Pages OpenEJB 3.0.x documentation (OPENEJBx30) http://cwiki.apache.org/confluence/display/OPENEJBx30 | |-Pages Added or Edited in This Space |-- Examples was last edited by dblevins (10:04 PM). | http://cwiki.apache.org/confluence/display/OPENEJBx30/Examples |-- Custom Injection was created by dblevins (09:52 PM). | http://cwiki.apache.org/confluence/display/OPENEJBx30/Custom+Injection |-- Built-in Type Converters was created by dblevins (09:40 PM). | http://cwiki.apache.org/confluence/display/OPENEJBx30/Built-in+Type+Converters |-- Injection of env-entry Example was last edited by dblevins (08:52 PM). | http://cwiki.apache.org/confluence/display/OPENEJBx30/Injection+of+env-entry+Example |-- EJB 2.1 Compatibility Example was last edited by dblevins (07:34 PM). | http
svn commit: r649802 - /struts/struts2/trunk/assembly/pom.xml
Author: mrdon
Date: Sat Apr 19 05:14:02 2008
New Revision: 649802
URL: http://svn.apache.org/viewvc?rev=649802&view=rev
Log:
Fixing version, adding missing plugins
WW-2604
Modified:
struts/struts2/trunk/assembly/pom.xml
Modified: struts/struts2/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?rev=649802&r1=649801&r2=649802&view=diff
==
--- struts/struts2/trunk/assembly/pom.xml (original)
+++ struts/struts2/trunk/assembly/pom.xml Sat Apr 19 05:14:02 2008
@@ -33,7 +33,7 @@
org.apache.struts
struts2-parent
-2.1.1-SNAPSHOT
+2.1.2-SNAPSHOT
@@ -161,6 +161,11 @@
+
+org.apache.struts
+struts2-codebehind-plugin
+${version}
+
org.apache.struts
@@ -170,6 +175,18 @@
org.apache.struts
+struts2-dojo-plugin
+${version}
+
+
+
+org.apache.struts
+struts2-dwr-plugin
+${version}
+
+
+
+org.apache.struts
struts2-jasperreports-plugin
${version}
@@ -188,6 +205,12 @@
org.apache.struts
+struts2-junit-plugin
+${version}
+
+
+
+org.apache.struts
struts2-pell-multipart-plugin
${version}
@@ -200,15 +223,32 @@
org.apache.struts
-struts2-sitegraph-plugin
+struts2-portlet-plugin
${version}
org.apache.struts
+struts2-rest-plugin
+${version}
+
+
+
+org.apache.struts
+struts2-sitegraph-plugin
+${version}
+
+
+
+org.apache.struts
struts2-sitemesh-plugin
${version}
+
+org.apache.struts
+struts2-spring-plugin
+${version}
+
org.apache.struts
@@ -218,13 +258,13 @@
org.apache.struts
-struts2-tiles-plugin
+struts2-testng-plugin
${version}
org.apache.struts
-struts2-rest-plugin
+struts2-tiles-plugin
${version}
svn commit: r649806 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
Author: mrdon
Date: Sat Apr 19 06:38:33 2008
New Revision: 649806
URL: http://svn.apache.org/viewvc?rev=649806&view=rev
Log:
Fixing premature closing of xslt output stream
WW-2551
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java?rev=649806&r1=649805&r2=649806&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
Sat Apr 19 06:38:33 2008
@@ -315,7 +315,7 @@
try {
HttpServletResponse response = ServletActionContext.getResponse();
-Writer writer = response.getWriter();
+PrintWriter writer = response.getWriter();
// Create a transformer for the stylesheet.
Templates templates = null;
@@ -349,18 +349,15 @@
Source xmlSource = getDOMSourceForStack(result);
// Transform the source XML to System.out.
-PrintWriter out = response.getWriter();
-
LOG.debug("xmlSource = " + xmlSource);
-transformer.transform(xmlSource, new StreamResult(out));
+transformer.transform(xmlSource, new StreamResult(writer));
-out.close(); // ...and flush...
+writer.flush(); // ...and flush...
if (LOG.isDebugEnabled()) {
LOG.debug("Time:" + (System.currentTimeMillis() - startTime) +
"ms");
}
-writer.flush();
} catch (Exception e) {
LOG.error("Unable to render XSLT Template, '" + location + "'", e);
throw e;
svn commit: r649812 - /struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java
Author: mrdon
Date: Sat Apr 19 06:44:32 2008
New Revision: 649812
URL: http://svn.apache.org/viewvc?rev=649812&view=rev
Log:
Fixing NPE for navigations that don't involve a Struts 2 action
WW-2572
Modified:
struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java
Modified:
struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java?rev=649812&r1=649811&r2=649812&view=diff
==
---
struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java
(original)
+++
struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java
Sat Apr 19 06:44:32 2008
@@ -59,28 +59,36 @@
public void handleNavigation(FacesContext facesContext, String fromAction,
String outcome) {
ActionContext ctx = ActionContext.getContext();
if (outcome != null) {
-ActionConfig config =
ctx.getActionInvocation().getProxy().getConfig();
-Map results = config.getResults();
-
-ResultConfig resultConfig = null;
-
-synchronized (config) {
-try {
-resultConfig = (ResultConfig) results.get(outcome);
-} catch (NullPointerException e) {
-}
-if (resultConfig == null) {
-// If no result is found for the given resultCode, try to
get a wildcard '*' match.
-resultConfig = (ResultConfig) results.get("*");
-}
-}
-if (resultConfig != null) {
-ctx.getActionInvocation().setResultCode(outcome);
-} else {
-// Failing over to parent handler
-parent.handleNavigation(facesContext, fromAction, outcome);
-}
+ if (ctx == null && ctx.getActionInvocation() == null) {
+ delegateToParentNavigation(facesContext, fromAction,
outcome);
+ } else {
+ ActionConfig config =
ctx.getActionInvocation().getProxy().getConfig();
+ Map results = config.getResults();
+
+ ResultConfig resultConfig = null;
+
+ synchronized (config) {
+ try {
+ resultConfig = (ResultConfig) results.get(outcome);
+ } catch (NullPointerException e) {
+ }
+ if (resultConfig == null) {
+ // If no result is found for the given resultCode,
try to get a wildcard '*' match.
+ resultConfig = (ResultConfig) results.get("*");
+ }
+ }
+ if (resultConfig != null) {
+ ctx.getActionInvocation().setResultCode(outcome);
+ } else {
+ delegateToParentNavigation(facesContext, fromAction,
outcome);
+ }
+ }
}
}
+
+ private void delegateToParentNavigation(FacesContext facesContext,
String fromAction, String outcome) {
+ // Failing over to parent handler
+ parent.handleNavigation(facesContext, fromAction, outcome);
+ }
}
svn commit: r649813 - /struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java
Author: mrdon
Date: Sat Apr 19 06:46:35 2008
New Revision: 649813
URL: http://svn.apache.org/viewvc?rev=649813&view=rev
Log:
Cleaning up the tabs
WW-2572
Modified:
struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java
Modified:
struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java?rev=649813&r1=649812&r2=649813&view=diff
==
---
struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java
(original)
+++
struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java
Sat Apr 19 06:46:35 2008
@@ -59,36 +59,36 @@
public void handleNavigation(FacesContext facesContext, String fromAction,
String outcome) {
ActionContext ctx = ActionContext.getContext();
if (outcome != null) {
- if (ctx == null && ctx.getActionInvocation() == null) {
- delegateToParentNavigation(facesContext, fromAction,
outcome);
- } else {
- ActionConfig config =
ctx.getActionInvocation().getProxy().getConfig();
- Map results = config.getResults();
-
- ResultConfig resultConfig = null;
-
- synchronized (config) {
- try {
- resultConfig = (ResultConfig) results.get(outcome);
- } catch (NullPointerException e) {
- }
- if (resultConfig == null) {
- // If no result is found for the given resultCode,
try to get a wildcard '*' match.
- resultConfig = (ResultConfig) results.get("*");
- }
- }
- if (resultConfig != null) {
- ctx.getActionInvocation().setResultCode(outcome);
- } else {
- delegateToParentNavigation(facesContext, fromAction,
outcome);
- }
- }
+if (ctx == null && ctx.getActionInvocation() == null) {
+delegateToParentNavigation(facesContext, fromAction, outcome);
+} else {
+ActionConfig config =
ctx.getActionInvocation().getProxy().getConfig();
+Map results = config.getResults();
+
+ResultConfig resultConfig = null;
+
+synchronized (config) {
+try {
+resultConfig = (ResultConfig) results.get(outcome);
+} catch (NullPointerException e) {
+}
+if (resultConfig == null) {
+// If no result is found for the given resultCode, try
to get a wildcard '*' match.
+resultConfig = (ResultConfig) results.get("*");
+}
+}
+if (resultConfig != null) {
+ctx.getActionInvocation().setResultCode(outcome);
+} else {
+delegateToParentNavigation(facesContext, fromAction,
outcome);
+}
+}
}
}
- private void delegateToParentNavigation(FacesContext facesContext,
String fromAction, String outcome) {
- // Failing over to parent handler
- parent.handleNavigation(facesContext, fromAction, outcome);
- }
+private void delegateToParentNavigation(FacesContext facesContext, String
fromAction, String outcome) {
+// Failing over to parent handler
+parent.handleNavigation(facesContext, fromAction, outcome);
+}
}
svn commit: r649814 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/views/xslt/AdapterFactory.java test/java/org/apache/struts2/views/xslt/XSLTResultTest.java
Author: mrdon
Date: Sat Apr 19 07:01:15 2008
New Revision: 649814
URL: http://svn.apache.org/viewvc?rev=649814&view=rev
Log:
Fixing improper render of boolean values for xslt result
WW-2457
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java?rev=649814&r1=649813&r2=649814&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java
Sat Apr 19 07:01:15 2008
@@ -146,7 +146,7 @@
if (valueType.isArray())
adapterClass = ArrayAdapter.class;
-else if (value instanceof String || value instanceof Number ||
valueType.isPrimitive())
+else if (value instanceof String || value instanceof Number || value
instanceof Boolean || valueType.isPrimitive())
adapterClass = StringAdapter.class;
else if (value instanceof Collection)
adapterClass = CollectionAdapter.class;
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java?rev=649814&r1=649813&r2=649814&view=diff
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java
Sat Apr 19 07:01:15 2008
@@ -106,7 +106,7 @@
assertTrue(out.indexOf("http://www.w3.org/TR/xhtml1/strict\"";) > -1);
assertTrue(out.indexOf("Hello Santa Claus how are you?") > -1);
}
-
+
public void testTransform3() throws Exception {
result.setParse(false);
result.setLocation("XSLTResultTest3.xsl");
@@ -120,6 +120,18 @@
assertTrue(out.indexOf("XWork not in Action by Superman") > -1);
}
+public void testTransformWithBoolean() throws Exception {
+result.setParse(false);
+result.setLocation("XSLTResultTest5.xsl");
+result.execute(mai);
+
+String out = response.getContentAsString();
+assertTrue(out.startsWith(""));
+assertTrue(out.indexOf("http://www.w3.org/TR/xhtml1/strict\"";) > -1);
+assertTrue(out.indexOf("Hello Santa Claus how are you?") > -1);
+assertTrue(out.indexOf("You are active: true") > -1);
+}
+
public void testTransform4WithDocumentInclude() throws Exception {
result = new XSLTResult(){
protected URIResolver getURIResolver() {
@@ -185,6 +197,10 @@
public String getUsername() {
return "Santa Claus";
+}
+
+public boolean isActive() {
+return true;
}
public List getBooks() {
[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 445 has FAILED (1 tests failed). Change made by Don Brown
The project Struts 2 SVN - Main Build (Java 6) has the following 1 change by 1 author: *Don Brown* made the following changes at Comment: Fixing improper render of boolean values for xslt result WW-2457 > /struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java > (649814) > /struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java > (649814) --- The build has 1 failed test and 781 successful tests. Click http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-445 to find out more. Thanks, Bamboo
[OSS Bamboo] Struts 2 SVN - Main Build build 779 has FAILED (1 tests failed). Change made by Don Brown
The project Struts 2 SVN - Main Build has the following 1 change by 1 author: *Don Brown* made the following changes at Comment: Fixing improper render of boolean values for xslt result WW-2457 > /struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java > (649814) > /struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java > (649814) --- The build has 1 failed test and 781 successful tests. Click http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-779 to find out more. Thanks, Bamboo
svn commit: r649820 - in /struts/struts2/trunk/plugins/rest/src: main/java/org/apache/struts2/rest/DefaultHttpHeaders.java test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java
Author: mrdon
Date: Sat Apr 19 07:15:51 2008
New Revision: 649820
URL: http://svn.apache.org/viewvc?rev=649820&view=rev
Log:
Changing return code to 201 when location header is present
WW-2605
Modified:
struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java
struts/struts2/trunk/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java
Modified:
struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java?rev=649820&r1=649819&r2=649820&view=diff
==
---
struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java
(original)
+++
struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java
Sat Apr 19 07:15:51 2008
@@ -24,6 +24,7 @@
import javax.servlet.http.HttpServletResponse;
import static javax.servlet.http.HttpServletResponse.SC_NOT_MODIFIED;
import static javax.servlet.http.HttpServletResponse.SC_OK;
+import static javax.servlet.http.HttpServletResponse.SC_CREATED;
import java.util.Date;
/**
@@ -113,8 +114,10 @@
url += "/"+locationId;
}
response.setHeader("Location", url);
+status = SC_CREATED;
} else if (location != null) {
response.setHeader("Location", location);
+status = SC_CREATED;
}
if (status == SC_OK && !disableCaching) {
Modified:
struts/struts2/trunk/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java?rev=649820&r1=649819&r2=649820&view=diff
==
---
struts/struts2/trunk/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java
(original)
+++
struts/struts2/trunk/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java
Sat Apr 19 07:15:51 2008
@@ -54,7 +54,7 @@
headers.apply(mockRequest, mockResponse, new Object());
-assertEquals(SC_OK, mockResponse.getStatus());
+assertEquals(SC_CREATED, mockResponse.getStatus());
assertEquals("http://localhost:80/foo/bar/44.xhtml";,
mockResponse.getHeader("Location"));
assertEquals("asdf", mockResponse.getHeader("ETag"));
assertEquals(now.getTime(), mockResponse.getHeader("Last-Modified"));
@@ -68,7 +68,7 @@
headers.apply(mockRequest, mockResponse, new Object());
assertEquals("http://localhost:80/foo/bar/44";,
mockResponse.getHeader("Location"));
-
+assertEquals(SC_CREATED, mockResponse.getStatus());
}
public void testApplyFullLocation() {
@@ -78,6 +78,7 @@
headers.apply(mockRequest, mockResponse, new Object());
assertEquals("http://localhost/bar/44";,
mockResponse.getHeader("Location"));
+assertEquals(SC_CREATED, mockResponse.getStatus());
}
svn commit: r649822 - /struts/struts2/trunk/core/src/test/resources/XSLTResultTest5.xsl
Author: mrdon Date: Sat Apr 19 07:18:54 2008 New Revision: 649822 URL: http://svn.apache.org/viewvc?rev=649822&view=rev Log: Adding missing test resource WW-2457 Added: struts/struts2/trunk/core/src/test/resources/XSLTResultTest5.xsl Added: struts/struts2/trunk/core/src/test/resources/XSLTResultTest5.xsl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/XSLTResultTest5.xsl?rev=649822&view=auto == --- struts/struts2/trunk/core/src/test/resources/XSLTResultTest5.xsl (added) +++ struts/struts2/trunk/core/src/test/resources/XSLTResultTest5.xsl Sat Apr 19 07:18:54 2008 @@ -0,0 +1,36 @@ + +http://www.w3.org/1999/XSL/Transform"; +xmlns="http://www.w3.org/TR/xhtml1/strict";> + + + + +Hello how are you? +You are active: + + + + + \ No newline at end of file
[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 446 has FAILED (1 tests failed, no failures were new). Change made by Don Brown
The project Struts 2 SVN - Main Build (Java 6) has the following 1 change by 1 author: *Don Brown* made the following changes at Comment: Changing return code to 201 when location header is present WW-2605 > /struts/struts2/trunk/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java > (649820) > /struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java > (649820) --- The build has 1 failed test and 781 successful tests. Click http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-446 to find out more. Thanks, Bamboo
[OSS Bamboo] Struts 2 SVN - Main Build build 780 has FAILED (1 tests failed, no failures were new). Change made by Don Brown
The project Struts 2 SVN - Main Build has the following 1 change by 1 author: *Don Brown* made the following changes at Comment: Changing return code to 201 when location header is present WW-2605 > /struts/struts2/trunk/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java > (649820) > /struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java > (649820) --- The build has 1 failed test and 781 successful tests. Click http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-780 to find out more. Thanks, Bamboo
[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 447 was SUCCESSFUL (with 782 tests). Change made by Don Brown
The project Struts 2 SVN - Main Build (Java 6) has the following 1 change by 1 author: *Don Brown* made the following changes at Comment: Adding missing test resource WW-2457 > /struts/struts2/trunk/core/src/test/resources/XSLTResultTest5.xsl (649822) --- All 782 tests passed. Click http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-447 to find out more. Thanks, Bamboo
[OSS Bamboo] Struts 2 SVN - Main Build build 781 was SUCCESSFUL (with 782 tests). Change made by Don Brown
The project Struts 2 SVN - Main Build has the following 1 change by 1 author: *Don Brown* made the following changes at Comment: Adding missing test resource WW-2457 > /struts/struts2/trunk/core/src/test/resources/XSLTResultTest5.xsl (649822) --- All 782 tests passed. Click http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-781 to find out more. Thanks, Bamboo
svn commit: r649823 - in /struts/struts2/trunk/core/src: main/resources/template/simple/ test/java/org/apache/struts2/views/jsp/ui/ test/resources/org/apache/struts2/views/jsp/ui/
Author: mrdon
Date: Sat Apr 19 07:55:33 2008
New Revision: 649823
URL: http://svn.apache.org/viewvc?rev=649823&view=rev
Log:
Better handling of disabled checkboxes
WW-2499
Added:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-6.txt
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/checkbox.ftl
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-1.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-2.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-3.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-33.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-4.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-5.txt
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/checkbox.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/checkbox.ftl?rev=649823&r1=649822&r2=649823&view=diff
==
--- struts/struts2/trunk/core/src/main/resources/template/simple/checkbox.ftl
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/checkbox.ftl
Sat Apr 19 07:55:33 2008
@@ -44,4 +44,8 @@
<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
<#include "/${parameters.templateDir}/simple/dynamic-attributes.ftl" />
/>
-
\ No newline at end of file
+
+<#if parameters.disabled?default(false)>
+ disabled="disabled"<#rt/>
+
+ />
\ No newline at end of file
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java?rev=649823&r1=649822&r2=649823&view=diff
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java
Sat Apr 19 07:55:33 2008
@@ -178,4 +178,22 @@
verify(CheckboxTag.class.getResource("Checkbox-2.txt"));
}
+
+public void testDisabled() throws Exception {
+TestAction testAction = (TestAction) action;
+testAction.setFoo("true");
+
+CheckboxTag tag = new CheckboxTag();
+tag.setPageContext(pageContext);
+tag.setLabel("mylabel");
+tag.setName("foo");
+tag.setFieldValue("baz");
+tag.setTitle("mytitle");
+tag.setDisabled("true");
+
+tag.doStartTag();
+tag.doEndTag();
+
+verify(CheckboxTag.class.getResource("Checkbox-6.txt"));
+}
}
Modified:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-1.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-1.txt?rev=649823&r1=649822&r2=649823&view=diff
==
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-1.txt
(original)
+++
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-1.txt
Sat Apr 19 07:55:33 2008
@@ -3,7 +3,7 @@
-
+
mylabel
Modified:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-2.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-2.txt?rev=649823&r1=649822&r2=649823&view=diff
==
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-2.txt
(original)
+++
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-2.txt
Sat Apr 19 07:55:33 2008
@@ -3,7 +3,7 @@
-
+
mylabel
Modified:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-3.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-3.txt?rev=649823&r1=649822&r2=649823&view=diff
==
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-3.txt
(original)
+++
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-3.txt
Sat Apr 19 07:55:3
svn commit: r649873 - in /struts/struts2/trunk/plugins: codebehind/src/main/java/org/apache/struts2/config/ codebehind/src/test/java/org/apache/struts2/config/ rest/src/main/java/org/apache/struts2/re
Author: mrdon
Date: Sat Apr 19 20:09:23 2008
New Revision: 649873
URL: http://svn.apache.org/viewvc?rev=649873&view=rev
Log:
Adding new settings to disable classpath action scanning for the codebehind and
rest plugins
WW-2506
Modified:
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/ClasspathPackageProviderTest.java
struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/ControllerClasspathPackageProvider.java
struts/struts2/trunk/plugins/rest/src/main/resources/struts-plugin.xml
Modified:
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java?rev=649873&r1=649872&r2=649873&view=diff
==
---
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java
(original)
+++
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java
Sat Apr 19 20:09:23 2008
@@ -61,7 +61,7 @@
* The default page prefix (or "path").
* Some applications may place pages under "/WEB-INF" as an extreme
security precaution.
*/
-private static final String DEFAULT_PAGE_PREFIX =
"struts.configuration.classpath.defaultPagePrefix";
+protected static final String DEFAULT_PAGE_PREFIX =
"struts.configuration.classpath.defaultPagePrefix";
/**
* The default page prefix (none).
@@ -71,7 +71,7 @@
/**
* The default page extension, to use in place of ".jsp".
*/
-private static final String DEFAULT_PAGE_EXTENSION =
"struts.configuration.classpath.defaultPageExtension";
+protected static final String DEFAULT_PAGE_EXTENSION =
"struts.configuration.classpath.defaultPageExtension";
/**
* The defacto default page extension, usually associated with JavaServer
Pages.
@@ -82,7 +82,12 @@
* A setting to indicate a custom default parent package,
* to use in place of "struts-default".
*/
-private static final String DEFAULT_PARENT_PACKAGE =
"struts.configuration.classpath.defaultParentPackage";
+protected static final String DEFAULT_PARENT_PACKAGE =
"struts.configuration.classpath.defaultParentPackage";
+
+/**
+ * A setting to disable action scanning.
+ */
+protected static final String DISABLE_ACTION_SCANNING =
"struts.configuration.classpath.disableActionScanning";
/**
* Name of the framework's default configuration package,
@@ -94,7 +99,7 @@
* The default page prefix (or "path").
* Some applications may place pages under "/WEB-INF" as an extreme
security precaution.
*/
-private static final String FORCE_LOWER_CASE =
"struts.configuration.classpath.forceLowerCase";
+protected static final String FORCE_LOWER_CASE =
"struts.configuration.classpath.forceLowerCase";
/**
* Whether to use a lowercase letter as the initial letter of an action.
@@ -120,6 +125,8 @@
* @see #needsReload
*/
private boolean initialized = false;
+
+private boolean disableActionScanning = false;
private PackageLoader packageLoader;
@@ -168,6 +175,16 @@
}
/**
+ * Disables action scanning.
+ *
+ * @param disableActionScanning True to disable
+ */
+@Inject(value=DISABLE_ACTION_SCANNING, required=false)
+public void setDisableActionScanning(String disableActionScanning) {
+this.disableActionScanning = "true".equals(disableActionScanning);
+}
+
+/**
* Register a default parent package for the actions.
*
* @param defaultParentPackage the new defaultParentPackage
@@ -437,7 +454,7 @@
* @throws ConfigurationException
*/
public void loadPackages() throws ConfigurationException {
-if (actionPackages != null) {
+if (actionPackages != null && !disableActionScanning) {
String[] names = actionPackages.split("\\s*[,]\\s*");
// Initialize the classloader scanner with the configured packages
if (names.length > 0) {
Modified:
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/ClasspathPackageProviderTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/ClasspathPackageProviderTest.java?rev=649873&r1=649872&r2=649873&view=diff
==
---
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/ClasspathPackageProviderTest.java
(original)
+++
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/s
svn commit: r649874 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/views/xslt/XSLTResult.java test/java/org/apache/struts2/views/xslt/XSLTResultTest.java
Author: mrdon
Date: Sat Apr 19 20:20:57 2008
New Revision: 649874
URL: http://svn.apache.org/viewvc?rev=649874&view=rev
Log:
Better error handling for XSLT transform errors
WW-2594
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java?rev=649874&r1=649873&r2=649874&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
Sat Apr 19 20:20:57 2008
@@ -28,6 +28,7 @@
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
+import javax.xml.transform.ErrorListener;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Source;
import javax.xml.transform.Templates;
@@ -41,6 +42,7 @@
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.StrutsException;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
@@ -327,6 +329,24 @@
transformer =
TransformerFactory.newInstance().newTransformer();
transformer.setURIResolver(getURIResolver());
+transformer.setErrorListener(new ErrorListener() {
+
+public void error(TransformerException exception)
+throws TransformerException {
+throw new StrutsException("Error transforming result",
exception);
+}
+
+public void fatalError(TransformerException exception)
+throws TransformerException {
+throw new StrutsException("Fatal error transforming
result", exception);
+}
+
+public void warning(TransformerException exception)
+throws TransformerException {
+LOG.warn(exception.getMessage(), exception);
+}
+
+});
String mimeType;
if (templates == null)
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java?rev=649874&r1=649873&r2=649874&view=diff
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java
Sat Apr 19 20:20:57 2008
@@ -152,7 +152,26 @@
assertTrue(out.startsWith(""));
assertTrue(out.indexOf("") > -1);
}
-
+
+public void testTransformWithError() throws Exception {
+result = new XSLTResult(){
+protected URIResolver getURIResolver() {
+return new URIResolver() {
+public Source resolve(String href, String base) throws
TransformerException {
+throw new TransformerException("Some random error");
+}
+};
+}
+};
+result.setLocation("XSLTResultTest4.xsl");
+try {
+result.execute(mai);
+fail("Should have thrown an exception");
+} catch (Exception ex) {
+assertEquals("Error transforming result", ex.getMessage());
+}
+}
+
protected void setUp() throws Exception {
super.setUp();
request = new MockHttpServletRequest();
svn commit: r649876 - /struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/Result.java
Author: mrdon
Date: Sat Apr 19 20:26:29 2008
New Revision: 649876
URL: http://svn.apache.org/viewvc?rev=649876&view=rev
Log:
Annotation improvements to the result annotation
WW-2577
Modified:
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/Result.java
Modified:
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/Result.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/Result.java?rev=649876&r1=649875&r2=649876&view=diff
==
---
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/Result.java
(original)
+++
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/Result.java
Sat Apr 19 20:26:29 2008
@@ -22,16 +22,19 @@
import com.opensymphony.xwork2.Action;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* Defines an XWork Result
*/
@Retention(RetentionPolicy.RUNTIME)
[EMAIL PROTECTED](ElementType.TYPE)
public @interface Result {
String name() default Action.SUCCESS;
-Class type() default NullResult.class;
+Class type() default
NullResult.class;
String value();
String[] params() default {};
}
svn commit: r649877 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor: RequestAware.java SessionAware.java
Author: mrdon Date: Sat Apr 19 20:30:28 2008 New Revision: 649877 URL: http://svn.apache.org/viewvc?rev=649877&view=rev Log: Use of generics in SessionAware and RequestAware WW-2581 Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/RequestAware.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/SessionAware.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/RequestAware.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/RequestAware.java?rev=649877&r1=649876&r2=649877&view=diff == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/RequestAware.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/RequestAware.java Sat Apr 19 20:30:28 2008 @@ -35,5 +35,5 @@ * * @param request a Map of HTTP request attribute name/value pairs. */ -public void setRequest(Map request); +public void setRequest(Map request); } Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/SessionAware.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/SessionAware.java?rev=649877&r1=649876&r2=649877&view=diff == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/SessionAware.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/SessionAware.java Sat Apr 19 20:30:28 2008 @@ -39,5 +39,5 @@ * * @param session a Map of HTTP session attribute name/value pairs. */ -public void setSession(Map session); +public void setSession(Map session); }
svn commit: r649878 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/interceptor/validation/ test/java/org/apache/struts2/interceptor/validation/ test/java/org/apache/struts2/views/js
Author: mrdon
Date: Sat Apr 19 20:38:49 2008
New Revision: 649878
URL: http://svn.apache.org/viewvc?rev=649878&view=rev
Log:
Adding correct response type for json validation
WW-2571
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletResponse.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java?rev=649878&r1=649877&r2=649878&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java
Sat Apr 19 20:38:49 2008
@@ -98,6 +98,7 @@
if (validationFailedStatus >= 0)
response.setStatus(validationFailedStatus);
response.getWriter().print(buildResponse(validationAware));
+response.setContentType("application/json");
return Action.NONE;
}
}
@@ -106,6 +107,7 @@
if (validateOnly != null && "true".equals(validateOnly)) {
//there were no errors
response.getWriter().print("/* {} */");
+response.setContentType("application/json");
return Action.NONE;
} else {
return invocation.invoke();
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java?rev=649878&r1=649877&r2=649878&view=diff
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java
Sat Apr 19 20:38:49 2008
@@ -78,6 +78,8 @@
assertFalse(action.isExecuted());
//http status
assertEquals(HttpServletResponse.SC_BAD_REQUEST, response.getStatus());
+assertEquals("application/json", response.getContentType());
+
}
public void testValidationSucceeds() throws Exception {
@@ -119,6 +121,7 @@
String normalizedActual = TestUtils.normalize(json, true);
assertEquals("/*{}*/", normalizedActual);
assertFalse(action.isExecuted());
+assertEquals("application/json", response.getContentType());
}
protected void setUp() throws Exception {
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletResponse.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletResponse.java?rev=649878&r1=649877&r2=649878&view=diff
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletResponse.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletResponse.java
Sat Apr 19 20:38:49 2008
@@ -37,6 +37,7 @@
private PrintWriter writer;
private int status;
private String redirectURL;
+private String contentType;
public Locale getLocale() {
return locale;
@@ -47,7 +48,12 @@
}
public String getContentType() {
-return null; //To change body of implemented methods use File |
Settings | File Templates.
+return contentType; //To change body of implemented methods use File
| Settings | File Templates.
+}
+
+@Override
+public void setContentType(String type) {
+this.contentType = type;
}
public PrintWriter getWriter() throws IOException {
svn commit: r649880 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
Author: mrdon
Date: Sat Apr 19 20:52:37 2008
New Revision: 649880
URL: http://svn.apache.org/viewvc?rev=649880&view=rev
Log:
Removing the unused matchingPatterns and excludingPatterns parameters
WW-1550
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java?rev=649880&r1=649879&r2=649880&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
Sat Apr 19 20:52:37 2008
@@ -177,12 +177,6 @@
* parse - true by default. If set to false, the location param will
* not be parsed for Ognl expressions.
*
- * matchingPattern - Pattern that matches only desired elements, by
- * default it matches everything.
- *
- * excludingPattern - Pattern that eliminates unwanted elements, by
- * default it matches none.
- *
*
*
*
@@ -277,22 +271,6 @@
public void setExposedValue(String exposedValue) {
this.exposedValue = exposedValue;
-}
-
-public String getMatchingPattern() {
-return matchingPattern;
-}
-
-public void setMatchingPattern(String matchingPattern) {
-this.matchingPattern = matchingPattern;
-}
-
-public String getExcludingPattern() {
-return excludingPattern;
-}
-
-public void setExcludingPattern(String excludingPattern) {
-this.excludingPattern = excludingPattern;
}
/**
svn commit: r649881 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
Author: mrdon
Date: Sat Apr 19 20:54:03 2008
New Revision: 649881
URL: http://svn.apache.org/viewvc?rev=649881&view=rev
Log:
Adding back accessors as deprecated for xslt result
WW-1550
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java?rev=649881&r1=649880&r2=649881&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
Sat Apr 19 20:54:03 2008
@@ -177,6 +177,14 @@
* parse - true by default. If set to false, the location param will
* not be parsed for Ognl expressions.
*
+ *
+ *
*
*
*
@@ -271,6 +279,34 @@
public void setExposedValue(String exposedValue) {
this.exposedValue = exposedValue;
+}
+
+/**
+ * @deprecated Since 2.1.1
+ */
+public String getMatchingPattern() {
+return matchingPattern;
+}
+
+/**
+ * @deprecated Since 2.1.1
+ */
+public void setMatchingPattern(String matchingPattern) {
+this.matchingPattern = matchingPattern;
+}
+
+/**
+ * @deprecated Since 2.1.1
+ */
+public String getExcludingPattern() {
+return excludingPattern;
+}
+
+/**
+ * @deprecated Since 2.1.1
+ */
+public void setExcludingPattern(String excludingPattern) {
+this.excludingPattern = excludingPattern;
}
/**
svn commit: r649884 - /struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/index.jsp
Author: mrdon Date: Sat Apr 19 21:40:35 2008 New Revision: 649884 URL: http://svn.apache.org/viewvc?rev=649884&view=rev Log: Fixing bad links in showcase Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/index.jsp Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/index.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/index.jsp?rev=649884&r1=649883&r2=649884&view=diff == --- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/index.jsp (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/index.jsp Sat Apr 19 21:40:35 2008 @@ -16,8 +16,8 @@ Tree Example (dynamic) Tree Example (dynamic ajax loading) Component Tag Example -DateTime picker tag - Pick a date -DateTime picker tag - Pick a time +DateTime picker tag - Pick a date +DateTime picker tag - Pick a time <%--li>UI population using iterator tag
