svn commit: r438603 - in /incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera: protocol/ protocol/server/ protocol/server/cache/ protocol/server/exceptions/ protocol/server/impl/ protocol/server/servlet/ protocol/server/target/ protocol/...

[jm...@apache.org]

Author: jmsnell
Date: Wed Aug 30 12:52:45 2006
New Revision: 438603

URL: http://svn.apache.org/viewvc?rev=438603&view=rev
Log:
Refactoring the package names so they're consistent with the client module
(e.g. client uses org.apache.abdera.protocol.client.* have the server use 
org.apache.abdera.protocol.server.*)

Added:
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/AbderaServer.java
      - copied, changed from r438533, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/AbderaServer.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/RequestContext.java   (contents, props changed)
      - copied, changed from r438533, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/RequestContext.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/RequestHandler.java   (contents, props changed)
      - copied, changed from r438108, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/RequestHandler.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/RequestHandlerFactory.java   (contents, props changed)
      - copied, changed from r438533, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/RequestHandlerFactory.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ResponseContext.java   (contents, props changed)
      - copied, changed from r438108, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/ResponseContext.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ServerConstants.java
      - copied, changed from r438533, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/ServerConstants.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/cache/
      - copied from r438108, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/cache/
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/cache/Cache.java
      - copied, changed from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/cache/Cache.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/cache/CacheEntry.java
      - copied, changed from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/cache/CacheEntry.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/cache/CacheFactory.java
      - copied, changed from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/cache/CacheFactory.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/exceptions/
      - copied from r438108, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/exceptions/
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/exceptions/AbderaServerException.java
      - copied, changed from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/exceptions/AbderaServerException.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/
      - copied from r438108, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/impl/
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractRequestHandler.java
      - copied, changed from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/impl/AbstractRequestHandler.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractResponseContext.java
      - copied, changed from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/impl/AbstractResponseContext.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/BaseResponseContext.java
      - copied, changed from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/impl/BaseResponseContext.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/EmptyResponseContext.java
      - copied, changed from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/impl/EmptyResponseContext.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/
      - copied from r438108, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/servlet/
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/AbderaServlet.java
      - copied, changed from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/servlet/AbderaServlet.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/ServletRequestContext.java
      - copied, changed from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/servlet/ServletRequestContext.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/target/
      - copied from r438533, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/target/
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/target/Target.java
      - copied, changed from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/target/Target.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/target/TargetResolver.java
      - copied, changed from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/target/TargetResolver.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/util/
      - copied from r438108, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/util/
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/util/RegexTargetResolver.java
      - copied, changed from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/util/RegexTargetResolver.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/util/ResourceType.java
      - copied, changed from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/util/ResourceType.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/util/ServerUtils.java
      - copied, changed from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/util/ServerUtils.java
