Return-Path: 
 <commits-return-3536-apmail-accumulo-commits-archive=accumulo.apache.org@accumulo.apache.org>
X-Original-To: apmail-accumulo-commits-archive@www.apache.org
Delivered-To: apmail-accumulo-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id EB86DF9FE
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Thu, 11 Apr 2013 21:23:19 +0000 (UTC)
Received: (qmail 36530 invoked by uid 500); 11 Apr 2013 21:23:19 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 36501 invoked by uid 500); 11 Apr 2013 21:23:19 -0000
Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@accumulo.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@accumulo.apache.org>
List-Post: <mailto:commits@accumulo.apache.org>
List-Id: <commits.accumulo.apache.org>
Reply-To: dev@accumulo.apache.org
Delivered-To: mailing list commits@accumulo.apache.org
Received: (qmail 36478 invoked by uid 99); 11 Apr 2013 21:23:19 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Apr 2013 21:23:19 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Apr 2013 21:23:18 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id D3C182388A32;
	Thu, 11 Apr 2013 21:22:57 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1467098 - in /accumulo/trunk: ./ assemble/
 assemble/dist.xml
 assemble/pom.xml core/ examples/
 fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
 fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
 pom.xml server/ src/
Date: Thu, 11 Apr 2013 21:22:57 -0000
To: commits@accumulo.apache.org
From: ctubbsii@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130411212257.D3C182388A32@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ctubbsii
Date: Thu Apr 11 21:22:57 2013
New Revision: 1467098

URL: http://svn.apache.org/r1467098
Log:
ACCUMULO-1107 merge to trunk

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/assemble/   (props changed)
    accumulo/trunk/assemble/dist.xml
    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
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5:r1467034-1467050,1467052-1467094

Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/assemble:r1467034-1467050,1467052-1467094

Modified: accumulo/trunk/assemble/dist.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/dist.xml?rev=1467098&r1=1467097&r2=1467098&view=diff
==============================================================================
--- accumulo/trunk/assemble/dist.xml (original)
+++ accumulo/trunk/assemble/dist.xml Thu Apr 11 21:22:57 2013
@@ -50,7 +50,7 @@
         <include>**/*.pl</include>
         <include>**/*.sh</include>
         <include>**/*.example</include>
-        <include>${so}</include>
+        <include>**/*.so</include>
       </includes>
       <excludes>
         <exclude>**/target</exclude>
@@ -109,8 +109,6 @@
         <exclude>**/randomwalk/conf/logger.xml</exclude>
         <exclude>**/randomwalk/conf/randomwalk.conf</exclude>
         <exclude>**/randomwalk/conf/walkers</exclude>
-        <exclude>${so}</exclude>
-        <exclude>${jnilib}</exclude>
       </excludes>
       <fileMode>0644</fileMode>
       <directoryMode>0755</directoryMode>

Modified: accumulo/trunk/assemble/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1467098&r1=1467097&r2=1467098&view=diff
==============================================================================
--- accumulo/trunk/assemble/pom.xml (original)
+++ accumulo/trunk/assemble/pom.xml Thu Apr 11 21:22:57 2013
@@ -27,8 +27,6 @@
   <name>Assemble</name>
   <properties>
     <accumulo-top>..</accumulo-top>
-    <jnilib>**/*.jnilib</jnilib>
-    <so>**/*.so</so>
   </properties>
   <dependencies>
     <!--
@@ -130,13 +128,6 @@
       </build>
     </profile>
     <profile>
-      <id>dist</id>
-      <properties>
-        <jnilib></jnilib>
-        <so></so>
-      </properties>
-    </profile>
-    <profile>
       <id>rpm</id>
       <build>
         <plugins>
@@ -152,7 +143,6 @@
                 Google's BigTable design.</description>
               <copyright>2011 The Apache Software Foundation.</copyright>
               <url>http://accumulo.apache.org</url>
-              <needarch>true</needarch>
               <group>Utilities</group>
               <requires>
                 <require>jdk</require>
@@ -178,6 +168,9 @@
                   <sources>
                     <source>
                       <location>${accumulo-top}/docs</location>
