libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

Fixed loading of resources in KeycloakServer when running using Maven

Browse source
This commit is contained in:
Stian Thorgersen 2013-10-15 11:03:17 +01:00
parent 91297f1ffd
commit 7194276a34
2 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
testsuite/integration/pom.xml
View file

@ -200,6 +200,13 @@
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
<workingDirectory>${project.basedir}</workingDirectory>
</configuration>
</plugin>
</plugins>
</build>

31
testsuite/integration/src/main/java/org/keycloak/testutils/KeycloakServer.java
View file

@ -117,17 +117,27 @@ public class KeycloakServer {
if (System.getProperties().containsKey("resources")) {
String resources = System.getProperty("resources");
if (resources == null || resources.equals("")) {
for (String c : System.getProperty("java.class.path").split(File.pathSeparator)) {
if (c.contains(File.separator + "testsuite" + File.separator + "integration")) {
config.setResourcesHome(c.replaceFirst("testsuite.integration.*", ""));
if (resources == null || resources.equals("") || resources.equals("true")) {
if (System.getProperties().containsKey("maven.home")) {
resources = System.getProperty("user.dir").replaceFirst("testsuite.integration.*", "");
} else {
for (String c : System.getProperty("java.class.path").split(File.pathSeparator)) {
if (c.contains(File.separator + "testsuite" + File.separator + "integration")) {
resources = c.replaceFirst("testsuite.integration.*", "");
}
}
}
} else {
config.setResourcesHome(resources);
}
File dir = new File(resources).getAbsoluteFile();
if (!dir.isDirectory() || !new File(dir, "admin-ui").isDirectory()) {
throw new RuntimeException("Invalid resources directory");
}
config.setResourcesHome(dir.getAbsolutePath());
}
final KeycloakServer keycloak = new KeycloakServer(config);
keycloak.sysout = true;
keycloak.start();
@ -309,9 +319,9 @@ public class KeycloakServer {
if (path.startsWith("/forms")) {
file = file(resourcesHome, "forms", "src", "main", "resources", "META-INF", "resources", path.replace('/', File.separatorChar));
} else if (path.startsWith("/admin")) {
file = file(resourcesHome, "admin-ui", "src", "main", "resources", "META-INF", "resources", path.replace('/', File.separatorChar));
file = file(resourcesHome, "admin-ui", "src", "main", "resources", "META-INF", "resources", path.replace('/', File.separatorChar));
if (!file.isFile()) {
file = file(resourcesHome, "admin-ui-styles", "src", "main", "resources", "META-INF", "resources", path.replace('/', File.separatorChar));
file = file(resourcesHome, "admin-ui-styles", "src", "main", "resources", "META-INF", "resources", path.replace('/', File.separatorChar));
}
} else {
throw new IOException("Unknown resource " + path);
@ -323,10 +333,9 @@ public class KeycloakServer {
private static File file(String... path) {
StringBuilder s = new StringBuilder();
s.append(path[0]);
for (int i = 1; i < path.length; i++) {
for (String p : path) {
s.append(File.separator);
s.append(path[i]);
s.append(p);
}
return new File(s.toString());
}