From 6a3fde709333cd72c356a0cc652a12b8c6ccc38f Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Fri, 22 Nov 2013 10:04:35 +0100
Subject: [PATCH] Add parent pom and update to clouddocs 1.12.0

Also, cleanup whitespace and line endings

Change-Id: I28978cb15477f0e215d9aa7d22d67f6ffe26aed1
---
 pom.xml      |  46 +++++++++++++
 v1.0/pom.xml | 178 +++++++++++++++++++++++----------------------------
 v2.0/pom.xml | 178 +++++++++++++++++++++++----------------------------
 3 files changed, 208 insertions(+), 194 deletions(-)
 create mode 100644 pom.xml

diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..88048b8
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,46 @@
+<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>parent-pom</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>v1.0</module>
+    <module>v2.0</module>
+  </modules>
+  <profiles>
+    <profile>
+      <id>Rackspace Research Repositories</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <repositories>
+        <repository>
+          <id>rackspace-research</id>
+          <name>Rackspace Research Repository</name>
+          <url>http://maven.research.rackspacecloud.com/content/groups/public/</url>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>rackspace-research</id>
+          <name>Rackspace Research Repository</name>
+          <url>http://maven.research.rackspacecloud.com/content/groups/public/</url>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+  </profiles>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.rackspace.cloud.api</groupId>
+        <artifactId>clouddocs-maven-plugin</artifactId>
+        <version>1.12.0</version>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/v1.0/pom.xml b/v1.0/pom.xml
index 4a76d6d..94817f8 100644
--- a/v1.0/pom.xml
+++ b/v1.0/pom.xml
@@ -1,97 +1,81 @@
-<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-network-api-v1</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <name>OpenStack Networking API v1.0 Reference</name>
-    <properties>
-        <!-- This is set by Jenkins according to the branch. -->
-        <release.path.name>local</release.path.name>
-        <comments.enabled>1</comments.enabled>
-    </properties>
-    <!-- ################################################ -->
-    <!-- USE "mvn clean generate-sources" to run this POM -->
-    <!-- ################################################ -->
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.rackspace.cloud.api</groupId>
-                <artifactId>clouddocs-maven-plugin</artifactId>
-                <version>1.11.1</version>
-                <executions>
-                    <!-- Configuration for OpenStack Networking API Reference -->
-                    <execution>
-                        <id>goal1</id>
-                        <goals>
-                            <goal>generate-webhelp</goal>
-                        </goals>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <includes> neutron-api-guide.xml</includes>
-                            <generateToc>
-                                appendix toc
-                                article/appendix nop
-                                article toc,title
-                                book toc,title,figure,equation
-                                chapter toc
-                                section toc
-                                part toc,title
-                                preface toc
-                                qandadiv toc
-                                qandaset toc
-                                reference toc,title
-                                set toc,title </generateToc>
-                            <targetDirectory>target/docbkx/webhelp/</targetDirectory>
-                            <webhelpDirname>openstack-network</webhelpDirname>
-                            <pdfFilenameBase>openstack-network</pdfFilenameBase>
-                        </configuration>
-                    </execution>
-                </executions>
-                <configuration>
-                    <chapterAutolabel>1</chapterAutolabel>
-                    <appendixAutolabel>1</appendixAutolabel>
-                    <sectionAutolabel>0</sectionAutolabel>
-                    <tocSectionDepth>1</tocSectionDepth>
-                    <formalProcedures>0</formalProcedures>
-                    <highlightSource>false</highlightSource>
-                    <xincludeSupported>true</xincludeSupported>
-                    <showXslMessages>true</showXslMessages>
-                    <sourceDirectory>.</sourceDirectory>
-                    <feedbackEmail>diane.fleming@rackspace.com</feedbackEmail>
-                    <security>external</security>
-                    <branding>openstack</branding>
-                    <enableDisqus>1</enableDisqus>
-                    <disqusShortname>os-neutron-guides</disqusShortname>
-                    <enableGoogleAnalytics>1</enableGoogleAnalytics>
-                    <googleAnalyticsId>UA-17511903-1</googleAnalyticsId>
-                    <suppressFooterNavigation>0</suppressFooterNavigation>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>Rackspace Research Repositories</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <repositories>
-                <repository>
-                    <id>rackspace-research</id>
-                    <name>Rackspace Research Repository</name>
-                    <url>http://maven.research.rackspacecloud.com/content/groups/public/</url>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>rackspace-research</id>
-                    <name>Rackspace Research Repository</name>
-                    <url>http://maven.research.rackspacecloud.com/content/groups/public/</url>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
-    </profiles>
-</project>
+<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">
+    <parent>
+      <groupId>org.openstack.docs</groupId>
+      <artifactId>parent-pom</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+      <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openstack.docs</groupId>
+    <artifactId>openstack-network-api-v1</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>OpenStack Networking API v1.0 Reference</name>
+    <properties>
+        <!-- This is set by Jenkins according to the branch. -->
+        <release.path.name>local</release.path.name>
+        <comments.enabled>1</comments.enabled>
+    </properties>
+    <!-- ################################################ -->
+    <!-- USE "mvn clean generate-sources" to run this POM -->
+    <!-- ################################################ -->
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.rackspace.cloud.api</groupId>
+                <artifactId>clouddocs-maven-plugin</artifactId>
+                <!-- version is set in ../pom.xml file -->
+                <executions>
+                    <!-- Configuration for OpenStack Networking API Reference -->
+                    <execution>
+                        <id>goal1</id>
+                        <goals>
+                            <goal>generate-webhelp</goal>
+                        </goals>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <includes> neutron-api-guide.xml</includes>
+                            <generateToc>
+                                appendix toc
+                                article/appendix nop
+                                article toc,title
+                                book toc,title,figure,equation
+                                chapter toc
+                                section toc
+                                part toc,title
+                                preface toc
+                                qandadiv toc
+                                qandaset toc
+                                reference toc,title
+                                set toc,title </generateToc>
+                            <targetDirectory>target/docbkx/webhelp/</targetDirectory>
+                            <webhelpDirname>openstack-network</webhelpDirname>
+                            <pdfFilenameBase>openstack-network</pdfFilenameBase>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <chapterAutolabel>1</chapterAutolabel>
+                    <appendixAutolabel>1</appendixAutolabel>
+                    <sectionAutolabel>0</sectionAutolabel>
+                    <tocSectionDepth>1</tocSectionDepth>
+                    <formalProcedures>0</formalProcedures>
+                    <highlightSource>false</highlightSource>
+                    <xincludeSupported>true</xincludeSupported>
+                    <showXslMessages>true</showXslMessages>
+                    <sourceDirectory>.</sourceDirectory>
+                    <feedbackEmail>diane.fleming@rackspace.com</feedbackEmail>
+                    <security>external</security>
+                    <branding>openstack</branding>
+                    <enableDisqus>1</enableDisqus>
+                    <disqusShortname>os-neutron-guides</disqusShortname>
+                    <enableGoogleAnalytics>1</enableGoogleAnalytics>
+                    <googleAnalyticsId>UA-17511903-1</googleAnalyticsId>
+                    <suppressFooterNavigation>0</suppressFooterNavigation>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/v2.0/pom.xml b/v2.0/pom.xml
index 593f2ec..115dfad 100644
--- a/v2.0/pom.xml
+++ b/v2.0/pom.xml
@@ -1,97 +1,81 @@
-<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-network-api-v2</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <name>OpenStack Networking API v2.0 Reference</name>
-    <properties>
-        <!-- This is set by Jenkins according to the branch. -->
-        <release.path.name>local</release.path.name>
-        <comments.enabled>1</comments.enabled>
-    </properties>
-    <!-- ################################################ -->
-    <!-- USE "mvn clean generate-sources" to run this POM -->
-    <!-- ################################################ -->
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.rackspace.cloud.api</groupId>
-                <artifactId>clouddocs-maven-plugin</artifactId>
-                <version>1.11.1</version>
-                <executions>
-                    <!-- Configuration for OpenStack End User Guide -->
-                    <execution>
-                        <id>goal1</id>
-                        <goals>
-                            <goal>generate-webhelp</goal>
-                        </goals>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <includes> neutron-api-guide.xml</includes>
-                            <generateToc>
-                                appendix toc
-                                article/appendix nop
-                                article toc,title
-                                book toc,title,figure,equation
-                                chapter toc
-                                section toc
-                                part toc,title
-                                preface toc
-                                qandadiv toc
-                                qandaset toc
-                                reference toc,title
-                                set toc,title </generateToc>
-                            <targetDirectory>target/docbkx/webhelp/</targetDirectory>
-                            <webhelpDirname>openstack-network</webhelpDirname>
-                            <pdfFilenameBase>openstack-network</pdfFilenameBase>
-                        </configuration>
-                    </execution>
-                </executions>
-                <configuration>
-                    <chapterAutolabel>1</chapterAutolabel>
-                    <appendixAutolabel>1</appendixAutolabel>
-                    <sectionAutolabel>0</sectionAutolabel>
-                    <tocSectionDepth>1</tocSectionDepth>
-                    <formalProcedures>0</formalProcedures>
-                    <highlightSource>false</highlightSource>
-                    <xincludeSupported>true</xincludeSupported>
-                    <showXslMessages>true</showXslMessages>
-                    <sourceDirectory>.</sourceDirectory>
-                    <feedbackEmail>diane.fleming@rackspace.com</feedbackEmail>
-                    <security>external</security>
-                    <branding>openstack</branding>
-                    <enableDisqus>1</enableDisqus>
-                    <disqusShortname>os-neutron-guides</disqusShortname>
-                    <enableGoogleAnalytics>1</enableGoogleAnalytics>
-                    <googleAnalyticsId>UA-17511903-1</googleAnalyticsId>
-                    <suppressFooterNavigation>0</suppressFooterNavigation>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>Rackspace Research Repositories</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <repositories>
-                <repository>
-                    <id>rackspace-research</id>
-                    <name>Rackspace Research Repository</name>
-                    <url>http://maven.research.rackspacecloud.com/content/groups/public/</url>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>rackspace-research</id>
-                    <name>Rackspace Research Repository</name>
-                    <url>http://maven.research.rackspacecloud.com/content/groups/public/</url>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
-    </profiles>
-</project>
+<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">
+    <parent>
+      <groupId>org.openstack.docs</groupId>
+      <artifactId>parent-pom</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+      <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openstack.docs</groupId>
+    <artifactId>openstack-network-api-v2</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>OpenStack Networking API v2.0 Reference</name>
+    <properties>
+        <!-- This is set by Jenkins according to the branch. -->
+        <release.path.name>local</release.path.name>
+        <comments.enabled>1</comments.enabled>
+    </properties>
+    <!-- ################################################ -->
+    <!-- USE "mvn clean generate-sources" to run this POM -->
+    <!-- ################################################ -->
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.rackspace.cloud.api</groupId>
+                <artifactId>clouddocs-maven-plugin</artifactId>
+                <!-- version is set in ../pom.xml file -->
+                <executions>
+                    <!-- Configuration for OpenStack End User Guide -->
+                    <execution>
+                        <id>goal1</id>
+                        <goals>
+                            <goal>generate-webhelp</goal>
+                        </goals>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <includes> neutron-api-guide.xml</includes>
+                            <generateToc>
+                                appendix toc
+                                article/appendix nop
+                                article toc,title
+                                book toc,title,figure,equation
+                                chapter toc
+                                section toc
+                                part toc,title
+                                preface toc
+                                qandadiv toc
+                                qandaset toc
+                                reference toc,title
+                                set toc,title </generateToc>
+                            <targetDirectory>target/docbkx/webhelp/</targetDirectory>
+                            <webhelpDirname>openstack-network</webhelpDirname>
+                            <pdfFilenameBase>openstack-network</pdfFilenameBase>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <chapterAutolabel>1</chapterAutolabel>
+                    <appendixAutolabel>1</appendixAutolabel>
+                    <sectionAutolabel>0</sectionAutolabel>
+                    <tocSectionDepth>1</tocSectionDepth>
+                    <formalProcedures>0</formalProcedures>
+                    <highlightSource>false</highlightSource>
+                    <xincludeSupported>true</xincludeSupported>
+                    <showXslMessages>true</showXslMessages>
+                    <sourceDirectory>.</sourceDirectory>
+                    <feedbackEmail>diane.fleming@rackspace.com</feedbackEmail>
+                    <security>external</security>
+                    <branding>openstack</branding>
+                    <enableDisqus>1</enableDisqus>
+                    <disqusShortname>os-neutron-guides</disqusShortname>
+                    <enableGoogleAnalytics>1</enableGoogleAnalytics>
+                    <googleAnalyticsId>UA-17511903-1</googleAnalyticsId>
+                    <suppressFooterNavigation>0</suppressFooterNavigation>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>