v2.0

Author: arnett, stu

.gitignore

@@ -1,5 +1,5 @@
 bin
-*.class
+build
 # Package Files #
 *.jar
 *.war
@@ -11,5 +11,4 @@ bin
 .settings
 .idea
 *.iml
-esu.log
 .gradle

README.md

@@ -1,6 +1,6 @@
-vipr-sync
+ecs-sync
 =========
 
-ViPRSync is a bulk copy utility that can move data between various systems in parallel
+ecs-sync is a bulk copy utility that can move data between various systems in parallel
 
 https://community.emc.com/docs/DOC-38905

build.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 EMC Corporation. All Rights Reserved.
+ * Copyright 2013-2015 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.
@@ -12,19 +12,21 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-group = 'com.emc.vipr'
-version = '1.4.0'
+group = 'com.emc.ecs'
+version = '2.0'
 
-ext.mainClass = 'com.emc.vipr.sync.ViPRSync'
+ext.mainClass = 'com.emc.ecs.sync.EcsSync'
 
-defaultTasks 'distZip'
+defaultTasks ':distZip'
 
 buildscript {
     repositories {
-        jcenter()
+        jcenter {
+            url "http://jcenter.bintray.com/"
+        }
     }
     dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:1.0.3'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.2'
     }
 }
 
@@ -39,29 +41,45 @@ repositories {
     mavenLocal()
 }
 
