date:20110708

svn commit: r1144250 - /struts/struts2/trunk/core/src/main/resources/template/simple/dynamic-attributes.ftl

2011-07-08 Thread lukaszlenart

Author: lukaszlenart
Date: Fri Jul  8 10:54:01 2011
New Revision: 1144250

URL: http://svn.apache.org/viewvc?rev=1144250&view=rev
Log:
Adds <#rt/> directive to remove empty spaces

Modified:

struts/struts2/trunk/core/src/main/resources/template/simple/dynamic-attributes.ftl

Modified: 
struts/struts2/trunk/core/src/main/resources/template/simple/dynamic-attributes.ftl
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/dynamic-attributes.ftl?rev=1144250&r1=1144249&r2=1144250&view=diff
==
--- 
struts/struts2/trunk/core/src/main/resources/template/simple/dynamic-attributes.ftl
 (original)
+++ 
struts/struts2/trunk/core/src/main/resources/template/simple/dynamic-attributes.ftl
 Fri Jul  8 10:54:01 2011
@@ -20,9 +20,9 @@
  * under the License.
  */
 -->
-<#if (parameters.dynamicAttributes?? && parameters.dynamicAttributes?size > 
0)><#t/>
-<#assign aKeys = parameters.dynamicAttributes.keySet()><#t/>
-<#list aKeys as aKey><#t/>
+<#if (parameters.dynamicAttributes?? && parameters.dynamicAttributes?size > 
0)><#rt/>
+<#assign aKeys = parameters.dynamicAttributes.keySet()><#rt/>
+<#list aKeys as aKey><#rt/>
  ${aKey}="${parameters.dynamicAttributes[aKey]?html}"<#rt/>
-<#t/> 
-<#t/>
\ No newline at end of file
+<#rt/>
+<#rt/>
\ No newline at end of file

svn commit: r1144259 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/interceptor/validation/ test/java/org/apache/struts2/interceptor/validation/ test/resources/org/apache/struts2/in

2011-07-08 Thread lukaszlenart

Author: lukaszlenart
Date: Fri Jul  8 11:12:52 2011
New Revision: 1144259

URL: http://svn.apache.org/viewvc?rev=1144259&view=rev
Log:
WW-3545 - remove comments for JSON output

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/resources/org/apache/struts2/interceptor/validation/json-1.txt

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=1144259&r1=1144258&r2=1144259&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
 Fri Jul  8 11:12:52 2011
