Commit cd472b92 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents bf848b00 e7f2e2ee

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

+2 −2
Original line number Diff line number Diff line
@@ -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

+9 −1
Original line number Diff line number Diff line
@@ -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/ActivitiAppAdminGroupFixer.java→src/main/java/com/inteligr8/activiti/idm/ActivitiAppAdminGroupFixer.java

+3 −1
Original line number Diff line number Diff line
@@ -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/ActivitiAppAdminMembersFixer.java→src/main/java/com/inteligr8/activiti/idm/ActivitiAppAdminMembersFixer.java

+3 −1
Original line number Diff line number Diff line
@@ -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/ActivitiAppAdminPasswordFixer.java→src/main/java/com/inteligr8/activiti/idm/ActivitiAppAdminPasswordFixer.java

+3 −1
Original line number Diff line number Diff line
@@ -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.