Return-Path: 
 <accumulo-commits-return-1244-apmail-incubator-accumulo-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id E4B6A97C8
	for <apmail-incubator-accumulo-commits-archive@minotaur.apache.org>;
 Tue, 13 Mar 2012 19:56:03 +0000 (UTC)
Received: (qmail 19477 invoked by uid 500); 13 Mar 2012 19:56:03 -0000
Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org
Received: (qmail 19449 invoked by uid 500); 13 Mar 2012 19:56:03 -0000
Mailing-List: contact accumulo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:accumulo-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:accumulo-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:accumulo-commits@incubator.apache.org>
List-Id: <accumulo-commits.incubator.apache.org>
Reply-To: accumulo-dev@incubator.apache.org
Delivered-To: mailing list accumulo-commits@incubator.apache.org
Received: (qmail 19440 invoked by uid 99); 13 Mar 2012 19:56:03 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Mar 2012 19:56:03 +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, 13 Mar 2012 19:56:02 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 2015E23889D5;
	Tue, 13 Mar 2012 19:55:42 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1300311 - in /incubator/accumulo/trunk: ./ assemble/
 core/
 examples/ packages/ server/ src/assemble/ src/core/ src/examples/
 src/packages/ src/server/ src/start/ src/trace/ start/ trace/
Date: Tue, 13 Mar 2012 19:55:41 -0000
To: accumulo-commits@incubator.apache.org
From: bimargulies@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120313195542.2015E23889D5@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: bimargulies
Date: Tue Mar 13 19:55:40 2012
New Revision: 1300311

URL: http://svn.apache.org/viewvc?rev=1300311&view=rev
Log:
ACCUMULO-464: hoist all subdirs of src to the toplevel, and tweak pathnames to go match.

Added:
    incubator/accumulo/trunk/assemble/
      - copied from r1300292, incubator/accumulo/trunk/src/assemble/
    incubator/accumulo/trunk/core/
      - copied from r1300292, incubator/accumulo/trunk/src/core/
    incubator/accumulo/trunk/examples/
      - copied from r1300292, incubator/accumulo/trunk/src/examples/
    incubator/accumulo/trunk/packages/
      - copied from r1300292, incubator/accumulo/trunk/src/packages/
    incubator/accumulo/trunk/server/
      - copied from r1300292, incubator/accumulo/trunk/src/server/
    incubator/accumulo/trunk/start/
      - copied from r1300292, incubator/accumulo/trunk/src/start/
    incubator/accumulo/trunk/trace/
      - copied from r1300292, incubator/accumulo/trunk/src/trace/
Removed:
    incubator/accumulo/trunk/src/assemble/
    incubator/accumulo/trunk/src/core/
    incubator/accumulo/trunk/src/examples/
    incubator/accumulo/trunk/src/packages/
    incubator/accumulo/trunk/src/server/
    incubator/accumulo/trunk/src/start/
    incubator/accumulo/trunk/src/trace/
Modified:
    incubator/accumulo/trunk/assemble/build.sh
    incubator/accumulo/trunk/assemble/docgen.sh
    incubator/accumulo/trunk/assemble/pom.xml
    incubator/accumulo/trunk/core/pom.xml
    incubator/accumulo/trunk/examples/pom.xml
    incubator/accumulo/trunk/pom.xml
    incubator/accumulo/trunk/server/pom.xml
    incubator/accumulo/trunk/trace/pom.xml

Modified: incubator/accumulo/trunk/assemble/build.sh
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/assemble/build.sh?rev=1300311&r1=1300292&r2=1300311&view=diff
==============================================================================
--- incubator/accumulo/trunk/assemble/build.sh (original)
+++ incubator/accumulo/trunk/assemble/build.sh Tue Mar 13 19:55:40 2012
@@ -16,7 +16,7 @@
 # limitations under the License.
 
 loc=`dirname "$0"`
-loc=`cd "$loc/../.."; pwd`
+loc=`cd "$loc/.."; pwd`
 
 cd "$loc"
 

Modified: incubator/accumulo/trunk/assemble/docgen.sh
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/assemble/docgen.sh?rev=1300311&r1=1300292&r2=1300311&view=diff
==============================================================================
--- incubator/accumulo/trunk/assemble/docgen.sh (original)
+++ incubator/accumulo/trunk/assemble/docgen.sh Tue Mar 13 19:55:40 2012
@@ -15,4 +15,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-java -cp ../../src/core/target/classes/:../../src/core/src/main/resources/org/apache/accumulo/core/conf/:../../lib/log4j-1.2.16.jar  org.apache.accumulo.core.conf.DefaultConfiguration --generate-doc > ../../docs/config.html
\ No newline at end of file
+java -cp ../core/target/classes/:../core/src/main/resources/org/apache/accumulo/core/conf/:../../lib/log4j-1.2.16.jar  org.apache.accumulo.core.conf.DefaultConfiguration --generate-doc > ../docs/config.html
\ No newline at end of file

