v1.3.2 pom

pom.xml

@@ -2,11 +2,9 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-
 	<groupId>com.inteligr8.activiti</groupId>
 	<artifactId>keycloak-activiti-app-ext</artifactId>
-	<version>1.3-SNAPSHOT</version>
-
+	<version>1.3.2</version>
 	<name>Keycloak Authentication &amp; Authorization for APS</name>
 	<description>An Alfresco Process Service App extension providing improved Keycloak/AIS support.</description>
 	<url>https://bitbucket.org/inteligr8/keycloak-activiti-app-ext</url>

src/main/java/com/activiti/conf/ActivitiOotbSecurityConfigurationAdapter.java

@@ -22,12 +22,12 @@ import org.springframework.security.config.annotation.authentication.builders.Au
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.stereotype.Component;
 
-import com.inteligr8.activiti.ActivitiSecurityConfigAdapter;
+import com.inteligr8.activiti.security.ActivitiSecurityConfigAdapter;
 
 /**
  * This class/bean executes the OOTB security configuration without the
  * override, so you can still use its OOTB features.  This will allow you to
- * enable/disable features, chain them, and uset he OOTB features as a
+ * enable/disable features, chain them, and unset the OOTB features as a
  * fallback or failsafe.
  * 
  * This class must be in the com.activiti.conf package so it can use protected

src/main/java/com/activiti/extension/conf/KeycloakExtSpringComponentScanner.java

@@ -16,6 +16,7 @@ package com.activiti.extension.conf;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FullyQualifiedAnnotationBeanNameGenerator;
 
 /**
  * A means for injecting packages to scan for the Spring context.
@@ -23,7 +24,14 @@ import org.springframework.context.annotation.Configuration;
  * @author brian@inteligr8.com
  */
 @Configuration
-@ComponentScan(basePackages = {"com.inteligr8.activiti"})
+@ComponentScan(
+    basePackages = {
+        "com.inteligr8.activiti.idm",
+        "com.inteligr8.activiti.keycloak",
+        "com.inteligr8.activiti.security"
+    },
+    nameGenerator = FullyQualifiedAnnotationBeanNameGenerator.class
+)
 public class KeycloakExtSpringComponentScanner {
 
 }

src/main/java/com/inteligr8/activiti/ais/IdentityServiceSecurityConfigurationAdapter.java

@@ -27,7 +27,7 @@ import org.springframework.stereotype.Component;
 import com.activiti.api.msmt.MsmtTenantResolver;
 import com.activiti.conf.MsmtProperties;
 import com.activiti.security.identity.service.authentication.provider.IdentityServiceAuthenticationProvider;
-import com.inteligr8.activiti.ActivitiSecurityConfigAdapter;
+import com.inteligr8.activiti.security.ActivitiSecurityConfigAdapter;
 import com.inteligr8.activiti.auth.Authenticator;
 import com.inteligr8.activiti.auth.InterceptingAuthenticationProvider;
 

src/main/java/com/inteligr8/activiti/idm/ActivitiAppAdminGroupFixer.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.inteligr8.activiti;
+package com.inteligr8.activiti.idm;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -32,6 +32,8 @@ import com.activiti.domain.idm.Group;
 import com.activiti.domain.idm.GroupCapability;
 import com.activiti.domain.idm.Tenant;
 import com.activiti.service.api.GroupService;
+import com.inteligr8.activiti.DataFixer;
+import com.inteligr8.activiti.keycloak.TenantFinderService;
 
 /**
  * This class/bean attempts to fix the administrative group in APS.  This may

src/main/java/com/inteligr8/activiti/idm/ActivitiAppAdminMembersFixer.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.inteligr8.activiti;
+package com.inteligr8.activiti.idm;
 
 import java.util.Arrays;
 import java.util.List;
@@ -29,6 +29,8 @@ import com.activiti.domain.idm.Group;
 import com.activiti.domain.idm.User;
 import com.activiti.service.api.GroupService;
 import com.activiti.service.api.UserService;
+import com.inteligr8.activiti.DataFixer;
+import com.inteligr8.activiti.keycloak.TenantFinderService;
 
 /**
  * This class/bean attempts to add administrators to the administrative group

src/main/java/com/inteligr8/activiti/idm/ActivitiAppAdminPasswordFixer.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.inteligr8.activiti;
+package com.inteligr8.activiti.idm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,6 +22,8 @@ import org.springframework.stereotype.Component;
 
 import com.activiti.domain.idm.User;
 import com.activiti.service.api.UserService;
+import com.inteligr8.activiti.DataFixer;
+import com.inteligr8.activiti.keycloak.TenantFinderService;
 
 /**
  * This class/bean attempts to reset the configured user's password.

src/main/java/com/inteligr8/activiti/keycloak/KeycloakActivitiAppAuthenticator.java

@@ -41,7 +41,6 @@ import com.activiti.domain.idm.Group;
 import com.activiti.domain.idm.User;
 import com.activiti.service.api.GroupService;
 import com.activiti.service.api.UserService;
-import com.inteligr8.activiti.TenantFinderService;
 
 /**
  * This class/bean implements an Open ID Connect authenticator for Alfresco

src/main/java/com/inteligr8/activiti/keycloak/KeycloakSecurityConfigurationAdapter.java

@@ -25,9 +25,9 @@ import org.springframework.security.core.authority.mapping.SimpleAuthorityMapper
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.stereotype.Component;
 
-import com.inteligr8.activiti.ActivitiSecurityConfigAdapter;
 import com.inteligr8.activiti.auth.Authenticator;
 import com.inteligr8.activiti.auth.InterceptingAuthenticationProvider;
+import com.inteligr8.activiti.security.ActivitiSecurityConfigAdapter;
 
 /**
  * This class/bean injects a custom keycloak authentication provider into the

src/main/java/com/inteligr8/activiti/keycloak/TenantFinderService.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.inteligr8.activiti;
+package com.inteligr8.activiti.keycloak;
 
 import java.util.ArrayList;
 import java.util.Collection;

src/main/java/com/inteligr8/activiti/security/ActivitiSecurityConfigAdapter.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.inteligr8.activiti;
+package com.inteligr8.activiti.security;
 
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.core.userdetails.UserDetailsService;

src/main/java/com/inteligr8/activiti/security/Inteligr8SecurityConfigurationRegistry.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.inteligr8.activiti;
+package com.inteligr8.activiti.security;
 
 import java.util.Collections;
 import java.util.List;
@@ -25,6 +25,7 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.stereotype.Component;
 
 import com.activiti.api.security.AlfrescoSecurityConfigOverride;
+import com.inteligr8.activiti.DataFixer;
 
 /**
  * This class/bean overrides the APS security configuration with a collection