accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject svn commit: r1477414 - in /accumulo/trunk: ./ assemble/ core/ docs/src/developer_manual/ docs/src/main/ docs/src/main/latex/ docs/src/main/latex/accumulo_developer_manual/ docs/src/main/latex/accumulo_developer_manual/images/ docs/src/main/latex/accumu...
Date Mon, 29 Apr 2013 23:32:50 GMT
Author: ctubbsii
Date: Mon Apr 29 23:32:49 2013
New Revision: 1477414

URL: http://svn.apache.org/r1477414
Log:
ACCUMULO-1350, ACCUMULO-1240 merge to trunk

Added:
    accumulo/trunk/docs/src/main/
      - copied from r1477413, accumulo/branches/1.5/docs/src/main/
    accumulo/trunk/docs/src/main/latex/
      - copied from r1477413, accumulo/branches/1.5/docs/src/main/latex/
    accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/   (props changed)
      - copied from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/
    accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/accumulo_developer_manual.tex
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/accumulo_developer_manual.tex
    accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/component_docs.odp
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/component_docs.odp
    accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/
      - copied from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/
    accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/component_overview.jpg
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/component_overview.jpg
    accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/system_blocks.jpg
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/system_blocks.jpg
    accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/tablet_dataflow.jpg
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/tablet_dataflow.jpg
    accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/tablet_hierarchy.jpg
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/tablet_hierarchy.jpg
    accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/tserver_config.jpg
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/tserver_config.jpg
    accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/tserver_maintenance.jpg
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/tserver_maintenance.jpg
    accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/tserver_monitor.jpg
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/tserver_monitor.jpg
    accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/tserver_recovery.jpg
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/tserver_recovery.jpg
    accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/tserver_rw.jpg
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/tserver_rw.jpg
    accumulo/trunk/docs/src/main/latex/accumulo_user_manual/   (props changed)
      - copied from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/
    accumulo/trunk/docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex
    accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/   (props changed)
      - copied from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/
    accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex
    accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/analytics.tex
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/analytics.tex
    accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/clients.tex
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/clients.tex
    accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/design.tex
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/design.tex
    accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/high_speed_ingest.tex
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/high_speed_ingest.tex
    accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/introduction.tex
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/introduction.tex
    accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/security.tex
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/security.tex
    accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/shell.tex
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/shell.tex
    accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/table_configuration.tex
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/table_configuration.tex
    accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/table_design.tex
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/table_design.tex
    accumulo/trunk/docs/src/main/latex/accumulo_user_manual/images/
      - copied from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/images/
    accumulo/trunk/docs/src/main/latex/accumulo_user_manual/images/data_distribution.png
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/images/data_distribution.png
    accumulo/trunk/docs/src/main/latex/accumulo_user_manual/images/failure_handling.png
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/images/failure_handling.png
    accumulo/trunk/docs/src/main/latex/common/
      - copied from r1477413, accumulo/branches/1.5/docs/src/main/latex/common/
    accumulo/trunk/docs/src/main/latex/common/state_diagrams/
      - copied from r1477413, accumulo/branches/1.5/docs/src/main/latex/common/state_diagrams/
    accumulo/trunk/docs/src/main/latex/common/state_diagrams/HDFS_WAL_states.odg
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/common/state_diagrams/HDFS_WAL_states.odg
    accumulo/trunk/docs/src/main/latex/common/state_diagrams/HDFS_WAL_states.pdf
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/common/state_diagrams/HDFS_WAL_states.pdf
    accumulo/trunk/docs/src/main/latex/common/state_diagrams/tablet_states.odg
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/common/state_diagrams/tablet_states.odg
    accumulo/trunk/docs/src/main/latex/common/state_diagrams/tablet_states.pdf
      - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/common/state_diagrams/tablet_states.pdf
Removed:
    accumulo/trunk/docs/src/developer_manual/
    accumulo/trunk/docs/src/state_diagrams/
    accumulo/trunk/docs/src/user_manual/
Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/assemble/   (props changed)
    accumulo/trunk/assemble/pom.xml
    accumulo/trunk/core/   (props changed)
    accumulo/trunk/examples/   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java 
 (props changed)
    accumulo/trunk/pom.xml   (contents, props changed)
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5:r1477346-1477379,1477381-1477403,1477405-1477413

Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/assemble:r1477346-1477413

Modified: accumulo/trunk/assemble/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1477414&r1=1477413&r2=1477414&view=diff
==============================================================================
--- accumulo/trunk/assemble/pom.xml (original)
+++ accumulo/trunk/assemble/pom.xml Mon Apr 29 23:32:49 2013
@@ -435,33 +435,41 @@
       <build>
         <plugins>
           <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>exec-maven-plugin</artifactId>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-resources-plugin</artifactId>
             <executions>
               <execution>
-                <id>developer-manual</id>
+                <id>copy-pdf-manuals</id>
                 <goals>
-                  <goal>exec</goal>
+                  <goal>copy-resources</goal>
                 </goals>
                 <phase>prepare-package</phase>
                 <configuration>
-                  <executable>bash</executable>
-                  <arguments>
-                    <argument>../docs/src/developer_manual/build.sh</argument>
-                  </arguments>
+                  <outputDirectory>../docs</outputDirectory>
+                  <resources>
+                    <resource>
+                      <directory>${project.build.directory}</directory>
+                      <includes>
+                        <include>*.pdf</include>
+                      </includes>
+                    </resource>
+                  </resources>
                 </configuration>
               </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>latex-maven-plugin</artifactId>
+            <executions>
               <execution>
-                <id>user-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/user_manual/build.sh</argument>
-                  </arguments>
+                  <docsRoot>../docs/src/main/latex</docsRoot>
                 </configuration>
               </execution>
             </executions>

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/core:r1477346-1477413

Propchange: accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Apr 29 23:32:49 2013
@@ -0,0 +1,5 @@
+developer_manual.toc
+
+developer_manual.aux
+
+developer_manual.pdf

Propchange: accumulo/trunk/docs/src/main/latex/accumulo_user_manual/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Apr 29 23:32:49 2013
@@ -0,0 +1,5 @@
+accumulo_user_manual.aux
+accumulo_user_manual.log
+accumulo_user_manual.out
+accumulo_user_manual.pdf
+accumulo_user_manual.toc

Propchange: accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Apr 29 23:32:49 2013
@@ -0,0 +1 @@
+*.aux

Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/examples:r1477346-1477413

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1477346-1477413

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1477346-1477413

Modified: accumulo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1477414&r1=1477413&r2=1477414&view=diff
==============================================================================
--- accumulo/trunk/pom.xml (original)
+++ accumulo/trunk/pom.xml Mon Apr 29 23:32:49 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>

Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/pom.xml:r1477346-1477413

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/server:r1477346-1477413

Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/src:r1477346-1477413



Mime
View raw message