Author: rareddy Date: 2010-06-18 11:44:49 -0400 (Fri, 18 Jun 2010) New Revision: 2246 Added: trunk/build/assembly/docs.xml Modified: trunk/build/assembly/jboss-container/dist.xml trunk/documentation/pom.xml trunk/pom.xml Log: misc: moving the document building to happen before the kit building, so that we can add the documents to the kit. Copied: trunk/build/assembly/docs.xml (from rev 2245, trunk/documentation/assembly/docs.xml) =================================================================== --- trunk/build/assembly/docs.xml (rev 0) +++ trunk/build/assembly/docs.xml 2010-06-18 15:44:49 UTC (rev 2246) @@ -0,0 +1,39 @@ +<!--This script builds a JAR for a Teiid Embedded Server Installation --> +<assembly> + + <id>docs</id> + + <formats> + <format>dir</format> + </formats> + + <includeBaseDirectory>false</includeBaseDirectory> + + <moduleSets> + <moduleSet> + <includeSubModules>true</includeSubModules> + + <includes> + <include>org.jboss.teiid.documentation:admin-guide</include> + <include>org.jboss.teiid.documentation:reference</include> + <include>org.jboss.teiid.documentation:developer-guide</include> + <include>org.jboss.teiid.documentation:quick-start-example</include> + </includes> + + <sources> + <includeModuleDirectory>true</includeModuleDirectory> + <excludeSubModuleDirectories>false</excludeSubModuleDirectories> + <useDefaultExcludes>true</useDefaultExcludes> + <fileSets> + <fileSet> + <directory>./target/docbook/publish</directory> + <outputDirectory></outputDirectory> + <useDefaultExcludes>true</useDefaultExcludes> + </fileSet> + </fileSets> + </sources> + + </moduleSet> + </moduleSets> + +</assembly> \ No newline at end of file Property changes on: trunk/build/assembly/docs.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/build/assembly/jboss-container/dist.xml =================================================================== --- trunk/build/assembly/jboss-container/dist.xml 2010-06-18 14:27:29 UTC (rev 2245) +++ trunk/build/assembly/jboss-container/dist.xml 2010-06-18 15:44:49 UTC (rev 2246) @@ -39,34 +39,6 @@ </fileSet> <fileSet> - <directory>target/distribution/teiid-${version}-docs.dir/admin-guide/en-US/pdf</directory> - <includes> - <include>teiid_admin_guide.pdf</include> - </includes> - <outputDirectory>teiid-docs</outputDirectory> - </fileSet> - <fileSet> - <directory>target/distribution/teiid-${version}-docs.dir/reference/en-US/pdf</directory> - <includes> - <include>teiid_reference.pdf</include> - </includes> - <outputDirectory>teiid-docs</outputDirectory> - </fileSet> - <fileSet> - <directory>target/distribution/teiid-${version}-docs.dir/quick-start-example/en-US/pdf</directory> - <includes> - <include>quick_start_example.pdf</include> - </includes> - <outputDirectory>teiid-docs</outputDirectory> - </fileSet> - <fileSet> - <directory>target/distribution/teiid-${version}-docs.dir/developer-guide/en-US/pdf</directory> - <includes> - <include>connector_developer_guide.pdf</include> - </includes> - <outputDirectory>teiid-docs</outputDirectory> - </fileSet> - <fileSet> <directory>client/src/main/resources</directory> <includes> <include>vdb-deployer.xsd</include> @@ -75,7 +47,25 @@ </fileSet> </fileSets> - + <files> + <file> + <source>target/distribution/teiid-${version}-docs/admin-guide/en-US/pdf/teiid_admin_guide.pdf</source> + <outputDirectory>teiid-docs</outputDirectory> + </file> + <file> + <source>target/distribution/teiid-${version}-docs/reference/en-US/pdf/teiid_reference.pdf</source> + <outputDirectory>teiid-docs</outputDirectory> + </file> + <file> + <source>target/distribution/teiid-${version}-docs/quick-start-example/en-US/pdf/quick_start_example.pdf</source> + <outputDirectory>teiid-docs</outputDirectory> + </file> + <file> + <source>target/distribution/teiid-${version}-docs/developer-guide/en-US/pdf/developer_guide.pdf</source> + <outputDirectory>teiid-docs</outputDirectory> + </file> + </files> + <!-- these have external dependent clients like connectors--> <moduleSets> Modified: trunk/documentation/pom.xml =================================================================== --- trunk/documentation/pom.xml 2010-06-18 14:27:29 UTC (rev 2245) +++ trunk/documentation/pom.xml 2010-06-18 15:44:49 UTC (rev 2246) @@ -6,7 +6,7 @@ <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.teiid.documentation</groupId> + <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> <packaging>pom</packaging> <name>Documents</name> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-18 14:27:29 UTC (rev 2245) +++ trunk/pom.xml 2010-06-18 15:44:49 UTC (rev 2246) @@ -77,14 +77,14 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-2</version> + <version>2.2-beta-5</version> <configuration> <descriptors> <descriptor>build/assembly/src.xml</descriptor> + <descriptor>build/assembly/docs.xml</descriptor> <descriptor>build/assembly/client-jar.xml</descriptor> <descriptor>build/assembly/jboss-container/dist.xml</descriptor> - <descriptor>build/assembly/adminshell/adminshell-dist.xml</descriptor> - <descriptor>documentation/assembly/docs.xml</descriptor> + <descriptor>build/assembly/adminshell/adminshell-dist.xml</descriptor> </descriptors> <outputDirectory>target/distribution</outputDirectory> <workDirectory>target/assembly/work</workDirectory> @@ -106,7 +106,7 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-2</version> + <version>2.2-beta-5</version> <configuration> <descriptors> <descriptor>build/assembly/client-jar.xml</descriptor>