openstack/openstack-manuals
Code Issues Proposed changes

Update of pom.xml files

Browse Source 
* Add canonicalUrlBase everywhere
* Add glossaryCollection everywhere - this will not build the glossary,
  but make glossterms work and silence build warnings
* Remove profileSecurity and security settings, we should always use the
  default of external.

Closes-Bug: #1273135

Change-Id: Ib81654070b9c58314815dbc45711a8875fec31b1
This commit is contained in:
Andreas Jaeger 2014-01-28 17:22:02 +01:00
parent 0227a30bca
commit 9d72389c09
10 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/admin-guide-cloud/pom.xml
View File

@ -68,7 +68,7 @@
bk-admin-guide-cloud.xml bk-admin-guide-cloud.xml
</includes> </includes>
<canonicalUrlBase>http://docs.openstack.org/admin-guide-cloud/content/</canonicalUrlBase> <canonicalUrlBase>http://docs.openstack.org/admin-guide-cloud/content/</canonicalUrlBase>
<profileSecurity>reviewer</profileSecurity> <glossaryCollection>${basedir}/../glossary/glossary-terms.xml</glossaryCollection>
<branding>openstack</branding> <branding>openstack</branding>
</configuration> </configuration>
</plugin> </plugin>

2
doc/config-reference/pom.xml
View File

@ -69,7 +69,7 @@
bk-config-ref.xml bk-config-ref.xml
</includes> </includes>
<canonicalUrlBase>http://docs.openstack.org/${release.path.name}/config-reference/content/</canonicalUrlBase> <canonicalUrlBase>http://docs.openstack.org/${release.path.name}/config-reference/content/</canonicalUrlBase>
<profileSecurity>reviewer</profileSecurity> <glossaryCollection>${basedir}/../glossary/glossary-terms.xml</glossaryCollection>
<branding>openstack</branding> <branding>openstack</branding>
</configuration> </configuration>
</plugin> </plugin>

1
doc/glossary/pom.xml
View File

@ -63,7 +63,6 @@
openstack-glossary.xml openstack-glossary.xml
</includes> </includes>
<canonicalUrlBase>http://docs.openstack.org/glossary/content/</canonicalUrlBase> <canonicalUrlBase>http://docs.openstack.org/glossary/content/</canonicalUrlBase>
<profileSecurity>reviewer</profileSecurity>
<branding>openstack</branding> <branding>openstack</branding>
</configuration> </configuration>
</plugin> </plugin>

2
doc/high-availability-guide/pom.xml
View File

@ -68,7 +68,7 @@
bk-ha-guide.xml bk-ha-guide.xml
</includes> </includes>
<canonicalUrlBase>http://docs.openstack.org/high-availability-guide/content/</canonicalUrlBase> <canonicalUrlBase>http://docs.openstack.org/high-availability-guide/content/</canonicalUrlBase>
<profileSecurity>reviewer</profileSecurity> <glossaryCollection>${basedir}/../glossary/glossary-terms.xml</glossaryCollection>
<branding>openstack</branding> <branding>openstack</branding>
</configuration> </configuration>
</plugin> </plugin>

3
doc/image-guide/pom.xml
View File

@ -70,7 +70,8 @@
<includes> <includes>
bk-imageguide.xml bk-imageguide.xml
</includes> </includes>
<profileSecurity>reviewer</profileSecurity> <canonicalUrlBase>http://docs.openstack.org/image-guide/content/</canonicalUrlBase>
<glossaryCollection>${basedir}/../glossary/glossary-terms.xml</glossaryCollection>
<branding>openstack</branding> <branding>openstack</branding>
</configuration> </configuration>
</plugin> </plugin>

2
doc/install-guide/pom.xml
View File

@ -92,7 +92,7 @@
<includes> <includes>
bk_openstackinstallguide.xml bk_openstackinstallguide.xml
</includes> </includes>
<profileSecurity>reviewer</profileSecurity> <canonicalUrlBase>http://docs.openstack.org/${release.path.name}/install-guide/install/${operating.system}/content/</canonicalUrlBase>
<branding>openstack</branding> <branding>openstack</branding>
<profileOs>${profile.os}</profileOs> <profileOs>${profile.os}</profileOs>
</configuration> </configuration>

2
doc/security-guide/pom.xml
View File

