accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject svn commit: r1484047 - in /accumulo/trunk: ./ assemble/ assemble/src/main/assemblies/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ proxy/ server/ server/src/main/c++/nativeMap/ src/
Date Sat, 18 May 2013 02:55:19 GMT
Author: ctubbsii
Date: Sat May 18 02:55:19 2013
New Revision: 1484047

URL: http://svn.apache.org/r1484047
Log:
ACCUMULO-1413 merge to trunk

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/.gitignore
    accumulo/trunk/assemble/   (props changed)
    accumulo/trunk/assemble/pom.xml
    accumulo/trunk/assemble/src/main/assemblies/binary-release.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   (contents, props changed)
    accumulo/trunk/proxy/README   (props changed)
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/server/src/main/c++/nativeMap/Makefile
    accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5:r1483561-1483626,1483628-1483629,1483631,1483634-1483955,1483957-1484042,1484044-1484045

Modified: accumulo/trunk/.gitignore
URL: http://svn.apache.org/viewvc/accumulo/trunk/.gitignore?rev=1484047&r1=1484046&r2=1484047&view=diff
==============================================================================
--- accumulo/trunk/.gitignore (original)
+++ accumulo/trunk/.gitignore Sat May 18 02:55:19 2013
@@ -13,14 +13,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# /
+# global Eclipse, Maven, Python
+target/
+.project
+.classpath
+.settings
+.pydevproject
 *.pyc
+
+# JetBrains IDE
+.idea
+*.iml
+
+# /
 /logs
 /walogs
-/target
-/.project
-/.settings
-/.pydevproject
 
 # /conf/
 /conf/accumulo-metrics.xml
@@ -34,31 +41,12 @@
 /conf/accumulo-site.xml
 /conf/accumulo_user_manual.pdf
 
-# /contrib/accumulo_sample/
-/contrib/accumulo_sample/.settings
-/contrib/accumulo_sample/.project
-/contrib/accumulo_sample/target
-
 # /contrib/accumulo_sample/ingest/
-/contrib/accumulo_sample/ingest/target
-/contrib/accumulo_sample/ingest/.settings
-/contrib/accumulo_sample/ingest/.classpath
-/contrib/accumulo_sample/ingest/.project
 /contrib/accumulo_sample/ingest/lib
 
 # /contrib/accumulo_sample/query/
-/contrib/accumulo_sample/query/target
-/contrib/accumulo_sample/query/.settings
-/contrib/accumulo_sample/query/.classpath
-/contrib/accumulo_sample/query/.project
 /contrib/accumulo_sample/query/lib
 
-# /contrib/accumulo_sample/query-war/
-/contrib/accumulo_sample/query-war/target
-/contrib/accumulo_sample/query-war/.settings
-/contrib/accumulo_sample/query-war/.classpath
-/contrib/accumulo_sample/query-war/.project
-
 # /docs/
 /docs/config.html
 /docs/accumulo_user_manual.pdf
