openstack-attic/database-api
Code Issues Proposed changes

Update pom.xml, remove bookinfo.xml

Browse Source 
The maven plugin comes with its own bookinfo.xml, no need
to hava a separate version here.

Remove copy instructions from pom.xml and remove extra whitespace
and tabs from the file.

Change-Id: Ic3c9499ecf3d923ee85b9ed517ae743c238bd096
This commit is contained in:
Andreas Jaeger 2014-01-17 09:40:10 +01:00
parent f1b69b2fc8
commit 694744a280
2 changed files with 169 additions and 194 deletions
apidocs
pom.xml
src/resources
bookinfo.xml

339
apidocs/pom.xml

@ -1,170 +1,169 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.rackspace.cloud.dbaas</groupId> <groupId>com.rackspace.cloud.dbaas</groupId>
<artifactId>dbaas-docs</artifactId> <artifactId>dbaas-docs</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<name>Database Public API Spec</name> <name>Database Public API Spec</name>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>net.sourceforge.saxon</groupId> <groupId>net.sourceforge.saxon</groupId>
<artifactId>saxon</artifactId> <artifactId>saxon</artifactId>
<version>9.1.0.8</version> <version>9.1.0.8</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.rackspace.cloud.api</groupId> <groupId>com.rackspace.cloud.api</groupId>
<artifactId>wadl-tools</artifactId> <artifactId>wadl-tools</artifactId>
<version>1.0.9</version> <version>1.0.9</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>com.rackspace.cloud.api</groupId> <groupId>com.rackspace.cloud.api</groupId>
<artifactId>clouddocs-maven-plugin</artifactId> <artifactId>clouddocs-maven-plugin</artifactId>
<!-- this <version> relates only to the *plugin* used for document formatting --> <!-- this <version> relates only to the *plugin* used for document formatting -->
<!-- the version of the *API* that is the subject of the document is indicated within each document --> <!-- the version of the *API* that is the subject of the document is indicated within each document -->
<version>1.12.2</version> <version>1.12.2</version>
<executions> <executions>
<execution> <execution>
<id>cdb-devguide</id> <id>cdb-devguide</id>
<goals> <goals>
<goal>generate-webhelp</goal> <goal>generate-webhelp</goal>
</goals> </goals>
<phase>generate-sources</phase> <phase>generate-sources</phase>
<configuration> <configuration>
<security>reviewer</security> <security>reviewer</security>
<sourceDirectory>src/resources</sourceDirectory> <sourceDirectory>src/resources</sourceDirectory>
<highlightSource>false</highlightSource> <highlightSource>false</highlightSource>
<trimWadlUriCount>2</trimWadlUriCount> <trimWadlUriCount>2</trimWadlUriCount>
<!-- this is the public-facing client developer guide formerly known as PublicAPISpec.xml --> <!-- this is the public-facing client developer guide formerly known as PublicAPISpec.xml -->
<!-- this document that will be published as cdb-devguide-latest.pdf at http://docs.rackspacecloud.com/api/ --> <!-- this document that will be published as cdb-devguide-latest.pdf at http://docs.rackspacecloud.com/api/ -->
<enableDisqus>1</enableDisqus> <enableDisqus>1</enableDisqus>
<googleAnalyticsId>UA-23102455-4</googleAnalyticsId> <googleAnalyticsId>UA-23102455-4</googleAnalyticsId>
<includes>cdb-devguide.xml</includes> <includes>cdb-devguide.xml</includes>
<canonicalUrlBase>http://docs.rackspace.com/cdb/api/v1.0/cdb-devguide/content</canonicalUrlBase> <canonicalUrlBase>http://docs.rackspace.com/cdb/api/v1.0/cdb-devguide/content</canonicalUrlBase>
<feedbackEmail>mike.asthalter@rackspace.com</feedbackEmail> <feedbackEmail>mike.asthalter@rackspace.com</feedbackEmail>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<socialIcons>1</socialIcons> <socialIcons>1</socialIcons>
<feedbackEmail>mike.asthalter@rackspace.com</feedbackEmail> <feedbackEmail>mike.asthalter@rackspace.com</feedbackEmail>
<branding>openstack</branding> <branding>openstack</branding>
<!-- <failOnValidationError>false</failOnValidationError> --> <!-- <failOnValidationError>false</failOnValidationError> -->
</configuration> </configuration>
</plugin> </plugin>
<!-- Unpack the wadl normalization xslts --> <!-- Unpack the wadl normalization xslts -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>unpack-shared-resources</id> <id>unpack-shared-resources</id>
<goals> <goals>
<goal>unpack-dependencies</goal> <goal>unpack-dependencies</goal>
</goals> </goals>
<phase>generate-sources</phase> <phase>generate-sources</phase>
<configuration> <configuration>
<outputDirectory>${project.build.directory}/generated-resources</outputDirectory> <outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
<includeGroupIds>com.rackspace.cloud.api</includeGroupIds> <includeGroupIds>com.rackspace.cloud.api</includeGroupIds>
<includeArtifactIds>wadl-tools</includeArtifactIds> <includeArtifactIds>wadl-tools</includeArtifactIds>
<excludeTransitive>true</excludeTransitive> <excludeTransitive>true</excludeTransitive>
<includes>**/xsl/*.xsl</includes> <includes>**/xsl/*.xsl</includes>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<!-- Normalize the dbaas wadl --> <!-- Normalize the dbaas wadl -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<version>1.5</version> <version>1.5</version>
<executions> <executions>
<execution> <execution>
<id>ant</id> <id>ant</id>
<phase>generate-sources</phase> <phase>generate-sources</phase>
<configuration> <configuration>
<target> <target>
<copy todir="${project.build.directory}/generated-resources/normalized/api/v1.0"> <copy todir="${project.build.directory}/generated-resources/normalized/api/v1.0">
<fileset dir="src/resources"> <fileset dir="src/resources">
<include name="xslts/**"/> <include name="xslts/**"/>
</fileset> </fileset>
<fileset dir="src/resources"> <fileset dir="src/resources">
<include name="samples/**"/> <include name="samples/**"/>
</fileset> </fileset>
</copy> </copy>
<copy file="../xsd/dbaas.xsd" tofile="${project.build.directory}/generated-resources/normalized/api/v1.0/xsd/cdb.xsd"/> <copy file="../xsd/dbaas.xsd" tofile="${project.build.directory}/generated-resources/normalized/api/v1.0/xsd/cdb.xsd"/>
<copy file="../xsd/dbaas.xsd" tofile="${project.build.directory}/generated-resources/normalized/api/v1.0/cdb.xsd"/> <copy file="../xsd/dbaas.xsd" tofile="${project.build.directory}/generated-resources/normalized/api/v1.0/cdb.xsd"/>
<copy file="src/resources/bookinfo.xml" tofile="${project.build.directory}/generated-resources/normalized/bookinfo.xml"/> <java
<java jar="${net.sourceforge.saxon:saxon:jar}"
jar="${net.sourceforge.saxon:saxon:jar}" fork="true">
fork="true"> <arg value="-u"/>
<arg value="-u"/> <arg value="-s:../xsd/dbaas.wadl"/>
<arg value="-s:../xsd/dbaas.wadl"/> <arg value="-xsl:${project.build.directory}/generated-resources/xsl/normalizeWadl.xsl"/>
<arg value="-xsl:${project.build.directory}/generated-resources/xsl/normalizeWadl.xsl"/> <arg value="-o:${project.build.directory}/generated-resources/normalized/api/v1.0/cdb.wadl"/>
<arg value="-o:${project.build.directory}/generated-resources/normalized/api/v1.0/cdb.wadl"/> <arg value="flattenXsds=false"/>
<arg value="flattenXsds=false"/> </java>
</java> <replaceregexp file="${project.build.directory}/generated-resources/normalized/api/v1.0/cdb.wadl"
<replaceregexp file="${project.build.directory}/generated-resources/normalized/api/v1.0/cdb.wadl" match="file:/.*/xsd/dbaas.xsd"
match="file:/.*/xsd/dbaas.xsd" replace="xsd/cdb.xsd"/>
replace="xsd/cdb.xsd"/> <war destfile="${project.build.directory}/docbkx/webhelp/cdb-wadls.war" needxmlfile="false">
<war destfile="${project.build.directory}/docbkx/webhelp/cdb-wadls.war" needxmlfile="false"> <fileset dir="${project.build.directory}/generated-resources/normalized"/>
<fileset dir="${project.build.directory}/generated-resources/normalized"/> </war>
</war> </target>
</target> </configuration>
</configuration> <goals>
<goals> <goal>run</goal>
<goal>run</goal> </goals>
</goals> </execution>
</execution> </executions>
</executions> </plugin>
</plugin> <plugin>
<plugin> <groupId>org.apache.maven.plugins</groupId>
<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId>
<artifactId>maven-assembly-plugin</artifactId> <version>2.3</version>
<version>2.3</version> <configuration>
<configuration> <descriptors>
<descriptors> <descriptor>includewars.xml</descriptor>
<descriptor>includewars.xml</descriptor> </descriptors>
</descriptors> </configuration>
</configuration> <executions>
<executions> <execution>
<execution> <id>assembly</id>
<id>assembly</id> <goals>
<goals> <goal>single</goal>
<goal>single</goal> </goals>
</goals> <phase>package</phase>
<phase>package</phase> </execution>
</execution> </executions>
</executions> </plugin>
</plugin> </plugins>
</plugins> </build>
</build> <profiles>
<profiles> <profile>
<profile> <id>Rackspace Research Repositories</id>
<id>Rackspace Research Repositories</id> <activation>
<activation> <activeByDefault>true</activeByDefault>
<activeByDefault>true</activeByDefault> </activation>
</activation> <repositories>
<repositories> <repository>
<repository> <id>rackspace-research</id>
<id>rackspace-research</id> <name>Rackspace Research Repository</name>
<name>Rackspace Research Repository</name> <url>http://maven.research.rackspacecloud.com/content/groups/public/</url>
<url>http://maven.research.rackspacecloud.com/content/groups/public/</url> </repository>
</repository> </repositories>
</repositories> <pluginRepositories>
<pluginRepositories> <pluginRepository>
<pluginRepository> <id>rackspace-research</id>
<id>rackspace-research</id> <name>Rackspace Research Repository</name>
<name>Rackspace Research Repository</name> <url>http://maven.research.rackspacecloud.com/content/groups/public/</url>
<url>http://maven.research.rackspacecloud.com/content/groups/public/</url> </pluginRepository>
</pluginRepository> </pluginRepositories>
</pluginRepositories> </profile>
</profile> </profiles>
</profiles> </project>
</project>

24
apidocs/src/resources/bookinfo.xml

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<products xmlns:xlink="http://www.w3.org/1999/xlink">
<docname>CDB Wadl</docname>
<productname>CDB</productname>
<webappname>cdb-wadls</webappname>
<pominfo>
<groupid>com.rackspace.cloud.apidocs</groupid>
<artifactid>cdb-wadls</artifactid>
<version>1.0.0-SNAPSHOT</version>
<name>CDB Wadl</name>
</pominfo>
<emails>
<email>
<name>CDT Publication Events</name>
<to>cdt-publication-events@lists.rackspace.com</to>
<from>clouddoctoolsteam@lists.rackspace.com</from>
</email>
<email>
<name>CDB wadl publication event</name>
<to>mike.asthalter@rackspace.com</to>
<from>clouddoctoolsteam@lists.rackspace.com</from>
</email>
</emails>
</products>