You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2013/04/30 01:20:32 UTC
svn commit: r1477411 - in /accumulo/branches/1.5: ./ assemble/
docs/src/developer_manual/ docs/src/main/ docs/src/main/latex/
docs/src/main/latex/accumulo_developer_manual/
docs/src/main/latex/accumulo_user_manual/
docs/src/main/latex/accumulo_user_man...
Author: ctubbsii
Date: Mon Apr 29 23:20:31 2013
New Revision: 1477411
URL: http://svn.apache.org/r1477411
Log:
ACCUMULO-1350 drop appendix from documentation; ACCUMULO-1240 build docs with latex-maven-plugin to avoid executing shell scripts
Added:
accumulo/branches/1.5/docs/src/main/
accumulo/branches/1.5/docs/src/main/latex/
accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/
- copied from r1477384, accumulo/branches/1.5/docs/src/developer_manual/
accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/accumulo_developer_manual.tex
- copied unchanged from r1477384, accumulo/branches/1.5/docs/src/developer_manual/accumulo_developer_manual.tex
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/
- copied from r1477384, accumulo/branches/1.5/docs/src/user_manual/
accumulo/branches/1.5/docs/src/main/latex/common/
accumulo/branches/1.5/docs/src/main/latex/common/state_diagrams/
- copied from r1477384, accumulo/branches/1.5/docs/src/state_diagrams/
Removed:
accumulo/branches/1.5/docs/src/developer_manual/
accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/build.sh
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/appendices/
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/build.sh
accumulo/branches/1.5/docs/src/state_diagrams/
accumulo/branches/1.5/docs/src/user_manual/
Modified:
accumulo/branches/1.5/assemble/pom.xml
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex
accumulo/branches/1.5/pom.xml
Modified: accumulo/branches/1.5/assemble/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1477411&r1=1477410&r2=1477411&view=diff
==============================================================================
--- accumulo/branches/1.5/assemble/pom.xml (original)
+++ accumulo/branches/1.5/assemble/pom.xml Mon Apr 29 23:20:31 2013
@@ -436,36 +436,44 @@
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
+ <artifactId>latex-maven-plugin</artifactId>
<executions>
<execution>
- <id>developer-manual</id>
+ <id>build-pdf-manuals</id>
<goals>
- <goal>exec</goal>
+ <goal>latex</goal>
</goals>
- <phase>prepare-package</phase>
+ <phase>compile</phase>
<configuration>
- <executable>bash</executable>
- <arguments>
- <argument>../docs/src/developer_manual/build.sh</argument>
- </arguments>
- </configuration>
- </execution>
- <execution>
- <id>user-manual</id>
- <goals>
- <goal>exec</goal>
- </goals>
- <phase>prepare-package</phase>
- <configuration>
- <executable>bash</executable>
- <arguments>
- <argument>../docs/src/user_manual/build.sh</argument>
- </arguments>
+ <docsRoot>../docs/src/main/latex</docsRoot>
</configuration>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-pdf-manuals</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <phase>prepare-package</phase>
+ <configuration>
+ <outputDirectory>../docs</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>*.pdf</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
Modified: accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex?rev=1477411&r1=1477384&r2=1477411&view=diff
==============================================================================
--- accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex (original)
+++ accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex Mon Apr 29 23:20:31 2013
@@ -49,6 +49,4 @@ Version 1.5}
\include{chapters/analytics}
\include{chapters/security}
\include{chapters/administration}
-\appendix
-\include{appendices/shell_commands}
\end{document}
Modified: accumulo/branches/1.5/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/pom.xml?rev=1477411&r1=1477410&r2=1477411&view=diff
==============================================================================
--- accumulo/branches/1.5/pom.xml (original)
+++ accumulo/branches/1.5/pom.xml Mon Apr 29 23:20:31 2013
@@ -477,6 +477,11 @@
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
+ <artifactId>latex-maven-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
<artifactId>rpm-maven-plugin</artifactId>
<version>2.1-alpha-2</version>
</plugin>