svn commit: r629138 - in /incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server: context/ impl/

[jm...@apache.org]

Author: jmsnell
Date: Tue Feb 19 08:03:55 2008
New Revision: 629138

URL: http://svn.apache.org/viewvc?rev=629138&view=rev
Log:
Per https://issues.apache.org/jira/browse/ABDERA-127....

Eliminate AbstractTarget, rename DefaultTarget to SimpleTarget. Calling it BasicTarget would
have been somewhat confusing with the Basic adapter.

Added:
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/SimpleTarget.java
      - copied, changed from r628803, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/DefaultTarget.java
Removed:
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractTarget.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/DefaultTarget.java
Modified:
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/context/AbstractRequestContext.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/RegexTargetResolver.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/RouteManager.java

Modified: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/context/AbstractRequestContext.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/context/AbstractRequestContext.java?rev=629138&r1=629137&r2=629138&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/context/AbstractRequestContext.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/context/AbstractRequestContext.java Tue Feb 19 08:03:55 2008
@@ -34,7 +34,7 @@
 import org.apache.abdera.protocol.server.RequestContext;
 import org.apache.abdera.protocol.server.Target;
 import org.apache.abdera.protocol.server.TargetType;
-import org.apache.abdera.protocol.server.impl.AbstractTarget;
+import org.apache.abdera.protocol.server.impl.SimpleTarget;
 import org.apache.abdera.protocol.util.AbstractRequest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -69,7 +69,7 @@
   protected Target initTarget() {
     try {
       Target target = provider.resolveTarget(this);
-      return target != null ? target : new AbstractTarget(TargetType.TYPE_NOT_FOUND, this);
+      return target != null ? target : new SimpleTarget(TargetType.TYPE_NOT_FOUND, this);
     } catch (Exception e) {
       throw new RuntimeException(e);
     }

Modified: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/RegexTargetResolver.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/RegexTargetResolver.java?rev=629138&r1=629137&r2=629138&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/RegexTargetResolver.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/RegexTargetResolver.java Tue Feb 19 08:03:55 2008
@@ -148,7 +148,7 @@
   }  
   
   public static class RegexTarget
-    extends AbstractTarget
+    extends SimpleTarget
     implements Target {
     
     private static final long serialVersionUID = 165211244926064449L;

Modified: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/RouteManager.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/RouteManager.java?rev=629138&r1=629137&r2=629138&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/RouteManager.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/RouteManager.java Tue Feb 19 08:03:55 2008
@@ -172,7 +172,7 @@
   }
   
   public static class RouteTarget 
-    extends AbstractTarget {
+    extends SimpleTarget {
       private final Map<String,String> params;
       private final Route route;      
       public RouteTarget(

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/SimpleTarget.java (from r628803, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/DefaultTarget.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/SimpleTarget.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/SimpleTarget.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/DefaultTarget.java&r1=628803&r2=629138&rev=629138&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/DefaultTarget.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/SimpleTarget.java Tue Feb 19 08:03:55 2008
@@ -23,13 +23,13 @@
 import org.apache.abdera.protocol.server.Target;
 import org.apache.abdera.protocol.server.TargetType;
 
-public class DefaultTarget 
+public class SimpleTarget 
   implements Target {
 
   protected final TargetType type;
   protected final RequestContext context;
   
-  public DefaultTarget(
+  public SimpleTarget(
     TargetType type, 
     RequestContext context) {
       this.type = type;
@@ -82,7 +82,7 @@
       return false;
     if (getClass() != obj.getClass())
       return false;
-    final DefaultTarget other = (DefaultTarget) obj;
+    final SimpleTarget other = (SimpleTarget) obj;
     if (context == null) {
       if (other.context != null)
         return false;