From ca209eb85a897fa6225507a14ddee44d9a3a50df Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Tue, 3 Oct 2017 16:04:21 +0530 Subject: [PATCH] cloudian: refactor package names Signed-off-by: Rohit Yadav --- .../cloudstack/cloudian/spring-cloudian-context.xml | 2 +- .../cloudstack/cloudian}/CloudianConnector.java | 2 +- .../cloudstack/cloudian}/CloudianConnectorImpl.java | 13 +++++++------ .../cloudian}/api/CloudianIsEnabledCmd.java | 6 +++--- .../cloudian}/api/CloudianSsoLoginCmd.java | 6 +++--- .../cloudstack}/cloudian/client/CloudianClient.java | 2 +- .../cloudstack}/cloudian/client/CloudianGroup.java | 2 +- .../cloudstack}/cloudian/client/CloudianUser.java | 2 +- .../cloudstack/cloudian/client}/CloudianUtils.java | 2 +- .../cloudian}/response/CloudianEnabledResponse.java | 2 +- .../response/CloudianSsoLoginResponse.java | 2 +- .../cloudstack/cloudian}/CloudianClientTest.java | 5 ++++- 12 files changed, 25 insertions(+), 21 deletions(-) rename plugins/integrations/cloudian/src/{com/cloudian/cloudstack => org/apache/cloudstack/cloudian}/CloudianConnector.java (99%) rename plugins/integrations/cloudian/src/{com/cloudian/cloudstack => org/apache/cloudstack/cloudian}/CloudianConnectorImpl.java (96%) rename plugins/integrations/cloudian/src/{com/cloudian/cloudstack => org/apache/cloudstack/cloudian}/api/CloudianIsEnabledCmd.java (93%) rename plugins/integrations/cloudian/src/{com/cloudian/cloudstack => org/apache/cloudstack/cloudian}/api/CloudianSsoLoginCmd.java (93%) rename plugins/integrations/cloudian/src/{com => org/apache/cloudstack}/cloudian/client/CloudianClient.java (99%) rename plugins/integrations/cloudian/src/{com => org/apache/cloudstack}/cloudian/client/CloudianGroup.java (97%) rename plugins/integrations/cloudian/src/{com => org/apache/cloudstack}/cloudian/client/CloudianUser.java (97%) rename plugins/integrations/cloudian/src/{com/cloudian/cloudstack => org/apache/cloudstack/cloudian/client}/CloudianUtils.java (98%) rename plugins/integrations/cloudian/src/{com/cloudian/cloudstack => org/apache/cloudstack/cloudian}/response/CloudianEnabledResponse.java (96%) rename plugins/integrations/cloudian/src/{com/cloudian/cloudstack => org/apache/cloudstack/cloudian}/response/CloudianSsoLoginResponse.java (96%) rename plugins/integrations/cloudian/test/{com/cloudian/client => org/apache/cloudstack/cloudian}/CloudianClientTest.java (98%) diff --git a/plugins/integrations/cloudian/resources/META-INF/cloudstack/cloudian/spring-cloudian-context.xml b/plugins/integrations/cloudian/resources/META-INF/cloudstack/cloudian/spring-cloudian-context.xml index 3c48885c1da..71ed52dd701 100644 --- a/plugins/integrations/cloudian/resources/META-INF/cloudstack/cloudian/spring-cloudian-context.xml +++ b/plugins/integrations/cloudian/resources/META-INF/cloudstack/cloudian/spring-cloudian-context.xml @@ -20,6 +20,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + diff --git a/plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianConnector.java b/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/CloudianConnector.java similarity index 99% rename from plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianConnector.java rename to plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/CloudianConnector.java index 794a6440dbf..c04d70c2601 100644 --- a/plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianConnector.java +++ b/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/CloudianConnector.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudian.cloudstack; +package org.apache.cloudstack.cloudian; import org.apache.cloudstack.framework.config.ConfigKey; diff --git a/plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianConnectorImpl.java b/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/CloudianConnectorImpl.java similarity index 96% rename from plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianConnectorImpl.java rename to plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/CloudianConnectorImpl.java index 9340e2f0267..49a2e3e7f48 100644 --- a/plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianConnectorImpl.java +++ b/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/CloudianConnectorImpl.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudian.cloudstack; +package org.apache.cloudstack.cloudian; import java.security.KeyManagementException; import java.security.KeyStoreException; @@ -28,6 +28,12 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import org.apache.cloudstack.acl.RoleType; +import org.apache.cloudstack.cloudian.api.CloudianSsoLoginCmd; +import org.apache.cloudstack.cloudian.api.CloudianIsEnabledCmd; +import org.apache.cloudstack.cloudian.client.CloudianClient; +import org.apache.cloudstack.cloudian.client.CloudianGroup; +import org.apache.cloudstack.cloudian.client.CloudianUser; +import org.apache.cloudstack.cloudian.client.CloudianUtils; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.Configurable; @@ -46,11 +52,6 @@ import com.cloud.user.dao.AccountDao; import com.cloud.user.dao.UserDao; import com.cloud.utils.component.ComponentLifecycleBase; import com.cloud.utils.exception.CloudRuntimeException; -import com.cloudian.client.CloudianClient; -import com.cloudian.client.CloudianGroup; -import com.cloudian.client.CloudianUser; -import com.cloudian.cloudstack.api.CloudianIsEnabledCmd; -import com.cloudian.cloudstack.api.CloudianSsoLoginCmd; public class CloudianConnectorImpl extends ComponentLifecycleBase implements CloudianConnector, Configurable { private static final Logger LOG = Logger.getLogger(CloudianConnectorImpl.class); diff --git a/plugins/integrations/cloudian/src/com/cloudian/cloudstack/api/CloudianIsEnabledCmd.java b/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/api/CloudianIsEnabledCmd.java similarity index 93% rename from plugins/integrations/cloudian/src/com/cloudian/cloudstack/api/CloudianIsEnabledCmd.java rename to plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/api/CloudianIsEnabledCmd.java index f04eae0cc2e..fdca87185d0 100644 --- a/plugins/integrations/cloudian/src/com/cloudian/cloudstack/api/CloudianIsEnabledCmd.java +++ b/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/api/CloudianIsEnabledCmd.java @@ -15,17 +15,17 @@ // specific language governing permissions and limitations // under the License. -package com.cloudian.cloudstack.api; +package org.apache.cloudstack.cloudian.api; import javax.inject.Inject; import org.apache.cloudstack.acl.RoleType; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.cloudian.CloudianConnector; +import org.apache.cloudstack.cloudian.response.CloudianEnabledResponse; import com.cloud.user.Account; -import com.cloudian.cloudstack.CloudianConnector; -import com.cloudian.cloudstack.response.CloudianEnabledResponse; @APICommand(name = CloudianIsEnabledCmd.APINAME, description = "Checks if the Cloudian Connector is enabled", responseObject = CloudianEnabledResponse.class, diff --git a/plugins/integrations/cloudian/src/com/cloudian/cloudstack/api/CloudianSsoLoginCmd.java b/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/api/CloudianSsoLoginCmd.java similarity index 93% rename from plugins/integrations/cloudian/src/com/cloudian/cloudstack/api/CloudianSsoLoginCmd.java rename to plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/api/CloudianSsoLoginCmd.java index 8c0a676accc..7bdd7fda5e1 100644 --- a/plugins/integrations/cloudian/src/com/cloudian/cloudstack/api/CloudianSsoLoginCmd.java +++ b/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/api/CloudianSsoLoginCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudian.cloudstack.api; +package org.apache.cloudstack.cloudian.api; import javax.inject.Inject; @@ -24,10 +24,10 @@ import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.cloudian.CloudianConnector; +import org.apache.cloudstack.cloudian.response.CloudianSsoLoginResponse; import com.cloud.user.Account; -import com.cloudian.cloudstack.CloudianConnector; -import com.cloudian.cloudstack.response.CloudianSsoLoginResponse; import com.google.common.base.Strings; @APICommand(name = CloudianSsoLoginCmd.APINAME, description = "Generates single-sign-on login url for logged-in CloudStack user to access the Cloudian Management Console", diff --git a/plugins/integrations/cloudian/src/com/cloudian/client/CloudianClient.java b/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianClient.java similarity index 99% rename from plugins/integrations/cloudian/src/com/cloudian/client/CloudianClient.java rename to plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianClient.java index 6f569847620..d6d4a0e77cf 100644 --- a/plugins/integrations/cloudian/src/com/cloudian/client/CloudianClient.java +++ b/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianClient.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudian.client; +package org.apache.cloudstack.cloudian.client; import java.io.IOException; import java.net.SocketTimeoutException; diff --git a/plugins/integrations/cloudian/src/com/cloudian/client/CloudianGroup.java b/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianGroup.java similarity index 97% rename from plugins/integrations/cloudian/src/com/cloudian/client/CloudianGroup.java rename to plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianGroup.java index ffa1df4f168..0a3c4e475a1 100644 --- a/plugins/integrations/cloudian/src/com/cloudian/client/CloudianGroup.java +++ b/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianGroup.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudian.client; +package org.apache.cloudstack.cloudian.client; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/plugins/integrations/cloudian/src/com/cloudian/client/CloudianUser.java b/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianUser.java similarity index 97% rename from plugins/integrations/cloudian/src/com/cloudian/client/CloudianUser.java rename to plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianUser.java index 2eae37de4f6..88d45f90976 100644 --- a/plugins/integrations/cloudian/src/com/cloudian/client/CloudianUser.java +++ b/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianUser.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudian.client; +package org.apache.cloudstack.cloudian.client; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianUtils.java b/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianUtils.java similarity index 98% rename from plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianUtils.java rename to plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianUtils.java index b8aae27b697..faca579886e 100644 --- a/plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianUtils.java +++ b/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianUtils.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudian.cloudstack; +package org.apache.cloudstack.cloudian.client; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; diff --git a/plugins/integrations/cloudian/src/com/cloudian/cloudstack/response/CloudianEnabledResponse.java b/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/response/CloudianEnabledResponse.java similarity index 96% rename from plugins/integrations/cloudian/src/com/cloudian/cloudstack/response/CloudianEnabledResponse.java rename to plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/response/CloudianEnabledResponse.java index ce935cb4b1b..49d8cda2eaf 100644 --- a/plugins/integrations/cloudian/src/com/cloudian/cloudstack/response/CloudianEnabledResponse.java +++ b/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/response/CloudianEnabledResponse.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudian.cloudstack.response; +package org.apache.cloudstack.cloudian.response; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; diff --git a/plugins/integrations/cloudian/src/com/cloudian/cloudstack/response/CloudianSsoLoginResponse.java b/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/response/CloudianSsoLoginResponse.java similarity index 96% rename from plugins/integrations/cloudian/src/com/cloudian/cloudstack/response/CloudianSsoLoginResponse.java rename to plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/response/CloudianSsoLoginResponse.java index 91d6eb860e4..1731456e197 100644 --- a/plugins/integrations/cloudian/src/com/cloudian/cloudstack/response/CloudianSsoLoginResponse.java +++ b/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/response/CloudianSsoLoginResponse.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudian.cloudstack.response; +package org.apache.cloudstack.cloudian.response; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; diff --git a/plugins/integrations/cloudian/test/com/cloudian/client/CloudianClientTest.java b/plugins/integrations/cloudian/test/org/apache/cloudstack/cloudian/CloudianClientTest.java similarity index 98% rename from plugins/integrations/cloudian/test/com/cloudian/client/CloudianClientTest.java rename to plugins/integrations/cloudian/test/org/apache/cloudstack/cloudian/CloudianClientTest.java index defcbcfc320..33024cc0a4b 100644 --- a/plugins/integrations/cloudian/test/com/cloudian/client/CloudianClientTest.java +++ b/plugins/integrations/cloudian/test/org/apache/cloudstack/cloudian/CloudianClientTest.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudian.client; +package org.apache.cloudstack.cloudian; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.containing; @@ -34,6 +34,9 @@ import static com.github.tomakehurst.wiremock.client.WireMock.verify; import java.util.List; +import org.apache.cloudstack.cloudian.client.CloudianClient; +import org.apache.cloudstack.cloudian.client.CloudianGroup; +import org.apache.cloudstack.cloudian.client.CloudianUser; import org.junit.Assert; import org.junit.Before; import org.junit.Rule;