From 0cad65eedd27048bf352b1ef565927fbac7e141b Mon Sep 17 00:00:00 2001
From: vharseko <vharseko@openam.org.ru>
Date: Thu, 01 Mar 2018 13:54:06 +0000
Subject: [PATCH] restore path for docuemntation assembly
---
opendj-doc-generated-ref/src/main/assembly/server-tools-man-page-sources-assembly.xml | 2
opendj-doc-generated-ref/pom.xml | 69 +++++++++++++++++-----------------
opendj-doc-generated-ref/src/main/assembly/server-tools-man-pages-assembly.xml | 2
3 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/opendj-doc-generated-ref/pom.xml b/opendj-doc-generated-ref/pom.xml
index 6e275b4..0ea5d9a 100644
--- a/opendj-doc-generated-ref/pom.xml
+++ b/opendj-doc-generated-ref/pom.xml
@@ -578,46 +578,45 @@
</plugin>
<!-- Format man pages -->
-<!-- <plugin> -->
-<!-- <groupId>org.forgerock.commons</groupId> -->
-<!-- <artifactId>forgerock-doc-maven-plugin</artifactId> -->
-<!-- <version>${forgerock-doc-plugin.version}</version> -->
-<!-- <executions> -->
-<!-- <execution> -->
-<!-- <id>build-man-pages</id> -->
-<!-- <phase>package</phase> -->
-<!-- <goals> -->
-<!-- <goal>process</goal> -->
-<!-- <goal>build</goal> -->
-<!-- </goals> -->
-<!-- <configuration> -->
-<!-- <projectName>OpenDJ</projectName> -->
-<!-- <projectVersion>${project.version}</projectVersion> -->
-<!-- <releaseVersion>${project.version}</releaseVersion> -->
-<!-- <formats combine.self="override"> -->
-<!-- <format>man</format> -->
-<!-- </formats> -->
-<!-- </configuration> -->
-<!-- </execution> -->
-<!-- </executions> -->
-<!-- </plugin> -->
+ <plugin>
+ <groupId>org.forgerock.commons</groupId>
+ <artifactId>forgerock-doc-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build-man-pages</id>
+ <phase>package</phase>
+ <goals>
+ <goal>process</goal>
+ <goal>build</goal>
+ </goals>
+ <configuration>
+ <projectName>OpenDJ</projectName>
+ <projectVersion>${project.version}</projectVersion>
+ <releaseVersion>${project.version}</releaseVersion>
+ <formats combine.self="override">
+ <format>man</format>
+ </formats>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<!-- Generate Artifacts -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
-<!-- <execution> -->
-<!-- <id>sdk-tools-man-pages</id> -->
-<!-- <goals> -->
-<!-- <goal>single</goal> -->
-<!-- </goals> -->
-<!-- <phase>package</phase> -->
-<!-- <configuration> -->
-<!-- <descriptors> -->
-<!-- <descriptor>src/main/assembly/sdk-tools-man-pages-assembly.xml</descriptor> -->
-<!-- </descriptors> -->
-<!-- </configuration> -->
-<!-- </execution> -->
+ <execution>
+ <id>sdk-tools-man-pages</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/sdk-tools-man-pages-assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
<execution>
<id>server-tools-man-pages-sources</id>
diff --git a/opendj-doc-generated-ref/src/main/assembly/server-tools-man-page-sources-assembly.xml b/opendj-doc-generated-ref/src/main/assembly/server-tools-man-page-sources-assembly.xml
index ec9f9b1..e39ced4 100644
--- a/opendj-doc-generated-ref/src/main/assembly/server-tools-man-page-sources-assembly.xml
+++ b/opendj-doc-generated-ref/src/main/assembly/server-tools-man-page-sources-assembly.xml
@@ -27,7 +27,7 @@
<fileSets>
<fileSet>
- <directory>${project.build.directory}/../src/main/docbkx/man-pages</directory>
+ <directory>${project.build.directory}/docbkx-sources/man-pages</directory>
<outputDirectory />
</fileSet>
</fileSets>
diff --git a/opendj-doc-generated-ref/src/main/assembly/server-tools-man-pages-assembly.xml b/opendj-doc-generated-ref/src/main/assembly/server-tools-man-pages-assembly.xml
index 9b06de5..bdefcf6 100644
--- a/opendj-doc-generated-ref/src/main/assembly/server-tools-man-pages-assembly.xml
+++ b/opendj-doc-generated-ref/src/main/assembly/server-tools-man-pages-assembly.xml
@@ -27,7 +27,7 @@
<fileSets>
<fileSet>
- <directory>${project.build.directory}/docbkx-sources/man-pages</directory>
+ <directory>${project.build.directory}/docbkx/manpages/man-pages</directory>
<outputDirectory />
</fileSet>
</fileSets>
--
Gitblit v1.10.0