You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2013/11/01 01:56:33 UTC
[54/54] git commit: ACCUMULO-210 Create separate RPMs
ACCUMULO-210 Create separate RPMs
Add descriptions to each module, add scripts to create user
(ACCUMULO-1387), and to set up system-wide configuration
(ACCUMULO-1385), using conventional unix directories from the RPM macros
where appropriate (ACCUMULO-1638)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/05d5921c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/05d5921c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/05d5921c
Branch: refs/heads/master
Commit: 05d5921c00cc5f71857fcb6c4a173cccc2e40123
Parents: 598821c
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Sep 27 18:03:23 2013 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Oct 31 20:40:58 2013 -0400
----------------------------------------------------------------------
assemble/pom.xml | 478 +++++++++----------
assemble/scripts/init.d/accumulo-gc | 159 ------
assemble/scripts/init.d/accumulo-master | 160 -------
assemble/scripts/init.d/accumulo-monitor | 159 ------
assemble/scripts/init.d/accumulo-tracer | 159 ------
assemble/scripts/init.d/accumulo-tserver | 162 -------
core/pom.xml | 163 +++++++
.../etc/security/limits.d/50-accumulo.conf | 17 +
core/src/main/packaging/etc/sysctl.d/accumulo | 20 +
core/src/main/packaging/preinstall.sh | 3 +
docs/pom.xml | 39 ++
examples/simple/pom.xml | 35 ++
fate/pom.xml | 34 ++
maven-plugin/pom.xml | 1 +
minicluster/pom.xml | 1 +
pom.xml | 180 ++++++-
proxy/pom.xml | 67 +++
server/base/pom.xml | 102 ++--
server/extras/pom.xml | 88 ++++
.../accumulo/utils/metanalysis/FilterMeta.java | 93 ++++
.../accumulo/utils/metanalysis/FindTablet.java | 66 +++
.../accumulo/utils/metanalysis/IndexMeta.java | 177 +++++++
.../utils/metanalysis/LogFileInputFormat.java | 116 +++++
.../utils/metanalysis/LogFileOutputFormat.java | 66 +++
.../accumulo/utils/metanalysis/PrintEvents.java | 99 ++++
.../utils/metanalysis/package-info.java | 34 ++
server/gc/pom.xml | 133 ++----
.../src/main/packaging/etc/init.d/accumulo-gc | 159 ++++++
server/master/pom.xml | 133 ++----
.../main/packaging/etc/init.d/accumulo-master | 160 +++++++
server/monitor/pom.xml | 134 ++----
.../main/packaging/etc/init.d/accumulo-monitor | 159 ++++++
server/native/pom.xml | 99 ++++
server/native/src/main/assemblies/component.xml | 6 +
server/native/src/main/resources/Makefile | 18 +-
server/tracer/pom.xml | 133 ++----
.../main/packaging/etc/init.d/accumulo-tracer | 159 ++++++
server/tserver/pom.xml | 133 ++----
.../main/packaging/etc/init.d/accumulo-tserver | 162 +++++++
server/utils/pom.xml | 135 ------
.../accumulo/utils/metanalysis/FilterMeta.java | 93 ----
.../accumulo/utils/metanalysis/FindTablet.java | 66 ---
.../accumulo/utils/metanalysis/IndexMeta.java | 177 -------
.../utils/metanalysis/LogFileInputFormat.java | 116 -----
.../utils/metanalysis/LogFileOutputFormat.java | 66 ---
.../accumulo/utils/metanalysis/PrintEvents.java | 99 ----
.../utils/metanalysis/package-info.java | 34 --
start/pom.xml | 34 ++
test/pom.xml | 1 +
trace/pom.xml | 32 ++
50 files changed, 2833 insertions(+), 2286 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/05d5921c/assemble/pom.xml
----------------------------------------------------------------------
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 32dd7e4..d11be2f 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -25,6 +25,7 @@
<artifactId>accumulo</artifactId>
<packaging>pom</packaging>
<name>Assemblies</name>
+ <description>Apache Accumulo packages.</description>
<properties>
<DEV_ACCUMULO_HOME>${project.build.directory}</DEV_ACCUMULO_HOME>
<accumulo-top>..</accumulo-top>
@@ -92,6 +93,37 @@
<artifactId>libthrift</artifactId>
</dependency>
</dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <versionRange>[1.8,)</versionRange>
+ <goals>
+ <goal>regex-property</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
<profiles>
<profile>
<id>apache-release</id>
@@ -184,256 +216,6 @@
</build>
</profile>
<profile>
- <id>rpm</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rpm-maven-plugin</artifactId>
- <inherited>false</inherited>
- <configuration>
- <!--
- The following is a trick to get the plugin to sign the rpm.
- However, these values are ignored, and gpg-agent is used instead.
- Requires copying contrib/dotfiles-rpmmacros to $HOME/.rpmmacros
- This is a workaround for bug http://jira.codehaus.org/browse/MRPM-139
- -->
- <keyname>dummy</keyname>
- <keyPassphrase>
- <passphrase>dummy</passphrase>
- </keyPassphrase>
- <summary>Apache Accumulo BigTable clone</summary>
- <description>Apache Accumulo is a large distributed structured store based on Google's BigTable design.</description>
- <!-- This populates the license field of the RPM. -->
- <copyright>Apache License, Version 2.0 and others (see included LICENSE file)</copyright>
- <url>http://accumulo.apache.org</url>
- <group>Utilities</group>
- <prefix>/opt/accumulo</prefix>
- <defaultDirmode>755</defaultDirmode>
- <defaultFilemode>644</defaultFilemode>
- <defaultUsername>root</defaultUsername>
- <defaultGroupname>root</defaultGroupname>
- </configuration>
- <executions>
- <execution>
- <id>build-bin-rpm</id>
- <goals>
- <goal>attached-rpm</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <name>accumulo</name>
- <classifier>bin</classifier>
- <provides>
- <provide>accumulo</provide>
- </provides>
- <requires>
- <require>jre</require>
- <require>hadoop</require>
- <require>zookeeper</require>
- </requires>
- <mappings>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}</directory>
- <sources>
- <source>
- <location>${accumulo-top}/CHANGES</location>
- </source>
- <source>
- <location>${accumulo-top}/LICENSE</location>
- </source>
- <source>
- <location>${accumulo-top}/NOTICE</location>
- </source>
- <source>
- <location>${accumulo-top}/README</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/docs</directory>
- <sources>
- <source>
- <location>${accumulo-top}/docs</location>
- <excludes>
- <exclude>src/**</exclude>
- </excludes>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
- <directoryIncluded>false</directoryIncluded>
- <filemode>755</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>${accumulo-top}/bin</location>
- </source>
- </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>
- <location>${accumulo-top}/proxy/src/main/thrift</location>
- <includes>
- <include>*.thrift</include>
- </includes>
- </source>
- <source>
- <location>${accumulo-top}/proxy/target</location>
- <includes>
- <include>gen-cpp/**</include>
- <include>gen-py/**</include>
- <include>gen-rb/**</include>
- </includes>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/examples/simple</directory>
- <recurseDirectories>true</recurseDirectories>
- <sources>
- <source>
- <location>${accumulo-top}/examples/simple</location>
- <includes>
- <include>src/main/**</include>
- </includes>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/conf</directory>
- <recurseDirectories>true</recurseDirectories>
- <sources>
- <source>
- <location>${accumulo-top}/conf</location>
- <includes>
- <include>accumulo.policy.example</include>
- <include>examples/**/*</include>
- <include>examples/**/*.*</include>
- </includes>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/lib</directory>
- <recurseDirectories>true</recurseDirectories>
- <sources>
- <source>
- <location>${accumulo-top}/lib</location>
- <includes>
- <include>*.jar</include>
- </includes>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/lib/ext</directory>
- </mapping>
- </mappings>
- </configuration>
- </execution>
- <execution>
- <id>build-native-libs-rpm</id>
- <goals>
- <goal>attached-rpm</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <name>accumulo-native</name>
- <classifier>native</classifier>
- <needarch>x86_64</needarch>
- <provides>
- <provide>libaccumulo</provide>
- </provides>
- <requires>
- <require>accumulo</require>
- </requires>
- <mappings>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/lib/native/map</directory>
- <sources>
- <source>
- <location>${accumulo-top}/lib/native/map</location>
- <includes>
- <include>libNativeMap-Linux-amd64-64.so</include>
- </includes>
- </source>
- </sources>
- </mapping>
- </mappings>
- </configuration>
- </execution>
- <execution>
- <id>build-tests-rpm</id>
- <goals>
- <goal>attached-rpm</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <name>accumulo-test</name>
- <classifier>test</classifier>
- <provides>
- <provide>accumulo-test</provide>
- </provides>
- <requires>
- <require>accumulo</require>
- <require>python</require>
- </requires>
- <mappings>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/test</directory>
- <sources>
- <source>
- <location>${accumulo-top}/test</location>
- <excludes>
- <exclude>src/**</exclude>
- <exclude>target/**</exclude>
- <exclude>**/walkers.txt</exclude>
- <exclude>**/ingesters.txt</exclude>
- <exclude>**/continuous-env.sh</exclude>
- <exclude>.*/**</exclude>
- <exclude>**/*.pyc</exclude>
- <exclude>**/*.pyo</exclude>
- <exclude>pom.xml</exclude>
- </excludes>
- </source>
- </sources>
- </mapping>
- </mappings>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>deb</id>
<build>
<plugins>
@@ -655,5 +437,201 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>rpm</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-docs</artifactId>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-examples-simple</artifactId>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-fate</artifactId>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-gc</artifactId>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-master</artifactId>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-monitor</artifactId>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-native</artifactId>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-proxy</artifactId>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-proxy</artifactId>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-server-base</artifactId>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-server-extras</artifactId>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-start</artifactId>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-trace</artifactId>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-tracer</artifactId>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-tserver</artifactId>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rpm-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build-rpm</id>
+ <goals>
+ <goal>attached-rpm</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <requires>
+ <require>accumulo-core = %{version}-%{release}</require>
+ <require>accumulo-docs = %{version}-%{release}</require>
+ <require>accumulo-examples-simple = %{version}-%{release}</require>
+ <require>accumulo-proxy = %{version}-%{release}</require>
+ <require>accumulo-gc = %{version}-%{release}</require>
+ <require>accumulo-master = %{version}-%{release}</require>
+ <require>accumulo-monitor = %{version}-%{release}</require>
+ <require>accumulo-native = %{version}-%{release}</require>
+ <require>accumulo-tracer = %{version}-%{release}</require>
+ <require>accumulo-tserver = %{version}-%{release}</require>
+ </requires>
+ <mappings>
+ <mapping>
+ <directory>%{_datadir}/accumulo-meta</directory>
+ </mapping>
+ </mappings>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-meta-rpm</id>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/yum-repo</outputDirectory>
+ <destFileName>${project.artifactId}-${project.version}.rpm</destFileName>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>Copy RPMs</id>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <outputDirectory>${project.build.directory}/yum-repo</outputDirectory>
+ <includeTypes>rpm</includeTypes>
+ <stripClassifier>true</stripClassifier>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>Create YUM repo</id>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <executable>createrepo</executable>
+ <arguments>
+ <argument>${project.build.directory}/yum-repo</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/05d5921c/assemble/scripts/init.d/accumulo-gc
----------------------------------------------------------------------
diff --git a/assemble/scripts/init.d/accumulo-gc b/assemble/scripts/init.d/accumulo-gc
deleted file mode 100755
index 6ca7eb4..0000000
--- a/assemble/scripts/init.d/accumulo-gc
+++ /dev/null
@@ -1,159 +0,0 @@
-#! /bin/sh
-# chkconfig: 2345 21 20
-### BEGIN INIT INFO
-# Provides: accumulo-gc
-# Required-Start: $network $local_fs
-# Required-Stop: $network $local_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: accumulo garbage collector process
-# Description: The accumulo garbage collector handles cleanup of old walogs and files in hdfs
-### END INIT INFO
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Do NOT "set -e"
-install -d -m 0775 -o root -g accumulo /var/run/accumulo
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/lib/accumulo/bin
-DESC="Accumulo Garbage Collector"
-NAME=accumulo-gc
-ACCUMULO_PROC=gc
-DAEMON=/usr/lib/accumulo/bin/start-server.sh
-IP=`ifconfig | grep inet[^6] | awk '{print $2}' | sed 's/addr://' | grep -v 0.0.0.0 | grep -v 127.0.0.1 | head -n 1`
-DAEMON_ARGS="$IP gc \"garbage collector\""
-PIDFILE=/var/run/accumulo/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Read configuration variable file if it is present
-[ -r /etc/default/accumulo ] && . /etc/default/accumulo
-
-# Load the VERBOSE setting and other rcS variables
-if [ -f /lib/init/vars.sh ]; then
- . /lib/init/vars.sh
-else
- log_daemon_msg() { logger "$@"; }
- log_end_msg() { [ $1 -eq 0 ] && RES=OK; logger ${RES:=FAIL}; }
-fi
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start() {
- TARGET_USER_NAME="ACCUMULO_USER"
- TARGET_USER=$(eval "echo \$$TARGET_USER_NAME")
-
- # Return
- # 0 if daemon has been started
- # 1 if daemon was already running
- # 2 if daemon could not be started
-
- if [ "`jps -m | grep $ACCUMULO_PROC`" ] ; then return 1; fi
-
- su -s /bin/sh $TARGET_USER -c "$DAEMON $DAEMON_ARGS > /dev/null || return 1"
-
- if [ "`jps -m | grep $ACCUMULO_PROC`" ] ; then return 0; fi
- return 2
- # Add code here, if necessary, that waits for the process to be ready
- # to handle requests from services started subsequently which depend
- # on this one. As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
- # Return
- # 0 if daemon has been stopped
- # 1 if daemon was already stopped
- # 2 if daemon could not be stopped
- # other if a failure occurred
-
- if [ ! "`jps -m | grep $ACCUMULO_PROC`" ] ; then return 1; fi
-
- jps -m | grep $ACCUMULO_PROC | awk '{print $1}' | xargs kill -9
-
- if [ "`jps -m | grep $ACCUMULO_PROC`" ] ; then return 2; fi
-
- return 0;
-}
-
-case "$1" in
- start)
- [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
- do_start
- case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- stop)
- [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- status)
- status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
- ;;
- #reload|force-reload)
- #
- # If do_reload() is not implemented then leave this commented out
- # and leave 'force-reload' as an alias for 'restart'.
- #
- #log_daemon_msg "Reloading $DESC" "$NAME"
- #do_reload
- #log_end_msg $?
- #;;
- restart|force-reload)
- #
- # If the "reload" option is implemented then remove the
- # 'force-reload' alias
- #
- log_daemon_msg "Restarting $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1)
- do_start
- case "$?" in
- 0) log_end_msg 0 ;;
- 1) log_end_msg 1 ;; # Old process is still running
- *) log_end_msg 1 ;; # Failed to start
- esac
- ;;
- *)
- # Failed to stop
- log_end_msg 1
- ;;
- esac
- ;;
- *)
- #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
- echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
- exit 3
- ;;
-esac
-
-:
http://git-wip-us.apache.org/repos/asf/accumulo/blob/05d5921c/assemble/scripts/init.d/accumulo-master
----------------------------------------------------------------------
diff --git a/assemble/scripts/init.d/accumulo-master b/assemble/scripts/init.d/accumulo-master
deleted file mode 100755
index 003d6cb..0000000
--- a/assemble/scripts/init.d/accumulo-master
+++ /dev/null
@@ -1,160 +0,0 @@
-#! /bin/sh
-# chkconfig: 2345 21 19
-### BEGIN INIT INFO
-# Provides: accumulo-master
-# Required-Start: $network $local_fs hadoop-namenode zookeeper-server
-# Required-Stop: $network $local_fs accumulo-slave
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: accumulo master process
-# Description: The accumulo master manages tablet assignment and balance to accumulo
-### END INIT INFO
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Do NOT "set -e"
-install -d -m 0775 -o root -g accumulo /var/run/accumulo
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/lib/accumulo/bin
-DESC="Accumulo Master"
-NAME=accumulo-master
-ACCUMULO_PROC=master
-DAEMON=/usr/lib/accumulo/bin/start-server.sh
-IP=`ifconfig | grep inet[^6] | awk '{print $2}' | sed 's/addr://' | grep -v 0.0.0.0 | grep -v 127.0.0.1 | head -n 1`
-DAEMON_ARGS="$IP master"
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Read configuration variable file if it is present
-[ -r /etc/default/accumulo ] && . /etc/default/accumulo
-
-# Load the VERBOSE setting and other rcS variables
-if [ -f /lib/init/vars.sh ]; then
- . /lib/init/vars.sh
-else
- log_daemon_msg() { logger "$@"; }
- log_end_msg() { [ $1 -eq 0 ] && RES=OK; logger ${RES:=FAIL}; }
-fi
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
- TARGET_USER_NAME="ACCUMULO_USER"
- TARGET_USER=$(eval "echo \$$TARGET_USER_NAME")
- # Return
- # 0 if daemon has been started
- # 1 if daemon was already running
- # 2 if daemon could not be started
-
- if [ "`jps -m | grep $ACCUMULO_PROC`" ] ; then return 1; fi
-
- su -s /bin/sh $TARGET_USER -c "/usr/lib/accumulo/bin/accumulo org.apache.accumulo.master.state.SetGoalState NORMAL"
- su -s /bin/sh $TARGET_USER -c "$DAEMON $DAEMON_ARGS > /dev/null || return 1"
-
- if [ "`jps -m | grep $ACCUMULO_PROC`" ] ; then return 0; fi
- return 2
- # Add code here, if necessary, that waits for the process to be ready
- # to handle requests from services started subsequently which depend
- # on this one. As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
- # Return
- # 0 if daemon has been stopped
- # 1 if daemon was already stopped
- # 2 if daemon could not be stopped
- # other if a failure occurred
-
- if [ ! "`jps -m | grep $ACCUMULO_PROC`" ] ; then return 1; fi
-
- jps -m | grep $ACCUMULO_PROC | awk '{print $1}' | xargs kill -9
-
- if [ "`jps -m | grep $ACCUMULO_PROC`" ] ; then return 2; fi
-
- return 0;
-}
-
-case "$1" in
- start)
- [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
- do_start
- case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- stop)
- [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- status)
- status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
- ;;
- #reload|force-reload)
- #
- # If do_reload() is not implemented then leave this commented out
- # and leave 'force-reload' as an alias for 'restart'.
- #
- #log_daemon_msg "Reloading $DESC" "$NAME"
- #do_reload
- #log_end_msg $?
- #;;
- restart|force-reload)
- #
- # If the "reload" option is implemented then remove the
- # 'force-reload' alias
- #
- log_daemon_msg "Restarting $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1)
- do_start
- case "$?" in
- 0) log_end_msg 0 ;;
- 1) log_end_msg 1 ;; # Old process is still running
- *) log_end_msg 1 ;; # Failed to start
- esac
- ;;
- *)
- # Failed to stop
- log_end_msg 1
- ;;
- esac
- ;;
- *)
- #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
- echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
- exit 3
- ;;
-esac
-
-:
http://git-wip-us.apache.org/repos/asf/accumulo/blob/05d5921c/assemble/scripts/init.d/accumulo-monitor
----------------------------------------------------------------------
diff --git a/assemble/scripts/init.d/accumulo-monitor b/assemble/scripts/init.d/accumulo-monitor
deleted file mode 100755
index 5eb7cf4..0000000
--- a/assemble/scripts/init.d/accumulo-monitor
+++ /dev/null
@@ -1,159 +0,0 @@
-#! /bin/sh
-# chkconfig: 2345 21 20
-### BEGIN INIT INFO
-# Provides: accumulo-monitor
-# Required-Start: $network $local_fs
-# Required-Stop: $network $local_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: accumulo monitor process on 50095
-# Description: The accumulo monitor provides a convenient mechanism for monitoring accumulo
-### END INIT INFO
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Do NOT "set -e"
-install -d -m 0775 -o root -g accumulo /var/run/accumulo
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/lib/accumulo/bin
-DESC="Accumulo Monitor"
-NAME=accumulo-monitor
-ACCUMULO_PROC=monitor
-DAEMON=/usr/lib/accumulo/bin/start-server.sh
-IP=`ifconfig | grep inet[^6] | awk '{print $2}' | sed 's/addr://' | grep -v 0.0.0.0 | grep -v 127.0.0.1 | head -n 1`
-DAEMON_ARGS="$IP monitor"
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Read configuration variable file if it is present
-[ -r /etc/default/accumulo ] && . /etc/default/accumulo
-
-# Load the VERBOSE setting and other rcS variables
-if [ -f /lib/init/vars.sh ]; then
- . /lib/init/vars.sh
-else
- log_daemon_msg() { logger "$@"; }
- log_end_msg() { [ $1 -eq 0 ] && RES=OK; logger ${RES:=FAIL}; }
-fi
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
- TARGET_USER_NAME="ACCUMULO_MONITOR_USER"
- TARGET_USER=$(eval "echo \$$TARGET_USER_NAME")
- # Return
- # 0 if daemon has been started
- # 1 if daemon was already running
- # 2 if daemon could not be started
-
- if [ "`jps -m | grep $ACCUMULO_PROC`" ] ; then return 1; fi
-
- su -s /bin/sh $TARGET_USER -c "$DAEMON $DAEMON_ARGS > /dev/null || return 1"
-
- if [ "`jps -m | grep $ACCUMULO_PROC`" ] ; then return 0; fi
- return 2
- # Add code here, if necessary, that waits for the process to be ready
- # to handle requests from services started subsequently which depend
- # on this one. As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
- # Return
- # 0 if daemon has been stopped
- # 1 if daemon was already stopped
- # 2 if daemon could not be stopped
- # other if a failure occurred
-
- if [ ! "`jps -m | grep $ACCUMULO_PROC`" ] ; then return 1; fi
-
- jps -m | grep $ACCUMULO_PROC | awk '{print $1}' | xargs kill -9
-
- if [ "`jps -m | grep $ACCUMULO_PROC`" ] ; then return 2; fi
-
- return 0;
-}
-
-case "$1" in
- start)
- [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
- do_start
- case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- stop)
- [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- status)
- status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
- ;;
- #reload|force-reload)
- #
- # If do_reload() is not implemented then leave this commented out
- # and leave 'force-reload' as an alias for 'restart'.
- #
- #log_daemon_msg "Reloading $DESC" "$NAME"
- #do_reload
- #log_end_msg $?
- #;;
- restart|force-reload)
- #
- # If the "reload" option is implemented then remove the
- # 'force-reload' alias
- #
- log_daemon_msg "Restarting $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1)
- do_start
- case "$?" in
- 0) log_end_msg 0 ;;
- 1) log_end_msg 1 ;; # Old process is still running
- *) log_end_msg 1 ;; # Failed to start
- esac
- ;;
- *)
- # Failed to stop
- log_end_msg 1
- ;;
- esac
- ;;
- *)
- #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
- echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
- exit 3
- ;;
-esac
-
-:
http://git-wip-us.apache.org/repos/asf/accumulo/blob/05d5921c/assemble/scripts/init.d/accumulo-tracer
----------------------------------------------------------------------
diff --git a/assemble/scripts/init.d/accumulo-tracer b/assemble/scripts/init.d/accumulo-tracer
deleted file mode 100755
index 8674cb4..0000000
--- a/assemble/scripts/init.d/accumulo-tracer
+++ /dev/null
@@ -1,159 +0,0 @@
-#! /bin/sh
-# chkconfig: 2345 21 20
-### BEGIN INIT INFO
-# Provides: accumulo-tracer
-# Required-Start: $network $local_fs zookeeper-server
-# Required-Stop: $network $local_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: accumulo tracer
-# Description: The accumulo tracer provides a mechanism for tracing accumulo calls
-### END INIT INFO
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Do NOT "set -e"
-install -d -m 0775 -o root -g accumulo /var/run/accumulo
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/lib/accumulo/bin
-DESC="Accumulo Tracer"
-NAME=accumulo-tracer
-ACCUMULO_PROC=tracer
-DAEMON=/usr/lib/accumulo/bin/start-server.sh
-IP=`ifconfig | grep inet[^6] | awk '{print $2}' | sed 's/addr://' | grep -v 0.0.0.0 | grep -v 127.0.0.1 | head -n 1`
-DAEMON_ARGS="$IP tracer"
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Read configuration variable file if it is present
-[ -r /etc/default/accumulo ] && . /etc/default/accumulo
-
-# Load the VERBOSE setting and other rcS variables
-if [ -f /lib/init/vars.sh ]; then
- . /lib/init/vars.sh
-else
- log_daemon_msg() { logger "$@"; }
- log_end_msg() { [ $1 -eq 0 ] && RES=OK; logger ${RES:=FAIL}; }
-fi
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
- TARGET_USER_NAME="ACCUMULO_TRACER_USER"
- TARGET_USER=$(eval "echo \$$TARGET_USER_NAME")
- # Return
- # 0 if daemon has been started
- # 1 if daemon was already running
- # 2 if daemon could not be started
-
- if [ "`jps -m | grep $ACCUMULO_PROC`" ] ; then return 1; fi
-
- su -s /bin/sh $TARGET_USER -c "$DAEMON $DAEMON_ARGS > /dev/null || return 1"
-
- if [ "`jps -m | grep $ACCUMULO_PROC`" ] ; then return 0; fi
- return 2
- # Add code here, if necessary, that waits for the process to be ready
- # to handle requests from services started subsequently which depend
- # on this one. As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
- # Return
- # 0 if daemon has been stopped
- # 1 if daemon was already stopped
- # 2 if daemon could not be stopped
- # other if a failure occurred
-
- if [ ! "`jps -m | grep $ACCUMULO_PROC`" ] ; then return 1; fi
-
- jps -m | grep $ACCUMULO_PROC | awk '{print $1}' | xargs kill -9
-
- if [ "`jps -m | grep $ACCUMULO_PROC`" ] ; then return 2; fi
-
- return 0;
-}
-
-case "$1" in
- start)
- [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
- do_start
- case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- stop)
- [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- status)
- status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
- ;;
- #reload|force-reload)
- #
- # If do_reload() is not implemented then leave this commented out
- # and leave 'force-reload' as an alias for 'restart'.
- #
- #log_daemon_msg "Reloading $DESC" "$NAME"
- #do_reload
- #log_end_msg $?
- #;;
- restart|force-reload)
- #
- # If the "reload" option is implemented then remove the
- # 'force-reload' alias
- #
- log_daemon_msg "Restarting $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1)
- do_start
- case "$?" in
- 0) log_end_msg 0 ;;
- 1) log_end_msg 1 ;; # Old process is still running
- *) log_end_msg 1 ;; # Failed to start
- esac
- ;;
- *)
- # Failed to stop
- log_end_msg 1
- ;;
- esac
- ;;
- *)
- #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
- echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
- exit 3
- ;;
-esac
-
-:
http://git-wip-us.apache.org/repos/asf/accumulo/blob/05d5921c/assemble/scripts/init.d/accumulo-tserver
----------------------------------------------------------------------
diff --git a/assemble/scripts/init.d/accumulo-tserver b/assemble/scripts/init.d/accumulo-tserver
deleted file mode 100755
index a6d60bb..0000000
--- a/assemble/scripts/init.d/accumulo-tserver
+++ /dev/null
@@ -1,162 +0,0 @@
-#! /bin/sh
-# chkconfig: 2345 21 15
-### BEGIN INIT INFO
-# Provides: accumulo-tserver
-# Required-Start: $network $local_fs hadoop-namenode hadoop-datanode zookeeper-server accumulo-master
-# Required-Stop: $network $local_fs hadoop-datanode hadoop-namenode zookeeper-server accumulo-master
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: accumulo tserver and logger processes
-# Description: The accumulo tserver process for accumulo
-### END INIT INFO
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Do NOT "set -e"
-install -d -m 0775 -o root -g accumulo /var/run/accumulo
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/lib/accumulo/bin
-DESC="Accumulo Tserver"
-NAME=accumulo-tserver
-ACCUMULO_PROC=tserver
-DAEMON=/usr/lib/accumulo/bin/start-server.sh
-IP=`ifconfig | grep inet[^6] | awk '{print $2}' | sed 's/addr://' | grep -v 0.0.0.0 | grep -v 127.0.0.1 | head -n 1`
-DAEMON_ARGS="$IP slaves"
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Read configuration variable file if it is present
-[ -r /etc/default/accumulo ] && . /etc/default/accumulo
-
-# Load the VERBOSE setting and other rcS variables
-if [ -f /lib/init/vars.sh ]; then
- . /lib/init/vars.sh
-else
- log_daemon_msg() { logger "$@"; }
- log_end_msg() { [ $1 -eq 0 ] && RES=OK; logger ${RES:=FAIL}; }
-fi
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
- TARGET_USER_NAME="ACCUMULO_USER"
- TARGET_USER=$(eval "echo \$$TARGET_USER_NAME")
- # Return
- # 0 if daemon has been started
- # 1 if daemon was already running
- # 2 if daemon could not be started
-
- if [ "`jps -m | grep $ACCUMULO_PROC`" ] ; then return 1; fi
-
- su -s /bin/sh $TARGET_USER -c "/usr/lib/accumulo/bin/start-server.sh $IP tserver \"tablet server\""
-
- if [ "`jps -m | grep $ACCUMULO_PROC`" ] ; then return 0; fi
- return 2
- # Add code here, if necessary, that waits for the process to be ready
- # to handle requests from services started subsequently which depend
- # on this one. As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
- TARGET_USER_NAME="ACCUMULO_USER"
- TARGET_USER=$(eval "echo \$$TARGET_USER_NAME")
- # Return
- # 0 if daemon has been stopped
- # 1 if daemon was already stopped
- # 2 if daemon could not be stopped
- # other if a failure occurred
-
- if [ ! "`jps -m | grep $ACCUMULO_PROC`" ] ; then return 1; fi
-
- su -s /bin/sh $TARGET_USER -c "/usr/lib/accumulo/bin/accumulo admin stop $IP"
-
- if [ "`jps -m | grep $ACCUMULO_PROC`" ] ; then jps -m | grep $ACCUMULO_PROC | awk '{print $1}' | xargs kill -9; fi
-
- if [ "`jps -m | grep $ACCUMULO_PROC`" ] ; then return 2; fi
- return 0;
-}
-
-case "$1" in
- start)
- [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
- do_start
- case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- stop)
- [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- status)
- status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
- ;;
- #reload|force-reload)
- #
- # If do_reload() is not implemented then leave this commented out
- # and leave 'force-reload' as an alias for 'restart'.
- #
- #log_daemon_msg "Reloading $DESC" "$NAME"
- #do_reload
- #log_end_msg $?
- #;;
- restart|force-reload)
- #
- # If the "reload" option is implemented then remove the
- # 'force-reload' alias
- #
- log_daemon_msg "Restarting $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1)
- do_start
- case "$?" in
- 0) log_end_msg 0 ;;
- 1) log_end_msg 1 ;; # Old process is still running
- *) log_end_msg 1 ;; # Failed to start
- esac
- ;;
- *)
- # Failed to stop
- log_end_msg 1
- ;;
- esac
- ;;
- *)
- #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
- echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
- exit 3
- ;;
-esac
-
-:
http://git-wip-us.apache.org/repos/asf/accumulo/blob/05d5921c/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 9ae5d15..1a35c53 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,6 +24,7 @@
</parent>
<artifactId>accumulo-core</artifactId>
<name>Core</name>
+ <description>Apache Accumulo core libraries.</description>
<dependencies>
<dependency>
<groupId>com.beust</groupId>
@@ -232,5 +233,167 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>rpm</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rpm-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build-rpm</id>
+ <goals>
+ <goal>attached-rpm</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <copyright>ASL 2.0 and BSD</copyright>
+ <requires>
+ <require>jre >= 1.6.0</require>
+ <require>hadoop >= 1.0.4</require>
+ <require>zookeeper >= 3.3.0</require>
+ <require>accumulo-trace = %{version}-%{release}</require>
+ <require>accumulo-fate = %{version}-%{release}</require>
+ <require>accumulo-start = %{version}-%{release}</require>
+ </requires>
+ <preinstallScriptlet>
+ <scriptFile>src/main/packaging/preinstall.sh</scriptFile>
+ <fileEncoding>${project.build.sourceEncoding}</fileEncoding>
+ </preinstallScriptlet>
+ <postinstallScriptlet>
+ <script>sysctl -q -p %{_sysconfdir}/sysctl.d/accumulo; ln -s %{_sysconfdir}/accumulo %{_datadir}/accumulo/conf</script>
+ </postinstallScriptlet>
+ <preremoveScriptlet>
+ <script>rm -f %{_datadir}/accumulo/conf</script>
+ </preremoveScriptlet>
+ <mappings>
+ <mapping>
+ <directory>%{_datadir}/accumulo</directory>
+ <sources>
+ <source>
+ <location>../CHANGES</location>
+ </source>
+ <source>
+ <location>../LICENSE</location>
+ </source>
+ <source>
+ <location>../NOTICE</location>
+ </source>
+ <source>
+ <location>../README</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>%{_javadir}/accumulo</directory>
+ <artifact />
+ </mapping>
+ <mapping>
+ <directory>%{_datadir}/accumulo/lib</directory>
+ <dependency>
+ <includes>
+ <include>com.google.code.gson:gson</include>
+ <include>org.apache.commons:commons-vfs2</include>
+ <include>com.beust:jcommander</include>
+ <include>com.google.guava:guava</include>
+ <include>jline:jline</include>
+ <include>org.apache.thrift:libthrift</include>
+ </includes>
+ <stripVersion>true</stripVersion>
+ </dependency>
+ </mapping>
+ <mapping>
+ <configuration>true</configuration>
+ <directory>%{_sysconfdir}/accumulo</directory>
+ <filemode>640</filemode>
+ <username>accumulo</username>
+ <sources>
+ <source>
+ <location>../conf</location>
+ <includes>
+ <include>*/**</include>
+ </includes>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>%{_datadir}/accumulo/bin</directory>
+ <filemode>755</filemode>
+ <sources>
+ <source>
+ <location>../bin</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <configuration>true</configuration>
+ <directory>%{_sysconfdir}/sysctl.d</directory>
+ <directoryIncluded>false</directoryIncluded>
+ <sources>
+ <source>
+ <location>src/main/packaging/etc/sysctl.d/accumulo</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <configuration>true</configuration>
+ <directory>%{_sysconfdir}/security/limits.d</directory>
+ <directoryIncluded>false</directoryIncluded>
+ <sources>
+ <source>
+ <location>src/main/packaging/etc/security/limits.d/50-accumulo.conf</location>
+ </source>
+ </sources>
+ </mapping>
+ </mappings>
+ </configuration>
+ </execution>
+ <!--
+ <execution>
+ <id>build-tests-rpm</id>
+ <goals>
+ <goal>attached-rpm</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <name>accumulo-test</name>
+ <classifier>test</classifier>
+ <provides>
+ <provide>accumulo-test</provide>
+ </provides>
+ <requires>
+ <require>accumulo</require>
+ <require>python</require>
+ </requires>
+ <mappings>
+ <mapping>
+ <directory>%{_datadir}/accumulo/test</directory>
+ <sources>
+ <source>
+ <location>${accumulo-top}/test</location>
+ <excludes>
+ <exclude>src/**</exclude>
+ <exclude>target/**</exclude>
+ <exclude>**/walkers.txt</exclude>
+ <exclude>**/ingesters.txt</exclude>
+ <exclude>**/continuous-env.sh</exclude>
+ <exclude>.*/**</exclude>
+ <exclude>**/*.pyc</exclude>
+ <exclude>**/*.pyo</exclude>
+ <exclude>pom.xml</exclude>
+ </excludes>
+ </source>
+ </sources>
+ </mapping>
+ </mappings>
+ </configuration>
+ </execution>
+ -->
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/05d5921c/core/src/main/packaging/etc/security/limits.d/50-accumulo.conf
----------------------------------------------------------------------
diff --git a/core/src/main/packaging/etc/security/limits.d/50-accumulo.conf b/core/src/main/packaging/etc/security/limits.d/50-accumulo.conf
new file mode 100644
index 0000000..be05006
--- /dev/null
+++ b/core/src/main/packaging/etc/security/limits.d/50-accumulo.conf
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+@accumulo - nofile 100000
+@accumulo - nproc 100000
http://git-wip-us.apache.org/repos/asf/accumulo/blob/05d5921c/core/src/main/packaging/etc/sysctl.d/accumulo
----------------------------------------------------------------------
diff --git a/core/src/main/packaging/etc/sysctl.d/accumulo b/core/src/main/packaging/etc/sysctl.d/accumulo
new file mode 100644
index 0000000..f8f653b
--- /dev/null
+++ b/core/src/main/packaging/etc/sysctl.d/accumulo
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+vm.swappiness = 0
+vm.vfs_cache_pressure = 50
+vm.nr_hugepages = 0
+vm.dirty_background_ratio = 3
+vm.dirty_expire_centisecs = 1500
http://git-wip-us.apache.org/repos/asf/accumulo/blob/05d5921c/core/src/main/packaging/preinstall.sh
----------------------------------------------------------------------
diff --git a/core/src/main/packaging/preinstall.sh b/core/src/main/packaging/preinstall.sh
new file mode 100644
index 0000000..178995d
--- /dev/null
+++ b/core/src/main/packaging/preinstall.sh
@@ -0,0 +1,3 @@
+getent group accumulo >/dev/null || groupadd -r accumulo
+getent passwd accumulo >/dev/null || useradd -r -g accumulo -d %{_datadir}/accumulo -s /sbin/nologin -c "Apache Accumulo" accumulo
+exit 0
http://git-wip-us.apache.org/repos/asf/accumulo/blob/05d5921c/docs/pom.xml
----------------------------------------------------------------------
diff --git a/docs/pom.xml b/docs/pom.xml
index 90b1832..0b7a602 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -25,6 +25,7 @@
<artifactId>accumulo-docs</artifactId>
<packaging>pom</packaging>
<name>Documentation</name>
+ <description>User documentation for Apache Accumulo.</description>
<profiles>
<profile>
<id>docs</id>
@@ -66,5 +67,43 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>rpm</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rpm-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build-rpm</id>
+ <goals>
+ <goal>attached-rpm</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <provides>
+ <provide>${project.artifactId} = %{version}-%{release}</provide>
+ </provides>
+ <requires>
+ <require>accumulo-core = %{version}-%{release}</require>
+ </requires>
+ <mappings>
+ <mapping>
+ <directory>%{_datadir}/accumulo/docs</directory>
+ <sources>
+ <source>
+ <location>${project.build.directory}/accumulo_user_manual.pdf</location>
+ </source>
+ </sources>
+ </mapping>
+ </mappings>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/05d5921c/examples/simple/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml
index e7c931a..de60f8d 100644
--- a/examples/simple/pom.xml
+++ b/examples/simple/pom.xml
@@ -25,6 +25,7 @@
</parent>
<artifactId>accumulo-examples-simple</artifactId>
<name>Simple Examples</name>
+ <description>Simple Apache Accumulo examples.</description>
<dependencies>
<dependency>
<groupId>com.beust</groupId>
@@ -98,4 +99,38 @@
</plugins>
</pluginManagement>
</build>
+ <profiles>
+ <profile>
+ <id>rpm</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rpm-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build-rpm</id>
+ <goals>
+ <goal>attached-rpm</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <requires>
+ <require>jre >= 1.6.0</require>
+ <require>accumulo-core = %{version}-%{release}</require>
+ </requires>
+ <mappings>
+ <mapping>
+ <directory>%{_javadir}/accumulo</directory>
+ <artifact />
+ </mapping>
+ </mappings>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/05d5921c/fate/pom.xml
----------------------------------------------------------------------
diff --git a/fate/pom.xml b/fate/pom.xml
index 1d7a7bf..d47cec3 100644
--- a/fate/pom.xml
+++ b/fate/pom.xml
@@ -24,6 +24,7 @@
</parent>
<artifactId>accumulo-fate</artifactId>
<name>Fate</name>
+ <description>A FAult-Tolerant Executor library used by Apache Accumulo.</description>
<dependencies>
<dependency>
<groupId>commons-lang</groupId>
@@ -46,4 +47,37 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>rpm</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rpm-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build-rpm</id>
+ <goals>
+ <goal>attached-rpm</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <requires>
+ <require>jre >= 1.6.0</require>
+ </requires>
+ <mappings>
+ <mapping>
+ <directory>%{_javadir}/accumulo</directory>
+ <artifact />
+ </mapping>
+ </mappings>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/05d5921c/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 9a073c6..f334795 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -25,6 +25,7 @@
<artifactId>accumulo-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Accumulo Maven Plugin</name>
+ <description>An Apache Maven plugin for testing software against a test Apache Accumulo instance.</description>
<dependencies>
<dependency>
<groupId>commons-cli</groupId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/05d5921c/minicluster/pom.xml
----------------------------------------------------------------------
diff --git a/minicluster/pom.xml b/minicluster/pom.xml
index 24c47c9..b7eaf04 100644
--- a/minicluster/pom.xml
+++ b/minicluster/pom.xml
@@ -24,6 +24,7 @@
</parent>
<artifactId>accumulo-minicluster</artifactId>
<name>MiniCluster</name>
+ <description>A library for launching and running a standalone instance of Apache Accumulo for testing.</description>
<dependencies>
<dependency>
<groupId>com.beust</groupId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/05d5921c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cd555fc..784f219 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<artifactId>accumulo-project</artifactId>
<version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Apache Accumulo Project</name>
+ <name>Apache Accumulo</name>
<description>Apache Accumulo is a sorted, distributed key/value store based on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It features a few novel improvements on the BigTable design in the form of cell-level access labels and a server-side programming mechanism that can modify key/value pairs at various points in the data management process.</description>
<!-- this URL is where the site derived via the maven-site-plugin ends up, not the generic site -->
<url>http://accumulo.apache.org/maven-site/</url>
@@ -90,7 +90,7 @@
<module>server/native</module>
<module>server/tracer</module>
<module>server/tserver</module>
- <module>server/utils</module>
+ <module>server/extras</module>
</modules>
<scm>
<connection>scm:git:git://git.apache.org/accumulo.git</connection>
@@ -215,6 +215,13 @@
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
+ <version>${project.version}</version>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-docs</artifactId>
<version>${project.version}</version>
<classifier>user-manual</classifier>
@@ -222,6 +229,20 @@
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-docs</artifactId>
+ <version>${project.version}</version>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-examples-simple</artifactId>
+ <version>${project.version}</version>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-examples-simple</artifactId>
<version>${project.version}</version>
</dependency>
@@ -232,11 +253,32 @@
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-fate</artifactId>
+ <version>${project.version}</version>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-gc</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-gc</artifactId>
+ <version>${project.version}</version>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-master</artifactId>
+ <version>${project.version}</version>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-master</artifactId>
<version>${project.version}</version>
</dependency>
@@ -254,6 +296,13 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-monitor</artifactId>
<version>${project.version}</version>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-monitor</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
@@ -263,6 +312,20 @@
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-native</artifactId>
+ <version>${project.version}</version>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-proxy</artifactId>
+ <version>${project.version}</version>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-proxy</artifactId>
<version>${project.version}</version>
</dependency>
@@ -270,6 +333,25 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-server-base</artifactId>
<version>${project.version}</version>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-server-base</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-server-extras</artifactId>
+ <version>${project.version}</version>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-server-extras</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
@@ -278,6 +360,13 @@
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-start</artifactId>
+ <version>${project.version}</version>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-test</artifactId>
<version>${project.version}</version>
</dependency>
@@ -288,6 +377,20 @@
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-trace</artifactId>
+ <version>${project.version}</version>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-tracer</artifactId>
+ <version>${project.version}</version>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-tracer</artifactId>
<version>${project.version}</version>
</dependency>
@@ -295,6 +398,13 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-tserver</artifactId>
<version>${project.version}</version>
+ <classifier>el6</classifier>
+ <type>rpm</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-tserver</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -484,7 +594,7 @@
<!-- should be in the Apache parent, but isn't -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -575,6 +685,32 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>rpm-maven-plugin</artifactId>
<version>2.1-alpha-3</version>
+ <configuration>
+ <!--
+ The following is a trick to get the plugin to sign the rpm.
+ However, these values are ignored, and gpg-agent is used instead.
+ Requires copying contrib/dotfiles-rpmmacros to $HOME/.rpmmacros
+ This is a workaround for bug http://jira.codehaus.org/browse/MRPM-139
+ -->
+ <keyname>dummy</keyname>
+ <keyPassphrase>
+ <passphrase>dummy</passphrase>
+ </keyPassphrase>
+ <projversion>${project.version.base}</projversion>
+ <version>${project.version.base}</version>
+ <release>1.el6</release>
+ <summary>${project.parent.name} - ${project.name}</summary>
+ <description>${project.description}</description>
+ <!-- This populates the license field of the RPM. -->
+ <copyright>ASL 2.0</copyright>
+ <classifier>el6</classifier>
+ <url>http://accumulo.apache.org</url>
+ <group>Applications/Databases</group>
+ <defaultDirmode>755</defaultDirmode>
+ <defaultFilemode>644</defaultFilemode>
+ <defaultUsername>root</defaultUsername>
+ <defaultGroupname>root</defaultGroupname>
+ </configuration>
</plugin>
<plugin>
<groupId>org.eclipse.m2e</groupId>
@@ -585,6 +721,19 @@
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <versionRange>[1.8,)</versionRange>
+ <goals>
+ <goal>regex-property</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<versionRange>[2.0,)</versionRange>
@@ -764,6 +913,25 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>regex-property</id>
+ <goals>
+ <goal>regex-property</goal>
+ </goals>
+ <configuration>
+ <name>project.version.base</name>
+ <value>${project.version}</value>
+ <regex>-SNAPSHOT</regex>
+ <replacement />
+ <failIfNoMatch>false</failIfNoMatch>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<extensions>
<extension>
@@ -850,6 +1018,12 @@
</reporting>
<profiles>
<profile>
+ <id>rpm</id>
+ <properties>
+ <thrift.enabled>true</thrift.enabled>
+ </properties>
+ </profile>
+ <profile>
<id>apache-release</id>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/05d5921c/proxy/pom.xml
----------------------------------------------------------------------
diff --git a/proxy/pom.xml b/proxy/pom.xml
index aefd0cf..dee93a7 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -24,6 +24,7 @@
</parent>
<artifactId>accumulo-proxy</artifactId>
<name>Proxy</name>
+ <description>A server for Apache Accumulo that proxies connections from any language supported by Apache Thrift.</description>
<dependencies>
<dependency>
<groupId>com.beust</groupId>
@@ -115,5 +116,71 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>rpm</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rpm-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build-rpm</id>
+ <goals>
+ <goal>attached-rpm</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <requires>
+ <require>jre >= 1.6.0</require>
+ <require>accumulo-core = %{version}-%{release}</require>
+ </requires>
+ <mappings>
+ <mapping>
+ <directory>%{_javadir}/accumulo</directory>
+ <artifact />
+ </mapping>
+ <mapping>
+ <directory>%{_datadir}/accumulo/proxy</directory>
+ <recurseDirectories>true</recurseDirectories>
+ <sources>
+ <source>
+ <location>README</location>
+ </source>
+ <source>
+ <location>proxy.properties</location>
+ </source>
+ <source>
+ <location>examples</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>%{_datadir}/accumulo/proxy/thrift</directory>
+ <sources>
+ <source>
+ <location>src/main/thrift</location>
+ <includes>
+ <include>*.thrift</include>
+ </includes>
+ </source>
+ <source>
+ <location>target</location>
+ <includes>
+ <include>gen-cpp/**</include>
+ <include>gen-py/**</include>
+ <include>gen-rb/**</include>
+ </includes>
+ </source>
+ </sources>
+ </mapping>
+ </mappings>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/05d5921c/server/base/pom.xml
----------------------------------------------------------------------
diff --git a/server/base/pom.xml b/server/base/pom.xml
index 409e884..6f5f4a7 100644
--- a/server/base/pom.xml
+++ b/server/base/pom.xml
@@ -25,6 +25,7 @@
</parent>
<artifactId>accumulo-server-base</artifactId>
<name>Server Base</name>
+ <description>A common base library for Apache Accumulo servers.</description>
<dependencies>
<dependency>
<groupId>com.beust</groupId>
@@ -35,78 +36,68 @@
<artifactId>gson</artifactId>
</dependency>
<dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-fate</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-start</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-trace</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-fate</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-start</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-trace</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -132,4 +123,47 @@
</testResource>
</testResources>
</build>
+ <profiles>
+ <profile>
+ <id>rpm</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rpm-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build-rpm</id>
+ <goals>
+ <goal>attached-rpm</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <requires>
+ <require>jre >= 1.6.0</require>
+ <require>accumulo-core = %{version}-%{release}</require>
+ </requires>
+ <mappings>
+ <mapping>
+ <directory>%{_javadir}/accumulo</directory>
+ <artifact />
+ </mapping>
+ <mapping>
+ <directory>%{_datadir}/accumulo/lib</directory>
+ <dependency>
+ <includes>
+ <include>com.google.code.gson:gson</include>
+ </includes>
+ <stripVersion>true</stripVersion>
+ </dependency>
+ </mapping>
+ </mappings>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>