diff --recursive --exclude '*svn*' ./s20111/pom.xml ./s212port/pom.xml
65c65
<             <plugin>
---
>             <!--plugin>
100c100
<             </plugin>
---
>             </plugin-->
486c486
<         <dependency>
---
>         <!--dependency>
490,491c490,491
<         </dependency>
<         <dependency>
---
>         </dependency-->
>         <!--dependency>
495c495
<         </dependency>
---
>         </dependency-->
978c978
<         <aspectj.version>1.6.0</aspectj.version>
---
>         <!--aspectj.version>1.6.0</aspectj.version-->
999c999
<         <struts.version>2.0.11.1</struts.version>
---
>         <struts.version>2.1.2</struts.version>
diff --recursive --exclude '*svn*' ./s20111/src/main/java/com/mycompany/app/webapp/action/BaseActionTestCase.java ./s212port/src/main/java/com/mycompany/app/webapp/action/BaseActionTestCase.java
3,12c3,16
< import com.opensymphony.xwork2.ActionContext;
< import com.opensymphony.xwork2.util.LocalizedTextUtil;
< import org.apache.commons.logging.Log;
< import org.apache.struts2.ServletActionContext;
< import com.mycompany.app.Constants;
< import org.springframework.mail.javamail.JavaMailSenderImpl;
< import org.springframework.mock.web.MockHttpServletRequest;
< import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests;
< 
< import java.util.HashMap;
---
> import com.mycompany.app.*;
> import com.opensymphony.xwork2.*;
> import com.opensymphony.xwork2.config.*;
> import com.opensymphony.xwork2.config.providers.*;
> import com.opensymphony.xwork2.inject.*;
> import com.opensymphony.xwork2.util.*;
> 
> import java.util.*;
> 
> import org.apache.commons.logging.*;
> import org.apache.struts2.*;
> import org.springframework.mail.javamail.*;
> import org.springframework.mock.web.*;
> import org.springframework.test.*;
37a42,52
>         
>         ConfigurationManager configurationManager = new ConfigurationManager(); 
>         configurationManager.addContainerProvider(
>             new XWorkConfigurationProvider()); 
>         Configuration config = configurationManager.getConfiguration(); 
>         Container container = config.getContainer();
> 
>         ValueStack stack = container.getInstance(ValueStackFactory.class)
>             .createValueStack(); 
>         stack.getContext().put(ActionContext.CONTAINER, container); 
>         ActionContext.setContext(new ActionContext(stack.getContext()));                 
diff --recursive --exclude '*svn*' ./s20111/src/main/java/com/mycompany/app/webapp/action/DateConverter.java ./s212port/src/main/java/com/mycompany/app/webapp/action/DateConverter.java
9c9
< import com.opensymphony.xwork2.util.TypeConversionException;
---
> import com.opensymphony.xwork2.conversion.TypeConversionException;
29c29
< } 
\ No newline at end of file
---
> } 
diff --recursive --exclude '*svn*' ./s20111/src/main/resources/struts.xml ./s212port/src/main/resources/struts.xml
26c26
<                 <interceptor-ref name="servlet-config"/>
---
>                 <interceptor-ref name="servletConfig"/>
32,33c32,33
<                 <interceptor-ref name="scoped-model-driven"/>
<                 <interceptor-ref name="model-driven"/>
---
>                 <interceptor-ref name="scopedModelDriven"/>
>                 <interceptor-ref name="modelDriven"/>
36c36,37
<                 <interceptor-ref name="static-params"/>
---
>                 <interceptor-ref name="staticParams"/>
>                 <interceptor-ref name="actionMappingParams"/>
38c39
<                     <param name="excludeParams">dojo\..*</param>
---
>                   <param name="excludeParams">dojo\..*</param>
42c43
<                     <param name="excludeMethods">cancel,execute,delete,edit,list</param>
---
>                     <param name="excludeMethods">input,back,cancel,browse,execute,delete,edit,list</param>
59c60
<             <result name="mainMenu" type="redirect-action">mainMenu</result>
---
>             <result name="mainMenu" type="redirectAction">mainMenu</result>
79c80
<             <result name="success" type="redirect-action">/mainMenu</result>
---
>             <result name="success" type="redirectAction">/mainMenu</result>
94c95
<             <result name="cancel" type="redirect-action">admin/users</result>
---
>             <result name="cancel" type="redirectAction">admin/users</result>
96c97
<             <result name="success" type="redirect-action">admin/users</result>
---
>             <result name="success" type="redirectAction">admin/users</result>
103c104
<             <result name="cancel" type="redirect-action">mainMenu</result>
---
>             <result name="cancel" type="redirectAction">mainMenu</result>
diff --recursive --exclude '*svn*' ./s20111/src/main/webapp/WEB-INF/pages/admin/userList.jsp ./s212port/src/main/webapp/WEB-INF/pages/admin/userList.jsp
19a20,21
> <s:set name="users" value="users" scope="request"/>
> 
diff --recursive --exclude '*svn*' ./s20111/src/main/webapp/WEB-INF/web.xml ./s212port/src/main/webapp/WEB-INF/web.xml
111a112,115
>         <init-param>
>             <param-name>actionPackages</param-name>
>             <param-value>*</param-value>
>         </init-param>