roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r542723 [8/12] - in /roller/trunk: ./ nbproject/ src/META-INF/ src/org/apache/roller/ src/org/apache/roller/business/ src/org/apache/roller/config/ src/org/apache/roller/planet/ src/org/apache/roller/pojos/ src/org/apache/roller/ui/ src/org...
Date Wed, 30 May 2007 02:18:48 GMT
Modified: roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/NewsfeedCache.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/NewsfeedCache.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/NewsfeedCache.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/NewsfeedCache.java Tue May 29 19:18:07 2007
@@ -1 +1,176 @@
-/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 *  contributor license agreements.  The ASF licenses this file to You
 * under the Apache License, Version 2.0 (the "License"); you may not
 * use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.  For additional information regarding
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */

package org.apache.roller.ui.rendering.velocity.deprecated;

import com.sun.syndication.feed.synd.SyndFeed;
import com.sun.syndication.io.SyndFeedInpu
 t;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.net.URLConnection;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.config.RollerConfig;
import org.apache.roller.util.LRUCache2;


/**
 * Returns parsed RSS feed by pulling one from a cache or by retrieving and
 * parging the specified feed using the Flock RSS parser.
 *
 * TODO: use PlanetRoller to implement NewsfeedCache instead.
 */
public class NewsfeedCache {
    
    private static Log mLogger = LogFactory.getLog(NewsfeedCache.class);
    
    /** Static singleton * */
    private static NewsfeedCache mInstance = null;
    
    /** Instance vars * */
    private boolean aggregator_enabled = true;
    private boolean aggregator_cache_enabled = true;
    private int aggregator_cache_timeout = 14400;
    
