Move HttpUtil to .usagetracker bundle (#1528)

* Move HttpUtil to .usagetracker
* Remove import introduced by auto-refactoring
* Add missing Import-Package

Author: chanseokoh

plugins/com.google.cloud.tools.eclipse.usagetracker.test/META-INF/MANIFEST.MF

@@ -11,3 +11,4 @@ Require-Bundle: org.junit,
  org.eclipse.equinox.preferences,
  com.google.cloud.tools.eclipse.test.dependencies;bundle-version="0.1.0",
  org.eclipse.swt
+Import-Package: com.google.cloud.tools.eclipse.test.util.http

…/tools/eclipse/util/io/HttpUtilTest.java …s/eclipse/usagetracker/HttpUtilTest.javaplugins/com.google.cloud.tools.eclipse.util.test/src/com/google/cloud/tools/eclipse/util/io/HttpUtilTest.java renamed to plugins/com.google.cloud.tools.eclipse.usagetracker.test/src/com/google/cloud/tools/eclipse/usagetracker/HttpUtilTest.java plugins/com.google.cloud.tools.eclipse.util.test/src/com/google/cloud/tools/eclipse/util/io/HttpUtilTest.java renamed to plugins/com.google.cloud.tools.eclipse.usagetracker.test/src/com/google/cloud/tools/eclipse/usagetracker/HttpUtilTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.tools.eclipse.util.io;
+package com.google.cloud.tools.eclipse.usagetracker;
 
 import java.util.Collections;
 import java.util.HashMap;

…ipse/util/io/HttpUtilWithServerTest.java …usagetracker/HttpUtilWithServerTest.javaplugins/com.google.cloud.tools.eclipse.util.test/src/com/google/cloud/tools/eclipse/util/io/HttpUtilWithServerTest.java renamed to plugins/com.google.cloud.tools.eclipse.usagetracker.test/src/com/google/cloud/tools/eclipse/usagetracker/HttpUtilWithServerTest.java plugins/com.google.cloud.tools.eclipse.util.test/src/com/google/cloud/tools/eclipse/util/io/HttpUtilWithServerTest.java renamed to plugins/com.google.cloud.tools.eclipse.usagetracker.test/src/com/google/cloud/tools/eclipse/usagetracker/HttpUtilWithServerTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.tools.eclipse.util.io;
+package com.google.cloud.tools.eclipse.usagetracker;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;

plugins/com.google.cloud.tools.eclipse.usagetracker/META-INF/MANIFEST.MF

@@ -10,7 +10,10 @@ Export-Package: com.google.cloud.tools.eclipse.usagetracker
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.1",
  org.eclipse.jface,
  org.eclipse.ui.workbench
-Import-Package: com.google.cloud.tools.eclipse.preferences,
+Import-Package: com.google.api.client.http;version="[1.22.0,1.23.0)",
+ com.google.api.client.http.javanet;version="[1.22.0,1.23.0)",
+ com.google.cloud.tools.eclipse.preferences,
  com.google.cloud.tools.eclipse.util,
- com.google.cloud.tools.eclipse.util.io,
- com.google.common.annotations;version="[20.0.0,21.0.0)"
+ com.google.common.annotations;version="[20.0.0,21.0.0)",
+ com.google.common.escape;version="[20.0.0,21.0.0)",
+ com.google.common.net;version="[20.0.0,21.0.0)"

plugins/com.google.cloud.tools.eclipse.usagetracker/src/com/google/cloud/tools/eclipse/usagetracker/AnalyticsPingManager.java

@@ -19,7 +19,6 @@
 import com.google.cloud.tools.eclipse.preferences.Activator;
 import com.google.cloud.tools.eclipse.preferences.AnalyticsPreferences;
 import com.google.cloud.tools.eclipse.util.CloudToolsInfo;
-import com.google.cloud.tools.eclipse.util.io.HttpUtil;
 import com.google.common.annotations.VisibleForTesting;
 import java.io.IOException;
 import java.util.Collections;

…loud/tools/eclipse/util/io/HttpUtil.java …tools/eclipse/usagetracker/HttpUtil.javaplugins/com.google.cloud.tools.eclipse.util/src/com/google/cloud/tools/eclipse/util/io/HttpUtil.java renamed to plugins/com.google.cloud.tools.eclipse.usagetracker/src/com/google/cloud/tools/eclipse/usagetracker/HttpUtil.java plugins/com.google.cloud.tools.eclipse.util/src/com/google/cloud/tools/eclipse/util/io/HttpUtil.java renamed to plugins/com.google.cloud.tools.eclipse.usagetracker/src/com/google/cloud/tools/eclipse/usagetracker/HttpUtil.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.tools.eclipse.util.io;
+package com.google.cloud.tools.eclipse.usagetracker;
 
 import com.google.api.client.http.ByteArrayContent;
 import com.google.api.client.http.GenericUrl;

plugins/com.google.cloud.tools.eclipse.util/.classpath

@@ -4,6 +4,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="lib" path="lib/google-http-client-1.22.0.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

plugins/com.google.cloud.tools.eclipse.util/META-INF/MANIFEST.MF

@@ -13,9 +13,7 @@ Export-Package: com.google.cloud.tools.eclipse.util,
  com.google.cloud.tools.eclipse.util.templates.appengine
 Import-Package: com.google.common.annotations;version="[20.0.0,21.0.0)",
  com.google.common.base;version="[20.0.0,21.0.0)",
- com.google.common.escape;version="[20.0.0,21.0.0)",
  com.google.common.io;version="[20.0.0,21.0.0)",
- com.google.common.net;version="[20.0.0,21.0.0)",
  freemarker.template;version="[2.3.25,2.4.0)",
  org.eclipse.core.commands,
  org.eclipse.core.expressions,
@@ -27,7 +25,6 @@ Import-Package: com.google.common.annotations;version="[20.0.0,21.0.0)",
  org.eclipse.wst.common.project.facet.core,
  org.osgi.framework
 Bundle-ClassPath: .,
- templates/appengine/,
- lib/google-http-client-1.22.0.jar
+ templates/appengine/
 Require-Bundle: org.eclipse.m2e.maven.runtime,
  org.eclipse.m2e.core;bundle-version="1.6.2"

plugins/com.google.cloud.tools.eclipse.util/build.properties

@@ -3,7 +3,6 @@ output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
                templates/appengine/,\
-               lib/google-http-client-1.22.0.jar,\
                plugin.xml
 javacSource=1.7
 javacTarget=1.7