@@ -71,55 +59,6 @@
 /lib/native
 /lib/*.jar
 
-# /assemble/
-/assemble/target
-/assemble/.settings
-/assemble/.project
-
-# /core/
-/core/target
-/core/.settings
-/core/.project
-/core/.classpath
-
-# /examples/
-/examples/lib
-/examples/target
-/examples/.settings
-/examples/.classpath
-/examples/.project
-
-# /examples/instamo/
-/examples/instamo/target
-/examples/instamo/.classpath
-/examples/instamo/.project
-/examples/instamo/.settings/
-
-
-# /examples/simple/
-/examples/simple/target
-/examples/simple/.classpath
-/examples/simple/.project
-/examples/simple/.settings/
-
-# /fate/
-/fate/target
-/fate/.settings
-/fate/.classpath
-/fate/.project
-
-# /proxy/
-/proxy/target
-/proxy/.settings
-/proxy/.classpath
-/proxy/.project
-
-# /server/
-/server/target
-/server/.project
-/server/.settings
-/server/.classpath
-
 # /server/src/main/c++/mlock/
 /server/src/main/c++/mlock/*.jnilib
 /server/src/main/c++/mlock/org_apache_accumulo_server_tabletserver_MLock.h
@@ -127,39 +66,11 @@
 # /server/src/main/c++/nativeMap/
 /server/src/main/c++/nativeMap/*.jnilib
 
-# /start/
-/start/target
-/start/.classpath
-/start/.project
-/start/.settings
-
-# /trace/
-/trace/target
-/trace/.classpath
-/trace/.project
-/trace/.settings
-
-# /test/
-/test/target
-/test/.classpath
-/test/.project
-/test/.settings
-
 # /test/system/auto/
-/test/system/auto/*.pyc
 /test/system/auto/fake_disk_failure.so
 
-# /test/system/auto/simple/
-/test/system/auto/simple/*.pyc
-
-# /test/system/auto/stress/
-/test/system/auto/stress/*.pyc
-
 # /test/system/continuous/
 /test/system/continuous/continuous-env.sh
 /test/system/continuous/walkers.txt
 /test/system/continuous/ingesters.txt
 
-# JetBrains IDE
-.idea
-*.iml

Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/assemble:r1483561-1483626,1483628-1483629,1483631,1483634-1483955,1483957-1484042,1484044-1484045

Modified: accumulo/trunk/assemble/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1484047&r1=1484046&r2=1484047&view=diff
==============================================================================
--- accumulo/trunk/assemble/pom.xml (original)
+++ accumulo/trunk/assemble/pom.xml Sat May 18 02:55:19 2013
@@ -107,6 +107,34 @@
   </build>
   <profiles>
     <profile>
+      <id>apache-release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-source-release-assembly</id>
+                <goals>
+                  <goal>attach-artifact</goal>
+                </goals>
+                <configuration>
+                  <artifacts>
+                    <artifact>
+                      <file>${project.parent.build.directory}/${project.artifactId}-${project.version}-src.tar.gz</file>
+                      <type>tar.gz</type>
+                      <classifier>src</classifier>
+                    </artifact>
+                  </artifacts>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
       <id>assemble</id>
       <build>
         <plugins>
@@ -122,6 +150,7 @@
                 <phase>package</phase>
                 <configuration>
                   <attach>true</attach>
+                  <finalName>${project.artifactId}-${project.version}</finalName>
                   <descriptors>
                     <descriptor>src/main/assemblies/binary-release.xml</descriptor>
                   </descriptors>
@@ -226,6 +255,25 @@
                       </sources>
                     </mapping>
                     <mapping>
+                      <directory>/opt/accumulo/accumulo-${project.version}/proxy</directory>
+                      <sources>
+                        <source>
+                          <location>${accumulo-top}/proxy/README</location>
+                        </source>
+                        <source>
+                          <location>${accumulo-top}/proxy/proxy.properties</location>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
+                      <directory>/opt/accumulo/accumulo-${project.version}/proxy/examples</directory>
+                      <sources>
+                        <source>
+                          <location>${accumulo-top}/proxy/examples</location>
+                        </source>
+                      </sources>
+                    </mapping>
+                    <mapping>
                       <directory>/opt/accumulo/accumulo-${project.version}/proxy/thrift</directory>
                       <sources>
                         <source>
@@ -436,6 +484,33 @@
                       <excludes>**/.svn/**,src/**</excludes>
                     </data>
                     <data>
+                      <src>${accumulo-top}/proxy/README</src>
+                      <type>file</type>
+                      <mapper>
+                        <type>perm</type>
+                        <prefix>/usr/lib/accumulo/proxy</prefix>
+                      </mapper>
+                      <includes>*.thrift</includes>
+                    </data>
+                    <data>
+                      <src>${accumulo-top}/proxy/proxy.properties</src>
+                      <type>file</type>
+                      <mapper>
+                        <type>perm</type>
+                        <prefix>/usr/lib/accumulo/proxy</prefix>
+                      </mapper>
+                      <includes>*.thrift</includes>
+                    </data>
+                    <data>
+                      <src>${accumulo-top}/proxy/examples</src>
+                      <type>directory</type>
+                      <mapper>
+                        <type>perm</type>
+                        <prefix>/usr/lib/accumulo/proxy/examples</prefix>
+                      </mapper>
+                      <excludes>**/.svn/**</excludes>
+                    </data>
+                    <data>
                       <src>${accumulo-top}/proxy/src/main/thrift</src>
                       <type>directory</type>
                       <mapper>

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=1484047&r1=1484046&r2=1484047&view=diff
==============================================================================
--- accumulo/trunk/assemble/src/main/assemblies/binary-release.xml (original)
+++ accumulo/trunk/assemble/src/main/assemblies/binary-release.xml Sat May 18 02:55:19 2013
@@ -141,6 +141,20 @@
       </includes>
     </fileSet>
     <fileSet>
+      <directory>../proxy</directory>
+      <directoryMode>0755</directoryMode>
+      <fileMode>0644</fileMode>
+      <includes>
+        <include>README</include>
+        <include>proxy.properties</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../proxy/examples</directory>
+      <directoryMode>0755</directoryMode>
+      <fileMode>0644</fileMode>
+    </fileSet>
+    <fileSet>
       <directory>../proxy/src/main/thrift</directory>
       <directoryMode>0755</directoryMode>
       <fileMode>0644</fileMode>

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/core:r1483561-1483626,1483628-1483629,1483631,1483634-1483955,1483957-1484042,1484044-1484045

Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/examples:r1483561-1483626,1483628-1483629,1483631,1483634-1483955,1483957-1484042,1484044-1484045

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:r1483561-1483626,1483628-1483629,1483631,1483634-1483955,1483957-1484042,1484044-1484045

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:r1483561-1483626,1483628-1483629,1483631,1483634-1483955,1483957-1484042,1484044-1484045

Modified: accumulo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1484047&r1=1484046&r2=1484047&view=diff
==============================================================================
--- accumulo/trunk/pom.xml (original)
+++ accumulo/trunk/pom.xml Sat May 18 02:55:19 2013
@@ -112,8 +112,6 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <sealJars>false</sealJars>
-    <!-- include the tarball, as well as the zip, for the Apache source-release artifact
-->
-    <sourceReleaseAssemblyDescriptor>source-release-zip-tar</sourceReleaseAssemblyDescriptor>
     <!-- ZooKeeper 3.4.x works also, but we're not using new features yet; this ensures
3.3.x compatibility. -->
     <zookeeper.version>3.3.6</zookeeper.version>
   </properties>
@@ -776,23 +774,51 @@
       <build>
         <plugins>
           <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.apache.resources</groupId>
+                <artifactId>apache-source-release-assembly-descriptor</artifactId>
+                <version>1.0.4</version>
+              </dependency>
+            </dependencies>
             <executions>
               <execution>
-                <id>attach-source-release-assembly</id>
+                <id>source-release-assembly</id>
                 <goals>
-                  <goal>attach-artifact</goal>
+                  <goal>single</goal>
                 </goals>
+                <phase>validate</phase>
                 <configuration>
                   <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-                  <artifacts>
-                    <artifact>
-                      <file>${project.build.directory}/${project.artifactId}-${project.version}-source-release.tar.gz</file>
-                      <type>tar.gz</type>
-                      <classifier>src</classifier>
-                    </artifact>
-                  </artifacts>
+                  <finalName>accumulo-${project.version}</finalName>
+                  <descriptorRefs>
+                    <descriptorRef>source-release-zip-tar</descriptorRef>
+                  </descriptorRefs>
+                  <tarLongFileFormat>gnu</tarLongFileFormat>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>rename-source-release-assembly</id>
+                <goals>
+                  <goal>exec</goal>
+                </goals>
+                <phase>validate</phase>
+                <configuration>
+                  <executable>mv</executable>
+                  <workingDirectory>${project.build.directory}</workingDirectory>
+                  <commandlineArgs>-n accumulo-${project.version}-source-release.tar.gz
accumulo-${project.version}-src.tar.gz</commandlineArgs>
+                  <successCodes>
+                    <successCode>0</successCode>
+                    <successCode>1</successCode>
+                  </successCodes>
                 </configuration>
               </execution>
             </executions>

Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/pom.xml:r1483561-1483626,1483628-1483629,1483631,1483634-1483955,1483957-1484042,1484044-1484045

Propchange: accumulo/trunk/proxy/README
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/proxy/README:r1483561-1483626,1483628-1483629,1483631,1483634-1483955,1483957-1484042,1484044-1484045

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/server:r1483561-1483626,1483628-1483629,1483631,1483634-1483955,1483957-1484042,1484044-1484045

Modified: accumulo/trunk/server/src/main/c++/nativeMap/Makefile
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/c%2B%2B/nativeMap/Makefile?rev=1484047&r1=1484046&r2=1484047&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/c++/nativeMap/Makefile (original)
+++ accumulo/trunk/server/src/main/c++/nativeMap/Makefile Sat May 18 02:55:19 2013
@@ -55,7 +55,7 @@ all : $(INSTALLED_LIBS)
 clean:
 	rm -f $(INSTALLED_LIBS) $(LIBS)
 
-org_apache_accumulo_server_tabletserver_NativeMap.h : ../../java/org/apache/accumulo/server/tabletserver/NativeMap.java
+org_apache_accumulo_server_tabletserver_NativeMap.h :
 	javah -classpath ../../../../../lib/accumulo-server.jar org.apache.accumulo.server.tabletserver.NativeMap
 
 $(INSTALLED_LIBS) : $(INSTALL_DIR) $(LIBS)

Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/src:r1483561-1483626,1483628-1483629,1483631,1483634-1483955,1483957-1484042,1484044-1484045



Mime
View raw message