Return-Path: 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 8D3A010A40 for ; Tue, 4 Jun 2013 16:12:19 +0000 (UTC) Received: (qmail 61608 invoked by uid 500); 4 Jun 2013 16:12:19 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 61548 invoked by uid 500); 4 Jun 2013 16:12:18 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 61537 invoked by uid 99); 4 Jun 2013 16:12:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jun 2013 16:12:17 +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; Tue, 04 Jun 2013 16:12:09 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 54BBE2388A39; Tue, 4 Jun 2013 16:11:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1489495 - in /accumulo/trunk: assemble/pom.xml assemble/src/main/assemblies/binary-release.xml assemble/src/main/assemblies/component.xml assemble/src/main/assemblies/dev-directory.xml pom.xml Date: Tue, 04 Jun 2013 16:11:48 -0000 To: commits@accumulo.apache.org From: ctubbsii@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130604161148.54BBE2388A39@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ctubbsii Date: Tue Jun 4 16:11:47 2013 New Revision: 1489495 URL: http://svn.apache.org/r1489495 Log: ACCUMULO-935 use assembly plugin to generate dev directory that mirrors what would be put in tarball Added: accumulo/trunk/assemble/src/main/assemblies/component.xml accumulo/trunk/assemble/src/main/assemblies/dev-directory.xml Modified: accumulo/trunk/assemble/pom.xml accumulo/trunk/assemble/src/main/assemblies/binary-release.xml accumulo/trunk/pom.xml Modified: accumulo/trunk/assemble/pom.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1489495&r1=1489494&r2=1489495&view=diff ============================================================================== --- accumulo/trunk/assemble/pom.xml (original) +++ accumulo/trunk/assemble/pom.xml Tue Jun 4 16:11:47 2013 @@ -147,6 +147,40 @@ + make-accumulo-home + + + DEV_ACCUMULO_HOME + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + directory-assembly + + single + + package + + ${DEV_ACCUMULO_HOME} + + dir + + + src/main/assemblies/dev-directory.xml + + + + + + + + + rpm Modified: accumulo/trunk/assemble/src/main/assemblies/binary-release.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/src/main/assemblies/binary-release.xml?rev=1489495&r1=1489494&r2=1489495&view=diff ============================================================================== --- accumulo/trunk/assemble/src/main/assemblies/binary-release.xml (original) +++ accumulo/trunk/assemble/src/main/assemblies/binary-release.xml Tue Jun 4 16:11:47 2013 @@ -21,204 +21,7 @@ tar.gz - - - lib - 0755 - 0644 - ${artifact.artifactId}${dashClassifier?}.${artifact.extension} - true - false - - ${groupId}:${artifactId}-* - org.apache.commons:commons-vfs2 - com.beust:jcommander - com.google.code.gson:gson - com.google.guava:guava - jline:jline - org.apache.thrift:libthrift - - - - - - ../bin - 0755 - 0755 - - - ../examples/simple - /examples/simple - 0755 - 0644 - - src/main/** - - - - ../lib/native - 0755 - 0644 - - **/*.so - **/*.jnilib - - - - ../server/src/main/c++ - 0755 - 0644 - - **/*.so - **/*.jnilib - - - - ../lib/ext - /lib/ext - 0755 - - */** - - - - ../logs - /logs - 0700 - - */** - - - - ../docs - 0755 - 0644 - - src/** - - - - ../conf - 0755 - 0755 - - examples/**/*.sh - - - - ../conf - 0755 - 0644 - - accumulo.policy.example - examples/** - - - examples/**/*.sh - - - - ../test - 0755 - 0755 - - **/*.sh - **/*.py - **/*.pl - - - src/** - target/** - **/continuous-env.sh - - - - ../test - 0755 - 0644 - - **/.*/** - pom.xml - src/** - target/** - **/*.sh - **/*.py - **/*.pl - **/*.pyc - **/*.pyo - **/walkers.txt - **/ingesters.txt - **/randomwalk/conf/logger.xml - **/randomwalk/conf/randomwalk.conf - **/randomwalk/conf/walkers - - - - - ../proxy/target - 0755 - 0644 - proxy/thrift - - gen-cpp/** - gen-py/** - gen-rb/** - - - - ../proxy - 0755 - 0644 - - README - proxy.properties - - - - ../proxy/examples - 0755 - 0755 - - **/*.py - **/*.rb - - - - ../proxy/examples - 0755 - 0644 - - **/*.py - **/*.rb - - - - ../proxy/src/main/thrift - 0755 - 0644 - proxy/thrift - - *.thrift - - - - scripts - 0755 - 0755 - - - - - ../CHANGES - - - ../LICENSE - - - ../NOTICE - - - ../README - - + + src/main/assemblies/component.xml + Added: accumulo/trunk/assemble/src/main/assemblies/component.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/src/main/assemblies/component.xml?rev=1489495&view=auto ============================================================================== --- accumulo/trunk/assemble/src/main/assemblies/component.xml (added) +++ accumulo/trunk/assemble/src/main/assemblies/component.xml Tue Jun 4 16:11:47 2013 @@ -0,0 +1,221 @@ + + + + + + lib + 0755 + 0644 + false + ${artifact.artifactId}${dashClassifier?}.${artifact.extension} + true + false + + ${groupId}:${artifactId}-* + org.apache.commons:commons-vfs2 + com.beust:jcommander + com.google.code.gson:gson + com.google.guava:guava + jline:jline + org.apache.thrift:libthrift + + + + + + ../bin + 0755 + 0755 + + + ../examples/simple + /examples/simple + 0755 + 0644 + + src/main/** + + + + ../lib/native + 0755 + 0644 + + **/*.so + **/*.jnilib + + + + ../server/src/main/c++ + 0755 + 0644 + + **/*.so + **/*.jnilib + + + + ../lib/ext + /lib/ext + 0755 + + */** + + + + ../logs + /logs + 0700 + + */** + + + + ../docs + 0755 + 0644 + + src/** + + + + ../conf + 0755 + 0755 + + examples/**/*.sh + + + + ../conf + 0755 + 0644 + + accumulo.policy.example + examples/** + + + examples/**/*.sh + + + + ../test + 0755 + 0755 + + **/*.sh + **/*.py + **/*.pl + + + src/** + target/** + **/continuous-env.sh + + + + ../test + 0755 + 0644 + + **/.*/** + pom.xml + src/** + target/** + **/*.sh + **/*.py + **/*.pl + **/*.pyc + **/*.pyo + **/walkers.txt + **/ingesters.txt + **/randomwalk/conf/logger.xml + **/randomwalk/conf/randomwalk.conf + **/randomwalk/conf/walkers + + + + + ../proxy/target + 0755 + 0644 + proxy/thrift + + gen-cpp/** + gen-py/** + gen-rb/** + + + + ../proxy + 0755 + 0644 + + README + proxy.properties + + + + ../proxy/examples + 0755 + 0755 + + **/*.py + **/*.rb + + + + ../proxy/examples + 0755 + 0644 + + **/*.py + **/*.rb + + + + ../proxy/src/main/thrift + 0755 + 0644 + proxy/thrift + + *.thrift + + + + scripts + 0755 + 0755 + + + + + ../CHANGES + + + ../LICENSE + + + ../NOTICE + + + ../README + + + Added: accumulo/trunk/assemble/src/main/assemblies/dev-directory.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/src/main/assemblies/dev-directory.xml?rev=1489495&view=auto ============================================================================== --- accumulo/trunk/assemble/src/main/assemblies/dev-directory.xml (added) +++ accumulo/trunk/assemble/src/main/assemblies/dev-directory.xml Tue Jun 4 16:11:47 2013 @@ -0,0 +1,27 @@ + + + + dev + + dir + + + src/main/assemblies/component.xml + + Modified: accumulo/trunk/pom.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1489495&r1=1489494&r2=1489495&view=diff ============================================================================== --- accumulo/trunk/pom.xml (original) +++ accumulo/trunk/pom.xml Tue Jun 4 16:11:47 2013 @@ -741,75 +741,6 @@ - make-accumulo-home - - - DEV_ACCUMULO_HOME - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - - copy-dependencies - - prepare-package - - ${DEV_ACCUMULO_HOME}/lib - - true - runtime - true - sources,test-sources - - - - - - org.apache.maven.plugins - maven-resources-plugin - - - copy-scripts - - copy-resources - - process-resources - - ${DEV_ACCUMULO_HOME}/bin - - - bin - - - - - - copy-configuration - - copy-resources - - process-resources - - ${DEV_ACCUMULO_HOME}/conf - - - conf - - - - - - - - - - apache-release