    /** LRU cache */
    LRUCache2 mCache = null;
    
    
    /** Constructor */
    private
  NewsfeedCache() {
        // lookup the props we need
        String enabled = RollerConfig.getProperty("aggregator.enabled");
        String usecache = RollerConfig.getProperty("aggregator.cache.enabled");
        String cachetime = RollerConfig.getProperty("aggregator.cache.timeout");
        
        if("true".equalsIgnoreCase(enabled))
            this.aggregator_enabled = true;
        
        if("true".equalsIgnoreCase(usecache))
            this.aggregator_cache_enabled = true;
        
        try {
            this.aggregator_cache_timeout = Integer.parseInt(cachetime);
        } catch(Exception e) { mLogger.warn(e); }
        
        // finally ... create the cache
        this.mCache = new LRUCache2(100, 1000 * this.aggregator_cache_timeout);
    }
    
    
    /** static singleton retriever */
    public static NewsfeedCache getInstance() {
        synchronized (NewsfeedCache.class) {
            if (mInstance == null) {
                if (mLogger.isDebugEna
 bled()) {
                    mLogger.debug("Instantiating new NewsfeedCache");
                }
                mInstance = new NewsfeedCache();
            }
        }
        return mInstance;
    }
    
    
    /**
     * Returns a Channel object for the supplied RSS newsfeed URL.
     *
     * @param feedUrl RSS newsfeed URL.
     * @return FlockFeedI for specified RSS newsfeed URL.
     */
    public SyndFeed getChannel(String feedUrl) {
        
        SyndFeed feed = null;
        try {
            // If aggregator has been disable return null
            if (!aggregator_enabled) {
                return null;
            }
            
            if (aggregator_cache_enabled) {
                if (mLogger.isDebugEnabled()) {
                    mLogger.debug("Newsfeed: use Cache for " + feedUrl);
                }
                
                // Get pre-parsed feed from the cache
                feed = (SyndFeed) mCache.get(feedUrl);
                if (mLog
 ger.isDebugEnabled()) {
                    mLogger.debug("Newsfeed: got from Cache");
                }
                
                if (feed == null) {
                    try {
                        // Parse the feed
                        SyndFeedInput feedInput = new SyndFeedInput();
                        feed = feedInput.build(new InputStreamReader(
                                new URL(feedUrl).openStream()));
                    } catch (Exception e1) {
                        mLogger.info("Error parsing RSS: " + feedUrl);
                    }
                }
                // Store parsed feed in the cache
                mCache.put(feedUrl, feed);
                mLogger.debug("Newsfeed: not in Cache");
                
            } else {
                if (mLogger.isDebugEnabled()) {
                    mLogger.debug("Newsfeed: not using Cache for " + feedUrl);
                }
                try {
                    // charset fix from Jason 
 Rumney (see ROL-766)
                    URLConnection connection = new URL(feedUrl).openConnection();
                    connection.connect();
                    String contentType = connection.getContentType();
                    // Default charset to UTF-8, since we are expecting XML
                    String charset = "UTF-8";
                    if (contentType != null) {
                        int charsetStart = contentType.indexOf("charset=");
                        if (charsetStart >= 0) {
                            int charsetEnd = contentType.indexOf(";", charsetStart);
                            if (charsetEnd == -1) charsetEnd = contentType.length();
                            charsetStart += "charset=".length();
                            charset = contentType.substring(charsetStart, charsetEnd);
                            // Check that charset is recognized by Java
                            try {
                                byte[] test = "test"
 .getBytes(charset);
                            } catch (UnsupportedEncodingException codingEx) {
                                // default to UTF-8
                                charset = "UTF-8";
                            }
                        }
                    }
                    // Parse the feed
                    SyndFeedInput feedInput = new SyndFeedInput();
                    feed = feedInput.build(new InputStreamReader(
                            connection.getInputStream(), charset));
                } catch (Exception e1) {
                    mLogger.info("Error parsing RSS: " + feedUrl);
                }
            }
            
        } catch (Exception ioe) {
            if (mLogger.isDebugEnabled()) {
                mLogger.debug("Newsfeed: Unexpected exception", ioe);
            }
        }
        
        return feed;
    }
    
}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ */
+
+package org.apache.roller.weblogger.ui.rendering.velocity.deprecated;
+
+import com.sun.syndication.feed.synd.SyndFeed;
+import com.sun.syndication.io.SyndFeedInput;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.net.URL;
+import java.net.URLConnection;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.util.LRUCache2;
+
+
+/**
+ * Returns parsed RSS feed by pulling one from a cache or by retrieving and
+ * parging the specified feed using the Flock RSS parser.
+ *
+ * TODO: use PlanetRoller to implement NewsfeedCache instead.
+ */
+public class NewsfeedCache {
+    
+    private static Log mLogger = LogFactory.getLog(NewsfeedCache.class);
+    
+    /** Static singleton * */
+    private static NewsfeedCache mInstance = null;
+    
+    /** Instance vars * */
+    private boolean aggregator_enabled = true;
+    private boolean aggregator_cache_enabled = true;
+    private int aggregator_cache_timeout = 14400;
+    
+    /** LRU cache */
+    LRUCache2 mCache = null;
+    
+    
+    /** Constructor */
+    private NewsfeedCache() {
+        // lookup the props we need
+        String enabled = RollerConfig.getProperty("aggregator.enabled");
+        String usecache = RollerConfig.getProperty("aggregator.cache.enabled");
+        String cachetime = RollerConfig.getProperty("aggregator.cache.timeout");
+        
+        if("true".equalsIgnoreCase(enabled))
+            this.aggregator_enabled = true;
+        
+        if("true".equalsIgnoreCase(usecache))
+            this.aggregator_cache_enabled = true;
+        
+        try {
+            this.aggregator_cache_timeout = Integer.parseInt(cachetime);
+        } catch(Exception e) { mLogger.warn(e); }
+        
+        // finally ... create the cache
+        this.mCache = new LRUCache2(100, 1000 * this.aggregator_cache_timeout);
+    }
+    
+    
+    /** static singleton retriever */
+    public static NewsfeedCache getInstance() {
+        synchronized (NewsfeedCache.class) {
+            if (mInstance == null) {
+                if (mLogger.isDebugEnabled()) {
+                    mLogger.debug("Instantiating new NewsfeedCache");
+                }
+                mInstance = new NewsfeedCache();
+            }
+        }
+        return mInstance;
+    }
+    
+    
+    /**
+     * Returns a Channel object for the supplied RSS newsfeed URL.
+     *
+     * @param feedUrl RSS newsfeed URL.
+     * @return FlockFeedI for specified RSS newsfeed URL.
+     */
+    public SyndFeed getChannel(String feedUrl) {
+        
+        SyndFeed feed = null;
+        try {
+            // If aggregator has been disable return null
+            if (!aggregator_enabled) {
+                return null;
+            }
+            
+            if (aggregator_cache_enabled) {
+                if (mLogger.isDebugEnabled()) {
+                    mLogger.debug("Newsfeed: use Cache for " + feedUrl);
+                }
+                
+                // Get pre-parsed feed from the cache
+                feed = (SyndFeed) mCache.get(feedUrl);
+                if (mLogger.isDebugEnabled()) {
+                    mLogger.debug("Newsfeed: got from Cache");
+                }
+                
+                if (feed == null) {
+                    try {
+                        // Parse the feed
+                        SyndFeedInput feedInput = new SyndFeedInput();
+                        feed = feedInput.build(new InputStreamReader(
+                                new URL(feedUrl).openStream()));
+                    } catch (Exception e1) {
+                        mLogger.info("Error parsing RSS: " + feedUrl);
+                    }
+                }
+                // Store parsed feed in the cache
+                mCache.put(feedUrl, feed);
+                mLogger.debug("Newsfeed: not in Cache");
+                
+            } else {
+                if (mLogger.isDebugEnabled()) {
+                    mLogger.debug("Newsfeed: not using Cache for " + feedUrl);
+                }
+                try {
+                    // charset fix from Jason Rumney (see ROL-766)
+                    URLConnection connection = new URL(feedUrl).openConnection();
+                    connection.connect();
+                    String contentType = connection.getContentType();
+                    // Default charset to UTF-8, since we are expecting XML
+                    String charset = "UTF-8";
+                    if (contentType != null) {
+                        int charsetStart = contentType.indexOf("charset=");
+                        if (charsetStart >= 0) {
+                            int charsetEnd = contentType.indexOf(";", charsetStart);
+                            if (charsetEnd == -1) charsetEnd = contentType.length();
+                            charsetStart += "charset=".length();
+                            charset = contentType.substring(charsetStart, charsetEnd);
+                            // Check that charset is recognized by Java
+                            try {
+                                byte[] test = "test".getBytes(charset);
+                            } catch (UnsupportedEncodingException codingEx) {
+                                // default to UTF-8
+                                charset = "UTF-8";
+                            }
+                        }
+                    }
+                    // Parse the feed
+                    SyndFeedInput feedInput = new SyndFeedInput();
+                    feed = feedInput.build(new InputStreamReader(
+                            connection.getInputStream(), charset));
+                } catch (Exception e1) {
+                    mLogger.info("Error parsing RSS: " + feedUrl);
+                }
+            }
+            
+        } catch (Exception ioe) {
+            if (mLogger.isDebugEnabled()) {
+                mLogger.debug("Newsfeed: Unexpected exception", ioe);
+            }
+        }
+        
+        return feed;
+    }
+    
+}

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldCommentsRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldCommentsRequest.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldCommentsRequest.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldCommentsRequest.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.rendering.velocity.deprecated;
+package org.apache.roller.weblogger.ui.rendering.velocity.deprecated;
 
 import java.util.Enumeration;
 import java.util.HashSet;

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldFeedRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldFeedRequest.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldFeedRequest.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldFeedRequest.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.rendering.velocity.deprecated;
+package org.apache.roller.weblogger.ui.rendering.velocity.deprecated;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -25,7 +25,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.pojos.WeblogTemplate;
+import org.apache.roller.weblogger.pojos.WeblogTemplate;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.rendering.velocity.deprecated;
+package org.apache.roller.weblogger.ui.rendering.velocity.deprecated;
 
 import java.net.MalformedURLException;
 import java.util.Date;
