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

Merge pull request #3976 from stianst/KEYCLOAK-3250-PROD-PROFILE

Browse source 
KEYCLOAK-4659 Changes to adapters for product profile
This commit is contained in:
Stian Thorgersen 2017-03-24 15:34:35 +01:00 committed by GitHub
commit 3ce8da0126
11 changed files with 108 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
adapters/oidc/as7-eap6/as7-subsystem/pom.xml
View file

@ -88,7 +88,6 @@
<dependency> <dependency>
<groupId>org.jboss.logging</groupId> <groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId> <artifactId>jboss-logging</artifactId>
<version>3.1.0.GA</version>
</dependency> </dependency>
<dependency> <dependency>
@ -104,7 +103,6 @@ projects that depend on this project.-->
<dependency> <dependency>
<groupId>org.jboss.msc</groupId> <groupId>org.jboss.msc</groupId>
<artifactId>jboss-msc</artifactId> <artifactId>jboss-msc</artifactId>
<version>1.0.2.GA</version>
</dependency> </dependency>
<dependency> <dependency>

12
adapters/oidc/as7-eap6/pom.xml
View file

@ -30,6 +30,18 @@
<artifactId>keycloak-as7-integration-pom</artifactId> <artifactId>keycloak-as7-integration-pom</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-parent</artifactId>
<version>${jboss.as.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<modules> <modules>
<module>as7-adapter-spi</module> <module>as7-adapter-spi</module>
<module>as7-adapter</module> <module>as7-adapter</module>

2
adapters/oidc/tomcat/tomcat-core/pom.xml
View file

@ -29,8 +29,6 @@
<artifactId>keycloak-tomcat-core-adapter</artifactId> <artifactId>keycloak-tomcat-core-adapter</artifactId>
<name>Keycloak Tomcat Core Integration</name> <name>Keycloak Tomcat Core Integration</name>
<properties> <properties>
<!-- <tomcat.version>8.0.14</tomcat.version> -->
<!-- <tomcat.version>7.0.52</tomcat.version> -->
<tomcat.version>6.0.41</tomcat.version> <tomcat.version>6.0.41</tomcat.version>
</properties> </properties>
<description /> <description />

12
adapters/saml/as7-eap6/pom.xml
View file

@ -30,6 +30,18 @@
<artifactId>keycloak-saml-eap-integration-pom</artifactId> <artifactId>keycloak-saml-eap-integration-pom</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-parent</artifactId>
<version>${jboss.as.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<modules> <modules>
<module>adapter</module> <module>adapter</module>
<module>subsystem</module> <module>subsystem</module>

1
adapters/saml/as7-eap6/subsystem/pom.xml
View file

@ -88,7 +88,6 @@
<dependency> <dependency>
<groupId>org.jboss.logging</groupId> <groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId> <artifactId>jboss-logging</artifactId>
<version>3.1.0.GA</version>
</dependency> </dependency>
<dependency> <dependency>

14
distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml
View file

@ -93,4 +93,18 @@
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>product</id>
<activation>
<property>
<name>product</name>
</property>
</activation>
<build>
<finalName>${product.name}-${product.filename.version}-eap6-adapter</finalName>
</build>
</profile>
</profiles>
</project> </project>

14
distribution/adapters/js-adapter-zip/pom.xml
View file

@ -85,4 +85,18 @@
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>product</id>
<activation>
<property>
<name>product</name>
</property>
</activation>
<build>
<finalName>${product.name}-${product.filename.version}-js-adapter</finalName>
</build>
</profile>
</profiles>
</project> </project>

14
distribution/adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml
View file

@ -90,4 +90,18 @@
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>product</id>
<activation>
<property>
<name>product</name>
</property>
</activation>
<build>
<finalName>${product.name}-${product.filename.version}-eap7-adapter</finalName>
</build>
</profile>
</profiles>
</project> </project>

14
distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/pom.xml
View file

@ -93,4 +93,18 @@
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>product</id>
<activation>
<property>
<name>product</name>
</property>
</activation>
<build>
<finalName>${product.name}-${product.filename.version}-saml-eap6-adapter</finalName>
</build>
</profile>
</profiles>
</project> </project>

14
distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml
View file

@ -90,4 +90,18 @@
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>product</id>
<activation>
<property>
<name>product</name>
</property>
</activation>
<build>
<finalName>${product.name}-${product.filename.version}-saml-eap7-adapter</finalName>
</build>
</profile>
</profiles>
</project> </project>

21
themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js
View file

@ -1012,13 +1012,20 @@ module.controller('LDAPUserStorageCtrl', function($scope, $location, Notificatio
$scope.provider = instance; $scope.provider = instance;
$scope.showSync = false; $scope.showSync = false;
$scope.ldapVendors = [ if (serverInfo.profileInfo.name == 'community') {
{ "id": "ad", "name": "Active Directory" }, $scope.ldapVendors = [
{ "id": "rhds", "name": "Red Hat Directory Server" }, {"id": "ad", "name": "Active Directory"},
{ "id": "tivoli", "name": "Tivoli" }, {"id": "rhds", "name": "Red Hat Directory Server"},
{ "id": "edirectory", "name": "Novell eDirectory" }, {"id": "tivoli", "name": "Tivoli"},
{ "id": "other", "name": "Other" } {"id": "edirectory", "name": "Novell eDirectory"},
]; {"id": "other", "name": "Other"}
];
} else {
$scope.ldapVendors = [
{"id": "ad", "name": "Active Directory"},
{"id": "rhds", "name": "Red Hat Directory Server"}
];
}
$scope.authTypes = [ $scope.authTypes = [
{ "id": "none", "name": "none" }, { "id": "none", "name": "none" },