accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject svn commit: r1441312 - in /accumulo/trunk: assemble/dist.xml assemble/pom.xml pom.xml
Date Fri, 01 Feb 2013 03:56:19 GMT
Author: elserj
Date: Fri Feb  1 03:56:18 2013
New Revision: 1441312

URL: http://svn.apache.org/viewvc?rev=1441312&view=rev
Log:
ACCUMULO-1008 Lift gen-* out of proxy/target to proxy/thrift in the tarball. Also fix the
reactor order so the proxy will build before assemble.

Modified:
    accumulo/trunk/assemble/dist.xml
    accumulo/trunk/assemble/pom.xml
    accumulo/trunk/pom.xml

Modified: accumulo/trunk/assemble/dist.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/dist.xml?rev=1441312&r1=1441311&r2=1441312&view=diff
==============================================================================
--- accumulo/trunk/assemble/dist.xml (original)
+++ accumulo/trunk/assemble/dist.xml Fri Feb  1 03:56:18 2013
@@ -62,6 +62,22 @@
         <exclude>**.*</exclude>
       </excludes>
     </fileSet>
+    <!-- Lift generated thrift proxy code into its own directory -->
+    <fileSet>
+      <directory>../proxy/target</directory>
+      <fileMode>0644</fileMode>
+      <directoryMode>0755</directoryMode>
+      <outputDirectory>proxy/thrift</outputDirectory>
+      <includes>
+        <include>gen-cpp/**</include>
+        <include>gen-java/**</include>
+        <include>gen-py/**</include>
+        <include>gen-rb/**</include>
+      </includes>
+      <excludes>
+        <exclude>*</exclude>
+      </excludes>
+    </fileSet>
     <fileSet>
       <directory>../</directory>
       <excludes>

Modified: accumulo/trunk/assemble/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1441312&r1=1441311&r2=1441312&view=diff
==============================================================================
--- accumulo/trunk/assemble/pom.xml (original)
+++ accumulo/trunk/assemble/pom.xml Fri Feb  1 03:56:18 2013
@@ -53,6 +53,10 @@
       <groupId>org.apache.accumulo</groupId>
       <artifactId>accumulo-trace</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>accumulo-proxy</artifactId>
+    </dependency>
   </dependencies>
 
   <build>

Modified: accumulo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1441312&r1=1441311&r2=1441312&view=diff
==============================================================================
--- accumulo/trunk/pom.xml (original)
+++ accumulo/trunk/pom.xml Fri Feb  1 03:56:18 2013
@@ -623,6 +623,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.accumulo</groupId>
+        <artifactId>accumulo-proxy</artifactId>
+        <version>1.5.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.accumulo</groupId>
         <artifactId>accumulo-examples-simple</artifactId>
         <version>1.5.0-SNAPSHOT</version>
       </dependency>



Mime
View raw message