You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by fe...@apache.org on 2011/12/09 22:56:57 UTC
svn commit: r1212658 - in /directory/documentation/ldap-api-manuals/trunk:
pom.xml src/main/assembly/.ldap-api-user-guide.xml.swp
src/main/assembly/ldap-api-user-guide.xml
Author: felixk
Date: Fri Dec 9 21:56:57 2011
New Revision: 1212658
URL: http://svn.apache.org/viewvc?rev=1212658&view=rev
Log:
There is no other documentation to generate.
Fix zip file generation.
Removed:
directory/documentation/ldap-api-manuals/trunk/src/main/assembly/.ldap-api-user-guide.xml.swp
Modified:
directory/documentation/ldap-api-manuals/trunk/pom.xml
directory/documentation/ldap-api-manuals/trunk/src/main/assembly/ldap-api-user-guide.xml
Modified: directory/documentation/ldap-api-manuals/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/documentation/ldap-api-manuals/trunk/pom.xml?rev=1212658&r1=1212657&r2=1212658&view=diff
==============================================================================
--- directory/documentation/ldap-api-manuals/trunk/pom.xml (original)
+++ directory/documentation/ldap-api-manuals/trunk/pom.xml Fri Dec 9 21:56:57 2011
@@ -210,7 +210,7 @@ under the License.
<executions>
<execution>
- <id>gen-html-basic-confluence</id>
+ <id>gen-html-ldap-api-confluence</id>
<phase>pre-site</phase>
<goals>
<goal>generate-html</goal>
@@ -241,7 +241,7 @@ under the License.
</execution>
<execution>
- <id>gen-pdf-basic-confluence</id>
+ <id>gen-pdf-ldap-api-confluence</id>
<phase>pre-site</phase>
<goals>
<goal>generate-pdf</goal>
@@ -254,98 +254,6 @@ under the License.
<admonGraphicsPath>${project.build.directory}/docbook-xsl/docbook/images/</admonGraphicsPath>
</configuration>
</execution>
-
- <execution>
- <id>gen-html-basic</id>
- <phase>pre-site</phase>
- <goals>
- <goal>generate-html</goal>
- </goals>
- <configuration>
- <!-- per execution configuration -->
- <sourceDirectory>${basedir}/src/ldap-api-user-guide</sourceDirectory>
- <targetDirectory>${project.build.directory}/docbook/manuals/ldap-api-user-guide-${project.version}/html</targetDirectory>
- <imgSrcPath>${basedir}/src/ldap-api-user-guide/images/</imgSrcPath>
- <postProcess>
- <!-- Copy the images -->
- <copy todir="${project.build.directory}/docbook/manuals/ldap-api-user-guide-${project.version}/html/images">
- <fileset dir="${basedir}/src/ldap-api-user-guide/images" />
- </copy>
- <copy todir="${project.build.directory}/docbook/manuals/ldap-api-user-guide-${project.version}/html/images">
- <fileset dir="${project.build.directory}/docbook-xsl/docbook/images" />
- </copy>
- <!-- Copy the css -->
- <copy todir="${project.build.directory}/docbook/manuals/ldap-api-user-guide-${project.version}/html">
- <fileset dir="${basedir}/src/main/resources/css" />
- </copy>
- <!-- Copy the data -->
- <copy todir="${project.build.directory}/docbook/manuals/ldap-api-user-guide-${project.version}/html/data">
- <fileset dir="${basedir}/src/ldap-api-user-guide/data" />
- </copy>
- </postProcess>
- </configuration>
- </execution>
-
- <execution>
- <id>gen-pdf-basic</id>
- <phase>pre-site</phase>
- <goals>
- <goal>generate-pdf</goal>
- </goals>
- <configuration>
- <!-- per execution configuration -->
- <sourceDirectory>${basedir}/src/ldap-api-user-guide</sourceDirectory>
- <targetDirectory>${project.build.directory}/docbook/manuals/ldap-api-user-guide-${project.version}/pdf</targetDirectory>
- <imgSrcPath>${basedir}/src/ldap-api-user-guide/images/</imgSrcPath>
- <admonGraphicsPath>${project.build.directory}/docbook-xsl/docbook/images/</admonGraphicsPath>
- </configuration>
- </execution>
-
- <execution>
- <id>gen-html-api</id>
- <phase>pre-site</phase>
- <goals>
- <goal>generate-html</goal>
- </goals>
- <configuration>
- <!-- per execution configuration -->
- <sourceDirectory>${basedir}/src/ldap-api-user-guide</sourceDirectory>
- <targetDirectory>${project.build.directory}/docbook/manuals/ldap-api-user-guide-${project.version}/html</targetDirectory>
- <imgSrcPath>${basedir}/src/ldap-api-user-guide/images/</imgSrcPath>
- <postProcess>
- <!-- Copy the images -->
- <copy todir="${project.build.directory}/docbook/manuals/ldap-api-user-guide-${project.version}/html/images">
- <fileset dir="${basedir}/src/ldap-api-user-guide/images" />
- </copy>
- <copy todir="${project.build.directory}/docbook/manuals/ldap-api-user-guide-${project.version}/html/images">
- <fileset dir="${project.build.directory}/docbook-xsl/docbook/images" />
- </copy>
- <!-- Copy the css -->
- <copy todir="${project.build.directory}/docbook/manuals/ldap-api-user-guide-${project.version}/html">
- <fileset dir="${basedir}/src/main/resources/css" />
- </copy>
- <!-- Copy the data -->
- <copy todir="${project.build.directory}/docbook/manuals/ldap-api-user-guide-${project.version}/html/data">
- <fileset dir="${basedir}/src/ldap-api-user-guide/data" />
- </copy>
- </postProcess>
- </configuration>
- </execution>
-
- <execution>
- <id>gen-pdf-ldap-api</id>
- <phase>pre-site</phase>
- <goals>
- <goal>generate-pdf</goal>
- </goals>
- <configuration>
- <!-- per execution configuration -->
- <sourceDirectory>${basedir}/src/ldap-api-user-guide</sourceDirectory>
- <targetDirectory>${project.build.directory}/docbook/manuals/ldap-api-user-guide-${project.version}/pdf</targetDirectory>
- <imgSrcPath>${basedir}/src/ldap-api-user-guide/images/</imgSrcPath>
- <admonGraphicsPath>${project.build.directory}/docbook-xsl/docbook/images/</admonGraphicsPath>
- </configuration>
- </execution>
</executions>
</plugin>
@@ -353,32 +261,18 @@ under the License.
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>gen-basic-zip</id>
+ <id>gen-ldap-api-confluence-zip</id>
<phase>pre-site</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
- <finalName>apacheds-${project.version}</finalName>
+ <finalName>ldap-apiuser-guide-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>${basedir}/src/main/assembly/ldap-api-user-guide.xml</descriptor>
</descriptors>
- <outputDirectory>${project.build.directory}/docbook/manuals/ldap-api-user-guide-${project.version}/zip</outputDirectory>
- </configuration>
- </execution>
-
- <execution>
- <id>gen-advanced-zip</id>
- <phase>pre-site</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <finalName>apacheds-${project.version}</finalName>
- <descriptors>
- <descriptor>${basedir}/src/main/assembly/advanced-user-guide.xml</descriptor>
- </descriptors>
- <outputDirectory>${project.build.directory}/docbook/manuals/advanced-user-guide-${project.version}/zip</outputDirectory>
+ <outputDirectory>${project.build.directory}/docbook/manuals/ldap-api-user-guide-confluence-${project.version}/zip</outputDirectory>
</configuration>
</execution>
</executions>
Modified: directory/documentation/ldap-api-manuals/trunk/src/main/assembly/ldap-api-user-guide.xml
URL: http://svn.apache.org/viewvc/directory/documentation/ldap-api-manuals/trunk/src/main/assembly/ldap-api-user-guide.xml?rev=1212658&r1=1212657&r2=1212658&view=diff
==============================================================================
--- directory/documentation/ldap-api-manuals/trunk/src/main/assembly/ldap-api-user-guide.xml (original)
+++ directory/documentation/ldap-api-manuals/trunk/src/main/assembly/ldap-api-user-guide.xml Fri Dec 9 21:56:57 2011
@@ -19,13 +19,13 @@ under the License.
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>ldap-api-user-guide</id>
+ <id>ldap-api-user-guide-confluence</id>
<formats>
<format>zip</format>
</formats>
<fileSets>
<fileSet>
- <directory>${project.build.directory}/docbook/ldpa-api-manuals/ldap-api-user-guide-${project.version}/html</directory>
+ <directory>${project.build.directory}/docbook/manuals/ldap-api-user-guide-confluence-${project.version}/html</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>**</include>