svn commit: r1238736 - in /incubator/sqoop/branches/sqoop2: common/src/main/java/org/apache/sqoop/json/ server/src/main/java/org/apache/sqoop/handler/ server/src/main/webapp/WEB-INF/

[bl...@apache.org]

Author: blee
Date: Tue Jan 31 18:32:55 2012
New Revision: 1238736

URL: http://svn.apache.org/viewvc?rev=1238736&view=rev
Log:
SQOOP-365. Name refactor for version resource.

Added:
    incubator/sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/json/VersionBean.java   (contents, props changed)
      - copied, changed from r1236955, incubator/sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/json/VersionsBean.java
Removed:
    incubator/sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/json/VersionsBean.java
Modified:
    incubator/sqoop/branches/sqoop2/server/src/main/java/org/apache/sqoop/handler/VersionRequestHandler.java
    incubator/sqoop/branches/sqoop2/server/src/main/webapp/WEB-INF/web.xml

Copied: incubator/sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/json/VersionBean.java (from r1236955, incubator/sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/json/VersionsBean.java)
URL: http://svn.apache.org/viewvc/incubator/sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/json/VersionBean.java?p2=incubator/sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/json/VersionBean.java&p1=incubator/sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/json/VersionsBean.java&r1=1236955&r2=1238736&rev=1238736&view=diff
==============================================================================
--- incubator/sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/json/VersionsBean.java (original)
+++ incubator/sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/json/VersionBean.java Tue Jan 31 18:32:55 2012
@@ -22,7 +22,7 @@ import java.util.Arrays;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 
-public class VersionsBean implements JsonBean {
+public class VersionBean implements JsonBean {
 
   public static final String VERSION = "version";
   public static final String REVISION = "revision";
@@ -39,7 +39,7 @@ public class VersionsBean implements Jso
   private String[] protocols;
 
   // for "extract"
-  public VersionsBean(String version, String revision, String date,
+  public VersionBean(String version, String revision, String date,
       String user, String url, String[] protocols) {
     this.version = version;
     this.revision = revision;
@@ -51,7 +51,7 @@ public class VersionsBean implements Jso
   }
 
   // for "restore"
-  public VersionsBean() {
+  public VersionBean() {
   }
 
   @SuppressWarnings("unchecked")

Propchange: incubator/sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/json/VersionBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/sqoop/branches/sqoop2/server/src/main/java/org/apache/sqoop/handler/VersionRequestHandler.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/branches/sqoop2/server/src/main/java/org/apache/sqoop/handler/VersionRequestHandler.java?rev=1238736&r1=1238735&r2=1238736&view=diff
==============================================================================
--- incubator/sqoop/branches/sqoop2/server/src/main/java/org/apache/sqoop/handler/VersionRequestHandler.java (original)
+++ incubator/sqoop/branches/sqoop2/server/src/main/java/org/apache/sqoop/handler/VersionRequestHandler.java Tue Jan 31 18:32:55 2012
@@ -21,7 +21,7 @@ import org.apache.log4j.Logger;
 import org.apache.sqoop.common.VersionInfo;
 import org.apache.sqoop.common.SqoopException;
 import org.apache.sqoop.json.JsonBean;
-import org.apache.sqoop.json.VersionsBean;
+import org.apache.sqoop.json.VersionBean;
 import org.apache.sqoop.server.RequestContext;
 import org.apache.sqoop.server.RequestHandler;
 
@@ -34,11 +34,11 @@ public class VersionRequestHandler imple
   public static final String PROTOCOL_V1 = "1";
 
 
-  private final VersionsBean versionsBean;
+  private final VersionBean versionBean;
 
   public VersionRequestHandler() {
     String[] protocols = { PROTOCOL_V1 };
-    versionsBean = new VersionsBean(VersionInfo.getVersion(),
+    versionBean = new VersionBean(VersionInfo.getVersion(),
         VersionInfo.getRevision(), VersionInfo.getDate(),
         VersionInfo.getUser(), VersionInfo.getUrl(), protocols);
 
@@ -48,6 +48,6 @@ public class VersionRequestHandler imple
 
   @Override
   public JsonBean handleEvent(RequestContext ctx) throws SqoopException {
-    return versionsBean;
+    return versionBean;
   }
 }

Modified: incubator/sqoop/branches/sqoop2/server/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/sqoop/branches/sqoop2/server/src/main/webapp/WEB-INF/web.xml?rev=1238736&r1=1238735&r2=1238736&view=diff
==============================================================================
--- incubator/sqoop/branches/sqoop2/server/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/sqoop/branches/sqoop2/server/src/main/webapp/WEB-INF/web.xml Tue Jan 31 18:32:55 2012
@@ -35,7 +35,7 @@ limitations under the License.
 
   <servlet-mapping>
     <servlet-name>VersionServlet</servlet-name>
-    <url-pattern>/versions</url-pattern>
+    <url-pattern>/version</url-pattern>
   </servlet-mapping>
 
 </web-app>