+                      <excludes>
+                        <exclude>src/**</exclude>
+                      </excludes>
                     </source>
                   </sources>
                 </mapping>
@@ -187,10 +180,15 @@
                     <source>
                       <location>${accumulo-top}/test</location>
                       <excludes>
-                        <exclude>${accumulo-top}/**/walkers.txt</exclude>
-                        <exclude>${accumulo-top}/**/ingesters.txt</exclude>
-                        <exclude>${accumulo-top}/**/continuous-env.sh</exclude>
-                        <exclude>${accumulo-top}/**/*.pyc</exclude>
+                        <exclude>src/**</exclude>
+                        <exclude>target/**</exclude>
+                        <exclude>**/walkers.txt</exclude>
+                        <exclude>**/ingesters.txt</exclude>
+                        <exclude>**/continuous-env.sh</exclude>
+                        <exclude>.*/**</exclude>
+                        <exclude>**/*.pyc</exclude>
+                        <exclude>**/*.pyo</exclude>
+                        <exclude>pom.xml</exclude>
                       </excludes>
                     </source>
                   </sources>
@@ -231,19 +229,24 @@
                 </mapping>
                 <mapping>
                   <directory>/opt/accumulo/accumulo-${project.version}/lib</directory>
-                  <dependency></dependency>
                   <sources>
                     <source>
                       <location>${accumulo-top}/lib</location>
+                      <includes>
+                        <include>*.jar</include>
+                      </includes>
                     </source>
                   </sources>
                 </mapping>
+                <mapping>
+                  <directory>/opt/accumulo/accumulo-${project.version}/lib/ext</directory>
+                </mapping>
               </mappings>
             </configuration>
             <executions>
               <execution>
                 <goals>
-                  <goal>rpm</goal>
+                  <goal>attached-rpm</goal>
                 </goals>
                 <phase>package</phase>
               </execution>
@@ -267,10 +270,10 @@
                 <goals>
                   <goal>jdeb</goal>
                 </goals>
-                <phase>install</phase>
+                <phase>package</phase>
                 <configuration>
+                  <classifier>deb</classifier>
                   <deb>${project.build.directory}/${project.artifactId}_${project.version}.deb</deb>
-                  <attach>false</attach>
                   <controlDir>assemble/deb/accumulo</controlDir>
                   <installDir>/usr/lib/accumulo</installDir>
                   <dataSet>
@@ -352,11 +355,11 @@
                 <goals>
                   <goal>jdeb</goal>
                 </goals>
-                <phase>install</phase>
+                <phase>package</phase>
                 <configuration>
-                  <attach>false</attach>
                   <controlDir>assemble/deb/accumulo-native</controlDir>
                   <installDir>/usr/lib/accumulo</installDir>
+                  <classifier>native-deb</classifier>
                   <deb>${project.build.directory}/${project.artifactId}-native_${project.version}-${os.arch}.deb</deb>
                   <dataSet>
                     <data>
@@ -392,11 +395,11 @@
                 <goals>
                   <goal>jdeb</goal>
                 </goals>
-                <phase>install</phase>
+                <phase>package</phase>
                 <configuration>
-                  <attach>false</attach>
                   <controlDir>assemble/deb/accumulo-test</controlDir>
                   <installDir>/usr/lib/accumulo</installDir>
+                  <classifier>test-deb</classifier>
                   <deb>${project.build.directory}/${project.artifactId}-test_${project.version}-${os.arch}.deb</deb>
                   <dataSet>
                     <data>

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/core:r1467034-1467050,1467052-1467094

Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/examples:r1467034-1467050,1467052-1467094

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:r1467034-1467050,1467052-1467094

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:r1467034-1467050,1467052-1467094

Modified: accumulo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1467098&r1=1467097&r2=1467098&view=diff
==============================================================================
--- accumulo/trunk/pom.xml (original)
+++ accumulo/trunk/pom.xml Thu Apr 11 21:22:57 2013
@@ -837,7 +837,15 @@
       </dependencyManagement>
     </profile>
     <profile>
-      <id>release</id>
+      <!-- Seal jars when either the apache-release profile is
+           activated or when tests are skipped -->
+      <id>apache-release</id>
+      <activation>
+        <property>
+          <name>skipTests</name>
+          <value>!false</value>
+        </property>
+      </activation>
       <properties>
         <sealJars>true</sealJars>
         <skipTests>true</skipTests>

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/server:r1467034-1467050,1467052-1467094

Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/src:r1467034-1467050,1467052-1467094