You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mr...@apache.org on 2006/07/02 01:58:22 UTC
svn commit: r418530 [1/3] - in /struts/struts2/trunk/apps: ./ blank/
blank/src/main/java/org/apache/struts/
blank/src/main/java/org/apache/struts2/
blank/src/main/java/org/apache/struts2/example/ blank/src/main/resources/
blank/src/main/webapp/WEB-INF/...
Author: mrdon
Date: Sat Jul 1 16:58:13 2006
New Revision: 418530
URL: http://svn.apache.org/viewvc?rev=418530&view=rev
Log:
Renamed org.apache.struts.action2 package to org.apache.struts2 for apps
WW-1367
Added:
struts/struts2/trunk/apps/blank/src/main/java/org/apache/struts2/
- copied from r418510, struts/struts2/trunk/apps/blank/src/main/java/org/apache/struts/action2/
struts/struts2/trunk/apps/blank/src/main/java/org/apache/struts2/example/
- copied from r418529, struts/struts2/trunk/apps/blank/src/main/java/org/apache/struts/action2/example/
struts/struts2/trunk/apps/blank/src/test/java/org/apache/struts2/
- copied from r418510, struts/struts2/trunk/apps/blank/src/test/java/org/apache/struts/action2/
struts/struts2/trunk/apps/blank/src/test/java/org/apache/struts2/example/
- copied from r418529, struts/struts2/trunk/apps/blank/src/test/java/org/apache/struts/action2/example/
struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/
- copied from r418529, struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts/action2/
struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/
- copied from r418529, struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts/action2/
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/
- copied from r418529, struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/
struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/
- copied from r418529, struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts/action2/
Removed:
struts/struts2/trunk/apps/blank/src/main/java/org/apache/struts/
struts/struts2/trunk/apps/blank/src/test/java/org/apache/struts/
struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts/
struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts/
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts/
struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts/
Modified:
struts/struts2/trunk/apps/blank/pom.xml
struts/struts2/trunk/apps/blank/src/main/java/org/apache/struts2/example/HomeAction.java
struts/struts2/trunk/apps/blank/src/main/resources/xwork.xml
struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/classes/xwork.xml
struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml
struts/struts2/trunk/apps/blank/src/test/java/org/apache/struts2/example/HomeActionTest.java
struts/struts2/trunk/apps/pom.xml
struts/struts2/trunk/apps/portlet/pom.xml
struts/struts2/trunk/apps/portlet/src/main/etc/exo/web.xml
struts/struts2/trunk/apps/portlet/src/main/etc/gridsphere/web.xml
struts/struts2/trunk/apps/portlet/src/main/etc/liferay3.6.1/web.xml
struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/ExampleAction.java
struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExample.java
struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleWithValidation.java
struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormResultAction.java
struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormTestAction.java
struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/SavePrefsAction.java
struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/SpringAction.java
struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/ThingManager.java
struts/struts2/trunk/apps/portlet/src/main/java/xwork.xml
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/applicationContext.xml
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/dwr.xml
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/portlet.xml
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml
struts/struts2/trunk/apps/shopping-cart/pom.xml
struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/AbstractModifyCartAction.java
struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ActiveCategory.java
struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/SetActiveCategory.java
struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ShowCart.java
struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ShowCatalog.java
struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/UpdateQuantityInCart.java
struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/cart/DefaultCart.java
struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/cart/ShoppingCart.java
struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/catalog/Catalog.java
struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/catalog/Category.java
struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/catalog/Identifiable.java
struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/catalog/Product.java
struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/catalog/TestCatalog.java
struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/applicationContext.xml
struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/dwr.xml
struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/web.xml
struts/struts2/trunk/apps/showcase/pom.xml
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DynamicTreeSelectAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/Guess.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfOptiontransferselectAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfRichtexteditorAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ShowDynamicTreeAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain1.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain2.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain3.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AjaxTestAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Category.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/GetCategory.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Toggle.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/MemoryStorage.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/Storage.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/TestDataProvider.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatAuthenticationInterceptor.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatException.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatInterceptor.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLoginAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLogoutAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatMessage.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatService.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatServiceImpl.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatSessionListener.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/Constants.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/CrudRoomAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/DateConverter.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/EnterRoomAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ExitRoomAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/MessagesAvailableInRoomAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/Room.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/RoomsAvailableAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/SendMessageToRoomAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/User.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableInRoomAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/Person.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/PersonAction-conversion.properties
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/PersonAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/AbstractDao.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/Dao.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/EmployeeDao.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/SkillDao.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/exception/CreateException.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/exception/DeleteException.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/exception/DuplicateKeyException.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/exception/StorageException.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/exception/UpdateException.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManager.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManagerUtil.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/jsf/JsfEmployeeAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/Employee.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/IdEntity.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/Skill.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/Gangster.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/CreatePerson.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPerson-conversion.properties
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPerson.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeople.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/Person.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/PersonManager.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/sitemesh/NoneDecoratorMapper.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actionPrefix/SubmitAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actiontag/ActionTagDemo.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AbstractValidationActionSupport.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/User.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction.java
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/wait/LongProcessAction.java
struts/struts2/trunk/apps/showcase/src/main/resources/log4j.properties
struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/ChatMessage-conversion.properties
struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/Room-conversion.properties
struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/conversion/PersonAction-conversion.properties
struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/person/EditPerson-conversion.properties
struts/struts2/trunk/apps/showcase/src/main/resources/struts.properties
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-actionchaining.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-ajax.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-chat.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-continuations.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-conversion.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-filedownload.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-fileupload.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-jsf.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-model-driven.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-person.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-tags-non-ui.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-tags-ui.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-token.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-validation.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork-wait.xml
struts/struts2/trunk/apps/showcase/src/main/resources/xwork.xml
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/applicationContext.xml
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/dwr.xml
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/sitemesh.xml
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml
struts/struts2/trunk/apps/showcase/src/main/webapp/chat/roomSelection.ftl
struts/struts2/trunk/apps/showcase/src/main/webapp/chat/showRoom.ftl
struts/struts2/trunk/apps/showcase/src/main/webapp/conversion/Person.java.txt
struts/struts2/trunk/apps/showcase/src/main/webapp/conversion/PersonAction.java.txt
struts/struts2/trunk/apps/showcase/src/main/webapp/token/index.jsp
struts/struts2/trunk/apps/starter/pom.xml
struts/struts2/trunk/apps/starter/src/main/webapp/WEB-INF/web.xml
Modified: struts/struts2/trunk/apps/blank/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/pom.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/blank/pom.xml (original)
+++ struts/struts2/trunk/apps/blank/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-blank</artifactId>
<packaging>war</packaging>
<name>Blank Webapp</name>
Modified: struts/struts2/trunk/apps/blank/src/main/java/org/apache/struts2/example/HomeAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/java/org/apache/struts2/example/HomeAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/blank/src/main/java/org/apache/struts2/example/HomeAction.java (original)
+++ struts/struts2/trunk/apps/blank/src/main/java/org/apache/struts2/example/HomeAction.java 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.example;
+package org.apache.struts2.example;
import com.opensymphony.xwork.ActionSupport;
Modified: struts/struts2/trunk/apps/blank/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/resources/xwork.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/blank/src/main/resources/xwork.xml (original)
+++ struts/struts2/trunk/apps/blank/src/main/resources/xwork.xml Sat Jul 1 16:58:13 2006
@@ -7,7 +7,7 @@
<default-action-ref name="home" />
- <action name="home" class="org.apache.struts.action2.example.HomeAction">
+ <action name="home" class="org.apache.struts2.example.HomeAction">
<result>/WEB-INF/pages/home.jsp</result>
</action>
Modified: struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/classes/xwork.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/classes/xwork.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/classes/xwork.xml (original)
+++ struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/classes/xwork.xml Sat Jul 1 16:58:13 2006
@@ -7,7 +7,7 @@
<default-action-ref name="home" />
- <action name="home" class="org.apache.struts.action2.example.HomeAction">
+ <action name="home" class="org.apache.struts2.example.HomeAction">
<result>/WEB-INF/pages/home.jsp</result>
</action>
Modified: struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml (original)
+++ struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml Sat Jul 1 16:58:13 2006
@@ -6,7 +6,7 @@
<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/blank/src/test/java/org/apache/struts2/example/HomeActionTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/test/java/org/apache/struts2/example/HomeActionTest.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/blank/src/test/java/org/apache/struts2/example/HomeActionTest.java (original)
+++ struts/struts2/trunk/apps/blank/src/test/java/org/apache/struts2/example/HomeActionTest.java 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.example;
+package org.apache.struts2.example;
import junit.framework.TestCase;
Modified: struts/struts2/trunk/apps/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/pom.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/pom.xml (original)
+++ struts/struts2/trunk/apps/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>
- <artifactId>struts-action2-parent</artifactId>
+ <groupId>org.apache.struts2</groupId>
+ <artifactId>struts2-parent</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.struts.action2</groupId>
+ <groupId>org.apache.struts2</groupId>
<artifactId>struts-apps</artifactId>
<packaging>pom</packaging>
<name>Webapps</name>
@@ -121,7 +121,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.struts.action2</groupId>
+ <groupId>org.apache.struts2</groupId>
<artifactId>struts-core</artifactId>
<version>${pom.version}</version>
</dependency>
Modified: struts/struts2/trunk/apps/portlet/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/pom.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/pom.xml (original)
+++ struts/struts2/trunk/apps/portlet/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-portlet</artifactId>
<packaging>war</packaging>
<name>Portlet Webapp</name>
Modified: struts/struts2/trunk/apps/portlet/src/main/etc/exo/web.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/etc/exo/web.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/etc/exo/web.xml (original)
+++ struts/struts2/trunk/apps/portlet/src/main/etc/exo/web.xml Sat Jul 1 16:58:13 2006
@@ -10,7 +10,7 @@
<filter>
<filter-name>action2</filter-name>
<filter-class>
- org.apache.struts.action2.dispatcher.FilterDispatcher
+ org.apache.struts2.dispatcher.FilterDispatcher
</filter-class>
</filter>
@@ -25,7 +25,7 @@
</listener>
<listener>
<listener-class>
- org.apache.struts.action2.portlet.context.ServletContextHolderListener
+ org.apache.struts2.portlet.context.ServletContextHolderListener
</listener-class>
</listener>
<listener>
@@ -37,7 +37,7 @@
<servlet>
<servlet-name>preparator</servlet-name>
<servlet-class>
- org.apache.struts.action2.portlet.context.PreparatorServlet
+ org.apache.struts2.portlet.context.PreparatorServlet
</servlet-class>
</servlet>
<servlet>
Modified: struts/struts2/trunk/apps/portlet/src/main/etc/gridsphere/web.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/etc/gridsphere/web.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/etc/gridsphere/web.xml (original)
+++ struts/struts2/trunk/apps/portlet/src/main/etc/gridsphere/web.xml Sat Jul 1 16:58:13 2006
@@ -10,7 +10,7 @@
<filter>
<filter-name>action2</filter-name>
<filter-class>
- org.apache.struts.action2.dispatcher.FilterDispatcher
+ org.apache.struts2.dispatcher.FilterDispatcher
</filter-class>
</filter>
@@ -25,7 +25,7 @@
</listener>
<listener>
<listener-class>
- org.apache.struts.action2.portlet.context.ServletContextHolderListener
+ org.apache.struts2.portlet.context.ServletContextHolderListener
</listener-class>
</listener>
<listener>
@@ -37,7 +37,7 @@
<servlet>
<servlet-name>preparator</servlet-name>
<servlet-class>
- org.apache.struts.action2.portlet.context.PreparatorServlet
+ org.apache.struts2.portlet.context.PreparatorServlet
</servlet-class>
</servlet>
<servlet>
Modified: struts/struts2/trunk/apps/portlet/src/main/etc/liferay3.6.1/web.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/etc/liferay3.6.1/web.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/etc/liferay3.6.1/web.xml (original)
+++ struts/struts2/trunk/apps/portlet/src/main/etc/liferay3.6.1/web.xml Sat Jul 1 16:58:13 2006
@@ -13,7 +13,7 @@
<filter>
<filter-name>action2</filter-name>
<filter-class>
- org.apache.struts.action2.dispatcher.FilterDispatcher
+ org.apache.struts2.dispatcher.FilterDispatcher
</filter-class>
</filter>
@@ -33,7 +33,7 @@
</listener>
<listener>
<listener-class>
- org.apache.struts.action2.portlet.context.ServletContextHolderListener
+ org.apache.struts2.portlet.context.ServletContextHolderListener
</listener-class>
</listener>
@@ -46,7 +46,7 @@
<init-param>
<param-name>portlet-class</param-name>
<param-value>
- org.apache.struts.action2.portlet.dispatcher.Jsr168Dispatcher
+ org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher
</param-value>
</init-param>
<load-on-startup>0</load-on-startup>
@@ -55,7 +55,7 @@
<servlet>
<servlet-name>preparator</servlet-name>
<servlet-class>
- org.apache.struts.action2.portlet.context.PreparatorServlet
+ org.apache.struts2.portlet.context.PreparatorServlet
</servlet-class>
</servlet>
<servlet>
Modified: struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/ExampleAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/ExampleAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/ExampleAction.java (original)
+++ struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/ExampleAction.java 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.portlet.example;
+package org.apache.struts2.portlet.example;
import java.util.Map;
Modified: struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExample.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExample.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExample.java (original)
+++ struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExample.java 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.portlet.example;
+package org.apache.struts2.portlet.example;
import com.opensymphony.xwork.ActionSupport;
Modified: struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleWithValidation.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleWithValidation.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleWithValidation.java (original)
+++ struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleWithValidation.java 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.portlet.example;
+package org.apache.struts2.portlet.example;
import com.opensymphony.xwork.ActionSupport;
Modified: struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormResultAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormResultAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormResultAction.java (original)
+++ struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormResultAction.java Sat Jul 1 16:58:13 2006
@@ -15,14 +15,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.portlet.example;
+package org.apache.struts2.portlet.example;
import java.util.Collection;
import java.util.Map;
import javax.portlet.RenderRequest;
-import org.apache.struts.action2.portlet.context.PortletActionContext;
+import org.apache.struts2.portlet.context.PortletActionContext;
import com.opensymphony.xwork.ActionSupport;
/**
Modified: struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormTestAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormTestAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormTestAction.java (original)
+++ struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormTestAction.java 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.portlet.example;
+package org.apache.struts2.portlet.example;
import com.opensymphony.xwork.ActionSupport;
Modified: struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/SavePrefsAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/SavePrefsAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/SavePrefsAction.java (original)
+++ struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/SavePrefsAction.java Sat Jul 1 16:58:13 2006
@@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.portlet.example;
+package org.apache.struts2.portlet.example;
import javax.portlet.ActionRequest;
import javax.portlet.PortletPreferences;
-import org.apache.struts.action2.portlet.context.PortletActionContext;
+import org.apache.struts2.portlet.context.PortletActionContext;
import com.opensymphony.xwork.ActionSupport;
/**
Modified: struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/SpringAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/SpringAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/SpringAction.java (original)
+++ struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/SpringAction.java 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.portlet.example.spring;
+package org.apache.struts2.portlet.example.spring;
import java.util.List;
Modified: struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/ThingManager.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/ThingManager.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/ThingManager.java (original)
+++ struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/ThingManager.java 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.portlet.example.spring;
+package org.apache.struts2.portlet.example.spring;
import java.util.ArrayList;
import java.util.List;
Modified: struts/struts2/trunk/apps/portlet/src/main/java/xwork.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/java/xwork.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/java/xwork.xml (original)
+++ struts/struts2/trunk/apps/portlet/src/main/java/xwork.xml Sat Jul 1 16:58:13 2006
@@ -13,14 +13,14 @@
</action>
<action name="formExample"
- class="org.apache.struts.action2.portlet.example.FormExample" method="input">
+ class="org.apache.struts2.portlet.example.FormExample" method="input">
<result name="input">
/WEB-INF/view/formExampleInput.jsp
</result>
</action>
<action name="processFormExample"
- class="org.apache.struts.action2.portlet.example.FormExample">
+ class="org.apache.struts2.portlet.example.FormExample">
<result name="input">
/WEB-INF/view/formExampleInput.jsp
</result>
@@ -30,14 +30,14 @@
</action>
<action name="validationExample"
- class="org.apache.struts.action2.portlet.example.FormExample" method="input">
+ class="org.apache.struts2.portlet.example.FormExample" method="input">
<result name="input">
/WEB-INF/view/formExampleInputValidation.jsp
</result>
</action>
<action name="processValidationExample"
- class="org.apache.struts.action2.portlet.example.FormExample">
+ class="org.apache.struts2.portlet.example.FormExample">
<result name="success">
/WEB-INF/view/formExample.jsp
</result>
@@ -95,11 +95,11 @@
</action>
<action name="processFreeMarkerExample"
- class="org.apache.struts.action2.portlet.example.FormExample">
+ class="org.apache.struts2.portlet.example.FormExample">
<result name="success">/view/processFreeMarkerView.action?firstName=${firstName}&lastName=${lastName}</result>
</action>
- <action name="processFreeMarkerView" class="org.apache.struts.action2.portlet.example.FormExample">
+ <action name="processFreeMarkerView" class="org.apache.struts2.portlet.example.FormExample">
<result type="freemarker" name="success">/WEB-INF/view/freeMarkerExample.ftl</result>
</action>
@@ -120,14 +120,14 @@
<result name="success">/WEB-INF/edit/test.jsp</result>
</action>
<action name="formExampleEdit"
- class="org.apache.struts.action2.portlet.example.FormExample" method="input">
+ class="org.apache.struts2.portlet.example.FormExample" method="input">
<result name="input">
/WEB-INF/edit/formExampleInput.jsp
</result>
</action>
<action name="processFormExampleEdit"
- class="org.apache.struts.action2.portlet.example.FormExample">
+ class="org.apache.struts2.portlet.example.FormExample">
<result name="input">
/WEB-INF/edtt/formExampleInput.jsp
</result>
@@ -137,7 +137,7 @@
</action>
<action name="processFormExampleForward"
- class="org.apache.struts.action2.portlet.example.FormExample">
+ class="org.apache.struts2.portlet.example.FormExample">
<result name="success">
/WEB-INF/edit/formExample.jsp
</result>
Modified: struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/applicationContext.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/applicationContext.xml Sat Jul 1 16:58:13 2006
@@ -7,10 +7,10 @@
<beans default-autowire="autodetect">
<bean id="thingManager"
- class="org.apache.struts.action2.portlet.example.spring.ThingManager">
+ class="org.apache.struts2.portlet.example.spring.ThingManager">
</bean>
<bean id="springAction"
- class="org.apache.struts.action2.portlet.example.spring.SpringAction" singleton="false">
+ class="org.apache.struts2.portlet.example.spring.SpringAction" singleton="false">
<property name="thingManager">
<ref bean="thingManager" />
</property>
Modified: struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/dwr.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/dwr.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/dwr.xml (original)
+++ struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/dwr.xml Sat Jul 1 16:58:13 2006
@@ -5,7 +5,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>
@@ -13,7 +13,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/portlet/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/portlet.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/portlet.xml (original)
+++ struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/portlet.xml Sat Jul 1 16:58:13 2006
@@ -6,7 +6,7 @@
<portlet-name>StrutsPortlet</portlet-name>
<display-name xml:lang="EN">Struts Action 2.0 Test Portlet</display-name>
- <portlet-class>org.apache.struts.action2.portlet.dispatcher.Jsr168Dispatcher</portlet-class>
+ <portlet-class>org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher</portlet-class>
<init-param>
<!-- The view mode namespace. Maps to a namespace in the xwork config file -->
@@ -63,7 +63,7 @@
<portlet-name>StrutsPortlet2</portlet-name>
<display-name xml:lang="EN">Struts Action 2 Test Portlet2</display-name>
- <portlet-class>org.apache.struts.action2.portlet.dispatcher.Jsr168Dispatcher</portlet-class>
+ <portlet-class>org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher</portlet-class>
<init-param>
<!-- The view mode namespace. Maps to a namespace in the xwork config file -->
Modified: struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml (original)
+++ struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml Sat Jul 1 16:58:13 2006
@@ -9,7 +9,7 @@
<filter id="filterdispatcher">
<filter-name>action2</filter-name>
<filter-class>
- org.apache.struts.action2.dispatcher.FilterDispatcher
+ org.apache.struts2.dispatcher.FilterDispatcher
</filter-class>
</filter>
@@ -25,7 +25,7 @@
</listener>
<listener>
<listener-class>
- org.apache.struts.action2.portlet.context.ServletContextHolderListener
+ org.apache.struts2.portlet.context.ServletContextHolderListener
</listener-class>
</listener>
@@ -33,7 +33,7 @@
<servlet id="preparator">
<servlet-name>preparator</servlet-name>
<servlet-class>
- org.apache.struts.action2.portlet.context.PreparatorServlet
+ org.apache.struts2.portlet.context.PreparatorServlet
</servlet-class>
</servlet>
<servlet id="dwr">
Modified: struts/struts2/trunk/apps/shopping-cart/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/pom.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/pom.xml (original)
+++ struts/struts2/trunk/apps/shopping-cart/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-shopping-cart</artifactId>
<packaging>war</packaging>
<name>Shopping Cart Webapp</name>
Modified: struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/AbstractModifyCartAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/AbstractModifyCartAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/AbstractModifyCartAction.java (original)
+++ struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/AbstractModifyCartAction.java Sat Jul 1 16:58:13 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.example.ajax.actions;
+package org.apache.struts2.example.ajax.actions;
-import org.apache.struts.action2.example.ajax.catalog.Catalog;
-import org.apache.struts.action2.example.ajax.catalog.Product;
+import org.apache.struts2.example.ajax.catalog.Catalog;
+import org.apache.struts2.example.ajax.catalog.Product;
/**
* AbstractModifyCartAction
Modified: struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ActiveCategory.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ActiveCategory.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ActiveCategory.java (original)
+++ struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ActiveCategory.java Sat Jul 1 16:58:13 2006
@@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.example.ajax.actions;
+package org.apache.struts2.example.ajax.actions;
-import org.apache.struts.action2.example.ajax.cart.ShoppingCart;
-import org.apache.struts.action2.example.ajax.catalog.Catalog;
-import org.apache.struts.action2.example.ajax.catalog.Category;
-import org.apache.struts.action2.interceptor.SessionAware;
+import org.apache.struts2.example.ajax.cart.ShoppingCart;
+import org.apache.struts2.example.ajax.catalog.Catalog;
+import org.apache.struts2.example.ajax.catalog.Category;
+import org.apache.struts2.interceptor.SessionAware;
import com.opensymphony.xwork.ActionSupport;
import java.util.Map;
Modified: struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/SetActiveCategory.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/SetActiveCategory.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/SetActiveCategory.java (original)
+++ struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/SetActiveCategory.java Sat Jul 1 16:58:13 2006
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.example.ajax.actions;
+package org.apache.struts2.example.ajax.actions;
-import org.apache.struts.action2.interceptor.SessionAware;
+import org.apache.struts2.interceptor.SessionAware;
import com.opensymphony.xwork.ActionSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ShowCart.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ShowCart.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ShowCart.java (original)
+++ struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ShowCart.java Sat Jul 1 16:58:13 2006
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.example.ajax.actions;
+package org.apache.struts2.example.ajax.actions;
-import org.apache.struts.action2.example.ajax.cart.ShoppingCart;
+import org.apache.struts2.example.ajax.cart.ShoppingCart;
import com.opensymphony.xwork.ActionSupport;
import java.util.Iterator;
Modified: struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ShowCatalog.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ShowCatalog.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ShowCatalog.java (original)
+++ struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ShowCatalog.java Sat Jul 1 16:58:13 2006
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.example.ajax.actions;
+package org.apache.struts2.example.ajax.actions;
-import org.apache.struts.action2.example.ajax.catalog.Catalog;
+import org.apache.struts2.example.ajax.catalog.Catalog;
import com.opensymphony.xwork.ActionSupport;
/**
Modified: struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/UpdateQuantityInCart.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/UpdateQuantityInCart.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/UpdateQuantityInCart.java (original)
+++ struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/UpdateQuantityInCart.java Sat Jul 1 16:58:13 2006
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.example.ajax.actions;
+package org.apache.struts2.example.ajax.actions;
-import org.apache.struts.action2.example.ajax.cart.ShoppingCart;
+import org.apache.struts2.example.ajax.cart.ShoppingCart;
/**
* UpdateQuantityInCart
Modified: struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/cart/DefaultCart.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/cart/DefaultCart.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/cart/DefaultCart.java (original)
+++ struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/cart/DefaultCart.java Sat Jul 1 16:58:13 2006
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.example.ajax.cart;
+package org.apache.struts2.example.ajax.cart;
-import org.apache.struts.action2.example.ajax.catalog.Product;
+import org.apache.struts2.example.ajax.catalog.Product;
import java.util.HashMap;
import java.util.HashSet;
Modified: struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/cart/ShoppingCart.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/cart/ShoppingCart.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/cart/ShoppingCart.java (original)
+++ struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/cart/ShoppingCart.java Sat Jul 1 16:58:13 2006
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.example.ajax.cart;
+package org.apache.struts2.example.ajax.cart;
-import org.apache.struts.action2.example.ajax.catalog.Product;
+import org.apache.struts2.example.ajax.catalog.Product;
import java.util.Set;
import java.io.Serializable;
Modified: struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/catalog/Catalog.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/catalog/Catalog.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/catalog/Catalog.java (original)
+++ struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/catalog/Catalog.java 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.example.ajax.catalog;
+package org.apache.struts2.example.ajax.catalog;
import java.util.Set;
import java.io.Serializable;
Modified: struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/catalog/Category.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/catalog/Category.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/catalog/Category.java (original)
+++ struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/catalog/Category.java 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.example.ajax.catalog;
+package org.apache.struts2.example.ajax.catalog;
/**
* Category
Modified: struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/catalog/Identifiable.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/catalog/Identifiable.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/catalog/Identifiable.java (original)
+++ struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/catalog/Identifiable.java 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.example.ajax.catalog;
+package org.apache.struts2.example.ajax.catalog;
/**
* Identifiable
Modified: struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/catalog/Product.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/catalog/Product.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/catalog/Product.java (original)
+++ struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/catalog/Product.java 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.example.ajax.catalog;
+package org.apache.struts2.example.ajax.catalog;
/**
* Product
Modified: struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/catalog/TestCatalog.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/catalog/TestCatalog.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/catalog/TestCatalog.java (original)
+++ struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/catalog/TestCatalog.java 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.example.ajax.catalog;
+package org.apache.struts2.example.ajax.catalog;
import java.util.*;
Modified: struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/applicationContext.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/applicationContext.xml Sat Jul 1 16:58:13 2006
@@ -5,11 +5,11 @@
<bean id="catalog"
singleton="true"
- class="org.apache.struts.action2.example.ajax.catalog.TestCatalog" />
+ class="org.apache.struts2.example.ajax.catalog.TestCatalog" />
<bean id="shoppingCart"
singleton="true"
- class="org.apache.struts.action2.example.ajax.cart.DefaultCart" />
+ class="org.apache.struts2.example.ajax.cart.DefaultCart" />
</beans>
Modified: struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/dwr.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/dwr.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/dwr.xml (original)
+++ struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/dwr.xml Sat Jul 1 16:58:13 2006
@@ -4,7 +4,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>
@@ -12,7 +12,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/shopping-cart/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/web.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/web.xml (original)
+++ struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/web.xml Sat Jul 1 16:58:13 2006
@@ -6,7 +6,7 @@
<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>
Modified: struts/struts2/trunk/apps/showcase/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/showcase/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-showcase</artifactId>
<packaging>war</packaging>
<name>Showcase Webapp</name>
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java 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;
+package org.apache.struts2.showcase;
import com.opensymphony.xwork.ActionSupport;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DynamicTreeSelectAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DynamicTreeSelectAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DynamicTreeSelectAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DynamicTreeSelectAction.java Sat Jul 1 16:58:13 2006
@@ -1,6 +1,6 @@
-package org.apache.struts.action2.showcase;
+package org.apache.struts2.showcase;
-import org.apache.struts.action2.showcase.ajax.tree.Category;
+import org.apache.struts2.showcase.ajax.tree.Category;
import com.opensymphony.xwork.ActionSupport;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/Guess.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/Guess.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/Guess.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/Guess.java 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;
+package org.apache.struts2.showcase;
import com.opensymphony.xwork.ActionSupport;
import com.opensymphony.xwork.Action;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfOptiontransferselectAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfOptiontransferselectAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfOptiontransferselectAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfOptiontransferselectAction.java 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;
+package org.apache.struts2.showcase;
import java.util.LinkedHashMap;
import java.util.List;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfRichtexteditorAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfRichtexteditorAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfRichtexteditorAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfRichtexteditorAction.java 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;
+package org.apache.struts2.showcase;
import com.opensymphony.xwork.ActionSupport;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ShowDynamicTreeAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ShowDynamicTreeAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ShowDynamicTreeAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ShowDynamicTreeAction.java Sat Jul 1 16:58:13 2006
@@ -1,6 +1,6 @@
-package org.apache.struts.action2.showcase;
+package org.apache.struts2.showcase;
-import org.apache.struts.action2.showcase.ajax.tree.Category;
+import org.apache.struts2.showcase.ajax.tree.Category;
import com.opensymphony.xwork.ActionSupport;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java Sat Jul 1 16:58:13 2006
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.showcase;
+package org.apache.struts2.showcase;
-import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts2.ServletActionContext;
import com.opensymphony.xwork.ActionSupport;
import com.opensymphony.xwork.Validateable;
import com.opensymphony.xwork.util.OgnlValueStack;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java Sat Jul 1 16:58:13 2006
@@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.showcase.action;
+package org.apache.struts2.showcase.action;
import org.apache.log4j.Logger;
import com.opensymphony.xwork.ActionSupport;
-import org.apache.struts.action2.showcase.dao.Dao;
-import org.apache.struts.action2.showcase.model.IdEntity;
+import org.apache.struts2.showcase.dao.Dao;
+import org.apache.struts2.showcase.model.IdEntity;
import java.util.Collection;
import java.io.Serializable;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java Sat Jul 1 16:58:13 2006
@@ -15,15 +15,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.showcase.action;
+package org.apache.struts2.showcase.action;
import com.opensymphony.xwork.Preparable;
import org.apache.log4j.Logger;
-import org.apache.struts.action2.showcase.application.TestDataProvider;
-import org.apache.struts.action2.showcase.dao.Dao;
-import org.apache.struts.action2.showcase.dao.EmployeeDao;
-import org.apache.struts.action2.showcase.model.Employee;
-import org.apache.struts.action2.showcase.model.Skill;
+import org.apache.struts2.showcase.application.TestDataProvider;
+import org.apache.struts2.showcase.dao.Dao;
+import org.apache.struts2.showcase.dao.EmployeeDao;
+import org.apache.struts2.showcase.model.Employee;
+import org.apache.struts2.showcase.model.Skill;
import java.util.ArrayList;
import java.util.Arrays;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java Sat Jul 1 16:58:13 2006
@@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.showcase.action;
+package org.apache.struts2.showcase.action;
-import org.apache.struts.action2.showcase.dao.Dao;
-import org.apache.struts.action2.showcase.dao.SkillDao;
-import org.apache.struts.action2.showcase.model.Skill;
+import org.apache.struts2.showcase.dao.Dao;
+import org.apache.struts2.showcase.dao.SkillDao;
+import org.apache.struts2.showcase.model.Skill;
import com.opensymphony.xwork.Preparable;
import org.apache.log4j.Logger;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain1.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain1.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain1.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain1.java 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.actionchaining;
+package org.apache.struts2.showcase.actionchaining;
import com.opensymphony.xwork.ActionSupport;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain2.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain2.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain2.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain2.java 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.actionchaining;
+package org.apache.struts2.showcase.actionchaining;
import com.opensymphony.xwork.ActionSupport;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain3.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain3.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain3.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain3.java 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.actionchaining;
+package org.apache.struts2.showcase.actionchaining;
import com.opensymphony.xwork.ActionSupport;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AjaxTestAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AjaxTestAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AjaxTestAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AjaxTestAction.java 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.ajax;
+package org.apache.struts2.showcase.ajax;
import com.opensymphony.xwork.Action;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Category.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Category.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Category.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Category.java 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.ajax.tree;
+package org.apache.struts2.showcase.ajax.tree;
import java.util.HashMap;
import java.util.List;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/GetCategory.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/GetCategory.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/GetCategory.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/GetCategory.java 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.ajax.tree;
+package org.apache.struts2.showcase.ajax.tree;
import com.opensymphony.xwork.ActionSupport;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Toggle.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Toggle.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Toggle.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Toggle.java 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.ajax.tree;
+package org.apache.struts2.showcase.ajax.tree;
import com.opensymphony.xwork.ActionSupport;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/MemoryStorage.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/MemoryStorage.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/MemoryStorage.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/MemoryStorage.java Sat Jul 1 16:58:13 2006
@@ -15,14 +15,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.showcase.application;
+package org.apache.struts2.showcase.application;
-import org.apache.struts.action2.showcase.exception.CreateException;
-import org.apache.struts.action2.showcase.exception.DuplicateKeyException;
-import org.apache.struts.action2.showcase.exception.StorageException;
-import org.apache.struts.action2.showcase.exception.UpdateException;
-import org.apache.struts.action2.showcase.model.IdEntity;
-import org.apache.struts.action2.showcase.application.Storage;
+import org.apache.struts2.showcase.exception.CreateException;
+import org.apache.struts2.showcase.exception.DuplicateKeyException;
+import org.apache.struts2.showcase.exception.StorageException;
+import org.apache.struts2.showcase.exception.UpdateException;
+import org.apache.struts2.showcase.model.IdEntity;
+import org.apache.struts2.showcase.application.Storage;
import java.io.Serializable;
import java.util.ArrayList;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/Storage.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/Storage.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/Storage.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/Storage.java Sat Jul 1 16:58:13 2006
@@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.showcase.application;
+package org.apache.struts2.showcase.application;
-import org.apache.struts.action2.showcase.model.IdEntity;
-import org.apache.struts.action2.showcase.exception.CreateException;
-import org.apache.struts.action2.showcase.exception.UpdateException;
-import org.apache.struts.action2.showcase.exception.StorageException;
+import org.apache.struts2.showcase.model.IdEntity;
+import org.apache.struts2.showcase.exception.CreateException;
+import org.apache.struts2.showcase.exception.UpdateException;
+import org.apache.struts2.showcase.exception.StorageException;
import java.io.Serializable;
import java.util.Collection;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/TestDataProvider.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/TestDataProvider.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/TestDataProvider.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/application/TestDataProvider.java Sat Jul 1 16:58:13 2006
@@ -15,13 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.showcase.application;
+package org.apache.struts2.showcase.application;
-import org.apache.struts.action2.showcase.dao.EmployeeDao;
-import org.apache.struts.action2.showcase.dao.SkillDao;
-import org.apache.struts.action2.showcase.exception.StorageException;
-import org.apache.struts.action2.showcase.model.Employee;
-import org.apache.struts.action2.showcase.model.Skill;
+import org.apache.struts2.showcase.dao.EmployeeDao;
+import org.apache.struts2.showcase.dao.SkillDao;
+import org.apache.struts2.showcase.exception.StorageException;
+import org.apache.struts2.showcase.model.Employee;
+import org.apache.struts2.showcase.model.Skill;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.InitializingBean;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatAuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatAuthenticationInterceptor.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatAuthenticationInterceptor.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatAuthenticationInterceptor.java Sat Jul 1 16:58:13 2006
@@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.showcase.chat;
+package org.apache.struts2.showcase.chat;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.action2.dispatcher.SessionMap;
+import org.apache.struts2.dispatcher.SessionMap;
import com.opensymphony.xwork.Action;
import com.opensymphony.xwork.ActionContext;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatException.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatException.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatException.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatException.java 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.chat;
+package org.apache.struts2.showcase.chat;
public class ChatException extends RuntimeException {
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatInterceptor.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatInterceptor.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatInterceptor.java 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.chat;
+package org.apache.struts2.showcase.chat;
import javax.servlet.http.HttpSession;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLoginAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLoginAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLoginAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLoginAction.java Sat Jul 1 16:58:13 2006
@@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.showcase.chat;
+package org.apache.struts2.showcase.chat;
import java.util.Map;
-import org.apache.struts.action2.interceptor.SessionAware;
+import org.apache.struts2.interceptor.SessionAware;
import com.opensymphony.xwork.ActionSupport;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLogoutAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLogoutAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLogoutAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLogoutAction.java Sat Jul 1 16:58:13 2006
@@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.showcase.chat;
+package org.apache.struts2.showcase.chat;
import java.util.Map;
-import org.apache.struts.action2.interceptor.SessionAware;
+import org.apache.struts2.interceptor.SessionAware;
import com.opensymphony.xwork.ActionSupport;