svn commit: r415326 - in /incubator/roller/branches/roller_3.0: src/org/apache/roller/ui/admin/struts/actions/ src/org/apache/roller/ui/core/tasks/ tests/org/apache/roller/business/ web/WEB-INF/classes/

[sn...@apache.org]

Author: snoopdave
Date: Mon Jun 19 06:15:43 2006
New Revision: 415326

URL: http://svn.apache.org/viewvc?rev=415326&view=rev
Log:
Until we have a planet module, let's group the planet tasks with the other tasks

Added:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/tasks/PlanetConfigAction.java
      - copied, changed from r415319, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/PlanetConfigAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/tasks/SyncWebsitesTask.java
      - copied, changed from r415319, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/SyncWebsitesTask.java
Removed:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/PlanetConfigAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/SyncWebsitesTask.java
Modified:
    incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/   (props changed)
    incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerLocalTest.java
    incubator/roller/branches/roller_3.0/web/WEB-INF/classes/roller.properties

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/tasks/PlanetConfigAction.java (from r415319, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/PlanetConfigAction.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/tasks/PlanetConfigAction.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/tasks/PlanetConfigAction.java&p1=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/PlanetConfigAction.java&r1=415319&r2=415326&rev=415326&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/PlanetConfigAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/tasks/PlanetConfigAction.java Mon Jun 19 06:15:43 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.roller.ui.admin.struts.actions;
+package org.apache.roller.ui.core.tasks;
 
 import java.io.File;
 import java.io.IOException;
@@ -24,6 +24,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.roller.ui.admin.struts.actions.*;
+import org.apache.roller.ui.core.tasks.SyncWebsitesTask;
 import org.apache.struts.action.ActionError;
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionForm;

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/tasks/SyncWebsitesTask.java (from r415319, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/SyncWebsitesTask.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/tasks/SyncWebsitesTask.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/tasks/SyncWebsitesTask.java&p1=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/SyncWebsitesTask.java&r1=415319&r2=415326&rev=415326&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/admin/struts/actions/SyncWebsitesTask.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/tasks/SyncWebsitesTask.java Mon Jun 19 06:15:43 2006
@@ -15,7 +15,7 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.roller.ui.admin.struts.actions;
+package org.apache.roller.ui.core.tasks;
 
 import java.io.IOException;
 import java.util.ArrayList;

Propchange: incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 19 06:15:43 2006
@@ -1 +1,2 @@
 .LCKPlanetManagerTest.java~
+.LCKPlanetManagerLocalTest.java~

Modified: incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerLocalTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerLocalTest.java?rev=415326&r1=415325&r2=415326&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerLocalTest.java (original)
+++ incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerLocalTest.java Mon Jun 19 06:15:43 2006
@@ -23,7 +23,7 @@
 import org.apache.roller.RollerTestBase;
 import org.apache.roller.model.PlanetManager;
 import org.apache.roller.ui.admin.struts.actions.RefreshEntriesTask;
-import org.apache.roller.ui.admin.struts.actions.SyncWebsitesTask;
+import org.apache.roller.ui.core.tasks.SyncWebsitesTask;
 
 /**
  * Test database implementation of PlanetManager for local feeds.

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/classes/roller.properties
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/classes/roller.properties?rev=415326&r1=415325&r2=415326&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/classes/roller.properties (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/classes/roller.properties Mon Jun 19 06:15:43 2006
@@ -184,13 +184,13 @@
 #,org.apache.roller.ui.core.tasks.BlacklistUpdateTask\
 
 # Daily Planet task: syncs weblog list with Roller, refreshes Technorati stats
-#,org.apache.roller.ui.admin.struts.actions.SyncWebsitesTask
+#,org.apache.roller.ui.core.tasks.SyncWebsitesTask
 
 # Comma separated list of task classnames to be executed hourly
 tasks.hourly=\
 
 # Hourly Planet task: refresh latest entry list from all weblogs in list
-#org.apache.roller.ui.admin.struts.actions.RefreshEntriesTask
+#org.apache.roller.ui.core.tasks.RefreshEntriesTask
 
 #----------------------------------
 # Velocity settings