Commit 0b032f1f authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents 3d3a7433 79083619

README.md

+4 −0
Original line number Diff line number Diff line
@@ -29,6 +29,10 @@ grant codeBase "file:${catalina.base}/ext/-" { 
}

```



### Dependencies



This extension requires the [`multiext-activiti-app-ext`](https://git.inteligr8.com/inteligr8/multiext-activiti-app-ext).  Without it, APS will fail to startup.  It is very small and requires no additional configuration.



## Support Matrix



| Auth Activiti App Extension | Activiti App    |

pom.xml

+295 −294
Original line number Diff line number Diff line
@@ -2,13 +2,14 @@ 
		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>auth-activiti-app-ext</artifactId>

	<version>2.0.0</version>

	<version>2.0.1</version>



	<name>Authentication &amp; Authorization for APS</name>

	<description>An Alfresco Process Service App extension providing improved authentication and authorization support.</description>

	<url>https://bitbucket.org/inteligr8/auth-activiti-app-ext</url>

	<url>https://git.inteligr8.com/inteligr8/auth-activiti-app-ext</url>



	<licenses>

		<license>
@@ -18,9 +19,9 @@ 
	</licenses>



	<scm>

		<connection>scm:git:https://bitbucket.org/inteligr8/auth-activiti-app-ext.git</connection>

		<developerConnection>scm:git:git@bitbucket.org:inteligr8/auth-activiti-app-ext.git</developerConnection>

		<url>https://bitbucket.org/inteligr8/auth-activiti-app-ext</url>

		<connection>scm:git:https://git.inteligr8.com/inteligr8/auth-activiti-app-ext.git</connection>

		<developerConnection>scm:git:git@git.inteligr8.com:inteligr8/auth-activiti-app-ext.git</developerConnection>

		<url>https://git.inteligr8.com/inteligr8/auth-activiti-app-ext</url>

	</scm>

	<organization>

		<name>Inteligr8</name>

src/main/java/com/inteligr8/activiti/auth/Bootstrapper.java

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
package com.inteligr8.activiti.auth;



import java.util.Map;

import java.util.Map.Entry;



import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.context.ApplicationContext;

import org.springframework.context.annotation.Primary;

import org.springframework.stereotype.Component;



import com.activiti.api.boot.BootstrapConfigurer;



@Component("bootstrap.proxy")

@Primary

public class Bootstrapper implements BootstrapConfigurer {

    

    private final Logger logger = LoggerFactory.getLogger(this.getClass());

    

    @Override

    public void applicationContextInitialized(ApplicationContext applicationContext) {

        Map<String, BootstrapConfigurer> bootstraps = applicationContext.getBeansOfType(BootstrapConfigurer.class);

        bootstraps.remove("bootstrap.proxy");

        

        this.logger.debug("Executing {} bootstrap configurers", bootstraps.size());

        for (Entry<String, BootstrapConfigurer> bootstrap : bootstraps.entrySet()) {

            this.logger.trace("Executing bootstrap configurer: {}: {}", bootstrap.getKey(), bootstrap.getValue().getClass());

            bootstrap.getValue().applicationContextInitialized(applicationContext);

        }

    }



}

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

+35 −35

File changed.

Contains only whitespace changes.