From 4d214cb668baa00a6e1464472517109bfd0a5968 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 13 Mar 2015 16:29:14 +0000
Subject: [PATCH] OPENDJ-1773: Remove duplicated config xml files
---
opendj-server-legacy/pom.xml | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index f7c2a94..75d28c3 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -79,6 +79,8 @@
<!-- Other properties -->
<checkstyleHeaderLocation>org/forgerock/checkstyle/opendj-java-header</checkstyleHeaderLocation>
<maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
+ <!-- Could be removed once migration to new config framework will be done-->
+ <old.config.files.path>${project.build.directory}/config/admin/defn/org/opends/server/admin/std</old.config.files.path>
</properties>
@@ -285,6 +287,35 @@
</configuration>
</plugin>
+ <!-- Unpack configuration files from opendj-maven-plugin -->
+ <!-- This plugin could be removed once the migration to the new config framework will be done -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>${project.build.directory}/config/admin/defn/org/opends/server/admin/std</outputDirectory>
+ <includes>config/xml/**/*.xml</includes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<!-- Generate i18n messages -->
<plugin>
<groupId>org.forgerock.commons</groupId>
@@ -988,6 +1019,30 @@
<executions>
<execution>
<!-- Temporary solution for configuration classes until migration to new config framework -->
+ <!-- Change package name and XML namespaces references to match the old config framework -->
+ <id>configure-config-files</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <target>
+ <move todir="${old.config.files.path}">
+ <fileset dir="${old.config.files.path}/config/xml/org/forgerock/opendj/server/config/" />
+ </move>
+ <delete dir="${old.config.files.path}/config" />
+ <replace dir="${old.config.files.path}"
+ token="org.forgerock.opendj.server.config"
+ value="org.opends.server.admin.std"/>
+ <replace dir="${old.config.files.path}"
+ token="http://opendj.forgerock.org/admin"
+ value="http://www.opends.org/admin"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ <execution>
+ <!-- Temporary solution for configuration classes until migration to new config framework -->
<id>generate-config</id>
<phase>generate-sources</phase>
<configuration>
--
Gitblit v1.10.0