From 64aeba66dd95ca44684c28f59422be90c6927020 Mon Sep 17 00:00:00 2001
From: Rohit Yadav <rohit.yadav@shapeblue.com>
Date: Tue, 19 Sep 2017 15:22:58 +0530
Subject: [PATCH] cloudian: file path/name refactorings

Also add httpclient maven lib deps

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 client/pom.xml                                              | 2 +-
 plugins/{connectors => integrations}/cloudian/pom.xml       | 6 +++++-
 .../META-INF/cloudstack/cloudian/module.properties          | 0
 .../cloudstack/cloudian/spring-cloudian-context.xml         | 0
 .../src/com/cloudian/cloudstack/CloudianConnector.java      | 0
 .../src/com/cloudian/cloudstack/CloudianConnectorImpl.java  | 0
 .../cloudian/src/com/cloudian/cloudstack/CloudianUtils.java | 0
 .../com/cloudian/cloudstack/api/CloudianIsEnabledCmd.java   | 0
 .../com/cloudian/cloudstack/api/CloudianSsoLoginCmd.java    | 0
 .../cloudstack/response/CloudianSsoLoginResponse.java       | 0
 plugins/pom.xml                                             | 2 +-
 11 files changed, 7 insertions(+), 3 deletions(-)
 rename plugins/{connectors => integrations}/cloudian/pom.xml (90%)
 rename plugins/{connectors => integrations}/cloudian/resources/META-INF/cloudstack/cloudian/module.properties (100%)
 rename plugins/{connectors => integrations}/cloudian/resources/META-INF/cloudstack/cloudian/spring-cloudian-context.xml (100%)
 rename plugins/{connectors => integrations}/cloudian/src/com/cloudian/cloudstack/CloudianConnector.java (100%)
 rename plugins/{connectors => integrations}/cloudian/src/com/cloudian/cloudstack/CloudianConnectorImpl.java (100%)
 rename plugins/{connectors => integrations}/cloudian/src/com/cloudian/cloudstack/CloudianUtils.java (100%)
 rename plugins/{connectors => integrations}/cloudian/src/com/cloudian/cloudstack/api/CloudianIsEnabledCmd.java (100%)
 rename plugins/{connectors => integrations}/cloudian/src/com/cloudian/cloudstack/api/CloudianSsoLoginCmd.java (100%)
 rename plugins/{connectors => integrations}/cloudian/src/com/cloudian/cloudstack/response/CloudianSsoLoginResponse.java (100%)

diff --git a/client/pom.xml b/client/pom.xml
index 632c410adc8..e45a561898b 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -394,7 +394,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-plugin-connectors-cloudian</artifactId>
+      <artifactId>cloud-plugin-integrations-cloudian-connector</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>
diff --git a/plugins/connectors/cloudian/pom.xml b/plugins/integrations/cloudian/pom.xml
similarity index 90%
rename from plugins/connectors/cloudian/pom.xml
rename to plugins/integrations/cloudian/pom.xml
index d55377a299a..c36a5f014c9 100644
--- a/plugins/connectors/cloudian/pom.xml
+++ b/plugins/integrations/cloudian/pom.xml
@@ -21,7 +21,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
   http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>cloud-plugin-connectors-cloudian</artifactId>
+  <artifactId>cloud-plugin-integrations-cloudian-connector</artifactId>
   <name>Apache CloudStack Plugin - Cloudian Connector</name>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
@@ -40,6 +40,10 @@
       <artifactId>cloud-utils</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/plugins/connectors/cloudian/resources/META-INF/cloudstack/cloudian/module.properties b/plugins/integrations/cloudian/resources/META-INF/cloudstack/cloudian/module.properties
similarity index 100%
rename from plugins/connectors/cloudian/resources/META-INF/cloudstack/cloudian/module.properties
rename to plugins/integrations/cloudian/resources/META-INF/cloudstack/cloudian/module.properties
diff --git a/plugins/connectors/cloudian/resources/META-INF/cloudstack/cloudian/spring-cloudian-context.xml b/plugins/integrations/cloudian/resources/META-INF/cloudstack/cloudian/spring-cloudian-context.xml
similarity index 100%
rename from plugins/connectors/cloudian/resources/META-INF/cloudstack/cloudian/spring-cloudian-context.xml
rename to plugins/integrations/cloudian/resources/META-INF/cloudstack/cloudian/spring-cloudian-context.xml
diff --git a/plugins/connectors/cloudian/src/com/cloudian/cloudstack/CloudianConnector.java b/plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianConnector.java
similarity index 100%
rename from plugins/connectors/cloudian/src/com/cloudian/cloudstack/CloudianConnector.java
rename to plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianConnector.java
diff --git a/plugins/connectors/cloudian/src/com/cloudian/cloudstack/CloudianConnectorImpl.java b/plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianConnectorImpl.java
similarity index 100%
rename from plugins/connectors/cloudian/src/com/cloudian/cloudstack/CloudianConnectorImpl.java
rename to plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianConnectorImpl.java
diff --git a/plugins/connectors/cloudian/src/com/cloudian/cloudstack/CloudianUtils.java b/plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianUtils.java
similarity index 100%
rename from plugins/connectors/cloudian/src/com/cloudian/cloudstack/CloudianUtils.java
rename to plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianUtils.java
diff --git a/plugins/connectors/cloudian/src/com/cloudian/cloudstack/api/CloudianIsEnabledCmd.java b/plugins/integrations/cloudian/src/com/cloudian/cloudstack/api/CloudianIsEnabledCmd.java
similarity index 100%
rename from plugins/connectors/cloudian/src/com/cloudian/cloudstack/api/CloudianIsEnabledCmd.java
rename to plugins/integrations/cloudian/src/com/cloudian/cloudstack/api/CloudianIsEnabledCmd.java
diff --git a/plugins/connectors/cloudian/src/com/cloudian/cloudstack/api/CloudianSsoLoginCmd.java b/plugins/integrations/cloudian/src/com/cloudian/cloudstack/api/CloudianSsoLoginCmd.java
similarity index 100%
rename from plugins/connectors/cloudian/src/com/cloudian/cloudstack/api/CloudianSsoLoginCmd.java
rename to plugins/integrations/cloudian/src/com/cloudian/cloudstack/api/CloudianSsoLoginCmd.java
diff --git a/plugins/connectors/cloudian/src/com/cloudian/cloudstack/response/CloudianSsoLoginResponse.java b/plugins/integrations/cloudian/src/com/cloudian/cloudstack/response/CloudianSsoLoginResponse.java
similarity index 100%
rename from plugins/connectors/cloudian/src/com/cloudian/cloudstack/response/CloudianSsoLoginResponse.java
rename to plugins/integrations/cloudian/src/com/cloudian/cloudstack/response/CloudianSsoLoginResponse.java
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 8646fd17a9b..5f27152e704 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -106,7 +106,7 @@
     <module>network-elements/vxlan</module>
     <module>network-elements/globodns</module>
     <module>database/quota</module>
-    <module>connectors/cloudian</module>
+    <module>integrations/cloudian</module>
   </modules>
 
   <dependencies>