summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxuegao <xg353y@intl.att.com>2017-02-24 17:29:21 +0100
committerxuegao <xg353y@intl.att.com>2017-04-06 10:28:50 +0200
commit495078893651ef84ac8bc9d26262e61d2d7e1e88 (patch)
tree16eb44abe5015bb7e98fb64ece9c8219cc1eb88d
parent486ab7373193bae711988bacd86e69f24fe169cf (diff)
[MSO-8]Remove RackspaceAuthentication
This removes the RackspaceAuthentication from the Openstack Java SDK as it will be managed by the core adapter utils. Change-Id: I9b6118e9952acbc80c8a80a5b18611c69a0dec1c Signed-off-by: xuegao <xg353y@intl.att.com>
-rw-r--r--keystone-client/src/main/java/com/woorea/openstack/keystone/api/TokensResource.java6
-rw-r--r--keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/RackspaceAuthentication.java99
-rw-r--r--pom.xml4
3 files changed, 4 insertions, 105 deletions
diff --git a/keystone-client/src/main/java/com/woorea/openstack/keystone/api/TokensResource.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/api/TokensResource.java
index 4f30313..06da8ca 100644
--- a/keystone-client/src/main/java/com/woorea/openstack/keystone/api/TokensResource.java
+++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/api/TokensResource.java
@@ -11,7 +11,6 @@ import com.woorea.openstack.base.client.OpenStackRequest;
import com.woorea.openstack.keystone.model.Access;
import com.woorea.openstack.keystone.model.Authentication;
import com.woorea.openstack.keystone.model.authentication.AccessKey;
-import com.woorea.openstack.keystone.model.authentication.RackspaceAuthentication;
import com.woorea.openstack.keystone.model.authentication.TokenAuthentication;
import com.woorea.openstack.keystone.model.authentication.UsernamePassword;
@@ -66,11 +65,6 @@ public class TokensResource {
return new Authenticate(authentication);
}
- public Authenticate withRackspace(String username, String apiKey, String region) {
- Authentication authentication = new RackspaceAuthentication(username, apiKey);
- return new Authenticate(authentication);
- }
-
public Authenticate withAccessKey(String accessKey, String secretKey) {
Authentication authentication = new AccessKey(accessKey, secretKey);
return new Authenticate(authentication);
diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/RackspaceAuthentication.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/RackspaceAuthentication.java
deleted file mode 100644
index 7007d02..0000000
--- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/authentication/RackspaceAuthentication.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * ============LICENSE_START==========================================
- * ===================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
- *
- */
-
-package com.woorea.openstack.keystone.model.authentication;
-
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
-import com.woorea.openstack.keystone.model.Authentication;
-
-@JsonRootName("auth")
-public class RackspaceAuthentication extends Authentication {
-
- /**
- *
- */
- private static final long serialVersionUID = 5451283386875662918L;
-
- @JsonIgnore
- private String tenantId;
-
- @JsonIgnore
- private String tenantName;
-
- public static final class Token {
-
- private String username;
- private String apiKey;
-
- /**
- * @return the username
- */
- public String getUsername() {
- return username;
- }
- /**
- * @param username the username to set
- */
- public void setUsername(String username) {
- this.username = username;
- }
- /**
- * @return the apiKey
- */
- public String getApiKey() {
- return apiKey;
- }
- /**
- * @param apiKey the apiKey to set
- */
- public void setApiKey(String apiKey) {
- this.apiKey = apiKey;
- }
- }
-
- @JsonProperty("RAX-KSKEY:apiKeyCredentials")
- private Token token = new Token();
-
- public RackspaceAuthentication (String username, String apiKey) {
- this.token.username = username;
- this.token.apiKey = apiKey;
-
- }
-
- /**
- * @return the token
- */
- public Token getToken() {
- return token;
- }
-
- /**
- * @param token the token to set
- */
- public void setToken(Token token) {
- this.token = token;
- }
-
-}
diff --git a/pom.xml b/pom.xml
index d80fe9f..f82fc00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,6 +25,10 @@
<name>OpenECOMP - Snapshot Repository</name>
<url>${nexusproxy}/${snapshotNexusPath}</url>
</snapshotRepository>
+ <site>
+ <id>ecomp-site</id>
+ <url>dav:${nexusproxy}${sitePath}</url>
+ </site>
</distributionManagement>
<modules>
<module>openstack-client</module>