openstack/openstack-manuals
Code Issues Proposed changes

Merge "Cleanup pom.xml for Install Guide and Network Guide"

Browse Source
This commit is contained in:
Jenkins
2013-09-03 21:53:17 +00:00
committed by Gerrit Code Review
parent f500aa812c b9c416215f
commit 502193e50b
2 changed files with 40 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
doc/src/docbkx/openstack-install/pom.xml
View File

@@ -1,15 +1,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.openstack.docs</groupId>
<artifactId>openstack-guide</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>OpenStack Guides</name>
<properties>
<!-- This is set by Jenkins according to the branch. -->
<release.path.name>local</release.path.name>
@@ -21,14 +21,14 @@
<!-- ################################################ -->
<!-- USE "mvn clean generate-sources" to run this POM -->
<!-- ################################################ -->
<build>
<plugins>
<plugins>
<plugin>
<groupId>com.rackspace.cloud.api</groupId>
<artifactId>clouddocs-maven-plugin</artifactId>
<version>1.9.2</version>
<version>1.9.2</version>
<executions>
<execution>
<id>generate-webhelp</id>
@@ -62,11 +62,10 @@
<sectionAutolabel>0</sectionAutolabel>
<tocSectionDepth>1</tocSectionDepth>
<formalProcedures>0</formalProcedures>
<failOnValidationError>false</failOnValidationError>
<webhelpDirname>${operating.system}</webhelpDirname>
<targetDirectory>${basedir}/target/docbkx/webhelp/${release.path.name}/openstack-compute/install</targetDirectory>
<includeDateInPdfFilename>0</includeDateInPdfFilename>
<pdfFilenameBase>openstack-install-guide-${operating.system}-${release.path.name}</pdfFilenameBase>
<targetDirectory>${basedir}/target/docbkx/webhelp/${release.path.name}/openstack-compute/install</targetDirectory>
<includeDateInPdfFilename>0</includeDateInPdfFilename>
<pdfFilenameBase>openstack-install-guide-${operating.system}-${release.path.name}</pdfFilenameBase>
</configuration>
</execution>
@@ -76,18 +75,18 @@
<goal>generate-webhelp</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<includes>dummy.xml</includes>
<postProcess>
<delete includeemptydirs="true" verbose="true">
<fileset dir="${basedir}/target/docbkx/webhelp/${release.path.name}" >
<include name="**/*"/>
<exclude name="openstack-compute/install/**"/>
</fileset>
</delete>
</postProcess>
</configuration>
</execution>
<configuration>
<includes>dummy.xml</includes>
<postProcess>
<delete includeemptydirs="true" verbose="true">
<fileset dir="${basedir}/target/docbkx/webhelp/${release.path.name}" >
<include name="**/*"/>
<exclude name="openstack-compute/install/**"/>
</fileset>
</delete>
</postProcess>
</configuration>
</execution>
</executions>
<configuration>
<!-- These parameters apply to pdf and webhelp -->
@@ -100,7 +99,7 @@
<branding>openstack</branding>
<profileOs>${profile.os}</profileOs>
</configuration>
</plugin>
</plugin>
</plugins>
</build>
<profiles>

35
doc/src/docbkx/openstack-network-connectivity-admin/pom.xml
View File

@@ -26,7 +26,7 @@
<plugin>
<groupId>com.rackspace.cloud.api</groupId>
<artifactId>clouddocs-maven-plugin</artifactId>
<version>1.9.2</version>
<version>1.9.2</version>
<executions>
<execution>
<id>networking-admin-webhelp</id>
@@ -41,16 +41,15 @@
<disqusShortname>os-neutron-guides</disqusShortname>
<enableGoogleAnalytics>1</enableGoogleAnalytics>
<googleAnalyticsId>UA-17511903-1</googleAnalyticsId>
<failOnValidationError>0</failOnValidationError>
<!-- The following elements sets the autonumbering of sections in output for chapter numbers but no numbered sections-->
<sectionAutolabel>0</sectionAutolabel>
<tocSectionDepth>1</tocSectionDepth>
<sectionLabelIncludesComponentLabel>0</sectionLabelIncludesComponentLabel>
<webhelpDirname>admin</webhelpDirname>
<targetDirectory>${basedir}/target/docbkx/webhelp/${release.path.name}/openstack-network</targetDirectory>
<includeDateInPdfFilename>0</includeDateInPdfFilename>
<pdfFilenameBase>bk-neutron-admin-guide-${release.path.name}</pdfFilenameBase>
<webhelpDirname>admin</webhelpDirname>
<targetDirectory>${basedir}/target/docbkx/webhelp/${release.path.name}/openstack-network</targetDirectory>
<includeDateInPdfFilename>0</includeDateInPdfFilename>
<pdfFilenameBase>bk-neutron-admin-guide-${release.path.name}</pdfFilenameBase>
</configuration>
</execution>
@@ -60,18 +59,18 @@
<goal>generate-webhelp</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<postProcess>
<delete includeemptydirs="true" verbose="true">
<fileset dir="${basedir}/target/docbkx/webhelp/${release.path.name}" >
<include name="**/*"/>
<exclude name="openstack-network/**"/>
</fileset>
</delete>
</postProcess>
</configuration>
</execution>
</executions>
<configuration>
<postProcess>
<delete includeemptydirs="true" verbose="true">
<fileset dir="${basedir}/target/docbkx/webhelp/${release.path.name}" >
<include name="**/*"/>
<exclude name="openstack-network/**"/>
</fileset>
</delete>
</postProcess>
</configuration>
</execution>
</executions>
<configuration>
<!-- These parameters apply to pdf and webhelp -->
<xincludeSupported>true</xincludeSupported>