Author: mrdon
Date: Sun Sep 24 11:22:48 2006
New Revision: 449451
URL: http://svn.apache.org/viewvc?view=rev&rev=449451
Log:
Adding back the deleted integration code, finished the legacy -> integration
renaming
Added:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/
- copied from r449435,
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/EditGangsterAction.java
- copied, changed from r449443,
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/EditGangsterAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/GangsterForm.java
- copied, changed from r449443,
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/GangsterForm.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/SaveGangsterAction.java
- copied, changed from r449443,
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/SaveGangsterAction.java
struts/struts2/trunk/apps/showcase/src/main/resources/struts-integration.xml
- copied, changed from r449435,
struts/struts2/trunk/apps/showcase/src/main/resources/struts-legacy.xml
struts/struts2/trunk/apps/showcase/src/main/webapp/integration/
- copied from r449435,
struts/struts2/trunk/apps/showcase/src/main/webapp/legacy/
struts/struts2/trunk/apps/showcase/src/main/webapp/integration/modelDriven.jsp
- copied, changed from r449443,
struts/struts2/trunk/apps/showcase/src/main/webapp/legacy/modelDriven.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/integration/modelDrivenResult.jsp
- copied, changed from r449443,
struts/struts2/trunk/apps/showcase/src/main/webapp/legacy/modelDrivenResult.jsp
struts/struts2/trunk/integration/src/test/resources/org/apache/struts2/s1/
- copied from r449450,
struts/struts2/trunk/integration/src/test/resources/org/apache/struts2/legacy/
Removed:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/
struts/struts2/trunk/apps/showcase/src/main/resources/struts-legacy.xml
struts/struts2/trunk/apps/showcase/src/main/webapp/legacy/
struts/struts2/trunk/integration/src/test/resources/org/apache/struts2/legacy/
Modified:
struts/struts2/trunk/apps/showcase/pom.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml
struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/ActionFormResetInterceptor.java
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/ActionFormValidationInterceptor.java
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/DynaBeanPropertyAccessor.java
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/LegacyAction.java
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/StrutsFactory.java
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/WrapperActionForward.java
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/WrapperActionMapping.java
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/WrapperExceptionConfig.java
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/WrapperModuleConfig.java
struts/struts2/trunk/integration/src/main/resources/struts-default.xml
struts/struts2/trunk/integration/src/test/java/org/apache/struts2/s1/DynaBeanPropertyAccessorTest.java
struts/struts2/trunk/integration/src/test/java/org/apache/struts2/s1/StrutsFactoryTest.java
struts/struts2/trunk/integration/src/test/resources/org/apache/struts2/s1/test-struts-factory.xml
Modified: struts/struts2/trunk/apps/showcase/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?view=diff&rev=449451&r1=449450&r2=449451
==============================================================================
--- struts/struts2/trunk/apps/showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/showcase/pom.xml Sun Sep 24 11:22:48 2006
@@ -26,7 +26,7 @@
<dependency>
<groupId>org.apache.struts</groupId>
- <artifactId>struts2-legacy</artifactId>
+ <artifactId>struts2-integration</artifactId>
<version>${pom.version}</version>
</dependency>
Copied:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/EditGangsterAction.java
(from r449443,
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/EditGangsterAction.java)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/EditGangsterAction.java?view=diff&rev=449451&p1=struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/EditGangsterAction.java&r1=449443&p2=struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/EditGangsterAction.java&r2=449451
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/EditGangsterAction.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/EditGangsterAction.java
Sun Sep 24 11:22:48 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts2.showcase.legacy;
+package org.apache.struts2.showcase.integration;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Copied:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/GangsterForm.java
(from r449443,
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/GangsterForm.java)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/GangsterForm.java?view=diff&rev=449451&p1=struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/GangsterForm.java&r1=449443&p2=struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/GangsterForm.java&r2=449451
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/GangsterForm.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/GangsterForm.java
Sun Sep 24 11:22:48 2006
@@ -1,4 +1,4 @@
-package org.apache.struts2.showcase.legacy;
+package org.apache.struts2.showcase.integration;
import javax.servlet.http.HttpServletRequest;
Copied:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/SaveGangsterAction.java
(from r449443,
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/SaveGangsterAction.java)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/SaveGangsterAction.java?view=diff&rev=449451&p1=struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/SaveGangsterAction.java&r1=449443&p2=struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/SaveGangsterAction.java&r2=449451
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/legacy/SaveGangsterAction.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/SaveGangsterAction.java
Sun Sep 24 11:22:48 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts2.showcase.legacy;
+package org.apache.struts2.showcase.integration;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Copied:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-integration.xml
(from r449435,
struts/struts2/trunk/apps/showcase/src/main/resources/struts-legacy.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-integration.xml?view=diff&rev=449451&p1=struts/struts2/trunk/apps/showcase/src/main/resources/struts-legacy.xml&r1=449435&p2=struts/struts2/trunk/apps/showcase/src/main/resources/struts-integration.xml&r2=449451
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-legacy.xml
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/resources/struts-integration.xml
Sun Sep 24 11:22:48 2006
@@ -5,14 +5,14 @@
"http://struts.apache.org/dtds/struts-2.0.dtd";>
<struts>
- <package name="legacy" extends="struts-default,struts-legacy-default"
namespace="/legacy">
+ <package name="integration"
extends="struts-default,struts-integration-default" namespace="/integration">
<interceptors>
<interceptor name="gangsterForm"
class="com.opensymphony.xwork2.interceptor.ScopedModelDrivenInterceptor">
- <param
name="className">org.apache.struts2.showcase.legacy.GangsterForm</param>
+ <param
name="className">org.apache.struts2.showcase.integration.GangsterForm</param>
</interceptor>
- <interceptor-stack name="legacy">
+ <interceptor-stack name="integration">
<interceptor-ref name="static-params"/>
<interceptor-ref name="gangsterForm"/>
<interceptor-ref name="model-driven"/>
@@ -23,18 +23,18 @@
</interceptor-stack>
</interceptors>
- <default-interceptor-ref name="legacy" />
+ <default-interceptor-ref name="integration" />
<default-action-ref name="editGangster" />
<!-- Diplay entry page that uses Model-Driven technique -->
- <action name="editGangster"
class="org.apache.struts2.legacy.LegacyAction">
- <param
name="className">org.apache.struts2.showcase.legacy.EditGangsterAction</param>
+ <action name="editGangster"
class="org.apache.struts2.s1.LegacyAction">
+ <param
name="className">org.apache.struts2.showcase.integration.EditGangsterAction</param>
<result>modelDriven.jsp</result>
</action>
<!-- Display the result page whose content is populated using
the Model-Driven technique -->
- <action name="saveGangster"
class="org.apache.struts2.legacy.LegacyAction">
- <param
name="className">org.apache.struts2.showcase.legacy.SaveGangsterAction</param>
+ <action name="saveGangster"
class="org.apache.struts2.s1.LegacyAction">
+ <param
name="className">org.apache.struts2.showcase.integration.SaveGangsterAction</param>
<param name="validate">true</param>
<result name="input">modelDriven.jsp</result>
<result>modelDrivenResult.jsp</result>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml?view=diff&rev=449451&r1=449450&r2=449451
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml Sun Sep 24
11:22:48 2006
@@ -38,7 +38,7 @@
<include file="struts-model-driven.xml" />
- <include file="struts-legacy.xml" />
+ <include file="struts-integration.xml" />
<include file="struts-filedownload.xml" />
Copied:
struts/struts2/trunk/apps/showcase/src/main/webapp/integration/modelDriven.jsp
(from r449443,
struts/struts2/trunk/apps/showcase/src/main/webapp/legacy/modelDriven.jsp)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/integration/modelDriven.jsp?view=diff&rev=449451&p1=struts/struts2/trunk/apps/showcase/src/main/webapp/legacy/modelDriven.jsp&r1=449443&p2=struts/struts2/trunk/apps/showcase/src/main/webapp/integration/modelDriven.jsp&r2=449451
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/legacy/modelDriven.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/integration/modelDriven.jsp
Sun Sep 24 11:22:48 2006
@@ -2,12 +2,12 @@
<html>
<head>
-<title>Showcase - Legacy Example</title>
+<title>Showcase - Struts 1 Integration Example</title>
<s:head/>
</head>
<body>
-<s:form action="saveGangster" method="POST" namespace="/legacy">
+<s:form action="saveGangster" method="POST" namespace="/integration">
<s:textfield
label="Gangster Name"
Copied:
struts/struts2/trunk/apps/showcase/src/main/webapp/integration/modelDrivenResult.jsp
(from r449443,
struts/struts2/trunk/apps/showcase/src/main/webapp/legacy/modelDrivenResult.jsp)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/integration/modelDrivenResult.jsp?view=diff&rev=449451&p1=struts/struts2/trunk/apps/showcase/src/main/webapp/legacy/modelDrivenResult.jsp&r1=449443&p2=struts/struts2/trunk/apps/showcase/src/main/webapp/integration/modelDrivenResult.jsp&r2=449451
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/legacy/modelDrivenResult.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/integration/modelDrivenResult.jsp
Sun Sep 24 11:22:48 2006
@@ -2,7 +2,7 @@
<html>
<head>
-<title>Showcase - Legacy Example</title>
+<title>Showcase - Struts 1 Integration Example</title>
<s:head/>
</head>
<body>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp?view=diff&rev=449451&r1=449450&r2=449451
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp Sun Sep 24
11:22:48 2006
@@ -66,8 +66,8 @@
<!-- JavaServer Faces -->
<li><s:url id="url" value="/jsf" /><s:a href="%{#url}">JavaServer
Faces Example</s:a></li>
- <!-- Legacy -->
- <li><s:url id="url" value="/legacy" /><s:a href="%{#url}">Legacy
Struts 1.3 Example</s:a></li>
+ <!-- Integration -->
+ <li><s:url id="url" action="editGangster"
namespace="/integration"/><s:a href="%{#url}">Struts 1.3 Integration
Example</s:a></li>
<!-- Chat (AJAX) Example -->
<li><s:url id="url" value="/chat" /><s:a href="%{#url}">Chat (AJAX)
Example</s:a></li>
Modified:
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/ActionFormResetInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/ActionFormResetInterceptor.java?view=diff&rev=449451&r1=449450&r2=449451
==============================================================================
---
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/ActionFormResetInterceptor.java
(original)
+++
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/ActionFormResetInterceptor.java
Sun Sep 24 11:22:48 2006
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.struts2.legacy;
+package org.apache.struts2.s1;
import javax.servlet.http.HttpServletRequest;
Modified:
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/ActionFormValidationInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/ActionFormValidationInterceptor.java?view=diff&rev=449451&r1=449450&r2=449451
==============================================================================
---
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/ActionFormValidationInterceptor.java
(original)
+++
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/ActionFormValidationInterceptor.java
Sun Sep 24 11:22:48 2006
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.struts2.legacy;
+package org.apache.struts2.s1;
import javax.servlet.http.HttpServletRequest;
Modified:
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/DynaBeanPropertyAccessor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/DynaBeanPropertyAccessor.java?view=diff&rev=449451&r1=449450&r2=449451
==============================================================================
---
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/DynaBeanPropertyAccessor.java
(original)
+++
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/DynaBeanPropertyAccessor.java
Sun Sep 24 11:22:48 2006
@@ -16,7 +16,7 @@
*
*/
-package org.apache.struts2.legacy;
+package org.apache.struts2.s1;
import java.io.Serializable;
import org.apache.commons.beanutils.DynaBean;
Modified:
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/LegacyAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/LegacyAction.java?view=diff&rev=449451&r1=449450&r2=449451
==============================================================================
---
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/LegacyAction.java
(original)
+++
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/LegacyAction.java
Sun Sep 24 11:22:48 2006
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.struts2.legacy;
+package org.apache.struts2.s1;
import java.util.Arrays;
import java.util.Iterator;
Modified:
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/StrutsFactory.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/StrutsFactory.java?view=diff&rev=449451&r1=449450&r2=449451
==============================================================================
---
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/StrutsFactory.java
(original)
+++
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/StrutsFactory.java
Sun Sep 24 11:22:48 2006
@@ -16,7 +16,7 @@
*
*/
-package org.apache.struts2.legacy;
+package org.apache.struts2.s1;
import com.opensymphony.xwork2.*;
import com.opensymphony.xwork2.config.Configuration;
Modified:
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/WrapperActionForward.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/WrapperActionForward.java?view=diff&rev=449451&r1=449450&r2=449451
==============================================================================
---
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/WrapperActionForward.java
(original)
+++
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/WrapperActionForward.java
Sun Sep 24 11:22:48 2006
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.struts2.legacy;
+package org.apache.struts2.s1;
import org.apache.struts.action.ActionForward;
import com.opensymphony.xwork2.config.entities.ResultConfig;
Modified:
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/WrapperActionMapping.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/WrapperActionMapping.java?view=diff&rev=449451&r1=449450&r2=449451
==============================================================================
---
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/WrapperActionMapping.java
(original)
+++
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/WrapperActionMapping.java
Sun Sep 24 11:22:48 2006
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.struts2.legacy;
+package org.apache.struts2.s1;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionForward;
Modified:
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/WrapperExceptionConfig.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/WrapperExceptionConfig.java?view=diff&rev=449451&r1=449450&r2=449451
==============================================================================
---
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/WrapperExceptionConfig.java
(original)
+++
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/WrapperExceptionConfig.java
Sun Sep 24 11:22:48 2006
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.struts2.legacy;
+package org.apache.struts2.s1;
import com.opensymphony.xwork2.config.entities.ExceptionMappingConfig;
import org.apache.struts.config.ExceptionConfig;
Modified:
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/WrapperModuleConfig.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/WrapperModuleConfig.java?view=diff&rev=449451&r1=449450&r2=449451
==============================================================================
---
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/WrapperModuleConfig.java
(original)
+++
struts/struts2/trunk/integration/src/main/java/org/apache/struts2/s1/WrapperModuleConfig.java
Sun Sep 24 11:22:48 2006
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.struts2.legacy;
+package org.apache.struts2.s1;
import java.util.HashMap;
import java.util.Iterator;
Modified: struts/struts2/trunk/integration/src/main/resources/struts-default.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/integration/src/main/resources/struts-default.xml?view=diff&rev=449451&r1=449450&r2=449451
==============================================================================
--- struts/struts2/trunk/integration/src/main/resources/struts-default.xml
(original)
+++ struts/struts2/trunk/integration/src/main/resources/struts-default.xml Sun
Sep 24 11:22:48 2006
@@ -5,7 +5,7 @@
"http://struts.apache.org/dtds/struts-2.0.dtd";>
<struts>
- <package name="struts-legacy-default">
+ <package name="struts-integration-default">
<interceptors>
<interceptor name="actionForm-reset"
class="org.apache.struts2.s1.ActionFormResetInterceptor"/>
Modified:
struts/struts2/trunk/integration/src/test/java/org/apache/struts2/s1/DynaBeanPropertyAccessorTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/integration/src/test/java/org/apache/struts2/s1/DynaBeanPropertyAccessorTest.java?view=diff&rev=449451&r1=449450&r2=449451
==============================================================================
---
struts/struts2/trunk/integration/src/test/java/org/apache/struts2/s1/DynaBeanPropertyAccessorTest.java
(original)
+++
struts/struts2/trunk/integration/src/test/java/org/apache/struts2/s1/DynaBeanPropertyAccessorTest.java
Sun Sep 24 11:22:48 2006
@@ -1,4 +1,4 @@
-package org.apache.struts2.legacy;
+package org.apache.struts2.s1;
import junit.framework.*;
import java.io.*;
Modified:
struts/struts2/trunk/integration/src/test/java/org/apache/struts2/s1/StrutsFactoryTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/integration/src/test/java/org/apache/struts2/s1/StrutsFactoryTest.java?view=diff&rev=449451&r1=449450&r2=449451
==============================================================================
---
struts/struts2/trunk/integration/src/test/java/org/apache/struts2/s1/StrutsFactoryTest.java
(original)
+++
struts/struts2/trunk/integration/src/test/java/org/apache/struts2/s1/StrutsFactoryTest.java
Sun Sep 24 11:22:48 2006
@@ -1,4 +1,4 @@
-package org.apache.struts2.legacy;
+package org.apache.struts2.s1;
import java.lang.reflect.InvocationTargetException;
@@ -27,7 +27,7 @@
*/
public class StrutsFactoryTest extends TestCase {
- private static final String PACKAGE_NAME = "org/apache/struts2/legacy";
+ private static final String PACKAGE_NAME = "org/apache/struts2/s1";
protected StrutsFactory factory = null;
protected Configuration config;
Modified:
struts/struts2/trunk/integration/src/test/resources/org/apache/struts2/s1/test-struts-factory.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/integration/src/test/resources/org/apache/struts2/s1/test-struts-factory.xml?view=diff&rev=449451&r1=449450&r2=449451
==============================================================================
---
struts/struts2/trunk/integration/src/test/resources/org/apache/struts2/s1/test-struts-factory.xml
(original)
+++
struts/struts2/trunk/integration/src/test/resources/org/apache/struts2/s1/test-struts-factory.xml
Sun Sep 24 11:22:48 2006
@@ -6,7 +6,7 @@
<!-- Used by the TestStrutsFactory TestCase. -->
<struts>
- <package name="org/apache/struts2/legacy"
namespace="/org/apache/struts2/legacy">
+ <package name="org/apache/struts2/s1" namespace="/org/apache/struts2/s1">
<result-types>
<result-type
class="org.apache.struts2.dispatcher.ServletDispatcherResult"
name="servletDispatcherResult"/>
</result-types>
