Move token

hibooboo2 · Jul 31, 2015 · d7d1659 · d7d1659
1 parent cb71f00
commit d7d1659
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 6 deletions.
diff --git a/...th/integration/github/resource/Token.java → ...latform/iaas/api/auth/identity/Token.java b/...th/integration/github/resource/Token.java → ...latform/iaas/api/auth/identity/Token.java
@@ -1,4 +1,4 @@
-package io.cattle.platform.iaas.api.auth.integration.github.resource;
+package io.cattle.platform.iaas.api.auth.identity;
 
 import io.cattle.platform.iaas.api.auth.TokenUtils;
 import io.github.ibuildthecloud.gdapi.annotation.Field;

diff --git a/...h-logic/src/main/java/io/cattle/platform/iaas/api/auth/identity/TokenResourceManager.java b/...h-logic/src/main/java/io/cattle/platform/iaas/api/auth/identity/TokenResourceManager.java
@@ -1,7 +1,6 @@
 package io.cattle.platform.iaas.api.auth.identity;
 
 import io.cattle.platform.archaius.util.ArchaiusUtil;
-import io.cattle.platform.iaas.api.auth.integration.github.resource.Token;
 import io.cattle.platform.iaas.api.auth.integration.interfaces.TokenHandler;
 import io.cattle.platform.iaas.api.auth.TokenUtils;
 import io.github.ibuildthecloud.gdapi.exception.ClientVisibleException;

diff --git a/...src/main/java/io/cattle/platform/iaas/api/auth/integration/github/GithubTokenHandler.java b/...src/main/java/io/cattle/platform/iaas/api/auth/integration/github/GithubTokenHandler.java
@@ -10,7 +10,7 @@
 import io.cattle.platform.iaas.api.auth.integration.github.resource.GithubAccountInfo;
 import io.cattle.platform.iaas.api.auth.integration.github.resource.GithubClient;
 import io.cattle.platform.iaas.api.auth.integration.github.resource.TeamAccountInfo;
-import io.cattle.platform.iaas.api.auth.integration.github.resource.Token;
+import io.cattle.platform.iaas.api.auth.identity.Token;
 import io.cattle.platform.iaas.api.auth.integration.interfaces.TokenHandler;
 import io.cattle.platform.iaas.api.auth.projects.ProjectResourceManager;
 import io.cattle.platform.object.ObjectManager;

diff --git a/...c/src/main/java/io/cattle/platform/iaas/api/auth/integration/interfaces/TokenHandler.java b/...c/src/main/java/io/cattle/platform/iaas/api/auth/integration/interfaces/TokenHandler.java
@@ -1,6 +1,6 @@
 package io.cattle.platform.iaas.api.auth.integration.interfaces;
 
-import io.cattle.platform.iaas.api.auth.integration.github.resource.Token;
+import io.cattle.platform.iaas.api.auth.identity.Token;
 import io.github.ibuildthecloud.gdapi.request.ApiRequest;
 
 import java.io.IOException;

diff --git a/...gic/src/main/java/io/cattle/platform/iaas/api/auth/integration/ldap/LdapTokenHandler.java b/...gic/src/main/java/io/cattle/platform/iaas/api/auth/integration/ldap/LdapTokenHandler.java
@@ -8,7 +8,7 @@
 import io.cattle.platform.iaas.api.auth.TokenUtils;
 import io.cattle.platform.iaas.api.auth.dao.AuthDao;
 import io.cattle.platform.iaas.api.auth.integration.github.GithubConstants;
-import io.cattle.platform.iaas.api.auth.integration.github.resource.Token;
+import io.cattle.platform.iaas.api.auth.identity.Token;
 import io.cattle.platform.iaas.api.auth.integration.interfaces.TokenHandler;
 import io.cattle.platform.iaas.api.auth.projects.ProjectResourceManager;
 import io.cattle.platform.object.ObjectManager;

diff --git a/...ion-api/src/main/resources/META-INF/cattle/extension-api/spring-extension-api-context.xml b/...ion-api/src/main/resources/META-INF/cattle/extension-api/spring-extension-api-context.xml
@@ -16,7 +16,7 @@
                 <value>io.cattle.platform.extension.api.model.ProcessDefinitionApi</value>
                 <value>io.cattle.platform.extension.api.model.ResourceDefinition</value>
                 <value>io.cattle.platform.engine.process.StateTransition</value>
-                <value>io.cattle.platform.iaas.api.auth.integration.github.resource.Token</value>
+                <value>io.cattle.platform.iaas.api.auth.identity.Token</value>
                 <value>io.cattle.platform.iaas.api.auth.integration.github.resource.GithubConfig</value>
                 <value>io.cattle.platform.iaas.api.auth.integration.github.resource.Member</value>
                 <value>io.cattle.platform.api.auth.Identity</value>