Modified: struts/struts2/trunk/apps/showcase/src/main/resources/xwork-token.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/xwork-token.xml?rev=418530&r1=418529&r2=418530&view=diff ============================================================================== --- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-token.xml (original) +++ struts/struts2/trunk/apps/showcase/src/main/resources/xwork-token.xml Sat Jul 1 16:58:13 2006 @@ -4,12 +4,12 @@ <package name="token" extends="struts-default" namespace="/token"> - <action name="tokenPrepare" class="org.apache.struts.action2.showcase.token.TokenAction"> + <action name="tokenPrepare" class="org.apache.struts2.showcase.token.TokenAction"> <interceptor-ref name="defaultStack"/> <result name="input">example1.jsp</result> </action> - <action name="transfer" class="org.apache.struts.action2.showcase.token.TokenAction"> + <action name="transfer" class="org.apache.struts2.showcase.token.TokenAction"> <interceptor-ref name="defaultStack"/> <interceptor-ref name="token"/> <result name="invalid.token">doublePost.jsp</result> @@ -18,12 +18,12 @@ - <action name="tokenPrepare2" class="org.apache.struts.action2.showcase.token.TokenAction"> + <action name="tokenPrepare2" class="org.apache.struts2.showcase.token.TokenAction"> <interceptor-ref name="defaultStack"/> <result name="input">example2.jsp</result> </action> - <action name="transfer2" class="org.apache.struts.action2.showcase.token.TokenAction"> + <action name="transfer2" class="org.apache.struts2.showcase.token.TokenAction"> <interceptor-ref name="defaultStack"/> <interceptor-ref name="token"/> <result name="invalid.token">doublePost.jsp</result> @@ -32,12 +32,12 @@ - <action name="tokenPrepare3" class="org.apache.struts.action2.showcase.token.TokenAction"> + <action name="tokenPrepare3" class="org.apache.struts2.showcase.token.TokenAction"> <interceptor-ref name="defaultStack"/> <result name="input">example3.jsp</result> </action> - <action name="transfer3" class="org.apache.struts.action2.showcase.token.TokenAction"> + <action name="transfer3" class="org.apache.struts2.showcase.token.TokenAction"> <interceptor-ref name="defaultStack"/> <interceptor-ref name="token-session"/> <result name="invalid.token">doublePost.jsp</result> @@ -45,13 +45,13 @@ </action> - <action name="tokenPrepare4" class="org.apache.struts.action2.showcase.token.TokenAction"> + <action name="tokenPrepare4" class="org.apache.struts2.showcase.token.TokenAction"> <interceptor-ref name="defaultStack"/> <interceptor-ref name="createSession"/> <!-- we must have a session when using freemarker and the @ww.token tag --> <result name="input" type="freemarker">example4.ftl</result> </action> - <action name="transfer4" class="org.apache.struts.action2.showcase.token.TokenAction"> + <action name="transfer4" class="org.apache.struts2.showcase.token.TokenAction"> <interceptor-ref name="defaultStack"/> <interceptor-ref name="token"/> <result name="invalid.token">doublePost.jsp</result>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/xwork-validation.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/xwork-validation.xml?rev=418530&r1=418529&r2=418530&view=diff ============================================================================== --- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-validation.xml (original) +++ struts/struts2/trunk/apps/showcase/src/main/resources/xwork-validation.xml Sat Jul 1 16:58:13 2006 @@ -6,22 +6,22 @@ <include file="struts-default.xml" /> <package name="validation" extends="struts-default" namespace="/validation"> - <action name="quizBasic" class="org.apache.struts.action2.showcase.validation.QuizAction"> + <action name="quizBasic" class="org.apache.struts2.showcase.validation.QuizAction"> <result name="input">quiz-basic.jsp</result> <result>quiz-success.jsp</result> </action> - <action name="quizClient" class="org.apache.struts.action2.showcase.validation.QuizAction"> + <action name="quizClient" class="org.apache.struts2.showcase.validation.QuizAction"> <result name="input">quiz-client.jsp</result> <result>quiz-success.jsp</result> </action> - <action name="quizClientCss" class="org.apache.struts.action2.showcase.validation.QuizAction"> + <action name="quizClientCss" class="org.apache.struts2.showcase.validation.QuizAction"> <result name="input">quiz-client-css.jsp</result> <result>quiz-success.jsp</result> </action> - <action name="quizAjax" class="org.apache.struts.action2.showcase.validation.QuizAction"> + <action name="quizAjax" class="org.apache.struts2.showcase.validation.QuizAction"> <result name="input">quiz-ajax.jsp</result> <result>quiz-success.jsp</result> </action> @@ -39,11 +39,11 @@ <!-- === Field Validators === --> <!-- ======================== --> - <action name="showFieldValidatorsExamples" class="org.apache.struts.action2.showcase.validation.FieldValidatorsExampleAction" method="input"> + <action name="showFieldValidatorsExamples" class="org.apache.struts2.showcase.validation.FieldValidatorsExampleAction" method="input"> <result name="input" type="dispatcher">/validation/fieldValidatorsExample.jsp</result> </action> - <action name="submitFieldValidatorsExamples" class="org.apache.struts.action2.showcase.validation.FieldValidatorsExampleAction" method="submit"> + <action name="submitFieldValidatorsExamples" class="org.apache.struts2.showcase.validation.FieldValidatorsExampleAction" method="submit"> <result name="input" type="dispatcher">/validation/fieldValidatorsExample.jsp</result> <result type="dispatcher">/validation/successFieldValidatorsExample.jsp</result> </action> @@ -54,11 +54,11 @@ <!-- === Non Field Validators === --> <!-- ============================ --> - <action name="showNonFieldValidatorsExamples" class="org.apache.struts.action2.showcase.validation.NonFieldValidatorsExampleAction" method="input"> + <action name="showNonFieldValidatorsExamples" class="org.apache.struts2.showcase.validation.NonFieldValidatorsExampleAction" method="input"> <result name="input">/validation/nonFieldValidatorsExample.jsp</result> </action> - <action name="submitNonFieldValidatorsExamples" class="org.apache.struts.action2.showcase.validation.NonFieldValidatorsExampleAction" method="submit"> + <action name="submitNonFieldValidatorsExamples" class="org.apache.struts2.showcase.validation.NonFieldValidatorsExampleAction" method="submit"> <result name="input">/validation/nonFieldValidatorsExample.jsp</result> <result>/validation/successNonFieldValidatorsExample.jsp</result> </action> @@ -69,11 +69,11 @@ <!-- === Visitor Validators === --> <!-- ========================== --> - <action name="showVisitorValidatorsExamples" class="org.apache.struts.action2.showcase.validation.VisitorValidatorsExampleAction" method="input"> + <action name="showVisitorValidatorsExamples" class="org.apache.struts2.showcase.validation.VisitorValidatorsExampleAction" method="input"> <result name="input">/validation/visitorValidatorsExample.jsp</result> </action> - <action name="submitVisitorValidatorsExamples" class="org.apache.struts.action2.showcase.validation.VisitorValidatorsExampleAction" method="submit"> + <action name="submitVisitorValidatorsExamples" class="org.apache.struts2.showcase.validation.VisitorValidatorsExampleAction" method="submit"> <result name="input">/validation/visitorValidatorsExample.jsp</result> <result>/validation/successVisitorValidatorsExample.jsp</result> </action> @@ -84,11 +84,11 @@ <!-- === Visitor Validators === --> <!-- ========================== --> - <action name="clientSideValidationExample" class="org.apache.struts.action2.showcase.validation.FieldValidatorsExampleAction" method="input"> + <action name="clientSideValidationExample" class="org.apache.struts2.showcase.validation.FieldValidatorsExampleAction" method="input"> <result name="input">/validation/clientSideValidationExample.jsp</result> </action> - <action name="submitClientSideValidationExample" class="org.apache.struts.action2.showcase.validation.FieldValidatorsExampleAction" method="submit"> + <action name="submitClientSideValidationExample" class="org.apache.struts2.showcase.validation.FieldValidatorsExampleAction" method="submit"> <result name="input">/validation/clientSideValidationExample.jsp</result> <result>/validation/successClientSideValidationExample.jsp</result> </action> Modified: struts/struts2/trunk/apps/showcase/src/main/resources/xwork-wait.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/xwork-wait.xml?rev=418530&r1=418529&r2=418530&view=diff ============================================================================== --- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-wait.xml (original) +++ struts/struts2/trunk/apps/showcase/src/main/resources/xwork-wait.xml Sat Jul 1 16:58:13 2006 @@ -4,14 +4,14 @@ <package name="wait" extends="struts-default" namespace="/wait"> - <action name="longProcess1" class="org.apache.struts.action2.showcase.wait.LongProcessAction"> + <action name="longProcess1" class="org.apache.struts2.showcase.wait.LongProcessAction"> <interceptor-ref name="defaultStack"/> <interceptor-ref name="execAndWait"/> <result name="wait">wait.jsp</result> <result name="success">complete.jsp</result> </action> - <action name="longProcess2" class="org.apache.struts.action2.showcase.wait.LongProcessAction"> + <action name="longProcess2" class="org.apache.struts2.showcase.wait.LongProcessAction"> <interceptor-ref name="defaultStack"/> <interceptor-ref name="execAndWait"> <param name="delay">2000</param> @@ -20,7 +20,7 @@ <result name="success">complete.jsp</result> </action> - <action name="longProcess3" class="org.apache.struts.action2.showcase.wait.LongProcessAction"> + <action name="longProcess3" class="org.apache.struts2.showcase.wait.LongProcessAction"> <interceptor-ref name="defaultStack"/> <interceptor-ref name="execAndWait"> <param name="delay">3000</param> Modified: struts/struts2/trunk/apps/showcase/src/main/resources/xwork.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/xwork.xml?rev=418530&r1=418529&r2=418530&view=diff ============================================================================== --- struts/struts2/trunk/apps/showcase/src/main/resources/xwork.xml (original) +++ struts/struts2/trunk/apps/showcase/src/main/resources/xwork.xml Sat Jul 1 16:58:13 2006 @@ -57,7 +57,7 @@ <result>showcase.jsp</result> </action> - <action name="date" class="org.apache.struts.action2.showcase.DateAction"> + <action name="date" class="org.apache.struts2.showcase.DateAction"> <result name="success">/date.jsp</result> </action> @@ -66,20 +66,20 @@ <package name="skill" extends="default" namespace="/skill"> <default-interceptor-ref name="crudStack"/> - <action name="list" class="org.apache.struts.action2.showcase.action.SkillAction" method="list"> + <action name="list" class="org.apache.struts2.showcase.action.SkillAction" method="list"> <result>/empmanager/listSkills.jsp</result> <interceptor-ref name="basicStack"/> </action> - <action name="edit" class="org.apache.struts.action2.showcase.action.SkillAction"> + <action name="edit" class="org.apache.struts2.showcase.action.SkillAction"> <result>/empmanager/editSkill.jsp</result> <interceptor-ref name="params" /> <interceptor-ref name="basicStack"/> </action> - <action name="save" class="org.apache.struts.action2.showcase.action.SkillAction" method="save"> + <action name="save" class="org.apache.struts2.showcase.action.SkillAction" method="save"> <result name="input">/empmanager/editSkill.jsp</result> <result type="redirect">edit.action?skillName=${currentSkill.name}</result> </action> - <action name="delete" class="org.apache.struts.action2.showcase.action.SkillAction" method="delete"> + <action name="delete" class="org.apache.struts2.showcase.action.SkillAction" method="delete"> <result name="error">/empmanager/editSkill.jsp</result> <result type="redirect">edit.action?skillName=${currentSkill.name}</result> </action> @@ -88,20 +88,20 @@ <package name="employee" extends="default" namespace="/employee"> <default-interceptor-ref name="crudStack"/> - <action name="list" class="org.apache.struts.action2.showcase.action.EmployeeAction" method="list"> + <action name="list" class="org.apache.struts2.showcase.action.EmployeeAction" method="list"> <result>/empmanager/listEmployees.jsp</result> <interceptor-ref name="basicStack"/> </action> - <action name="edit-*" class="org.apache.struts.action2.showcase.action.EmployeeAction"> + <action name="edit-*" class="org.apache.struts2.showcase.action.EmployeeAction"> <param name="empId">{1}</param> <result>/empmanager/editEmployee.jsp</result> <interceptor-ref name="crudStack"><param name="validation.excludeMethods">execute</param></interceptor-ref> </action> - <action name="save" class="org.apache.struts.action2.showcase.action.EmployeeAction" method="save"> + <action name="save" class="org.apache.struts2.showcase.action.EmployeeAction" method="save"> <result name="input">/empmanager/editEmployee.jsp</result> <result type="redirect">edit-${currentEmployee.empId}.action</result> </action> - <action name="delete" class="org.apache.struts.action2.showcase.action.EmployeeAction" method="delete"> + <action name="delete" class="org.apache.struts2.showcase.action.EmployeeAction" method="delete"> <result name="error">/empmanager/editEmployee.jsp</result> <result type="redirect">edit-${currentEmployee.empId}.action</result> </action> Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/applicationContext.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/applicationContext.xml?rev=418530&r1=418529&r2=418530&view=diff ============================================================================== --- struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/applicationContext.xml (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/applicationContext.xml Sat Jul 1 16:58:13 2006 @@ -2,84 +2,84 @@ <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd";> <beans default-autowire="byName"> - <bean id="storage" class="org.apache.struts.action2.showcase.application.MemoryStorage" singleton="true"/> + <bean id="storage" class="org.apache.struts2.showcase.application.MemoryStorage" singleton="true"/> - <bean id="testDataProvider" class="org.apache.struts.action2.showcase.application.TestDataProvider" singleton="true" lazy-init="false"/> + <bean id="testDataProvider" class="org.apache.struts2.showcase.application.TestDataProvider" singleton="true" lazy-init="false"/> - <bean id="skillDao" class="org.apache.struts.action2.showcase.dao.SkillDao"/> - <bean id="employeeDao" class="org.apache.struts.action2.showcase.dao.EmployeeDao"/> + <bean id="skillDao" class="org.apache.struts2.showcase.dao.SkillDao"/> + <bean id="employeeDao" class="org.apache.struts2.showcase.dao.EmployeeDao"/> - <bean id="personManager" class="org.apache.struts.action2.showcase.person.PersonManager" singleton="true"/> + <bean id="personManager" class="org.apache.struts2.showcase.person.PersonManager" singleton="true"/> <!-- Showcase's CustomFreemarkerManager example --> - <bean id="customFreemarkerManager" class="org.apache.struts.action2.showcase.freemarker.CustomFreemarkerManager"> + <bean id="customFreemarkerManager" class="org.apache.struts2.showcase.freemarker.CustomFreemarkerManager"> <constructor-arg index="0"> <ref bean="customFreemarkerManagerUtil" /> </constructor-arg> </bean> - <bean id="customFreemarkerManagerUtil" class="org.apache.struts.action2.showcase.freemarker.CustomFreemarkerManagerUtil" /> + <bean id="customFreemarkerManagerUtil" class="org.apache.struts2.showcase.freemarker.CustomFreemarkerManagerUtil" /> <!-- Chat Example --> - <bean id="chatService" class="org.apache.struts.action2.showcase.chat.ChatServiceImpl"> + <bean id="chatService" class="org.apache.struts2.showcase.chat.ChatServiceImpl"> </bean> - <bean id="chatLoginAction" class="org.apache.struts.action2.showcase.chat.ChatLoginAction" singleton="false"> + <bean id="chatLoginAction" class="org.apache.struts2.showcase.chat.ChatLoginAction" singleton="false"> <constructor-arg index="0"> <ref local="chatService" /> </constructor-arg> </bean> - <bean id="chatLogoutAction" class="org.apache.struts.action2.showcase.chat.ChatLogoutAction" singleton="false"> + <bean id="chatLogoutAction" class="org.apache.struts2.showcase.chat.ChatLogoutAction" singleton="false"> <constructor-arg index="0"> <ref local="chatService" /> </constructor-arg> </bean> - <bean id="usersAvailableAction" class="org.apache.struts.action2.showcase.chat.UsersAvailableAction" singleton="false"> + <bean id="usersAvailableAction" class="org.apache.struts2.showcase.chat.UsersAvailableAction" singleton="false"> <constructor-arg index="0"> <ref local="chatService" /> </constructor-arg> </bean> - <bean id="roomsAvailableAction" class="org.apache.struts.action2.showcase.chat.RoomsAvailableAction" singleton="false"> + <bean id="roomsAvailableAction" class="org.apache.struts2.showcase.chat.RoomsAvailableAction" singleton="false"> <constructor-arg index="0"> <ref local="chatService" /> </constructor-arg> </bean> - <bean id="crudRoomAction" class="org.apache.struts.action2.showcase.chat.CrudRoomAction" singleton="false"> + <bean id="crudRoomAction" class="org.apache.struts2.showcase.chat.CrudRoomAction" singleton="false"> <constructor-arg index="0"> <ref local="chatService" /> </constructor-arg> </bean> - <bean id="enterRoomAction" class="org.apache.struts.action2.showcase.chat.EnterRoomAction" singleton="false"> + <bean id="enterRoomAction" class="org.apache.struts2.showcase.chat.EnterRoomAction" singleton="false"> <constructor-arg index="0"> <ref local="chatService" /> </constructor-arg> </bean> - <bean id="messagesAvailableInRoomAction" class="org.apache.struts.action2.showcase.chat.MessagesAvailableInRoomAction" singleton="false"> + <bean id="messagesAvailableInRoomAction" class="org.apache.struts2.showcase.chat.MessagesAvailableInRoomAction" singleton="false"> <constructor-arg index="0"> <ref local="chatService" /> </constructor-arg> </bean> - <bean id="sendMessageToRoomAction" class="org.apache.struts.action2.showcase.chat.SendMessageToRoomAction" singleton="false"> + <bean id="sendMessageToRoomAction" class="org.apache.struts2.showcase.chat.SendMessageToRoomAction" singleton="false"> <constructor-arg index="0"> <ref local="chatService" /> </constructor-arg> </bean> - <bean id="usersAvailableInRoomAction" class="org.apache.struts.action2.showcase.chat.UsersAvailableInRoomAction" singleton="false"> + <bean id="usersAvailableInRoomAction" class="org.apache.struts2.showcase.chat.UsersAvailableInRoomAction" singleton="false"> <constructor-arg index="0"> <ref local="chatService" /> </constructor-arg> </bean> - <bean id="exitRoomAction" class="org.apache.struts.action2.showcase.chat.ExitRoomAction" singleton="false"> + <bean id="exitRoomAction" class="org.apache.struts2.showcase.chat.ExitRoomAction" singleton="false"> <constructor-arg index="0"> <ref local="chatService" /> </constructor-arg> Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/dwr.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/dwr.xml?rev=418530&r1=418529&r2=418530&view=diff ============================================================================== --- struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/dwr.xml (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/dwr.xml Sat Jul 1 16:58:13 2006 @@ -8,7 +8,7 @@ <dwr> <allow> <create creator="new" javascript="validator"> - <param name="class" value="org.apache.struts.action2.validators.DWRValidator"/> + <param name="class" value="org.apache.struts2.validators.DWRValidator"/> </create> <convert converter="bean" match="com.opensymphony.xwork.ValidationAwareSupport"/> </allow> @@ -16,7 +16,7 @@ <signatures> <![CDATA[ import java.util.Map; - import org.apache.struts.action2.validators.DWRValidator; + import org.apache.struts2.validators.DWRValidator; DWRValidator.doPost(String, String, Map<String, String>); ]]> Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/sitemesh.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/sitemesh.xml?rev=418530&r1=418529&r2=418530&view=diff ============================================================================== --- struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/sitemesh.xml (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/sitemesh.xml Sat Jul 1 16:58:13 2006 @@ -42,7 +42,7 @@ <mapper class="com.opensymphony.module.sitemesh.mapper.FileDecoratorMapper"> </mapper> - <mapper class="org.apache.struts.action2.showcase.sitemesh.NoneDecoratorMapper"> + <mapper class="org.apache.struts2.showcase.sitemesh.NoneDecoratorMapper"> </mapper> <mapper class="com.opensymphony.module.sitemesh.mapper.ConfigDecoratorMapper"> Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml?rev=418530&r1=418529&r2=418530&view=diff ============================================================================== --- struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml Sat Jul 1 16:58:13 2006 @@ -7,12 +7,12 @@ <filter> <filter-name>action2-cleanup</filter-name> - <filter-class>org.apache.struts.action2.dispatcher.ActionContextCleanUp</filter-class> + <filter-class>org.apache.struts2.dispatcher.ActionContextCleanUp</filter-class> </filter> <filter> <filter-name>action2</filter-name> - <filter-class>org.apache.struts.action2.dispatcher.FilterDispatcher</filter-class> + <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class> </filter> <filter> @@ -51,7 +51,7 @@ <!-- Chat Example in Showcase --> <listener> <listener-class> - org.apache.struts.action2.showcase.chat.ChatSessionListener + org.apache.struts2.showcase.chat.ChatSessionListener </listener-class> </listener> @@ -89,15 +89,15 @@ <!-- SNIPPET START: example.velocity.filter.chain <filter> <filter-name>action2-cleanup</filter-name> - <filter-class>org.apache.struts.action2.dispatcher.ActionContextCleanUp</filter-class> + <filter-class>org.apache.struts2.dispatcher.ActionContextCleanUp</filter-class> </filter> <filter> <filter-name>sitemesh</filter-name> - <filter-class>org.apache.struts.action2.sitemesh.VelocityPageFilter</filter-class> + <filter-class>org.apache.struts2.sitemesh.VelocityPageFilter</filter-class> </filter> <filter> <filter-name>action2</filter-name> - <filter-class>org.apache.struts.action2.dispatcher.FilterDispatcher</filter-class> + <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class> </filter> <filter-mapping> @@ -117,15 +117,15 @@ <!-- SNIPPET START: example.freemarker.filter.chain <filter> <filter-name>action2-cleanup</filter-name> - <filter-class>org.apache.struts.action2.dispatcher.ActionContextCleanUp</filter-class> + <filter-class>org.apache.struts2.dispatcher.ActionContextCleanUp</filter-class> </filter> <filter> <filter-name>sitemesh</filter-name> - <filter-class>org.apache.struts.action2.sitemesh.FreeMarkerPageFilter</filter-class> + <filter-class>org.apache.struts2.sitemesh.FreeMarkerPageFilter</filter-class> </filter> <filter> <filter-name>action2</filter-name> - <filter-class>org.apache.struts.action2.dispatcher.FilterDispatcher</filter-class> + <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class> </filter> <filter-mapping> Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/chat/roomSelection.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/chat/roomSelection.ftl?rev=418530&r1=418529&r2=418530&view=diff ============================================================================== --- struts/struts2/trunk/apps/showcase/src/main/webapp/chat/roomSelection.ftl (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/chat/roomSelection.ftl Sat Jul 1 16:58:13 2006 @@ -127,7 +127,7 @@ </#if> <div class="box"> <h3>Users Available In Chat</h3> - <@saf.div id="usersAvailable" delay="1" updateFreq="[EMAIL PROTECTED]@UPDATE_FREQ}" + <@saf.div id="usersAvailable" delay="1" updateFreq="[EMAIL PROTECTED]@UPDATE_FREQ}" theme="ajax" href="/chat/ajax/usersAvailable.action" class="box"> Initial Loading Users ... @@ -140,7 +140,7 @@ <div class="box"> <h3>Rooms Available In Chat</h3> <@saf.div id="roomsAvailable" listenTopics="topicRoomCreated" - delay="1" updateFreq="[EMAIL PROTECTED]@UPDATE_FREQ}" + delay="1" updateFreq="[EMAIL PROTECTED]@UPDATE_FREQ}" theme="ajax" href="/chat/ajax/roomsAvailable.action" > Initial Loading Rooms ... </@saf.div> Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/chat/showRoom.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/chat/showRoom.ftl?rev=418530&r1=418529&r2=418530&view=diff ============================================================================== --- struts/struts2/trunk/apps/showcase/src/main/webapp/chat/showRoom.ftl (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/chat/showRoom.ftl Sat Jul 1 16:58:13 2006 @@ -109,7 +109,7 @@ <div class="box"> <h3>Users Available In Chat</h3> <@saf.div id="usersAvailable" href="/chat/ajax/usersAvailable.action" - theme="ajax" delay="1" updateFreq="[EMAIL PROTECTED]@UPDATE_FREQ}"> + theme="ajax" delay="1" updateFreq="[EMAIL PROTECTED]@UPDATE_FREQ}"> Initial Users Available ... </@saf.div> </div> @@ -122,7 +122,7 @@ <@saf.param name="roomName" value="%{roomName}" /> </@saf.url> <@saf.div id="messagesInRoom" href="%{#url}" includeContext="false" - theme="ajax" delay="1" updateFreq="[EMAIL PROTECTED]@UPDATE_FREQ}" + theme="ajax" delay="1" updateFreq="[EMAIL PROTECTED]@UPDATE_FREQ}" listenTopics="topicMessageSend"> Initial Messages In Room ... </@saf.div> @@ -147,7 +147,7 @@ <@saf.param name="roomName" value="%{roomName}" /> </@saf.url> <@saf.div id="usersAvailableInRoom" href="%{#url}" includeContext="false" - theme="ajax" delay="1" updateFreq="[EMAIL PROTECTED]@UPDATE_FREQ}"> + theme="ajax" delay="1" updateFreq="[EMAIL PROTECTED]@UPDATE_FREQ}"> Initial Users Available In Room ... </@saf.div> </div> Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/conversion/Person.java.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/conversion/Person.java.txt?rev=418530&r1=418529&r2=418530&view=diff ============================================================================== --- struts/struts2/trunk/apps/showcase/src/main/webapp/conversion/Person.java.txt (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/conversion/Person.java.txt Sat Jul 1 16:58:13 2006 @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.showcase.conversion; +package org.apache.struts2.showcase.conversion; import java.io.Serializable; Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/conversion/PersonAction.java.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/conversion/PersonAction.java.txt?rev=418530&r1=418529&r2=418530&view=diff ============================================================================== --- struts/struts2/trunk/apps/showcase/src/main/webapp/conversion/PersonAction.java.txt (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/conversion/PersonAction.java.txt Sat Jul 1 16:58:13 2006 @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.showcase.conversion; +package org.apache.struts2.showcase.conversion; import java.util.List; Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/token/index.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/token/index.jsp?rev=418530&r1=418529&r2=418530&view=diff ============================================================================== --- struts/struts2/trunk/apps/showcase/src/main/webapp/token/index.jsp (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/token/index.jsp Sat Jul 1 16:58:13 2006 @@ -14,8 +14,8 @@ from time to time. This token is then validated with the HttpSession that it is the first time it is submitted, if not we have a double post and therefore can prevent the second submit action. <p/> - For more information check out javadoc for org.apache.struts.action2.interceptor.TokenInterceptor - and org.apache.struts.action2.interceptor.TokenSessionStoreInterceptor. + For more information check out javadoc for org.apache.struts2.interceptor.TokenInterceptor + and org.apache.struts2.interceptor.TokenSessionStoreInterceptor. <br/> <br/><a href="tokenPrepare!input.action">Example 1 (token based .jsp example)</a> Modified: struts/struts2/trunk/apps/starter/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/starter/pom.xml?rev=418530&r1=418529&r2=418530&view=diff ============================================================================== --- struts/struts2/trunk/apps/starter/pom.xml (original) +++ struts/struts2/trunk/apps/starter/pom.xml Sat Jul 1 16:58:13 2006 @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.struts.action2</groupId> + <groupId>org.apache.struts2</groupId> <artifactId>struts-apps</artifactId> <version>2.0-SNAPSHOT</version> </parent> - <groupId>org.apache.struts.action2</groupId> + <groupId>org.apache.struts2</groupId> <artifactId>struts-starter</artifactId> <packaging>war</packaging> <name>Starter Webapp</name> Modified: struts/struts2/trunk/apps/starter/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/starter/src/main/webapp/WEB-INF/web.xml?rev=418530&r1=418529&r2=418530&view=diff ============================================================================== --- struts/struts2/trunk/apps/starter/src/main/webapp/WEB-INF/web.xml (original) +++ struts/struts2/trunk/apps/starter/src/main/webapp/WEB-INF/web.xml Sat Jul 1 16:58:13 2006 @@ -7,7 +7,7 @@ <!-- START SNIPPET: example --> <filter> <filter-name>action2</filter-name> - <filter-class>org.apache.struts.action2.dispatcher.FilterDispatcher</filter-class> + <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class> </filter> <filter-mapping> @@ -24,7 +24,7 @@ <!-- START SNIPPET: freemarkerSupport --> <servlet> <servlet-name>JspSupportServlet</servlet-name> - <servlet-class>org.apache.struts.action2.views.JspSupportServlet</servlet-class> + <servlet-class>org.apache.struts2.views.JspSupportServlet</servlet-class> <load-on-startup>1</load-on-startup> </servlet> <!-- END SNIPPET: freemarkerSupport --> @@ -32,7 +32,7 @@ <!-- START SNIPPET: compatibility <servlet> <servlet-name>action</servlet-name> - <servlet-class>org.apache.struts.action2.dispatcher.ServletDispatcher</servlet-class> + <servlet-class>org.apache.struts2.dispatcher.ServletDispatcher</servlet-class> </servlet> <servlet-mapping>
