etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cloudian: refactor package names 

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2017-10-03 16:04:21 +05:30
parent 99302708c0
commit ca209eb85a
12 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/integrations/cloudian/resources/META-INF/cloudstack/cloudian/spring-cloudian-context.xml
View File

@ -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">
<bean id="cloudianConnector" class="com.cloudian.cloudstack.CloudianConnectorImpl" >
<bean id="cloudianConnector" class="org.apache.cloudstack.cloudian.CloudianConnectorImpl" >
</bean>
</beans>

2
plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianConnector.java → plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/CloudianConnector.java
View File

@ -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;

13
plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianConnectorImpl.java → plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/CloudianConnectorImpl.java
View File

@ -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);

6
plugins/integrations/cloudian/src/com/cloudian/cloudstack/api/CloudianIsEnabledCmd.java → plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/api/CloudianIsEnabledCmd.java
View File

@ -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,

6
plugins/integrations/cloudian/src/com/cloudian/cloudstack/api/CloudianSsoLoginCmd.java → plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/api/CloudianSsoLoginCmd.java
View File

@ -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",

2
plugins/integrations/cloudian/src/com/cloudian/client/CloudianClient.java → plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianClient.java
View File

@ -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;

2
plugins/integrations/cloudian/src/com/cloudian/client/CloudianGroup.java → plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianGroup.java
View File

@ -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;

2
plugins/integrations/cloudian/src/com/cloudian/client/CloudianUser.java → plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianUser.java
View File

@ -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;

2
plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianUtils.java → plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianUtils.java
View File

@ -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;

2
plugins/integrations/cloudian/src/com/cloudian/cloudstack/response/CloudianEnabledResponse.java → plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/response/CloudianEnabledResponse.java
View File

@ -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;

2
plugins/integrations/cloudian/src/com/cloudian/cloudstack/response/CloudianSsoLoginResponse.java → plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/response/CloudianSsoLoginResponse.java
View File

@ -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;

5
plugins/integrations/cloudian/test/com/cloudian/client/CloudianClientTest.java → plugins/integrations/cloudian/test/org/apache/cloudstack/cloudian/CloudianClientTest.java
View File

@ -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;