libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

KEYCLOAK-981 Module org.picketlink.federation.bindings doesn't work with EAP6

Browse source
This commit is contained in:
mposolda 2015-01-20 11:13:39 +01:00
parent 1119bb5b8b
commit f592e8b499
5 changed files with 55 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
distribution/modules/build.xml
View file

@ -109,6 +109,10 @@
</module-def> </module-def>
<module-def name="org.picketlink.federation.bindings"> <module-def name="org.picketlink.federation.bindings">
<maven-resource group="org.picketlink" artifact="picketlink-wildfly-common"/> <maven-resource group="org.picketlink" artifact="picketlink-wildfly-common"/>
<maven-resource group="org.picketlink" artifact="picketlink-tomcat-common"/>
<maven-resource group="org.picketlink" artifact="picketlink-tomcat5-single"/>
<maven-resource group="org.picketlink" artifact="picketlink-jbas-common"/>
<maven-resource group="org.picketlink" artifact="picketlink-jbas7-single"/>
</module-def> </module-def>
<module-def name="org.picketlink.idm"> <module-def name="org.picketlink.idm">
<maven-resource group="org.picketlink" artifact="picketlink-idm-impl"/> <maven-resource group="org.picketlink" artifact="picketlink-idm-impl"/>

21
distribution/modules/pom.xml
View file

@ -81,10 +81,31 @@
<groupId>org.picketlink</groupId> <groupId>org.picketlink</groupId>
<artifactId>picketlink-federation</artifactId> <artifactId>picketlink-federation</artifactId>
</dependency> </dependency>
<!-- Wildfly federation binding -->
<dependency> <dependency>
<groupId>org.picketlink</groupId> <groupId>org.picketlink</groupId>
<artifactId>picketlink-wildfly-common</artifactId> <artifactId>picketlink-wildfly-common</artifactId>
</dependency> </dependency>
<!-- AS7/EAP6 federation binding -->
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-tomcat-common</artifactId>
</dependency>
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-tomcat5-single</artifactId>
</dependency>
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-jbas-common</artifactId>
</dependency>
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-jbas7-single</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.picketlink</groupId> <groupId>org.picketlink</groupId>
<artifactId>picketlink-idm-simple-schema</artifactId> <artifactId>picketlink-idm-simple-schema</artifactId>

12
distribution/modules/src/main/resources/modules/org/picketlink/federation/bindings/main/module.xml
View file

@ -29,7 +29,6 @@
<module name="javax.servlet.api" /> <module name="javax.servlet.api" />
<module name="org.jboss.common-core" /> <module name="org.jboss.common-core" />
<module name="org.jboss.logging" /> <module name="org.jboss.logging" />
<module name="org.wildfly.extension.undertow" />
<module name="org.jboss.security.xacml" /> <module name="org.jboss.security.xacml" />
<module name="org.picketbox" /> <module name="org.picketbox" />
<module name="javax.xml.ws.api" /> <module name="javax.xml.ws.api" />
@ -43,11 +42,18 @@
<module name="org.jboss.ws.api" /> <module name="org.jboss.ws.api" />
<module name="org.jboss.ws.spi" /> <module name="org.jboss.ws.spi" />
<module name="org.apache.cxf" /> <module name="org.apache.cxf" />
<module name="io.undertow.core" />
<module name="io.undertow.servlet" />
<module name="org.picketlink.common" /> <module name="org.picketlink.common" />
<module name="org.picketlink.config" /> <module name="org.picketlink.config" />
<module name="org.picketlink.federation" /> <module name="org.picketlink.federation" />
<!-- Wildfly dependencies -->
<module name="org.wildfly.extension.undertow" optional="true" />
<module name="io.undertow.core" optional="true" />
<module name="io.undertow.servlet" optional="true" />
<!-- AS7/EAP6 dependencies -->
<module name="org.jboss.as.web" optional="true"/>
<module name="org.jboss.modules" optional="true"/>
</dependencies> </dependencies>
</module> </module>

2
distribution/modules/src/main/resources/modules/org/picketlink/federation/main/module.xml
View file

@ -29,7 +29,7 @@
<module name="javax.servlet.api" /> <module name="javax.servlet.api" />
<module name="org.jboss.common-core" /> <module name="org.jboss.common-core" />
<module name="org.jboss.logging" /> <module name="org.jboss.logging" />
<module name="org.jboss.as.web-common" /> <module name="org.jboss.as.web-common" optional="true" />
<module name="org.jboss.security.xacml" /> <module name="org.jboss.security.xacml" />
<module name="org.picketbox" /> <module name="org.picketbox" />
<module name="javax.xml.ws.api" /> <module name="javax.xml.ws.api" />

20
pom.xml
View file

@ -260,6 +260,26 @@
<artifactId>picketlink-wildfly-common</artifactId> <artifactId>picketlink-wildfly-common</artifactId>
<version>${picketlink.version}</version> <version>${picketlink.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-tomcat-common</artifactId>
<version>${picketlink.version}</version>
</dependency>
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-tomcat5-single</artifactId>
<version>${picketlink.version}</version>
</dependency>
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-jbas-common</artifactId>
<version>${picketlink.version}</version>
</dependency>
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-jbas7-single</artifactId>
<version>${picketlink.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.picketlink</groupId> <groupId>org.picketlink</groupId>
<artifactId>picketlink-idm-simple-schema</artifactId> <artifactId>picketlink-idm-simple-schema</artifactId>