svn commit: r803974 - /struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java
Author: musachy Date: Thu Aug 13 18:11:52 2009 New Revision: 803974 URL: http://svn.apache.org/viewvc?rev=803974&view=rev Log: Fix failing test Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptorTest.java 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=803974&r1=803973&r2=803974&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 Thu Aug 13 18:11:52 2009 @@ -148,7 +148,8 @@ StrutsMockServletContext servletContext = new StrutsMockServletContext(); context.put(StrutsStatics.SERVLET_CONTEXT, servletContext); -invocation = new MockActionInvocation(); +invocation = new MockActionInvocation(); +ActionContext.getContext().setActionInvocation(invocation); invocation.setAction(action); invocation.setInvocationContext(context); MockActionProxy proxy = new MockActionProxy();
[OSS Bamboo] Struts 2 SVN - Main Build build 1191 has FAILED (8 tests failed, 6 failures were new). Change made by Musachy Barroso
--- STRUTS-MAIN-1191 failed. --- Code has been updated by Musachy Barroso. 8/1023 tests failed. http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-1191/ -- Code Changes -- Musachy Barroso (803974): >Fix failing test -- Tests -- Failed Tests (8) - FormTagTest: Form with custom onsubmit enabled with validate enabled1 (New) - FormTagTest: Form with custom onsubmit enabled with validate enabled3 (New) - FormTagTest: Form with custom onsubmit enabled with validate enabled4 (New) - AnnotationValidationInterceptorTest: Should not skip (New) - AnnotationValidationInterceptorTest: Should not skip base (New) - FormTest: Test form get validators (New) - PackageBasedActionConfigBuilderTest: Action packages (Existing) - PackageBasedActionConfigBuilderTest: Package locators (Existing) -- Error Summary -- [INFO] [ERROR] BUILD FAILURE [INFO] [INFO] There are test failures. [INFO] [INFO] For more information, run Maven with the -e switch -- This message is automatically generated by Atlassian Bamboo
[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 933 has FAILED (8 tests failed, 6 failures were new). Change made by Musachy Barroso
--- STRUTS-MAINJ6-933 failed. --- Code has been updated by Musachy Barroso. 8/1023 tests failed. http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-933/ -- Code Changes -- Musachy Barroso (803974): >Fix failing test -- Tests -- Failed Tests (8) - FormTagTest: Form with custom onsubmit enabled with validate enabled1 (New) - FormTagTest: Form with custom onsubmit enabled with validate enabled3 (New) - FormTagTest: Form with custom onsubmit enabled with validate enabled4 (New) - AnnotationValidationInterceptorTest: Should not skip (New) - AnnotationValidationInterceptorTest: Should not skip base (New) - FormTest: Test form get validators (New) - PackageBasedActionConfigBuilderTest: Action packages (Existing) - PackageBasedActionConfigBuilderTest: Package locators (Existing) Fixed Tests (1) - UIComponentTest: Form component dispose itself from component stack -- Error Summary -- [INFO] [ERROR] BUILD FAILURE [INFO] [INFO] There are test failures. [INFO] [INFO] For more information, run Maven with the -e switch -- This message is automatically generated by Atlassian Bamboo
svn commit: r803993 - in /struts/sandbox/trunk/struts2-jquery-plugin: ./ src/main/java/org/apache/struts2/jquery/ src/main/java/org/apache/struts2/jquery/freemarker/ src/main/java/org/apache/struts2/j
Author: wesw
Date: Thu Aug 13 19:12:07 2009
New Revision: 803993
URL: http://svn.apache.org/viewvc?rev=803993&view=rev
Log:
added freemarker <@sjx.tag support for existing tags.
Added:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/JQueryStrutsModels.java
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/JQueryTaglib.java
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/freemarker/
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/freemarker/models/
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/freemarker/models/JQueryFreemarkerModel.java
Modified:
struts/sandbox/trunk/struts2-jquery-plugin/ (props changed)
struts/sandbox/trunk/struts2-jquery-plugin/pom.xml
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/struts-plugin.xml
Propchange: struts/sandbox/trunk/struts2-jquery-plugin/
--
--- svn:ignore (added)
+++ svn:ignore Thu Aug 13 19:12:07 2009
@@ -0,0 +1,5 @@
+.*
+*.iml
+*.ipr
+*.iws
+target
Modified: struts/sandbox/trunk/struts2-jquery-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jquery-plugin/pom.xml?rev=803993&r1=803992&r2=803993&view=diff
==
--- struts/sandbox/trunk/struts2-jquery-plugin/pom.xml (original)
+++ struts/sandbox/trunk/struts2-jquery-plugin/pom.xml Thu Aug 13 19:12:07 2009
@@ -5,7 +5,7 @@
org.apache.struts
struts2-plugins
-2.1.7-SNAPSHOT
+2.1.8-SNAPSHOT
org.apache.struts
struts2-jquery-plugin
@@ -48,6 +48,7 @@
install
+
org.apache.maven.plugins
maven-resources-plugin
Added:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/JQueryStrutsModels.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/JQueryStrutsModels.java?rev=803993&view=auto
==
---
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/JQueryStrutsModels.java
(added)
+++
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/JQueryStrutsModels.java
Thu Aug 13 19:12:07 2009
@@ -0,0 +1,84 @@
+package org.apache.struts2.jquery;
+
+import com.opensymphony.xwork2.util.ValueStack;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts2.jquery.freemarker.models.JQueryFreemarkerModel;
+import org.apache.struts2.jquery.components.JQueryForm;
+import org.apache.struts2.jquery.components.JQueryHead;
+import org.apache.struts2.jquery.components.JQueryReset;
+import org.apache.struts2.jquery.components.JQuerySubmit;
+import org.apache.struts2.jquery.components.JQueryTextField;
+import org.apache.struts2.jquery.components.JQueryDatepicker;
+
+/**
+ * Describe your class here
+ *
+ * @author $Author$
+ *
+ * $Id$
+ */
+public class JQueryStrutsModels {
+
+protected ValueStack stack;
+protected HttpServletRequest req;
+protected HttpServletResponse res;
+
+protected JQueryFreemarkerModel form;
+protected JQueryFreemarkerModel head;
+protected JQueryFreemarkerModel reset;
+protected JQueryFreemarkerModel submit;
+protected JQueryFreemarkerModel textfield;
+protected JQueryFreemarkerModel datepicker;
+
+public JQueryStrutsModels(ValueStack stack, HttpServletRequest req,
HttpServletResponse res) {
+this.stack = stack;
+this.req = req;
+this.res = res;
+}
+
+public JQueryFreemarkerModel getForm() {
+if (form == null ) {
+form = new JQueryFreemarkerModel(stack, req, res,
JQueryForm.class);
+}
+return form;
+}
+
+public JQueryFreemarkerModel getHead() {
+if (head == null ) {
+head = new JQueryFreemarkerModel(stack, req, res,
JQueryHead.class);
+}
+return head;
+}
+
+public JQueryFreemarkerModel getReset() {
+if (reset == null ) {
+reset = new JQueryFreemarkerModel(stack, req, res,
JQueryReset.class);
+}
+return reset;
+}
+
+public JQueryFreemarkerModel getSubmit() {
+if (submit == null ) {
+submit = new JQueryFreemarkerModel(stack, req, res,
JQuerySubmit.class);
+}
+return submit;
+}
+
+public JQueryFreemarkerModel getTextfield() {
+if (textfield == null ) {
+textfield = new JQueryFreemarkerModel(stack, req, res,
JQueryTextField.class);
+}
+return textfield;
+}
+
+public JQueryFreemarkerMod
[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 934 has FAILED (8 tests failed, no failures were new). Change made by Musachy Barroso
--- STRUTS-MAINJ6-934 failed. --- Code has been updated by Musachy Barroso. 8/1029 tests failed. http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-934/ -- Code Changes -- Musachy Barroso (804072): >WW-2802 Unselected multi-select boxes do not post back request parameters, >therefore the associated attributes do not get cleared > >thanks to Tim Stavenger for the patch -- Tests -- Failed Tests (8) - FormTagTest: Form with custom onsubmit enabled with validate enabled1 (Existing) - FormTagTest: Form with custom onsubmit enabled with validate enabled3 (Existing) - FormTagTest: Form with custom onsubmit enabled with validate enabled4 (Existing) - AnnotationValidationInterceptorTest: Should not skip (Existing) - AnnotationValidationInterceptorTest: Should not skip base (Existing) - PackageBasedActionConfigBuilderTest: Action packages (Existing) - PackageBasedActionConfigBuilderTest: Package locators (Existing) - FormTest: Test form get validators (Existing) -- Error Summary -- [INFO] [ERROR] BUILD FAILURE [INFO] [INFO] There are test failures. [INFO] [INFO] For more information, run Maven with the -e switch -- This message is automatically generated by Atlassian Bamboo
[OSS Bamboo] Struts 2 SVN - Main Build build 1192 has FAILED (8 tests failed, no failures were new). Change made by Musachy Barroso
--- STRUTS-MAIN-1192 failed. --- Code has been updated by Musachy Barroso. 8/1029 tests failed. http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-1192/ -- Code Changes -- Musachy Barroso (804072): >WW-2802 Unselected multi-select boxes do not post back request parameters, >therefore the associated attributes do not get cleared > >thanks to Tim Stavenger for the patch -- Tests -- Failed Tests (8) - FormTagTest: Form with custom onsubmit enabled with validate enabled1 (Existing) - FormTagTest: Form with custom onsubmit enabled with validate enabled3 (Existing) - FormTagTest: Form with custom onsubmit enabled with validate enabled4 (Existing) - AnnotationValidationInterceptorTest: Should not skip (Existing) - AnnotationValidationInterceptorTest: Should not skip base (Existing) - PackageBasedActionConfigBuilderTest: Action packages (Existing) - PackageBasedActionConfigBuilderTest: Package locators (Existing) - FormTest: Test form get validators (Existing) -- Error Summary -- [INFO] [ERROR] BUILD FAILURE [INFO] [INFO] There are test failures. [INFO] [INFO] For more information, run Maven with the -e switch -- This message is automatically generated by Atlassian Bamboo