Modified: incubator/accumulo/trunk/assemble/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/assemble/pom.xml?rev=1300311&r1=1300292&r2=1300311&view=diff
==============================================================================
--- incubator/accumulo/trunk/assemble/pom.xml (original)
+++ incubator/accumulo/trunk/assemble/pom.xml Tue Mar 13 19:55:40 2012
@@ -16,7 +16,6 @@
 		<groupId>org.apache.accumulo</groupId>
 		<artifactId>accumulo</artifactId>
 		<version>1.5.0-incubating-SNAPSHOT</version>
-		<relativePath>../..</relativePath>
 	</parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -70,7 +69,7 @@
             <configuration>
               <executable>bash</executable>
               <arguments>
-                <argument>../../docs/src/user_manual/build.sh</argument>
+                <argument>../docs/src/user_manual/build.sh</argument>
               </arguments>
             </configuration>
           </execution>

Modified: incubator/accumulo/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/core/pom.xml?rev=1300311&r1=1300292&r2=1300311&view=diff
==============================================================================
--- incubator/accumulo/trunk/core/pom.xml (original)
+++ incubator/accumulo/trunk/core/pom.xml Tue Mar 13 19:55:40 2012
@@ -22,7 +22,6 @@
     <groupId>org.apache.accumulo</groupId>
     <artifactId>accumulo</artifactId>
     <version>1.5.0-incubating-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

Modified: incubator/accumulo/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/examples/pom.xml?rev=1300311&r1=1300292&r2=1300311&view=diff
==============================================================================
--- incubator/accumulo/trunk/examples/pom.xml (original)
+++ incubator/accumulo/trunk/examples/pom.xml Tue Mar 13 19:55:40 2012
@@ -21,7 +21,6 @@
         <artifactId>accumulo</artifactId>
         <groupId>org.apache.accumulo</groupId>
         <version>1.5.0-incubating-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
   </parent>
   <artifactId>accumulo-examples</artifactId>
   <packaging>pom</packaging>

Modified: incubator/accumulo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/pom.xml?rev=1300311&r1=1300310&r2=1300311&view=diff
==============================================================================
--- incubator/accumulo/trunk/pom.xml (original)
+++ incubator/accumulo/trunk/pom.xml Tue Mar 13 19:55:40 2012
@@ -30,20 +30,15 @@
   <name>accumulo</name>
 
   <modules>
-    <module>src/trace</module>
-    <module>src/core</module>
-    <module>src/server</module>
-    <module>src/start</module>
-    <module>src/examples</module>
-    <module>src/assemble</module>
+    <module>trace</module>
+    <module>core</module>
+    <module>server</module>
+    <module>start</module>
+    <module>examples</module>
+    <module>assemble</module>
   </modules>
 
   <build>
-    <resources>
-      <resource>
-        <directory>${basedir}/src/main/resources</directory>
-      </resource>
-    </resources>
     
     <defaultGoal>package</defaultGoal>
     <plugins>
@@ -59,7 +54,7 @@
             <configuration>
               <rules>
                 <requireMavenVersion>
-                  <version>[2.0.9,)</version>
+                  <version>[2.2.0,)</version>
                 </requireMavenVersion>
               </rules>
             </configuration>
@@ -106,7 +101,7 @@
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <outputDirectory>../../lib</outputDirectory>
+              <outputDirectory>../lib</outputDirectory>
               <!-- just grab the non-provided runtime dependencies -->
               <includeArtifactIds>commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,commons-jci-core,commons-jci-fam,commons-logging,commons-logging-api</includeArtifactIds>
               <excludeTransitive>true</excludeTransitive>
@@ -117,7 +112,7 @@
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
-          <outputDirectory>../../lib</outputDirectory>
+          <outputDirectory>../lib</outputDirectory>
           <archive>
             <manifest>
               <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
@@ -167,14 +162,14 @@
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
         <configuration>
-          <outputDirectory>../../lib</outputDirectory>
+          <outputDirectory>../lib</outputDirectory>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <environmentVariables>
-            <ACCUMULO_HOME>../..</ACCUMULO_HOME>
+            <ACCUMULO_HOME>..</ACCUMULO_HOME>
           </environmentVariables>
         </configuration>
       </plugin>

Modified: incubator/accumulo/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/server/pom.xml?rev=1300311&r1=1300292&r2=1300311&view=diff
==============================================================================
--- incubator/accumulo/trunk/server/pom.xml (original)
+++ incubator/accumulo/trunk/server/pom.xml Tue Mar 13 19:55:40 2012
@@ -22,7 +22,6 @@
     <groupId>org.apache.accumulo</groupId>
     <artifactId>accumulo</artifactId>
     <version>1.5.0-incubating-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

Modified: incubator/accumulo/trunk/trace/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/trace/pom.xml?rev=1300311&r1=1300292&r2=1300311&view=diff
==============================================================================
--- incubator/accumulo/trunk/trace/pom.xml (original)
+++ incubator/accumulo/trunk/trace/pom.xml Tue Mar 13 19:55:40 2012
@@ -22,7 +22,6 @@
     <groupId>org.apache.accumulo</groupId>
     <artifactId>accumulo</artifactId>
     <version>1.5.0-incubating-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>