v2.1

Author: arnett, stu

build.gradle

@@ -12,18 +12,18 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-group = 'com.emc.ecs'
-version = '2.0'
+allprojects {
+    group = 'com.emc.ecs'
+    version = '2.1'
+}
 
 ext.mainClass = 'com.emc.ecs.sync.EcsSync'
 
 defaultTasks ':distZip'
 
 buildscript {
     repositories {
-        jcenter {
-            url "http://jcenter.bintray.com/"
-        }
+        jcenter { url "http://jcenter.bintray.com/" }
     }
     dependencies {
         classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.2'
@@ -41,7 +41,7 @@ repositories {
     mavenLocal()
 }
 
-project(':client') {
+project(':ecs-sync-rest') {
     apply plugin: 'java'
     repositories {
         mavenCentral()
@@ -60,7 +60,7 @@ dependencies {
             "commons-cli:commons-cli:1.3.1",
             "com.google.code.gson:gson:2.0",
             "com.emc.ecs:atmos-client:2.2.2.1",
-            "com.emc.ecs:object-client:2.1.0",
+            "com.emc.ecs:object-client:2.1.1",
             "mysql:mysql-connector-java:5.1.37",
             "org.springframework:spring-jdbc:3.2.6.RELEASE",
             "org.springframework:spring-context:3.2.6.RELEASE",
@@ -69,7 +69,7 @@ dependencies {
             "net.java.truevfs:truevfs-profile-default:0.11.0",
             "com.sun.jersey:jersey-server:1.19",
             "org.xerial:sqlite-jdbc:3.8.11.1",
-            project(':client')
+            project(':ecs-sync-rest')
     testCompile "junit:junit:4.11",
             "org.hsqldb:hsqldb:2.3.2"
 }
@@ -135,5 +135,5 @@ distributions {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.6'
+    gradleVersion = '2.9'
 }

ecs-sync-cli/build.gradle ecs-sync-ctl/build.gradle

@@ -1,5 +1,3 @@
-version '1.1'
-
 defaultTasks 'shadowJar'
 
 buildscript {
@@ -19,14 +17,14 @@ apply plugin: 'java'
 apply plugin: 'application'
 apply plugin: 'com.github.johnrengelman.shadow'
 
-mainClassName = "com.emc.ecs.sync.cli.EcsSyncCli"
+mainClassName = "com.emc.ecs.sync.ctl.EcsSyncCtl"
 
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.11'
     compile "commons-cli:commons-cli:1.3.1"
     compile "log4j:log4j:1.2.17"
     compile "com.sun.jersey:jersey-client:1.19"
-    compile project(':client')
+    compile project(':ecs-sync-rest')
 }
 
 compileJava {

ecs-sync-cli/src/main/java/com/emc/ecs/sync/cli/EcsSyncCli.java ecs-sync-ctl/src/main/java/com/emc/ecs/sync/ctl/EcsSyncCtl.java

@@ -1,6 +1,6 @@
-package com.emc.ecs.sync.cli;
+package com.emc.ecs.sync.ctl;
 
-import com.emc.ecs.sync.bean.*;
+import com.emc.ecs.sync.rest.*;
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.ClientResponse;
 import com.sun.jersey.api.client.UniformInterfaceException;
@@ -15,8 +15,8 @@
 /**
  * Entry point class for the ECS Sync CLI
  */
-public class EcsSyncCli {
-    private static final Logger l4j = Logger.getLogger(EcsSyncCli.class);
+public class EcsSyncCtl {
+    private static final Logger l4j = Logger.getLogger(EcsSyncCtl.class);
     private static final String PAUSE_OPT = "pause";
     private static final String RESUME_OPT = "resume";
     private static final String STOP_OPT = "stop";
@@ -33,7 +33,7 @@ public class EcsSyncCli {
     private static final String ENDPOINT_OPT = "endpoint";
 
     private static final String DEFAULT_ENDPOINT = "http://localhost:9200";
-    private static final String JAR_NAME = "ecs-sync-{version}";
+    private static final String JAR_NAME = "ecs-sync-ctl-{version}";
 
     private static final String LAYOUT_STRING_FILE = "%d{yyyy-MM-dd HH:mm:ss} %-5p [%t] %c{1}:%L - %m%n";
     private static final String LAYOUT_STRING_CONSOLE = "%d{MM-dd HH:mm:ss}%-5p [%t] %c{1}:%L - %m%n";
@@ -150,7 +150,7 @@ public static void main(String[] args) {
         if(cmd.hasOption(ENDPOINT_OPT)) {
             endpoint = cmd.getOptionValue(ENDPOINT_OPT);
         }
-        EcsSyncCli cli = new EcsSyncCli(endpoint, null, null);
+        EcsSyncCtl cli = new EcsSyncCtl(endpoint, null, null);
 
 
         if(cmd.hasOption(PAUSE_OPT)) {
@@ -399,7 +399,7 @@ private String simpleSize(long size) {
     private String user;
     private String pass;
 
-    public EcsSyncCli(String endpoint, String user, String pass) {
+    public EcsSyncCtl(String endpoint, String user, String pass) {
         this.endpoint = endpoint;
         this.user = user;
         this.pass = pass;

client/src/main/java/com/emc/ecs/sync/bean/ErrorList.java ecs-sync-rest/src/main/java/com/emc/ecs/sync/rest/ErrorList.java

@@ -12,7 +12,7 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package com.emc.ecs.sync.bean;
+package com.emc.ecs.sync.rest;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;

client/src/main/java/com/emc/ecs/sync/bean/HostInfo.java ecs-sync-rest/src/main/java/com/emc/ecs/sync/rest/HostInfo.java

@@ -12,20 +12,30 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package com.emc.ecs.sync.bean;
+package com.emc.ecs.sync.rest;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
 @XmlRootElement(name = "HostInfo")
-@XmlType(propOrder = {"hostCpuCount", "hostCpuLoad", "hostMemoryUsed", "hostTotalMemory"})
+@XmlType(propOrder = {"ecsSyncVersion", "hostCpuCount", "hostCpuLoad", "hostMemoryUsed", "hostTotalMemory"})
 public class HostInfo {
+    private String ecsSyncVersion;
     private int hostCpuCount;
     private double hostCpuLoad;
     private long hostMemoryUsed;
     private long hostTotalMemory;
 
+    @XmlElement(name = "EcsSyncVersion")
+    public String getEcsSyncVersion() {
+        return ecsSyncVersion;
+    }
+
+    public void setEcsSyncVersion(String ecsSyncVersion) {
+        this.ecsSyncVersion = ecsSyncVersion;
+    }
+
     @XmlElement(name = "HostCpuCount")
     public int getHostCpuCount() {
         return hostCpuCount;

client/src/main/java/com/emc/ecs/sync/bean/JobControl.java ecs-sync-rest/src/main/java/com/emc/ecs/sync/rest/JobControl.java

@@ -12,7 +12,7 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package com.emc.ecs.sync.bean;
+package com.emc.ecs.sync.rest;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;

client/src/main/java/com/emc/ecs/sync/bean/JobControlStatus.java ecs-sync-rest/src/main/java/com/emc/ecs/sync/rest/JobControlStatus.java

@@ -12,7 +12,7 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package com.emc.ecs.sync.bean;
+package com.emc.ecs.sync.rest;
 
 import javax.xml.bind.annotation.XmlEnum;
 

client/src/main/java/com/emc/ecs/sync/bean/JobInfo.java ecs-sync-rest/src/main/java/com/emc/ecs/sync/rest/JobInfo.java

@@ -12,20 +12,26 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package com.emc.ecs.sync.bean;
+package com.emc.ecs.sync.rest;
 
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
 
+@XmlType(propOrder = {"jobId", "status", "config", "progress"})
 public class JobInfo {
     private Integer jobId;
     private JobControlStatus status;
+    private SyncConfig config;
+    private SyncProgress progress;
 
     public JobInfo() {
     }
 
-    public JobInfo(Integer jobId, JobControlStatus status) {
+    public JobInfo(Integer jobId, JobControlStatus status, SyncConfig config, SyncProgress progress) {
         this.jobId = jobId;
         this.status = status;
+        this.config = config;
+        this.progress = progress;
     }
 
     @XmlElement(name = "JobId")
@@ -45,4 +51,22 @@ public JobControlStatus getStatus() {
     public void setStatus(JobControlStatus status) {
         this.status = status;
     }
+
+    @XmlElement(name = "Config")
+    public SyncConfig getConfig() {
+        return config;
+    }
+
+    public void setConfig(SyncConfig config) {
+        this.config = config;
+    }
+
+    @XmlElement(name = "Progress")
+    public SyncProgress getProgress() {
+        return progress;
+    }
+
+    public void setProgress(SyncProgress progress) {
+        this.progress = progress;
+    }
 }

client/src/main/java/com/emc/ecs/sync/bean/JobList.java ecs-sync-rest/src/main/java/com/emc/ecs/sync/rest/JobList.java

@@ -12,7 +12,7 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package com.emc.ecs.sync.bean;
+package com.emc.ecs.sync.rest;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;

ecs-sync-rest/src/main/java/com/emc/ecs/sync/rest/ListPropEntry.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright 2013-2016 EMC Corporation. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package com.emc.ecs.sync.rest;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ListPropEntry {
+    private String name;
+    private List<String> values = new ArrayList<>();
+
+    public ListPropEntry() {
+    }
+
+    public ListPropEntry(String name, List<String> values) {
+        this.name = name;
+        this.values = values;
+    }
+
+    @XmlAttribute(name = "name")
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @XmlElement(name = "Value")
+    public List<String> getValues() {
+        return values;
+    }
+
+    public void setValues(List<String> values) {
+        this.values = values;
+    }
+}

client/src/main/java/com/emc/ecs/sync/bean/PluginConfig.java ecs-sync-rest/src/main/java/com/emc/ecs/sync/rest/PluginConfig.java

@@ -12,31 +12,33 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package com.emc.ecs.sync.bean;
+package com.emc.ecs.sync.rest;
 
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlTransient;
-import java.util.HashMap;
-import java.util.Map;
+import javax.xml.bind.annotation.XmlType;
+import java.util.*;
 
+@XmlType(propOrder = {"pluginClass", "propEntries", "listPropEntries"})
 public class PluginConfig {
-    protected Class pluginClass;
+    protected String pluginClass;
     protected Map<String, String> customProperties = new HashMap<>();
+    protected Map<String, List<String>> customListProperties = new HashMap<>();
 
     public PluginConfig() {
     }
 
-    public PluginConfig(Class pluginClass) {
+    public PluginConfig(String pluginClass) {
         this.pluginClass = pluginClass;
     }
 
-    @XmlAttribute(name = "Class")
-    public Class getPluginClass() {
+    @XmlAttribute(name = "class")
+    public String getPluginClass() {
         return pluginClass;
     }
 
-    public void setPluginClass(Class pluginClass) {
+    public void setPluginClass(String pluginClass) {
         this.pluginClass = pluginClass;
     }
 
@@ -57,6 +59,23 @@ public void setPropEntries(PropEntry[] propEntries) {
         }
     }
 
+    @XmlElement(name = "ListProperty")
+    public ListPropEntry[] getListPropEntries() {
+        ListPropEntry[] entries = new ListPropEntry[customListProperties.size()];
+        int i = 0;
+        for (Map.Entry<String, List<String>> entry : customListProperties.entrySet()) {
+            entries[i++] = new ListPropEntry(entry.getKey(), new ArrayList<>(entry.getValue()));
+        }
+        return entries;
+    }
+
+    public void setListPropEntries(ListPropEntry[] listPropEntries) {
+        customListProperties = new HashMap<>();
+        for (ListPropEntry entry : listPropEntries) {
+            customListProperties.put(entry.getName(), new ArrayList<>(entry.getValues()));
+        }
+    }
+
     @XmlTransient
     public Map<String, String> getCustomProperties() {
         return customProperties;
@@ -66,7 +85,16 @@ public void setCustomProperties(Map<String, String> customProperties) {
         this.customProperties = customProperties;
     }
 
-    public PluginConfig withPluginClass(Class pluginClass) {
+    @XmlTransient
+    public Map<String, List<String>> getCustomListProperties() {
+        return customListProperties;
+    }
+
+    public void setCustomListProperties(Map<String, List<String>> customListProperties) {
+        this.customListProperties = customListProperties;
+    }
+
+    public PluginConfig withPluginClass(String pluginClass) {
         setPluginClass(pluginClass);
         return this;
     }
@@ -75,4 +103,9 @@ public PluginConfig addCustomProperty(String name, String value) {
         customProperties.put(name, value);
         return this;
     }
+
+    public PluginConfig addCustomListProperty(String name, String... values) {
+        customListProperties.put(name, Arrays.asList(values));
+        return this;
+    }
 }