This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch feature/WW-3714-rename
in repository https://gitbox.apache.org/repos/asf/struts.git
omit 284558ee8 WW-3714 Moves all classes from com.opensymphony.xwork2 into
org.apache.struts2
add ae34e2c7e WW-3714 Moves all classes from com.opensymphony.xwork2 into
org.apache.struts2
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (284558ee8)
\
N -- N -- N refs/heads/feature/WW-3714-rename (ae34e2c7e)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.../struts2/{ => test}/util/StrutsUtilTest.java | 4 +-
.../org/apache/struts2/util/ResolverUtilTest.java | 4 +-
.../apache/struts2/util/Cat-conversion.properties | 4 +-
core/src/test/resources/xwork - jar.jar | Bin 4396 -> 2042 bytes
core/src/test/resources/xwork - zip.zip | Bin 3184 -> 2653 bytes
core/src/test/resources/xwork-jar.jar | Bin 4396 -> 2026 bytes
core/src/test/resources/xwork-zip.zip | Bin 3152 -> 2645 bytes
.../struts2}/spring/SpringObjectFactory.java | 0
.../spring/SpringProxyableObjectFactory.java | 0
.../interceptor/ActionAutowiringInterceptor.java | 0
.../spring/src/main/resources/struts-plugin.xml | 19 ++---
.../spring/StrutsSpringObjectFactoryTest.java | 2 +-
.../xwork2/spring/emptyContext-spring.xml | 25 ------
.../struts2}/spring/actionContext-spring.xml | 84 ++++++++++++---------
.../apache/struts2}/spring/actionContext-xwork.xml | 28 +++----
...licationContext.xml => emptyContext-spring.xml} | 0
16 files changed, 82 insertions(+), 88 deletions(-)
rename core/src/test/java/org/apache/struts2/{ =>
test}/util/StrutsUtilTest.java (98%)
rename plugins/spring/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/spring/SpringObjectFactory.java (100%)
rename plugins/spring/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/spring/SpringProxyableObjectFactory.java (100%)
rename plugins/spring/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/spring/interceptor/ActionAutowiringInterceptor.java (100%)
delete mode 100644
plugins/spring/src/test/resources/com/opensymphony/xwork2/spring/emptyContext-spring.xml
rename plugins/spring/src/test/resources/{com/opensymphony/xwork2 =>
org/apache/struts2}/spring/actionContext-spring.xml (55%)
rename plugins/spring/src/test/resources/{com/opensymphony/xwork2 =>
org/apache/struts2}/spring/actionContext-xwork.xml (76%)
rename
plugins/spring/src/test/resources/org/apache/struts2/spring/{StrutsSpringObjectFactoryTest-applicationContext.xml
=> emptyContext-spring.xml} (100%)
