From 723b1bd2df194b640e3a5d2e92175803dc9bc494 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 04 Mar 2016 14:50:52 +0000
Subject: [PATCH] OPENDJ-2741 Fix maven default lifecycle
---
opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateConfigMojo.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateConfigMojo.java b/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateConfigMojo.java
index ae7e9d8..2711cb0 100644
--- a/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateConfigMojo.java
+++ b/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateConfigMojo.java
@@ -430,7 +430,16 @@
}
final URL url = getClass().getClassLoader().getResource(parentPath);
- loadXMLDescriptorsFromJar(parentPath, ((JarURLConnection) url.openConnection()).getJarFile());
+ final String protocol = url.getProtocol();
+ if ("file".equals(protocol)) {
+ loadXMLDescriptorsFromFolder(parentPath);
+ } else if ("jar".equals(protocol)) {
+ loadXMLDescriptorsFromJar(parentPath, ((JarURLConnection) url.openConnection()).getJarFile());
+ } else {
+ final String errorMsg = "Impossible to read XML descriptors from path '" + parentPath + "'";
+ getLog().error(errorMsg);
+ throw new MojoExecutionException(errorMsg);
+ }
}
private void loadXMLDescriptorsFromFolder(final String parentPath) {
--
Gitblit v1.10.0