@ -32,7 +32,6 @@
<configuration> <configuration>
<includes>bk_openstack-sec-guide.xml</includes> <includes>bk_openstack-sec-guide.xml</includes>
<sourceDirectory>.</sourceDirectory> <sourceDirectory>.</sourceDirectory>
<canonicalUrlBase>http://docs.openstack.org/security-guide/content/</canonicalUrlBase>
<glossaryCollection>${basedir}/../glossary/glossary-terms.xml</glossaryCollection> <glossaryCollection>${basedir}/../glossary/glossary-terms.xml</glossaryCollection>
<webhelpDirname>security-guide</webhelpDirname> <webhelpDirname>security-guide</webhelpDirname>
<pdfFilenameBase>security-guide</pdfFilenameBase> <pdfFilenameBase>security-guide</pdfFilenameBase>
@ -66,6 +65,7 @@
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<canonicalUrlBase>http://docs.openstack.org/security-guide/content/</canonicalUrlBase>
<branding>openstack</branding> <branding>openstack</branding>
<showXslMessages>true</showXslMessages> <showXslMessages>true</showXslMessages>
</configuration> </configuration>

2
doc/training-guides/pom.xml
View File

@ -64,6 +64,8 @@
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<canonicalUrlBase>http://docs.openstack.org/training-guides/content/</canonicalUrlBase>
<glossaryCollection>${basedir}/../glossary/glossary-terms.xml</glossaryCollection>
<branding>openstack</branding> <branding>openstack</branding>
<showXslMessages>true</showXslMessages> <showXslMessages>true</showXslMessages>
</configuration> </configuration>

3
doc/user-guide-admin/pom.xml
View File

@ -65,7 +65,6 @@
<showXslMessages>true</showXslMessages> <showXslMessages>true</showXslMessages>
<sourceDirectory>.</sourceDirectory> <sourceDirectory>.</sourceDirectory>
<feedbackEmail>diane.fleming@rackspace.com</feedbackEmail> <feedbackEmail>diane.fleming@rackspace.com</feedbackEmail>
<security>external</security>
<branding>openstack</branding> <branding>openstack</branding>
<enableDisqus>${comments.enabled}</enableDisqus> <enableDisqus>${comments.enabled}</enableDisqus>
<disqusShortname>os-user-admin-guide</disqusShortname> <disqusShortname>os-user-admin-guide</disqusShortname>
@ -75,6 +74,8 @@
<formalProcedures>0</formalProcedures> <formalProcedures>0</formalProcedures>
<sectionAutolabel>0</sectionAutolabel> <sectionAutolabel>0</sectionAutolabel>
<tocSectionDepth>1</tocSectionDepth> <tocSectionDepth>1</tocSectionDepth>
<canonicalUrlBase>http://docs.openstack.org/user-guide-admin/content/</canonicalUrlBase>
<glossaryCollection>${basedir}/../glossary/glossary-terms.xml</glossaryCollection>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

3
doc/user-guide/pom.xml
View File

@ -65,13 +65,14 @@
<showXslMessages>true</showXslMessages> <showXslMessages>true</showXslMessages>
<sourceDirectory>.</sourceDirectory> <sourceDirectory>.</sourceDirectory>
<feedbackEmail>diane.fleming@rackspace.com</feedbackEmail> <feedbackEmail>diane.fleming@rackspace.com</feedbackEmail>
<security>external</security>
<branding>openstack</branding> <branding>openstack</branding>
<enableDisqus>${comments.enabled}</enableDisqus> <enableDisqus>${comments.enabled}</enableDisqus>
<disqusShortname>os-user-guide</disqusShortname> <disqusShortname>os-user-guide</disqusShortname>
<enableGoogleAnalytics>1</enableGoogleAnalytics> <enableGoogleAnalytics>1</enableGoogleAnalytics>
<googleAnalyticsId>UA-17511903-1</googleAnalyticsId> <googleAnalyticsId>UA-17511903-1</googleAnalyticsId>
<suppressFooterNavigation>0</suppressFooterNavigation> <suppressFooterNavigation>0</suppressFooterNavigation>
<canonicalUrlBase>http://docs.openstack.org/user-guide/content/</canonicalUrlBase>
<glossaryCollection>${basedir}/../glossary/glossary-terms.xml</glossaryCollection>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>