You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2007/05/30 04:18:48 UTC
svn commit: r542723 [10/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/or...
Copied: roller/trunk/src/org/apache/roller/weblogger/util/TrackbackNotAllowedException.java (from r542721, roller/trunk/src/org/apache/roller/util/TrackbackNotAllowedException.java)
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/util/TrackbackNotAllowedException.java?view=diff&rev=542723&p1=roller/trunk/src/org/apache/roller/util/TrackbackNotAllowedException.java&r1=542721&p2=roller/trunk/src/org/apache/roller/weblogger/util/TrackbackNotAllowedException.java&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/util/TrackbackNotAllowedException.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/util/TrackbackNotAllowedException.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.util;
+package org.apache.roller.weblogger.util;
import org.apache.roller.RollerException;
Copied: roller/trunk/src/org/apache/roller/weblogger/util/URLUtilities.java (from r542721, roller/trunk/src/org/apache/roller/util/URLUtilities.java)
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/util/URLUtilities.java?view=diff&rev=542723&p1=roller/trunk/src/org/apache/roller/util/URLUtilities.java&r1=542721&p2=roller/trunk/src/org/apache/roller/weblogger/util/URLUtilities.java&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/util/URLUtilities.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/util/URLUtilities.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.util;
+package org.apache.roller.weblogger.util;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
@@ -25,9 +25,9 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.pojos.WeblogTheme;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.pojos.WeblogTheme;
+import org.apache.roller.weblogger.pojos.Weblog;
/**
Copied: roller/trunk/src/org/apache/roller/weblogger/util/Utilities.java (from r542721, roller/trunk/src/org/apache/roller/util/Utilities.java)
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/util/Utilities.java?view=diff&rev=542723&p1=roller/trunk/src/org/apache/roller/util/Utilities.java&r1=542721&p2=roller/trunk/src/org/apache/roller/weblogger/util/Utilities.java&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/util/Utilities.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/util/Utilities.java Tue May 29 19:18:07 2007
@@ -1,4 +1,4 @@
-package org.apache.roller.util;
+package org.apache.roller.weblogger.util;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
Copied: roller/trunk/src/org/apache/roller/weblogger/util/WSSEUtilities.java (from r542721, roller/trunk/src/org/apache/roller/util/WSSEUtilities.java)
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/util/WSSEUtilities.java?view=diff&rev=542723&p1=roller/trunk/src/org/apache/roller/util/WSSEUtilities.java&r1=542721&p2=roller/trunk/src/org/apache/roller/weblogger/util/WSSEUtilities.java&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/util/WSSEUtilities.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/util/WSSEUtilities.java Tue May 29 19:18:07 2007
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.roller.util;
+package org.apache.roller.weblogger.util;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
Copied: roller/trunk/src/org/apache/roller/weblogger/util/XSLTransform.java (from r542721, roller/trunk/src/org/apache/roller/util/XSLTransform.java)
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/util/XSLTransform.java?view=diff&rev=542723&p1=roller/trunk/src/org/apache/roller/util/XSLTransform.java&r1=542721&p2=roller/trunk/src/org/apache/roller/weblogger/util/XSLTransform.java&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/util/XSLTransform.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/util/XSLTransform.java Tue May 29 19:18:07 2007
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.roller.util;
+package org.apache.roller.weblogger.util;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -87,4 +87,5 @@
System.out.println("ERROR: line = "+line+" col = "+col);
}
}
-}
\ No newline at end of file
+
+}
Modified: roller/trunk/src/org/apache/roller/weblogger/util/cache/Cache.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/util/cache/Cache.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/util/cache/Cache.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/util/cache/Cache.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.util.cache;
+package org.apache.roller.weblogger.util.cache;
import java.util.Map;
import java.util.Set;
Modified: roller/trunk/src/org/apache/roller/weblogger/util/cache/CacheFactory.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/util/cache/CacheFactory.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/util/cache/CacheFactory.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/util/cache/CacheFactory.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.util.cache;
+package org.apache.roller.weblogger.util.cache;
import java.util.Map;
Modified: roller/trunk/src/org/apache/roller/weblogger/util/cache/CacheHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/util/cache/CacheHandler.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/util/cache/CacheHandler.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/util/cache/CacheHandler.java Tue May 29 19:18:07 2007
@@ -16,18 +16,18 @@
* directory of this distribution.
*/
-package org.apache.roller.util.cache;
+package org.apache.roller.weblogger.util.cache;
import java.util.Map;
-import org.apache.roller.pojos.WeblogBookmark;
-import org.apache.roller.pojos.WeblogEntryComment;
-import org.apache.roller.pojos.WeblogBookmarkFolder;
-import org.apache.roller.pojos.WeblogReferrer;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.WeblogCategory;
-import org.apache.roller.pojos.WeblogEntry;
-import org.apache.roller.pojos.WeblogTemplate;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.WeblogBookmark;
+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.User;
+import org.apache.roller.weblogger.pojos.WeblogCategory;
+import org.apache.roller.weblogger.pojos.WeblogEntry;
+import org.apache.roller.weblogger.pojos.WeblogTemplate;
+import org.apache.roller.weblogger.pojos.Weblog;
/**
Modified: roller/trunk/src/org/apache/roller/weblogger/util/cache/CacheManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/util/cache/CacheManager.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/util/cache/CacheManager.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/util/cache/CacheManager.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.util.cache;
+package org.apache.roller.weblogger.util.cache;
import java.util.Date;
import java.util.HashMap;
@@ -27,20 +27,20 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
-import org.apache.roller.business.runnable.ContinuousWorkerThread;
-import org.apache.roller.business.runnable.Job;
-import org.apache.roller.config.RollerConfig;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.pojos.WeblogBookmark;
-import org.apache.roller.pojos.WeblogEntryComment;
-import org.apache.roller.pojos.WeblogBookmarkFolder;
-import org.apache.roller.pojos.WeblogReferrer;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.WeblogCategory;
-import org.apache.roller.pojos.WeblogEntry;
-import org.apache.roller.pojos.WeblogTemplate;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.business.runnable.ContinuousWorkerThread;
+import org.apache.roller.weblogger.business.runnable.Job;
+import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.pojos.WeblogBookmark;
+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.User;
+import org.apache.roller.weblogger.pojos.WeblogCategory;
+import org.apache.roller.weblogger.pojos.WeblogEntry;
+import org.apache.roller.weblogger.pojos.WeblogTemplate;
+import org.apache.roller.weblogger.pojos.Weblog;
/**
@@ -61,7 +61,7 @@
private static Log log = LogFactory.getLog(CacheManager.class);
private static final String DEFAULT_FACTORY =
- "org.apache.roller.util.cache.ExpiringLRUCacheFactoryImpl";
+ "org.apache.roller.weblogger.util.cache.ExpiringLRUCacheFactoryImpl";
// a reference to the cache factory in use
private static CacheFactory cacheFactory = null;
@@ -142,7 +142,7 @@
* the cache.
*
* example:
- * factory -> org.apache.roller.util.cache.LRUCacheFactoryImpl
+ * factory -> org.apache.roller.weblogger.util.cache.LRUCacheFactoryImpl
*
* This allows Roller admins the ability to choose a caching strategy to
* use for the whole system, but override it in certain places where they
Modified: roller/trunk/src/org/apache/roller/weblogger/util/cache/CachedContent.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/util/cache/CachedContent.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/util/cache/CachedContent.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/util/cache/CachedContent.java Tue May 29 19:18:07 2007
@@ -1,5 +1,5 @@
-package org.apache.roller.util.cache;
+package org.apache.roller.weblogger.util.cache;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
Modified: roller/trunk/src/org/apache/roller/weblogger/util/cache/ExpiringCacheEntry.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/util/cache/ExpiringCacheEntry.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/util/cache/ExpiringCacheEntry.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/util/cache/ExpiringCacheEntry.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.util.cache;
+package org.apache.roller.weblogger.util.cache;
import java.io.Serializable;
Modified: roller/trunk/src/org/apache/roller/weblogger/util/cache/ExpiringLRUCacheFactoryImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/util/cache/ExpiringLRUCacheFactoryImpl.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/util/cache/ExpiringLRUCacheFactoryImpl.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/util/cache/ExpiringLRUCacheFactoryImpl.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.util.cache;
+package org.apache.roller.weblogger.util.cache;
import java.util.Map;
import org.apache.commons.logging.Log;
Modified: roller/trunk/src/org/apache/roller/weblogger/util/cache/ExpiringLRUCacheImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/util/cache/ExpiringLRUCacheImpl.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/util/cache/ExpiringLRUCacheImpl.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/util/cache/ExpiringLRUCacheImpl.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.util.cache;
+package org.apache.roller.weblogger.util.cache;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: roller/trunk/src/org/apache/roller/weblogger/util/cache/LRUCacheFactoryImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/util/cache/LRUCacheFactoryImpl.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/util/cache/LRUCacheFactoryImpl.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/util/cache/LRUCacheFactoryImpl.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.util.cache;
+package org.apache.roller.weblogger.util.cache;
import java.util.Map;
import org.apache.commons.logging.Log;
Modified: roller/trunk/src/org/apache/roller/weblogger/util/cache/LRUCacheImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/util/cache/LRUCacheImpl.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/util/cache/LRUCacheImpl.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/util/cache/LRUCacheImpl.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.util.cache;
+package org.apache.roller.weblogger.util.cache;
import java.util.Collections;
import java.util.Date;
Modified: roller/trunk/src/org/apache/roller/weblogger/util/cache/LazyExpiringCacheEntry.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/util/cache/LazyExpiringCacheEntry.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/util/cache/LazyExpiringCacheEntry.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/util/cache/LazyExpiringCacheEntry.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.util.cache;
+package org.apache.roller.weblogger.util.cache;
import java.io.Serializable;
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/AdminServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/AdminServlet.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/AdminServlet.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/AdminServlet.java Tue May 29 19:18:07 2007
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.roller.webservices.adminprotocol;
+package org.apache.roller.weblogger.webservices.adminprotocol;
import java.io.IOException;
import java.io.InputStreamReader;
@@ -28,7 +28,7 @@
import org.jdom.Document;
import org.jdom.output.XMLOutputter;
import org.jdom.output.Format;
-import org.apache.roller.webservices.adminprotocol.sdk.EntrySet;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.EntrySet;
/**
* Atom Admin Servlet implements the Atom Admin endpoint.
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/AppUrl.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/AppUrl.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/AppUrl.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/AppUrl.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.webservices.adminprotocol;
+package org.apache.roller.weblogger.webservices.adminprotocol;
import java.net.MalformedURLException;
import java.net.URL;
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/Authenticator.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/Authenticator.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/Authenticator.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/Authenticator.java Tue May 29 19:18:07 2007
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.roller.webservices.adminprotocol;
+package org.apache.roller.weblogger.webservices.adminprotocol;
import javax.servlet.http.HttpServletRequest;
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;
/**
* TODO
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/BadRequestException.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/BadRequestException.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/BadRequestException.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/BadRequestException.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.webservices.adminprotocol;
+package org.apache.roller.weblogger.webservices.adminprotocol;
import javax.servlet.http.HttpServletResponse;
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/BasicAuthenticator.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/BasicAuthenticator.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/BasicAuthenticator.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/BasicAuthenticator.java Tue May 29 19:18:07 2007
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.roller.webservices.adminprotocol;
+package org.apache.roller.weblogger.webservices.adminprotocol;
import java.util.StringTokenizer;
import javax.servlet.http.HttpServletRequest;
@@ -21,7 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
-import org.apache.roller.pojos.User;
+import org.apache.roller.weblogger.pojos.User;
/**
* This class implements HTTP basic authentication for roller.
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java Tue May 29 19:18:07 2007
@@ -15,25 +15,25 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.webservices.adminprotocol;
+package org.apache.roller.weblogger.webservices.adminprotocol;
import java.io.IOException;
import java.io.Reader;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.config.RollerConfig;
-import org.apache.roller.business.Roller;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.webservices.adminprotocol.sdk.EntrySet;
+import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.EntrySet;
import java.util.regex.Pattern;
import java.util.regex.Matcher;
import org.apache.roller.RollerException;
-import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.Weblog;
-import org.apache.roller.webservices.adminprotocol.sdk.UnexpectedRootElementException;
+import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+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.webservices.adminprotocol.sdk.UnexpectedRootElementException;
import org.jdom.Document;
import org.jdom.JDOMException;
import org.jdom.input.SAXBuilder;
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/HandlerException.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/HandlerException.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/HandlerException.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/HandlerException.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.webservices.adminprotocol;
+package org.apache.roller.weblogger.webservices.adminprotocol;
/**
* Abstract base class for all handler exceptions.
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/InternalException.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/InternalException.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/InternalException.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/InternalException.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.webservices.adminprotocol;
+package org.apache.roller.weblogger.webservices.adminprotocol;
import javax.servlet.http.HttpServletResponse;
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/IntrospectionHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/IntrospectionHandler.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/IntrospectionHandler.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/IntrospectionHandler.java Tue May 29 19:18:07 2007
@@ -15,17 +15,17 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.webservices.adminprotocol;
+package org.apache.roller.weblogger.webservices.adminprotocol;
import java.io.Reader;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
-import org.apache.roller.webservices.adminprotocol.sdk.Entry;
-import org.apache.roller.webservices.adminprotocol.sdk.EntrySet;
-import org.apache.roller.webservices.adminprotocol.sdk.Service;
-import org.apache.roller.webservices.adminprotocol.sdk.UnexpectedRootElementException;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.Entry;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.EntrySet;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.Service;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.UnexpectedRootElementException;
import org.jdom.Document;
/**
@@ -76,20 +76,20 @@
Service.Workspace.Collection weblogCol = new Service.Workspace.Collection();
weblogCol.setTitle("Collection: Weblog administration entries");
- weblogCol.setMemberType(org.apache.roller.webservices.adminprotocol.sdk.Entry.Types.WEBLOG);
- weblogCol.setHref(service.getHref() + "/" + org.apache.roller.webservices.adminprotocol.sdk.EntrySet.Types.WEBLOGS);
+ weblogCol.setMemberType(org.apache.roller.weblogger.webservices.adminprotocol.sdk.Entry.Types.WEBLOG);
+ weblogCol.setHref(service.getHref() + "/" + org.apache.roller.weblogger.webservices.adminprotocol.sdk.EntrySet.Types.WEBLOGS);
workspaceCollections.add(weblogCol);
Service.Workspace.Collection userCol = new Service.Workspace.Collection();
userCol.setTitle("Collection: User administration entries");
userCol.setMemberType("user");
- userCol.setHref(service.getHref() + "/" + org.apache.roller.webservices.adminprotocol.sdk.EntrySet.Types.USERS);
+ userCol.setHref(service.getHref() + "/" + org.apache.roller.weblogger.webservices.adminprotocol.sdk.EntrySet.Types.USERS);
workspaceCollections.add(userCol);
Service.Workspace.Collection memberCol = new Service.Workspace.Collection();
memberCol.setTitle("Collection: Member administration entries");
memberCol.setMemberType("member");
- memberCol.setHref(service.getHref() + "/" + org.apache.roller.webservices.adminprotocol.sdk.EntrySet.Types.MEMBERS);
+ memberCol.setHref(service.getHref() + "/" + org.apache.roller.weblogger.webservices.adminprotocol.sdk.EntrySet.Types.MEMBERS);
workspaceCollections.add(memberCol);
workspace.setEntries((Entry[])workspaceCollections.toArray(new Entry[0]));
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/NotAllowedException.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/NotAllowedException.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/NotAllowedException.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/NotAllowedException.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.webservices.adminprotocol;
+package org.apache.roller.weblogger.webservices.adminprotocol;
import javax.servlet.http.HttpServletResponse;
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/NotFoundException.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/NotFoundException.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/NotFoundException.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/NotFoundException.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.webservices.adminprotocol;
+package org.apache.roller.weblogger.webservices.adminprotocol;
import javax.servlet.http.HttpServletResponse;
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.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.webservices.adminprotocol;
+package org.apache.roller.weblogger.webservices.adminprotocol;
import java.io.IOException;
import java.io.Reader;
@@ -27,16 +27,16 @@
import org.jdom.Document;
import org.jdom.JDOMException;
import org.apache.roller.RollerException;
-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.util.cache.CacheManager;
-import org.apache.roller.webservices.adminprotocol.sdk.Entry;
-import org.apache.roller.webservices.adminprotocol.sdk.EntrySet;
-import org.apache.roller.webservices.adminprotocol.sdk.MemberEntry;
-import org.apache.roller.webservices.adminprotocol.sdk.MemberEntrySet;
-import org.apache.roller.webservices.adminprotocol.sdk.UnexpectedRootElementException;
+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.util.cache.CacheManager;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.Entry;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.EntrySet;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.MemberEntry;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.MemberEntrySet;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.UnexpectedRootElementException;
/**
* This class handles requests concerning Roller weblog membership (groups).
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/RollerUserHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/RollerUserHandler.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/RollerUserHandler.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/RollerUserHandler.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.webservices.adminprotocol;
+package org.apache.roller.weblogger.webservices.adminprotocol;
import java.io.IOException;
import java.io.Reader;
@@ -26,14 +26,14 @@
import org.jdom.Document;
import org.jdom.JDOMException;
import org.apache.roller.RollerException;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.pojos.User;
-import org.apache.roller.util.cache.CacheManager;
-import org.apache.roller.webservices.adminprotocol.sdk.Entry;
-import org.apache.roller.webservices.adminprotocol.sdk.EntrySet;
-import org.apache.roller.webservices.adminprotocol.sdk.UnexpectedRootElementException;
-import org.apache.roller.webservices.adminprotocol.sdk.UserEntry;
-import org.apache.roller.webservices.adminprotocol.sdk.UserEntrySet;
+import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.util.cache.CacheManager;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.Entry;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.EntrySet;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.UnexpectedRootElementException;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.UserEntry;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.UserEntrySet;
/**
* This class handles request concerning Roller users.
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.webservices.adminprotocol;
+package org.apache.roller.weblogger.webservices.adminprotocol;
import java.io.Reader;
import java.net.MalformedURLException;
@@ -31,18 +31,18 @@
import org.apache.commons.logging.LogFactory;
import org.jdom.Document;
import org.apache.roller.RollerException;
-import org.apache.roller.config.RollerRuntimeConfig;
-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.util.cache.CacheManager;
-import org.apache.roller.util.Utilities;
-import org.apache.roller.webservices.adminprotocol.sdk.Entry;
-import org.apache.roller.webservices.adminprotocol.sdk.EntrySet;
-import org.apache.roller.webservices.adminprotocol.sdk.UnexpectedRootElementException;
-import org.apache.roller.webservices.adminprotocol.sdk.WeblogEntry;
-import org.apache.roller.webservices.adminprotocol.sdk.WeblogEntrySet;
+import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+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.util.cache.CacheManager;
+import org.apache.roller.weblogger.util.Utilities;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.Entry;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.EntrySet;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.UnexpectedRootElementException;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.WeblogEntry;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.WeblogEntrySet;
/**
* This class handles requests concerning Roller weblog resources.
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/UnauthorizedException.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/UnauthorizedException.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/UnauthorizedException.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/UnauthorizedException.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.webservices.adminprotocol;
+package org.apache.roller.weblogger.webservices.adminprotocol;
import javax.servlet.http.HttpServletResponse;
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/Entry.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/Entry.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/Entry.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/Entry.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.webservices.adminprotocol.sdk;
+package org.apache.roller.weblogger.webservices.adminprotocol.sdk;
import java.io.IOException;
import java.io.StringWriter;
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/EntrySet.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/EntrySet.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/EntrySet.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/EntrySet.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.webservices.adminprotocol.sdk;
+package org.apache.roller.weblogger.webservices.adminprotocol.sdk;
import java.util.Arrays;
import java.util.List;
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/LocaleString.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/LocaleString.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/LocaleString.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/LocaleString.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.webservices.adminprotocol.sdk;
+package org.apache.roller.weblogger.webservices.adminprotocol.sdk;
import java.util.Locale;
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntry.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntry.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntry.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntry.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.webservices.adminprotocol.sdk;
+package org.apache.roller.weblogger.webservices.adminprotocol.sdk;
import java.io.InputStream;
import java.io.IOException;
@@ -25,8 +25,8 @@
import org.jdom.Text;
import org.jdom.input.SAXBuilder;
import org.jdom.JDOMException;
-import org.apache.roller.webservices.adminprotocol.sdk.Entry.Attributes;
-import org.apache.roller.webservices.adminprotocol.sdk.Entry.Types;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.Entry.Attributes;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.Entry.Types;
/**
* This class describes a member entry.
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntrySet.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntrySet.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntrySet.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntrySet.java Tue May 29 19:18:07 2007
@@ -21,7 +21,7 @@
* Created on January 17, 2006, 12:44 PM
*/
-package org.apache.roller.webservices.adminprotocol.sdk;
+package org.apache.roller.weblogger.webservices.adminprotocol.sdk;
import java.io.InputStream;
import java.io.IOException;
@@ -32,7 +32,7 @@
import org.jdom.Element;
import org.jdom.JDOMException;
import org.jdom.input.SAXBuilder;
-import org.apache.roller.webservices.adminprotocol.sdk.EntrySet.Types;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.EntrySet.Types;
/**
* This class describes a set of member entries.
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/Service.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/Service.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/Service.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/Service.java Tue May 29 19:18:07 2007
@@ -20,14 +20,14 @@
*
* Created on January 17, 2006, 12:44 PM
*/
-package org.apache.roller.webservices.adminprotocol.sdk;
+package org.apache.roller.weblogger.webservices.adminprotocol.sdk;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.roller.webservices.adminprotocol.sdk.EntrySet.Types;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.EntrySet.Types;
import org.jdom.Document;
import org.jdom.Element;
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UnexpectedRootElementException.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UnexpectedRootElementException.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UnexpectedRootElementException.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UnexpectedRootElementException.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.webservices.adminprotocol.sdk;
+package org.apache.roller.weblogger.webservices.adminprotocol.sdk;
public class UnexpectedRootElementException extends Exception {
private String expected;
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntry.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntry.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntry.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntry.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.webservices.adminprotocol.sdk;
+package org.apache.roller.weblogger.webservices.adminprotocol.sdk;
import java.io.IOException;
import java.io.InputStream;
@@ -27,8 +27,8 @@
import org.jdom.JDOMException;
import org.jdom.Text;
import org.jdom.input.SAXBuilder;
-import org.apache.roller.webservices.adminprotocol.sdk.Entry.Attributes;
-import org.apache.roller.webservices.adminprotocol.sdk.Entry.Types;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.Entry.Attributes;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.Entry.Types;
/**
* This class describes a user entry; a user weblog resource.
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntrySet.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntrySet.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntrySet.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntrySet.java Tue May 29 19:18:07 2007
@@ -21,7 +21,7 @@
* Created on January 17, 2006, 12:44 PM
*/
-package org.apache.roller.webservices.adminprotocol.sdk;
+package org.apache.roller.weblogger.webservices.adminprotocol.sdk;
import java.io.IOException;
import java.io.InputStream;
@@ -32,7 +32,7 @@
import org.jdom.Element;
import org.jdom.JDOMException;
import org.jdom.input.SAXBuilder;
-import org.apache.roller.webservices.adminprotocol.sdk.EntrySet.Types;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.EntrySet.Types;
/**
* This class describes a set of user entries.
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/WeblogEntry.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/WeblogEntry.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/WeblogEntry.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/WeblogEntry.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.webservices.adminprotocol.sdk;
+package org.apache.roller.weblogger.webservices.adminprotocol.sdk;
/*
* WeblogEntry.java
*
@@ -32,8 +32,8 @@
import org.jdom.JDOMException;
import org.jdom.Text;
import org.jdom.input.SAXBuilder;
-import org.apache.roller.webservices.adminprotocol.sdk.Entry.Attributes;
-import org.apache.roller.webservices.adminprotocol.sdk.Entry.Types;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.Entry.Attributes;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.Entry.Types;
/**
* This class describes a weblog entry.
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/WeblogEntrySet.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/WeblogEntrySet.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/WeblogEntrySet.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/adminprotocol/sdk/WeblogEntrySet.java Tue May 29 19:18:07 2007
@@ -21,7 +21,7 @@
* Created on January 17, 2006, 12:44 PM
*/
-package org.apache.roller.webservices.adminprotocol.sdk;
+package org.apache.roller.weblogger.webservices.adminprotocol.sdk;
import java.io.IOException;
import java.io.InputStream;
@@ -32,7 +32,7 @@
import org.jdom.Element;
import org.jdom.JDOMException;
import org.jdom.input.SAXBuilder;
-import org.apache.roller.webservices.adminprotocol.sdk.EntrySet.Types;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.EntrySet.Types;
/**
* This class describes a set of weblog entries.
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/AtomException.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/AtomException.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/AtomException.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/AtomException.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.webservices.atomprotocol;
+package org.apache.roller.weblogger.webservices.atomprotocol;
import javax.servlet.http.HttpServletResponse;
import org.apache.roller.RollerException;
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/AtomHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/AtomHandler.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/AtomHandler.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/AtomHandler.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.webservices.atomprotocol;
+package org.apache.roller.weblogger.webservices.atomprotocol;
import java.io.InputStream;
import com.sun.syndication.feed.atom.Entry;
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/AtomNotAuthorizedException.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/AtomNotAuthorizedException.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/AtomNotAuthorizedException.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/AtomNotAuthorizedException.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.webservices.atomprotocol;
+package org.apache.roller.weblogger.webservices.atomprotocol;
import javax.servlet.http.HttpServletResponse;
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/AtomNotFoundException.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/AtomNotFoundException.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/AtomNotFoundException.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/AtomNotFoundException.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.webservices.atomprotocol;
+package org.apache.roller.weblogger.webservices.atomprotocol;
import javax.servlet.http.HttpServletResponse;
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/AtomService.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/AtomService.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/AtomService.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/AtomService.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.webservices.atomprotocol;
+package org.apache.roller.weblogger.webservices.atomprotocol;
import java.util.ArrayList;
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/AtomServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/AtomServlet.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/AtomServlet.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/AtomServlet.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.webservices.atomprotocol;
+package org.apache.roller.weblogger.webservices.atomprotocol;
import java.io.IOException;
import java.io.InputStreamReader;
@@ -46,7 +46,7 @@
import java.io.BufferedReader;
import java.io.StringWriter;
import org.jdom.Namespace;
-import org.apache.roller.config.RollerConfig;
+import org.apache.roller.weblogger.config.RollerConfig;
/**
* Atom Servlet implements Atom by calling a Roller independent handler.
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/Categories.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/Categories.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/Categories.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/Categories.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.webservices.atomprotocol;
+package org.apache.roller.weblogger.webservices.atomprotocol;
import com.sun.syndication.feed.atom.Category;
import java.util.ArrayList;
@@ -66,4 +66,5 @@
public void setScheme(String scheme) {
this.scheme = scheme;
}
-}
\ No newline at end of file
+
+}
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/Collection.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/Collection.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/Collection.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/Collection.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.webservices.atomprotocol;
+package org.apache.roller.weblogger.webservices.atomprotocol;
import com.sun.syndication.feed.atom.Category;
import java.util.ArrayList;
@@ -213,4 +213,5 @@
}
return collection;
}
-}
\ No newline at end of file
+
+}
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/PubControlModule.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/PubControlModule.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/PubControlModule.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/PubControlModule.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.webservices.atomprotocol;
+package org.apache.roller.weblogger.webservices.atomprotocol;
import com.sun.syndication.feed.module.Module;
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/PubControlModuleGenerator.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/PubControlModuleGenerator.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/PubControlModuleGenerator.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/PubControlModuleGenerator.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.webservices.atomprotocol;
+package org.apache.roller.weblogger.webservices.atomprotocol;
import java.util.Collections;
import java.util.HashSet;
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/PubControlModuleImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/PubControlModuleImpl.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/PubControlModuleImpl.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/PubControlModuleImpl.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.webservices.atomprotocol;
+package org.apache.roller.weblogger.webservices.atomprotocol;
import com.sun.syndication.feed.module.ModuleImpl;
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/PubControlModuleParser.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/PubControlModuleParser.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/PubControlModuleParser.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/PubControlModuleParser.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.webservices.atomprotocol;
+package org.apache.roller.weblogger.webservices.atomprotocol;
import org.jdom.Element;
import org.jdom.Namespace;
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.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.webservices.atomprotocol;
+package org.apache.roller.weblogger.webservices.atomprotocol;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -32,18 +32,18 @@
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.business.FileManager;
-import org.apache.roller.business.FileNotFoundException;
-import org.apache.roller.business.FilePathException;
-import org.apache.roller.business.Roller;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.pojos.WeblogCategory;
-import org.apache.roller.pojos.WeblogEntry;
-import org.apache.roller.pojos.Weblog;
-import org.apache.roller.util.Utilities;
-import org.apache.roller.util.WSSEUtilities;
+import org.apache.roller.weblogger.business.FileManager;
+import org.apache.roller.weblogger.business.FileNotFoundException;
+import org.apache.roller.weblogger.business.FilePathException;
+import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
+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.util.Utilities;
+import org.apache.roller.weblogger.util.WSSEUtilities;
import com.sun.syndication.feed.atom.Content;
import com.sun.syndication.feed.atom.Category;
import com.sun.syndication.feed.atom.Entry;
@@ -58,17 +58,17 @@
import javax.activation.FileTypeMap;
import org.apache.commons.lang.StringUtils;
import org.apache.roller.RollerException;
-import org.apache.roller.business.FileIOException;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.config.RollerConfig;
-import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.business.WeblogManager;
-import org.apache.roller.business.search.IndexManager;
-import org.apache.roller.pojos.RuntimeConfigProperty;
-import org.apache.roller.pojos.WeblogEntryTag;
-import org.apache.roller.pojos.ThemeResource;
-import org.apache.roller.util.URLUtilities;
-import org.apache.roller.util.cache.CacheManager;
+import org.apache.roller.weblogger.business.FileIOException;
+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.business.WeblogManager;
+import org.apache.roller.weblogger.business.search.IndexManager;
+import org.apache.roller.weblogger.pojos.RuntimeConfigProperty;
+import org.apache.roller.weblogger.pojos.WeblogEntryTag;
+import org.apache.roller.weblogger.pojos.ThemeResource;
+import org.apache.roller.weblogger.util.URLUtilities;
+import org.apache.roller.weblogger.util.cache.CacheManager;
/**
* Roller's ROME-based Atom Protocol implementation.
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/Workspace.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/Workspace.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/Workspace.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/atomprotocol/Workspace.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.webservices.atomprotocol;
+package org.apache.roller.weblogger.webservices.atomprotocol;
import java.util.ArrayList;
import java.util.Iterator;
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/json/TagStatsServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/json/TagStatsServlet.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/json/TagStatsServlet.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/json/TagStatsServlet.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.webservices.json;
+package org.apache.roller.weblogger.webservices.json;
import java.io.IOException;
import java.util.Iterator;
@@ -27,13 +27,13 @@
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.business.WeblogManager;
-import org.apache.roller.config.RollerConfig;
-import org.apache.roller.pojos.TagStat;
-import org.apache.roller.pojos.Weblog;
+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.business.WeblogManager;
+import org.apache.roller.weblogger.config.RollerConfig;
+import org.apache.roller.weblogger.pojos.TagStat;
+import org.apache.roller.weblogger.pojos.Weblog;
/**
* Return list of tags matching a startsWith strings. <br />
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/xmlrpc/BaseAPIHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/xmlrpc/BaseAPIHandler.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/xmlrpc/BaseAPIHandler.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/xmlrpc/BaseAPIHandler.java Tue May 29 19:18:07 2007
@@ -18,20 +18,20 @@
/*
* Created on Apr 11, 2003
*/
-package org.apache.roller.webservices.xmlrpc;
+package org.apache.roller.weblogger.webservices.xmlrpc;
import java.io.Serializable;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xmlrpc.XmlRpcException;
-import org.apache.roller.config.RollerConfig;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.Weblog;
-import org.apache.roller.util.cache.CacheManager;
-import org.apache.roller.util.Utilities;
+import org.apache.roller.weblogger.config.RollerConfig;
+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.pojos.Weblog;
+import org.apache.roller.weblogger.util.cache.CacheManager;
+import org.apache.roller.weblogger.util.Utilities;
/**
* Base API handler does user validation, provides exception types, etc.
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.webservices.xmlrpc;
+package org.apache.roller.weblogger.webservices.xmlrpc;
import java.sql.Timestamp;
import java.util.ArrayList;
@@ -34,16 +34,16 @@
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.Roller;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.WeblogEntry;
-import org.apache.roller.pojos.WeblogTemplate;
-import org.apache.roller.pojos.Weblog;
-import org.apache.roller.util.Utilities;
+import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+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.business.WeblogManager;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.WeblogEntry;
+import org.apache.roller.weblogger.pojos.WeblogTemplate;
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.util.Utilities;
import org.apache.xmlrpc.XmlRpcException;
/**
Modified: roller/trunk/src/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java?view=diff&rev=542723&r1=542721&r2=542723
==============================================================================
--- roller/trunk/src/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java (original)
+++ roller/trunk/src/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.webservices.xmlrpc;
+package org.apache.roller.weblogger.webservices.xmlrpc;
import java.io.ByteArrayInputStream;
import java.sql.Timestamp;
@@ -29,18 +29,18 @@
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.FileManager;
-import org.apache.roller.business.Roller;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.WeblogCategory;
-import org.apache.roller.pojos.WeblogEntry;
-import org.apache.roller.pojos.Weblog;
-import org.apache.roller.util.RollerMessages;
-import org.apache.roller.util.URLUtilities;
-import org.apache.roller.util.Utilities;
+import org.apache.roller.weblogger.config.RollerRuntimeConfig;
+import org.apache.roller.weblogger.business.FileManager;
+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.User;
+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.util.RollerMessages;
+import org.apache.roller.weblogger.util.URLUtilities;
+import org.apache.roller.weblogger.util.Utilities;
import org.apache.xmlrpc.XmlRpcException;
Modified: roller/trunk/testdata/WEB-INF/classes/log4j.properties
URL: http://svn.apache.org/viewvc/roller/trunk/testdata/WEB-INF/classes/log4j.properties?view=diff&rev=542723&r1=542722&r2=542723
==============================================================================
--- roller/trunk/testdata/WEB-INF/classes/log4j.properties (original)
+++ roller/trunk/testdata/WEB-INF/classes/log4j.properties Tue May 29 19:18:07 2007
@@ -14,7 +14,7 @@
log4j.appender.roller.layout.ConversionPattern=%-5p %d{yyyy-MM-dd HH:mm:ss,SSS} %C{1}:%M - %m%n
# logging levels
-log4j.category.org.apache.roller=INFO
+log4j.category.org.apache.roller.weblogger=INFO
log4j.category.org.hibernate=WARN
log4j.category.org.apache.struts=WARN
log4j.category.org.apache.velocity=WARN
Modified: roller/trunk/testdata/WEB-INF/security.xml
URL: http://svn.apache.org/viewvc/roller/trunk/testdata/WEB-INF/security.xml?view=diff&rev=542723&r1=542722&r2=542723
==============================================================================
--- roller/trunk/testdata/WEB-INF/security.xml (original)
+++ roller/trunk/testdata/WEB-INF/security.xml Tue May 29 19:18:07 2007
@@ -80,7 +80,7 @@
<property name="userCache" ref="userCache"/>
</bean>
- <bean id="mockAuthenticationDao" class="org.apache.roller.ui.MockAcegiUserDetailsService" />
+ <bean id="mockAuthenticationDao" class="org.apache.roller.weblogger.ui.MockAcegiUserDetailsService" />
<!-- Read users from database
<bean id="jdbcAuthenticationDao" class="org.acegisecurity.userdetails.jdbc.JdbcDaoImpl">
<property name="dataSource">
Modified: roller/trunk/testdata/roller-custom.properties
URL: http://svn.apache.org/viewvc/roller/trunk/testdata/roller-custom.properties?view=diff&rev=542723&r1=542722&r2=542723
==============================================================================
--- roller/trunk/testdata/roller-custom.properties (original)
+++ roller/trunk/testdata/roller-custom.properties Tue May 29 19:18:07 2007
@@ -1,7 +1,7 @@
-persistence.roller.classname=org.apache.roller.business.jpa.JPARollerImpl
-#persistence.roller.classname=org.apache.roller.business.datamapper.jpa.JPARollerImpl
-#persistence.roller.classname=org.apache.roller.business.hibernate.HibernateRollerImpl
+#persistence.roller.classname=org.apache.roller.weblogger.business.jpa.JPARollerImpl
+#persistence.roller.classname=org.apache.roller.weblogger.business.datamapper.jpa.JPARollerImpl
+persistence.roller.classname=org.apache.roller.weblogger.business.hibernate.HibernateRollerImpl
# we don't want to start with any folders/bookmarks for testing
newuser.blogroll=
Copied: roller/trunk/tests/org/apache/roller/weblogger/TestUtils.java (from r542694, roller/trunk/tests/org/apache/roller/TestUtils.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/TestUtils.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/TestUtils.java&r1=542694&p2=roller/trunk/tests/org/apache/roller/weblogger/TestUtils.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/TestUtils.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/TestUtils.java Tue May 29 19:18:07 2007
@@ -21,24 +21,25 @@
* Created on April 6, 2006, 8:38 PM
*/
-package org.apache.roller;
+package org.apache.roller.weblogger;
-import org.apache.roller.business.BookmarkManager;
-import org.apache.roller.business.pings.AutoPingManager;
-import org.apache.roller.business.pings.PingTargetManager;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.UserManager;
-import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.AutoPing;
-import org.apache.roller.pojos.WeblogEntryComment;
-import org.apache.roller.pojos.WeblogBookmarkFolder;
-import org.apache.roller.pojos.WeblogHitCount;
-import org.apache.roller.pojos.WeblogPermission;
-import org.apache.roller.pojos.PingTarget;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.WeblogCategory;
-import org.apache.roller.pojos.WeblogEntry;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.business.BookmarkManager;
+import org.apache.roller.weblogger.business.pings.AutoPingManager;
+import org.apache.roller.weblogger.business.pings.PingTargetManager;
+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.AutoPing;
+import org.apache.roller.weblogger.pojos.WeblogEntryComment;
+import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
+import org.apache.roller.weblogger.pojos.WeblogHitCount;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.pojos.PingTarget;
+import org.apache.roller.weblogger.pojos.User;
+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.RollerException;
/**
Copied: roller/trunk/tests/org/apache/roller/weblogger/ant/StartDerbyTask.java (from r542721, roller/trunk/tests/org/apache/roller/ant/StartDerbyTask.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/ant/StartDerbyTask.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/ant/StartDerbyTask.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/ant/StartDerbyTask.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/ant/StartDerbyTask.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/ant/StartDerbyTask.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.ant;
+package org.apache.roller.weblogger.ant;
import java.io.PrintWriter;
import org.apache.derby.drda.NetworkServerControl;
Copied: roller/trunk/tests/org/apache/roller/weblogger/ant/StopDerbyTask.java (from r542721, roller/trunk/tests/org/apache/roller/ant/StopDerbyTask.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/ant/StopDerbyTask.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/ant/StopDerbyTask.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/ant/StopDerbyTask.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/ant/StopDerbyTask.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/ant/StopDerbyTask.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.ant;
+package org.apache.roller.weblogger.ant;
import org.apache.derby.drda.NetworkServerControl;
import org.apache.tools.ant.BuildException;
Copied: roller/trunk/tests/org/apache/roller/weblogger/business/BookmarkTest.java (from r542721, roller/trunk/tests/org/apache/roller/business/BookmarkTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/business/BookmarkTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/business/BookmarkTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/business/BookmarkTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/business/BookmarkTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/business/BookmarkTest.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.business;
+package org.apache.roller.weblogger.business;
import java.io.BufferedReader;
import java.io.InputStream;
@@ -28,15 +28,15 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
-import org.apache.roller.TestUtils;
-import org.apache.roller.business.BookmarkManager;
-import org.apache.roller.business.Roller;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.pojos.WeblogBookmark;
-import org.apache.roller.pojos.WeblogBookmarkFolder;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.Weblog;
-import org.apache.roller.util.Utilities;
+import org.apache.roller.weblogger.TestUtils;
+import org.apache.roller.weblogger.business.BookmarkManager;
+import org.apache.roller.weblogger.business.Roller;
+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.User;
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.util.Utilities;
/**
Copied: roller/trunk/tests/org/apache/roller/weblogger/business/CommentTest.java (from r542721, roller/trunk/tests/org/apache/roller/business/CommentTest.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/business/CommentTest.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/business/CommentTest.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/business/CommentTest.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/business/CommentTest.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/business/CommentTest.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.business;
+package org.apache.roller.weblogger.business;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -27,11 +27,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
-import org.apache.roller.TestUtils;
-import org.apache.roller.pojos.WeblogEntryComment;
-import org.apache.roller.pojos.User;
-import org.apache.roller.pojos.WeblogEntry;
-import org.apache.roller.pojos.Weblog;
+import org.apache.roller.weblogger.TestUtils;
+import org.apache.roller.weblogger.pojos.WeblogEntryComment;
+import org.apache.roller.weblogger.pojos.User;
+import org.apache.roller.weblogger.pojos.WeblogEntry;
+import org.apache.roller.weblogger.pojos.Weblog;
/**
Copied: roller/trunk/tests/org/apache/roller/weblogger/business/CoreBusinessServicesTestSuite.java (from r542721, roller/trunk/tests/org/apache/roller/business/CoreBusinessServicesTestSuite.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/business/CoreBusinessServicesTestSuite.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/business/CoreBusinessServicesTestSuite.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/business/CoreBusinessServicesTestSuite.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/business/CoreBusinessServicesTestSuite.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/business/CoreBusinessServicesTestSuite.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.business;
+package org.apache.roller.weblogger.business;
import junit.framework.Test;
import junit.framework.TestSuite;
Copied: roller/trunk/tests/org/apache/roller/weblogger/business/CoreWeblogPlatformTestSuite.java (from r542721, roller/trunk/tests/org/apache/roller/business/CoreWeblogPlatformTestSuite.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/business/CoreWeblogPlatformTestSuite.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/business/CoreWeblogPlatformTestSuite.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/business/CoreWeblogPlatformTestSuite.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/business/CoreWeblogPlatformTestSuite.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/business/CoreWeblogPlatformTestSuite.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.business;
+package org.apache.roller.weblogger.business;
import junit.framework.Test;
import junit.framework.TestSuite;
Copied: roller/trunk/tests/org/apache/roller/weblogger/business/CoreWeblogServicesTestSuite.java (from r542721, roller/trunk/tests/org/apache/roller/business/CoreWeblogServicesTestSuite.java)
URL: http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/weblogger/business/CoreWeblogServicesTestSuite.java?view=diff&rev=542723&p1=roller/trunk/tests/org/apache/roller/business/CoreWeblogServicesTestSuite.java&r1=542721&p2=roller/trunk/tests/org/apache/roller/weblogger/business/CoreWeblogServicesTestSuite.java&r2=542723
==============================================================================
--- roller/trunk/tests/org/apache/roller/business/CoreWeblogServicesTestSuite.java (original)
+++ roller/trunk/tests/org/apache/roller/weblogger/business/CoreWeblogServicesTestSuite.java Tue May 29 19:18:07 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.business;
+package org.apache.roller.weblogger.business;
import junit.framework.Test;
import junit.framework.TestSuite;