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 [2/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/...
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatMessage.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatMessage.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatMessage.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatMessage.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 java.util.Date;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatService.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatService.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatService.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatService.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 java.util.List;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatServiceImpl.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatServiceImpl.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatServiceImpl.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatServiceImpl.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 java.util.ArrayList;
import java.util.LinkedHashMap;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatSessionListener.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatSessionListener.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatSessionListener.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatSessionListener.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;
import javax.servlet.http.HttpSessionEvent;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/Constants.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/Constants.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/Constants.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/Constants.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 Constants {
public static String UPDATE_FREQ = "30000";
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/CrudRoomAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/CrudRoomAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/CrudRoomAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/CrudRoomAction.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 com.opensymphony.xwork.ActionSupport;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/DateConverter.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/DateConverter.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/DateConverter.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/DateConverter.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 java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -24,7 +24,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.action2.util.StrutsTypeConverter;
+import org.apache.struts2.util.StrutsTypeConverter;
public class DateConverter extends StrutsTypeConverter {
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/EnterRoomAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/EnterRoomAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/EnterRoomAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/EnterRoomAction.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/ExitRoomAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ExitRoomAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ExitRoomAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ExitRoomAction.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/MessagesAvailableInRoomAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/MessagesAvailableInRoomAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/MessagesAvailableInRoomAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/MessagesAvailableInRoomAction.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 java.util.ArrayList;
import java.util.List;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/Room.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/Room.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/Room.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/Room.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 java.util.ArrayList;
import java.util.Date;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/RoomsAvailableAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/RoomsAvailableAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/RoomsAvailableAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/RoomsAvailableAction.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 java.util.ArrayList;
import java.util.List;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/SendMessageToRoomAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/SendMessageToRoomAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/SendMessageToRoomAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/SendMessageToRoomAction.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/User.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/User.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/User.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/User.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 java.io.Serializable;
import java.util.Date;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableAction.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 java.util.ArrayList;
import java.util.List;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableInRoomAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableInRoomAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableInRoomAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableInRoomAction.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 java.util.ArrayList;
import java.util.List;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/Person.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/Person.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/Person.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/Person.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.conversion;
+package org.apache.struts2.showcase.conversion;
import java.io.Serializable;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/PersonAction-conversion.properties
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/PersonAction-conversion.properties?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/PersonAction-conversion.properties (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/PersonAction-conversion.properties Sat Jul 1 16:58:13 2006
@@ -1 +1 @@
-Element_persons=org.apache.struts.action2.showcase.conversion.Person
+Element_persons=org.apache.struts2.showcase.conversion.Person
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/PersonAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/PersonAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/PersonAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/PersonAction.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.conversion;
+package org.apache.struts2.showcase.conversion;
import java.util.List;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/AbstractDao.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/AbstractDao.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/AbstractDao.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/AbstractDao.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.dao;
+package org.apache.struts2.showcase.dao;
-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.struts.action2.showcase.application.Storage;
+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 org.apache.struts2.showcase.application.Storage;
import java.io.Serializable;
import java.util.Collection;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/Dao.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/Dao.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/Dao.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/Dao.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.dao;
+package org.apache.struts2.showcase.dao;
-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/dao/EmployeeDao.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/EmployeeDao.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/EmployeeDao.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/EmployeeDao.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.showcase.dao;
+package org.apache.struts2.showcase.dao;
-import org.apache.struts.action2.showcase.model.Employee;
-import org.apache.struts.action2.showcase.model.Skill;
+import org.apache.struts2.showcase.model.Employee;
+import org.apache.struts2.showcase.model.Skill;
import java.util.List;
import java.util.ArrayList;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/SkillDao.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/SkillDao.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/SkillDao.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/dao/SkillDao.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.dao;
+package org.apache.struts2.showcase.dao;
-import org.apache.struts.action2.showcase.model.Skill;
+import org.apache.struts2.showcase.model.Skill;
/**
* SkillDao.
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/exception/CreateException.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/exception/CreateException.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/exception/CreateException.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/exception/CreateException.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.exception;
+package org.apache.struts2.showcase.exception;
/**
* CreateException.
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/exception/DeleteException.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/exception/DeleteException.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/exception/DeleteException.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/exception/DeleteException.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.exception;
+package org.apache.struts2.showcase.exception;
/**
* DeleteException.
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/exception/DuplicateKeyException.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/exception/DuplicateKeyException.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/exception/DuplicateKeyException.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/exception/DuplicateKeyException.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.exception;
+package org.apache.struts2.showcase.exception;
/**
* DuplicateKeyException.
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/exception/StorageException.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/exception/StorageException.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/exception/StorageException.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/exception/StorageException.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.exception;
+package org.apache.struts2.showcase.exception;
/**
* StorageException.
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/exception/UpdateException.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/exception/UpdateException.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/exception/UpdateException.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/exception/UpdateException.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.exception;
+package org.apache.struts2.showcase.exception;
/**
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.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.filedownload;
+package org.apache.struts2.showcase.filedownload;
-import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts2.ServletActionContext;
import com.opensymphony.xwork.Action;
import java.io.InputStream;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.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.fileupload;
+package org.apache.struts2.showcase.fileupload;
import com.opensymphony.xwork.ActionSupport;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManager.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManager.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManager.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManager.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.freemarker;
+package org.apache.struts2.showcase.freemarker;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.action2.views.freemarker.FreemarkerManager;
-import org.apache.struts.action2.views.freemarker.ScopesHashModel;
+import org.apache.struts2.views.freemarker.FreemarkerManager;
+import org.apache.struts2.views.freemarker.ScopesHashModel;
import com.opensymphony.xwork.util.OgnlValueStack;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManagerUtil.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManagerUtil.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManagerUtil.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManagerUtil.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.freemarker;
+package org.apache.struts2.showcase.freemarker;
import java.text.SimpleDateFormat;
import java.util.Date;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/jsf/JsfEmployeeAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/jsf/JsfEmployeeAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/jsf/JsfEmployeeAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/jsf/JsfEmployeeAction.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.jsf;
+package org.apache.struts2.showcase.jsf;
import java.util.ArrayList;
import java.util.Collection;
@@ -24,10 +24,10 @@
import java.util.List;
import java.util.Map;
-import org.apache.struts.action2.showcase.action.EmployeeAction;
-import org.apache.struts.action2.showcase.dao.SkillDao;
-import org.apache.struts.action2.showcase.model.Employee;
-import org.apache.struts.action2.showcase.model.Skill;
+import org.apache.struts2.showcase.action.EmployeeAction;
+import org.apache.struts2.showcase.dao.SkillDao;
+import org.apache.struts2.showcase.model.Employee;
+import org.apache.struts2.showcase.model.Skill;
/**
* Overriding the EmployeeAction to main provide getters returning the data in
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/Employee.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/Employee.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/Employee.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/Employee.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.model;
+package org.apache.struts2.showcase.model;
import java.io.Serializable;
import java.util.Date;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/IdEntity.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/IdEntity.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/IdEntity.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/IdEntity.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.model;
+package org.apache.struts2.showcase.model;
import java.io.Serializable;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/Skill.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/Skill.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/Skill.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/Skill.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.model;
+package org.apache.struts2.showcase.model;
import java.io.Serializable;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/Gangster.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/Gangster.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/Gangster.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/Gangster.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.modelDriven;
+package org.apache.struts2.showcase.modelDriven;
import java.io.Serializable;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.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.modelDriven;
+package org.apache.struts2.showcase.modelDriven;
import com.opensymphony.xwork.ActionSupport;
import com.opensymphony.xwork.ModelDriven;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/CreatePerson.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/CreatePerson.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/CreatePerson.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/CreatePerson.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.person;
+package org.apache.struts2.showcase.person;
import com.opensymphony.xwork.ActionSupport;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPerson-conversion.properties
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPerson-conversion.properties?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPerson-conversion.properties (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPerson-conversion.properties Sat Jul 1 16:58:13 2006
@@ -1,3 +1,3 @@
KeyProperty_persons=id
-Element_persons=org.apache.struts.action2.showcase.person.Person
+Element_persons=org.apache.struts2.showcase.person.Person
CreateIfNull_persons=true
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPerson.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPerson.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPerson.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPerson.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.person;
+package org.apache.struts2.showcase.person;
import com.opensymphony.xwork.ActionSupport;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeople.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeople.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeople.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeople.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.person;
+package org.apache.struts2.showcase.person;
import com.opensymphony.xwork.ActionSupport;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/Person.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/Person.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/Person.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/Person.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.person;
+package org.apache.struts2.showcase.person;
/**
*/
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/PersonManager.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/PersonManager.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/PersonManager.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/PersonManager.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.person;
+package org.apache.struts2.showcase.person;
import java.util.Set;
import java.util.HashSet;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/sitemesh/NoneDecoratorMapper.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/sitemesh/NoneDecoratorMapper.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/sitemesh/NoneDecoratorMapper.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/sitemesh/NoneDecoratorMapper.java Sat Jul 1 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.showcase.sitemesh;
+package org.apache.struts2.showcase.sitemesh;
import com.opensymphony.module.sitemesh.Decorator;
import com.opensymphony.module.sitemesh.Page;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actionPrefix/SubmitAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actionPrefix/SubmitAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actionPrefix/SubmitAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actionPrefix/SubmitAction.java Sat Jul 1 16:58:13 2006
@@ -1,4 +1,4 @@
-package org.apache.struts.action2.showcase.tag.nonui.actionPrefix;
+package org.apache.struts2.showcase.tag.nonui.actionPrefix;
import com.opensymphony.xwork.ActionSupport;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actiontag/ActionTagDemo.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actiontag/ActionTagDemo.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actiontag/ActionTagDemo.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actiontag/ActionTagDemo.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.tag.nonui.actiontag;
+package org.apache.struts2.showcase.tag.nonui.actiontag;
import com.opensymphony.xwork.ActionSupport;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.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.tag.nonui.iteratortag;
+package org.apache.struts2.showcase.tag.nonui.iteratortag;
import com.opensymphony.xwork.ActionSupport;
import com.opensymphony.xwork.Validateable;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.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.tag.nonui.iteratortag;
+package org.apache.struts2.showcase.tag.nonui.iteratortag;
import com.opensymphony.xwork.ActionSupport;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.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.tag.nonui.iteratortag;
+package org.apache.struts2.showcase.tag.nonui.iteratortag;
import com.opensymphony.xwork.ActionSupport;
import com.opensymphony.xwork.Validateable;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.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.tag.nonui.iteratortag;
+package org.apache.struts2.showcase.tag.nonui.iteratortag;
import com.opensymphony.xwork.ActionSupport;
import com.opensymphony.xwork.Validateable;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.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.token;
+package org.apache.struts2.showcase.token;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionSupport;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AbstractValidationActionSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AbstractValidationActionSupport.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AbstractValidationActionSupport.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AbstractValidationActionSupport.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.validation;
+package org.apache.struts2.showcase.validation;
import com.opensymphony.xwork.ActionSupport;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction.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.validation;
+package org.apache.struts2.showcase.validation;
import java.sql.Date;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction.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.validation;
+package org.apache.struts2.showcase.validation;
/**
*/
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction.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.validation;
+package org.apache.struts2.showcase.validation;
import com.opensymphony.xwork.ActionSupport;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/User.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/User.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/User.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/User.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.validation;
+package org.apache.struts2.showcase.validation;
import java.sql.Date;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction.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.validation;
+package org.apache.struts2.showcase.validation;
// START SNIPPET: visitorValidatorsExample
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/wait/LongProcessAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/wait/LongProcessAction.java?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/wait/LongProcessAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/wait/LongProcessAction.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.wait;
+package org.apache.struts2.showcase.wait;
import com.opensymphony.xwork.ActionSupport;
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/log4j.properties?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/log4j.properties (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/log4j.properties Sat Jul 1 16:58:13 2006
@@ -24,7 +24,7 @@
# OpenSymphony Stuff
log4j.logger.com.opensymphony=INFO
-log4j.logger.org.apache.struts.action2=DEBUG
+log4j.logger.org.apache.struts2=DEBUG
# Spring Stuff
log4j.logger.org.springframework=INFO
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/ChatMessage-conversion.properties
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/ChatMessage-conversion.properties?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/ChatMessage-conversion.properties (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/ChatMessage-conversion.properties Sat Jul 1 16:58:13 2006
@@ -1 +1 @@
-creationDate=org.apache.struts.action2.showcase.chat.DateConverter
+creationDate=org.apache.struts2.showcase.chat.DateConverter
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/Room-conversion.properties
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/Room-conversion.properties?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/Room-conversion.properties (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/Room-conversion.properties Sat Jul 1 16:58:13 2006
@@ -1 +1 @@
-creationDate=org.apache.struts.action2.showcase.chat.DateConverter
+creationDate=org.apache.struts2.showcase.chat.DateConverter
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/conversion/PersonAction-conversion.properties
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/conversion/PersonAction-conversion.properties?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/conversion/PersonAction-conversion.properties (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/conversion/PersonAction-conversion.properties Sat Jul 1 16:58:13 2006
@@ -1 +1 @@
-Element_persons=org.apache.struts.action2.showcase.conversion.Person
+Element_persons=org.apache.struts2.showcase.conversion.Person
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/person/EditPerson-conversion.properties
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/person/EditPerson-conversion.properties?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/person/EditPerson-conversion.properties (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/org/apache/struts2/showcase/person/EditPerson-conversion.properties Sat Jul 1 16:58:13 2006
@@ -1,3 +1,3 @@
KeyProperty_persons=id
-Element_persons=org.apache.struts.action2.showcase.person.Person
+Element_persons=org.apache.struts2.showcase.person.Person
CreateIfNull_persons=true
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts.properties
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts.properties?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts.properties (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts.properties Sat Jul 1 16:58:13 2006
@@ -1,7 +1,7 @@
struts.i18n.reload=true
struts.devMode = true
struts.configuration.xml.reload=true
-struts.continuations.package = org.apache.struts.action2.showcase
+struts.continuations.package = org.apache.struts2.showcase
struts.objectFactory = spring
struts.custom.i18n.resources=globalMessages
#struts.action.extension=jspa
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/xwork-actionchaining.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/xwork-actionchaining.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-actionchaining.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/xwork-actionchaining.xml Sat Jul 1 16:58:13 2006
@@ -8,13 +8,13 @@
<include file="struts-default.xml" />
<package name="actionchaining" extends="struts-default" namespace="/actionchaining">
- <action name="actionChain1" class="org.apache.struts.action2.showcase.actionchaining.ActionChain1">
+ <action name="actionChain1" class="org.apache.struts2.showcase.actionchaining.ActionChain1">
<result type="chain">actionChain2</result>
</action>
- <action name="actionChain2" class="org.apache.struts.action2.showcase.actionchaining.ActionChain2">
+ <action name="actionChain2" class="org.apache.struts2.showcase.actionchaining.ActionChain2">
<result type="chain">actionChain3</result>
</action>
- <action name="actionChain3" class="org.apache.struts.action2.showcase.actionchaining.ActionChain3">
+ <action name="actionChain3" class="org.apache.struts2.showcase.actionchaining.ActionChain3">
<result>/actionchaining/actionChainingResult.jsp</result>
</action>
</package>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/xwork-ajax.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/xwork-ajax.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-ajax.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/xwork-ajax.xml Sat Jul 1 16:58:13 2006
@@ -4,15 +4,15 @@
<include file="struts-default.xml"/>
<package name="ajax" extends="struts-default">
- <action name="AjaxTest" class="org.apache.struts.action2.showcase.ajax.AjaxTestAction">
+ <action name="AjaxTest" class="org.apache.struts2.showcase.ajax.AjaxTestAction">
<result>/ajax/AjaxResult.jsp</result>
</action>
- <action name="AjaxRemoteLink" class="org.apache.struts.action2.showcase.ajax.AjaxTestAction">
+ <action name="AjaxRemoteLink" class="org.apache.struts2.showcase.ajax.AjaxTestAction">
<result>/ajax/AjaxResult2.js</result>
</action>
- <action name="AjaxRemoteForm" class="org.apache.struts.action2.showcase.ajax.AjaxTestAction">
+ <action name="AjaxRemoteForm" class="org.apache.struts2.showcase.ajax.AjaxTestAction">
<result>/ajax/AjaxResult3.jsp</result>
</action>
@@ -32,11 +32,11 @@
<result>/ajax/tree/tree.jsp</result>
</action>
- <action name="getCategory" class="org.apache.struts.action2.showcase.ajax.tree.GetCategory">
+ <action name="getCategory" class="org.apache.struts2.showcase.ajax.tree.GetCategory">
<result>/ajax/tree/getCategory.jsp</result>
</action>
- <action name="toggle" class="org.apache.struts.action2.showcase.ajax.tree.Toggle">
+ <action name="toggle" class="org.apache.struts2.showcase.ajax.tree.Toggle">
<result>/ajax/tree/toggle.jsp</result>
</action>
</package>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/xwork-chat.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/xwork-chat.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-chat.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/xwork-chat.xml Sat Jul 1 16:58:13 2006
@@ -8,7 +8,7 @@
<package name="chat" extends="struts-default" namespace="/chat">
<interceptors>
<interceptor name="chatAuthentication"
- class="org.apache.struts.action2.showcase.chat.ChatAuthenticationInterceptor" />
+ class="org.apache.struts2.showcase.chat.ChatAuthenticationInterceptor" />
<interceptor-stack name="chatAuthenticationStack">
<interceptor-ref name="createSession" />
<interceptor-ref name="exception"/>
@@ -73,7 +73,7 @@
<package name="chat-remote" extends="struts-default" namespace="/chat/ajax">
<interceptors>
<interceptor name="chatAuthentication"
- class="org.apache.struts.action2.showcase.chat.ChatAuthenticationInterceptor" />
+ class="org.apache.struts2.showcase.chat.ChatAuthenticationInterceptor" />
<interceptor-stack name="chatAuthenticationStack">
<interceptor-ref name="createSession" />
<interceptor-ref name="exception"/>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/xwork-continuations.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/xwork-continuations.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-continuations.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/xwork-continuations.xml Sat Jul 1 16:58:13 2006
@@ -3,7 +3,7 @@
<include file="struts-default.xml"/>
<package name="continuations" extends="struts-default" namespace="/continuations">
- <action name="guess" class="org.apache.struts.action2.showcase.Guess">
+ <action name="guess" class="org.apache.struts2.showcase.Guess">
<result type="freemarker">guess.ftl</result>
</action>
</package>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/xwork-conversion.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/xwork-conversion.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-conversion.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/xwork-conversion.xml Sat Jul 1 16:58:13 2006
@@ -9,11 +9,11 @@
<package name="conversion" namespace="/conversion" extends="struts-default">
<action name="enterPersonsInfo" method="input"
- class="org.apache.struts.action2.showcase.conversion.PersonAction">
+ class="org.apache.struts2.showcase.conversion.PersonAction">
<result>enterPersonInfo.jsp</result>
</action>
<action name="submitPersonInfo" method="submit"
- class="org.apache.struts.action2.showcase.conversion.PersonAction">
+ class="org.apache.struts2.showcase.conversion.PersonAction">
<result>showPersonInfo.jsp</result>
<result name="input">enterPersonInfo.jsp</result>
</action>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/xwork-filedownload.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/xwork-filedownload.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-filedownload.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/xwork-filedownload.xml Sat Jul 1 16:58:13 2006
@@ -11,7 +11,7 @@
<default-action-ref name="download"/>
- <action name="download" class="org.apache.struts.action2.showcase.filedownload.FileDownloadAction">
+ <action name="download" class="org.apache.struts2.showcase.filedownload.FileDownloadAction">
<result name="success" type="stream">
<param name="contentType">image/jpeg</param>
<param name="inputName">imageStream</param>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/xwork-fileupload.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/xwork-fileupload.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-fileupload.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/xwork-fileupload.xml Sat Jul 1 16:58:13 2006
@@ -11,11 +11,11 @@
<default-action-ref name="upload"/>
- <action name="upload" class="org.apache.struts.action2.showcase.fileupload.FileUploadAction" method="input">
+ <action name="upload" class="org.apache.struts2.showcase.fileupload.FileUploadAction" method="input">
<result>upload.jsp</result>
</action>
- <action name="doUpload" class="org.apache.struts.action2.showcase.fileupload.FileUploadAction" method="upload">
+ <action name="doUpload" class="org.apache.struts2.showcase.fileupload.FileUploadAction" method="upload">
<result>upload-success.jsp</result>
</action>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/xwork-jsf.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/xwork-jsf.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-jsf.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/xwork-jsf.xml Sat Jul 1 16:58:13 2006
@@ -17,13 +17,13 @@
<package name="jsf.employee" extends="jsf" namespace="/jsf/employee">
- <action name="list" class="org.apache.struts.action2.showcase.jsf.JsfEmployeeAction" method="list">
+ <action name="list" class="org.apache.struts2.showcase.jsf.JsfEmployeeAction" method="list">
<result name="success" type="jsf" />
</action>
- <action name="edit" class="org.apache.struts.action2.showcase.jsf.JsfEmployeeAction">
+ <action name="edit" class="org.apache.struts2.showcase.jsf.JsfEmployeeAction">
<result name="success" type="jsf" />
</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" type="redirect">list.action</result>
<result type="redirect">list.action</result>
</action>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/xwork-model-driven.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/xwork-model-driven.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-model-driven.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/xwork-model-driven.xml Sat Jul 1 16:58:13 2006
@@ -9,12 +9,12 @@
<package name="modelDriven" extends="struts-default" namespace="/modelDriven">
<!-- Diplay entry page that uses Model-Driven technique -->
- <action name="modelDriven" class="org.apache.struts.action2.showcase.modelDriven.ModelDrivenAction" method="input">
+ <action name="modelDriven" class="org.apache.struts2.showcase.modelDriven.ModelDrivenAction" method="input">
<result>modelDriven.jsp</result>
</action>
<!-- Display the result page whose content is populated using the Model-Driven technique -->
- <action name="modelDrivenResult" class="org.apache.struts.action2.showcase.modelDriven.ModelDrivenAction">
+ <action name="modelDrivenResult" class="org.apache.struts2.showcase.modelDriven.ModelDrivenAction">
<result>modelDrivenResult.jsp</result>
</action>
</package>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/xwork-person.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/xwork-person.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-person.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/xwork-person.xml Sat Jul 1 16:58:13 2006
@@ -6,21 +6,21 @@
<include file="struts-default.xml"/>
<package name="person" extends="struts-default" namespace="/person">
- <action name="listPeople" class="org.apache.struts.action2.showcase.person.ListPeople">
+ <action name="listPeople" class="org.apache.struts2.showcase.person.ListPeople">
<interceptor-ref name="validationWorkflowStack"/>
<result type="freemarker">listPeople.ftl</result>
</action>
- <action name="newPerson" class="org.apache.struts.action2.showcase.person.CreatePerson">
+ <action name="newPerson" class="org.apache.struts2.showcase.person.CreatePerson">
<result type="redirect">listPeople.action</result>
<result name="input" type="freemarker">newPerson.ftl</result>
</action>
- <action name="editPerson" class="org.apache.struts.action2.showcase.person.EditPerson">
+ <action name="editPerson" class="org.apache.struts2.showcase.person.EditPerson">
<result>editPeople.jsp</result>
</action>
- <action name="doEditPerson" class="org.apache.struts.action2.showcase.person.EditPerson" method="save">
+ <action name="doEditPerson" class="org.apache.struts2.showcase.person.EditPerson" method="save">
<result name="error">editPeople.jsp</result>
<result type="redirect">listPeople.action</result>
</action>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/xwork-tags-non-ui.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/xwork-tags-non-ui.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-tags-non-ui.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/xwork-tags-non-ui.xml Sat Jul 1 16:58:13 2006
@@ -11,10 +11,10 @@
<!-- ================================== -->
<package name="actionTag" extends="struts-default" namespace="/tags/non-ui/actionTag">
- <action name="showActionTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.actiontag.ActionTagDemo" method="show">
+ <action name="showActionTagDemo" class="org.apache.struts2.showcase.tag.nonui.actiontag.ActionTagDemo" method="show">
<result>/tags/non-ui/actionTag/showActionTagDemo.jsp</result>
</action>
- <action name="includePage" class="org.apache.struts.action2.showcase.tag.nonui.actiontag.ActionTagDemo" method="doInclude">
+ <action name="includePage" class="org.apache.struts2.showcase.tag.nonui.actiontag.ActionTagDemo" method="doInclude">
<result>/tags/non-ui/actionTag/includedPage.jsp</result>
</action>
<action name="includePage2">
@@ -33,10 +33,10 @@
<!-- ==================================== -->
<package name="iteratorGeneratorTag" extends="struts-default" namespace="/tags/non-ui/iteratorGeneratorTag">
- <action name="showGeneratorTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.IteratorGeneratorTagDemo" method="input">
+ <action name="showGeneratorTagDemo" class="org.apache.struts2.showcase.tag.nonui.iteratortag.IteratorGeneratorTagDemo" method="input">
<result>/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp</result>
</action>
- <action name="submitGeneratorTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.IteratorGeneratorTagDemo" method="submit">
+ <action name="submitGeneratorTagDemo" class="org.apache.struts2.showcase.tag.nonui.iteratortag.IteratorGeneratorTagDemo" method="submit">
<result name="input">/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp</result>
<result>/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp</result>
</action>
@@ -47,10 +47,10 @@
<!-- === Package for AppendIteratorTag Demo === -->
<!-- ========================================== -->
<package name="appendIteratorTag" extends="struts-default" namespace="/tags/non-ui/appendIteratorTag">
- <action name="showAppendTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.AppendIteratorTagDemo" method="input">
+ <action name="showAppendTagDemo" class="org.apache.struts2.showcase.tag.nonui.iteratortag.AppendIteratorTagDemo" method="input">
<result>/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp</result>
</action>
- <action name="submitAppendTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.AppendIteratorTagDemo" method="submit">
+ <action name="submitAppendTagDemo" class="org.apache.struts2.showcase.tag.nonui.iteratortag.AppendIteratorTagDemo" method="submit">
<result name="input">/tag/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp</result>
<result>/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp</result>
</action>
@@ -61,10 +61,10 @@
<!-- === Package for MergeIteratorTag Demo === -->
<!-- ========================================= -->
<package name="mergeIteratorTag" extends="struts-default" namespace="/tags/non-ui/mergeIteratorTag">
- <action name="showMergeTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.MergeIteratorTagDemo" method="input">
+ <action name="showMergeTagDemo" class="org.apache.struts2.showcase.tag.nonui.iteratortag.MergeIteratorTagDemo" method="input">
<result>/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp</result>
</action>
- <action name="submitMergeTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.MergeIteratorTagDemo" method="submit">
+ <action name="submitMergeTagDemo" class="org.apache.struts2.showcase.tag.nonui.iteratortag.MergeIteratorTagDemo" method="submit">
<result name="input">/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp</result>
<result>/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp</result>
</action>
@@ -74,10 +74,10 @@
<!-- === Package for SubsetIteratorTag Demo === -->
<!-- =========================================== -->
<package name="subsetIteratorTag" extends="struts-default" namespace="/tags/non-ui/subsetIteratorTag">
- <action name="showSubsetTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.SubsetIteratorTagDemo" method="input">
+ <action name="showSubsetTagDemo" class="org.apache.struts2.showcase.tag.nonui.iteratortag.SubsetIteratorTagDemo" method="input">
<result>/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp</result>
</action>
- <action name="submitSubsetTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.SubsetIteratorTagDemo" method="submit">
+ <action name="submitSubsetTagDemo" class="org.apache.struts2.showcase.tag.nonui.iteratortag.SubsetIteratorTagDemo" method="submit">
<result name="input">/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp</result>
<result>/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp</result>
</action>
@@ -90,13 +90,13 @@
<action name="actionPrefixExampleUsingFreemarker">
<result type="freemarker">/tags/non-ui/actionPrefix/actionPrefixExample.ftl</result>
</action>
- <action name="submit" class="org.apache.struts.action2.showcase.tag.nonui.actionPrefix.SubmitAction">
+ <action name="submit" class="org.apache.struts2.showcase.tag.nonui.actionPrefix.SubmitAction">
<result type="freemarker">/tags/non-ui/actionPrefix/normalSubmit.ftl</result>
</action>
- <action name="submit" class="org.apache.struts.action2.showcase.tag.nonui.actionPrefix.SubmitAction" method="alternateMethod">
+ <action name="submit" class="org.apache.struts2.showcase.tag.nonui.actionPrefix.SubmitAction" method="alternateMethod">
<result name="methodPrefixResult" type="freemarker">/tags/non-ui/actionPrefix/methodPrefix.ftl</result>
</action>
- <action name="actionPrefix" class="org.apache.struts.action2.showcase.tag.nonui.actionPrefix.SubmitAction">
+ <action name="actionPrefix" class="org.apache.struts2.showcase.tag.nonui.actionPrefix.SubmitAction">
<result type="freemarker">/tags/non-ui/actionPrefix/actionPrefix.ftl</result>
</action>
<action name="redirectPrefix">
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/xwork-tags-ui.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/xwork-tags-ui.xml?rev=418530&r1=418529&r2=418530&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-tags-ui.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/xwork-tags-ui.xml Sat Jul 1 16:58:13 2006
@@ -8,33 +8,33 @@
<include file="struts-default.xml"/>
<package name="ui-tags" extends="struts-default" namespace="/tags/ui">
- <action name="example" class="org.apache.struts.action2.showcase.UITagExample">
+ <action name="example" class="org.apache.struts2.showcase.UITagExample">
<result>example.jsp</result>
<result name="input">example.jsp</result>
</action>
- <action name="exampleSubmit" class="org.apache.struts.action2.showcase.UITagExample" method="doSubmit">
+ <action name="exampleSubmit" class="org.apache.struts2.showcase.UITagExample" method="doSubmit">
<result>exampleSubmited.jsp</result>
<result name="input">example.jsp</result>
</action>
- <action name="exampleVelocity" class="org.apache.struts.action2.showcase.UITagExample">
+ <action name="exampleVelocity" class="org.apache.struts2.showcase.UITagExample">
<result type="velocity">example.vm</result>
<result name="input" type="velocity">example.vm</result>
</action>
- <action name="exampleSubmitVelocity" class="org.apache.struts.action2.showcase.UITagExample" method="doSubmit">
+ <action name="exampleSubmitVelocity" class="org.apache.struts2.showcase.UITagExample" method="doSubmit">
<result type="velocity">exampleSubmited.vm</result>
<result name="input" type="velocity">example.vm</result>
</action>
- <action name="lotsOfOptiontransferselect" class="org.apache.struts.action2.showcase.LotsOfOptiontransferselectAction" method="input">
+ <action name="lotsOfOptiontransferselect" class="org.apache.struts2.showcase.LotsOfOptiontransferselectAction" method="input">
<result>lotsOfOptiontransferselect.jsp</result>
</action>
- <action name="lotsOfOptiontransferselectSubmit" class="org.apache.struts.action2.showcase.LotsOfOptiontransferselectAction" method="submit">
+ <action name="lotsOfOptiontransferselectSubmit" class="org.apache.struts2.showcase.LotsOfOptiontransferselectAction" method="submit">
<result name="input">lotsOfOptiontransferselect.jsp</result>
<result>lotsOfOptiontransferselectSubmit.jsp</result>
</action>
- <action name="lotsOfRichtexteditor" class="org.apache.struts.action2.showcase.LotsOfRichtexteditorAction" method="input">
+ <action name="lotsOfRichtexteditor" class="org.apache.struts2.showcase.LotsOfRichtexteditorAction" method="input">
<result>lotsOfRichtexteditor.jsp</result>
</action>
- <action name="lotsOfRichtexteditorSubmit" class="org.apache.struts.action2.showcase.LotsOfRichtexteditorAction" method="submit">
+ <action name="lotsOfRichtexteditorSubmit" class="org.apache.struts2.showcase.LotsOfRichtexteditorAction" method="submit">
<result name="input">lotsOfRichtexteditor.jsp</result>
<result>lotsOfRichtexteditorSubmit.jsp</result>
</action>
@@ -44,7 +44,7 @@
<!-- START SNIPPET: treeExampleDynamicXWorkXml -->
- <action name="showDynamicTreeAction" class="org.apache.struts.action2.showcase.ShowDynamicTreeAction">
+ <action name="showDynamicTreeAction" class="org.apache.struts2.showcase.ShowDynamicTreeAction">
<result>/tags/ui/treeExampleDynamic.jsp</result>
</action>
@@ -64,7 +64,7 @@
<action name="staticTreeSelectAction">
<result>/tags/ui/staticTreeSelect.jsp</result>
</action>
- <action name="dynamicTreeSelectAction" class="org.apache.struts.action2.showcase.DynamicTreeSelectAction">
+ <action name="dynamicTreeSelectAction" class="org.apache.struts2.showcase.DynamicTreeSelectAction">
<result>/tags/ui/dynamicTreeSelect.jsp</result>
</action>
</package>