+project(':client') {
+    apply plugin: 'java'
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        compile 'com.sun.jersey:jersey-client:1.19'
+        testCompile 'junit:junit:4.11'
+    }
+}
+
 dependencies {
     compile files('lib/fplibrary-3.3.718.jar'),
-            "log4j:log4j:1.2.16",
-            "commons-cli:commons-cli:1.2",
+            "org.slf4j:slf4j-api:1.7.12",
+            "org.slf4j:slf4j-log4j12:1.7.12",
+            "log4j:log4j:1.2.17",
+            "commons-cli:commons-cli:1.3.1",
             "com.google.code.gson:gson:2.0",
             "com.emc.ecs:atmos-client:2.2.2.1",
-            "mysql:mysql-connector-java:5.1.31",
+            "com.emc.ecs:object-client:2.1.0",
+            "mysql:mysql-connector-java:5.1.37",
             "org.springframework:spring-jdbc:3.2.6.RELEASE",
             "org.springframework:spring-context:3.2.6.RELEASE",
             "commons-dbcp:commons-dbcp:1.4",
-            "com.amazonaws:aws-java-sdk:1.7.5",
-            "net.java.truevfs:truevfs-profile-default:0.10.6",
-            "org.slf4j:slf4j-log4j12:1.7.5"
+            "com.amazonaws:aws-java-sdk-s3:1.10.5.1",
+            "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')
     testCompile "junit:junit:4.11",
             "org.hsqldb:hsqldb:2.3.2"
 }
 
 compileJava {
-    sourceCompatibility = 1.6
-    targetCompatibility = 1.6
-    if (project.hasProperty('java6Lib')) {
+    sourceCompatibility = 1.7
+    targetCompatibility = 1.7
+    if (project.hasProperty('java7Lib')) {
         options.fork = true
-        options.bootClasspath = new File(java6Lib).listFiles(
+        options.bootClasspath = new File(java7Lib).listFiles(
                 [accept:{d, f-> f ==~ /.*\.jar/ }] as FilenameFilter
         ).join(File.pathSeparator)
     }
@@ -76,10 +94,10 @@ shadowJar {
     mergeServiceFiles()
     append('META-INF/spring.handlers')
     append('META-INF/spring.schemas')
-    appendManifest {
+    manifest {
         attributes 'Main-Class': mainClass,
                 'Implementation-Version': project.version,
-                'Class-Path': configurations.runtime.collect { it.getName() }.join(' ')
+                'Class-Path': { configurations.runtime.collect { it.getName() }.join(' ') }
     }
 }
 
@@ -100,10 +118,12 @@ distributions {
             from 'license.txt'
             from shadowJar
             from 'script'
-            from 'docker'
             into('sample') {
                 from 'sample'
             }
+            into('docker') {
+                from 'docker'
+            }
             into('doc') {
                 from javadocJar
             }
@@ -115,5 +135,5 @@ distributions {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '1.11'
+    gradleVersion = '2.6'
 }

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

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2013-2015 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.bean;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.ArrayList;
+import java.util.List;
+
+@XmlRootElement(name = "ErrorList")
+public class ErrorList {
+    private List<SyncError> errors = new ArrayList<>();
+
+    @XmlElement(name = "Error")
+    public List<SyncError> getErrors() {
+        return errors;
+    }
+
+    public void setErrors(List<SyncError> errors) {
+        this.errors = errors;
+    }
+}

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

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2013-2015 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.bean;
+
+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"})
+public class HostInfo {
+    private int hostCpuCount;
+    private double hostCpuLoad;
+    private long hostMemoryUsed;
+    private long hostTotalMemory;
+
+    @XmlElement(name = "HostCpuCount")
+    public int getHostCpuCount() {
+        return hostCpuCount;
+    }
+
+    public void setHostCpuCount(int hostCpuCount) {
+        this.hostCpuCount = hostCpuCount;
+    }
+
+    @XmlElement(name = "HostCpuLoad")
+    public double getHostCpuLoad() {
+        return hostCpuLoad;
+    }
+
+    public void setHostCpuLoad(double hostCpuLoad) {
+        this.hostCpuLoad = hostCpuLoad;
+    }
+
+    @XmlElement(name = "HostMemoryUsed")
+    public long getHostMemoryUsed() {
+        return hostMemoryUsed;
+    }
+
+    public void setHostMemoryUsed(long hostMemoryUsed) {
+        this.hostMemoryUsed = hostMemoryUsed;
+    }
+
+    @XmlElement(name = "HostTotalMemory")
+    public long getHostTotalMemory() {
+        return hostTotalMemory;
+    }
+
+    public void setHostTotalMemory(long hostTotalMemory) {
+        this.hostTotalMemory = hostTotalMemory;
+    }
+}

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

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2013-2015 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.bean;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "JobControl")
+@XmlType(propOrder = {"status", "syncThreadCount", "queryThreadCount"})
+public class JobControl {
+    private JobControlStatus status;
+    private int syncThreadCount;
+    private int queryThreadCount;
+
+    public JobControl() {
+    }
+
+    public JobControl(JobControlStatus status, int syncThreadCount, int queryThreadCount) {
+        this.status = status;
+        this.syncThreadCount = syncThreadCount;
+        this.queryThreadCount = queryThreadCount;
+    }
+
+    @XmlElement(name = "Status")
+    public JobControlStatus getStatus() {
+        return status;
+    }
+
+    public void setStatus(JobControlStatus status) {
+        this.status = status;
+    }
+
+    @XmlElement(name = "SyncThreadCount")
+    public int getSyncThreadCount() {
+        return syncThreadCount;
+    }
+
+    public void setSyncThreadCount(int syncThreadCount) {
+        this.syncThreadCount = syncThreadCount;
+    }
+
+    @XmlElement(name = "QueryThreadCount")
+    public int getQueryThreadCount() {
+        return queryThreadCount;
+    }
+
+    public void setQueryThreadCount(int queryThreadCount) {
+        this.queryThreadCount = queryThreadCount;
+    }
+}

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

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2013-2015 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.bean;
+
+import javax.xml.bind.annotation.XmlEnum;
+
+@XmlEnum
+public enum JobControlStatus {
+    Initialized(false), Running(false), Paused(false), Stopping(false), Stopped(true), Complete(true);
+
+    private boolean finalState;
+
+    private JobControlStatus(boolean finalState) {
+        this.finalState = finalState;
+    }
+
+    public boolean isFinalState() {
+        return finalState;
+    }
+}

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

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2013-2015 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.bean;
+
+import javax.xml.bind.annotation.XmlElement;
+
+public class JobInfo {
+    private Integer jobId;
+    private JobControlStatus status;
+
+    public JobInfo() {
+    }
+
+    public JobInfo(Integer jobId, JobControlStatus status) {
+        this.jobId = jobId;
+        this.status = status;
+    }
+
+    @XmlElement(name = "JobId")
+    public Integer getJobId() {
+        return jobId;
+    }
+
+    public void setJobId(Integer jobId) {
+        this.jobId = jobId;
+    }
+
+    @XmlElement(name = "Status")
+    public JobControlStatus getStatus() {
+        return status;
+    }
+
+    public void setStatus(JobControlStatus status) {
+        this.status = status;
+    }
+}