@@ -106,7 +106,7 @@ public class JSONValidationInterceptor e
 if (isValidateOnly(request)) {
 //there were no errors
 setupEncoding(response, request);
-response.getWriter().print("/* {} */");
+response.getWriter().print("{}");
 response.setContentType("application/json");
 return Action.NONE;
 } else {
@@ -159,7 +159,7 @@ public class JSONValidationInterceptor e
 protected String buildResponse(ValidationAware validationAware) {
 //should we use FreeMarker here?
 StringBuilder sb = new StringBuilder();
-sb.append("/* { ");
+sb.append("{ ");
 
 if (validationAware.hasErrors()) {
 //action errors
@@ -192,7 +192,7 @@ public class JSONValidationInterceptor e
 }
 }
 
-sb.append("} */");
+sb.append("}");
 /*response should be something like:
  * {
  *  "errors": ["this", "that"],

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=1144259&r1=1144258&r2=1144259&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
 Fri Jul  8 11:12:52 2011
@@ -21,32 +21,28 @@
 
 package org.apache.struts2.interceptor.validation;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts2.StrutsStatics;
-import org.apache.struts2.StrutsTestCase;
-import org.apache.struts2.TestUtils;
-import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest;
-import org.apache.struts2.views.jsp.StrutsMockHttpServletResponse;
-import org.apache.struts2.views.jsp.StrutsMockServletContext;
-
 import com.opensymphony.xwork2.Action;
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionSupport;
 import com.opensymphony.xwork2.config.entities.ActionConfig;
 import com.opensymphony.xwork2.mock.MockActionInvocation;
 import com.opensymphony.xwork2.mock.MockActionProxy;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStackFactory;
 import com.opensymphony.xwork2.validator.annotations.EmailValidator;
 import com.opensymphony.xwork2.validator.annotations.IntRangeFieldValidator;
 import 
com.opensymphony.xwork2.validator.annotations.StringLengthFieldValidator;
 import com.opensymphony.xwork2.validator.annotations.Validation;
+import org.apache.struts2.StrutsStatics;
+import org.apache.struts2.StrutsTestCase;
+import org.apache.struts2.TestUtils;
+import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest;
+import org.apache.struts2.views.jsp.StrutsMockHttpServletResponse;
+import org.apache.struts2.views.jsp.StrutsMockServletContext;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.Map;
 
 public class JSONValidationInterceptorTest extends StrutsTestCase {
 private MockActionInvocation invocation;
@@ -121,7 +117,7 @@ public class JSONValidationInterceptorTe
 String json = stringWriter.toString();
 
 String normalizedActual = TestUtils.normalize(json, true);
-assertEquals("/*{}*/", normaliz

svn commit: r1144261 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/URLUtil.java

2011-07-08 Thread lukaszlenart

Author: lukaszlenart
Date: Fri Jul  8 11:13:50 2011
New Revision: 1144261

URL: http://svn.apache.org/viewvc?rev=1144261&view=rev
Log:
WW-3558 - adds support for JBoss VFS protocol

Modified:

struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/URLUtil.java

Modified: 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/URLUtil.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/URLUtil.java?rev=1144261&r1=1144260&r2=1144261&view=diff
==
--- 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/URLUtil.java
 (original)
+++ 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/URLUtil.java
 Fri Jul  8 11:13:50 2011
@@ -28,6 +28,7 @@ public class URLUtil {
 /**
  * Prefix for Jar files in JBoss Virtual File System
  */
+public static final String JBOSS5_VFS = "vfs";
 public static final String JBOSS5_VFSZIP = "vfszip";
 public static final String JBOSS5_VFSMEMORY = "vfsmemory";
 public static final String JBOSS5_VFSFILE = "vfsfile";
@@ -100,8 +101,8 @@ public class URLUtil {
  */
 public static boolean isJBoss5Url(URL fileUrl) {
 final String protocol = fileUrl.getProtocol();
-return JBOSS5_VFSZIP.equals(protocol) || 
JBOSS5_VFSMEMORY.equals(fileUrl.getProtocol())
-|| ("true".equals(System.getProperty("jboss.vfs.forceVfsJar")) 
&& JBOSS5_VFSFILE.equals(fileUrl.getProtocol()));
+return JBOSS5_VFSZIP.equals(protocol) || 
JBOSS5_VFSMEMORY.equals(protocol) || JBOSS5_VFS.equals(protocol)
+|| ("true".equals(System.getProperty("jboss.vfs.forceVfsJar")) 
&& JBOSS5_VFSFILE.equals(protocol));
 }
 
 }

[CONF] Confluence Changes in the last 24 hours

2011-07-08 Thread confluence

This is a daily summary of all recent changes in Confluence.

-
Updated Spaces:
-


Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL)

Pages
-
CronScheduledRoutePolicy edited by  davsclaus  (09:05 AM)
https://cwiki.apache.org/confluence/display/CAMEL/CronScheduledRoutePolicy

Book Getting Started edited by  janstey  (08:05 AM)
https://cwiki.apache.org/confluence/display/CAMEL/Book+Getting+Started

Camel 2.8.0 Release edited by  davsclaus  (06:34 AM)
https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.8.0+Release



Apache CXF Documentation (https://cwiki.apache.org/confluence/display/CXF20DOC)

Pages
-
2.5 Migration Guide created by dkulp (09:59 AM)
https://cwiki.apache.org/confluence/display/CXF20DOC/2.5+Migration+Guide

Migration Guides edited by  dkulp  (09:45 AM)
https://cwiki.apache.org/confluence/display/CXF20DOC/Migration+Guides



Apache Flume (https://cwiki.apache.org/confluence/display/FLUME)

Pages
-
Flume Incubator Status Report - July 2011 created by jmhsieh (05:10 AM)
https://cwiki.apache.org/confluence/display/FLUME/Flume+Incubator+Status+Report+-+July+2011

Project Reports created by jmhsieh (05:07 AM)
https://cwiki.apache.org/confluence/display/FLUME/Project+Reports

Index edited by  jmhsieh  (05:02 AM)
https://cwiki.apache.org/confluence/display/FLUME/Index



Apache ActiveMQ NMS (https://cwiki.apache.org/confluence/display/NMS)

Pages
-
Source edited by  jgomes  (04:31 PM)
https://cwiki.apache.org/confluence/display/NMS/Source



Apache OpenOffice.org Community 
(https://cwiki.apache.org/confluence/display/OOOUSERS)

Pages
-
Bugtracking migration edited by  rbircher  (06:24 PM)
https://cwiki.apache.org/confluence/display/OOOUSERS/Bugtracking+migration



Apache Roller (https://cwiki.apache.org/confluence/display/ROLLER)

Pages
-
Roller GSOC 2011 - mid term project review created by snoopdave (04:07 PM)
https://cwiki.apache.org/confluence/display/ROLLER/Roller+GSOC+2011+-+mid+term+project+review



Apache Sqoop (https://cwiki.apache.org/confluence/display/SQOOP)

Pages
-
Incubator Status Report (July 2011) created by arvind (01:02 AM)
https://cwiki.apache.org/confluence/display/SQOOP/Incubator+Status+Report+%28July+2011%29

Project Reports created by arvind (12:46 AM)
https://cwiki.apache.org/confluence/display/SQOOP/Project+Reports

Home edited by  arvind  (12:40 AM)
https://cwiki.apache.org/confluence/display/SQOOP/Home



Traffic Server (https://cwiki.apache.org/confluence/display/TS)

Pages
-
Continuous Integration edited by  zwoop  (03:52 PM)
https://cwiki.apache.org/confluence/display/TS/Continuous+Integration



UIMA (https://cwiki.apache.org/confluence/display/UIMA)

Pages
-
www.ohnlp.org edited by  james_masanz  (11:58 AM)
https://cwiki.apache.org/confluence/display/UIMA/www.ohnlp.org




Change your notification preferences: 
https://cwiki.apache.org/confluence/users/viewnotifications.action

svn commit: r1144250 - /struts/struts2/trunk/core/src/main/resources/template/simple/dynamic-attributes.ftl

svn commit: r1144259 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/interceptor/validation/ test/java/org/apache/struts2/interceptor/validation/ test/resources/org/apache/struts2/in

svn commit: r1144261 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/URLUtil.java

[CONF] Confluence Changes in the last 24 hours

4 matches

Site Navigation

Mail list logo

Footer information