[1/3] struts git commit: WW-4556 Extracts tooltips into dedicated template file
Repository: struts
Updated Branches:
refs/heads/support-2-3 f65e38bb8 -> 095807776
WW-4556 Extracts tooltips into dedicated template file
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c7088763
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c7088763
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c7088763
Branch: refs/heads/support-2-3
Commit: c7088763395f14c2f7f610ad6a872fcfec026a1b
Parents: f65e38b
Author: Lukasz Lenart
Authored: Tue Oct 27 08:25:36 2015 +0100
Committer: Lukasz Lenart
Committed: Tue Oct 27 08:25:36 2015 +0100
--
.../template/simple/form-close-tooltips.ftl | 30
.../resources/template/simple/form-close.ftl| 11 +--
2 files changed, 31 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/c7088763/core/src/main/resources/template/simple/form-close-tooltips.ftl
--
diff --git a/core/src/main/resources/template/simple/form-close-tooltips.ftl
b/core/src/main/resources/template/simple/form-close-tooltips.ftl
new file mode 100644
index 000..993d034
--- /dev/null
+++ b/core/src/main/resources/template/simple/form-close-tooltips.ftl
@@ -0,0 +1,30 @@
+<#--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
+
+<#--
+ Code that will add javascript needed for tooltips
+--><#t/>
+<#if (parameters.hasTooltip?default(false))><#t/>
+ <#lt/>
+ <#lt/>
+ <#lt/>"/>
+
+<#t/>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/c7088763/core/src/main/resources/template/simple/form-close.ftl
--
diff --git a/core/src/main/resources/template/simple/form-close.ftl
b/core/src/main/resources/template/simple/form-close.ftl
index 360eef9..2f8fcec 100644
--- a/core/src/main/resources/template/simple/form-close.ftl
+++ b/core/src/main/resources/template/simple/form-close.ftl
@@ -101,13 +101,4 @@
-
-<#--
- Code that will add javascript needed for tooltips
---><#t/>
-<#if (parameters.hasTooltip?default(false))><#t/>
- <#lt/>
- <#lt/>
- <#lt/>"/>
-
-<#t/>
\ No newline at end of file
+<#include
"/${parameters.templateDir}/${parameters.expandTheme}/form-close-tooltips.ftl"
/>
[3/3] struts git commit: WW-4134 Checks if Response wasn't committed to allow store messages
WW-4134 Checks if Response wasn't committed to allow store messages
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/09580777
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/09580777
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/09580777
Branch: refs/heads/support-2-3
Commit: 095807776288ce982ee064f820de428cd3969761
Parents: 7848534
Author: Lukasz Lenart
Authored: Tue Oct 27 09:01:09 2015 +0100
Committer: Lukasz Lenart
Committed: Tue Oct 27 09:01:09 2015 +0100
--
.../interceptor/MessageStoreInterceptor.java | 18 --
.../interceptor/MessageStoreInterceptorTest.java | 15 +++
2 files changed, 27 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/09580777/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
--
diff --git
a/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
b/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
index b7509f0..f34cee0 100644
---
a/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
+++
b/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
@@ -26,6 +26,7 @@ import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.Map;
+import org.apache.struts2.ServletActionContext;
import org.apache.struts2.dispatcher.ServletRedirectResult;
import com.opensymphony.xwork2.ActionContext;
@@ -273,14 +274,16 @@ public class MessageStoreInterceptor extends
AbstractInterceptor {
String reqOperationMode = getRequestOperationMode(invocation);
boolean isRedirect = invocation.getResult() instanceof
ServletRedirectResult;
+boolean isCommitted = ServletActionContext.getResponse().isCommitted();
+
if (STORE_MODE.equalsIgnoreCase(reqOperationMode) ||
STORE_MODE.equalsIgnoreCase(operationMode) ||
(AUTOMATIC_MODE.equalsIgnoreCase(operationMode) &&
isRedirect)) {
Object action = invocation.getAction();
-if (action instanceof ValidationAware) {
+if (action instanceof ValidationAware && !isCommitted) {
// store error / messages into session
-Map session = (Map)
invocation.getInvocationContext().get(ActionContext.SESSION);
+Map session =
invocation.getInvocationContext().getSession();
if (session == null) {
if (LOG.isDebugEnabled()) {
@@ -297,14 +300,17 @@ public class MessageStoreInterceptor extends
AbstractInterceptor {
session.put(actionErrorsSessionKey,
validationAwareAction.getActionErrors());
session.put(actionMessagesSessionKey,
validationAwareAction.getActionMessages());
session.put(fieldErrorsSessionKey,
validationAwareAction.getFieldErrors());
-}
-else if(LOG.isDebugEnabled()) {
- LOG.debug("Action ["+action+"] is not ValidationAware, no
message / error that are storeable");
+
+} else if(LOG.isDebugEnabled()) {
+if (isCommitted) {
+LOG.debug("Response was already committed, cannot store
messages!");
+} else {
+LOG.debug("Action [" + action + "] is not ValidationAware,
no message / error that are storeable");
+}
}
}
}
-
/**
* Get the operationMode through request paramter, if
allowRequestParameterSwitch
* is 'true', else it simply returns 'NONE', meaning its neither in the
'STORE_MODE' nor
http://git-wip-us.apache.org/repos/asf/struts/blob/09580777/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java
--
diff --git
a/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java
b/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java
index 3ba76c2..d5e339a 100644
---
a/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java
+++
b/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java
@@ -27,6 +27,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsInternalTestCase;
import org.apache.struts2.dispatcher.ServletActionRedirectResult;
import org.easymock.EasyMock;
@@ -36,6 +37,8 @@ import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionSupport;
[2/3] struts git commit: WW-4554 Drops duplicated calls to initialize BeanPostProcessors It's already done by Spring
WW-4554 Drops duplicated calls to initialize BeanPostProcessors
It's already done by Spring
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/7848534e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/7848534e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/7848534e
Branch: refs/heads/support-2-3
Commit: 7848534e2f2a8cf4aa956d27b6cf672f36cfacfe
Parents: c708876
Author: Lukasz Lenart
Authored: Tue Oct 27 08:27:25 2015 +0100
Committer: Lukasz Lenart
Committed: Tue Oct 27 08:27:25 2015 +0100
--
.../java/com/opensymphony/xwork2/spring/SpringObjectFactory.java | 2 --
1 file changed, 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/7848534e/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java
index 56f6b53..c05d635 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java
@@ -192,9 +192,7 @@ public class SpringObjectFactory extends ObjectFactory
implements ApplicationCon
return bean;
} else {
bean = autoWiringFactory.autowire(clazz,
AutowireCapableBeanFactory.AUTOWIRE_CONSTRUCTOR, false);
-bean =
autoWiringFactory.applyBeanPostProcessorsBeforeInitialization(bean,
bean.getClass().getName());
bean = autoWiringFactory.initializeBean(bean,
bean.getClass().getName());
-bean =
autoWiringFactory.applyBeanPostProcessorsAfterInitialization(bean,
bean.getClass().getName());
return autoWireBean(bean, autoWiringFactory);
}
} catch (UnsatisfiedDependencyException e) {
struts-site git commit: add Aleksandr to commiter list
Repository: struts-site Updated Branches: refs/heads/master e6e6d83ea -> 8bce64e7d add Aleksandr to commiter list Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/8bce64e7 Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/8bce64e7 Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/8bce64e7 Branch: refs/heads/master Commit: 8bce64e7deb78d9d8590adf6c5aa7da89fac3b86 Parents: e6e6d83 Author: Rene Gielen Authored: Tue Oct 27 11:55:08 2015 +0100 Committer: Rene Gielen Committed: Tue Oct 27 11:55:08 2015 +0100 -- source/volunteers.md | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/struts-site/blob/8bce64e7/source/volunteers.md -- diff --git a/source/volunteers.md b/source/volunteers.md index 15f8c61..3ca1437 100644 --- a/source/volunteers.md +++ b/source/volunteers.md @@ -47,6 +47,7 @@ Other committers are listed in the chronological order, according to the date ea - John Lindal (jafl at apache.org) - Bruce A. Phillips (bphillips at apache.org) - Greg Huber (ghuber at apache.org) +- Aleksandr Mashchenko (amashchenko at apache.org) ## Emeritus Volunteers
svn commit: r970366 - /websites/production/struts/content/volunteers.html
Author: rgielen Date: Tue Oct 27 10:56:56 2015 New Revision: 970366 Log: add Aleksandr to commiter list Modified: websites/production/struts/content/volunteers.html Modified: websites/production/struts/content/volunteers.html == --- websites/production/struts/content/volunteers.html (original) +++ websites/production/struts/content/volunteers.html Tue Oct 27 10:56:56 2015 @@ -165,6 +165,7 @@ or committee member. John Lindal (jafl at apache.org) Bruce A. Phillips (bphillips at apache.org) Greg Huber (ghuber at apache.org) + Aleksandr Mashchenko (amashchenko at apache.org) Emeritus Volunteers
