Skip to content

Commit

Permalink
relase 2.1.1-3
Browse files Browse the repository at this point in the history
  • Loading branch information
vroyer committed Feb 21, 2016
1 parent 26dfca7 commit 8b0fc9d
Show file tree
Hide file tree
Showing 5 changed files with 174 additions and 6 deletions.
6 changes: 6 additions & 0 deletions CHANGES.txt
Expand Up @@ -46,3 +46,9 @@
2.1.1-2 - 2016-02-16
* Elassandra now build as a standalone project.
* Add a modified bin/cassandra.in.sh without empty element in CLASSPATH (cause a JarHell error)

2.1.1-3 - 2016-02-21
* Add a start script for Linux Debian provided by Chris Feldmeier.
* Add sigar binaries in the tarball package.
* Fix the buildNumber in cluster information.

39 changes: 38 additions & 1 deletion dependency-reduced-pom.xml
Expand Up @@ -4,7 +4,7 @@
<groupId>org.elassandra</groupId>
<artifactId>elassandra</artifactId>
<name>Elassandra</name>
<version>2.1.1-2</version>
<version>2.1.1-3</version>
<description>Elassandra - ElasticSearch for Cassandra</description>
<licenses>
<license>
Expand Down Expand Up @@ -103,6 +103,23 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.3</version>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>create</goal>
</goals>
</execution>
</executions>
<configuration>
<doCheck>false</doCheck>
<doUpdate>false</doUpdate>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<executions>
Expand Down Expand Up @@ -152,6 +169,26 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.5</version>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<X-Build-Branch>${scmBranch}</X-Build-Branch>
<X-Build-Number>${buildNumber}</X-Build-Number>
<X-Build-Time>${timestamp}</X-Build-Time>
<X-Compile-Elasticsearch-Version>${elasticsearch.version}</X-Compile-Elasticsearch-Version>
<X-Compile-Lucene-Version>${lucene.version}</X-Compile-Lucene-Version>
<X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
<X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
Expand Down
83 changes: 83 additions & 0 deletions distribution/deb/init.d/elassandra
@@ -0,0 +1,83 @@
#!/bin/bash
# author : Chris Feldmeier
# 2016

if [ $(whoami) != "root" ]; then
echo "Elassandra bash script works only with root user"
exit 1
fi

CASSANDRADIR=/etc/elassandra/bin
PIDFILE=/var/run/elassandra.pid
LOGFILE=/var/log/elassandra/output_script.log
USER=root
_BOLD=`tput bold`
_NORMAL=`tput sgr0`
PARAMS="-p ${PIDFILE}"

writelog(){
echo "`date` : $1" >> "$LOG"
}

log_clear(){
echo "`date` - cleared" > $LOG
}

start(){
if [ ! -f ${PIDFILE} ];
then
echo "Starting ${_BOLD}Elassandra (Elasticsearch+Cassandra) ${_NORMAL} ..."
start-stop-daemon --start \
--user ${USER} \
--pidfile ${PIDFILE} \
--exec ${CASSANDRADIR}/elassandra -- ${PARAMS} \ >> ${LOGFILE}
sleep 3
echo "Elassandra started ."
else
echo "Elassandra already running !!"
fi
}

stop(){
if [ ! -f ${PIDFILE} ] ; then
echo "Elassandra is ${_BOLD}not${_NORMAL} running"
else
echo "Elassandra stopping ... "
pid_no=`cat ${PIDFILE}`
kill $pid_no
rm ${PIDFILE}
sleep 2
fi
}

status(){
if [ ! -f $PIDFILE ] ; then
echo "Elassandra is ${_BOLD}not${_NORMAL} running"
else
echo "Elassandra running. pid : " `cat $PID`
fi
}

case "$1" in
start)
start
;;
stop)
stop
;;
restart)
stop
start
;;
status)
status
;;
logclear)
log_clear
;;
*)
echo "Usage : sudo service elassandra (start|stop|restart|status|logclear)"
;;
esac

exit 1
44 changes: 42 additions & 2 deletions pom.xml
Expand Up @@ -13,7 +13,7 @@

<groupId>org.elassandra</groupId>
<artifactId>elassandra</artifactId>
<version>2.1.1-2</version>
<version>2.1.1-3</version>
<name>Elassandra</name>
<description>Elassandra - ElasticSearch for Cassandra</description>

Expand Down Expand Up @@ -439,7 +439,6 @@
<version>4.1.0</version>
<optional>true</optional>
</dependency>


<dependency>
<groupId>io.airlift</groupId>
Expand Down Expand Up @@ -554,6 +553,24 @@
</executions>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.3</version>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>create</goal>
</goals>
</execution>
</executions>
<configuration>
<doCheck>false</doCheck>
<doUpdate>false</doUpdate>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down Expand Up @@ -607,6 +624,29 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.5</version>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<X-Build-Branch>${scmBranch}</X-Build-Branch>
<X-Build-Number>${buildNumber}</X-Build-Number>
<X-Build-Time>${timestamp}</X-Build-Time>
<X-Compile-Elasticsearch-Version>${elasticsearch.version}</X-Compile-Elasticsearch-Version>
<X-Compile-Lucene-Version>${lucene.version}</X-Compile-Lucene-Version>
<X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
<X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
</manifestEntries>
</archive>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
Expand Down
8 changes: 5 additions & 3 deletions src/main/assemblies/common-bin.xml
Expand Up @@ -126,10 +126,12 @@
</fileSet>

<fileSet>
<directory>lib/sigar</directory>
<outputDirectory>lib/sigar</outputDirectory>
<directory>${cassandra.home}/lib</directory>
<outputDirectory>lib</outputDirectory>
<includes>
<include>*</include>
<include>jsr223/*/**</include>
<include>licenses/*</include>
<include>sigar-bin/*</include>
</includes>
</fileSet>

Expand Down

0 comments on commit 8b0fc9d

Please sign in to comment.