@@ -32,24 +32,24 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts.util.RequestUtils;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.WeblogEntryPlugin;
-import org.apache.roller.business.PluginManager;
-import org.apache.roller.business.Roller;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.pojos.WeblogBookmarkFolder;
-import org.apache.roller.pojos.Weblog;
-import org.apache.roller.pojos.wrapper.RefererDataWrapper;
-import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
-import org.apache.roller.ui.core.RequestConstants;
-import org.apache.roller.ui.core.RollerSession;
-import org.apache.roller.ui.core.tags.calendar.CalendarModel;
-import org.apache.roller.ui.core.tags.calendar.CalendarTag;
-import org.apache.roller.ui.core.tags.menu.EditorNavigationBarTag;
-import org.apache.roller.ui.core.tags.menu.MenuTag;
-import org.apache.roller.ui.core.tags.calendar.BigWeblogCalendarModel;
-import org.apache.roller.ui.core.tags.calendar.WeblogCalendarModel;
-import org.apache.roller.ui.rendering.util.WeblogPageRequest;
-import org.apache.roller.util.URLUtilities;
+import org.apache.roller.weblogger.business.WeblogEntryPlugin;
+import org.apache.roller.weblogger.business.PluginManager;
+import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.wrapper.RefererDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper;
+import org.apache.roller.weblogger.ui.core.RequestConstants;
+import org.apache.roller.weblogger.ui.core.RollerSession;
+import org.apache.roller.weblogger.ui.core.tags.calendar.CalendarModel;
+import org.apache.roller.weblogger.ui.core.tags.calendar.CalendarTag;
+import org.apache.roller.weblogger.ui.core.tags.menu.EditorNavigationBarTag;
+import org.apache.roller.weblogger.ui.core.tags.menu.MenuTag;
+import org.apache.roller.weblogger.ui.core.tags.calendar.BigWeblogCalendarModel;
+import org.apache.roller.weblogger.ui.core.tags.calendar.WeblogCalendarModel;
+import org.apache.roller.weblogger.ui.rendering.util.WeblogPageRequest;
+import org.apache.roller.weblogger.util.URLUtilities;
 
 /**
  * Provides assistance to VelociMacros, filling in where Velocity falls.

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageRequest.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageRequest.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageRequest.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
 * directory of this distribution.
 */
 
