-
Notifications
You must be signed in to change notification settings - Fork 3.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1657 from druid-io/backport-for-0-8-1-rc2
Merge fixes for 0.8.1 rc2
- Loading branch information
Showing
20 changed files
with
509 additions
and
100 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| ~ Druid - a distributed column store. | ||
| ~ Copyright 2012 - 2015 Metamarkets Group Inc. | ||
| ~ | ||
| ~ Licensed 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. | ||
| --> | ||
|
|
||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <packaging>pom</packaging> | ||
|
|
||
| <artifactId>distribution</artifactId> | ||
| <name>distribution</name> | ||
| <description>distribution</description> | ||
|
|
||
| <parent> | ||
| <artifactId>druid</artifactId> | ||
| <groupId>io.druid</groupId> | ||
| <version>0.8.1-rc2-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>io.druid</groupId> | ||
| <artifactId>druid-services</artifactId> | ||
| <version>${project.parent.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.druid</groupId> | ||
| <artifactId>extensions-distribution</artifactId> | ||
| <version>${project.parent.version}</version> | ||
| <classifier>extensions-repo</classifier> | ||
| <type>zip</type> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-assembly-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>distro-assembly</id> | ||
| <phase>package</phase> | ||
| <goals> | ||
| <goal>single</goal> | ||
| </goals> | ||
| <configuration> | ||
| <finalName>${project.parent.artifactId}-${project.parent.version}</finalName> | ||
| <tarLongFileMode>posix</tarLongFileMode> | ||
| <descriptors> | ||
| <descriptor>src/assembly/assembly.xml</descriptor> | ||
| </descriptors> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.codehaus.mojo</groupId> | ||
| <artifactId>license-maven-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>download-licenses</id> | ||
| <goals> | ||
| <goal>download-licenses</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| #!/usr/bin/env bash | ||
| set +e | ||
| set +u | ||
| shopt -s xpg_echo | ||
| shopt -s expand_aliases | ||
| trap "exit 1" 1 2 3 15 | ||
|
|
||
| SCRIPT_DIR=`dirname $0` | ||
| MAVEN_DIR="${SCRIPT_DIR}/extensions-repo" | ||
| SERVER_TYPE="$1" | ||
|
|
||
| if [ "x${SERVER_TYPE}" = "x" ] | ||
| then | ||
| echo "usage: $0 server-type" >& 2 | ||
| exit 2 | ||
| fi | ||
|
|
||
| if [[ ! -d "${SCRIPT_DIR}/lib" || ! -d "${SCRIPT_DIR}/config" ]]; then | ||
| echo "This script appears to be running from the source location. It must be run from its deployed location." | ||
| echo "After building, unpack services/target/druid-services-*-SNAPSHOT-bin.tar.gz, and run the script unpacked there." | ||
| exit 2 | ||
| fi | ||
|
|
||
| CURR_DIR=`pwd` | ||
| cd ${SCRIPT_DIR} | ||
| SCRIPT_DIR=`pwd` | ||
| cd ${CURR_DIR} | ||
|
|
||
| # start process | ||
| JAVA_ARGS="${JAVA_ARGS} -Xmx512m -Duser.timezone=UTC -Dfile.encoding=UTF-8" | ||
| JAVA_ARGS="${JAVA_ARGS} -Ddruid.extensions.localRepository=${MAVEN_DIR}" | ||
|
|
||
| DRUID_CP="${SCRIPT_DIR}/config/_common" | ||
| DRUID_CP="${DRUID_CP}:${SCRIPT_DIR}/config/$SERVER_TYPE" | ||
| DRUID_CP="${DRUID_CP}:${SCRIPT_DIR}/lib/*" | ||
|
|
||
| exec java ${JAVA_ARGS} -classpath "${DRUID_CP}" io.druid.cli.Main server "$SERVER_TYPE" |
Oops, something went wrong.