From bf0caafa04091ec3bc790b62a99f284bf053a6ca Mon Sep 17 00:00:00 2001 From: Shay Banon Date: Tue, 6 Dec 2011 01:01:04 +0200 Subject: [PATCH] remove old modules and gradle --- build.gradle | 217 ------------------ gradle/wrapper/gradle-wrapper.jar | Bin 13031 -> 0 bytes gradle/wrapper/gradle-wrapper.properties | 6 - gradlew | 168 -------------- gradlew.bat | 82 ------- modules/benchmark/micro/build.gradle | 16 -- .../micro/src/main/java/log4j.properties | 18 -- modules/elasticsearch/build.gradle | 132 ----------- modules/jarjar/build.gradle | 91 -------- modules/test/integration/build.gradle | 22 -- modules/test/testng/build.gradle | 20 -- .../src/main/java/log4j-gradle.properties | 13 -- .../testng/src/main/java/log4j.properties | 24 -- .../util/testng/DotTestListener.java | 51 ---- .../elasticsearch/util/testng/Listeners.java | 74 ------ .../util/testng/LoggingListener.java | 102 -------- pkg/debian/control/conffiles | 4 - pkg/debian/control/control | 36 --- pkg/debian/control/postinst | 39 ---- pkg/debian/control/postrm | 30 --- pkg/debian/control/prerm | 10 - pkg/debian/default/elasticsearch | 24 -- pkg/debian/init.d/elasticsearch | 192 ---------------- settings.gradle | 20 -- 24 files changed, 1391 deletions(-) delete mode 100644 build.gradle delete mode 100644 gradle/wrapper/gradle-wrapper.jar delete mode 100644 gradle/wrapper/gradle-wrapper.properties delete mode 100755 gradlew delete mode 100644 gradlew.bat delete mode 100644 modules/benchmark/micro/build.gradle delete mode 100644 modules/benchmark/micro/src/main/java/log4j.properties delete mode 100644 modules/elasticsearch/build.gradle delete mode 100644 modules/jarjar/build.gradle delete mode 100644 modules/test/integration/build.gradle delete mode 100644 modules/test/testng/build.gradle delete mode 100644 modules/test/testng/src/main/java/log4j-gradle.properties delete mode 100644 modules/test/testng/src/main/java/log4j.properties delete mode 100644 modules/test/testng/src/main/java/org/elasticsearch/util/testng/DotTestListener.java delete mode 100644 modules/test/testng/src/main/java/org/elasticsearch/util/testng/Listeners.java delete mode 100644 modules/test/testng/src/main/java/org/elasticsearch/util/testng/LoggingListener.java delete mode 100644 pkg/debian/control/conffiles delete mode 100644 pkg/debian/control/control delete mode 100755 pkg/debian/control/postinst delete mode 100755 pkg/debian/control/postrm delete mode 100755 pkg/debian/control/prerm delete mode 100644 pkg/debian/default/elasticsearch delete mode 100644 pkg/debian/init.d/elasticsearch delete mode 100644 settings.gradle diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 4a4eb485039fa..0000000000000 --- a/build.gradle +++ /dev/null @@ -1,217 +0,0 @@ -import java.text.SimpleDateFormat - -defaultTasks "clean", "release" - -apply plugin: 'base' - -archivesBaseName = 'elasticsearch' - -buildTime = new Date() -SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); -sdf.setTimeZone(TimeZone.getTimeZone("UTC")); -buildTimeStr = sdf.format(buildTime) - -versionNumber = '0.19.0-SNAPSHOT' - -explodedDistDir = new File(distsDir, 'exploded') -explodedDistLibDir = new File(explodedDistDir, 'lib') -explodedDistBinDir = new File(explodedDistDir, 'bin') -explodedDistConfigDir = new File(explodedDistDir, 'config') - -mavenRepoUrl = System.getenv("REPO_URL"); -if (mavenRepoUrl == null) { -// mavenRepoUrl = "file://localhost/" + projectDir.absolutePath + "/build/maven/repository" - mavenRepoUrl = "http://oss.sonatype.org/service/local/staging/deploy/maven2/" -} -mavenSnapshotRepoUrl = System.getenv("SNAPSHOT_REPO_URL"); -if (mavenSnapshotRepoUrl == null) { -// mavenSnapshotRepoUrl = "file://localhost/" + projectDir.absolutePath + "/build/maven/snapshotRepository" - mavenSnapshotRepoUrl = "http://oss.sonatype.org/content/repositories/snapshots" -} -mavenRepoUser = System.getenv("REPO_USER") -mavenRepoPass = System.getenv("REPO_PASS") - -jarjarArchivePath = project(":jarjar").file("build/libs/jarjar-$versionNumber" + ".jar").absolutePath - -allprojects { - group = 'org.elasticsearch' - version = versionNumber - - plugins.withType(JavaPlugin).whenPluginAdded { - sourceCompatibility = 1.6 - targetCompatibility = 1.6 - compileJava { - sourceCompatibility = 1.6 - targetCompatibility = 1.6 - options.encoding = "UTF8" - } - javadoc { - maxMemory = "1g" - options.encoding = "UTF8" - } - - - test { - useTestNG() - String testSuiteName = project.name - suiteName = project.name - workingDir = rootProject.projectDir - options { - suiteNamte = testSuiteName - listeners << 'org.elasticsearch.util.testng.Listeners' - } - maxHeapSize = '1g' - systemProperties["es.logger.prefix"] = "" - systemProperties["es.test.log.conf"] = System.getProperty("es.test.log.conf", "log4j-gradle.properties") - systemProperties["es.test.log.conf"] = System.getProperty("es.test.log.conf", "log4j-gradle.properties") - } - - dependencies { - if (project.name != "test-testng") { - testCompile project(':test-testng') - } - testCompile('org.testng:testng:6.1.1') { transitive = false } - testCompile('com.beust:jcommander:1.5') { transitive = false } - testCompile('org.beanshell:bsh:2.0b4') { transitive = false } - testCompile('org.hamcrest:hamcrest-core:1.3.RC2') { transitive = false } - testCompile('org.hamcrest:hamcrest-library:1.3.RC2') { transitive = false } - } - } - - repositories { - mavenCentral() - mavenRepo urls: 'https://repository.jboss.org/nexus/content/groups/public' - mavenRepo urls: 'http://repository.codehaus.org/' - mavenRepo urls: 'http://elasticsearch.googlecode.com/svn/maven' - mavenRepo urls: 'http://oss.sonatype.org/content/repositories/releases' - mavenRepo urls: 'http://oss.sonatype.org/content/repositories/snapshots' - mavenRepo urls: 'http://download.java.net/maven/2/' - } -} - -configurations { - dists - distLib { - visible = false - } - jdeb -} - -dependencies { - jdeb group: 'org.vafer', name: 'jdeb', version: '0.8' -} - -//task run(dependsOn: [configurations.distLib], description: 'Runs') << { -// ant.java(classname: "org.elasticsearch.bootstrap.Bootstrap", fork: "true", classpath: configurations.distLib.asPath, -// jvmargs: "-Des-foreground=yes") -//} - -dependencies { - distLib project(':elasticsearch') -} - -task explodedDist(dependsOn: [configurations.distLib], description: 'Builds a minimal distribution image') << { - ant.delete(dir: explodedDistDir) // clean the exploded dir - [explodedDistDir, explodedDistLibDir, explodedDistBinDir, explodedDistConfigDir]*.mkdirs() - // remove old elasticsearch files - ant.delete { fileset(dir: explodedDistLibDir, includes: "$archivesBaseName-*.jar") } - - copy { - from configurations.distLib - into explodedDistLibDir - } - - copy { from('bin'); into explodedDistBinDir } - copy { from('config'); into explodedDistConfigDir } - copy { from('lib'); into explodedDistLibDir } - - copy { - from('.') - into explodedDistDir - include 'LICENSE.txt' - include 'NOTICE.txt' - include 'README.textile' - } - - ant.replace(dir: explodedDistBinDir, token: "@ES_VERSION@", value: versionNumber) - - ant.delete { fileset(dir: explodedDistLibDir, includes: "$archivesBaseName-*-javadoc.jar") } - ant.delete { fileset(dir: explodedDistLibDir, includes: "$archivesBaseName-*-sources.jar") } - ant.delete { fileset(dir: explodedDistLibDir, includes: "slf4j-*.jar") } // no need for slf4j - ant.delete { fileset(dir: explodedDistLibDir, includes: "jarjar-*.jar") } // no need jackson, we jarjar it - ant.delete { fileset(dir: explodedDistLibDir, includes: "sigar-*.jar") } // no need sigar directly under lib... - - // move relevant jars to ext - // ant.move(todir: "$explodedDistLibDir/ext") { - // fileset(dir: explodedDistLibDir) { - // include(name: '*jline*') - // include(name: '*log4j*') - // include(name: '*jna*') - // } - // } - - ant.chmod(dir: "$explodedDistDir/bin", perm: "ugo+rx", includes: "**/*") -} - -task zip(type: Zip, dependsOn: ['explodedDist']) { - rootFolder = "$archivesBaseName-${-> version}" - from(explodedDistDir) { - into rootFolder - exclude 'bin/elasticsearch' - exclude 'bin/plugin' - } - from(explodedDistDir) { - into rootFolder - include 'bin/elasticsearch' - include 'bin/plugin' - fileMode = 0755 - } -} - -task tar(type: Tar, dependsOn: ['explodedDist']) { - compression = Compression.GZIP - extension = "tar.gz" - rootFolder = "$archivesBaseName-${-> version}" - from(explodedDistDir) { - into rootFolder - exclude 'bin/*.bat' - exclude 'bin/elasticsearch' - exclude 'bin/plugin' - exclude 'lib/sigar/*win*' - } - from(explodedDistDir) { - into rootFolder - include 'bin/elasticsearch' - include 'bin/plugin' - fileMode = 0755 - } -} - - -task deb(dependsOn: ['explodedDist']) << { - ant.taskdef(name: "deb", classname: "org.vafer.jdeb.ant.DebAntTask", classpath: configurations.jdeb.asPath) - ant.copy(todir: "${distsDir}/debian") { - fileset(dir: "pkg/debian/control") - filterset(begintoken: "[[", endtoken: "]]") { - filter(token: "version", value: "${version}") - } - } - ant.deb(destfile: "${distsDir}/${archivesBaseName}-${version}-1_all.deb", control: "${distsDir}/debian", verbose: "true") { - tarfileset(dir: explodedDistDir, prefix: "/usr/share/elasticsearch", includes: "*.txt, *.textile", username: "root", group: "root") - tarfileset(dir: explodedDistBinDir, prefix: "/usr/share/elasticsearch/bin", excludes: "*.bat", filemode: "755", username: "root", group: "root") - tarfileset(dir: explodedDistLibDir, prefix: "/usr/share/elasticsearch/lib", includes: "*.jar, sigar/*", username: "root", group: "root") - tarfileset(dir: explodedDistConfigDir, prefix: "/etc/elasticsearch", username: "root", group: "root") - tarfileset(dir: "pkg/debian/init.d", includes: "elasticsearch", prefix: "/etc/init.d", filemode: "755", username: "root", group: "root") - tarfileset(dir: "pkg/debian/default", includes: "elasticsearch", prefix: "/etc/default", username: "root", group: "root") - } - ant.delete(dir: "${distsDir}/debian") -} - - -task release(dependsOn: [zip, tar, deb]) << { - ant.delete(dir: explodedDistDir) -} - -task wrapper(type: Wrapper) { - gradleVersion = '1.0-milestone-3' -} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 45bfb5c85ea4b9b0d02616718f2637b2075acb1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13031 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/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -GRADLE_APP_BASE_NAME=`basename "$0"` - -exec "$JAVACMD" $JAVA_OPTS $GRADLE_OPTS \ - -classpath "$CLASSPATH" \ - -Dorg.gradle.appname="$GRADLE_APP_BASE_NAME" \ - -Dorg.gradle.wrapper.properties="$WRAPPER_PROPERTIES" \ - $STARTER_MAIN_CLASS \ - "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index 0dbce4682d4aa..0000000000000 --- a/gradlew.bat +++ /dev/null @@ -1,82 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem ## -@rem Gradle startup script for Windows ## -@rem ## -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Uncomment those lines to set JVM options. GRADLE_OPTS and JAVA_OPTS can be used together. -set GRADLE_OPTS=%GRADLE_OPTS% -Xmx512m -@rem set JAVA_OPTS=%JAVA_OPTS% -Xmx512m - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=.\ - -@rem Find java.exe -set JAVA_EXE=java.exe -if not defined JAVA_HOME goto init - -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. -echo. -goto end - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set STARTER_MAIN_CLASS=org.gradle.wrapper.GradleWrapperMain -set CLASSPATH=%DIRNAME%\gradle\wrapper\gradle-wrapper.jar -set WRAPPER_PROPERTIES=%DIRNAME%\gradle\wrapper\gradle-wrapper.properties - -set GRADLE_OPTS=%JAVA_OPTS% %GRADLE_OPTS% -Dorg.gradle.wrapper.properties="%WRAPPER_PROPERTIES%" - -@rem Execute Gradle -"%JAVA_EXE%" %GRADLE_OPTS% -classpath "%CLASSPATH%" %STARTER_MAIN_CLASS% %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -if not "%OS%"=="Windows_NT" echo 1 > nul | choice /n /c:1 - -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit "%ERRORLEVEL%" -exit /b "%ERRORLEVEL%" - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega \ No newline at end of file diff --git a/modules/benchmark/micro/build.gradle b/modules/benchmark/micro/build.gradle deleted file mode 100644 index 4e7d14cebbdd4..0000000000000 --- a/modules/benchmark/micro/build.gradle +++ /dev/null @@ -1,16 +0,0 @@ -dependsOn(':elasticsearch') - -apply plugin: 'java' - -archivesBaseName = "$rootProject.archivesBaseName-$project.archivesBaseName" - -configurations.compile.transitive = true -configurations.testCompile.transitive = true - -// no need to use the resource dir -sourceSets.main.resources.srcDirs 'src/main/java' -sourceSets.test.resources.srcDirs 'src/test/java' - -dependencies { - compile project(':elasticsearch') -} diff --git a/modules/benchmark/micro/src/main/java/log4j.properties b/modules/benchmark/micro/src/main/java/log4j.properties deleted file mode 100644 index 4ca2f3caab98f..0000000000000 --- a/modules/benchmark/micro/src/main/java/log4j.properties +++ /dev/null @@ -1,18 +0,0 @@ -log4j.rootLogger=INFO, out -log4j.logger.jgroups=WARN - -#log4j.logger.discovery=TRACE -#log4j.logger.cluster=TRACE -#log4j.logger.indices.cluster=DEBUG -#log4j.logger.index=TRACE -#log4j.logger.index.engine=DEBUG -#log4j.logger.index.shard=TRACE -#log4j.logger.index.cache=DEBUG -#log4j.logger.http=TRACE -#log4j.logger.monitor.jvm=DEBUG -#log4j.logger.cluster.action.shard=TRACE -#log4j.logger.index.gateway=TRACE - -log4j.appender.out=org.apache.log4j.ConsoleAppender -log4j.appender.out.layout=org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern=[%d{ABSOLUTE}][%-5p][%-25c] %m%n diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle deleted file mode 100644 index 0490ecbeb4419..0000000000000 --- a/modules/elasticsearch/build.gradle +++ /dev/null @@ -1,132 +0,0 @@ -dependsOn(':test-testng') - -apply plugin: 'java' -apply plugin: 'maven' -apply plugin: 'eclipse' - -archivesBaseName = "$project.archivesBaseName" - -// make sure we jarjar things before we compile Java -compileJava.dependsOn << ":jarjar:jar" - -processResources.doLast { - Properties versionProps = new Properties(); - versionProps.setProperty("number", rootProject.version) - versionProps.setProperty("date", buildTimeStr) - - File versionFile = new File(sourceSets.main.classesDir, "/org/elasticsearch/version.properties") - versionFile.parentFile.mkdirs() - versionFile.withOutputStream { - versionProps.store(it, '') - } -} - -// no need to use the resource dir -sourceSets.main.resources.srcDirs 'src/main/java' -sourceSets.test.resources.srcDirs 'src/test/java' - -dependencies { - compile files(rootProject.jarjarArchivePath) - - compile('jline:jline:0.9.94') { transitive = false } - compile files(rootProject.file("lib/sigar/sigar-1.6.4.jar").absolutePath) - - - compile 'org.slf4j:slf4j-api:1.5.11' - compile('org.slf4j:slf4j-log4j12:1.5.11') { transitive = false } - compile('log4j:log4j:1.2.16') { transitive = false } - - compile('net.java.dev.jna:jna:3.2.7') { transitive = false } - - compile('org.apache.lucene:lucene-core:3.5.0') { transitive = false } - compile('org.apache.lucene:lucene-analyzers:3.5.0') { transitive = false } - compile('org.apache.lucene:lucene-queries:3.5.0') { transitive = false } - compile('org.apache.lucene:lucene-memory:3.5.0') { transitive = false } - compile('org.apache.lucene:lucene-highlighter:3.5.0') { transitive = false } -} - -configurations { - deployerJars - tools -} - -dependencies { - deployerJars "org.apache.maven.wagon:wagon-http:1.0-beta-2" -} - -jar { -// from sourceSets.main.allJava - manifest { - attributes("Implementation-Title": "ElasticSearch", "Implementation-Version": rootProject.version, "Implementation-Date": buildTimeStr) - } -} - -jar << { - mergedArchivePath = new File(jar.archivePath.absolutePath + ".merged.jar") - project.ant { - jar(destfile: mergedArchivePath) { - zipFileSet(src: jar.archivePath) - zipFileSet(src: rootProject.jarjarArchivePath) - } - delete(file: jar.archivePath) - move(file: mergedArchivePath, tofile: jar.archivePath) - } -} - -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource -} - -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} - -artifacts { - archives sourcesJar - archives javadocJar -} - -uploadArchives { - repositories.mavenDeployer { - configuration = configurations.deployerJars - repository(url: rootProject.mavenRepoUrl) { - authentication(userName: rootProject.mavenRepoUser, password: rootProject.mavenRepoPass) - } - snapshotRepository(url: rootProject.mavenSnapshotRepoUrl) { - authentication(userName: rootProject.mavenRepoUser, password: rootProject.mavenRepoPass) - } - - pom.project { - inceptionYear '2009' - name 'elasticsearch' - description 'Open Source, Distributed, RESTful Search Engine' - licenses { - license { - name 'The Apache Software License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - distribution 'repo' - } - } - scm { - connection 'git://github.com/elasticsearch/elasticsearch.git' - developerConnection 'git@github.com:elasticsearch/elasticsearch.git' - url 'http://github.com/elasticsearch/elasticsearch' - } - } - - pom.whenConfigured {pom -> - pom.dependencies = pom.dependencies.findAll {dep -> dep.scope != 'test' } // removes the test scoped ones - pom.dependencies = pom.dependencies.findAll {dep -> !dep.artifactId.contains('jna') } // remove jna, its optional - pom.dependencies = pom.dependencies.findAll {dep -> !dep.artifactId.contains('jarjar') } - pom.dependencies = pom.dependencies.findAll {dep -> !dep.artifactId.contains('log4j') } - pom.dependencies = pom.dependencies.findAll {dep -> !dep.artifactId.contains('slf4j') } - pom.dependencies = pom.dependencies.findAll {dep -> !dep.artifactId.contains('jline') } - } - } -} - -eclipseClasspath { - defaultOutputDir = file('build/eclipse-build') -} diff --git a/modules/jarjar/build.gradle b/modules/jarjar/build.gradle deleted file mode 100644 index 1fe3e425289d0..0000000000000 --- a/modules/jarjar/build.gradle +++ /dev/null @@ -1,91 +0,0 @@ -apply plugin: 'java' - -archivesBaseName = "$project.archivesBaseName" - -dependencies { - runtime 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.2' - runtime 'com.google.guava:guava:r09' - runtime 'org.elasticsearch:es-trove:3.0.0' - runtime 'org.elasticsearch:es-jsr166y:20110918' - runtime 'org.elasticsearch:es-jsr166e:20110918' - - runtime 'commons-codec:commons-codec:1.5' - - // joda 2.0 moved to using volatile fields for datetime, which hurts performance for facets! - runtime 'joda-time:joda-time:1.6.2' - runtime 'org.mvel:mvel2:2.1.Beta7' - - runtime 'org.codehaus.jackson:jackson-core-asl:1.9.2' - runtime 'org.codehaus.jackson:jackson-smile:1.9.2' - runtime 'org.yaml:snakeyaml:1.6' - - runtime('org.jboss.netty:netty:3.2.7.Final') { transitive = false } -} - -configurations { - tools -} - -dependencies { - tools "org.elasticsearch:es-jarjar:1.0.0" -} - -jar << { - jarjarArchivePath = new File(jar.archivePath.absolutePath + ".jarjar.jar") - project.ant { - taskdef name: "jarjar", classname: "com.tonicsystems.jarjar.JarJarTask", classpath: configurations.tools.asPath - jarjar(jarfile: jarjarArchivePath) { - zipfileset(src: jar.archivePath) - configurations.runtime.files.findAll {file -> - ['inject', 'codec', 'mvel', 'jackson', 'joda', 'snakeyaml', 'netty', 'guice', 'javax.inject', 'aopalliance', 'guava', 'concurrentlinkedhashmap', 'trove', 'jsr166y', 'jsr166e'].any { file.name.contains(it) } - }.each { jarjarFile -> - zipfileset(src: jarjarFile) { - exclude(name: "META-INF/**") - } - } - rule pattern: "com.googlecode.concurrentlinkedhashmap.**", result: "org.elasticsearch.common.concurrentlinkedhashmap.@1" - rule pattern: "com.google.common.**", result: "org.elasticsearch.common.@1" - rule pattern: "gnu.trove.**", result: "org.elasticsearch.common.trove.@1" - rule pattern: "jsr166y.**", result: "org.elasticsearch.common.util.concurrent.jsr166y.@1" - rule pattern: "jsr166e.**", result: "org.elasticsearch.common.util.concurrent.jsr166e.@1" - - rule pattern: "org.aopalliance.**", result: "org.elasticsearch.common.aopalliance.@1" - rule pattern: "javax.inject.**", result: "org.elasticsearch.common.inject.jex.@1" - rule pattern: "com.google.inject.**", result: "org.elasticsearch.common.inject.@1" - - rule pattern: "org.apache.commons.codec.**", result: "org.elasticsearch.common.codec.@1" - - rule pattern: "org.mvel2.**", result: "org.elasticsearch.common.mvel2.@1" - - rule pattern: "org.codehaus.jackson.**", result: "org.elasticsearch.common.jackson.@1" - rule pattern: "org.yaml.**", result: "org.elasticsearch.common.yaml.@1" - - rule pattern: "org.joda.**", result: "org.elasticsearch.common.joda.@1" - - rule pattern: "org.jboss.netty.**", result: "org.elasticsearch.common.netty.@1" - } - delete(file: jar.archivePath) - copy(file: jarjarArchivePath, tofile: jar.archivePath) - delete(file: jarjarArchivePath) - - // seems like empty dirs still exists, unjar and clean them - unjar(src: jar.archivePath, dest: "build/tmp/extracted") - delete(file: "build/tmp/extracted/NOTICE") - delete(file: "build/tmp/extracted/LICENSE") - delete(file: "build/tmp/extracted/build.properties") - delete(dir: "build/tmp/extracted/jsr166y") - delete(dir: "build/tmp/extracted/jsr166e") - delete(dir: "build/tmp/extracted/gnu") - delete(dir: "build/tmp/extracted/org/codehaus") - delete(dir: "build/tmp/extracted/org/aopalliance") - delete(dir: "build/tmp/extracted/com/google") - delete(dir: "build/tmp/extracted/org/mvel2") - delete(dir: "build/tmp/extracted/org/joda") - delete(dir: "build/tmp/extracted/org/yaml") - delete(dir: "build/tmp/extracted/org/jboss") - - delete(file: jar.archivePath) - jar(destfile: jar.archivePath, basedir: "build/tmp/extracted") - delete(dir: "build/tmp/extracted") - } -} diff --git a/modules/test/integration/build.gradle b/modules/test/integration/build.gradle deleted file mode 100644 index a7fc866de4d03..0000000000000 --- a/modules/test/integration/build.gradle +++ /dev/null @@ -1,22 +0,0 @@ -dependsOn(':elasticsearch') - -apply plugin: 'java' -apply plugin: 'eclipse' - -archivesBaseName = "$rootProject.archivesBaseName-$project.archivesBaseName" - -configurations.compile.transitive = true -configurations.testCompile.transitive = true - -// no need to use the resource dir -sourceSets.main.resources.srcDirs 'src/main/java' -sourceSets.test.resources.srcDirs 'src/test/java' - -dependencies { - compile project(':elasticsearch') -} - -eclipseClasspath { - defaultOutputDir = file('build/eclipse-build') -} - diff --git a/modules/test/testng/build.gradle b/modules/test/testng/build.gradle deleted file mode 100644 index 87b0cc8e1eba6..0000000000000 --- a/modules/test/testng/build.gradle +++ /dev/null @@ -1,20 +0,0 @@ -apply plugin: 'java' -apply plugin: 'eclipse' - -archivesBaseName = "$rootProject.archivesBaseName-$project.archivesBaseName" - -configurations.compile.transitive = true -configurations.testCompile.transitive = true - -// no need to use the resource dir -sourceSets.main.resources.srcDirs 'src/main/java' -sourceSets.test.resources.srcDirs 'src/test/java' - -dependencies { - compile('org.testng:testng:6.1.1') { transitive = false } - compile('log4j:log4j:1.2.16') { transitive = false } -} - -eclipseClasspath { - defaultOutputDir = file('build/eclipse-build') -} diff --git a/modules/test/testng/src/main/java/log4j-gradle.properties b/modules/test/testng/src/main/java/log4j-gradle.properties deleted file mode 100644 index d4fa6250dc535..0000000000000 --- a/modules/test/testng/src/main/java/log4j-gradle.properties +++ /dev/null @@ -1,13 +0,0 @@ -log4j.rootLogger=INFO, out -log4j.logger.jgroups=WARN - -#log4j.logger.index=DEBUG -#log4j.logger.http=TRACE -#log4j.logger.monitor.memory=TRACE -#log4j.logger.gateway=TRACE - -log4j.appender.out=org.apache.log4j.FileAppender -log4j.appender.out.file=${test.log.dir}/${test.log.name}.log -log4j.appender.out.append=true -log4j.appender.out.layout=org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern=[%d{ABSOLUTE}][%-5p][%-25c] %m%n diff --git a/modules/test/testng/src/main/java/log4j.properties b/modules/test/testng/src/main/java/log4j.properties deleted file mode 100644 index 933fb39087079..0000000000000 --- a/modules/test/testng/src/main/java/log4j.properties +++ /dev/null @@ -1,24 +0,0 @@ -log4j.rootLogger=INFO, out -log4j.logger.jgroups=WARN - -#log4j.logger.action=DEBUG -#log4j.logger.gateway=DEBUG -#log4j.logger.transport=TRACE -#log4j.logger.discovery=TRACE -#log4j.logger.cluster.service=TRACE -#log4j.logger.cluster.action.shard=DEBUG -#log4j.logger.indices.cluster=DEBUG -#log4j.logger.index=TRACE -#log4j.logger.index.engine=DEBUG -#log4j.logger.index.shard.service=DEBUG -#log4j.logger.index.shard.recovery=DEBUG -#log4j.logger.index.cache=DEBUG -#log4j.logger.http=TRACE -#log4j.logger.monitor.memory=TRACE -#log4j.logger.monitor.memory=TRACE -#log4j.logger.cluster.action.shard=TRACE -#log4j.logger.index.gateway=TRACE - -log4j.appender.out=org.apache.log4j.ConsoleAppender -log4j.appender.out.layout=org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern=[%d{ABSOLUTE}][%-5p][%-25c] %m%n diff --git a/modules/test/testng/src/main/java/org/elasticsearch/util/testng/DotTestListener.java b/modules/test/testng/src/main/java/org/elasticsearch/util/testng/DotTestListener.java deleted file mode 100644 index c709fa7df7bbe..0000000000000 --- a/modules/test/testng/src/main/java/org/elasticsearch/util/testng/DotTestListener.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to Elastic Search and Shay Banon under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. Elastic Search 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. - */ - -package org.elasticsearch.util.testng; - -import org.testng.ITestResult; -import org.testng.TestListenerAdapter; - -/** - * @author kimchy (Shay Banon) - */ -public class DotTestListener extends TestListenerAdapter { - - private int count = 1; - - @Override public void onTestFailure(ITestResult tr) { - log("F"); - } - - @Override public void onTestSkipped(ITestResult tr) { - log("S"); - } - - @Override public void onTestSuccess(ITestResult tr) { - log("."); - } - - private void log(String string) { - System.err.print(string); - if (count++ % 40 == 0) { - System.err.println(""); - } - } -} - diff --git a/modules/test/testng/src/main/java/org/elasticsearch/util/testng/Listeners.java b/modules/test/testng/src/main/java/org/elasticsearch/util/testng/Listeners.java deleted file mode 100644 index b9f41faa6d894..0000000000000 --- a/modules/test/testng/src/main/java/org/elasticsearch/util/testng/Listeners.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Licensed to Elastic Search and Shay Banon under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. Elastic Search 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. - */ - -package org.elasticsearch.util.testng; - -import org.testng.ITestContext; -import org.testng.ITestListener; -import org.testng.ITestResult; - -/** - * @author kimchy (Shay Banon) - */ -public class Listeners implements ITestListener { - - private final ITestListener[] listeners = new ITestListener[]{new LoggingListener()}; - - @Override public void onTestStart(ITestResult result) { - for (ITestListener listener : listeners) { - listener.onTestStart(result); - } - } - - @Override public void onTestSuccess(ITestResult result) { - for (ITestListener listener : listeners) { - listener.onTestSuccess(result); - } - } - - @Override public void onTestFailure(ITestResult result) { - for (ITestListener listener : listeners) { - listener.onTestFailure(result); - } - } - - @Override public void onTestSkipped(ITestResult result) { - for (ITestListener listener : listeners) { - listener.onTestSkipped(result); - } - } - - @Override public void onTestFailedButWithinSuccessPercentage(ITestResult result) { - for (ITestListener listener : listeners) { - listener.onTestFailedButWithinSuccessPercentage(result); - } - } - - @Override public void onStart(ITestContext context) { - for (ITestListener listener : listeners) { - listener.onStart(context); - } - } - - @Override public void onFinish(ITestContext context) { - for (ITestListener listener : listeners) { - listener.onFinish(context); - } - } -} diff --git a/modules/test/testng/src/main/java/org/elasticsearch/util/testng/LoggingListener.java b/modules/test/testng/src/main/java/org/elasticsearch/util/testng/LoggingListener.java deleted file mode 100644 index d18cedd124939..0000000000000 --- a/modules/test/testng/src/main/java/org/elasticsearch/util/testng/LoggingListener.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Licensed to Elastic Search and Shay Banon under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. Elastic Search 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. - */ - -package org.elasticsearch.util.testng; - -import org.apache.log4j.PropertyConfigurator; -import org.testng.ITestContext; -import org.testng.ITestResult; -import org.testng.TestListenerAdapter; - -import java.io.File; -import java.io.IOException; -import java.util.Properties; - -/** - * @author kimchy (shay.banon) - */ -public class LoggingListener extends TestListenerAdapter { - - @Override public void onStart(ITestContext context) { - String logsDir = context.getOutputDirectory() + "/logs"; - deleteRecursively(new File(logsDir), false); - System.setProperty("test.log.dir", logsDir); - System.setProperty("es.path.data", context.getOutputDirectory() + "/data"); - System.setProperty("es.path.work", context.getOutputDirectory() + "/work"); - } - - @Override public void onTestStart(ITestResult result) { - String logName = result.getTestClass().getName(); - if (logName.startsWith("org.elasticsearch.")) { - logName = logName.substring("org.elasticsearch.".length()); - } - System.setProperty("test.log.name", logName); - - Properties props = new Properties(); - try { - props.load(LoggingListener.class.getClassLoader().getResourceAsStream(System.getProperty("es.test.log.conf", "log4j.properties"))); - } catch (IOException e) { - e.printStackTrace(); - } - PropertyConfigurator.configure(props); - - org.apache.log4j.Logger.getLogger("testng").info("========== Starting Test [" + result.getName() + "] =========="); - } - - @Override public void onTestSuccess(ITestResult result) { - org.apache.log4j.Logger.getLogger("testng").info("========== Test Success [" + result.getName() + "] =========="); - } - - @Override public void onTestFailure(ITestResult result) { - org.apache.log4j.Logger.getLogger("testng").info("========== Test Failure [" + result.getName() + "] =========="); - } - - @Override public void onTestSkipped(ITestResult result) { - org.apache.log4j.Logger.getLogger("testng").info("========== Test Skipped [" + result.getName() + "] =========="); - } - - /** - * Delete the supplied {@link java.io.File} - for directories, - * recursively delete any nested directories or files as well. - * - * @param root the root File to delete - * @param deleteRoot whether or not to delete the root itself or just the content of the root. - * @return true if the File was deleted, - * otherwise false - */ - public static boolean deleteRecursively(File root, boolean deleteRoot) { - if (root != null && root.exists()) { - if (root.isDirectory()) { - File[] children = root.listFiles(); - if (children != null) { - for (File aChildren : children) { - deleteRecursively(aChildren, true); - } - } - } - - if (deleteRoot) { - return root.delete(); - } else { - return true; - } - } - return false; - } -} \ No newline at end of file diff --git a/pkg/debian/control/conffiles b/pkg/debian/control/conffiles deleted file mode 100644 index 98e0f5a64326c..0000000000000 --- a/pkg/debian/control/conffiles +++ /dev/null @@ -1,4 +0,0 @@ -/etc/init.d/elasticsearch -/etc/default/elasticsearch -/etc/elasticsearch/logging.yml -/etc/elasticsearch/elasticsearch.yml diff --git a/pkg/debian/control/control b/pkg/debian/control/control deleted file mode 100644 index d7026e6ee35ce..0000000000000 --- a/pkg/debian/control/control +++ /dev/null @@ -1,36 +0,0 @@ -Package: elasticsearch -Version: [[version]] -Architecture: all -Maintainer: Nicolas Huray -Depends: openjdk-6-jre-headless | sun-java6-jre -Section: web -Priority: optional -Homepage: http://www.elasticsearch.org/ -Description: Open Source, Distributed, RESTful Search Engine - ElasticSearch is a distributed RESTful search engine built for the cloud. - . - Features include: - . - * Distributed and Highly Available Search Engine. - - Each index is fully sharded with a configurable number of shards. - - Each shard can have one or more replicas. - - Read / Search operations performed on either one of the replica shard. - * Multi Tenant with Multi Types. - - Support for more than one index. - - Support for more than one type per index. - - Index level configuration (number of shards, index storage, ...). - * Various set of APIs - - HTTP RESTful API - - Native Java API. - - All APIs perform automatic node operation rerouting. - * Document oriented - - No need for upfront schema definition. - - Schema can be defined per type for customization of the indexing process. - * Reliable, Asynchronous Write Behind for long term persistency. - * (Near) Real Time Search. - * Built on top of Lucene - - Each shard is a fully functional Lucene index - - All the power of Lucene easily exposed through simple configuration / plugins. - * Per operation consistency - - Single document level operations are atomic, consistent, isolated and durable. - * Open Source under Apache 2 License. diff --git a/pkg/debian/control/postinst b/pkg/debian/control/postinst deleted file mode 100755 index 85d631b6e23ac..0000000000000 --- a/pkg/debian/control/postinst +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -set -e - -case "$1" in - configure) - [ -f /etc/default/elasticsearch ] && . /etc/default/elasticsearch - [ -z "$ES_USER" ] && ES_USER="elasticsearch" - [ -z "$ES_GROUP" ] && ES_GROUP="elasticsearch" - if ! getent group "$ES_GROUP" > /dev/null 2>&1 ; then - addgroup --system "$ES_GROUP" --quiet - fi - if ! id $ES_USER > /dev/null 2>&1 ; then - adduser --system --home /usr/share/elasticsearch --no-create-home \ - --ingroup "$ES_GROUP" --disabled-password --shell /bin/false \ - "$ES_USER" - fi - - # Set user permissions on /var/log/elasticsearch and /var/lib/elasticsearch - mkdir -p /var/log/elasticsearch /var/lib/elasticsearch - chown -R $ES_USER:$ES_GROUP /var/log/elasticsearch /var/lib/elasticsearch - chmod 755 /var/log/elasticsearch /var/lib/elasticsearch - - # configuration files should not be modifiable by elasticsearch user, as this can be a security issue - chown -Rh root:root /etc/elasticsearch/* - chmod 755 /etc/elasticsearch - chmod 644 /etc/elasticsearch/* - ;; -esac - - -if [ -x "/etc/init.d/elasticsearch" ]; then - update-rc.d elasticsearch defaults 95 10 >/dev/null - if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d elasticsearch start || true - else - /etc/init.d/elasticsearch start || true - fi -fi - diff --git a/pkg/debian/control/postrm b/pkg/debian/control/postrm deleted file mode 100755 index 776528a3af435..0000000000000 --- a/pkg/debian/control/postrm +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -set -e - -case "$1" in - remove) - # Remove logs and data - rm -rf /var/log/elasticsearch /var/lib/elasticsearch - ;; - - purge) - # Remove service - update-rc.d elasticsearch remove >/dev/null || true - - # Remove logs and data - rm -rf /var/log/elasticsearch /var/lib/elasticsearch - - # Remove user/group - deluser elasticsearch || true - delgroup elasticsearch || true - ;; - - upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - # Nothing to do here - ;; - - *) - echo "$0 called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac diff --git a/pkg/debian/control/prerm b/pkg/debian/control/prerm deleted file mode 100755 index f3603a24df70e..0000000000000 --- a/pkg/debian/control/prerm +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -set -e - -if [ -x "/etc/init.d/elasticsearch" ]; then - if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d elasticsearch stop || true - else - /etc/init.d/elasticsearch stop || true - fi -fi \ No newline at end of file diff --git a/pkg/debian/default/elasticsearch b/pkg/debian/default/elasticsearch deleted file mode 100644 index f3cecf8af221b..0000000000000 --- a/pkg/debian/default/elasticsearch +++ /dev/null @@ -1,24 +0,0 @@ -# Run ElasticSearch as this user ID and group ID -ES_USER=elasticsearch -ES_GROUP=elasticsearch - -# Minimum Heap memory to run ElasticSearch -ES_MIN_MEM=256m - -# Maximum Heap memory to run ElasticSearch -ES_MAX_MEM=1g - -# ElasticSearch log directory -LOG_DIR=/var/log/elasticsearch - -# ElasticSearch data directory -DATA_DIR=/var/lib/elasticsearch - -# ElasticSearch work directory -WORK_DIR=/tmp/elasticsearch - -# ElasticSearch configuration directory -CONF_DIR=/etc/elasticsearch - -# ElasticSearch configuration file (elasticsearch.yml) -CONF_FILE=/etc/elasticsearch/elasticsearch.yml diff --git a/pkg/debian/init.d/elasticsearch b/pkg/debian/init.d/elasticsearch deleted file mode 100644 index 8d250b4184726..0000000000000 --- a/pkg/debian/init.d/elasticsearch +++ /dev/null @@ -1,192 +0,0 @@ -#!/bin/sh -# -# /etc/init.d/elasticsearch -- startup script for Elasticsearch -# -# Written by Miquel van Smoorenburg . -# Modified for Debian GNU/Linux by Ian Murdock . -# Modified for Tomcat by Stefan Gybas . -# Modified for Tomcat6 by Thierry Carrez . -# Additional improvements by Jason Brittain . -# Modified by Nicolas Huray for ElasticSearch . -# -### BEGIN INIT INFO -# Provides: elasticsearch -# Required-Start: $all -# Required-Stop: $all -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Starts elasticsearch -# Description: Starts elasticsearch using start-stop-daemon -### END INIT INFO - -set -e - -PATH=/bin:/usr/bin:/sbin:/usr/sbin -NAME=elasticsearch -DESC="ElasticSearch Server" -DEFAULT=/etc/default/$NAME - -if [ `id -u` -ne 0 ]; then - echo "You need root privileges to run this script" - exit 1 -fi - - -. /lib/lsb/init-functions - -if [ -r /etc/default/rcS ]; then - . /etc/default/rcS -fi - - -# The following variables can be overwritten in $DEFAULT - -# Run ElasticSearch as this user ID and group ID -ES_USER=elasticsearch -ES_GROUP=elasticsearch - -# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT) -JDK_DIRS="/usr/lib/jvm/java-7-openjdk /usr/lib/jvm/java-7-oracle /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun" - -# Look for the right JVM to use -for jdir in $JDK_DIRS; do - if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then - JAVA_HOME="$jdir" - fi -done -export JAVA_HOME - -# Directory where the ElasticSearch binary distribution resides -ES_HOME=/usr/share/$NAME - -# Minimum Heap memory to run ElasticSearch -ES_MIN_MEM=256m - -# Maximum Heap memory to run ElasticSearch -ES_MAX_MEM=1g - -# ElasticSearch log directory -LOG_DIR=/var/log/$NAME - -# ElasticSearch data directory -DATA_DIR=/var/lib/$NAME - -# ElasticSearch work directory -WORK_DIR=/tmp/$NAME - -# ElasticSearch configuration directory -CONF_DIR=/etc/$NAME - -# ElasticSearch configuration file (elasticsearch.yml) -CONF_FILE=$CONF_DIR/elasticsearch.yml - -# End of variables that can be overwritten in $DEFAULT - -# overwrite settings from default file -if [ -f "$DEFAULT" ]; then - . "$DEFAULT" -fi - -# Define other required variables -PID_FILE=/var/run/$NAME.pid -DAEMON=$ES_HOME/bin/elasticsearch -DAEMON_OPTS="-p $PID_FILE -Des.config=$CONF_FILE -Des.path.home=$ES_HOME -Des.path.logs=$LOG_DIR -Des.path.data=$DATA_DIR -Des.path.work=$WORK_DIR -Des.path.conf=$CONF_DIR" - -export ES_MIN_MEM ES_MAX_MEM - -# Check DAEMON exists -test -x $DAEMON || exit 0 - -case "$1" in - start) - if [ -z "$JAVA_HOME" ]; then - log_failure_msg "no JDK found - please set JAVA_HOME" - exit 1 - fi - - log_daemon_msg "Starting $DESC" - - if start-stop-daemon --test --start --pidfile "$PID_FILE" \ - --user "$ES_USER" --exec "$JAVA_HOME/bin/java" \ - >/dev/null; then - - # Prepare environment - mkdir -p "$LOG_DIR" "$DATA_DIR" "$WORK_DIR" && chown "$ES_USER":"$ES_GROUP" "$LOG_DIR" "$DATA_DIR" "$WORK_DIR" - touch "$PID_FILE" && chown "$ES_USER":"$ES_GROUP" "$PID_FILE" - ulimit -n 65535 - - # Start Daemon - start-stop-daemon --start -b --user "$ES_USER" -c "$ES_USER" --pidfile "$PID_FILE" --exec /bin/bash -- -c "$DAEMON $DAEMON_OPTS" - - sleep 1 - if start-stop-daemon --test --start --pidfile "$PID_FILE" \ - --user "$ES_USER" --exec "$JAVA_HOME/bin/java" \ - >/dev/null; then - if [ -f "$PID_FILE" ]; then - rm -f "$PID_FILE" - fi - log_end_msg 1 - else - log_end_msg 0 - fi - - else - log_progress_msg "(already running)" - log_end_msg 0 - fi - ;; - stop) - log_daemon_msg "Stopping $DESC" - - set +e - if [ -f "$PID_FILE" ]; then - start-stop-daemon --stop --pidfile "$PID_FILE" \ - --user "$ES_USER" \ - --retry=TERM/20/KILL/5 >/dev/null - if [ $? -eq 1 ]; then - log_progress_msg "$DESC is not running but pid file exists, cleaning up" - elif [ $? -eq 3 ]; then - PID="`cat $PID_FILE`" - log_failure_msg "Failed to stop $DESC (pid $PID)" - exit 1 - fi - rm -f "$PID_FILE" - else - log_progress_msg "(not running)" - fi - log_end_msg 0 - set -e - ;; - status) - set +e - start-stop-daemon --test --start --pidfile "$PID_FILE" \ - --user "$ES_USER" --exec "$JAVA_HOME/bin/java" \ - >/dev/null 2>&1 - if [ "$?" = "0" ]; then - - if [ -f "$PID_FILE" ]; then - log_success_msg "$DESC is not running, but pid file exists." - exit 1 - else - log_success_msg "$DESC is not running." - exit 3 - fi - else - log_success_msg "$DESC is running with pid `cat $PID_FILE`" - fi - set -e - ;; - restart|force-reload) - if [ -f "$PID_FILE" ]; then - $0 stop - sleep 1 - fi - $0 start - ;; - *) - log_success_msg "Usage: $0 {start|stop|restart|force-reload|status}" - exit 1 - ;; -esac - -exit 0 diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 6edf3206adda5..0000000000000 --- a/settings.gradle +++ /dev/null @@ -1,20 +0,0 @@ -include 'test-testng' - -include 'jarjar' - -include 'elasticsearch' - -include 'test-integration' - -include 'benchmark-micro' - -rootProject.name = 'elasticsearch-root' -rootProject.children.each {project -> - String fileBaseName = project.name.replaceAll("\\p{Upper}") { "-${it.toLowerCase()}" } - fileBaseName = fileBaseName.replace('-', '/'); - if (fileBaseName.startsWith("plugins")) { - project.projectDir = new File(settingsDir, "$fileBaseName") - } else { - project.projectDir = new File(settingsDir, "modules/$fileBaseName") - } -}