incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1294842 - in /incubator/accumulo/trunk: ./ pom.xml src/assemble/pom.xml
Date Tue, 28 Feb 2012 21:28:54 GMT
Author: vines
Date: Tue Feb 28 21:28:53 2012
New Revision: 1294842

URL: http://svn.apache.org/viewvc?rev=1294842&view=rev
Log:
Merging ACCUMULO-19


Modified:
    incubator/accumulo/trunk/   (props changed)
    incubator/accumulo/trunk/pom.xml
    incubator/accumulo/trunk/src/assemble/pom.xml

Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 28 21:28:53 2012
@@ -1,3 +1,3 @@
 /incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632
 /incubator/accumulo/branches/1.3.5rc:1209938
-/incubator/accumulo/branches/1.4:1201902-1294805
+/incubator/accumulo/branches/1.4:1201902-1294841

Modified: incubator/accumulo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/pom.xml?rev=1294842&r1=1294841&r2=1294842&view=diff
==============================================================================
--- incubator/accumulo/trunk/pom.xml (original)
+++ incubator/accumulo/trunk/pom.xml Tue Feb 28 21:28:53 2012
@@ -199,6 +199,170 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>jdeb</artifactId>
+        <groupId>org.vafer</groupId>
+        <version>0.10</version>
+        <inherited>false</inherited>
+        <executions>
+          <execution>
+            <id>accumulo</id>
+            <phase>install</phase>
+            <goals>
+              <goal>jdeb</goal>
+            </goals>
+            <configuration>
+              <deb>${project.build.directory}/${artifactId}_${project.version}.deb</deb>
+              <attach>false</attach>
+              <controlDir>src/packages/deb/accumulo</controlDir>
+              <installDir>/usr/lib/accumulo</installDir>
+              <dataSet>
+                <data>
+                  <src>lib</src>
+                  <type>directory</type>
+                  <mapper>
+                    <type>perm</type>
+                    <prefix>/usr/lib/accumulo/lib</prefix>
+                  </mapper>
+                  <excludes>**/.svn/**</excludes>
+                </data>
+                <data>
+                  <src>NOTICE</src>
+                  <type>file</type>
+                  <mapper>
+                    <type>perm</type>
+                  <prefix>/usr/lib/accumulo</prefix>
+                  </mapper>
+                </data>
+                <data>
+                  <src>DISCLAIMER</src>
+                  <type>file</type>
+                  <mapper>
+                    <type>perm</type>
+                  <prefix>/usr/lib/accumulo</prefix>
+                  </mapper>
+                </data>
+                <data>
+                  <src>NOTICE</src>
+                  <type>file</type>
+                  <mapper>
+                    <type>perm</type>
+                  <prefix>/usr/lib/accumulo</prefix>
+                  </mapper>
+                </data>
+                <data>
+                  <src>CHANGES</src>
+                  <type>file</type>
+                  <mapper>
+                    <type>perm</type>
+                  <prefix>/usr/lib/accumulo</prefix>
+                  </mapper>
+                </data>
+                <data>
+                  <src>README</src>
+                  <type>file</type>
+                  <mapper>
+                    <type>perm</type>
+                  <prefix>/usr/lib/accumulo</prefix>
+                  </mapper>
+                </data>
+                <data>
+                  <src>docs</src>
+                  <type>directory</type>
+                  <mapper>
+                    <type>perm</type>
+                    <prefix>/usr/lib/accumulo/docs</prefix>
+                  </mapper>
+                  <excludes>**/.svn/**</excludes>
+                </data>
+                <data>
+                  <src>bin</src>
+                  <type>directory</type>
+                  <mapper>
+                    <type>perm</type>
+                    <prefix>/usr/lib/accumulo/bin</prefix>
+                    <filemode>755</filemode>
+                  </mapper>
+                  <excludes>**/.svn/**</excludes>
+                </data>
+                <data>
+                  <src>conf</src>
+                  <type>directory</type>
+                  <mapper>
+                    <type>perm</type>
+                    <prefix>/usr/lib/accumulo/conf</prefix>
+                  </mapper>
+                  <excludes>**/.svn/**,**/accumulo-site.xml,**/accumulo-env.sh,**/accumulo-metrics.xml,**/test-*,**/slaves,**/masters,**/tracers,**/gc,**/monitor</excludes>
+                </data>
+              </dataSet>
+            </configuration>
+          </execution>
+          <execution>
+            <id>accumulo-native</id>
+            <phase>install</phase>
+            <goals>
+              <goal>jdeb</goal>
+            </goals>
+            <configuration>
+              <attach>false</attach>
+              <controlDir>src/packages/deb/accumulo-native</controlDir>
+              <installDir>/usr/lib/accumulo</installDir>
+              <deb>${project.build.directory}/${artifactId}-native_${project.version}-${os.arch}.deb</deb>
+              <dataSet>
+                <data>
+                  <src>src/server/src/main/c++</src>
+                  <type>directory</type>
+                  <mapper>
+                    <type>perm</type>
+                    <prefix>/usr/lib/accumulo/src/server/src/main/c++</prefix>
+                  </mapper>
+                  <excludes>**/.svn/**</excludes>
+                </data>
+                <data>
+                  <src>src/server/src/main/java/org/apache/accumulo/server/tabletserver/MLock.java</src>
+                  <type>file</type>
+                  <mapper>
+                    <type>perm</type>
+                    <prefix>/usr/lib/accumulo/src/server/src/main/java/org/apache/accumulo/server/tabletserver/MLock.java</prefix>
+                  </mapper>
+                </data>
+                <data>
+                  <src>src/server/src/main/java/org/apache/accumulo/server/tabletserver/NativeMap.java</src>
+                  <type>file</type>
+                  <mapper>
+                    <type>perm</type>
+                    <prefix>/usr/lib/accumulo/src/server/src/main/java/org/apache/accumulo/server/tabletserver/NativeMap.java</prefix>
+                  </mapper>
+                </data>
+              </dataSet>
+            </configuration>
+          </execution>
+          <execution>
+            <id>accumulo-test</id>
+            <phase>install</phase>
+            <goals>
+              <goal>jdeb</goal>
+            </goals>
+            <configuration>
+              <attach>false</attach>
+              <controlDir>src/packages/deb/accumulo-test</controlDir>
+              <installDir>/usr/lib/accumulo</installDir>
+              <deb>${project.build.directory}/${artifactId}-test_${project.version}-${os.arch}.deb</deb>
+              <dataSet>
+                <data>
+                  <src>test</src>
+                  <type>directory</type>
+                  <mapper>
+                    <type>perm</type>
+                    <prefix>/usr/lib/accumulo/test</prefix>
+                  </mapper>
+                  <excludes>**/.svn/**,**/*.pyc</excludes>
+                </data>
+              </dataSet>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
 
 

Modified: incubator/accumulo/trunk/src/assemble/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/assemble/pom.xml?rev=1294842&r1=1294841&r2=1294842&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/assemble/pom.xml (original)
+++ incubator/accumulo/trunk/src/assemble/pom.xml Tue Feb 28 21:28:53 2012
@@ -261,7 +261,7 @@
             <executions>
               <execution>
                 <id>accumulo</id>
-                <phase>package</phase>
+                <phase>install</phase>
                 <goals>
                   <goal>jdeb</goal>
                 </goals>
@@ -353,7 +353,7 @@
               </execution>
               <execution>
                 <id>accumulo-native</id>
-                <phase>package</phase>
+                <phase>install</phase>
                 <goals>
                   <goal>jdeb</goal>
                 </goals>
@@ -393,7 +393,7 @@
               </execution>
               <execution>
                 <id>accumulo-test</id>
-                <phase>package</phase>
+                <phase>install</phase>
                 <goals>
                   <goal>jdeb</goal>
                 </goals>



Mime
View raw message