Author: agilliland
Date: Tue May 22 10:15:15 2007
New Revision: 540652
URL: http://svn.apache.org/viewvc?view=rev&rev=540652
Log:
second batch of struts2 reorg work, this finalizes the move of all the struts2
code into it's own package.
Added:
roller/trunk/src/org/apache/roller/ui/struts2/core/
roller/trunk/src/org/apache/roller/ui/struts2/core/CreateWeblog-validation.xml
- copied unchanged from r540638,
roller/trunk/src/org/apache/roller/ui/core/struts2/CreateWeblog-validation.xml
roller/trunk/src/org/apache/roller/ui/struts2/core/CreateWeblog.java
- copied, changed from r540645,
roller/trunk/src/org/apache/roller/ui/core/struts2/CreateWeblog.java
roller/trunk/src/org/apache/roller/ui/struts2/core/CreateWeblogBean.java
- copied, changed from r540638,
roller/trunk/src/org/apache/roller/ui/core/struts2/CreateWeblogBean.java
roller/trunk/src/org/apache/roller/ui/struts2/core/Login.java
- copied, changed from r540645,
roller/trunk/src/org/apache/roller/ui/core/struts2/Login.java
roller/trunk/src/org/apache/roller/ui/struts2/core/MainMenu.java
- copied, changed from r540645,
roller/trunk/src/org/apache/roller/ui/core/struts2/MainMenu.java
roller/trunk/src/org/apache/roller/ui/struts2/core/Profile-validation.xml
- copied unchanged from r540638,
roller/trunk/src/org/apache/roller/ui/core/struts2/Profile-validation.xml
roller/trunk/src/org/apache/roller/ui/struts2/core/Profile.java
- copied, changed from r540645,
roller/trunk/src/org/apache/roller/ui/core/struts2/Profile.java
roller/trunk/src/org/apache/roller/ui/struts2/core/ProfileBean.java
- copied, changed from r540638,
roller/trunk/src/org/apache/roller/ui/core/struts2/ProfileBean.java
roller/trunk/src/org/apache/roller/ui/struts2/core/Register-validation.xml
- copied unchanged from r540638,
roller/trunk/src/org/apache/roller/ui/core/struts2/Register-validation.xml
roller/trunk/src/org/apache/roller/ui/struts2/core/Register.java
- copied, changed from r540645,
roller/trunk/src/org/apache/roller/ui/core/struts2/Register.java
roller/trunk/src/org/apache/roller/ui/struts2/core/Setup.java
- copied, changed from r540645,
roller/trunk/src/org/apache/roller/ui/core/struts2/Setup.java
Removed:
roller/trunk/src/org/apache/roller/ui/admin/struts2/
roller/trunk/src/org/apache/roller/ui/authoring/struts2/
roller/trunk/src/org/apache/roller/ui/common/
roller/trunk/src/org/apache/roller/ui/core/struts2/
roller/trunk/src/org/apache/roller/ui/core/util/struts2/
Modified:
roller/trunk/src/org/apache/roller/ui/struts2/admin/CreateUser.java
roller/trunk/web/WEB-INF/classes/struts.xml
Modified: roller/trunk/src/org/apache/roller/ui/struts2/admin/CreateUser.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/admin/CreateUser.java?view=diff&rev=540652&r1=540651&r2=540652
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/struts2/admin/CreateUser.java
(original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/admin/CreateUser.java Tue May
22 10:15:15 2007
@@ -29,7 +29,7 @@
import org.apache.roller.business.UserManager;
import org.apache.roller.config.RollerConfig;
import org.apache.roller.pojos.UserData;
-import org.apache.roller.ui.core.struts2.Register;
+import org.apache.roller.ui.struts2.core.Register;
import org.apache.roller.ui.struts2.util.UIAction;
Copied: roller/trunk/src/org/apache/roller/ui/struts2/core/CreateWeblog.java
(from r540645,
roller/trunk/src/org/apache/roller/ui/core/struts2/CreateWeblog.java)
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/core/CreateWeblog.java?view=diff&rev=540652&p1=roller/trunk/src/org/apache/roller/ui/core/struts2/CreateWeblog.java&r1=540645&p2=roller/trunk/src/org/apache/roller/ui/struts2/core/CreateWeblog.java&r2=540652
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/core/struts2/CreateWeblog.java
(original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/core/CreateWeblog.java Tue
May 22 10:15:15 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.ui.core.struts2;
+package org.apache.roller.ui.struts2.core;
import java.util.List;
import org.apache.commons.lang.CharSetUtils;
Copied:
roller/trunk/src/org/apache/roller/ui/struts2/core/CreateWeblogBean.java (from
r540638,
roller/trunk/src/org/apache/roller/ui/core/struts2/CreateWeblogBean.java)
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/core/CreateWeblogBean.java?view=diff&rev=540652&p1=roller/trunk/src/org/apache/roller/ui/core/struts2/CreateWeblogBean.java&r1=540638&p2=roller/trunk/src/org/apache/roller/ui/struts2/core/CreateWeblogBean.java&r2=540652
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/core/struts2/CreateWeblogBean.java
(original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/core/CreateWeblogBean.java
Tue May 22 10:15:15 2007
@@ -16,10 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.ui.core.struts2;
-
-import java.util.Locale;
-import org.apache.roller.pojos.WebsiteData;
+package org.apache.roller.ui.struts2.core;
/**
Copied: roller/trunk/src/org/apache/roller/ui/struts2/core/Login.java (from
r540645, roller/trunk/src/org/apache/roller/ui/core/struts2/Login.java)
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/core/Login.java?view=diff&rev=540652&p1=roller/trunk/src/org/apache/roller/ui/core/struts2/Login.java&r1=540645&p2=roller/trunk/src/org/apache/roller/ui/struts2/core/Login.java&r2=540652
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/core/struts2/Login.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/core/Login.java Tue May 22
10:15:15 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.ui.core.struts2;
+package org.apache.roller.ui.struts2.core;
import org.apache.roller.ui.struts2.util.UIAction;
Copied: roller/trunk/src/org/apache/roller/ui/struts2/core/MainMenu.java (from
r540645, roller/trunk/src/org/apache/roller/ui/core/struts2/MainMenu.java)
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/core/MainMenu.java?view=diff&rev=540652&p1=roller/trunk/src/org/apache/roller/ui/core/struts2/MainMenu.java&r1=540645&p2=roller/trunk/src/org/apache/roller/ui/struts2/core/MainMenu.java&r2=540652
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/core/struts2/MainMenu.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/core/MainMenu.java Tue May 22
10:15:15 2007
@@ -16,20 +16,18 @@
* directory of this distribution.
*/
-package org.apache.roller.ui.core.struts2;
+package org.apache.roller.ui.struts2.core;
import java.util.Collections;
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
-import org.apache.roller.config.RollerConfig;
import org.apache.roller.business.RollerFactory;
import org.apache.roller.business.UserManager;
import org.apache.roller.pojos.PermissionsData;
import org.apache.roller.pojos.UserData;
import org.apache.roller.pojos.WebsiteData;
-import
org.apache.roller.ui.core.struts.actions.YourWebsitesAction.YourWebsitesPageModel;
import org.apache.roller.ui.struts2.util.UIAction;
Copied: roller/trunk/src/org/apache/roller/ui/struts2/core/Profile.java (from
r540645, roller/trunk/src/org/apache/roller/ui/core/struts2/Profile.java)
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/core/Profile.java?view=diff&rev=540652&p1=roller/trunk/src/org/apache/roller/ui/core/struts2/Profile.java&r1=540645&p2=roller/trunk/src/org/apache/roller/ui/struts2/core/Profile.java&r2=540652
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/core/struts2/Profile.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/core/Profile.java Tue May 22
10:15:15 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.ui.core.struts2;
+package org.apache.roller.ui.struts2.core;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
Copied: roller/trunk/src/org/apache/roller/ui/struts2/core/ProfileBean.java
(from r540638,
roller/trunk/src/org/apache/roller/ui/core/struts2/ProfileBean.java)
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/core/ProfileBean.java?view=diff&rev=540652&p1=roller/trunk/src/org/apache/roller/ui/core/struts2/ProfileBean.java&r1=540638&p2=roller/trunk/src/org/apache/roller/ui/struts2/core/ProfileBean.java&r2=540652
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/core/struts2/ProfileBean.java
(original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/core/ProfileBean.java Tue May
22 10:15:15 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.ui.core.struts2;
+package org.apache.roller.ui.struts2.core;
import org.apache.roller.pojos.UserData;
Copied: roller/trunk/src/org/apache/roller/ui/struts2/core/Register.java (from
r540645, roller/trunk/src/org/apache/roller/ui/core/struts2/Register.java)
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/core/Register.java?view=diff&rev=540652&p1=roller/trunk/src/org/apache/roller/ui/core/struts2/Register.java&r1=540645&p2=roller/trunk/src/org/apache/roller/ui/struts2/core/Register.java&r2=540652
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/core/struts2/Register.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/core/Register.java Tue May 22
10:15:15 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.ui.core.struts2;
+package org.apache.roller.ui.struts2.core;
import java.util.Locale;
import java.util.TimeZone;
Copied: roller/trunk/src/org/apache/roller/ui/struts2/core/Setup.java (from
r540645, roller/trunk/src/org/apache/roller/ui/core/struts2/Setup.java)
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/struts2/core/Setup.java?view=diff&rev=540652&p1=roller/trunk/src/org/apache/roller/ui/core/struts2/Setup.java&r1=540645&p2=roller/trunk/src/org/apache/roller/ui/struts2/core/Setup.java&r2=540652
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/core/struts2/Setup.java (original)
+++ roller/trunk/src/org/apache/roller/ui/struts2/core/Setup.java Tue May 22
10:15:15 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.ui.core.struts2;
+package org.apache.roller.ui.struts2.core;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: roller/trunk/web/WEB-INF/classes/struts.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/classes/struts.xml?view=diff&rev=540652&r1=540651&r2=540652
==============================================================================
--- roller/trunk/web/WEB-INF/classes/struts.xml (original)
+++ roller/trunk/web/WEB-INF/classes/struts.xml Tue May 22 10:15:15 2007
@@ -98,38 +98,38 @@
</action>
<action name="setup"
- class="org.apache.roller.ui.core.struts2.Setup">
+ class="org.apache.roller.ui.struts2.core.Setup">
<result name="success" type="tiles">.Setup</result>
</action>
<action name="login"
- class="org.apache.roller.ui.core.struts2.Login">
+ class="org.apache.roller.ui.struts2.core.Login">
<result type="tiles">.Login</result>
</action>
<action name="register!*" method="{1}"
- class="org.apache.roller.ui.core.struts2.Register">
+ class="org.apache.roller.ui.struts2.core.Register">
<result name="input" type="tiles">.Register</result>
<result name="cancel" type="redirect">/</result>
<result name="success" type="tiles">.Welcome</result>
</action>
<action name="profile!*" method="{1}"
- class="org.apache.roller.ui.core.struts2.Profile">
+ class="org.apache.roller.ui.struts2.core.Profile">
<result name="input" type="tiles">.Profile</result>
<result name="cancel" type="redirect-action">menu</result>
<result name="success" type="tiles">.Profile</result>
</action>
<action name="createWeblog!*" method="{1}"
- class="org.apache.roller.ui.core.struts2.CreateWeblog">
+ class="org.apache.roller.ui.struts2.core.CreateWeblog">
<result name="input" type="tiles">.CreateWeblog</result>
<result name="cancel" type="redirect-action">menu</result>
<result name="success" type="chain">menu</result>
</action>
<action name="menu!*" method="{1}"
- class="org.apache.roller.ui.core.struts2.MainMenu">
+ class="org.apache.roller.ui.struts2.core.MainMenu">
<result type="tiles">.MainMenu</result>
</action>
