Fix failing imports
diff --git a/api/src/main/java/io/mifos/identity/api/v1/client/IdentityManager.java b/api/src/main/java/io/mifos/identity/api/v1/client/IdentityManager.java
index 1d51644..5e82889 100644
--- a/api/src/main/java/io/mifos/identity/api/v1/client/IdentityManager.java
+++ b/api/src/main/java/io/mifos/identity/api/v1/client/IdentityManager.java
@@ -18,10 +18,10 @@
*/
package io.mifos.identity.api.v1.client;
-import org.apache.fineract.cn.anubis.api.v1.client.Anubis;
-import org.apache.fineract.cn.anubis.api.v1.domain.ApplicationSignatureSet;
-import org.apache.fineract.cn.anubis.api.v1.domain.Signature;
-import org.apache.fineract.cn.anubis.api.v1.validation.ValidKeyTimestamp;
+import io.mifos.anubis.api.v1.client.Anubis;
+import io.mifos.anubis.api.v1.domain.ApplicationSignatureSet;
+import io.mifos.anubis.api.v1.domain.Signature;
+import io.mifos.anubis.api.v1.validation.ValidKeyTimestamp;
import io.mifos.core.api.annotation.ThrowsException;
import io.mifos.core.api.util.CustomFeignClientsConfiguration;
import io.mifos.identity.api.v1.domain.*;
diff --git a/api/src/main/java/io/mifos/identity/api/v1/domain/Permission.java b/api/src/main/java/io/mifos/identity/api/v1/domain/Permission.java
index 9fe4c9f..1e41fdf 100644
--- a/api/src/main/java/io/mifos/identity/api/v1/domain/Permission.java
+++ b/api/src/main/java/io/mifos/identity/api/v1/domain/Permission.java
@@ -18,7 +18,7 @@
*/
package io.mifos.identity.api.v1.domain;
-import org.apache.fineract.cn.anubis.api.v1.domain.AllowedOperation;
+import io.mifos.anubis.api.v1.domain.AllowedOperation;
import org.hibernate.validator.constraints.NotBlank;
import javax.validation.Valid;
diff --git a/api/src/main/java/io/mifos/identity/api/v1/domain/PermittableGroup.java b/api/src/main/java/io/mifos/identity/api/v1/domain/PermittableGroup.java
index 334601d..fea7382 100644
--- a/api/src/main/java/io/mifos/identity/api/v1/domain/PermittableGroup.java
+++ b/api/src/main/java/io/mifos/identity/api/v1/domain/PermittableGroup.java
@@ -18,9 +18,8 @@
*/
package io.mifos.identity.api.v1.domain;
-import org.apache.fineract.cn.anubis.api.v1.domain.PermittableEndpoint;
+import io.mifos.anubis.api.v1.domain.PermittableEndpoint;
import io.mifos.core.lang.validation.constraints.ValidIdentifier;
-
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.util.List;
diff --git a/service/src/main/java/io/mifos/identity/config/IdentityServiceConfig.java b/service/src/main/java/io/mifos/identity/config/IdentityServiceConfig.java
index 259fad8..2e79f1d 100644
--- a/service/src/main/java/io/mifos/identity/config/IdentityServiceConfig.java
+++ b/service/src/main/java/io/mifos/identity/config/IdentityServiceConfig.java
@@ -20,7 +20,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-import org.apache.fineract.cn.anubis.config.EnableAnubis;
+import io.mifos.anubis.config.EnableAnubis;
import io.mifos.core.async.config.EnableAsync;
import io.mifos.core.cassandra.config.EnableCassandra;
import io.mifos.core.command.config.EnableCommandProcessing;
diff --git a/service/src/main/java/io/mifos/identity/internal/command/SetApplicationSignatureCommand.java b/service/src/main/java/io/mifos/identity/internal/command/SetApplicationSignatureCommand.java
index bc2b384..c25a588 100644
--- a/service/src/main/java/io/mifos/identity/internal/command/SetApplicationSignatureCommand.java
+++ b/service/src/main/java/io/mifos/identity/internal/command/SetApplicationSignatureCommand.java
@@ -18,7 +18,7 @@
*/
package io.mifos.identity.internal.command;
-import org.apache.fineract.cn.anubis.api.v1.domain.Signature;
+import io.mifos.anubis.api.v1.domain.Signature;
/**
* @author Myrle Krantz
diff --git a/service/src/main/java/io/mifos/identity/internal/command/handler/AuthenticationCommandHandler.java b/service/src/main/java/io/mifos/identity/internal/command/handler/AuthenticationCommandHandler.java
index 5f07db4..b779fde 100644
--- a/service/src/main/java/io/mifos/identity/internal/command/handler/AuthenticationCommandHandler.java
+++ b/service/src/main/java/io/mifos/identity/internal/command/handler/AuthenticationCommandHandler.java
@@ -20,13 +20,13 @@
import com.google.common.collect.Sets;
import com.google.gson.Gson;
-import org.apache.fineract.cn.anubis.api.v1.domain.AllowedOperation;
-import org.apache.fineract.cn.anubis.api.v1.domain.TokenContent;
-import org.apache.fineract.cn.anubis.api.v1.domain.TokenPermission;
-import org.apache.fineract.cn.anubis.provider.InvalidKeyTimestampException;
-import org.apache.fineract.cn.anubis.provider.TenantRsaKeyProvider;
-import org.apache.fineract.cn.anubis.security.AmitAuthenticationException;
-import org.apache.fineract.cn.anubis.token.*;
+import io.mifos.anubis.api.v1.domain.AllowedOperation;
+import io.mifos.anubis.api.v1.domain.TokenContent;
+import io.mifos.anubis.api.v1.domain.TokenPermission;
+import io.mifos.anubis.provider.InvalidKeyTimestampException;
+import io.mifos.anubis.provider.TenantRsaKeyProvider;
+import io.mifos.anubis.security.AmitAuthenticationException;
+import io.mifos.anubis.token.*;
import io.mifos.core.command.annotation.Aggregate;
import io.mifos.core.command.annotation.CommandHandler;
import io.mifos.core.command.annotation.CommandLogLevel;
diff --git a/service/src/main/java/io/mifos/identity/internal/command/handler/PermittableGroupCommandHandler.java b/service/src/main/java/io/mifos/identity/internal/command/handler/PermittableGroupCommandHandler.java
index d986e61..128f924 100644
--- a/service/src/main/java/io/mifos/identity/internal/command/handler/PermittableGroupCommandHandler.java
+++ b/service/src/main/java/io/mifos/identity/internal/command/handler/PermittableGroupCommandHandler.java
@@ -18,7 +18,7 @@
*/
package io.mifos.identity.internal.command.handler;
-import org.apache.fineract.cn.anubis.api.v1.domain.PermittableEndpoint;
+import io.mifos.anubis.api.v1.domain.PermittableEndpoint;
import io.mifos.core.command.annotation.Aggregate;
import io.mifos.core.command.annotation.CommandHandler;
import io.mifos.core.command.annotation.CommandLogLevel;
diff --git a/service/src/main/java/io/mifos/identity/internal/command/handler/Provisioner.java b/service/src/main/java/io/mifos/identity/internal/command/handler/Provisioner.java
index d0f4407..c19fa47 100644
--- a/service/src/main/java/io/mifos/identity/internal/command/handler/Provisioner.java
+++ b/service/src/main/java/io/mifos/identity/internal/command/handler/Provisioner.java
@@ -19,7 +19,7 @@
package io.mifos.identity.internal.command.handler;
import com.datastax.driver.core.exceptions.InvalidQueryException;
-import org.apache.fineract.cn.anubis.api.v1.domain.ApplicationSignatureSet;
+import io.mifos.anubis.api.v1.domain.ApplicationSignatureSet;
import io.mifos.core.lang.ServiceException;
import io.mifos.core.lang.TenantContextHolder;
import io.mifos.core.lang.security.RsaKeyPairFactory;
diff --git a/service/src/main/java/io/mifos/identity/internal/mapper/PermissionMapper.java b/service/src/main/java/io/mifos/identity/internal/mapper/PermissionMapper.java
index 8a4f5ed..b7ce862 100644
--- a/service/src/main/java/io/mifos/identity/internal/mapper/PermissionMapper.java
+++ b/service/src/main/java/io/mifos/identity/internal/mapper/PermissionMapper.java
@@ -18,7 +18,7 @@
*/
package io.mifos.identity.internal.mapper;
-import org.apache.fineract.cn.anubis.api.v1.domain.AllowedOperation;
+import io.mifos.anubis.api.v1.domain.AllowedOperation;
import io.mifos.identity.api.v1.domain.Permission;
import io.mifos.identity.internal.repository.AllowedOperationType;
import io.mifos.identity.internal.repository.PermissionType;
diff --git a/service/src/main/java/io/mifos/identity/internal/mapper/SignatureMapper.java b/service/src/main/java/io/mifos/identity/internal/mapper/SignatureMapper.java
index 7893a5f..cd6892d 100644
--- a/service/src/main/java/io/mifos/identity/internal/mapper/SignatureMapper.java
+++ b/service/src/main/java/io/mifos/identity/internal/mapper/SignatureMapper.java
@@ -18,8 +18,8 @@
*/
package io.mifos.identity.internal.mapper;
-import org.apache.fineract.cn.anubis.api.v1.domain.ApplicationSignatureSet;
-import org.apache.fineract.cn.anubis.api.v1.domain.Signature;
+import io.mifos.anubis.api.v1.domain.ApplicationSignatureSet;
+import io.mifos.anubis.api.v1.domain.Signature;
import io.mifos.identity.internal.repository.ApplicationSignatureEntity;
import io.mifos.identity.internal.repository.SignatureEntity;
diff --git a/service/src/main/java/io/mifos/identity/internal/service/ApplicationService.java b/service/src/main/java/io/mifos/identity/internal/service/ApplicationService.java
index 07ea9ef..e0d70ff 100644
--- a/service/src/main/java/io/mifos/identity/internal/service/ApplicationService.java
+++ b/service/src/main/java/io/mifos/identity/internal/service/ApplicationService.java
@@ -18,7 +18,7 @@
*/
package io.mifos.identity.internal.service;
-import org.apache.fineract.cn.anubis.api.v1.domain.Signature;
+import io.mifos.anubis.api.v1.domain.Signature;
import io.mifos.identity.api.v1.domain.CallEndpointSet;
import io.mifos.identity.api.v1.domain.Permission;
import io.mifos.identity.internal.mapper.ApplicationCallEndpointSetMapper;
diff --git a/service/src/main/java/io/mifos/identity/internal/service/PermittableGroupService.java b/service/src/main/java/io/mifos/identity/internal/service/PermittableGroupService.java
index 404d75c..259f679 100644
--- a/service/src/main/java/io/mifos/identity/internal/service/PermittableGroupService.java
+++ b/service/src/main/java/io/mifos/identity/internal/service/PermittableGroupService.java
@@ -18,7 +18,7 @@
*/
package io.mifos.identity.internal.service;
-import org.apache.fineract.cn.anubis.api.v1.domain.PermittableEndpoint;
+import io.mifos.anubis.api.v1.domain.PermittableEndpoint;
import io.mifos.identity.api.v1.domain.PermittableGroup;
import io.mifos.identity.internal.repository.PermittableType;
import io.mifos.identity.internal.repository.PermittableGroupEntity;
diff --git a/service/src/main/java/io/mifos/identity/internal/service/RoleMapper.java b/service/src/main/java/io/mifos/identity/internal/service/RoleMapper.java
index d5939d4..c19e0f8 100644
--- a/service/src/main/java/io/mifos/identity/internal/service/RoleMapper.java
+++ b/service/src/main/java/io/mifos/identity/internal/service/RoleMapper.java
@@ -18,7 +18,7 @@
*/
package io.mifos.identity.internal.service;
-import org.apache.fineract.cn.anubis.api.v1.domain.AllowedOperation;
+import io.mifos.anubis.api.v1.domain.AllowedOperation;
import io.mifos.identity.api.v1.domain.Permission;
import io.mifos.identity.internal.repository.PermissionType;
import io.mifos.identity.internal.repository.AllowedOperationType;
diff --git a/service/src/main/java/io/mifos/identity/internal/service/TenantService.java b/service/src/main/java/io/mifos/identity/internal/service/TenantService.java
index 5e393b1..05c1f05 100644
--- a/service/src/main/java/io/mifos/identity/internal/service/TenantService.java
+++ b/service/src/main/java/io/mifos/identity/internal/service/TenantService.java
@@ -18,9 +18,9 @@
*/
package io.mifos.identity.internal.service;
-import org.apache.fineract.cn.anubis.api.v1.domain.ApplicationSignatureSet;
-import org.apache.fineract.cn.anubis.api.v1.domain.Signature;
-import org.apache.fineract.cn.anubis.config.TenantSignatureRepository;
+import io.mifos.anubis.api.v1.domain.ApplicationSignatureSet;
+import io.mifos.anubis.api.v1.domain.Signature;
+import io.mifos.anubis.config.TenantSignatureRepository;
import io.mifos.core.lang.security.RsaKeyPairFactory;
import io.mifos.core.lang.security.RsaPrivateKeyBuilder;
import io.mifos.identity.internal.mapper.SignatureMapper;
diff --git a/service/src/main/java/io/mifos/identity/internal/service/UserService.java b/service/src/main/java/io/mifos/identity/internal/service/UserService.java
index 680b279..3a22681 100644
--- a/service/src/main/java/io/mifos/identity/internal/service/UserService.java
+++ b/service/src/main/java/io/mifos/identity/internal/service/UserService.java
@@ -18,7 +18,7 @@
*/
package io.mifos.identity.internal.service;
-import org.apache.fineract.cn.anubis.api.v1.domain.AllowedOperation;
+import io.mifos.anubis.api.v1.domain.AllowedOperation;
import io.mifos.identity.api.v1.PermittableGroupIds;
import io.mifos.identity.api.v1.domain.Permission;
import io.mifos.identity.api.v1.domain.User;
diff --git a/service/src/main/java/io/mifos/identity/rest/ApplicationCallEndpointSetRestController.java b/service/src/main/java/io/mifos/identity/rest/ApplicationCallEndpointSetRestController.java
index 5570d89..9d399b9 100644
--- a/service/src/main/java/io/mifos/identity/rest/ApplicationCallEndpointSetRestController.java
+++ b/service/src/main/java/io/mifos/identity/rest/ApplicationCallEndpointSetRestController.java
@@ -18,8 +18,8 @@
*/
package io.mifos.identity.rest;
-import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType;
-import org.apache.fineract.cn.anubis.annotation.Permittable;
+import io.mifos.anubis.annotation.AcceptedTokenType;
+import io.mifos.anubis.annotation.Permittable;
import io.mifos.core.command.gateway.CommandGateway;
import io.mifos.core.lang.ServiceException;
import io.mifos.identity.api.v1.domain.CallEndpointSet;
diff --git a/service/src/main/java/io/mifos/identity/rest/ApplicationPermissionUserRestController.java b/service/src/main/java/io/mifos/identity/rest/ApplicationPermissionUserRestController.java
index b49a179..2e1b6ba 100644
--- a/service/src/main/java/io/mifos/identity/rest/ApplicationPermissionUserRestController.java
+++ b/service/src/main/java/io/mifos/identity/rest/ApplicationPermissionUserRestController.java
@@ -18,8 +18,8 @@
*/
package io.mifos.identity.rest;
-import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType;
-import org.apache.fineract.cn.anubis.annotation.Permittable;
+import io.mifos.anubis.annotation.AcceptedTokenType;
+import io.mifos.anubis.annotation.Permittable;
import io.mifos.core.command.gateway.CommandGateway;
import io.mifos.core.lang.ServiceException;
import io.mifos.identity.api.v1.PermittableGroupIds;
diff --git a/service/src/main/java/io/mifos/identity/rest/ApplicationRestController.java b/service/src/main/java/io/mifos/identity/rest/ApplicationRestController.java
index bfc75a8..9e72489 100644
--- a/service/src/main/java/io/mifos/identity/rest/ApplicationRestController.java
+++ b/service/src/main/java/io/mifos/identity/rest/ApplicationRestController.java
@@ -19,10 +19,10 @@
package io.mifos.identity.rest;
-import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType;
-import org.apache.fineract.cn.anubis.annotation.Permittable;
-import org.apache.fineract.cn.anubis.api.v1.domain.Signature;
-import org.apache.fineract.cn.anubis.api.v1.validation.ValidKeyTimestamp;
+import io.mifos.anubis.annotation.AcceptedTokenType;
+import io.mifos.anubis.annotation.Permittable;
+import io.mifos.anubis.api.v1.domain.Signature;
+import io.mifos.anubis.api.v1.validation.ValidKeyTimestamp;
import io.mifos.core.command.gateway.CommandGateway;
import io.mifos.core.lang.ServiceException;
import io.mifos.identity.api.v1.PermittableGroupIds;
diff --git a/service/src/main/java/io/mifos/identity/rest/AuthorizationRestController.java b/service/src/main/java/io/mifos/identity/rest/AuthorizationRestController.java
index 28c5ed1..787735a 100644
--- a/service/src/main/java/io/mifos/identity/rest/AuthorizationRestController.java
+++ b/service/src/main/java/io/mifos/identity/rest/AuthorizationRestController.java
@@ -18,10 +18,10 @@
*/
package io.mifos.identity.rest;
-import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType;
-import org.apache.fineract.cn.anubis.annotation.Permittable;
-import org.apache.fineract.cn.anubis.api.v1.TokenConstants;
-import org.apache.fineract.cn.anubis.security.AmitAuthenticationException;
+import io.mifos.anubis.annotation.AcceptedTokenType;
+import io.mifos.anubis.annotation.Permittable;
+import io.mifos.anubis.api.v1.TokenConstants;
+import io.mifos.anubis.security.AmitAuthenticationException;
import io.mifos.core.command.domain.CommandCallback;
import io.mifos.core.command.domain.CommandProcessingException;
import io.mifos.core.command.gateway.CommandGateway;
diff --git a/service/src/main/java/io/mifos/identity/rest/InitializeRestController.java b/service/src/main/java/io/mifos/identity/rest/InitializeRestController.java
index 3739c7d..348ba37 100644
--- a/service/src/main/java/io/mifos/identity/rest/InitializeRestController.java
+++ b/service/src/main/java/io/mifos/identity/rest/InitializeRestController.java
@@ -18,9 +18,9 @@
*/
package io.mifos.identity.rest;
-import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType;
-import org.apache.fineract.cn.anubis.annotation.Permittable;
-import org.apache.fineract.cn.anubis.api.v1.domain.ApplicationSignatureSet;
+import io.mifos.anubis.annotation.AcceptedTokenType;
+import io.mifos.anubis.annotation.Permittable;
+import io.mifos.anubis.api.v1.domain.ApplicationSignatureSet;
import io.mifos.identity.internal.command.handler.Provisioner;
import io.mifos.identity.internal.service.TenantService;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/service/src/main/java/io/mifos/identity/rest/PermittableGroupRestController.java b/service/src/main/java/io/mifos/identity/rest/PermittableGroupRestController.java
index 0c53d50..e434f57 100644
--- a/service/src/main/java/io/mifos/identity/rest/PermittableGroupRestController.java
+++ b/service/src/main/java/io/mifos/identity/rest/PermittableGroupRestController.java
@@ -18,8 +18,8 @@
*/
package io.mifos.identity.rest;
-import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType;
-import org.apache.fineract.cn.anubis.annotation.Permittable;
+import io.mifos.anubis.annotation.AcceptedTokenType;
+import io.mifos.anubis.annotation.Permittable;
import io.mifos.core.command.gateway.CommandGateway;
import io.mifos.core.lang.ServiceException;
import io.mifos.identity.api.v1.PermittableGroupIds;
diff --git a/service/src/main/java/io/mifos/identity/rest/RoleRestController.java b/service/src/main/java/io/mifos/identity/rest/RoleRestController.java
index e4f3d28..7c90969 100644
--- a/service/src/main/java/io/mifos/identity/rest/RoleRestController.java
+++ b/service/src/main/java/io/mifos/identity/rest/RoleRestController.java
@@ -18,8 +18,8 @@
*/
package io.mifos.identity.rest;
-import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType;
-import org.apache.fineract.cn.anubis.annotation.Permittable;
+import io.mifos.anubis.annotation.AcceptedTokenType;
+import io.mifos.anubis.annotation.Permittable;
import io.mifos.core.command.gateway.CommandGateway;
import io.mifos.core.lang.ServiceException;
import io.mifos.identity.api.v1.PermittableGroupIds;
diff --git a/service/src/main/java/io/mifos/identity/rest/UserRestController.java b/service/src/main/java/io/mifos/identity/rest/UserRestController.java
index 8e10c79..5bc2c39 100644
--- a/service/src/main/java/io/mifos/identity/rest/UserRestController.java
+++ b/service/src/main/java/io/mifos/identity/rest/UserRestController.java
@@ -18,8 +18,8 @@
*/
package io.mifos.identity.rest;
-import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType;
-import org.apache.fineract.cn.anubis.annotation.Permittable;
+import io.mifos.anubis.annotation.AcceptedTokenType;
+import io.mifos.anubis.annotation.Permittable;
import io.mifos.core.api.util.UserContextHolder;
import io.mifos.core.command.gateway.CommandGateway;
import io.mifos.core.lang.ServiceException;