Removed:
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/cache/CachePolicy.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/BaseRequestHandler.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/util/Target.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/AbderaServer.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/RequestContext.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/RequestHandler.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/RequestHandlerFactory.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/ResponseContext.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/ServerConstants.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/cache/
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/exceptions/
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/impl/
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/servlet/
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/target/
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/util/

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/AbderaServer.java (from r438533, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/AbderaServer.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/AbderaServer.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/AbderaServer.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/AbderaServer.java&r1=438533&r2=438603&rev=438603&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/AbderaServer.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/AbderaServer.java Wed Aug 30 12:52:45 2006
@@ -15,10 +15,10 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.server;
+package org.apache.abdera.protocol.server;
 
 import org.apache.abdera.Abdera;
-import org.apache.abdera.server.target.TargetResolver;
+import org.apache.abdera.protocol.server.target.TargetResolver;
 import org.apache.abdera.util.ServiceUtil;
 
 public class AbderaServer implements ServerConstants {

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/RequestContext.java (from r438533, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/RequestContext.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/RequestContext.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/RequestContext.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/RequestContext.java&r1=438533&r2=438603&rev=438603&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/RequestContext.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/RequestContext.java Wed Aug 30 12:52:45 2006
@@ -15,7 +15,7 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.server;
+package org.apache.abdera.protocol.server;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -23,7 +23,7 @@
 import java.util.Date;
 import java.util.List;
 
-import org.apache.abdera.server.target.Target;
+import org.apache.abdera.protocol.server.target.Target;
 
 public interface RequestContext {
   

Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/RequestContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/RequestContext.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/RequestContext.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/RequestHandler.java (from r438108, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/RequestHandler.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/RequestHandler.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/RequestHandler.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/RequestHandler.java&r1=438108&r2=438603&rev=438603&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/RequestHandler.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/RequestHandler.java Wed Aug 30 12:52:45 2006
@@ -15,9 +15,9 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.server;
+package org.apache.abdera.protocol.server;
 
-import org.apache.abdera.server.exceptions.AbderaServerException;
+import org.apache.abdera.protocol.server.exceptions.AbderaServerException;
 
 public interface RequestHandler {
 

Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/RequestHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/RequestHandler.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/RequestHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/RequestHandlerFactory.java (from r438533, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/RequestHandlerFactory.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/RequestHandlerFactory.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/RequestHandlerFactory.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/RequestHandlerFactory.java&r1=438533&r2=438603&rev=438603&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/RequestHandlerFactory.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/RequestHandlerFactory.java Wed Aug 30 12:52:45 2006
@@ -15,9 +15,9 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.server;
+package org.apache.abdera.protocol.server;
 
-import org.apache.abdera.server.exceptions.AbderaServerException;
+import org.apache.abdera.protocol.server.exceptions.AbderaServerException;
 
 public interface RequestHandlerFactory {
   

Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/RequestHandlerFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/RequestHandlerFactory.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/RequestHandlerFactory.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ResponseContext.java (from r438108, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/ResponseContext.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ResponseContext.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ResponseContext.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/ResponseContext.java&r1=438108&r2=438603&rev=438603&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/ResponseContext.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ResponseContext.java Wed Aug 30 12:52:45 2006
@@ -15,7 +15,7 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.server;
+package org.apache.abdera.protocol.server;
 
 import java.io.IOException;
 import java.io.OutputStream;

Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ResponseContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ResponseContext.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ResponseContext.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ServerConstants.java (from r438533, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/ServerConstants.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ServerConstants.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ServerConstants.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/ServerConstants.java&r1=438533&r2=438603&rev=438603&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/ServerConstants.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/ServerConstants.java Wed Aug 30 12:52:45 2006
@@ -15,18 +15,18 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.server;
+package org.apache.abdera.protocol.server;
 
 public interface ServerConstants {
 
   public static final String REQUESTCONTEXT = 
-    "org.apache.abdera.server.RequestContext";
+    "org.apache.abdera.protocol.server.RequestContext";
  
   public static final String HANDLER_FACTORY = 
-    "org.apache.abdera.server.RequestHandlerFactory";
+    "org.apache.abdera.protocol.server.RequestHandlerFactory";
   
   public static final String TARGET_RESOLVER = 
-    "org.apache.abdera.server.target.TargetResolver";
+    "org.apache.abdera.protocol.server.target.TargetResolver";
   
   public static final String X_OVERRIDE_HEADER = 
     "X-HTTP-Method-Override";

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/cache/Cache.java (from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/cache/Cache.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/cache/Cache.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/cache/Cache.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/cache/Cache.java&r1=438602&r2=438603&rev=438603&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/cache/Cache.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/cache/Cache.java Wed Aug 30 12:52:45 2006
@@ -15,10 +15,10 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.server.cache;
+package org.apache.abdera.protocol.server.cache;
 
-import org.apache.abdera.server.RequestContext;
-import org.apache.abdera.server.ResponseContext;
+import org.apache.abdera.protocol.server.RequestContext;
+import org.apache.abdera.protocol.server.ResponseContext;
 
 /**
  * Provides an interface for a server-side cache, out of which responses can

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/cache/CacheEntry.java (from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/cache/CacheEntry.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/cache/CacheEntry.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/cache/CacheEntry.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/cache/CacheEntry.java&r1=438602&r2=438603&rev=438603&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/cache/CacheEntry.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/cache/CacheEntry.java Wed Aug 30 12:52:45 2006
@@ -15,9 +15,9 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.server.cache;
+package org.apache.abdera.protocol.server.cache;
 
-import org.apache.abdera.server.ResponseContext;
+import org.apache.abdera.protocol.server.ResponseContext;
 
 public interface CacheEntry extends ResponseContext {
 

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/cache/CacheFactory.java (from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/cache/CacheFactory.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/cache/CacheFactory.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/cache/CacheFactory.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/cache/CacheFactory.java&r1=438602&r2=438603&rev=438603&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/cache/CacheFactory.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/cache/CacheFactory.java Wed Aug 30 12:52:45 2006
@@ -15,7 +15,7 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.server.cache;
+package org.apache.abdera.protocol.server.cache;
 
 public interface CacheFactory {
 

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/exceptions/AbderaServerException.java (from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/exceptions/AbderaServerException.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/exceptions/AbderaServerException.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/exceptions/AbderaServerException.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/exceptions/AbderaServerException.java&r1=438602&r2=438603&rev=438603&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/exceptions/AbderaServerException.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/exceptions/AbderaServerException.java Wed Aug 30 12:52:45 2006
@@ -15,7 +15,7 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.server.exceptions;
+package org.apache.abdera.protocol.server.exceptions;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -37,8 +37,8 @@
 import javax.activation.URLDataSource;
 
 import org.apache.abdera.model.Base;
-import org.apache.abdera.server.ResponseContext;
-import org.apache.abdera.server.impl.AbstractResponseContext;
+import org.apache.abdera.protocol.server.ResponseContext;
+import org.apache.abdera.protocol.server.impl.AbstractResponseContext;
 import org.apache.abdera.util.AbderaDataSource;
 import org.apache.axiom.attachments.ByteArrayDataSource;
 

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractRequestHandler.java (from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/impl/AbstractRequestHandler.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractRequestHandler.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractRequestHandler.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/impl/AbstractRequestHandler.java&r1=438602&r2=438603&rev=438603&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/impl/AbstractRequestHandler.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractRequestHandler.java Wed Aug 30 12:52:45 2006
@@ -15,14 +15,14 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.server.impl;
+package org.apache.abdera.protocol.server.impl;
 
-import org.apache.abdera.server.RequestContext;
-import org.apache.abdera.server.RequestHandler;
-import org.apache.abdera.server.ResponseContext;
-import org.apache.abdera.server.ServerConstants;
-import org.apache.abdera.server.exceptions.AbderaServerException;
-import org.apache.abdera.server.util.ResourceType;
+import org.apache.abdera.protocol.server.RequestContext;
+import org.apache.abdera.protocol.server.RequestHandler;
+import org.apache.abdera.protocol.server.ResponseContext;
+import org.apache.abdera.protocol.server.ServerConstants;
+import org.apache.abdera.protocol.server.exceptions.AbderaServerException;
+import org.apache.abdera.protocol.server.util.ResourceType;
 
 public abstract class AbstractRequestHandler 
   implements RequestHandler, ServerConstants {

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractResponseContext.java (from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/impl/AbstractResponseContext.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractResponseContext.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractResponseContext.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/impl/AbstractResponseContext.java&r1=438602&r2=438603&rev=438603&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/impl/AbstractResponseContext.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractResponseContext.java Wed Aug 30 12:52:45 2006
@@ -15,7 +15,7 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.server.impl;
+package org.apache.abdera.protocol.server.impl;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -28,7 +28,7 @@
 import javax.activation.MimeType;
 import javax.activation.MimeTypeParseException;
 
-import org.apache.abdera.server.ResponseContext;
+import org.apache.abdera.protocol.server.ResponseContext;
 
 public abstract class AbstractResponseContext 
   implements ResponseContext {

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/BaseResponseContext.java (from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/impl/BaseResponseContext.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/BaseResponseContext.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/BaseResponseContext.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/impl/BaseResponseContext.java&r1=438602&r2=438603&rev=438603&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/impl/BaseResponseContext.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/BaseResponseContext.java Wed Aug 30 12:52:45 2006
@@ -15,7 +15,7 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.server.impl;
+package org.apache.abdera.protocol.server.impl;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/EmptyResponseContext.java (from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/impl/EmptyResponseContext.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/EmptyResponseContext.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/EmptyResponseContext.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/impl/EmptyResponseContext.java&r1=438602&r2=438603&rev=438603&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/impl/EmptyResponseContext.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/EmptyResponseContext.java Wed Aug 30 12:52:45 2006
@@ -15,7 +15,7 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.server.impl;
+package org.apache.abdera.protocol.server.impl;
 
 import java.io.IOException;
 import java.io.OutputStream;

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/AbderaServlet.java (from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/servlet/AbderaServlet.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/AbderaServlet.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/AbderaServlet.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/servlet/AbderaServlet.java&r1=438602&r2=438603&rev=438603&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/servlet/AbderaServlet.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/AbderaServlet.java Wed Aug 30 12:52:45 2006
@@ -15,7 +15,7 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.server.servlet;
+package org.apache.abdera.protocol.server.servlet;
 
 import java.io.IOException;
 import java.util.Date;
@@ -29,14 +29,14 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.abdera.Abdera;
-import org.apache.abdera.server.AbderaServer;
-import org.apache.abdera.server.RequestContext;
-import org.apache.abdera.server.RequestHandler;
-import org.apache.abdera.server.RequestHandlerFactory;
-import org.apache.abdera.server.ResponseContext;
-import org.apache.abdera.server.ServerConstants;
-import org.apache.abdera.server.exceptions.AbderaServerException;
-import org.apache.abdera.server.target.TargetResolver;
+import org.apache.abdera.protocol.server.AbderaServer;
+import org.apache.abdera.protocol.server.RequestContext;
+import org.apache.abdera.protocol.server.RequestHandler;
+import org.apache.abdera.protocol.server.RequestHandlerFactory;
+import org.apache.abdera.protocol.server.ResponseContext;
+import org.apache.abdera.protocol.server.ServerConstants;
+import org.apache.abdera.protocol.server.exceptions.AbderaServerException;
+import org.apache.abdera.protocol.server.target.TargetResolver;
 
 public class AbderaServlet 
   extends HttpServlet 

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/ServletRequestContext.java (from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/servlet/ServletRequestContext.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/ServletRequestContext.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/ServletRequestContext.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/servlet/ServletRequestContext.java&r1=438602&r2=438603&rev=438603&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/servlet/ServletRequestContext.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/ServletRequestContext.java Wed Aug 30 12:52:45 2006
@@ -15,7 +15,7 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.server.servlet;
+package org.apache.abdera.protocol.server.servlet;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,11 +29,11 @@
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.abdera.Abdera;
+import org.apache.abdera.protocol.server.RequestContext;
+import org.apache.abdera.protocol.server.ServerConstants;
+import org.apache.abdera.protocol.server.target.Target;
+import org.apache.abdera.protocol.server.target.TargetResolver;
 import org.apache.abdera.protocol.util.CacheControlParser;
-import org.apache.abdera.server.RequestContext;
-import org.apache.abdera.server.ServerConstants;
-import org.apache.abdera.server.target.Target;
-import org.apache.abdera.server.target.TargetResolver;
 
 public class ServletRequestContext 
   implements RequestContext, ServerConstants {

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/target/Target.java (from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/target/Target.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/target/Target.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/target/Target.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/target/Target.java&r1=438602&r2=438603&rev=438603&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/target/Target.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/target/Target.java Wed Aug 30 12:52:45 2006
@@ -15,9 +15,9 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.server.target;
+package org.apache.abdera.protocol.server.target;
 
-import org.apache.abdera.server.util.ResourceType;
+import org.apache.abdera.protocol.server.util.ResourceType;
 
 public interface Target {
 

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/target/TargetResolver.java (from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/target/TargetResolver.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/target/TargetResolver.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/target/TargetResolver.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/target/TargetResolver.java&r1=438602&r2=438603&rev=438603&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/target/TargetResolver.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/target/TargetResolver.java Wed Aug 30 12:52:45 2006
@@ -15,7 +15,7 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.server.target;
+package org.apache.abdera.protocol.server.target;
 
 public interface TargetResolver {
 

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/util/RegexTargetResolver.java (from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/util/RegexTargetResolver.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/util/RegexTargetResolver.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/util/RegexTargetResolver.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/util/RegexTargetResolver.java&r1=438602&r2=438603&rev=438603&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/util/RegexTargetResolver.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/util/RegexTargetResolver.java Wed Aug 30 12:52:45 2006
@@ -15,15 +15,15 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.server.util;
+package org.apache.abdera.protocol.server.util;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.abdera.server.target.Target;
-import org.apache.abdera.server.target.TargetResolver;
+import org.apache.abdera.protocol.server.target.Target;
+import org.apache.abdera.protocol.server.target.TargetResolver;
 
 /**
  * <p>Provides a utility class helpful for determining which type of resource

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/util/ResourceType.java (from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/util/ResourceType.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/util/ResourceType.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/util/ResourceType.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/util/ResourceType.java&r1=438602&r2=438603&rev=438603&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/util/ResourceType.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/util/ResourceType.java Wed Aug 30 12:52:45 2006
@@ -15,7 +15,7 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.server.util;
+package org.apache.abdera.protocol.server.util;
 
 public enum ResourceType {
 

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/util/ServerUtils.java (from r438602, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/util/ServerUtils.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/util/ServerUtils.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/util/ServerUtils.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/util/ServerUtils.java&r1=438602&r2=438603&rev=438603&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/util/ServerUtils.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/util/ServerUtils.java Wed Aug 30 12:52:45 2006
@@ -15,7 +15,7 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.server.util;
+package org.apache.abdera.protocol.server.util;
 
 import java.util.Arrays;
 import java.util.Comparator;