-package org.apache.roller.ui.rendering.velocity.deprecated;
+package org.apache.roller.weblogger.ui.rendering.velocity.deprecated;
 
 import java.util.Enumeration;
 import java.util.HashSet;
@@ -27,8 +27,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.pojos.WeblogTemplate;
-import org.apache.roller.util.Utilities;
+import org.apache.roller.weblogger.pojos.WeblogTemplate;
+import org.apache.roller.weblogger.util.Utilities;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldStringUtils.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldStringUtils.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldStringUtils.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldStringUtils.java Tue May 29 19:18:07 2007
@@ -18,7 +18,7 @@
 /*
  * Created on Jun 3, 2004
  */
-package org.apache.roller.ui.rendering.velocity.deprecated;
+package org.apache.roller.weblogger.ui.rendering.velocity.deprecated;
 
 /**
  * @author lance.lavandowska

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldUtilities.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldUtilities.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldUtilities.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldUtilities.java Tue May 29 19:18:07 2007
@@ -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.rendering.velocity.deprecated;
+package org.apache.roller.weblogger.ui.rendering.velocity.deprecated;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -29,9 +29,9 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.util.DateUtil;
-import org.apache.roller.util.RegexUtil;
-import org.apache.roller.util.Utilities;
+import org.apache.roller.weblogger.util.DateUtil;
+import org.apache.roller.weblogger.util.RegexUtil;
+import org.apache.roller.weblogger.util.Utilities;
 import org.apache.commons.codec.binary.Base64;
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.rendering.velocity.deprecated;
+package org.apache.roller.weblogger.ui.rendering.velocity.deprecated;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -34,30 +34,30 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.business.BookmarkManager;
-import org.apache.roller.business.referrers.RefererManager;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.WeblogEntryComment;
-import org.apache.roller.pojos.WeblogBookmarkFolder;
-import org.apache.roller.pojos.WeblogReferrer;
-import org.apache.roller.pojos.WeblogCategory;
-import org.apache.roller.pojos.WeblogEntry;
-import org.apache.roller.pojos.Weblog;
-import org.apache.roller.pojos.wrapper.CommentDataWrapper;
-import org.apache.roller.pojos.wrapper.FolderDataWrapper;
-import org.apache.roller.pojos.wrapper.RefererDataWrapper;
-import org.apache.roller.pojos.wrapper.TemplateWrapper;
-import org.apache.roller.pojos.wrapper.WeblogCategoryDataWrapper;
-import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
-import org.apache.roller.pojos.wrapper.WebsiteDataWrapper;
-import org.apache.roller.ui.core.RollerSession;
-import org.apache.roller.util.DateUtil;
+import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.business.BookmarkManager;
+import org.apache.roller.weblogger.business.referrers.RefererManager;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.pojos.WeblogEntryComment;
+import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
+import org.apache.roller.weblogger.pojos.WeblogReferrer;
+import org.apache.roller.weblogger.pojos.WeblogCategory;
+import org.apache.roller.weblogger.pojos.WeblogEntry;
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.wrapper.CommentDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.FolderDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.RefererDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.TemplateWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogCategoryDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WebsiteDataWrapper;
+import org.apache.roller.weblogger.ui.core.RollerSession;
+import org.apache.roller.weblogger.util.DateUtil;
 import org.apache.commons.lang.StringUtils;
-import org.apache.roller.pojos.WeblogHitCount;
-import org.apache.roller.pojos.ThemeTemplate;
+import org.apache.roller.weblogger.pojos.WeblogHitCount;
+import org.apache.roller.weblogger.pojos.ThemeTemplate;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/RedirectServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/RedirectServlet.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/RedirectServlet.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/RedirectServlet.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.rendering.velocity.deprecated;
+package org.apache.roller.weblogger.ui.rendering.velocity.deprecated;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -29,8 +29,8 @@
 import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.util.URLUtilities;
+import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.util.URLUtilities;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/CacheInfo.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/CacheInfo.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/CacheInfo.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/CacheInfo.java Tue May 29 19:18:07 2007
@@ -16,14 +16,14 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.admin;
+package org.apache.roller.weblogger.ui.struts2.admin;
 
 import java.util.Collections;
 import java.util.Map;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.ui.struts2.util.UIAction;
-import org.apache.roller.util.cache.CacheManager;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.util.cache.CacheManager;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetAdd.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetAdd.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetAdd.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetAdd.java Tue May 29 19:18:07 2007
@@ -16,12 +16,12 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.admin;
+package org.apache.roller.weblogger.ui.struts2.admin;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.pojos.PingTarget;
-import org.apache.roller.ui.struts2.common.PingTargetAddBase;
+import org.apache.roller.weblogger.pojos.PingTarget;
+import org.apache.roller.weblogger.ui.struts2.common.PingTargetAddBase;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetEdit.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetEdit.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargetEdit.java Tue May 29 19:18:07 2007
@@ -16,11 +16,11 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.admin;
+package org.apache.roller.weblogger.ui.struts2.admin;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.ui.struts2.common.PingTargetEditBase;
+import org.apache.roller.weblogger.ui.struts2.common.PingTargetEditBase;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargets.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargets.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargets.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargets.java Tue May 29 19:18:07 2007
@@ -16,14 +16,14 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.admin;
+package org.apache.roller.weblogger.ui.struts2.admin;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.pings.PingTargetManager;
-import org.apache.roller.ui.struts2.common.PingTargetsBase;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.pings.PingTargetManager;
+import org.apache.roller.weblogger.ui.struts2.common.PingTargetsBase;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.admin;
+package org.apache.roller.weblogger.ui.struts2.admin;
 
 import java.util.Locale;
 import java.util.TimeZone;
@@ -25,12 +25,12 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.config.RollerConfig;
-import org.apache.roller.pojos.User;
-import org.apache.roller.ui.struts2.core.Register;
-import org.apache.roller.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.ui.struts2.core.Register;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/CreateUserBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/CreateUserBean.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/CreateUserBean.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/CreateUserBean.java Tue May 29 19:18:07 2007
@@ -16,10 +16,10 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.admin;
+package org.apache.roller.weblogger.ui.struts2.admin;
 
 import java.util.Locale;
-import org.apache.roller.pojos.User;
+import org.apache.roller.weblogger.pojos.User;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.admin;
+package org.apache.roller.weblogger.ui.struts2.admin;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,13 +27,13 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.WeblogEntryComment;
-import org.apache.roller.ui.struts2.util.KeyValueObject;
-import org.apache.roller.util.cache.CacheManager;
-import org.apache.roller.ui.struts2.util.UIAction;
-import org.apache.roller.util.Utilities;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.pojos.WeblogEntryComment;
+import org.apache.roller.weblogger.ui.struts2.util.KeyValueObject;
+import org.apache.roller.weblogger.util.cache.CacheManager;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.util.Utilities;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagementBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagementBean.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagementBean.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagementBean.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.admin;
+package org.apache.roller.weblogger.ui.struts2.admin;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -25,9 +25,9 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
-import org.apache.roller.pojos.WeblogEntryComment;
-import org.apache.roller.util.DateUtil;
-import org.apache.roller.util.Utilities;
+import org.apache.roller.weblogger.pojos.WeblogEntryComment;
+import org.apache.roller.weblogger.util.DateUtil;
+import org.apache.roller.weblogger.util.Utilities;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.admin;
+package org.apache.roller.weblogger.ui.struts2.admin;
 
 import java.util.Collections;
 import java.util.Iterator;
@@ -26,13 +26,13 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.PropertiesManager;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.config.runtime.ConfigDef;
-import org.apache.roller.config.runtime.RuntimeConfigDefs;
-import org.apache.roller.pojos.RuntimeConfigProperty;
-import org.apache.roller.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.business.PropertiesManager;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.config.runtime.ConfigDef;
+import org.apache.roller.weblogger.config.runtime.RuntimeConfigDefs;
+import org.apache.roller.weblogger.pojos.RuntimeConfigProperty;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
 import org.apache.struts2.interceptor.ParameterAware;
 
 

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java Tue May 29 19:18:07 2007
@@ -16,16 +16,16 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.admin;
+package org.apache.roller.weblogger.ui.struts2.admin;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.pojos.User;
-import org.apache.roller.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/UserAdmin.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/UserAdmin.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/UserAdmin.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/admin/UserAdmin.java Tue May 29 19:18:07 2007
@@ -16,9 +16,9 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.admin;
+package org.apache.roller.weblogger.ui.struts2.admin;
 
-import org.apache.roller.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.ajax;
+package org.apache.roller.weblogger.ui.struts2.ajax;
 
 import java.io.IOException;
 import javax.servlet.ServletException;
@@ -25,11 +25,11 @@
 import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.WordUtils;
-import org.apache.roller.business.Roller;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.WeblogEntryComment;
-import org.apache.roller.util.Utilities;
+import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.pojos.WeblogEntryComment;
+import org.apache.roller.weblogger.util.Utilities;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.ajax;
+package org.apache.roller.weblogger.ui.struts2.ajax;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -26,10 +26,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.Roller;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.pojos.User;
+import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.pojos.User;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/common/PingTargetAddBase.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/common/PingTargetAddBase.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/common/PingTargetAddBase.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/common/PingTargetAddBase.java Tue May 29 19:18:07 2007
@@ -16,14 +16,14 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.common;
+package org.apache.roller.weblogger.ui.struts2.common;
 
 import org.apache.commons.logging.Log;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.pings.PingTargetManager;
-import org.apache.roller.pojos.PingTarget;
-import org.apache.roller.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.pings.PingTargetManager;
+import org.apache.roller.weblogger.pojos.PingTarget;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java Tue May 29 19:18:07 2007
@@ -16,15 +16,15 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.common;
+package org.apache.roller.weblogger.ui.struts2.common;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.pings.PingTargetManager;
-import org.apache.roller.pojos.PingTarget;
-import org.apache.roller.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.pings.PingTargetManager;
+import org.apache.roller.weblogger.pojos.PingTarget;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/common/PingTargetFormBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/common/PingTargetFormBean.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/common/PingTargetFormBean.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/common/PingTargetFormBean.java Tue May 29 19:18:07 2007
@@ -16,9 +16,9 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.common;
+package org.apache.roller.weblogger.ui.struts2.common;
 
-import org.apache.roller.pojos.PingTarget;
+import org.apache.roller.weblogger.pojos.PingTarget;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java Tue May 29 19:18:07 2007
@@ -16,17 +16,17 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.common;
+package org.apache.roller.weblogger.ui.struts2.common;
 
 import java.util.Collections;
 import java.util.List;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.pings.PingTargetManager;
-import org.apache.roller.pojos.PingTarget;
-import org.apache.roller.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.pings.PingTargetManager;
+import org.apache.roller.weblogger.pojos.PingTarget;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog-validation.xml
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog-validation.xml?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog-validation.xml (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog-validation.xml Tue May 29 19:18:07 2007
@@ -68,4 +68,4 @@
         </field-validator>
     </field>
     
-</validators>
\ No newline at end of file
+</validators>

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.core;
+package org.apache.roller.weblogger.ui.struts2.core;
 
 import java.util.List;
 import org.apache.commons.lang.CharSetUtils;
@@ -24,15 +24,15 @@
 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.config.RollerRuntimeConfig;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.themes.ThemeManager;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.Weblog;
-import org.apache.roller.ui.struts2.util.UIAction;
-import org.apache.roller.util.Utilities;
+import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.themes.ThemeManager;
+import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.util.Utilities;
 import org.apache.struts2.interceptor.validation.SkipValidation;
 
 

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/CreateWeblogBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/CreateWeblogBean.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/CreateWeblogBean.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/CreateWeblogBean.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.core;
+package org.apache.roller.weblogger.ui.struts2.core;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/Login.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/Login.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/Login.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/Login.java Tue May 29 19:18:07 2007
@@ -16,9 +16,9 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.core;
+package org.apache.roller.weblogger.ui.struts2.core;
 
-import org.apache.roller.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java Tue May 29 19:18:07 2007
@@ -16,19 +16,19 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.core;
+package org.apache.roller.weblogger.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.business.RollerFactory;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.Weblog;
-import org.apache.roller.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/Profile-validation.xml
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/Profile-validation.xml?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/Profile-validation.xml (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/Profile-validation.xml Tue May 29 19:18:07 2007
@@ -61,4 +61,4 @@
         </field-validator>
     </field>
     
-</validators>
\ No newline at end of file
+</validators>

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/Profile.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/Profile.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/Profile.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/Profile.java Tue May 29 19:18:07 2007
@@ -16,16 +16,16 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.core;
+package org.apache.roller.weblogger.ui.struts2.core;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.pojos.User;
-import org.apache.roller.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
 import org.apache.struts2.interceptor.validation.SkipValidation;
 
 

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/ProfileBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/ProfileBean.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/ProfileBean.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/ProfileBean.java Tue May 29 19:18:07 2007
@@ -16,9 +16,9 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.core;
+package org.apache.roller.weblogger.ui.struts2.core;
 
-import org.apache.roller.pojos.User;
+import org.apache.roller.weblogger.pojos.User;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/Register-validation.xml
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/Register-validation.xml?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/Register-validation.xml (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/Register-validation.xml Tue May 29 19:18:07 2007
@@ -95,4 +95,4 @@
         </field-validator>
     </field>
     
-</validators>
\ No newline at end of file
+</validators>

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/Register.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/Register.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/Register.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/Register.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.core;
+package org.apache.roller.weblogger.ui.struts2.core;
 
 import java.util.Locale;
 import java.util.TimeZone;
@@ -27,14 +27,14 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.config.RollerConfig;
-import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.pojos.User;
-import org.apache.roller.ui.core.security.CustomUserRegistry;
-import org.apache.roller.ui.struts2.util.UIAction;
-import org.apache.roller.util.MailUtil;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.ui.core.security.CustomUserRegistry;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.util.MailUtil;
 import org.apache.struts2.interceptor.ServletRequestAware;
 import org.apache.struts2.interceptor.validation.SkipValidation;
 

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/Setup.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/Setup.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/Setup.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/core/Setup.java Tue May 29 19:18:07 2007
@@ -16,14 +16,14 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.core;
+package org.apache.roller.weblogger.ui.struts2.core;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd-validation.xml
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd-validation.xml?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd-validation.xml (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd-validation.xml Tue May 29 19:18:07 2007
@@ -62,4 +62,4 @@
         </field-validator>
     </field>
     
-</validators>
\ No newline at end of file
+</validators>

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.editor;
+package org.apache.roller.weblogger.ui.struts2.editor;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -24,13 +24,13 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.BookmarkManager;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.pojos.WeblogBookmark;
-import org.apache.roller.pojos.WeblogBookmarkFolder;
-import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.ui.struts2.util.UIAction;
-import org.apache.roller.util.cache.CacheManager;
+import org.apache.roller.weblogger.business.BookmarkManager;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.pojos.WeblogBookmark;
+import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.util.cache.CacheManager;
 import org.apache.struts2.interceptor.validation.SkipValidation;
 
 

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/BookmarkBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/BookmarkBean.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/BookmarkBean.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/BookmarkBean.java Tue May 29 19:18:07 2007
@@ -16,9 +16,9 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.editor;
+package org.apache.roller.weblogger.ui.struts2.editor;
 
-import org.apache.roller.pojos.WeblogBookmark;
+import org.apache.roller.weblogger.pojos.WeblogBookmark;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit-validation.xml
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit-validation.xml?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit-validation.xml (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit-validation.xml Tue May 29 19:18:07 2007
@@ -62,4 +62,4 @@
         </field-validator>
     </field>
     
-</validators>
\ No newline at end of file
+</validators>

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.editor;
+package org.apache.roller.weblogger.ui.struts2.editor;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -24,12 +24,12 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.BookmarkManager;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.pojos.WeblogBookmark;
-import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.ui.struts2.util.UIAction;
-import org.apache.roller.util.cache.CacheManager;
+import org.apache.roller.weblogger.business.BookmarkManager;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.pojos.WeblogBookmark;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.util.cache.CacheManager;
 import org.apache.struts2.interceptor.validation.SkipValidation;
 
 

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.editor;
+package org.apache.roller.weblogger.ui.struts2.editor;
 
 import java.util.Collections;
 import java.util.Comparator;
@@ -28,13 +28,13 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.BookmarkManager;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.pojos.WeblogBookmark;
-import org.apache.roller.pojos.WeblogBookmarkFolder;
-import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.ui.struts2.util.UIAction;
-import org.apache.roller.util.cache.CacheManager;
+import org.apache.roller.weblogger.business.BookmarkManager;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.pojos.WeblogBookmark;
+import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.util.cache.CacheManager;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.editor;
+package org.apache.roller.weblogger.ui.struts2.editor;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -26,11 +26,11 @@
 import java.util.Date;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.business.BookmarkManager;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.ui.struts2.util.UIAction;
-import org.apache.roller.util.cache.CacheManager;
+import org.apache.roller.weblogger.business.BookmarkManager;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.util.cache.CacheManager;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/Categories.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/Categories.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/Categories.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/Categories.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.editor;
+package org.apache.roller.weblogger.ui.struts2.editor;
 
 import java.util.Collections;
 import java.util.List;
@@ -27,12 +27,12 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.pojos.WeblogCategory;
-import org.apache.roller.pojos.WeblogCategoryPathComparator;
-import org.apache.roller.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.pojos.WeblogCategory;
+import org.apache.roller.weblogger.pojos.WeblogCategoryPathComparator;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd-validation.xml
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd-validation.xml?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd-validation.xml (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd-validation.xml Tue May 29 19:18:07 2007
@@ -26,4 +26,4 @@
         </field-validator>
     </field>
     
-</validators>
\ No newline at end of file
+</validators>

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java Tue May 29 19:18:07 2007
@@ -16,18 +16,18 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.editor;
+package org.apache.roller.weblogger.ui.struts2.editor;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.WeblogCategory;
-import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.ui.struts2.util.UIAction;
-import org.apache.roller.util.cache.CacheManager;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.pojos.WeblogCategory;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.util.cache.CacheManager;
 import org.apache.struts2.interceptor.validation.SkipValidation;
 
 

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CategoryBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CategoryBean.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CategoryBean.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CategoryBean.java Tue May 29 19:18:07 2007
@@ -16,10 +16,10 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.editor;
+package org.apache.roller.weblogger.ui.struts2.editor;
 
 import org.apache.roller.RollerException;
-import org.apache.roller.pojos.WeblogCategory;
+import org.apache.roller.weblogger.pojos.WeblogCategory;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit-validation.xml
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit-validation.xml?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit-validation.xml (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit-validation.xml Tue May 29 19:18:07 2007
@@ -26,4 +26,4 @@
         </field-validator>
     </field>
     
-</validators>
\ No newline at end of file
+</validators>

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java Tue May 29 19:18:07 2007
@@ -16,18 +16,18 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.editor;
+package org.apache.roller.weblogger.ui.struts2.editor;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.WeblogCategory;
-import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.ui.struts2.util.UIAction;
-import org.apache.roller.util.cache.CacheManager;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.pojos.WeblogCategory;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.util.cache.CacheManager;
 import org.apache.struts2.interceptor.validation.SkipValidation;
 
 

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.editor;
+package org.apache.roller.weblogger.ui.struts2.editor;
 
 import java.util.Collections;
 import java.util.List;
@@ -26,13 +26,13 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.pojos.WeblogCategory;
-import org.apache.roller.pojos.WeblogCategoryPathComparator;
-import org.apache.roller.ui.struts2.util.UIAction;
-import org.apache.roller.util.cache.CacheManager;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.pojos.WeblogCategory;
+import org.apache.roller.weblogger.pojos.WeblogCategoryPathComparator;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.util.cache.CacheManager;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/Comments.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/Comments.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/Comments.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.editor;
+package org.apache.roller.weblogger.ui.struts2.editor;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -26,14 +26,14 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.WeblogEntryComment;
-import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.ui.struts2.util.KeyValueObject;
-import org.apache.roller.util.cache.CacheManager;
-import org.apache.roller.ui.struts2.util.UIAction;
-import org.apache.roller.util.Utilities;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.pojos.WeblogEntryComment;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.ui.struts2.util.KeyValueObject;
+import org.apache.roller.weblogger.util.cache.CacheManager;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.util.Utilities;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CommentsBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CommentsBean.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CommentsBean.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CommentsBean.java Tue May 29 19:18:07 2007
@@ -16,14 +16,14 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.editor;
+package org.apache.roller.weblogger.ui.struts2.editor;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
-import org.apache.roller.pojos.WeblogEntryComment;
-import org.apache.roller.util.Utilities;
+import org.apache.roller.weblogger.pojos.WeblogEntryComment;
+import org.apache.roller.weblogger.util.Utilities;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargetAdd.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargetAdd.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargetAdd.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargetAdd.java Tue May 29 19:18:07 2007
@@ -7,13 +7,13 @@
  * and open the template in the editor.
  */
 
