From af999bde6feb5ead2c483a43f68f31f2c713839a Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Fri, 21 Jun 2013 08:31:53 +0000
Subject: [PATCH] Additional fix for OPENDJ-987: Determine what to do with links to http://opendj.forgerock.org/
---
opendj3/pom.xml | 60 +++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 39 insertions(+), 21 deletions(-)
diff --git a/opendj3/pom.xml b/opendj3/pom.xml
index 9e210f1..d230467 100644
--- a/opendj3/pom.xml
+++ b/opendj3/pom.xml
@@ -135,30 +135,48 @@
<configRefBase>http://opendj.forgerock.org/opendj-server/configref/</configRefBase>
<serverJavadocBase>http://opendj.forgerock.org/opendj-server/javadoc/</serverJavadocBase>
<sdkJavadocBase>http://opendj.forgerock.org/opendj-ldap-sdk/apidocs/</sdkJavadocBase>
+
+ <!-- Filtered docbkx sources -->
+ <docbkxSourceDirectory>target/docbkx-filtered</docbkxSourceDirectory>
</properties>
<build>
-
- <!-- Filter XML to allow ${property} in attribute values. -->
- <resources>
- <resource>
- <directory>src/main/docbkx</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/docbkx</directory>
- <filtering>false</filtering>
- <excludes>
- <exclude>**/*.xml</exclude>
- </excludes>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>filter-docbkx-resources</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <inherited>false</inherited>
+ <configuration>
+ <!-- Filter XML to allow ${property} in attribute values. -->
+ <outputDirectory>${docbkxSourceDirectory}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/docbkx</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/docbkx</directory>
+ <filtering>false</filtering>
+ <excludes>
+ <exclude>**/*.xml</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
@@ -189,7 +207,7 @@
<version>${frDocPluginVersion}</version>
<inherited>false</inherited>
<configuration>
- <docbkxSourceDirectory>target/classes</docbkxSourceDirectory> <!-- Use filtered XML -->
+ <docbkxSourceDirectory>${docbkxSourceDirectory}</docbkxSourceDirectory> <!-- Use filtered XML -->
<projectName>OpenDJ</projectName>
<googleAnalyticsId>${gaId}</googleAnalyticsId>
</configuration>
@@ -476,4 +494,4 @@
<distribution>repo</distribution>
</license>
</licenses>
-</project>
\ No newline at end of file
+</project>
--
Gitblit v1.10.0