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

KEYCLOAK-4123: keycloak-install.cli fails if not run from bin dir

Browse source
This commit is contained in:
Stan Silvert 2017-01-05 21:25:41 -05:00
parent 56160ef12b
commit eb1b011989
4 changed files with 38 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
distribution/server-overlay/assembly.xml
View file

@ -84,7 +84,7 @@
<outputDirectory></outputDirectory> <outputDirectory></outputDirectory>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>src/main/cli</directory> <directory>${project.build.directory}/cli</directory>
<includes> <includes>
<include>*.cli</include> <include>*.cli</include>
</includes> </includes>
@ -107,11 +107,6 @@
<outputDirectory>bin</outputDirectory> <outputDirectory>bin</outputDirectory>
<destName>add-user-keycloak.bat</destName> <destName>add-user-keycloak.bat</destName>
</file> </file>
<file>
<source>${project.build.directory}/cli/default-keycloak-subsys-config.cli</source>
<outputDirectory>bin</outputDirectory>
<destName>default-keycloak-subsys-config.cli</destName>
</file>
</files> </files>
</assembly> </assembly>

37
distribution/server-overlay/pom.xml
View file

@ -129,6 +129,43 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<inherited>false</inherited>
<executions>
<execution>
<id>merge-cli</id>
<phase>prepare-package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<concat destfile="${project.build.directory}/cli/keycloak-install.cli" force="yes">
<fileset dir="${project.build.directory}/cli">
<include name="keycloak-install-base.cli"/>
</fileset>
<fileset dir="${project.build.directory}/cli">
<include name="default-keycloak-subsys-config.cli"/>
</fileset>
</concat>
<concat destfile="${project.build.directory}/cli/keycloak-install-ha.cli" force="yes">
<fileset dir="${project.build.directory}/cli">
<include name="keycloak-install-ha-base.cli"/>
</fileset>
<fileset dir="${project.build.directory}/cli">
<include name="default-keycloak-subsys-config.cli"/>
</fileset>
</concat>
<delete file="${project.build.directory}/cli/default-keycloak-subsys-config.cli"/>
<delete file="${project.build.directory}/cli/keycloak-install-base.cli"/>
<delete file="${project.build.directory}/cli/keycloak-install-ha-base.cli"/>
</target>
</configuration>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>

1
distribution/server-overlay/src/main/cli/keycloak-install.cli → distribution/server-overlay/src/main/cli/keycloak-install-base.cli
View file

@ -15,4 +15,3 @@ embed-server --server-config=standalone.xml
/subsystem=infinispan/cache-container=keycloak/local-cache=keys/eviction=EVICTION:add(max-entries=1000,strategy=LRU) /subsystem=infinispan/cache-container=keycloak/local-cache=keys/eviction=EVICTION:add(max-entries=1000,strategy=LRU)
/subsystem=infinispan/cache-container=keycloak/local-cache=keys/expiration=EXPIRATION:add(max-idle=3600000) /subsystem=infinispan/cache-container=keycloak/local-cache=keys/expiration=EXPIRATION:add(max-idle=3600000)
/extension=org.keycloak.keycloak-server-subsystem/:add(module=org.keycloak.keycloak-server-subsystem) /extension=org.keycloak.keycloak-server-subsystem/:add(module=org.keycloak.keycloak-server-subsystem)
run-batch --file=default-keycloak-subsys-config.cli

1
distribution/server-overlay/src/main/cli/keycloak-install-ha.cli → distribution/server-overlay/src/main/cli/keycloak-install-ha-base.cli
View file

@ -15,4 +15,3 @@ embed-server --server-config=standalone-ha.xml
/subsystem=infinispan/cache-container=keycloak/local-cache=keys/eviction=EVICTION:add(max-entries=1000,strategy=LRU) /subsystem=infinispan/cache-container=keycloak/local-cache=keys/eviction=EVICTION:add(max-entries=1000,strategy=LRU)
/subsystem=infinispan/cache-container=keycloak/local-cache=keys/expiration=EXPIRATION:add(max-idle=3600000) /subsystem=infinispan/cache-container=keycloak/local-cache=keys/expiration=EXPIRATION:add(max-idle=3600000)
/extension=org.keycloak.keycloak-server-subsystem/:add(module=org.keycloak.keycloak-server-subsystem) /extension=org.keycloak.keycloak-server-subsystem/:add(module=org.keycloak.keycloak-server-subsystem)
run-batch --file=default-keycloak-subsys-config.cli