-package org.apache.roller.ui.struts2.editor;
+package org.apache.roller.weblogger.ui.struts2.editor;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.pojos.PingTarget;
-import org.apache.roller.ui.struts2.common.PingTargetAddBase;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.pojos.PingTarget;
+import org.apache.roller.weblogger.ui.struts2.common.PingTargetAddBase;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargetEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargetEdit.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargetEdit.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargetEdit.java Tue May 29 19:18:07 2007
@@ -16,12 +16,12 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.editor;
+package org.apache.roller.weblogger.ui.struts2.editor;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.ui.struts2.common.PingTargetEditBase;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.ui.struts2.common.PingTargetEditBase;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargets.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargets.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargets.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargets.java Tue May 29 19:18:07 2007
@@ -16,16 +16,16 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.editor;
+package org.apache.roller.weblogger.ui.struts2.editor;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.pings.PingTargetManager;
-import org.apache.roller.config.PingConfig;
-import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.ui.struts2.common.PingTargetsBase;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.pings.PingTargetManager;
+import org.apache.roller.weblogger.config.PingConfig;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.ui.struts2.common.PingTargetsBase;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/Entries.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/Entries.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/Entries.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.editor;
+package org.apache.roller.weblogger.ui.struts2.editor;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -24,12 +24,12 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.pojos.WeblogEntry;
-import org.apache.roller.ui.struts2.util.KeyValueObject;
-import org.apache.roller.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.pojos.WeblogEntry;
+import org.apache.roller.weblogger.ui.struts2.util.KeyValueObject;
+import org.apache.roller.weblogger.ui.struts2.util.UIAction;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/EntriesBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/EntriesBean.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/EntriesBean.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/EntriesBean.java Tue May 29 19:18:07 2007
@@ -16,11 +16,11 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.struts2.editor;
+package org.apache.roller.weblogger.ui.struts2.editor;
 
 import java.util.Date;
 import java.util.List;
-import org.apache.roller.util.Utilities;
+import org.apache.roller.weblogger.util.Utilities;
 
 
 /**

Modified: roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd-validation.xml
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd-validation.xml?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd-validation.xml (original)
+++ roller/trunk/src/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd-validation.xml Tue May 29 19:18:07 2007
@@ -31,4 +31,4 @@
         </field-validator>
     </field>
     
-</validators>
\ No newline at end of file
+</validators>



Mime
View raw message