alter package name

jenkins-client/src/main/java/com/offbytwo/jenkins/model/Job.java

@@ -99,11 +99,9 @@ public class Job extends BaseModel {
      */
     public QueueReference build(Map<String, String> params) throws IOException {
         String qs = join(Collections2.transform(params.entrySet(), new MapEntryToQueryStringPair()), "&");
-<<<<<<< HEAD
+
         // client.post(url + "buildWithParameters?" + qs);
-=======
-//        client.post(url + "buildWithParameters?" + qs);
->>>>>>> bc119ee10fc482fee999d72df1c4031006926ba9
+
         ExtractHeader location = client.post(url + "buildWithParameters?" + qs, null, ExtractHeader.class, false);
         return new QueueReference(location.getLocation());
     }

jenkins-exec/src/main/java/com/educoder/jenkins/api/JenkinsApi.java

@@ -1,8 +1,8 @@
-package cn.guange.app.jenkins.api;
+package com.educoder.jenkins.api;
 
-import cn.guange.app.jenkins.settings.AppConfig;
-import cn.guange.app.jenkins.utils.StringUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.educoder.jenkins.settings.AppConfig;
+import com.educoder.jenkins.utils.StringUtil;
 import com.offbytwo.jenkins.JenkinsServer;
 import com.offbytwo.jenkins.model.JobWithDetails;
 import org.apache.commons.io.IOUtils;

jenkins-exec/src/main/java/com/educoder/jenkins/api/TrustieApi.java

@@ -1,9 +1,10 @@
-package cn.guange.app.jenkins.api;
+package com.educoder.jenkins.api;
 
-import cn.guange.app.jenkins.settings.AppConfig;
-import cn.guange.app.jenkins.utils.Base64Helper;
-import cn.guange.app.jenkins.utils.HttpHelper;
 import com.alibaba.fastjson.JSONObject;
+import com.educoder.jenkins.settings.AppConfig;
+import com.educoder.jenkins.utils.Base64Helper;
+import com.educoder.jenkins.utils.HttpHelper;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

jenkins-exec/src/main/java/com/educoder/jenkins/controller/BaseController.java

@@ -1,4 +1,4 @@
-package cn.guange.app.jenkins.controller;
+package com.educoder.jenkins.controller;
 
 import org.springframework.web.bind.annotation.ModelAttribute;
 

jenkins-exec/src/main/java/com/educoder/jenkins/controller/JenkinsController.java

@@ -1,8 +1,9 @@
-package cn.guange.app.jenkins.controller;
+package com.educoder.jenkins.controller;
 
-import cn.guange.app.jenkins.api.JenkinsApi;
-import cn.guange.app.jenkins.utils.Base64Helper;
 import com.alibaba.fastjson.JSONObject;
+import com.educoder.jenkins.api.JenkinsApi;
+import com.educoder.jenkins.utils.Base64Helper;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;

jenkins-exec/src/main/java/com/educoder/jenkins/controller/PipeLineController.java

@@ -1,7 +1,8 @@
-package cn.guange.app.jenkins.controller;
+package com.educoder.jenkins.controller;
 
-import cn.guange.app.jenkins.api.TrustieApi;
 import com.alibaba.fastjson.JSONObject;
+import com.educoder.jenkins.api.TrustieApi;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;

jenkins-exec/src/main/java/com/educoder/jenkins/settings/AppConfig.java

@@ -1,4 +1,4 @@
-package cn.guange.app.jenkins.settings;
+package com.educoder.jenkins.settings;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;

jenkins-exec/src/main/java/com/educoder/jenkins/test/JenkinsApi.java

@@ -8,7 +8,7 @@
  * 修改时间：      2017年3月17日
  * 修改内容：      <修改内容>
  */
-package cn.lili.test;
+package com.educoder.jenkins.test;
 
 import java.io.IOException;
 import java.io.InputStream;

jenkins-exec/src/main/java/com/educoder/jenkins/test/MyTest.java

@@ -4,7 +4,7 @@
  * 
  * @author liliy 版本 : <版本> 修改时间： 2017年3月16日 修改内容： <修改内容>
  */
-package cn.lili.test;
+package com.educoder.jenkins.test;
 
 import java.io.FileOutputStream;
 import java.io.IOException;

jenkins-exec/src/main/java/com/educoder/jenkins/test/StringUtil.java

@@ -1,4 +1,4 @@
-package cn.lili.test;
+package com.educoder.jenkins.test;
 
 import java.io.IOException;
 

jenkins-exec/src/main/java/com/educoder/jenkins/test/TimeHandle.java

@@ -8,7 +8,7 @@
  * 修改时间：      2017年3月24日
  * 修改内容：      <修改内容>
  */
-package cn.lili.test;
+package com.educoder.jenkins.test;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

jenkins-exec/src/main/java/com/educoder/jenkins/utils/Base64Helper.java

@@ -1,4 +1,4 @@
-package cn.guange.app.jenkins.utils;
+package com.educoder.jenkins.utils;
 
 
 import org.apache.commons.codec.binary.Base64;

jenkins-exec/src/main/java/com/educoder/jenkins/utils/ExecuteShellCommand.java

@@ -1,4 +1,4 @@
-package cn.guange.app.jenkins.utils;
+package com.educoder.jenkins.utils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

jenkins-exec/src/main/java/com/educoder/jenkins/utils/HttpHelper.java

@@ -1,4 +1,4 @@
-package cn.guange.app.jenkins.utils;
+package com.educoder.jenkins.utils;
 
 import org.apache.log4j.Logger;
 

jenkins-exec/src/main/java/com/educoder/jenkins/utils/StringUtil.java

@@ -1,4 +1,4 @@
-package cn.guange.app.jenkins.utils;
+package com.educoder.jenkins.utils;
 
 import org.apache.commons.lang.StringEscapeUtils;
 

jenkins-exec/src/test/java/cn/guange/app/jenkins/api/JenkinsApiTest.java

@@ -1,8 +1,10 @@
 package cn.guange.app.jenkins.api;
 
 import cn.guange.app.jenkins.SpringTestBase;
-import cn.guange.app.jenkins.settings.AppConfig;
 import cn.wangwei.app.jenkins.ReadFileUtil;
+
+import com.educoder.jenkins.api.JenkinsApi;
+import com.educoder.jenkins.settings.AppConfig;
 import com.offbytwo.jenkins.JenkinsServer;
 import org.junit.Assert;
 import org.junit.Test;

jenkins-exec/src/test/java/cn/guange/app/jenkins/api/TrustieApiTest.java

@@ -1,6 +1,8 @@
 package cn.guange.app.jenkins.api;
 
 import com.alibaba.fastjson.JSONObject;
+import com.educoder.jenkins.api.TrustieApi;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

jenkins-exec/src/test/java/cn/guange/app/jenkins/utils/StringUtilTest.java

@@ -3,6 +3,8 @@ package cn.guange.app.jenkins.utils;
 import junit.framework.Assert;
 import org.junit.Test;
 
+import com.educoder.jenkins.utils.StringUtil;
+
 import static org.junit.Assert.*;
 
 /**

jenkins-exec/src/test/java/cn/wangwei/app/jenkins/JenkinsTest.java

@@ -1,19 +1,19 @@
 package cn.wangwei.app.jenkins;
 
 import cn.guange.app.jenkins.SpringTestBase;
-import cn.guange.app.jenkins.api.JenkinsApi;
-import cn.guange.app.jenkins.settings.AppConfig;
+
+import com.educoder.jenkins.api.JenkinsApi;
+import com.educoder.jenkins.settings.AppConfig;
 import com.offbytwo.jenkins.JenkinsServer;
 import com.offbytwo.jenkins.model.Build;
 import com.offbytwo.jenkins.model.BuildWithDetails;
 import com.offbytwo.jenkins.model.Job;
 import com.offbytwo.jenkins.model.JobWithDetails;
-<<<<<<< HEAD
-=======
+
 
 import org.apache.commons.logging.Log;
 import org.junit.Assert;
->>>>>>> bc119ee10fc482fee999d72df1c4031006926ba9
+
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -28,11 +28,7 @@ import java.util.Map;
 
 class JenkinsTest extends SpringTestBase {
 
-<<<<<<< HEAD
-    public static void main(String[] args) throws FileNotFoundException {
-        System.setIn(new FileInputStream("ddd"));
-    }
-=======
+
 	@Autowired
 	AppConfig appConfig;
 
@@ -135,5 +131,5 @@ class JenkinsTest extends SpringTestBase {
 			e.printStackTrace();
 		}
 	}
->>>>>>> bc119ee10fc482fee999d72df1c4031006926ba9
+
 }