Author: bvahdat Date: Tue Feb 5 07:07:19 2013 New Revision: 1442480 URL: http://svn.apache.org/viewvc?rev=1442480&view=rev Log: Reverted the previously committed revision.
Modified: camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml camel/trunk/tooling/pom.xml Modified: camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml?rev=1442480&r1=1442479&r2=1442480&view=diff ============================================================================== --- camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml (original) +++ camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml Tue Feb 5 07:07:19 2013 @@ -55,6 +55,16 @@ <lineEnding>unix</lineEnding> </fileSet> + <!-- copy the manual docs --> + <fileSet> + <directory>${basedir}/../tooling/camel-manual/target/site/manual/</directory> + <outputDirectory>/doc/manual</outputDirectory> + <includes> + <include>*.pdf</include> + <include>*.html</include> + </includes> + </fileSet> + <!-- copy the java docs --> <fileSet> <directory>${basedir}/target/javadoc/</directory> @@ -66,19 +76,6 @@ </fileSets> <files> - <!-- copy the manual docs --> - <file> - <source>${basedir}/../tooling/camel-manual/target/site/manual/camel-manual-${project.version}-SNAPSHOT.html</source> - <outputDirectory>/doc/manual</outputDirectory> - <fileMode>0444</fileMode> - <destName>camel-manual-${project.version}.html</destName> - </file> - <file> - <source>${basedir}/../tooling/camel-manual/target/site/manual/camel-manual-${project.version}-SNAPSHOT.pdf</source> - <outputDirectory>/doc/manual</outputDirectory> - <fileMode>0444</fileMode> - <destName>camel-manual-${project.version}.pdf</destName> - </file> <!--filtering README.txt--> <file> <source>../examples/camel-example-reportincident-wssecurity/README.txt</source> Modified: camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml?rev=1442480&r1=1442479&r2=1442480&view=diff ============================================================================== --- camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml (original) +++ camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml Tue Feb 5 07:07:19 2013 @@ -55,6 +55,16 @@ <lineEnding>dos</lineEnding> </fileSet> + <!-- copy the manual docs --> + <fileSet> + <directory>${basedir}/../tooling/camel-manual/target/site/manual/</directory> + <outputDirectory>/doc/manual</outputDirectory> + <includes> + <include>*.pdf</include> + <include>*.html</include> + </includes> + </fileSet> + <!-- copy the java docs --> <fileSet> <directory>${basedir}/target/javadoc/</directory> @@ -66,19 +76,6 @@ </fileSets> <files> - <!-- copy the manual docs --> - <file> - <source>${basedir}/../tooling/camel-manual/target/site/manual/camel-manual-${project.version}-SNAPSHOT.html</source> - <outputDirectory>/doc/manual</outputDirectory> - <fileMode>0444</fileMode> - <destName>camel-manual-${project.version}.html</destName> - </file> - <file> - <source>${basedir}/../tooling/camel-manual/target/site/manual/camel-manual-${project.version}-SNAPSHOT.pdf</source> - <outputDirectory>/doc/manual</outputDirectory> - <fileMode>0444</fileMode> - <destName>camel-manual-${project.version}.pdf</destName> - </file> <!--filtering README.txt--> <file> <source>../examples/camel-example-reportincident-wssecurity/README.txt</source> Modified: camel/trunk/tooling/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/tooling/pom.xml?rev=1442480&r1=1442479&r2=1442480&view=diff ============================================================================== --- camel/trunk/tooling/pom.xml (original) +++ camel/trunk/tooling/pom.xml Tue Feb 5 07:07:19 2013 @@ -33,9 +33,10 @@ <modules> <module>maven</module> <module>archetypes</module> + <module>camel-manual</module> </modules> - <profiles> + <!-- profiles> <profile> <id>build.manual</id> <modules> @@ -60,6 +61,6 @@ <module>camel-manual</module> </modules> </profile> - </profiles> + </profiles --> </project>