You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dl...@apache.org on 2017/11/02 03:21:12 UTC
[01/50] [abbrv] incubator-edgent git commit: Jenkinsfile: add
building samples verification
Repository: incubator-edgent
Updated Branches:
refs/heads/develop bdb2cd815 -> 9ad48657a
Jenkinsfile: add building samples verification
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/b176fd21
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/b176fd21
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/b176fd21
Branch: refs/heads/develop
Commit: b176fd2133a45cbfa7e36c4048b5a94c71015656
Parents: 0d8d9f6
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Mon Oct 23 18:00:24 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Mon Oct 23 18:00:24 2017 -0400
----------------------------------------------------------------------
Jenkinsfile | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/b176fd21/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 07ed98f..a56ea86 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -53,6 +53,17 @@ node('ubuntu') {
stage ('Build') {
echo 'Building'
sh "${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-android,platform-java7,distribution,toolchain -Djava8.home=${env.JAVA_HOME} -Dedgent.build.ci=true clean ${mavenGoal} sonar:sonar site:site"
+
+ echo 'Verify samples build, etc'
+ sh "cd samples; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} clean package"
+ sh "cd samples/topology; ./run-sample.sh HelloEdgent"
+ sh "cd samples; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-java7 clean package"
+ sh "cd samples/topology; ./run-sample.sh HelloEdgent"
+
+ echo 'Verify app template builds, etc'
+ sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} clean package; ./run-app.sh"
+ sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-java7 clean package; ./run-app.sh"
+ sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-android clean package; ./run-app.sh"
}
stage ('Stage Site') {
[35/50] [abbrv] incubator-edgent git commit: remove all gradle
tooling artifacts and "exclusions" from the repo
Posted by dl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/build.gradle.sav
----------------------------------------------------------------------
diff --git a/build.gradle.sav b/build.gradle.sav
deleted file mode 100644
index 450a54c..0000000
--- a/build.gradle.sav
+++ /dev/null
@@ -1,930 +0,0 @@
-/*
-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.
-*/
-
-apply from: 'gradle/wrapper.gradle'
-apply from: 'gradle/other.gradle'
-
-import org.gradle.plugins.signing.Sign
-import java.io.Console
-
-/* Configure root project */
-allprojects {
- apply plugin: 'idea'
- apply plugin: 'eclipse'
-
- repositories {
- mavenCentral()
- }
-
- project.version = build_version
-}
-
-apply from: 'gradle/rat.gradle'
-
-rat {
- excludes = [
- '*.patch',
- '**/.classpath',
- '**/.cache/**',
- '**/.git/**',
- '**/.gitignore',
- '**/.gradle/**',
- '.gradle-wrapper/**', // historical instead of gradle/wrapper
- '**/.idea/**',
- '**/.project',
- '**/.settings/**',
- '**/bin/**', // generated by Eclipse builds
- '**/build/**',
- '**/META-INF/services/**',
- '**/README.md',
- 'externalJars/**', // generated by setupExternalJars for Eclipse use
- 'gradlew',
- 'gradlew.bat',
- 'DEVELOPMENT.md',
- 'JAVA_SUPPORT.md',
- 'CONTRIBUTORS', '.mailmap',
- 'binary-release/apache-notice',
- 'binary-release/ibm-contrib-notice',
- 'connectors/jdbc/JdbcStreamsTestDb/**',
- 'connectors/jdbc/derby.log',
- 'connectors/mqtt/src/test/keystores/**',
- 'console/**/js/ext/**/jquery.js', // has header w/MIT license ref
- 'console/**/js/ext/**/jquery-ui.min.css', // has header w/MIT license ref
- 'console/**/js/ext/**/jquery-ui.min.js', // has header w/MIT license ref
- 'console/**/js/ext/**/jquery-ui.structure.min.css', // has header w/MIT license ref
- 'console/**/js/ext/**/jquery-ui.theme.min.css', // has header w/MIT license ref
- 'console/**/js/ext/d3.legend.js', // has header w/MIT license ref
- 'console/**/js/ext/d3.min.js', // no header. included in LICENSE
- 'console/**/js/ext/sankey_edgent.js', // no header. included in LICENSE
- 'licenses/d3-sankey.BSD', // OK, BSD 3-clause
- 'licenses/d3.BSD', // OK, BSD 3-clause
- 'licenses/binary-release/javax.servlet-api-3.1.0.CDDL-1.0', // OK, only binary form content
- 'licenses/binary-release/javax.websocket-api-1.0.CDDL-1.1', // OK, only binary form content
- 'licenses/binary-release/mqttv3-1.1.0.EDL-1.0', // OK, EDL-1.0
- 'licenses/binary-release/mqttv3-1.1.0.EDL-1.0', // OK, EDL-1.0
- 'licenses/binary-release/watson-iot-0.2.2.EPL-1.0', // OK, only binary form content
- 'samples/**/*.properties',
- 'samples/**/*.cfg',
- 'scripts/**/*.properties',
- 'scripts/**/*.cfg',
- 'scripts/connectors/jdbc/persondata.txt',
- 'scripts/connectors/kafka/README-kafka',
- 'test/**/*.properties',
- 'test/**/device.cfg',
- 'test/**/*.txt',
- ]
-}
-
-apply plugin: 'java'
-jar {
- deleteAllActions() // Avoid creating/staging an empty jar for the "root"
-}
-apply plugin: 'signing'
-
-
-ext {
- commithash_error = ''
- commithash = {
- try {
- return "git rev-parse --short HEAD".execute().text.trim()
- } catch (Exception e) {
- ext.commithash_error = e
- return ''
- }
- }()
- now = new Date()
- DSTAMP = String.format('%tY%<tm%<td', now)
- TSTAMP = String.format('%tH%<tM', now)
- COPYRIGHT_YEAR = String.format('%tY', now)
-
- snapshotId = "-SNAPSHOT-${DSTAMP}-${TSTAMP}"
- if (System.properties['edgent.snapshotId'] != null) {
- snapshotId = System.properties['edgent.snapshotId']
- }
-
- external_jars_dir = "$rootProject.projectDir/externalJars/java8"
-
- target_dir = "$distsDir"
- target_java8_dir = "$target_dir/java8"
- target_java8_ext_dir = "$target_java8_dir/ext"
- target_java7_dir = "$target_dir/java7"
- target_android_dir = "$target_dir/android"
- target_docs_dir = "$target_dir/docs"
- target_javadoc_dir = "$target_docs_dir/javadoc"
- target_report_dir = "$target_dir/reports"
-
- // project groups whose jars are to be placed in target_java8_lib
- // instead of the default "$target_java8_dir/$simpleProjectGroup/$project.name/lib"
- // e.g., "$target_java8_dir/lib" for api/topology
- // "$target_java8_dir/connectors/iotp/lib" for connectors/iotp
- //
- target_java8_lib_groups = ["api", "providers", "runtime", "spi"]
-
- // TODO can these be deduced by the absence of a build.gradle for the project?
- aggregatorOnlyProjects = [
- ':android',
- ':analytics', ':api', ':apps',
- ':connectors', ':console',
- ':platform', ':providers',
- ':runtime', ':samples', ':spi',
- ':test', ':utils'
- ]
-
- filteredSubprojects = subprojects.findAll {
- project -> !aggregatorOnlyProjects.contains(project.path)
- }
-
- // Edgent core external dependencies
- core_ext_dependencies = ['com.google.code.gson:gson:2.2.4',
- 'org.slf4j:slf4j-api:1.7.12',
- 'io.dropwizard.metrics:metrics-core:3.1.2']
-
- // Edgent Samples external dependencies
- samples_ext_dependencies = ['org.slf4j:slf4j-jdk14:1.7.12']
-
- // Edgent tests external dependencies
- test_common_dependencies = ['org.slf4j:slf4j-jdk14:1.7.12']
-
- common_ext_dependencies = [
- core_ext_dependencies,
- samples_ext_dependencies,
- // test_common_dependencies, // omit as tests aren't included in release tgz
- ].flatten()
-
- ext."signing.keyId" = null
- ext."signing.secretKeyRingFile" = null
- ext."signing.password" = null
-}
-
-// Declare the common_ext_dependencies as dependencies of the root project
-// to easily copy them (their resolved paths) to the target dir
-dependencies {
- compile common_ext_dependencies
-}
-ext.copyCommonExtJarsFn = { targetDir ->
- copy {
- from configurations.compile.files
- into targetDir
- }
-}
-task setupCommonExtJars << {
- copyCommonExtJarsFn "$external_jars_dir/ext"
-}
-task copyCommonExtJars << {
- copyCommonExtJarsFn target_java8_ext_dir
-}
-
-def String mkJarNameFromSpec(String jarSpec) {
- // e.g. 'com.google.code.gson:gson:2.2.4' => gson-2.2.4.jar
- // e.g. 'com.google.code.gson:gson:2.2.4@jar' => gson-2.2.4.jar
- def sfx = jarSpec.endsWith('@jar') ? "" : '.jar'
- return jarSpec.split(':')[1] + '-' + jarSpec.split(':')[2].replace('@','.') + sfx
-}
-
-def getProjectExtDepFiles(Project proj) { // project's direct ext deps and their transitive deps
- // TODO suspect this is picking up ext dependencies of transitive **project** dependencies???
-
- // handle ext jar deps expressed via "compile <external-dependency-spec>"
- def allExtDepFiles = proj.configurations.runtime.files { it instanceof ExternalDependency }
-
- // handle ext jar deps expressed via addTargetDirExtJarDependency
- allExtDepFiles.addAll proj.files(proj.directTargetDirExtJarDependencies)
-
- logger.info "$proj.path allExtDepFiles: "+allExtDepFiles
- return allExtDepFiles
-}
-
-def getProjectNonCommonExtDepFiles(Project proj) {
- // filter out "common" (target_java8_ext_dir) external dependencies
- def commonExtJarNames = common_ext_dependencies.collect {
- mkJarNameFromSpec it
- }
- def filteredExtDepFiles = getProjectExtDepFiles(proj).findAll {
- ! commonExtJarNames.contains(it.getName())
- }
- return filteredExtDepFiles
-}
-
-def String mkManifestClassPath(Project proj) {
- // The manifest's classpath needs to include the project's:
- // - immediate-only dependant edgent jars (not transitive and not their ext deps
- // since our project jars are build with a manifest-classpath that
- // handles the project's "private" dependencies)
- // - immediate dependant external jars and their transitive deps (since
- // these don't seem to have a manifest classpath that takes care of their
- // dependencies)
- // - common_ext_dependencies jars when declared as dependencies
- //
- // proj.configurations.runtime.files (mostly) captures all of the above
- // since do to our project build.gradle use of our various add*Dependency().
-
- def depJars = proj.configurations.runtime.files
-
- // assume that any deps still in the gradle cache are project private ext deps
- // (that will-get/have-been copied into the project's ext dir in the targetdir)
- def projExtDir = "$target_java8_dir/$proj.targetRelProjExtDir"
- depJars = depJars.collect { file ->
- if (file.toString().contains('/.gradle/caches/')) {
- return proj.file("$projExtDir/"+file.getName())
- }
- return file
- }
-
- def cp = proj.mkRelativePaths(depJars).join(' ')
- logger.info "$proj.path manifest-classPath: $cp"
- return cp
-}
-
-gradle.taskGraph.whenReady {taskGraph ->
- if (taskGraph.hasTask(test)) {
- println "\nHINTs: Use the '--tests <testClassNamePattern>[.<testMethodNamePattern>]' option to select specific test classes or methods."
- println " ./gradlew :api:topology:test --tests '*JsonFunctionsTest'"
- println " ./gradlew :api:topology:test --tests '*JsonFunctionsTest.testBytes'"
- println "Use the 'cleanTest' task to force a rerun of a previously successful test task:"
- println " ./gradlew :api:topology:cleanTest :api:topology:test"
- println " ./gradlew cleanTest test"
- println ""
- sleep 2
- }
-}
-
-/* Configure subprojects */
-subprojects {
-
- // ignore aggregator only projects so we don't assemble empty jars, etc for them.
- if (aggregatorOnlyProjects.contains(project.path)) {
- return
- }
-
- if(!project.group.equals("edgent.platform")){
- apply plugin: 'maven-publish'
- }
- apply plugin: 'java'
- apply plugin: "jacoco"
-
- if (buildFile.isFile() && !buildFile.exists()) {
- configurations.create('default')
- return
- }
-
- ext.simpleGroupName = project.group.replace('edgent.', '') // e.g., 'edgent.api' => 'api'
-
- ext.mkRelativePaths = { Collection files ->
- // make all files paths relative to the project's lib dir in targetdir
- // well... unless this is for a war, which resides in the group's "webapps"
- // dir instead of project's lib dir. See :console:servlets build.gradle.
- def projLibDir = project.file("$target_java8_dir/$targetRelProjLibDir")
- if (project.pluginManager.hasPlugin('war')) {
- projLibDir = project.file("$target_java8_dir/$project.simpleGroupName/webapps")
- }
- files.collect { projLibDir.toPath().relativize(it.toPath()) }
- }
-
- ext.targetRelProjDir = { String kind -> // kind: "lib", "ext"
- // use targetRelProject{Lib,Ext}Dir
- // e.g., => "lib" or "<component>/<subcomponent>/lib"
- // the general case location
- def relProjDir = "$simpleGroupName/$project.name/$kind"
-
- // special cases
- if (target_java8_lib_groups.contains(simpleGroupName)) {
- relProjDir = "$kind"
- }
- else if ('samples' == simpleGroupName) {
- relProjDir = "samples/$kind"
- }
-
- return relProjDir
- }
- ext.targetRelProjLibDir = targetRelProjDir('lib')
- ext.targetRelProjExtDir = targetRelProjDir('ext')
-
- // N.B. regarding the various add*Dependency() methods
- //
- // The methods need to be used in project build.gradle "dependencies" declarations.
- // e.g.,
- // dependencies {
- // addTargetDirProjectJarDependency 'compile', ':api:topology' # NOT compile project(':api:topology')
- // addProjectExtDependency 'compile', 'com.ibm.messaging:watson-iot:0.2.2' # NOT compile 'com.ibm.messaging:watson-iot:0.2.2'
- // addProjectExtDependency 'compile', 'org.apache.kafka:kafka_2.10:0.8.2.2@jar'
- // addTargetDirCoreExtDependencies 'compile'
- // addMyTargetDirProjectJarDependency 'testCompile'
- // // N.B. root project adds test common dependencies
- // }
- //
- // These methods play a role in the policies:
- // - Edgent projects depend on other project's jars in the target-dir, not their classes
- // - Edgent project jars have a manifest-classpath that handles
- // the project's "private" inter-project dependencies
- // as well as the project's "private" external component dependencies.
- // - We build a target dir that includes the project's jar as well as
- // the project's external dependency jars
- // - The tests compile and run against the project jars in the target dir
- // (as external/integration test code would).
- // - The samples compile and run against the project jars in the target dir
- // (as user code would).
-
- ext.directTargetDirExtJarDependencies = []
-
- ext.addTargetDirProjectJarDependency = { config,proj ->
- // add a dependency on a project's jar in the target-dir
- def jarPath = project(proj).jar.archivePath
-
- // add the jar as a dependency and ensure it's present when we need it
- // ? script error with: dependencies { "$config" files(jarPath) builtBy "${proj}:assemble" }
- dependencies { "$config" files(jarPath) }
- def task = "${config}Java"
- if (config == "testCompile") {
- task = "compileTestJava"
- }
- else if (config == "providedCompile") {
- task = "compileJava"
- }
- "$task" { dependsOn "${proj}:assemble" }
- }
-
- ext.addMyTargetDirProjectJarDependency = { config ->
- // add a dependency on my project's jar in the target dir
- addTargetDirProjectJarDependency(config, project.path)
- }
-
- ext.addTargetDirExtJarDependency = { config,jarName ->
- // add a dependency on a target_java8_ext_dir jarName
- // record the addition
- def jar = "$target_java8_ext_dir/$jarName"
- if (!directTargetDirExtJarDependencies.contains(jar)) {
- directTargetDirExtJarDependencies.add jar
- }
-
- // add the jar as a dependency
- dependencies { "$config" files(jar) }
- compileJava { dependsOn ':copyCommonExtJars' }
- }
-
- ext.addTargetDirCoreExtJarDependencies = { config ->
- core_ext_dependencies.collect { depSpec ->
- mkJarNameFromSpec(depSpec)
- }.each { jarName ->
- addTargetDirExtJarDependency config, jarName
- }
- }
-
- ext.addProjectExtDependency = { config,externalDepSpec ->
- // for declaring project private external dependencies
- // ends up (transitively) copying the dependency to the project's ext dir
- dependencies { "$config" externalDepSpec }
- }
-
- ext.addCompileTestDependencies = { String... deps ->
- // add a dependency on other project's testClasses
- deps.each { dep ->
- dependencies {
- testCompile project(dep).sourceSets.test.output
- }
- compileTestJava {
- dependsOn "${dep}:testClasses"
- }
- }
- }
-
- sourceCompatibility = '1.8'
- targetCompatibility = '1.8'
-
- def compileOptions = {
- options.debugOptions.debugLevel = 'source,lines,vars'
- options.verbose = logger.isDebugEnabled()
- options.listFiles = logger.isInfoEnabled()
- options.deprecation = true
- options.encoding = 'UTF-8'
- }
- compileJava {
- configure compileOptions
- }
- compileTestJava {
- configure compileOptions
- }
-
- dependencies {
- // common dependencies for tests
- testCompile 'junit:junit:4.10'
- addMyTargetDirProjectJarDependency 'testCompile'
- if (project.path != ':api:function') {
- addTargetDirExtJarDependency 'testRuntime', 'slf4j-jdk14-1.7.12.jar'
- }
- else {
- // the add... induces UnsupportedOperationException elsewhere in script when processing :api:function:jar ???
- // can't figure it out but cleaning directTargetDirExtJarDependencies
- // avoids it ???... with seemingly no other consequences.
- addTargetDirExtJarDependency 'testRuntime', 'slf4j-jdk14-1.7.12.jar'
- project.directTargetDirExtJarDependencies = []
- }
-
- // common dependencies for samples
- if (project.path ==~ '^:samples.*') {
- addTargetDirProjectJarDependency 'compile', ':providers:development'
- addTargetDirProjectJarDependency 'compile', ':providers:direct'
-
- addTargetDirCoreExtJarDependencies 'compile'
- addTargetDirExtJarDependency 'runtime', 'slf4j-jdk14-1.7.12.jar'
- }
- }
-
- ext.copyProjectExtJarsFn = { targetDir ->
- // Copy the project jar's "private" external dependencies (transitively)
- // into the project's ext dir in the target-dir.
-
- // If our project's jar task lacks any actions (e.g., platform:android)
- // there's nothing to do.
- if (!jar.actions)
- return
-
- // FYI we're getting more transitive ext deps than the ant build
- // in some cases - e.g., for watson iot we "knew" we only needed a subset
- // of all watson iot deps known to maven
-
- def projectExtDir = project.targetRelProjExtDir
- def nonCommonExtFiles = getProjectNonCommonExtDepFiles(project)
- logger.info "$project.path copying projExtDepFiles jars: "+nonCommonExtFiles.collect { it.getName() }
- copy {
- from nonCommonExtFiles
- includeEmptyDirs = false
- into "$targetDir/$projectExtDir"
- }
- }
-
- ext.copyProjectExtJarsFn2 = { targetDir ->
- // Copy the project jar's "private" external dependencies (transitively)
- // into target-dir.
-
- def nonCommonExtFiles = getProjectNonCommonExtDepFiles(project)
- logger.info "$project.path copying projExtDepFiles jars: "+nonCommonExtFiles.collect { it.getName() }
- copy {
- from nonCommonExtFiles
- includeEmptyDirs = false
- into "$targetDir"
- }
- }
-
- task setupProjectExtJars << {
- // Helper for setupExternalJars task
- copyProjectExtJarsFn external_jars_dir
- }
-
- jar {
- // adjust jar task config and also augment the task to do our additional processing
-
- // generate the project's jar into the target dir location
- // with the appropriate name and manifest.
- // TODO - gradle/maven best practice has version in jarname
-
- archiveName = "${project.group}.${project.name}.${extension}"
- if (["javax.websocket-client", "javax.websocket-server", "edgent.javax.websocket"].contains(project.name)) {
- archiveName = "${project.name}.${extension}"
- }
- destinationDir = file("$target_java8_dir/" + targetRelProjLibDir)
-
- doFirst {
- configure jarOptions
- }
-
- doLast {
- copyProjectExtJarsFn target_java8_dir
- }
- }
-
- ext.jarOptions = {
- manifest {
- attributes(
- 'Implementation-Title': "${-> baseName}",
- 'Implementation-Vendor': build_vendor,
- // TODO inclusion of DSTAMP/TSTAMP results in regeneration
- // of a jar when none of its contents/dependencies have changed.
- // If possible use a canned DSTAMP/TSTAMP for non-"release" tasks
- // to make the dev cycle more efficient at the expense of the TSTAMP.
- 'Implementation-Version': "${commithash}-${DSTAMP}-${TSTAMP}",
- 'Class-Path': mkManifestClassPath(project),
- )
- }
- metaInf {
- with( copySpec {
- rename { 'LICENSE' }
- from rootProject.file('binary-release/apache-v2_0-license')
- })
- with( copySpec {
- rename { 'NOTICE' }
- from rootProject.file(
- projectsWithPreApacheContribs.contains(project.path)
- ? 'binary-release/ibm-contrib-notice'
- : 'binary-release/apache-notice')
- })
- }
- }
-
- ext.printFile = { path ->
- ant.concat { fileset(file: path) }
- }
- ext.adjustTest7Classpath = false
-
- task testSummaryFinalizer << {
- def testTask = tasks.getByName('test')
- if (System.properties['edgent.build.ci'] != null) {
- testTask.failedTestResultPaths.each { path ->
- println path
- printFile path
- }
- }
- def result = testTask.summaryResult
- if (result != null) {
- def duration = String.format('%.3fsec', (result.endTime - result.startTime) / 1000)
- println "$project.path $duration $result.resultType ($result.testCount tests, $result.failedTestCount failures, $result.skippedTestCount skipped)"
- }
- }
-
- test {
- filter {
- includeTestsMatching '*Test' // can override via --tests command line option
- }
-
- systemProperty 'edgent.test.top.dir.file.path', rootProject.projectDir
- systemProperty 'edgent.test.root.dir', rootProject.projectDir
- systemProperty 'edgent.build.ci', System.properties['edgent.build.ci']
-
- // pass along any org.apache.edgent system props
- systemProperties System.properties.findAll { it.key.startsWith("org.apache.edgent") }
-
- testLogging {
- exceptionFormat 'full'
- showStandardStreams = System.properties['edgent.test.showOutput'] != null
- }
- beforeSuite { desc ->
- if (!desc.parent) { // will match the outermost suite
- println "$project.path testing ..."
- }
- }
- ext.failedTestResultPaths = []
- ext.summaryResult = null
- afterSuite { desc, result ->
- // make failures in edgent.build.ci runs more debuggable
- // wish the junit xml files existed at this moment but they don't
- if (desc.parent && desc.className != null) { // individual test class result
- if (result.resultType == TestResult.ResultType.FAILURE) {
- def resultFile = "$testResultsDir/test/TEST-${desc.className}.xml"
- println "\nFailed testrun results: $resultFile"
- failedTestResultPaths.add resultFile
- }
- }
- else if (!desc.parent) { // project's overall results
- summaryResult = result
- }
- }
- finalizedBy "testSummaryFinalizer" // a doLast isn't invoked if there's a test failure
- reports {
- junitXml.enabled = true // generate build/test-results/test/TEST-*.xml
- // individual <project>/build/reports junit/jacoco html reports not needed with aggregate report
- html.enabled = System.properties['edgent.test.project.htmlReports'] != null
- }
- doFirst {
- // The project's tests are supposed to run against its target-dir jar.
- // We must remove the project's $buildDir/{classes,resources}/main
- // from the classpath so they're not used.
-
- classpath = project.sourceSets.test.runtimeClasspath
- classpath -= project.sourceSets.main.output
-
- // Hmm... for some reason the classpath (when printed here) also includes
- // the project's src build/libs/ jar and by the default name
- // (e.g., build/libs/oplets-0.4.1.jar) yet we've configured the jar task
- // to generate the jar in the target-dir with a different name.
- // It also lacks that target-dir jar we added as a dependency
- // via addMyTargetDirProjectJarDependency 'testCompile'
- // ???
- // Adjust accordingly.
-
- classpath = classpath.filter { ! it.path.startsWith(project.libsDir.path) }
- classpath = files(project.jar.archivePath) + classpath
-
- if (adjustTest7Classpath) {
- // Add special java7 processing... (on top of the other test.doFirst classpath manipulations)
-
- // Change from using the normal test classes dir to the java7 test classes dir
- classpath -= files(sourceSets.test.output.classesDir)
- classpath = files(sourceSets.test.output.classesDir.toString().replace('test', 'java7Test')) + classpath
-
- // Some of the tests have dependencies on other tests, adjust those classpaths too
- classpath = files(classpath.collect { it.toString().replace('build/classes/test', 'build/classes/java7Test') })
-
- // Switch from java8 jars to java7 jars
- classpath = files(classpath.collect { it.toString().replace('java8', 'java7') })
- }
- logger.debug "$project.path test.classpath: " + classpath.collect { it.toString() }
- }
- }
-
- ext.j7TestClassesDir = file("$project.buildDir/classes/java7Test")
-
- task test7AdjustTestTask << {
- if (! tasks.getByName('test').enabled
- || unsupportedJava7TestProjects.contains(project.path)
- || sourceSets.test.allSource.isEmpty()) {
- test.enabled = false
- return
- }
- adjustTest7Classpath = true
- if (!j7TestClassesDir.exists()) {
- // implicit dependency: :platform:java7:test7Compile
- logger.error " ERROR: Run the test7Compile task. $j7TestClassesDir does not exist."
- throw new TaskExecutionException()
- }
- test {
- testClassesDir = j7TestClassesDir
- outputs.upToDateWhen { false } // always run - task is never "up to date"
- }
- }
-
- task test7Run() {
- description = "Run the test7Compile'd tests against the java7 target jars - run after :platform:java7:test7Compile and with JAVA_HOME==java7-VM"
- // fwiw trying to leverage :platform:java7:ant_test7.run was problematic
-
- dependsOn ':platform:java7:verifyJava7Built', test7AdjustTestTask, test
- // implicit dependency: :platform:java7:test7Compile
- test.mustRunAfter = [ test7AdjustTestTask, ':platform:java7:verifyJava7Built' ]
-
- outputs.upToDateWhen { false } // always run - never "up to date"
- }
-
- assemble.doLast {
- // augment assemble with our additional target dir update processing
-
- // Copy SRC into target dir when appropriate
- if (project.path ==~ '^:samples.*') {
- copy {
- from(sourceSets.main.allSource.srcDirs) { include '**/*.java' }
- into "$target_java8_dir/$project.simpleGroupName/src/$project.name/src/main/java/"
- }
- }
- }
-
- task sourceJar(type: Jar) {
- // baseName-appendix-version-classifier.extension
- from sourceSets.main.allJava
- classifier = 'sources'
- }
-
- // support for 'gradle publishToMavenLocal' etc
- // TODO publishing test.{fvt,svt} and samples ... doesn't seem desirable? e.g., we're excluding test.{fvt,svt} jars from the tgz
- if (project.pluginManager.hasPlugin('publishing')) {
- publishing {
- publications {
- mavenJava(MavenPublication) {
- // specify dependencies like: org.apache.edgent:edgent.api.topology:0.4.0
- groupId = build_group
- artifactId = "${project.group}.${project.name}"
- artifact sourceJar
- if (project.pluginManager.hasPlugin('war')) {
- from components.web
- }
- else {
- from components.java
- }
- }
- }
- }
- }
-
-}
-
-task copyScripts(type: Copy) {
- description = 'Copy scripts to target_java8_dir'
- includeEmptyDirs = false
- from("scripts/") { include "**/*" }
- into "$target_java8_dir/scripts/"
-}
-
-//Create Junit Report
-// need to setup classpath to junit/jacoco for ant.junitreport task
-configurations {
- junitLibs
-}
-dependencies { // versions with gradle 3.1
- junitLibs 'org.apache.ant:ant-junit:1.9.6'
- junitLibs 'org.apache.ant:ant-junit4:1.9.6'
- junitLibs 'org.jacoco:org.jacoco.ant:0.7.7.201606060606'
-}
-
-task createJunitReport << {
- description = "Generates a Junit report from all subprojects (use after 'test')"
-
- ant.delete(dir: "${target_report_dir}/tests")
- ant.taskdef(name: 'junitreport',
- classname: 'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator',
- classpath: configurations.junitLibs.asPath)
- ant.junitreport(todir: './') {
- fileset(dir: './', includes: '**/test-results/test/TEST-*.xml')
- report(format: 'frames', todir: "${target_report_dir}/tests")
- }
- ant.move(file: "TESTS-TestSuites.xml", tofile: "${target_report_dir}/TESTS-TestSuites.xml")
-}
-
-apply from: 'gradle/jacoco.gradle'
-apply from: 'gradle/javadoc.gradle'
-
-task addVersionDotTxt {
- description = 'Add version.txt in target_dir'
- doLast {
- def map = [
- DSTAMP: "$DSTAMP",
- TSTAMP: "$TSTAMP",
- commithash: "$commithash",
- 'commithash.error': "$commithash_error",
- 'edgent.version': "$build_version",
- ]
- def f = new File("$target_dir/version.txt");
- def d = new File(target_dir);
- if( !d.exists() ) { d.mkdirs() }
- f.createNewFile()
- map.forEach { k,v -> f.append "$k=$v\n" }
- }
-}
-
-task releaseTarGz(type: Tar) {
- description = 'Create binary release tgz in target_dir'
- archiveName = "apache-${build_name}-${build_version}-incubating${snapshotId}-bin.tgz"
- compression = Compression.GZIP
- destinationDir = new File("${target_dir}/../release-edgent")
- duplicatesStrategy 'exclude'
- into "${build_name}-${build_version}${snapshotId}"
- // make some things first in the tgz
- from rootProject.file('binary-release/LICENSE')
- from rootProject.file('binary-release/NOTICE')
- into ('licenses') { from 'licenses' }
- from 'DISCLAIMER', 'JAVA_SUPPORT.md'
- from rootProject.file('binary-release/README')
- from 'RELEASE_NOTES', 'CONTRIBUTORS'
- from "$target_dir/version.txt"
- from target_dir
- exclude '**/test/svt/'
- exclude '**/connectors/javax.websocket-server/' // just part of wsclient test harness
- doLast {
- ant.checksum algorithm: 'md5', file: archivePath
- ant.checksum algorithm: 'sha-512', fileext: '.sha', file: archivePath
- println "created $destinationDir/$archiveName"
- }
-}
-
-task srcReleaseTarGz(type: Tar) {
- description = 'Create source release tgz in target_dir'
- archiveName = "apache-${build_name}-${build_version}-incubating${snapshotId}-src.tgz"
- compression = Compression.GZIP
- destinationDir = new File("${target_dir}/../release-edgent")
- duplicatesStrategy 'exclude'
- into "${build_name}-${build_version}${snapshotId}-src"
- // make some things first in the tgz
- from 'LICENSE', 'NOTICE'
- from 'DISCLAIMER', 'JAVA_SUPPORT.md'
- from 'RELEASE_NOTES'
- from 'README'
- exclude 'README.md'
- from 'DEVELOPMENT.md'
- from '.'
- exclude 'KEYS'
- exclude '.git', '.gradle', '.settings'
- exclude '.gradle-wrapper', 'gradlew', 'gradlew.bat'
- exclude '**/build/' // gradle generated artifacts
- exclude '**/externalJars/' // gradle generated artifacts for eclipse
- exclude '**/bin/' // eclipse generated artifacts
- exclude '**/*.class' // final backstop just in case
- exclude 'connectors/jdbc/derby.log' // test cruft
- exclude 'connectors/jdbc/JdbcStreamsTestDb' // test cruft
- doLast {
- ant.checksum algorithm: 'md5', file: archivePath
- ant.checksum algorithm: 'sha-512', fileext: '.sha', file: archivePath
- println "created $destinationDir/$archiveName"
- }
-}
-
-gradle.taskGraph.whenReady { taskGraph ->
- if (ext."signing.password"==null && taskGraph.allTasks.any { it instanceof Sign }) {
- // Use Java console to read from the console (no good for a CI environment)
- def Console console = System.console()
- console.printf "\n\n#####################################" +
- "\nWe have to sign some things in this build." +
- "\nPlease enter your signing details.\n\n"
- def id = System.env['GPG_ID']
- try {
- def tmpId = console.readLine("PGP Code Signing Key Id (default: $id): ")
- if (!tmpId.isEmpty())
- id = tmpId
- } catch (NullPointerException e) {
- throw new GradleException("You must run 'signAll --no-daemon'")
- }
- def file = System.env['GPG_SECRING']
- if (file == null) {
- file = "${System.properties['user.home']}/.gnupg/secring.gpg"
- }
- def tmpFile = console.readLine("PGP Secret Key Ring File (default: $file): ")
- if (!tmpFile.isEmpty()) {
- file = tmpFile
- }
- def password = String.valueOf(console.readPassword("PGP Private Key Password: "))
-
- allprojects { ext."signing.keyId" = id }
- allprojects { ext."signing.secretKeyRingFile" = file }
- allprojects { ext."signing.password" = password }
-
- console.printf "\n#####################################\n"
- }
-}
-
-task signAll(type: Sign) {
- description='Sign existing release artifacts in ${target_dir}/../release-edgent (run separetely after "release")'
- fileTree("${target_dir}/../release-edgent") {
- include '**/*.tgz'
- }.each {
- sign it
- }
- outputs.upToDateWhen { false }
- doFirst {
- if (getFilesToSign().isEmpty()) {
- throw new GradleException("No artifacts to sign. Run the 'release' task first.")
- }
- //println "### files to sign: " + getFilesToSign().collect { it.name }.join(",")
- }
- doLast {
- println "\nCreated signature files: " + getSignatureFiles().collect { it.name }.join(", ")
- }
-}
-
-assemble {
- description = "Assemble distribution artifacts and populate the target_dir with jars, doc, etc. Like 'build' w/o 'test'"
- dependsOn filteredSubprojects.assemble, aggregateJavadoc, copyScripts
- aggregateJavadoc.mustRunAfter filteredSubprojects*.assemble
-}
-
-task all(dependsOn: assemble) {
- description = "alias for 'assemble'"
-}
-
-task cleanAll(type: Delete) {
- description = 'clean aggregator' // "release dependsOn clean" only does top-level clean
- dependsOn clean, filteredSubprojects*.clean
- // purge old ant build artifacts
- delete 'target'
- delete 'reports'
- delete fileTree(dir: '.', includes:['**/classes/', '**/test.classes/'])
- // retro7 processing cruft
- delete fileTree(dir: '.', includes:['**/classes.in/', '**/classes.out/'])
-}
-
-task release {
- description = 'Assemble distribution artifacts, populate target_dir, and create a release tgz'
- dependsOn cleanAll, addVersionDotTxt, assemble,
- ':platform:java7:addJava7TargetDir', ':platform:android:addAndroidTargetDir',
- srcReleaseTarGz, releaseTarGz
- addVersionDotTxt.mustRunAfter cleanAll
- assemble.mustRunAfter addVersionDotTxt
- releaseTarGz.mustRunAfter assemble,':platform:java7:addJava7TargetDir',':platform:android:addAndroidTargetDir'
-}
-
-task reports {
- description = "Generate JUnit and Coverage reports of prior test run. Use after 'test'"
- dependsOn createJunitReport, jacocoTestReport
-}
-
-task test7AdjustJacocoReport << {
- jacocoTestReport.test7AdjustJacocoReport = true
- logger.lifecycle "### NOTE: [WIP] test7 jacoco reporting ###"
-}
-
-task test7Reports {
- description = "Generate JUnit and Coverage reports of prior test run. Use after 'test7Run'"
- dependsOn createJunitReport, test7AdjustJacocoReport, jacocoTestReport
- jacocoTestReport.mustRunAfter test7AdjustJacocoReport
-}
-
-// build: inject test report generation and javadoc generation (for early problem detection)
-// make 'build' like "all test reports"
-build {
- dependsOn filteredSubprojects.build, reports
- reports.mustRunAfter filteredSubprojects.build
-}
-
-task setupExternalJars {
- description = 'Add all of the dependant external jars to the target-dir (make available to Eclipse, etc)'
- dependsOn setupCommonExtJars, filteredSubprojects.setupProjectExtJars
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/connectors/command/build.gradle
----------------------------------------------------------------------
diff --git a/connectors/command/build.gradle b/connectors/command/build.gradle
deleted file mode 100644
index a5eb48c..0000000
--- a/connectors/command/build.gradle
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:topology'
- addTargetDirProjectJarDependency 'compile', ':connectors:common'
-
- addTargetDirProjectJarDependency 'testCompile', ':providers:direct'
- // N.B. root project adds test common dependencies
-}
-
-addCompileTestDependencies ':api:topology', ':providers:direct', ':connectors:common'
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/connectors/common/build.gradle
----------------------------------------------------------------------
diff --git a/connectors/common/build.gradle b/connectors/common/build.gradle
deleted file mode 100644
index 99f1553..0000000
--- a/connectors/common/build.gradle
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:topology'
- addTargetDirCoreExtJarDependencies 'compile'
-
- addTargetDirProjectJarDependency 'testCompile', ':providers:direct'
- // N.B. root project adds test common dependencies
-}
-
-addCompileTestDependencies ':api:topology', ':providers:direct'
-
-test {
- // this project lacks tests and this task fails if attempted
- enabled = false
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/connectors/csv/build.gradle
----------------------------------------------------------------------
diff --git a/connectors/csv/build.gradle b/connectors/csv/build.gradle
deleted file mode 100644
index 6a08147..0000000
--- a/connectors/csv/build.gradle
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:topology'
- addTargetDirCoreExtJarDependencies 'compile'
-
- addTargetDirProjectJarDependency 'testCompile', ':providers:direct'
- // N.B. root project adds test common dependencies
-}
-
-addCompileTestDependencies ':api:topology', ':providers:direct', ':connectors:common'
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/connectors/file/build.gradle
----------------------------------------------------------------------
diff --git a/connectors/file/build.gradle b/connectors/file/build.gradle
deleted file mode 100644
index 6a08147..0000000
--- a/connectors/file/build.gradle
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:topology'
- addTargetDirCoreExtJarDependencies 'compile'
-
- addTargetDirProjectJarDependency 'testCompile', ':providers:direct'
- // N.B. root project adds test common dependencies
-}
-
-addCompileTestDependencies ':api:topology', ':providers:direct', ':connectors:common'
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/connectors/http/build.gradle
----------------------------------------------------------------------
diff --git a/connectors/http/build.gradle b/connectors/http/build.gradle
deleted file mode 100644
index caf8636..0000000
--- a/connectors/http/build.gradle
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:topology'
- addProjectExtDependency 'compile', 'org.apache.httpcomponents:httpclient:4.5.1'
- addProjectExtDependency 'compile', 'org.apache.httpcomponents:httpcore:4.4.4'
- addTargetDirCoreExtJarDependencies 'compile'
-
- addTargetDirProjectJarDependency 'testCompile', ':providers:direct'
- // N.B. root project adds test common dependencies
-}
-
-addCompileTestDependencies ':api:topology', ':providers:direct'
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/connectors/iot/build.gradle
----------------------------------------------------------------------
diff --git a/connectors/iot/build.gradle b/connectors/iot/build.gradle
deleted file mode 100644
index 6a86d26..0000000
--- a/connectors/iot/build.gradle
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:topology'
- addTargetDirCoreExtJarDependencies 'compile'
-
- addTargetDirProjectJarDependency 'testCompile', ':providers:direct'
- // N.B. root project adds test common dependencies
-}
-
-addCompileTestDependencies ':api:topology', ':providers:direct'
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/connectors/iotp/build.gradle
----------------------------------------------------------------------
diff --git a/connectors/iotp/build.gradle b/connectors/iotp/build.gradle
deleted file mode 100644
index c5e2390..0000000
--- a/connectors/iotp/build.gradle
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:topology'
- addTargetDirProjectJarDependency 'compile', ':connectors:iot'
- addProjectExtDependency 'compile', 'com.ibm.messaging:watson-iot:0.2.2'
- addTargetDirCoreExtJarDependencies 'compile'
-
- addTargetDirProjectJarDependency 'testCompile', ':providers:direct'
- // N.B. root project adds test common dependencies
-}
-
-addCompileTestDependencies ':api:topology', ':providers:direct'
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/connectors/jdbc/build.gradle
----------------------------------------------------------------------
diff --git a/connectors/jdbc/build.gradle b/connectors/jdbc/build.gradle
deleted file mode 100644
index 0eef8c2..0000000
--- a/connectors/jdbc/build.gradle
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:topology'
- addTargetDirCoreExtJarDependencies 'compile'
- addTargetDirProjectJarDependency 'testCompile', ':providers:direct'
-
- testCompile files("${System.env.DERBY_HOME}/lib/derby.jar")
- // N.B. root project adds test common dependencies
-}
-
-addCompileTestDependencies ':api:topology', ':providers:direct', ':connectors:common'
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/connectors/kafka/build.gradle
----------------------------------------------------------------------
diff --git a/connectors/kafka/build.gradle b/connectors/kafka/build.gradle
deleted file mode 100644
index 047bed7..0000000
--- a/connectors/kafka/build.gradle
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:topology'
-
- // The pom for kafka includes dependencies that don't make sense for us.
- // In at least one case kafka dependencies include a slf4j *implementation* jar
- // and that conflicts with our samples' binding to a particular
- // version of slf4j implementation.
- // This all seems like fallout from, I believe, the kafka jars containing
- // the code for their cli tools too, and possibly tests, which need things like:
- // slf4j-log4j12, snappy-java, jline, jopt-simple, junit-3.8.1
- //
- // So at least for now, avoid transitive and just match our ant based config
- //
- // addProjectExtDependency 'compile', 'org.apache.kafka:kafka_2.10:0.8.2.2'
- // addProjectExtDependency 'compile', 'org.apache.kafka:kafka-clients:0.8.2.2'
- addProjectExtDependency 'compile', 'org.apache.kafka:kafka_2.10:0.8.2.2@jar'
- addProjectExtDependency 'compile', 'org.apache.kafka:kafka-clients:0.8.2.2@jar'
- addProjectExtDependency 'compile', 'log4j:log4j:1.2.16@jar'
- addProjectExtDependency 'compile', 'com.yammer.metrics:metrics-core:2.2.0@jar'
- addProjectExtDependency 'compile', 'org.scala-lang:scala-library:2.10.4@jar'
- addProjectExtDependency 'compile', 'com.101tec:zkclient:0.3@jar'
- addProjectExtDependency 'compile', 'org.apache.zookeeper:zookeeper:3.4.6@jar'
-
- addTargetDirCoreExtJarDependencies 'compile'
-
- addTargetDirProjectJarDependency 'testCompile', ':providers:direct'
- // N.B. root project adds test common dependencies
-}
-
-addCompileTestDependencies ':api:topology', ':providers:direct', ':connectors:common'
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/connectors/kafka/src/test/java/org/apache/edgent/test/connectors/kafka/KafkaStreamsSkipMeTest.java
----------------------------------------------------------------------
diff --git a/connectors/kafka/src/test/java/org/apache/edgent/test/connectors/kafka/KafkaStreamsSkipMeTest.java b/connectors/kafka/src/test/java/org/apache/edgent/test/connectors/kafka/KafkaStreamsSkipMeTest.java
index 78bdc47..fbc9a8c 100644
--- a/connectors/kafka/src/test/java/org/apache/edgent/test/connectors/kafka/KafkaStreamsSkipMeTest.java
+++ b/connectors/kafka/src/test/java/org/apache/edgent/test/connectors/kafka/KafkaStreamsSkipMeTest.java
@@ -23,7 +23,7 @@ import static org.junit.Assume.assumeTrue;
import org.junit.Test;
/*
- * Our current gradle driven test config (test filtering with
+ * Our current maven/gradle driven test config (test filtering with
* includeTestsMatching '*Test') results in failing a project's
* test task if the project lacks any "*Test" classes.
*
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/connectors/mqtt/build.gradle
----------------------------------------------------------------------
diff --git a/connectors/mqtt/build.gradle b/connectors/mqtt/build.gradle
deleted file mode 100644
index 2d1d32e..0000000
--- a/connectors/mqtt/build.gradle
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:topology'
- addTargetDirProjectJarDependency 'compile', ':connectors:iot'
- addTargetDirProjectJarDependency 'compile', ':connectors:common'
- addProjectExtDependency 'compile', 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.1.0'
-
- addTargetDirProjectJarDependency 'testCompile', ':providers:direct'
- // N.B. root project adds test common dependencies
-}
-
-addCompileTestDependencies ':api:topology', ':providers:direct', ':connectors:common'
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/connectors/pubsub/build.gradle
----------------------------------------------------------------------
diff --git a/connectors/pubsub/build.gradle b/connectors/pubsub/build.gradle
deleted file mode 100644
index 6a86d26..0000000
--- a/connectors/pubsub/build.gradle
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:topology'
- addTargetDirCoreExtJarDependencies 'compile'
-
- addTargetDirProjectJarDependency 'testCompile', ':providers:direct'
- // N.B. root project adds test common dependencies
-}
-
-addCompileTestDependencies ':api:topology', ':providers:direct'
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/connectors/serial/build.gradle
----------------------------------------------------------------------
diff --git a/connectors/serial/build.gradle b/connectors/serial/build.gradle
deleted file mode 100644
index 6a86d26..0000000
--- a/connectors/serial/build.gradle
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:topology'
- addTargetDirCoreExtJarDependencies 'compile'
-
- addTargetDirProjectJarDependency 'testCompile', ':providers:direct'
- // N.B. root project adds test common dependencies
-}
-
-addCompileTestDependencies ':api:topology', ':providers:direct'
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/connectors/websocket-base/build.gradle
----------------------------------------------------------------------
diff --git a/connectors/websocket-base/build.gradle b/connectors/websocket-base/build.gradle
deleted file mode 100644
index 6a86d26..0000000
--- a/connectors/websocket-base/build.gradle
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:topology'
- addTargetDirCoreExtJarDependencies 'compile'
-
- addTargetDirProjectJarDependency 'testCompile', ':providers:direct'
- // N.B. root project adds test common dependencies
-}
-
-addCompileTestDependencies ':api:topology', ':providers:direct'
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/connectors/websocket-jetty/build.gradle
----------------------------------------------------------------------
diff --git a/connectors/websocket-jetty/build.gradle b/connectors/websocket-jetty/build.gradle
deleted file mode 100644
index 0391c10..0000000
--- a/connectors/websocket-jetty/build.gradle
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-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.
-*/
-archivesBaseName = project.name
-
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':connectors:edgent.javax.websocket'
- addProjectExtDependency 'compile', 'org.eclipse.jetty.websocket:javax-websocket-client-impl:9.3.6.v20151106'
-
- // N.B. root project adds test common dependencies
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/connectors/websocket-misc/build.gradle
----------------------------------------------------------------------
diff --git a/connectors/websocket-misc/build.gradle b/connectors/websocket-misc/build.gradle
deleted file mode 100644
index 9a06f08..0000000
--- a/connectors/websocket-misc/build.gradle
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-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.
-*/
-archivesBaseName = project.name
-
-dependencies {
- addProjectExtDependency 'compile', 'javax.websocket:javax.websocket-api:1.0'
-
- // N.B. root project adds test common dependencies
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/connectors/websocket-server/build.gradle
----------------------------------------------------------------------
diff --git a/connectors/websocket-server/build.gradle b/connectors/websocket-server/build.gradle
deleted file mode 100644
index 16d7f5f..0000000
--- a/connectors/websocket-server/build.gradle
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-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.
-*/
-archivesBaseName = project.name
-
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':connectors:javax.websocket-client'
- addProjectExtDependency 'compile', 'org.eclipse.jetty.websocket:javax-websocket-server-impl:9.3.6.v20151106'
-
- // N.B. root project adds test common dependencies
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/connectors/websocket/build.gradle
----------------------------------------------------------------------
diff --git a/connectors/websocket/build.gradle b/connectors/websocket/build.gradle
deleted file mode 100644
index e0c84dc..0000000
--- a/connectors/websocket/build.gradle
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:topology'
- addTargetDirProjectJarDependency 'compile', ':connectors:common'
- addTargetDirProjectJarDependency 'compile', ':connectors:wsclient'
- addTargetDirProjectJarDependency 'compile', ':connectors:edgent.javax.websocket'
-
- addTargetDirProjectJarDependency 'testCompile', ':providers:direct'
- addTargetDirProjectJarDependency 'testCompile', ':connectors:javax.websocket-client'
- addTargetDirProjectJarDependency 'testCompile', ':connectors:javax.websocket-server'
-
- // N.B. root project adds test common dependencies
-}
-
-addCompileTestDependencies ':api:topology', ':providers:direct', ':connectors:common'
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/console/server/build.gradle
----------------------------------------------------------------------
diff --git a/console/server/build.gradle b/console/server/build.gradle
deleted file mode 100644
index 1febc14..0000000
--- a/console/server/build.gradle
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addProjectExtDependency 'compile', 'org.eclipse.jetty:jetty-http:9.3.6.v20151106'
- addProjectExtDependency 'compile', 'org.eclipse.jetty:jetty-io:9.3.6.v20151106'
- addProjectExtDependency 'compile', 'org.eclipse.jetty:jetty-security:9.3.6.v20151106'
- addProjectExtDependency 'compile', 'org.eclipse.jetty:jetty-server:9.3.6.v20151106'
- addProjectExtDependency 'compile', 'org.eclipse.jetty:jetty-servlet:9.3.6.v20151106'
- addProjectExtDependency 'compile', 'org.eclipse.jetty:jetty-util:9.3.6.v20151106'
- addProjectExtDependency 'compile', 'org.eclipse.jetty:jetty-webapp:9.3.6.v20151106'
- addProjectExtDependency 'compile', 'org.eclipse.jetty:jetty-xml:9.3.6.v20151106'
- addTargetDirCoreExtJarDependencies 'compile'
-
- // TODO runtime dependsOn ":console:servlets" ???
-
- // N.B. root project adds test common dependencies
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/console/servlets/build.gradle
----------------------------------------------------------------------
diff --git a/console/servlets/build.gradle b/console/servlets/build.gradle
deleted file mode 100644
index 272a672..0000000
--- a/console/servlets/build.gradle
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-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.
-*/
-distsDirName = 'webapps'
-
-plugins.apply 'war'
-
-dependencies {
- addTargetDirProjectJarDependency 'providedCompile', ':utils:streamscope'
- addProjectExtDependency 'providedCompile', 'javax.servlet:javax.servlet-api:3.1.0'
- addTargetDirCoreExtJarDependencies 'providedCompile'
-
- // N.B. root project adds test common dependencies
-}
-
-war {
- destinationDir = file("$target_java8_dir/$project.simpleGroupName/webapps")
- archiveName 'console.war'
- from file('webapp_content/html')
- into('resources') {
- from file('webapp_content/resources')
- }
- into('js') {
- from file('webapp_content/js')
- }
- webXml = file('webapp_content/WEB-INF/console.xml')
-
- doFirst {
- configure jarOptions
- }
-}
-
-testClasses.dependsOn war
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/gradle.properties
----------------------------------------------------------------------
diff --git a/gradle.properties b/gradle.properties
deleted file mode 100644
index cca1472..0000000
--- a/gradle.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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.
-
-build_group: org.apache.edgent
-build_name: edgent
-build_version: 1.2.0
-build_vendor: Apache Software Foundation
-
-# Minimum required gradle version and version for the wrapper to use.
-# Comment out gradleDistributionSha256Sum to disable validation of
-# a wrapper downloaded gradle distribution.
-gradleVersion = 3.1
-gradleDistributionSha256Sum = c7de3442432253525902f7e8d7eac8b5fd6ce1623f96d76916af6d0e383010fc
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/gradle/jacoco.gradle
----------------------------------------------------------------------
diff --git a/gradle/jacoco.gradle b/gradle/jacoco.gradle
deleted file mode 100644
index bcdb738..0000000
--- a/gradle/jacoco.gradle
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-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.
-*/
-
-task jacocoTestReport {
- description = "Generates a coverage report from all subprojects (use after 'test')"
- ext.test7AdjustJacocoReport = false
-}
-jacocoTestReport << {
-
- ant.delete(dir: "${target_report_dir}/coverage")
-
- def libDir = new File("${target_java8_dir}", "lib")
- def utilsDir = new File("${target_java8_dir}", "utils")
- def connectorsDir = new File("${target_java8_dir}", "connectors")
- def analyticsDir = new File("${target_java8_dir}", "analytics")
- def consoleDir = new File("${target_java8_dir}", "console")
-
- if( !libDir.exists() ) { libDir.mkdirs() }
- if( !utilsDir.exists() ) { utilsDir.mkdirs() }
- if( !connectorsDir.exists() ) { connectorsDir.mkdirs() }
- if( !analyticsDir.exists() ) { analyticsDir.mkdirs() }
- if( !consoleDir.exists() ) { consoleDir.mkdirs() }
-
- FileCollection executionData = files()
-
- subprojects.findAll { subproject ->
- subproject.pluginManager.hasPlugin('java') && subproject.pluginManager.hasPlugin('jacoco')
- }.each { subproject ->
- executionData += subproject.tasks.jacocoTestReport.executionData
- }
-
- executionData = files(executionData.findAll {
- it.exists()
- })
- ant.taskdef(name: 'jacocoReport', classname: 'org.jacoco.ant.ReportTask',
- classpath: configurations.junitLibs.asPath)
- ant.jacocoReport {
- executiondata {
- executionData.addToAntBuilder(ant, 'resources')
- }
-
- platformTargetDir = target_java8_dir
- if (test7AdjustJacocoReport) {
- platformTargetDir = target_java7_dir
- }
-
- structure(name: project.name) {
- group(name: "Edgent API") {
- classfiles {
- fileset(dir: "$platformTargetDir/lib", includes: "edgent.api.*.jar")
- }
- sourcefiles {
- fileset(dir: "./api/function/src/main/java", includes: "**/*.java")
- fileset(dir: "./api/execution/src/main/java", includes: "**/*.java")
- fileset(dir: "./api/oplet/src/main/java", includes: "**/*.java")
- fileset(dir: "./api/graph/src/main/java", includes: "**/*.java")
- fileset(dir: "./api/topology/src/main/java", includes: "**/*.java")
- }
- }
- group(name: "Edgent SPI") {
- classfiles {
- fileset(dir: "$platformTargetDir/lib", includes: "edgent.spi.*.jar")
- }
- sourcefiles {
- fileset(dir: "./spi/graph/src/main/java", includes: "**/*.java")
- fileset(dir: "./spi/topology/src/main/java", includes: "**/*.java")
- }
- }
- group(name: "Edgent Runtime") {
- classfiles {
- fileset(dir: "$platformTargetDir/lib", includes: "edgent.runtime.*.jar")
- }
- sourcefiles {
- fileset(dir: "./runtime/etiao/src/main/java", includes: "**/*.java")
- fileset(dir: "./runtime/jmxcontrol/src/main/java", includes: "**/*.java")
- }
- }
- group(name: "Edgent Utilities") {
- classfiles {
- fileset(dir: "$platformTargetDir/utils", includes: "**/edgent.utils.*.jar")
- }
- sourcefiles {
- fileset(dir: "./utils/metrics/src/main/java", includes: "**/*.java")
- fileset(dir: "./utils/streamscope/src/main/java", includes: "**/*.java")
- }
- }
- group(name: "Edgent Connectors") {
- classfiles {
- fileset(dir: "$platformTargetDir/connectors", includes: "**/edgent.connectors.*.jar")
- }
- sourcefiles {
- fileset(dir: "./connectors/common/src/main/java", includes: "**/*.java")
- fileset(dir: "./connectors/command/src/main/java", includes: "**/*.java")
- fileset(dir: "./connectors/csv/src/main/java", includes: "**/*.java")
- fileset(dir: "./connectors/file/src/main/java", includes: "**/*.java")
- fileset(dir: "./connectors/iot/src/main/java", includes: "**/*.java")
- fileset(dir: "./connectors/iotp/src/main/java", includes: "**/*.java")
- fileset(dir: "./connectors/jdbc/src/main/java", includes: "**/*.java")
- fileset(dir: "./connectors/kafka/src/main/java", includes: "**/*.java")
- fileset(dir: "./connectors/mqtt/src/main/java", includes: "**/*.java")
- fileset(dir: "./connectors/http/src/main/java", includes: "**/*.java")
- fileset(dir: "./connectors/wsclient/src/main/java", includes: "**/*.java")
- fileset(dir: "./connectors/wsclient-javax.websocket/src/main/java", includes: "**/*.java")
- }
- }
- group(name: "Edgent Providers") {
- classfiles {
- fileset(dir: "$platformTargetDir/lib", includes: "edgent.providers.*.jar")
- }
- sourcefiles {
- fileset(dir: "./providers/direct/src/main/java", includes: "**/*.java")
- fileset(dir: "./providers/development/src/main/java", includes: "**/*.java")
- }
- }
- if (!test7AdjustJacocoReport) {
- group(name: "Edgent Analytics") {
- classfiles {
- fileset(dir: "$platformTargetDir/analytics", includes: "**/edgent.analytics.*.jar")
- }
- sourcefiles {
- fileset(dir: "./analytics/math3/src/main/java", includes: "**/*.java")
- fileset(dir: "./analytics/sensors/src/main/java", includes: "**/*.java")
- }
- }
- group(name: "Edgent Console") {
- classfiles {
- fileset(dir: "$platformTargetDir/console", includes: "**/edgent.console.*.jar")
- }
- sourcefiles {
- fileset(dir: "./console/server/src/main/java", includes: "**/*.java")
- fileset(dir: "./console/servlets/src/main/java", includes: "**/*.java")
- }
- }
- }
- }
- html(destdir: "${target_report_dir}/coverage/")
- xml(destfile: "${target_report_dir}/coverage/jacoco-sessions.xml")
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/gradle/javadoc.gradle
----------------------------------------------------------------------
diff --git a/gradle/javadoc.gradle b/gradle/javadoc.gradle
deleted file mode 100644
index 85bfff3..0000000
--- a/gradle/javadoc.gradle
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-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.
-*/
-
-task aggregateJavadoc(type: Javadoc) {
- description = 'Create all javadoc into target_dir/docs/javadoc'
- destinationDir file(target_javadoc_dir)
- options.addStringOption('Xdoclint:none', '-quiet')
- configure(options) {
- author = true
- version = true
- use = true
- docTitle "Apache Edgent (incubating) v${build_version}"
- footer '<a href="http://edgent.incubator.apache.org">Apache Edgent (incubating)</a>'
- bottom "Copyright © ${COPYRIGHT_YEAR} The Apache Software Foundation. All Rights Reserved - ${commithash}-${DSTAMP}-${TSTAMP}"
- overview "edgent_overview.html"
- windowTitle "Edgent v${build_version}"
-
- group("Edgent Providers", "org.apache.edgent.providers.*")
- group("Edgent API", "org.apache.edgent.execution", "org.apache.edgent.function", "org.apache.edgent.topology", "org.apache.edgent.topology.json", "org.apache.edgent.topology.mbeans", "org.apache.edgent.topology.plumbing", "org.apache.edgent.topology.services", "org.apache.edgent.execution.*")
- group("Edgent Analytics", "org.apache.edgent.analytics.*")
- group("Edgent Utilities", "org.apache.edgent.metrics", "org.apache.edgent.metrics.*", "org.apache.edgent.streamscope", "org.apache.edgent.streamscope.*")
- group("Edgent Connectors", "org.apache.edgent.connectors.*")
- group("Edgent Samples", "org.apache.edgent.samples.*")
- group("Edgent Low-Level API", "org.apache.edgent.graph", "org.apache.edgent.graph.*", "org.apache.edgent.oplet", "org.apache.edgent.oplet.*", "org.apache.edgent.window")
- group("Edgent SPI", "org.apache.edgent.topology.spi", "org.apache.edgent.topology.spi.*")
- }
- source subprojects.collect { project -> project.sourceSets.main.allJava }
- exclude "**/edgent/connectors/**/runtime"
- exclude "**/edgent/console"
- exclude "**/edgent/samples/scenarios/iotp/range/sensor"
- exclude "**/android/**"
- classpath = files(filteredSubprojects.collect { it.jar.archivePath })
-
- // doc-files aren't picked up automatically so get them now.
- doLast {
- copy {
- from subprojects.collect { project -> project.sourceSets.main.java.srcDirs }
- include '**/doc-files/**'
- includeEmptyDirs = false
- into target_javadoc_dir
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/gradle/other.gradle
----------------------------------------------------------------------
diff --git a/gradle/other.gradle b/gradle/other.gradle
deleted file mode 100644
index 944bacf..0000000
--- a/gradle/other.gradle
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-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.
-*/
-
-ext.unsupportedJava7TestProjects = [ // why not on all of these? (match ant_test7.run, see JAVA_SUPPORT.md)
- // projects with no tests will be automatically avoided for java7 tests
- // otherwise those that are not yet supported for java7 (not in ant_test7.{setup,run}) must be added here
- ':api:graph', // no runnable tests
- ':analytics:math3',
- ':analytics:sensors',
- ':connectors:command',
- ':connectors:csv',
- ':connectors:file',
- ':connectors:jdbc',
- ':connectors:mqtt',
- ':connectors:kafka',
- ':connectors:serial',
- ':connectors:wsclient',
- ':connectors:wsclient-javax.websocket',
- ':connectors:javax.websocket-client',
- ':connectors:edgent.javax.websocket',
- ':connectors:javax.websocket-server',
- ':console:server',
- ':console:servlets',
- ':providers:development',
- ':utils:streamscope',
- ':test:fvtiot',
- ':test:svt',
-]
-
-ext.projectsWithPreApacheContribs = [
- ':analytics:math3', ':analytics:sensors',
- ':android:topology', ':android:hardware',
- ':api:function', ':api:execution', ':api:window', ':api:oplet',
- ':api:graph', ':api:topology',
- ':connectors:common', ':connectors:iot', ':connectors:serial',
- ':connectors:file', ':connectors:http', ':connectors:iotp',
- ':connectors:jdbc', ':connectors:kafka', ':connectors:mqtt',
- ':connectors:edgent.javax.websocket',
- ':connectors:javax.websocket-client', ':connectors:javax.websocket-server',
- ':connectors:wsclient', ':connectors:wsclient-javax.websocket',
- ':console:server', ':console:servlets',
- ':providers:direct', ':providers:development',
- ':runtime:etiao', ':runtime:jmxcontrol', ':runtime:jsoncontrol',
- ':samples:utils', ':samples:apps', ':samples:topology', ':samples:connectors',
- ':samples:console',
- ':spi:graph', ':spi:topology',
- ':test:svt',
- ':utils:metrics',
-]
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/gradle/rat.gradle
----------------------------------------------------------------------
diff --git a/gradle/rat.gradle b/gradle/rat.gradle
deleted file mode 100644
index 2de8999..0000000
--- a/gradle/rat.gradle
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * 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.
- */
-
-// shamelessly copied from https://github.com/apache/samza
-
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.api.Task
-import org.gradle.api.internal.project.IsolatedAntBuilder
-
-apply plugin: RatPlugin
-
-class RatTask extends DefaultTask {
- @Input
- List<String> excludes
-
- def reportPath = 'build/rat'
- def stylesheet = 'gradle/resources/rat-output-to-html.xsl'
- def xmlReport = reportPath + '/rat-report.xml'
- def htmlReport = reportPath + '/rat-report.html'
- def textReport = reportPath + '/rat-report.txt'
-
- def generateTextReport(File reportDir) {
- def antBuilder = services.get(IsolatedAntBuilder)
- def ratClasspath = project.configurations.rat
- antBuilder.withClasspath(ratClasspath).execute {
- ant.taskdef(resource: 'org/apache/rat/anttasks/antlib.xml')
- ant.report(format: 'plain', reportFile: textReport) {
- fileset(dir: ".") {
- patternset {
- excludes.each {
- exclude(name: it)
- }
- }
- }
- }
- }
- }
-
- def generateXmlReport(File reportDir) {
- def antBuilder = services.get(IsolatedAntBuilder)
- def ratClasspath = project.configurations.rat
- antBuilder.withClasspath(ratClasspath).execute {
- ant.taskdef(resource: 'org/apache/rat/anttasks/antlib.xml')
- ant.report(format: 'xml', reportFile: xmlReport) {
- fileset(dir: ".") {
- patternset {
- excludes.each {
- exclude(name: it)
- }
- }
- }
- }
- }
- }
-
- def printUnknownFiles() {
- def ratXml = new XmlParser().parse(xmlReport)
- def unknownLicenses = 0
- ratXml.resource.each { resource ->
- if (resource.'license-approval'.@name[0] == "false") {
- println('Unknown license: ' + resource.@name)
- unknownLicenses++
- }
- }
- if (unknownLicenses > 0) {
- throw new GradleException("Found " + unknownLicenses + " files with " +
- "unknown licenses.")
- }
- }
-
- def generateHtmlReport() {
- def antBuilder = services.get(IsolatedAntBuilder)
- def ratClasspath = project.configurations.rat
- antBuilder.withClasspath(ratClasspath).execute {
- ant.xslt(
- in: xmlReport,
- style: stylesheet,
- out: htmlReport,
- classpath: ratClasspath)
- }
- println('Rat report: ' + htmlReport)
- }
-
- @TaskAction
- def rat() {
- File reportDir = new File(reportPath)
- if (!reportDir.exists()) {
- reportDir.mkdirs()
- }
- generateXmlReport(reportDir)
- generateHtmlReport()
- generateTextReport()
- printUnknownFiles()
- }
-}
-
-class RatPlugin implements Plugin<Project> {
- void apply(Project project) {
- configureDependencies(project)
- project.plugins.apply(JavaBasePlugin);
- Task ratTask = project.task("rat",
- type: RatTask,
- group: 'Build',
- description: 'Runs Apache Rat checks.')
- project.tasks[JavaBasePlugin.CHECK_TASK_NAME].dependsOn ratTask
- }
-
- void configureDependencies(final Project project) {
- project.configurations {
- rat
- }
- project.repositories {
- mavenCentral()
- }
- project.dependencies {
- rat 'org.apache.rat:apache-rat-tasks:0.12'
- }
- }
-}
\ No newline at end of file
[10/50] [abbrv] incubator-edgent git commit: fix earlier
AbstractTester change and reduce 'ci' tmo multiplier
Posted by dl...@apache.org.
fix earlier AbstractTester change and reduce 'ci' tmo multiplier
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/9bd024d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/9bd024d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/9bd024d8
Branch: refs/heads/develop
Commit: 9bd024d88a32ca2d84bdc92cb9dfdcfc6537b65b
Parents: fcfaf77
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Oct 24 19:43:38 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Oct 24 19:43:38 2017 -0400
----------------------------------------------------------------------
.../test/java/org/apache/edgent/test/topology/TStreamTest.java | 2 +-
.../main/java/org/apache/edgent/runtime/etiao/Executable.java | 2 +-
.../org/apache/edgent/topology/spi/tester/AbstractTester.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/9bd024d8/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java
----------------------------------------------------------------------
diff --git a/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java b/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java
index 0e55fe2..441d43f 100644
--- a/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java
+++ b/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java
@@ -859,7 +859,7 @@ public abstract class TStreamTest extends TopologyAbstractTest {
// in the face of overloaded/slow build/test servers.
if (Boolean.getBoolean("edgent.build.ci")) {
// could do something like base the decision of the current value of timeout and/or units
- return timeout * 10;
+ return timeout * 2; // try to minimize
}
return timeout;
}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/9bd024d8/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/Executable.java
----------------------------------------------------------------------
diff --git a/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/Executable.java b/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/Executable.java
index 453003c..46c7de0 100644
--- a/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/Executable.java
+++ b/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/Executable.java
@@ -212,7 +212,7 @@ public class Executable implements RuntimeServices {
// in the face of overloaded/slow build/test servers.
if (Boolean.getBoolean("edgent.build.ci")) {
// could do something like base the decision of the current value of timeout and/or units
- return timeout * 10;
+ return timeout * 2; // try to minimize
}
return timeout;
}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/9bd024d8/spi/topology/src/main/java/org/apache/edgent/topology/spi/tester/AbstractTester.java
----------------------------------------------------------------------
diff --git a/spi/topology/src/main/java/org/apache/edgent/topology/spi/tester/AbstractTester.java b/spi/topology/src/main/java/org/apache/edgent/topology/spi/tester/AbstractTester.java
index 07b72d2..0c10a08 100644
--- a/spi/topology/src/main/java/org/apache/edgent/topology/spi/tester/AbstractTester.java
+++ b/spi/topology/src/main/java/org/apache/edgent/topology/spi/tester/AbstractTester.java
@@ -49,7 +49,7 @@ public abstract class AbstractTester implements Tester {
if (Boolean.getBoolean("edgent.build.ci")) {
// could do something like base the decision of the current value of timeout and/or units
- return timeout * 10;
+ return timeout * 2; // minimize the multiplier because of the aforementioned await-tmo test cases
}
return timeout;
}
@@ -59,8 +59,8 @@ public abstract class AbstractTester implements Tester {
long timeout, TimeUnit unit) throws Exception {
long tmoMsec = Math.max(unit.toMillis(timeout), 1000);
- long maxTime = System.currentTimeMillis() + tmoMsec;
tmoMsec = getTimeoutValue(tmoMsec, TimeUnit.MILLISECONDS);
+ long maxTime = System.currentTimeMillis() + tmoMsec;
Future<?> future = submitter.submit(topology(), config);
// wait at most tmoMsec for the submit to create the job
[13/50] [abbrv] incubator-edgent git commit: reduce some
unnecessarily long WindowTest tests
Posted by dl...@apache.org.
reduce some unnecessarily long WindowTest tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/d402541e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/d402541e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/d402541e
Branch: refs/heads/develop
Commit: d402541e0351bf56abba4a081285d7d74cd5a9b1
Parents: d50be30
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Oct 25 11:24:45 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Oct 25 11:24:45 2017 -0400
----------------------------------------------------------------------
.../apache/edgent/test/window/WindowTest.java | 22 +++++++++++++-------
1 file changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d402541e/api/window/src/test/java/org/apache/edgent/test/window/WindowTest.java
----------------------------------------------------------------------
diff --git a/api/window/src/test/java/org/apache/edgent/test/window/WindowTest.java b/api/window/src/test/java/org/apache/edgent/test/window/WindowTest.java
index 45d4c61..e563d38 100644
--- a/api/window/src/test/java/org/apache/edgent/test/window/WindowTest.java
+++ b/api/window/src/test/java/org/apache/edgent/test/window/WindowTest.java
@@ -20,6 +20,7 @@ package org.apache.edgent.test.window;
import static org.apache.edgent.function.Functions.unpartitioned;
import static org.apache.edgent.window.Policies.alwaysInsert;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue;
@@ -35,6 +36,7 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
import org.apache.edgent.function.BiConsumer;
import org.apache.edgent.window.InsertionTimeList;
@@ -293,7 +295,7 @@ public class WindowTest {
window.registerScheduledExecutorService(new ScheduledThreadPoolExecutor(5));
- long endTime = System.currentTimeMillis() + 8000;
+ long endTime = System.currentTimeMillis() + 4000;
List<Thread> threads = new ArrayList<>();
int NUM_THREADS = 10;
// Create 10 threads. Each inserts at 1,000 Hz
@@ -375,7 +377,7 @@ public class WindowTest {
window.insert(1);
}, 0, 10, TimeUnit.MILLISECONDS);
- Thread.sleep(11000);
+ Thread.sleep(4000);
sf.cancel(true);
double tolerance = .08;
for(int i = 0; i < numBatches.size(); i++){
@@ -415,7 +417,7 @@ public class WindowTest {
window.insert(i);
}, 0, 1, TimeUnit.MILLISECONDS);
- Thread.sleep(11000);
+ Thread.sleep(4000);
sf.cancel(true);
try {
sf.get();
@@ -457,19 +459,22 @@ public class WindowTest {
window.registerScheduledExecutorService(new ScheduledThreadPoolExecutor(5));
+ AtomicInteger count = new AtomicInteger();
+ int MAX_TUP_CNT = 300;
ScheduledFuture<?> sf = ses.scheduleAtFixedRate(new Runnable(){
- private int count = 0;
@Override
public void run() {
- if(count < 1000){
- window.insert(count++);
+ if(count.get() < MAX_TUP_CNT){
+ window.insert(count.incrementAndGet());
}
}
}, 0, 10, TimeUnit.MILLISECONDS);
- Thread.sleep(11000);
+ long insertMsec = MAX_TUP_CNT * 10 /*10msec/tup*/;
+ Thread.sleep(insertMsec + 1000/*extra sec*/);
sf.cancel(true);
+ assertEquals("Invalid test", MAX_TUP_CNT, count.get());
int numTuples = 0;
for(int i = 0; i < batches.size() - 1; i++){
List<Integer> batch = batches.get(i);
@@ -480,7 +485,8 @@ public class WindowTest {
}
numTuples += batches.get(batches.size() -1).size();
- assertTrue("Number of tuples submitted (1000) != number of tuples processed in batch (" + numTuples + ")", numTuples == 1000);
+ assertEquals("Number of batch tuples", count.get(), numTuples);
+ assertEquals("Number of batches", MAX_TUP_CNT/100, batches.size());
}
private void assertOnTimeEvictions(List<Long> diffs) {
[22/50] [abbrv] incubator-edgent git commit: more test dbg output
Posted by dl...@apache.org.
more test dbg output
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/ca75e6a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/ca75e6a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/ca75e6a6
Branch: refs/heads/develop
Commit: ca75e6a6943f7de39fb51241fbf772985498d6db
Parents: 45df006
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Thu Oct 26 17:30:05 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Thu Oct 26 17:30:05 2017 -0400
----------------------------------------------------------------------
.../test/java/org/apache/edgent/test/topology/TStreamTest.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/ca75e6a6/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java
----------------------------------------------------------------------
diff --git a/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java b/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java
index 464f8e2..30e3ffb 100644
--- a/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java
+++ b/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java
@@ -808,7 +808,9 @@ public abstract class TStreamTest extends TopologyAbstractTest {
try {
complete(t, tc);
} catch (Exception e) {
+ // we're receiving the CancellationException here (and it percolates through waitForCompletion
System.err.println("MTPWE complete() threw e:"+e);
+ e.printStackTrace();
throw e;
}
return true;
@@ -819,6 +821,7 @@ public abstract class TStreamTest extends TopologyAbstractTest {
waitForCompletion(completer, executions);
} catch (Exception e) {
System.err.println("MTPWE waitForCompletion() threw e:"+e);
+ e.printStackTrace();
throw e;
}
}
[19/50] [abbrv] incubator-edgent git commit:
TrakcingScheduledExecutor CME fix take 2
Posted by dl...@apache.org.
TrakcingScheduledExecutor CME fix take 2
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/bea8576b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/bea8576b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/bea8576b
Branch: refs/heads/develop
Commit: bea8576b6eaa8c607263a1f633fffc7bf40b53da
Parents: 786d934
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Thu Oct 26 13:04:11 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Thu Oct 26 13:04:11 2017 -0400
----------------------------------------------------------------------
.../runtime/etiao/TrackingScheduledExecutor.java | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/bea8576b/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/TrackingScheduledExecutor.java
----------------------------------------------------------------------
diff --git a/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/TrackingScheduledExecutor.java b/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/TrackingScheduledExecutor.java
index 478e419..fef4105 100644
--- a/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/TrackingScheduledExecutor.java
+++ b/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/TrackingScheduledExecutor.java
@@ -117,6 +117,7 @@ public final class TrackingScheduledExecutor extends ScheduledThreadPoolExecutor
private int cancelAllAsyncTasks(boolean mayInterruptIfRunning) {
int notCanceled = 0;
+ // follow the iterator access pattern doc'd by Collections:synchronizedSet()
synchronized (asyncTasks) {
// hmm have gotten CMEs here with testMultiTopologyPollWithError.
// This seems to follow the required access pattern for synchronized collection iterator.
@@ -126,10 +127,22 @@ public final class TrackingScheduledExecutor extends ScheduledThreadPoolExecutor
// hasActiveTasks() - iterates while synchronized and can remove
// removeTrack() - remove
// Just to make things iron clad, synch the add and remove too
- for (RunnableScheduledFuture<?> task : asyncTasks) {
+ // hmm... got another CME even after mods to the above.
+ // java.util.ConcurrentModificationException
+ // at java.util.HashMap$HashIterator.nextNode(HashMap.java:1437)
+ // at java.util.HashMap$KeyIterator.next(HashMap.java:1461)
+ // at: for (RunnableScheduledFuture<?> task : asyncTasks)
+// for (RunnableScheduledFuture<?> task : asyncTasks) {
+// if (!task.cancel(mayInterruptIfRunning))
+// notCanceled++;
+// }
+ Iterator<RunnableScheduledFuture<?>> i = asyncTasks.iterator();
+ while (i.hasNext()) {
+ RunnableScheduledFuture<?> task = i.next();
if (!task.cancel(mayInterruptIfRunning))
notCanceled++;
}
+
// remove tasks which are done
hasActiveTasks();
}
[16/50] [abbrv] incubator-edgent git commit: fix command test
completion to not be TMO based
Posted by dl...@apache.org.
fix command test completion to not be TMO based
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/719fe6d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/719fe6d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/719fe6d8
Branch: refs/heads/develop
Commit: 719fe6d8bf787e16cff01c49d86b2ae281437cc5
Parents: b7897e5
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Oct 25 15:29:27 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Oct 25 15:29:27 2017 -0400
----------------------------------------------------------------------
.../connectors/command/CommandStreamsTest.java | 47 +++++++++++++++-----
.../edgent/test/connectors/common/FileUtil.java | 27 +++++++++--
2 files changed, 61 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/719fe6d8/connectors/command/src/test/java/org/apache/edgent/test/connectors/command/CommandStreamsTest.java
----------------------------------------------------------------------
diff --git a/connectors/command/src/test/java/org/apache/edgent/test/connectors/command/CommandStreamsTest.java b/connectors/command/src/test/java/org/apache/edgent/test/connectors/command/CommandStreamsTest.java
index 344650e..bc96ad2 100644
--- a/connectors/command/src/test/java/org/apache/edgent/test/connectors/command/CommandStreamsTest.java
+++ b/connectors/command/src/test/java/org/apache/edgent/test/connectors/command/CommandStreamsTest.java
@@ -41,8 +41,6 @@ import org.apache.edgent.topology.Topology;
import org.apache.edgent.topology.tester.Condition;
import org.junit.Test;
-import com.google.gson.JsonObject;
-
public class CommandStreamsTest extends DirectTopologyTestBase {
private String[] stdLines = new String[] {
@@ -176,9 +174,24 @@ public class CommandStreamsTest extends DirectTopologyTestBase {
assertNotNull(sink);
try {
- // start the job, sleep for a bit (await the timeout) then validate sink output
- Condition<?> never = t.getTester().tupleCount(s, Long.MAX_VALUE);
- t.getTester().complete(getSubmitter(), new JsonObject(), never, 3, TimeUnit.SECONDS);
+ // complete when the sink has generated the expected results
+ Condition<Object> tc = new Condition<Object>() {
+ public boolean valid() {
+ try {
+ return FileUtil.validateFile(tempFile1, getLines(), true);
+ } catch (Exception e) {
+ return false;
+ }
+ }
+ public Object getResult() { return "todo-files-lines"; }
+ };
+
+ // If we time out, still validate content to see what we did get
+ try {
+ complete(t, tc, 3, TimeUnit.SECONDS);
+ } catch (Exception e) {
+ System.out.println("test time out");
+ }
FileUtil.validateFile(tempFile1, getLines());
}
@@ -229,11 +242,25 @@ public class CommandStreamsTest extends DirectTopologyTestBase {
assertNotNull(sink);
try {
- // start the job, sleep for a bit (await the timeout) then validate sink output
- Condition<?> never = t.getTester().tupleCount(s, Long.MAX_VALUE);
- t.getTester().complete(getSubmitter(), new JsonObject(), never,
- 6 + ((NUM_RUNS-1) * 1/*restart delay*/), TimeUnit.SECONDS);
-
+ // complete when the sink has generated the expected results
+ Condition<Object> tc = new Condition<Object>() {
+ public boolean valid() {
+ try {
+ return FileUtil.validateFile(tempFile1, expLines.toArray(new String[0]), true);
+ } catch (Exception e) {
+ return false;
+ }
+ }
+ public Object getResult() { return "todo-files-lines"; }
+ };
+
+ // If we time out, still validate content to see what we did get
+ try {
+ complete(t, tc, 6 + ((NUM_RUNS-1) * 1/*restart delay*/), TimeUnit.SECONDS);
+ } catch (Exception e) {
+ System.out.println("test time out");
+ }
+
FileUtil.validateFile(tempFile1, expLines.toArray(new String[0]));
}
finally {
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/719fe6d8/connectors/common/src/test/java/org/apache/edgent/test/connectors/common/FileUtil.java
----------------------------------------------------------------------
diff --git a/connectors/common/src/test/java/org/apache/edgent/test/connectors/common/FileUtil.java b/connectors/common/src/test/java/org/apache/edgent/test/connectors/common/FileUtil.java
index 8032f55..4902544 100644
--- a/connectors/common/src/test/java/org/apache/edgent/test/connectors/common/FileUtil.java
+++ b/connectors/common/src/test/java/org/apache/edgent/test/connectors/common/FileUtil.java
@@ -30,6 +30,7 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
/**
@@ -69,9 +70,11 @@ public class FileUtil {
* Validate that the file contains the specified content.
* @param path file to validate
* @param lines the expected content
- * @throws Exception on failure
+ * @param silent control return vs throw
+ * @return false on failure - only applicable when silent==true
+ * @throws Exception on failure when silent==false
*/
- public static void validateFile(Path path, String[] lines) throws Exception {
+ public static boolean validateFile(Path path, String[] lines, boolean silent) throws Exception {
List<String> actLines = new ArrayList<>();
try (BufferedReader reader =
new BufferedReader(new InputStreamReader(
@@ -81,8 +84,26 @@ public class FileUtil {
while ((line = reader.readLine()) != null) {
actLines.add(line);
}
- assertArrayEquals(lines, actLines.toArray(new String[actLines.size()]));
+ if (!silent)
+ assertArrayEquals(lines, actLines.toArray(new String[actLines.size()]));
+ else if (!Arrays.equals(lines, actLines.toArray(new String[actLines.size()])))
+ return false;
+ return true;
+ }
+ catch (Exception e) {
+ if (!silent) throw e;
+ return false;
}
}
+
+ /**
+ * Validate that the file contains the specified content.
+ * @param path file to validate
+ * @param lines the expected content
+ * @throws Exception on failure
+ */
+ public static void validateFile(Path path, String[] lines) throws Exception {
+ validateFile(path, lines, false);
+ }
}
[20/50] [abbrv] incubator-edgent git commit: desensitize
WindowTest.timeBatchEnsureUnique
Posted by dl...@apache.org.
desensitize WindowTest.timeBatchEnsureUnique
got a: Number of batches expected:<3> but was:<4>
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/2428f6f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/2428f6f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/2428f6f6
Branch: refs/heads/develop
Commit: 2428f6f6839de2edb9ea204e2ca0b92562083a61
Parents: bea8576
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Thu Oct 26 13:18:24 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Thu Oct 26 13:18:24 2017 -0400
----------------------------------------------------------------------
.../test/java/org/apache/edgent/test/window/WindowTest.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/2428f6f6/api/window/src/test/java/org/apache/edgent/test/window/WindowTest.java
----------------------------------------------------------------------
diff --git a/api/window/src/test/java/org/apache/edgent/test/window/WindowTest.java b/api/window/src/test/java/org/apache/edgent/test/window/WindowTest.java
index e563d38..ca2863d 100644
--- a/api/window/src/test/java/org/apache/edgent/test/window/WindowTest.java
+++ b/api/window/src/test/java/org/apache/edgent/test/window/WindowTest.java
@@ -487,6 +487,8 @@ public class WindowTest {
numTuples += batches.get(batches.size() -1).size();
assertEquals("Number of batch tuples", count.get(), numTuples);
assertEquals("Number of batches", MAX_TUP_CNT/100, batches.size());
+ assertTrue("Number of batches exp:"+MAX_TUP_CNT/100+" got:"+batches.size(),
+ withinToleranceAmt((double)MAX_TUP_CNT/100, (double)batches.size(), 1)); // +/- 1
}
private void assertOnTimeEvictions(List<Long> diffs) {
@@ -503,4 +505,10 @@ public class WindowTest {
return (actual < highBound && actual > lowBound);
}
+ public static boolean withinToleranceAmt(double expected, Double actual, double toleranceAmt) {
+ double lowBound = expected - toleranceAmt;
+ double highBound = expected + toleranceAmt;
+ return (actual < highBound && actual > lowBound);
+ }
+
}
[06/50] [abbrv] incubator-edgent git commit: LICENSE tweaks for
re-addition of d3.legend.js to repo
Posted by dl...@apache.org.
LICENSE tweaks for re-addition of d3.legend.js to repo
- fix file path in source-release LICENSE
- retain URL to original source (to which the MIT license really
applies) in the LICENSE files
- add the source URL to modified d3.legend.js to make the origin clear
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/907b4e93
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/907b4e93
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/907b4e93
Branch: refs/heads/develop
Commit: 907b4e93f06cab8344bc9e49406b0e0b7c57d45c
Parents: 2320506
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Oct 24 08:40:37 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Oct 24 08:40:37 2017 -0400
----------------------------------------------------------------------
LICENSE | 4 +++-
console/server/src/main/remote-resources/META-INF/LICENSE | 1 +
console/servlets/src/main/remote-resources/META-INF/LICENSE | 1 +
console/servlets/src/main/webapp/js/ext/d3.legend/d3.legend.js | 2 ++
4 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/907b4e93/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index ffa5058..b56042a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -210,7 +210,9 @@ conditions of the following licenses.
This product bundles d3-legend which is available under a separate license.
-console/servlets/src/main/webapp/js/ext/d3.legend.js
+console/servlets/src/main/webapp/js/ext/d3-legend/d3.legend.js
+https://gist.githubusercontent.com/ZJONSSON/3918369/raw/bf9bce6b68a3b70f87450f155436ca4a84af1ba4/d3.legend.js
+With Edgent specific modifications.
License type: MIT
Copyright (c) 2012 ziggy.jonsson.nyc@gmail.com
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/907b4e93/console/server/src/main/remote-resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/console/server/src/main/remote-resources/META-INF/LICENSE b/console/server/src/main/remote-resources/META-INF/LICENSE
index 044c03e..8d0e1a0 100644
--- a/console/server/src/main/remote-resources/META-INF/LICENSE
+++ b/console/server/src/main/remote-resources/META-INF/LICENSE
@@ -23,6 +23,7 @@ jquery-ui (org.webjars:jquery-ui:1.11.4)
For details, see META-INF/licenses/jquery-ui-1_11_4-MIT.txt.
d3.legend.js (included inside the resources/servlets.war!/js/ext/d3.legend/d3.legend.js)
+ https://gist.githubusercontent.com/ZJONSSON/3918369/raw/bf9bce6b68a3b70f87450f155436ca4a84af1ba4/d3.legend.js
With Edgent specific modifications.
For details, see META-INF/licenses/d3.legend-MIT.txt.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/907b4e93/console/servlets/src/main/remote-resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/console/servlets/src/main/remote-resources/META-INF/LICENSE b/console/servlets/src/main/remote-resources/META-INF/LICENSE
index 8573e96..29d3c2e 100644
--- a/console/servlets/src/main/remote-resources/META-INF/LICENSE
+++ b/console/servlets/src/main/remote-resources/META-INF/LICENSE
@@ -23,6 +23,7 @@ jquery-ui (org.webjars:jquery-ui:1.11.4)
For details, see META-INF/licenses/jquery-ui-1_11_4-MIT.txt.
d3.legend.js (src/main/webapp/js/ext/d3.legend/d3.legend.js)
+ https://gist.githubusercontent.com/ZJONSSON/3918369/raw/bf9bce6b68a3b70f87450f155436ca4a84af1ba4/d3.legend.js
With Edgent specific modifications.
For details, see META-INF/licenses/d3.legend-MIT.txt.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/907b4e93/console/servlets/src/main/webapp/js/ext/d3.legend/d3.legend.js
----------------------------------------------------------------------
diff --git a/console/servlets/src/main/webapp/js/ext/d3.legend/d3.legend.js b/console/servlets/src/main/webapp/js/ext/d3.legend/d3.legend.js
index b225804..79c3c43 100644
--- a/console/servlets/src/main/webapp/js/ext/d3.legend/d3.legend.js
+++ b/console/servlets/src/main/webapp/js/ext/d3.legend/d3.legend.js
@@ -2,6 +2,8 @@
// (C) 2012 ziggy.jonsson.nyc@gmail.com
// MIT licence
+// Edgent modified from https://gist.githubusercontent.com/ZJONSSON/3918369/raw/bf9bce6b68a3b70f87450f155436ca4a84af1ba4/d3.legend.js
+
(function() {
d3.legend = function(g, chartSvg, pItems, legendTitle) {
g.each(function() {
[46/50] [abbrv] incubator-edgent git commit: - Give the multiple
steps another try
Posted by dl...@apache.org.
- Give the multiple steps another try
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/bd059c50
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/bd059c50
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/bd059c50
Branch: refs/heads/develop
Commit: bd059c504727735201a82ec1182c47254cdffaeb
Parents: 9423f7a
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Wed Nov 1 13:40:38 2017 +0100
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Wed Nov 1 13:40:38 2017 +0100
----------------------------------------------------------------------
Jenkinsfile | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/bd059c50/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 63407d4..6bd1fa1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -50,9 +50,20 @@ node('ubuntu') {
checkout scm
}
+ stage ('Clean') {
+ echo 'Cleaning Edgent'
+ sh "${mvnHome}/bin/mvn ${mavenLocalRepo} -Pplatform-android,platform-java7,distribution clean"
+ }
+
stage ('Build Edgent') {
echo 'Building Edgent'
- sh "${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-android,platform-java7,distribution,toolchain -Djava8.home=${env.JAVA_HOME} -Dedgent.build.ci=true clean ${mavenGoal} sonar:sonar site:site"
+ sh "${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-android,platform-java7,distribution,toolchain -Djava8.home=${env.JAVA_HOME} -Dedgent.build.ci=true ${mavenGoal} sonar:sonar"
+ }
+
+ stage ('Build Site') {
+ echo 'Building Site'
+ sh "${mvnHome}/bin/mvn ${mavenLocalRepo} site site:stage"
+
}
stage ('Build Samples') {
@@ -65,21 +76,15 @@ node('ubuntu') {
stage ('Build Templates') {
echo 'Building templates'
- sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} clean package; ./run-app.sh"
- sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-java7 clean package; ./run-app.sh"
- sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-android clean package; ./run-app.sh"
+ sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} clean package; ./app-run.sh"
+ sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-java7 clean package; ./app-run.sh"
+ sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-android clean package; ./app-run.sh"
}
stage ('Verify get-engent-jars') {
echo 'Verifying get-edgent-jars'
sh "cd samples/get-edgent-jars; ./get-edgent-jars.sh"
}
-
- stage ('Stage Site') {
- echo 'Staging Site'
- sh "${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-android,platform-java7,distribution,toolchain -Djava8.home=${env.JAVA_HOME} -Dedgent.build.ci=true site:stage"
- }
-
}
[12/50] [abbrv] incubator-edgent git commit: fix
TrackingScheduledExecutor CME seen with testMultiTopologyPollWithError()
Jenkins #118
Posted by dl...@apache.org.
fix TrackingScheduledExecutor CME seen with
testMultiTopologyPollWithError() Jenkins #118
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/d50be305
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/d50be305
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/d50be305
Branch: refs/heads/develop
Commit: d50be305b178132cb7b546d600d9b58c48d069d0
Parents: bab6c94
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Oct 25 09:55:21 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Oct 25 09:55:21 2017 -0400
----------------------------------------------------------------------
.../edgent/runtime/etiao/TrackingScheduledExecutor.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d50be305/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/TrackingScheduledExecutor.java
----------------------------------------------------------------------
diff --git a/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/TrackingScheduledExecutor.java b/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/TrackingScheduledExecutor.java
index c4dc44d..478e419 100644
--- a/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/TrackingScheduledExecutor.java
+++ b/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/TrackingScheduledExecutor.java
@@ -118,6 +118,14 @@ public final class TrackingScheduledExecutor extends ScheduledThreadPoolExecutor
private int cancelAllAsyncTasks(boolean mayInterruptIfRunning) {
int notCanceled = 0;
synchronized (asyncTasks) {
+ // hmm have gotten CMEs here with testMultiTopologyPollWithError.
+ // This seems to follow the required access pattern for synchronized collection iterator.
+ // But obviously something's amiss. There seem to be only a few other
+ // asyncTasks modifiers:
+ // trackTask() - add
+ // hasActiveTasks() - iterates while synchronized and can remove
+ // removeTrack() - remove
+ // Just to make things iron clad, synch the add and remove too
for (RunnableScheduledFuture<?> task : asyncTasks) {
if (!task.cancel(mayInterruptIfRunning))
notCanceled++;
@@ -134,7 +142,7 @@ public final class TrackingScheduledExecutor extends ScheduledThreadPoolExecutor
*/
private <V> RunnableScheduledFuture<V> trackTask(RunnableScheduledFuture<V> task) {
task = new TrackedFuture<V>(task);
- asyncTasks.add(task);
+ synchronized(asyncTasks) { asyncTasks.add(task); } // see cancelAllAsyncTasks
return task;
}
@@ -214,7 +222,7 @@ public final class TrackingScheduledExecutor extends ScheduledThreadPoolExecutor
* the scheduler seems to have no work.
*/
private void removeTrack() {
- asyncTasks.remove(this);
+ synchronized(asyncTasks) { asyncTasks.remove(this); } // see cancelAllAsyncTasks
// Notify the completer if the following is true:
// no asyncTasks (user tasks) pending, or the executor's task
[38/50] [abbrv] incubator-edgent git commit: - Split up the "Build"
step into multiple smaller ones.
Posted by dl...@apache.org.
- Split up the "Build" step into multiple smaller ones.
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/60444199
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/60444199
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/60444199
Branch: refs/heads/develop
Commit: 60444199724b5eb6c33cdbc0fb350e7a3bb5315c
Parents: ede4ab6
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Tue Oct 31 11:45:24 2017 +0100
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Tue Oct 31 11:45:24 2017 +0100
----------------------------------------------------------------------
Jenkinsfile | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/60444199/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 6fa4b55..38c6849 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -50,22 +50,28 @@ node('ubuntu') {
checkout scm
}
- stage ('Build') {
- echo 'Building'
+ stage ('Build Edgent') {
+ echo 'Building Edgent'
sh "${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-android,platform-java7,distribution,toolchain -Djava8.home=${env.JAVA_HOME} -Dedgent.build.ci=true clean ${mavenGoal} sonar:sonar site:site"
+ }
- echo 'Verify samples build, etc'
+ stage ('Build Samples') {
+ echo 'Building samples'
sh "cd samples; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} clean package"
sh "cd samples/topology; ./run-sample.sh HelloEdgent"
sh "cd samples; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-java7 clean package"
sh "cd samples/topology; ./run-sample.sh HelloEdgent"
-
- echo 'Verify app template builds, etc'
+ }
+
+ stage ('Build Templates') {
+ echo 'Building templates'
sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} clean package; ./run-app.sh"
sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-java7 clean package; ./run-app.sh"
sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-android clean package; ./run-app.sh"
-
- echo 'Verify get-edgent-jars'
+ }
+
+ stage ('Verify get-engent-jars') {
+ echo 'Verifying get-edgent-jars'
sh "cd samples/get-edgent-jars; ./get-edgent-jars.sh"
}
[08/50] [abbrv] incubator-edgent git commit: further desensitize
PlumbingTest.testParallelBalanced
Posted by dl...@apache.org.
further desensitize PlumbingTest.testParallelBalanced
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/56cb7a44
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/56cb7a44
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/56cb7a44
Branch: refs/heads/develop
Commit: 56cb7a44c53aaed30bdc5995bee69e7aba2f3ca0
Parents: dc6fbef
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Oct 24 14:17:58 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Oct 24 14:17:58 2017 -0400
----------------------------------------------------------------------
.../edgent/test/topology/PlumbingTest.java | 25 ++++++++++----------
1 file changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/56cb7a44/api/topology/src/test/java/org/apache/edgent/test/topology/PlumbingTest.java
----------------------------------------------------------------------
diff --git a/api/topology/src/test/java/org/apache/edgent/test/topology/PlumbingTest.java b/api/topology/src/test/java/org/apache/edgent/test/topology/PlumbingTest.java
index 4a347ed..48a498b 100644
--- a/api/topology/src/test/java/org/apache/edgent/test/topology/PlumbingTest.java
+++ b/api/topology/src/test/java/org/apache/edgent/test/topology/PlumbingTest.java
@@ -64,7 +64,7 @@ public abstract class PlumbingTest extends TopologyAbstractTest {
// delay stream
starts = PlumbingStreams.blockingDelay(starts, 300, TimeUnit.MILLISECONDS);
- // calculate display
+ // calculate delay
starts = starts.modify(v -> System.currentTimeMillis() - v);
starts = starts.filter(v -> v >= 300);
@@ -561,10 +561,6 @@ public abstract class PlumbingTest extends TopologyAbstractTest {
@Test
public void testParallelBalanced() throws Exception {
- // May need tweak validation sensitivity or add this:
- // Timing variances on shared machines can cause this test to fail
- // assumeTrue(!Boolean.getBoolean("edgent.build.ci"));
-
Topology top = newTopology("testParallelBalanced");
// arrange for even channels to process ~2x as many as odd channels.
@@ -576,6 +572,7 @@ public abstract class PlumbingTest extends TopologyAbstractTest {
int width = 4;
int tupCnt = 60;
+ int expEvenChCnt = 2 * (tupCnt / 3); // even:2/3rds, odd:1/3rd
Integer[] resultTuples = new Integer[tupCnt];
for (int i = 0; i < tupCnt; i++)
resultTuples[i] = i;
@@ -616,17 +613,19 @@ public abstract class PlumbingTest extends TopologyAbstractTest {
assertTrue("expMinSerialDuration="+expMinSerialDuration+" actDuration="+actDuration,
actDuration < 0.5 * expMinSerialDuration);
- int evenChCounts = 0;
- int oddChCounts = 0;
+ // Verify the balancing seemed to work.
+ // On loaded systems we've seen eCnt:37 oCnt:23. Settle for expEvenCnt +- 15%
+ double thresholdCnt = expEvenChCnt * 0.15;
+ int evenChCnt = 0;
for (int ch = 0; ch < width; ch++) {
- assertTrue(chCounts[ch].get() != 0);
+ assertTrue("ch:"+ch, chCounts[ch].get() != 0);
if (ch % 2 == 0)
- evenChCounts += chCounts[ch].get();
- else
- oddChCounts += chCounts[ch].get();
+ evenChCnt += chCounts[ch].get();
}
- assertTrue(oddChCounts > 0.4 * evenChCounts
- && oddChCounts < 0.6 * evenChCounts);
+ assertTrue(
+ String.format("evenChCnt:%d expEvenChCnt:%d +-:%d", evenChCnt, expEvenChCnt, thresholdCnt),
+ evenChCnt >= (expEvenChCnt - thresholdCnt)
+ && evenChCnt <= (expEvenChCnt + thresholdCnt));
}
// @Test
[07/50] [abbrv] incubator-edgent git commit: try more general test
tmo desenstization when edgent.build.ci=true
Posted by dl...@apache.org.
try more general test tmo desenstization when edgent.build.ci=true
- tweek test.topology.TStreamTest.waitForCompletion()
- tweek topology.spi.tester.AbstractTester.complete()
- tweek runtime.etiao.Executable.invokeAction()
The above may eliminate the need for other test specific uses of
edgent.build.ci in: FiltersTest, PlumbingTest, WindowTest, Mqtt,
wsclient. We'll see.
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/dc6fbef2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/dc6fbef2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/dc6fbef2
Branch: refs/heads/develop
Commit: dc6fbef267c6f2fa7b1d64eac077b8b09a2b67af
Parents: 907b4e9
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Oct 24 12:15:39 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Oct 24 12:15:39 2017 -0400
----------------------------------------------------------------------
DEVELOPMENT.md | 14 ++++++++++++
.../edgent/test/topology/TStreamTest.java | 20 ++++++++++++++---
.../apache/edgent/runtime/etiao/Executable.java | 19 ++++++++++++++--
.../topology/spi/tester/AbstractTester.java | 23 +++++++++++++++++++-
4 files changed, 70 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/dc6fbef2/DEVELOPMENT.md
----------------------------------------------------------------------
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 9728f80..221f252 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -213,6 +213,20 @@ It includes:
* Testing on Java 8
- Not all tests may be run, some tests are skipped due to timing issues or if excessive setup is required.
+In an attempt to more generally desentize tmo failures
+when the system property edgent.build.ci=true is set
+some runtime and test infrastructure components will
+bump the normal tmo value (e.g., 10x).
+This affects travis and Jenkins runs (both set edgent.build.ci).
+See:
+
+ * TStreamTest.waitForCompletion()
+ * AbstractTester.complete()
+ * Execuatble.invokeAction()
+ * generally search for uses of edgent.build.ci
+ * maybe remove other test specific uses of it in light of the general change
+
+The following may now best be avoided:
If your test randomly fails because, for example, it depends on publicly available test services,
or is timing dependent, and if timing variances on the Travis CI servers may make it more likely
for your tests to fail, you may disable the test from being executed on Travis CI using the
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/dc6fbef2/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java
----------------------------------------------------------------------
diff --git a/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java b/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java
index aa35828..0e55fe2 100644
--- a/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java
+++ b/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java
@@ -853,15 +853,29 @@ public abstract class TStreamTest extends TopologyAbstractTest {
Condition<Long> tc = t.getTester().tupleCount(joinsHappened, 100);
complete(t, tc);
}
+
+ private static long getTimeoutValue(long timeout, TimeUnit units) {
+ // try to protect the tests from timing out prematurely
+ // in the face of overloaded/slow build/test servers.
+ if (Boolean.getBoolean("edgent.build.ci")) {
+ // could do something like base the decision of the current value of timeout and/or units
+ return timeout * 10;
+ }
+ return timeout;
+ }
private void waitForCompletion(ExecutorCompletionService<Boolean> completer, int numtasks) throws ExecutionException {
int remainingTasks = numtasks;
+ long getFutureTimeout = 4;
+ TimeUnit getFutureTimeoutUnits = TimeUnit.SECONDS;
+ getFutureTimeout = getTimeoutValue(getFutureTimeout, getFutureTimeoutUnits);
while (remainingTasks > 0) {
try {
- Future<Boolean> completed = completer.poll(4, TimeUnit.SECONDS);
+ Future<Boolean> completed = completer.poll(getFutureTimeout, getFutureTimeoutUnits);
if (completed == null) {
- System.err.println("Completer timed out");
- throw new RuntimeException(new TimeoutException());
+ String msg = String.format("Completer timed out: %d%s timeout", getFutureTimeout, getFutureTimeoutUnits.toString());
+ System.err.println(msg);
+ throw new RuntimeException(new TimeoutException(msg));
}
else {
completed.get();
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/dc6fbef2/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/Executable.java
----------------------------------------------------------------------
diff --git a/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/Executable.java b/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/Executable.java
index 2d3eefd..453003c 100644
--- a/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/Executable.java
+++ b/runtime/etiao/src/main/java/org/apache/edgent/runtime/etiao/Executable.java
@@ -206,6 +206,16 @@ public class Executable implements RuntimeServices {
logger.warn("Scheduler could not finish {} tasks", unfinished.size());
}
}
+
+ private static long getTimeoutValue(long timeout, TimeUnit units) {
+ // try to protect the tests from timing out prematurely
+ // in the face of overloaded/slow build/test servers.
+ if (Boolean.getBoolean("edgent.build.ci")) {
+ // could do something like base the decision of the current value of timeout and/or units
+ return timeout * 10;
+ }
+ return timeout;
+ }
private void invokeAction(Consumer<Invocation<?, ?, ?>> action) {
ExecutorCompletionService<Boolean> completer = new ExecutorCompletionService<>(controlScheduler);
@@ -216,13 +226,18 @@ public class Executable implements RuntimeServices {
});
}
+ long getFutureTimeout = 10;
+ TimeUnit getFutureTimeoutUnits = TimeUnit.SECONDS;
+ getFutureTimeout = getTimeoutValue(getFutureTimeout, getFutureTimeoutUnits);
+
int remainingTasks = invocations.size();
while (remainingTasks > 0) {
try {
- Future<Boolean> completed = completer.poll(10, TimeUnit.SECONDS);
+ Future<Boolean> completed = completer.poll(getFutureTimeout, getFutureTimeoutUnits);
if (completed == null) {
// TODO during close log exception and wait on the next task to complete
- throw new RuntimeException(new TimeoutException());
+ throw new RuntimeException(new TimeoutException(
+ String.format("%d%s timeout", getFutureTimeout, getFutureTimeoutUnits.toString())));
}
else {
try {
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/dc6fbef2/spi/topology/src/main/java/org/apache/edgent/topology/spi/tester/AbstractTester.java
----------------------------------------------------------------------
diff --git a/spi/topology/src/main/java/org/apache/edgent/topology/spi/tester/AbstractTester.java b/spi/topology/src/main/java/org/apache/edgent/topology/spi/tester/AbstractTester.java
index 270d3fd..07b72d2 100644
--- a/spi/topology/src/main/java/org/apache/edgent/topology/spi/tester/AbstractTester.java
+++ b/spi/topology/src/main/java/org/apache/edgent/topology/spi/tester/AbstractTester.java
@@ -22,8 +22,8 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import org.apache.edgent.execution.Job;
-import org.apache.edgent.execution.Submitter;
import org.apache.edgent.execution.Job.State;
+import org.apache.edgent.execution.Submitter;
import org.apache.edgent.topology.Topology;
import org.apache.edgent.topology.tester.Condition;
import org.apache.edgent.topology.tester.Tester;
@@ -33,6 +33,26 @@ import com.google.gson.JsonObject;
public abstract class AbstractTester implements Tester {
private Job job;
+
+ private static long getTimeoutValue(long timeout, TimeUnit units) {
+ // try to protect the tests from timing out prematurely
+ // in the face of overloaded/slow build/test servers.
+ //
+ // One problem with the following "generally bump the timeout value"
+ // scheme is that there are some tests that expect / test-for something
+ // to NOT happen - within some timeout tolerance.
+ // Ideally we don't want such tests to always take this extra-long timeout.
+ // Not sure what to do about that. The first step is to just try this and
+ // see if it generally addresses the slow-test-server problem.
+ // Then we can review test execution times to identify those that fall
+ // into this case and then contemplate what to do about them.
+
+ if (Boolean.getBoolean("edgent.build.ci")) {
+ // could do something like base the decision of the current value of timeout and/or units
+ return timeout * 10;
+ }
+ return timeout;
+ }
@Override
public boolean complete(Submitter<Topology, ? extends Job> submitter, JsonObject config, Condition<?> endCondition,
@@ -40,6 +60,7 @@ public abstract class AbstractTester implements Tester {
long tmoMsec = Math.max(unit.toMillis(timeout), 1000);
long maxTime = System.currentTimeMillis() + tmoMsec;
+ tmoMsec = getTimeoutValue(tmoMsec, TimeUnit.MILLISECONDS);
Future<?> future = submitter.submit(topology(), config);
// wait at most tmoMsec for the submit to create the job
[24/50] [abbrv] incubator-edgent git commit: fix WindowTest for sure
this time
Posted by dl...@apache.org.
fix WindowTest for sure this time
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/ec48aada
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/ec48aada
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/ec48aada
Branch: refs/heads/develop
Commit: ec48aadafbfbb22030f168b769749d4f5ad3bc31
Parents: 458471d
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Fri Oct 27 09:42:05 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Fri Oct 27 09:42:05 2017 -0400
----------------------------------------------------------------------
.../src/test/java/org/apache/edgent/test/window/WindowTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/ec48aada/api/window/src/test/java/org/apache/edgent/test/window/WindowTest.java
----------------------------------------------------------------------
diff --git a/api/window/src/test/java/org/apache/edgent/test/window/WindowTest.java b/api/window/src/test/java/org/apache/edgent/test/window/WindowTest.java
index 92002f7..98f04ea 100644
--- a/api/window/src/test/java/org/apache/edgent/test/window/WindowTest.java
+++ b/api/window/src/test/java/org/apache/edgent/test/window/WindowTest.java
@@ -507,7 +507,7 @@ public class WindowTest {
public static boolean withinToleranceAmt(double expected, Double actual, double toleranceAmt) {
double lowBound = expected - toleranceAmt;
double highBound = expected + toleranceAmt;
- return (actual < highBound && actual > lowBound);
+ return (actual <= highBound && actual >= lowBound);
}
}
[37/50] [abbrv] incubator-edgent git commit: enhance
testMultiTopologyPollWithError dbg output
Posted by dl...@apache.org.
enhance testMultiTopologyPollWithError dbg output
this is just to understand seemingly "duplicate" log/stacktraces in the
failure case. Suspect build #151 has enough info to identify the root
failure issue.
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/ede4ab6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/ede4ab6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/ede4ab6b
Branch: refs/heads/develop
Commit: ede4ab6be7f61387b47678b1771536dcb1a63ad6
Parents: 52f6fb3
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Mon Oct 30 12:01:40 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Mon Oct 30 12:01:40 2017 -0400
----------------------------------------------------------------------
.../test/java/org/apache/edgent/test/topology/TStreamTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/ede4ab6b/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java
----------------------------------------------------------------------
diff --git a/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java b/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java
index 30e3ffb..9fae5ed 100644
--- a/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java
+++ b/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java
@@ -37,6 +37,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.edgent.topology.TSink;
@@ -795,13 +796,14 @@ public abstract class TStreamTest extends TopologyAbstractTest {
int executions = 4;
ExecutorCompletionService<Boolean> completer = new ExecutorCompletionService<>(
Executors.newFixedThreadPool(executions));
+ final AtomicInteger excCnt = new AtomicInteger();
for (int i = 0; i < executions; i++) {
completer.submit(() -> {
Topology t = newTopology();
AtomicLong n = new AtomicLong(0);
TStream<Long> s = t.poll(() -> n.incrementAndGet(), 10, TimeUnit.MILLISECONDS);
// Throw on the 8th tuple
- s.sink((tuple) -> { if (8 == n.get()) throw new RuntimeException("MTPWE Expected Test Exception");});
+ s.sink((tuple) -> { if (8 == n.get()) throw new RuntimeException("MTPWE Expected Test Exception # "+excCnt.incrementAndGet());});
// Expect 7 tuples out of 8
Condition<Long> tc = t.getTester().tupleCount(s, 7);
// complete(t, tc);
[41/50] [abbrv] incubator-edgent git commit: - Give the multiple
steps another try
Posted by dl...@apache.org.
- Give the multiple steps another try
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/f1adc511
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/f1adc511
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/f1adc511
Branch: refs/heads/develop
Commit: f1adc5114d3ec3f392203364586ce30179665a52
Parents: d244cc7
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Tue Oct 31 15:46:37 2017 +0100
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Tue Oct 31 15:46:37 2017 +0100
----------------------------------------------------------------------
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/f1adc511/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 852c792..f9b081c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -37,7 +37,7 @@ node('ubuntu') {
if(env.BRANCH_NAME == 'develop') {
mavenGoal = "deploy"
} else {
- mavenLocalRepo = "-Dmaven.repo.local=${workspace)/.repository"
+ mavenLocalRepo = "-Dmaven.repo.local=${workspace)@script/.repository"
}
def mavenFailureMode = "" // consider "--fail-at-end"? Odd ordering side effects?
[36/50] [abbrv] incubator-edgent git commit: remove all gradle
tooling artifacts and "exclusions" from the repo
Posted by dl...@apache.org.
remove all gradle tooling artifacts and "exclusions" from the repo
We really want to support only a single set of build tooling.
Also, while perhaps not too too difficult to remedy, the current
state of the grade tooling won't work due to some repo restructuring.
TODO identify / cleanup items in buildTools that have no role going
forward (most if not all of them).
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/52f6fb33
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/52f6fb33
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/52f6fb33
Branch: refs/heads/develop
Commit: 52f6fb331e374fbbc2943c4078bf46fa24bf3b1f
Parents: 89252db
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Mon Oct 30 11:26:41 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Mon Oct 30 11:26:41 2017 -0400
----------------------------------------------------------------------
.gitignore | 5 -
.gradle-wrapper/gradle-wrapper.jar | Bin 54783 -> 0 bytes
.gradle-wrapper/gradle-wrapper.properties | 7 -
analytics/math3/build.gradle | 28 -
analytics/sensors/build.gradle | 27 -
android/hardware/build.gradle | 32 -
android/topology/build.gradle | 31 -
api/execution/build.gradle | 24 -
api/function/build.gradle | 24 -
api/graph/build.gradle | 29 -
api/oplet/build.gradle | 26 -
api/topology/build.gradle | 43 -
api/window/build.gradle | 24 -
apps/iot/build.gradle | 26 -
apps/runtime/build.gradle | 27 -
binary-release/LICENSE | 401 --------
binary-release/NOTICE | 85 --
binary-release/README | 21 -
binary-release/apache-notice | 8 -
binary-release/apache-v2_0-license | 201 ----
binary-release/ibm-contrib-notice | 11 -
build.gradle.sav | 930 -------------------
connectors/command/build.gradle | 27 -
connectors/common/build.gradle | 32 -
connectors/csv/build.gradle | 27 -
connectors/file/build.gradle | 27 -
connectors/http/build.gradle | 29 -
connectors/iot/build.gradle | 27 -
connectors/iotp/build.gradle | 29 -
connectors/jdbc/build.gradle | 28 -
connectors/kafka/build.gradle | 48 -
.../kafka/KafkaStreamsSkipMeTest.java | 2 +-
connectors/mqtt/build.gradle | 29 -
connectors/pubsub/build.gradle | 27 -
connectors/serial/build.gradle | 27 -
connectors/websocket-base/build.gradle | 27 -
connectors/websocket-jetty/build.gradle | 26 -
connectors/websocket-misc/build.gradle | 25 -
connectors/websocket-server/build.gradle | 26 -
connectors/websocket/build.gradle | 32 -
console/server/build.gradle | 33 -
console/servlets/build.gradle | 48 -
gradle.properties | 27 -
gradle/jacoco.gradle | 155 ----
gradle/javadoc.gradle | 59 --
gradle/other.gradle | 65 --
gradle/rat.gradle | 136 ---
gradle/resources/rat-output-to-html.xsl | 208 -----
gradle/wrapper.gradle | 51 -
gradlew | 172 ----
gradlew.bat | 84 --
.../binary-release/commons-codec-1.10.AL-2.0 | 202 ----
.../binary-release/commons-codec-1.10.NOTICE | 17 -
.../binary-release/commons-codec-1.9.AL-2.0 | 202 ----
.../binary-release/commons-codec-1.9.NOTICE | 9 -
.../binary-release/commons-lang3-3.4.AL-2.0 | 202 ----
.../binary-release/commons-lang3-3.4.NOTICE | 8 -
.../binary-release/commons-logging-1.2.AL-2.0 | 202 ----
.../binary-release/commons-logging-1.2.NOTICE | 6 -
.../binary-release/commons-math3-3.4.1.AL-2.0 | 457 ---------
.../binary-release/commons-math3-3.4.1.NOTICE | 9 -
licenses/binary-release/commons-net-3.3.AL-2.0 | 202 ----
licenses/binary-release/commons-net-3.3.NOTICE | 5 -
licenses/binary-release/gson-2.2.4.AL-2.0 | 203 ----
licenses/binary-release/gson-2.6.1.AL-2.0 | 202 ----
licenses/binary-release/httpclient-4.5.1.AL-2.0 | 202 ----
licenses/binary-release/httpclient-4.5.1.NOTICE | 8 -
licenses/binary-release/httpcore-4.4.3.AL-2.0 | 266 ------
licenses/binary-release/httpcore-4.4.3.NOTICE | 10 -
licenses/binary-release/httpcore-4.4.4.AL-2.0 | 266 ------
licenses/binary-release/httpcore-4.4.4.NOTICE | 10 -
.../javax-websocket-client-impl-9.3.6.AL-2.0 | 27 -
.../javax.servlet-api-3.1.0.CDDL-1.0 | 263 ------
.../javax.websocket-api-1.0.CDDL-1.1 | 209 -----
licenses/binary-release/jetty-http-9.3.6.AL-2.0 | 27 -
licenses/binary-release/jetty-io-9.3.6.AL-2.0 | 27 -
.../binary-release/jetty-security-9.3.6.AL-2.0 | 27 -
.../binary-release/jetty-server-9.3.6.AL-2.0 | 27 -
.../binary-release/jetty-servlet-9.3.6.AL-2.0 | 27 -
licenses/binary-release/jetty-util-9.3.6.AL-2.0 | 27 -
.../binary-release/jetty-webapp-9.3.6.AL-2.0 | 27 -
licenses/binary-release/jetty-xml-9.3.6.AL-2.0 | 27 -
licenses/binary-release/joda-time-2.9.2.AL-2.0 | 202 ----
licenses/binary-release/joda-time-2.9.2.NOTICE | 5 -
.../binary-release/kafka-clients-0.8.2.2.AL-2.0 | 202 ----
.../binary-release/kafka-clients-0.8.2.2.NOTICE | 5 -
.../binary-release/kafka_2.10-0.8.2.2.AL-2.0 | 202 ----
.../binary-release/kafka_2.10-0.8.2.2.NOTICE | 5 -
licenses/binary-release/log4j-1.2.16.AL-2.0 | 202 ----
licenses/binary-release/log4j-1.2.16.NOTICE | 5 -
licenses/binary-release/log4j-1.2.17.AL-2.0 | 202 ----
licenses/binary-release/log4j-1.2.17.NOTICE | 5 -
.../binary-release/metrics-core-2.2.0.AL-2.0 | 202 ----
.../binary-release/metrics-core-2.2.0.NOTICE | 11 -
.../binary-release/metrics-core-3.1.2.AL-2.0 | 202 ----
.../binary-release/metrics-core-3.1.2.NOTICE | 11 -
licenses/binary-release/mqttv3-1.1.0.EDL-1.0 | 28 -
licenses/binary-release/scala-2.10.4.BSD | 63 --
licenses/binary-release/slf4j1.7.12.MIT | 22 -
.../binary-release/watson-iot-0.2.2.EPL-1.0 | 203 ----
.../binary-release/websocket-api-9.3.6.AL-2.0 | 27 -
.../websocket-client-9.3.6.AL-2.0 | 27 -
.../websocket-common-9.3.6.AL-2.0 | 27 -
licenses/binary-release/zkclient-0.3.AL-2.0 | 202 ----
licenses/binary-release/zookeeper-3.4.6.AL-2.0 | 202 ----
pom.xml | 7 -
providers/development/build.gradle | 29 -
providers/direct/build.gradle | 32 -
providers/iot/build.gradle | 31 -
runtime/appservice/build.gradle | 25 -
runtime/etiao/build.gradle | 28 -
runtime/jmxcontrol/build.gradle | 25 -
runtime/jobregistry/build.gradle | 25 -
runtime/jsoncontrol/build.gradle | 25 -
samples/.gitignore | 5 -
samples/apps/build.gradle | 30 -
samples/connectors/build.gradle | 33 -
samples/console/build.gradle | 25 -
samples/scenarios/build.gradle | 49 -
samples/topology/build.gradle | 28 -
samples/utils/build.gradle | 27 -
settings.gradle | 77 --
spi/graph/build.gradle | 25 -
spi/topology/build.gradle | 24 -
src/assembly/source-release.xml | 8 -
test/fvtiot/build.gradle | 28 -
test/svt/build.gradle | 38 -
utils/metrics/build.gradle | 26 -
utils/streamscope/build.gradle | 31 -
129 files changed, 1 insertion(+), 9888 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index e02d723..ea7e192 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,12 +8,7 @@
# More generated artifacts
target/
-/test/svt/lib
-/release-edgent
/reports
-/.gradle/
-build/
-/externalJars
# Mobile Tools for Java (J2ME)
.mtj.tmp/
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/.gradle-wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/.gradle-wrapper/gradle-wrapper.jar b/.gradle-wrapper/gradle-wrapper.jar
deleted file mode 100644
index b5070d3..0000000
Binary files a/.gradle-wrapper/gradle-wrapper.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/.gradle-wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/.gradle-wrapper/gradle-wrapper.properties b/.gradle-wrapper/gradle-wrapper.properties
deleted file mode 100644
index c59d27a..0000000
--- a/.gradle-wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-#Wed May 24 15:58:25 CEST 2017
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip
-distributionSha256Sum=c7de3442432253525902f7e8d7eac8b5fd6ce1623f96d76916af6d0e383010fc
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/analytics/math3/build.gradle
----------------------------------------------------------------------
diff --git a/analytics/math3/build.gradle b/analytics/math3/build.gradle
deleted file mode 100644
index 9842e9c..0000000
--- a/analytics/math3/build.gradle
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:topology'
- addProjectExtDependency 'compile', 'org.apache.commons:commons-math3:3.4.1'
- addTargetDirCoreExtJarDependencies 'compile'
-
- addTargetDirProjectJarDependency 'testCompile', ':providers:direct'
- // N.B. root project adds test common dependencies
-}
-
-addCompileTestDependencies ':api:topology', ':providers:direct'
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/analytics/sensors/build.gradle
----------------------------------------------------------------------
diff --git a/analytics/sensors/build.gradle b/analytics/sensors/build.gradle
deleted file mode 100644
index 6a86d26..0000000
--- a/analytics/sensors/build.gradle
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:topology'
- addTargetDirCoreExtJarDependencies 'compile'
-
- addTargetDirProjectJarDependency 'testCompile', ':providers:direct'
- // N.B. root project adds test common dependencies
-}
-
-addCompileTestDependencies ':api:topology', ':providers:direct'
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/android/hardware/build.gradle
----------------------------------------------------------------------
diff --git a/android/hardware/build.gradle b/android/hardware/build.gradle
deleted file mode 100644
index 0368f95..0000000
--- a/android/hardware/build.gradle
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-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.
-*/
-
-ext.androidJarSpec = 'com.google.android:android:4.1.1.4@jar'
-
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:topology'
- addProjectExtDependency 'compile', androidJarSpec
-
- // N.B. root project adds test common dependencies
-}
-
-test {
- // this project lacks tests and this task fails if attempted
- enabled = false
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/android/topology/build.gradle
----------------------------------------------------------------------
diff --git a/android/topology/build.gradle b/android/topology/build.gradle
deleted file mode 100644
index f5e9106..0000000
--- a/android/topology/build.gradle
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-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.
-*/
-
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:topology'
- addTargetDirProjectJarDependency 'compile', ':api:oplet'
- addProjectExtDependency 'compile', project(':android:hardware').androidJarSpec
-
- // N.B. root project adds test common dependencies
-}
-
-test {
- // this project lacks tests and this task fails if attempted
- enabled = false
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/api/execution/build.gradle
----------------------------------------------------------------------
diff --git a/api/execution/build.gradle b/api/execution/build.gradle
deleted file mode 100644
index 19b441d..0000000
--- a/api/execution/build.gradle
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:function'
- addTargetDirCoreExtJarDependencies 'compile'
-
- // N.B. root project adds test common dependencies
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/api/function/build.gradle
----------------------------------------------------------------------
diff --git a/api/function/build.gradle b/api/function/build.gradle
deleted file mode 100644
index f5aa243..0000000
--- a/api/function/build.gradle
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-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.
-*/
-
-dependencies {
- // none
-
- // N.B. root project adds test common dependencies
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/api/graph/build.gradle
----------------------------------------------------------------------
diff --git a/api/graph/build.gradle b/api/graph/build.gradle
deleted file mode 100644
index 4931d57..0000000
--- a/api/graph/build.gradle
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:oplet'
- addTargetDirCoreExtJarDependencies 'compile'
-
- // N.B. root project adds test common dependencies
-}
-
-test {
- // this project lacks non-abstract test classes and this task fails if attempted
- enabled = false
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/api/oplet/build.gradle
----------------------------------------------------------------------
diff --git a/api/oplet/build.gradle b/api/oplet/build.gradle
deleted file mode 100644
index b97572d..0000000
--- a/api/oplet/build.gradle
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:function'
- addTargetDirProjectJarDependency 'compile', ':api:execution'
- addTargetDirProjectJarDependency 'compile', ':api:window'
- addTargetDirCoreExtJarDependencies 'compile'
-
- // N.B. root project adds test common dependencies
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/api/topology/build.gradle
----------------------------------------------------------------------
diff --git a/api/topology/build.gradle b/api/topology/build.gradle
deleted file mode 100644
index ac33fc3..0000000
--- a/api/topology/build.gradle
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:execution'
- addTargetDirProjectJarDependency 'compile', ':api:function'
- addTargetDirProjectJarDependency 'compile', ':api:graph'
- addTargetDirProjectJarDependency 'compile', ':api:oplet'
- addTargetDirCoreExtJarDependencies 'compile'
-
- // N.B. root project adds test common dependencies
-}
-
-//Build a jar file containing the applications to test the ApplicationService
-task testApplicationJar{
- doLast{
- ant.jar(destfile: "${buildDir}/lib/test/edgent.api.topology.APPS.TEST.jar") {
- service(type: 'org.apache.edgent.topology.services.TopologyBuilder') {
- provider(classname: 'org.apache.edgent.test.topology.services.TestApplications$AppOne')
- provider(classname: 'org.apache.edgent.test.topology.services.TestApplications$AppTwo')
- provider(classname: 'org.apache.edgent.test.topology.services.TestApplications$AppThree')
- }
- fileset (dir: "${buildDir}/classes/test/", includes: '**/*TestApplications$App*.class')
- }
- }
-}
-
-testClasses.dependsOn testApplicationJar
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/api/window/build.gradle
----------------------------------------------------------------------
diff --git a/api/window/build.gradle b/api/window/build.gradle
deleted file mode 100644
index 19b441d..0000000
--- a/api/window/build.gradle
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:function'
- addTargetDirCoreExtJarDependencies 'compile'
-
- // N.B. root project adds test common dependencies
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/apps/iot/build.gradle
----------------------------------------------------------------------
diff --git a/apps/iot/build.gradle b/apps/iot/build.gradle
deleted file mode 100644
index 0242187..0000000
--- a/apps/iot/build.gradle
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:topology'
- addTargetDirProjectJarDependency 'compile', ':connectors:pubsub'
- addTargetDirProjectJarDependency 'compile', ':connectors:iot'
-
- addTargetDirProjectJarDependency 'testCompile', ':providers:direct'
- // N.B. root project adds test common dependencies
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/apps/runtime/build.gradle
----------------------------------------------------------------------
diff --git a/apps/runtime/build.gradle b/apps/runtime/build.gradle
deleted file mode 100644
index fefbe85..0000000
--- a/apps/runtime/build.gradle
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:topology'
- addTargetDirProjectJarDependency 'compile', ':runtime:jobregistry'
- addTargetDirProjectJarDependency 'compile', ':runtime:appservice'
-
- addTargetDirProjectJarDependency 'testCompile', ':providers:direct'
- addTargetDirProjectJarDependency 'testCompile', ':runtime:jmxcontrol'
- // N.B. root project adds test common dependencies
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/binary-release/LICENSE
----------------------------------------------------------------------
diff --git a/binary-release/LICENSE b/binary-release/LICENSE
deleted file mode 100644
index 39e4bcd..0000000
--- a/binary-release/LICENSE
+++ /dev/null
@@ -1,401 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "{}"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright {yyyy} {name of copyright owner}
-
- 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.
-
-======================================
-APACHE EDGENT SUBCOMPONENTS:
-
-This Apache Edgent binary release includes a number of subcomponents with
-separate copyright notices and license terms. Your use of these
-components is subject to the terms and conditions of the following licenses.
-
-The binary release includes some binary content with associated
-Eclipse Public License ("EPL-1.0") and
-Common Development and Distribution License ("CDDL-1.0" and CDDL-1.1")
-licenses as noted below.
-
---------------------------------
-ext/ # common dependencies for all Edgent components
- gson-2.2.4.jar com.google.code.gson:gson:2.2.4
- LICENSE: AL-2.0 For details, see licenses/binary-release/gson-2.2.4.AL-2.0
-
- metrics-core-3.1.2.jar io.dropwizard.metrics:metrics-core:3.1.2
- LICENSE: AL-2.0 For details, see licenses/binary-release/metrics-core-3.1.2.AL-2.0
-
- slf4j-api-1.7.12.jar org.slf4j:slf4j-api:1.7.12
- slf4j-jdk14-1.7.12.jar
- LICENSE: MIT For details, see licenses/binary-release/slf4j-1.7.12.MIT
-
---------------------------------
-analytics/math3/ext/
- commons-math3-3.4.1.jar org.apache.commons:commons-math3:3.4.1
- LICENSE: AL-2.0 For details, see licenses/binary-release/commons-math3-3.4.1.AL-2.0
-
---------------------------------
-connectors/http/ext
- httpclient-4.5.1.jar org.apache.httpcomponents:httpclient:4.5.1
- LICENSE: AL-2.0 For details, see licenses/binary-release/httpclient-4.5.1.AL-2.0
-
- httpcore-4.4.4.jar org.apache.httpcomponents:httpcore:4.4.4
- LICENSE: AL-2.0 For details, see licenses/binary-release/httpcore-4.4.4.AL-2.0
-
- commons-codec-1.9.jar org.apache.commons:commons-codec:1.9
- LICENSE: AL-2.0 For details, see licenses/binary-release/commons-codec-1.9.AL-2.0
-
- commons-logging-1.2.jar org.apache.commons:commons-logging:1.2
- LICENSE: AL-2.0 For details, see licenses/binary-release/commons-logging-1.2.AL-2.0
-
---------------------------------
-connectors/iotp/ext
- watson-iot-0.2.2.jar com.ibm.messaging:watson-iot:0.2.2
- LICENSE: EPL-1.0 For details, see licenses/binary-release/watson-iot-0.2.2.EPL-1.0
- Only binary form content is included.
- https://mvnrepository.com/artifact/com.ibm.messaging/watson-iot/0.2.2
-
- commons-codec-1.10.jar org.apache.commons:commons-codec:1.10
- LICENSE: AL-2.0 For details, see licenses/binary-release/commons-codec-1.10.AL-2.0
-
- commons-lang3-3.4.jar org.apache.commons:commons-lang3:3.4
- LICENSE: AL-2.0 For details, see licenses/binary-release/commons-lang3-3.4.AL-2.0
-
- commons-logging-1.2.jar org.apache.commons:commons-logging:1.2
- LICENSE: AL-2.0 For details, see licenses/binary-release/commons-logging-1.2.AL-2.0
-
- commons-net-3.3.jar org.apache.commons:commons-net:3.3
- LICENSE: AL-2.0 For details, see licenses/binary-release/commons-net-3.3.AL-2.0
-
- gson-2.6.1.jar com.google.code.gson:gson:2.6.1
- LICENSE: AL-2.0 For details, see licenses/binary-release/gson-2.6.1.AL-2.0
-
- httpclient-4.5.1.jar org.apache.httpcomponents:httpclient:4.5.1
- LICENSE: AL-2.0 For details, see licenses/binary-release/httpclient-4.5.1.AL-2.0
-
- httpcore-4.4.3.jar org.apache.httpcomponents:httpcore:4.4.3
- LICENSE: AL-2.0 For details, see licenses/binary-release/httpcore-4.4.3.AL-2.0
-
- joda-time-2.9.2.jar joda-time:joda-time:2.9.2
- LICENSE: AL-2.0 For details, see licenses/binary-release/joda-time-2.9.2.AL-2.0
-
- log4j-1.2.17.jar log4j:log4j:1.2.17
- LICENSE: AL-2.0 For details, see licenses/binary-release/log4j-1.2.17.AL-2.0
-
- org.eclipse.paho.client.mqttv3-1.1.0.jar org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.1.0
- LICENSE: EDL-1.0 For details, see licenses/binary-release/mqttv3-1.1.0.EDL-1.0
-
---------------------------------
-connectors/kafka/ext
- kafka-clients-0.8.2.2.jar org.apache.kafka:kafka-clients:0.8.2.2
- LICENSE: AL-2.0 For details, see licenses/binary-release/kafka-clients-0.8.2.2.AL-2.0
-
- kafka_2.10-0.8.2.2.jar org.apache.kafka:kafka_2.10:0.8.2.2
- LICENSE: AL-2.0 For details, see licenses/binary-release/kafka-2.10-0.8.2.2.AL-2.0
-
- log4j-1.2.16.jar log4j:log4j:1.2.16
- LICENSE: AL-2.0 For details, see licenses/binary-release/log4j-1.2.16.AL-2.0
-
- metrics-core-2.2.0.jar com.yammer.metrics:metrics-core:2.2.0
- LICENSE: AL-2.0 For details, see licenses/binary-release/metrics-core-2.2.0.AL-2.0
-
- scala-library-2.10.4.jar org.scala-lang:scala-library:2.10.4
- LICENSE: BSD For details, see licenses/binary-release/scala-library-2.10.4.BSD
-
- zkclient-0.3.jar com.101tec:zkclient:0.3
- LICENSE: AL-2.0 For details, see licenses/binary-release/zkclient-0.3.AL-2.0
-
- zookeeper-3.4.6.jar org.apache.zookeeper:zookeeper:3.4.6
- LICENSE: AL-2.0 For details, see licenses/binary-release/zookeeper-3.4.6.AL-2.0
-
---------------------------------
-connectors/mqtt/ext
- org.eclipse.paho.client.mqttv3-1.1.0.jar org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.1.0
- LICENSE: EDL-1.0 For details, see licenses/binary-release/mqttv3-1.1.0.EDL-1.0
-
---------------------------------
-connectors/edgent.javax.websocket/ext
- javax.websocket-api-1.0.jar javax.websocket:javax.websocket-api:1.0
- LICENSE: CDDL-1.1 For details, see licenses/binary-release/javax.websocket-api-1.0.CDDL-1.1
- Only binary form content is included.
- https://mvnrepository.com/artifact/javax.websocket/javax.websocket-api/1.0
-
---------------------------------
-connectors/javax.websocket-client/ext
- javax-websocket-client-impl-9.3.6.v20151106.jar org.eclipse.jetty.websocket:javax-websocket-client-impl:9.3.6.v20151106
- LICENSE: AL-2.0 For details, see licenses/binary-release/javax-websocket-client-impl-9.3.6.AL-2.0
-
- javax.websocket-api-1.0.jar javax.websocket:javax.websocket-api:1.0
- LICENSE: CDDL-1.1 For details, see licenses/binary-release/javax.websocket-api-1.0.CDDL-1.1
- Only binary form content is included.
- https://mvnrepository.com/artifact/javax.websocket/javax.websocket-api/1.0
-
- jetty-io-9.3.6.v20151106.jar org.eclipse.jetty.websocket:javax-websocket-client-impl:9.3.6.v20151106
- LICENSE: AL-2.0 For details, see licenses/binary-release/jetty-io-9.3.6.AL-2.0
-
- jetty-util-9.3.6.v20151106.jar org.eclipse.jetty.websocket:javax-websocket-client-impl:9.3.6.v20151106
- LICENSE: AL-2.0 For details, see licenses/binary-release/jetty-util-9.3.6.AL-2.0
-
- websocket-api-9.3.6.v20151106.jar org.eclipse.jetty.websocket:javax-websocket-client-impl:9.3.6.v20151106
- LICENSE: AL-2.0 For details, see licenses/binary-release/websocket-api-9.3.6.AL-2.0
-
- websocket-client-9.3.6.v20151106.jar org.eclipse.jetty.websocket:javax-websocket-client-impl:9.3.6.v20151106
- LICENSE: AL-2.0 For details, see licenses/binary-release/websocket-client-9.3.6.AL-2.0
-
- websocket-common-9.3.6.v20151106.jar org.eclipse.jetty.websocket:javax-websocket-client-impl:9.3.6.v20151106
- LICENSE: AL-2.0 For details, see licenses/binary-release/websocket-common-9.3.6.AL-2.0
-
---------------------------------
-console/server/ext
- javax.servlet-api-3.1.0.jar javax.servlet:javax.servlet-api:3.1.0
- LICENSE: CDDL-1.0 For details, see licenses/binary-release/javax.servlet-api-3.1.0.CDDL-1.0
- Only binary form content is included.
- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api/3.1.0
-
- jetty-http-9.3.6.v20151106.jar org.eclipse.jetty:jetty-http:9.3.6.v20151106
- LICENSE: AL-2.0 For details, see licenses/binary-release/jetty-http-9.3.6.AL-2.0
-
- jetty-io-9.3.6.v20151106.jar org.eclipse.jetty:jetty-io:9.3.6.v20151106
- LICENSE: AL-2.0 For details, see licenses/binary-release/jetty-io-9.3.6.AL-2.0
-
- jetty-security-9.3.6.v20151106.jar org.eclipse.jetty:jetty-security:9.3.6.v20151106
- LICENSE: AL-2.0 For details, see licenses/binary-release/jetty-security-9.3.6.AL-2.0
-
- jetty-server-9.3.6.v20151106.jar org.eclipse.jetty:jetty-server:9.3.6.v20151106
- LICENSE: AL-2.0 For details, see licenses/binary-release/jetty-server-9.3.6.AL-2.0
-
- jetty-servlet-9.3.6.v20151106.jar org.eclipse.jetty:jetty-servlet:9.3.6.v20151106
- LICENSE: AL-2.0 For details, see licenses/binary-release/jetty-servlet-9.3.6.AL-2.0
-
- jetty-util-9.3.6.v20151106.jar org.eclipse.jetty:jetty-util:9.3.6.v20151106
- LICENSE: AL-2.0 For details, see licenses/binary-release/jetty-util-9.3.6.AL-2.0
-
- jetty-webapp-9.3.6.v20151106.jar org.eclipse.jetty:jetty-webapp:9.3.6.v20151106
- LICENSE: AL-2.0 For details, see licenses/binary-release/jetty-webapp-9.3.6.AL-2.0
-
- jetty-xml-9.3.6.v20151106.jar org.eclipse.jetty:jetty-xml:9.3.6.v20151106
- LICENSE: AL-2.0 For details, see licenses/binary-release/jetty-xml-9.3.6.AL-2.0
-
---------------------------------
-console/servlets/ext
- javax.servlet-api-3.1.0.jar javax.servlet:javax.servlet-api:3.1.0
- LICENSE: CDDL-1.0 For details, see licenses/binary-release/javax.servlet-api-3.1.0.CDDL-1.0
- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api/3.1.0
-
---------------------------------
-console/webapps
- console.war
- The file bundles d3-legend which is available under a MIT license.
- For details, see licenses/d3-legend.MIT
-
- The file bundles portions of d3 which is available under a BSD license.
- For details, see licenses/d3.BSD
-
- The file bundles portions of d3-sankey which is available under a BSD license.
- For details, see licenses/d3-sankey.BSD
-
- The file bundles portions of jquery-ui which is available under a MIT license.
- For details, see licenses/jquery-ui.MIT
-
- The bundled jquery-ui bundles jquery which is available under a MIT license.
- For details, see licenses/jquery.MIT
-
- The bundled jquery bundles Sizzle which is available under a MIT license.
- For details, see licenses/sizzle.MIT
-
---------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/binary-release/NOTICE
----------------------------------------------------------------------
diff --git a/binary-release/NOTICE b/binary-release/NOTICE
deleted file mode 100644
index 48d09e1..0000000
--- a/binary-release/NOTICE
+++ /dev/null
@@ -1,85 +0,0 @@
-Apache Edgent
-Copyright 2016-2017 The Apache Software Foundation
-
-Apache Edgent is currently undergoing Incubation at the Apache Software Foundation.
-
-This bundle includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-
-===============================================================================
-
-APACHE EDGENT SUBCOMPONENTS:
-
-This Apache Edgent binary release includes a number of subcomponents with
-separate copyright notices and license terms. The following notices apply.
-
---------------------------------
-ext/ # common dependencies for all Edgent components
- metrics-core-3.1.2.jar io.dropwizard.metrics:metrics-core:3.1.2
- See licenses/binary-release/metrics-core-3.1.2.NOTICE
-
---------------------------------
-analytics/math3/ext/
- commons-math3-3.4.1.jar org.apache.commons:commons-math3:3.4.1
- See licenses/binary-release/commons-math3-3.4.1.NOTICE
-
---------------------------------
-connectors/http/ext
- httpclient-4.5.1.jar org.apache.httpcomponents:httpclient:4.5.1
- See licenses/binary-release/httpclient-4.5.1.NOTICE
-
- httpcore-4.4.4.jar org.apache.httpcomponents:httpcore:4.4.4
- See licenses/binary-release/httpcore-4.4.4.NOTICE
-
- commons-codec-1.9.jar org.apache.commons:commons-codec:1.9
- See licenses/binary-release/commons-codec-1.9.NOTICE
-
- commons-logging-1.2.jar org.apache.commons:commons-logging:1.2
- See licenses/binary-release/commons-logging-1.2.NOTICE
-
---------------------------------
-connectors/iotp/ext
- commons-codec-1.10.jar org.apache.commons:commons-codec:1.10
- See licenses/binary-release/commons-codec-1.10.NOTICE
-
- commons-lang3-3.4.jar org.apache.commons:commons-lang3:3.4
- See licenses/binary-release/commons-lang3-3.4.NOTICE
-
- commons-logging-1.2.jar org.apache.commons:commons-logging:1.2
- See licenses/binary-release/commons-logging-1.2.NOTICE
-
- commons-net-3.3.jar org.apache.commons:commons-net:3.3
- See licenses/binary-release/commons-net-3.3.NOTICE
-
- httpclient-4.5.1.jar org.apache.httpcomponents:httpclient:4.5.1
- See licenses/binary-release/httpclient-4.5.1.NOTICE
-
- httpcore-4.4.3.jar org.apache.httpcomponents:httpcore:4.4.3
- See licenses/binary-release/httpcore-4.4.3.NOTICE
-
- joda-time-2.9.2.jar joda-time:joda-time:2.9.2
- See licenses/binary-release/joda-time-2.9.2.NOTICE
-
- log4j-1.2.17.jar log4j:log4j:1.2.17
- See licenses/binary-release/log4j-1.2.17.NOTICE
-
---------------------------------
-connectors/kafka/ext
- kafka-clients-0.8.2.2.jar org.apache.kafka:kafka-clients:0.8.2.2
- See licenses/binary-release/kafka-clients-0.8.2.2.NOTICE
-
- kafka_2.10-0.8.2.2.jar org.apache.kafka:kafka_2.10:0.8.2.2
- See licenses/binary-release/kafka_2.10-0.8.2.2.NOTICE
-
- log4j-1.2.16.jar log4j:log4j:1.2.16
- See licenses/binary-release/log4j-1.2.16.NOTICE
-
- metrics-core-2.2.0.jar com.yammer.metrics:metrics-core:2.2.0
- See licenses/binary-release/metrics-core-2.2.0.NOTICE
-
---------------------------------
-
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/binary-release/README
----------------------------------------------------------------------
diff --git a/binary-release/README b/binary-release/README
deleted file mode 100644
index aae76d3..0000000
--- a/binary-release/README
+++ /dev/null
@@ -1,21 +0,0 @@
-Using an Apache Edgent binary release bundle
-
-Apache Edgent is supported on several Java target platforms.
-For more information see JAVA_SUPPORT.md
-
-See Getting Started https://edgent.apache.org/docs/edgent-getting-started for
-information about using this binary release to develop applications that
-use Edgent.
-
-Apache Edgent is released under the Apache License Version 2.0.
-This Apache Edgent binary release includes a number of subcomponents with
-separate copyright notices and license terms. It includes some binary content
-with associated EPL and CDDL licenses. See LICENSE for details.
-
-Apache Edgent is an effort undergoing incubation at The Apache Software Foundation (ASF),
-sponsored by the Incubator PMC. Incubation is required of all newly accepted
-projects until a further review indicates that the infrastructure, communications,
-and decision making process have stabilized in a manner consistent with other
-successful ASF projects. While incubation status is not necessarily a reflection
-of the completeness or stability of the code, it does indicate that the project
-has yet to be fully endorsed by the ASF.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/binary-release/apache-notice
----------------------------------------------------------------------
diff --git a/binary-release/apache-notice b/binary-release/apache-notice
deleted file mode 100644
index 2684968..0000000
--- a/binary-release/apache-notice
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache Edgent
-Copyright 2016 The Apache Software Foundation
-
-Apache Edgent is currently undergoing Incubation at the Apache Software Foundation.
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-===============================================================================
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/binary-release/apache-v2_0-license
----------------------------------------------------------------------
diff --git a/binary-release/apache-v2_0-license b/binary-release/apache-v2_0-license
deleted file mode 100644
index 8dada3e..0000000
--- a/binary-release/apache-v2_0-license
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "{}"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright {yyyy} {name of copyright owner}
-
- 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.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/binary-release/ibm-contrib-notice
----------------------------------------------------------------------
diff --git a/binary-release/ibm-contrib-notice b/binary-release/ibm-contrib-notice
deleted file mode 100644
index 9ddbaa5..0000000
--- a/binary-release/ibm-contrib-notice
+++ /dev/null
@@ -1,11 +0,0 @@
-Apache Edgent
-Copyright 2016 The Apache Software Foundation
-
-Apache Edgent is currently undergoing Incubation at the Apache Software Foundation.
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-===============================================================================
-
-Portions of this software were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
[18/50] [abbrv] incubator-edgent git commit: fix MQTT test to not use
complete() TMO upon success
Posted by dl...@apache.org.
fix MQTT test to not use complete() TMO upon success
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/786d934f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/786d934f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/786d934f
Branch: refs/heads/develop
Commit: 786d934f0837d387e2b97043a68cc56cc793608e
Parents: a6db4b8
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Oct 25 16:10:54 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Oct 25 16:10:54 2017 -0400
----------------------------------------------------------------------
.../connectors/common/ConnectorTestBase.java | 20 ++++++++++++++++++++
.../connectors/mqtt/MqttStreamsTestManual.java | 19 +++++++++++++------
.../javax/websocket/WebSocketClientTest.java | 19 -------------------
3 files changed, 33 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/786d934f/connectors/common/src/test/java/org/apache/edgent/test/connectors/common/ConnectorTestBase.java
----------------------------------------------------------------------
diff --git a/connectors/common/src/test/java/org/apache/edgent/test/connectors/common/ConnectorTestBase.java b/connectors/common/src/test/java/org/apache/edgent/test/connectors/common/ConnectorTestBase.java
index f5230a9..82a70c0 100644
--- a/connectors/common/src/test/java/org/apache/edgent/test/connectors/common/ConnectorTestBase.java
+++ b/connectors/common/src/test/java/org/apache/edgent/test/connectors/common/ConnectorTestBase.java
@@ -23,10 +23,12 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.concurrent.TimeUnit;
import org.apache.edgent.test.providers.direct.DirectTopologyTestBase;
import org.apache.edgent.topology.TStream;
import org.apache.edgent.topology.Topology;
+import org.apache.edgent.topology.tester.Condition;
public class ConnectorTestBase extends DirectTopologyTestBase {
@@ -102,5 +104,23 @@ public class ConnectorTestBase extends DirectTopologyTestBase {
super.completeAndValidate(ordered, msg, t, s, secTimeout, expected);
}
+
+ public static Condition<Object> newWaitTimeCondition(int seconds) {
+ return new Condition<Object>() {
+ private long startTime = 0;
+ private long endTime = 0;
+ private volatile boolean done = false;
+ public boolean valid() {
+ if (startTime==0) {
+ startTime = System.currentTimeMillis();
+ endTime = startTime + TimeUnit.SECONDS.toMillis(seconds);
+ }
+ long now = System.currentTimeMillis();
+ done = now >= endTime;
+ return done;
+ }
+ public Object getResult() { return done; }
+ };
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/786d934f/connectors/mqtt/src/test/java/org/apache/edgent/test/connectors/mqtt/MqttStreamsTestManual.java
----------------------------------------------------------------------
diff --git a/connectors/mqtt/src/test/java/org/apache/edgent/test/connectors/mqtt/MqttStreamsTestManual.java b/connectors/mqtt/src/test/java/org/apache/edgent/test/connectors/mqtt/MqttStreamsTestManual.java
index 018c1c6..4eae1f1 100644
--- a/connectors/mqtt/src/test/java/org/apache/edgent/test/connectors/mqtt/MqttStreamsTestManual.java
+++ b/connectors/mqtt/src/test/java/org/apache/edgent/test/connectors/mqtt/MqttStreamsTestManual.java
@@ -495,17 +495,24 @@ public class MqttStreamsTestManual extends ConnectorTestBase {
top.collection(msgs), PUB_DELAY_MSEC, TimeUnit.MILLISECONDS);
// Code coverage test: induce connection failure
- //
- // At this point the only thing we can check is an expected
- // result of 0 msgs received.
MqttConfig config = newConfig("tcp://localhost:31999", clientId);
MqttStreams mqtt = new MqttStreams(top, () -> config);
mqtt.publish(s, topic, qos, retain);
- TStream<String> rcvd = mqtt.subscribe(topic, qos);
-
- completeAndValidate(clientId, top, rcvd, mgen, SEC_TIMEOUT, new String[0]);
+ TStream<String> rcvd = mqtt.subscribe(topic, qos); // rcv nothing
+
+ // in this case there's no useful condition that we can check for
+ // to validate this is behaving properly other than the connector doesn't
+ // blow up and that nothing is rcvd, so just wait a short time
+ // before verifying nothing was rcvd.
+ // Don't use the complete() TMO for successful termination.
+
+ Condition<List<String>> rcvdContent = top.getTester().streamContents(rcvd, new String[0]);
+ Condition<Object> tc = newWaitTimeCondition(3);
+
+ complete(top, tc, SEC_TIMEOUT, TimeUnit.SECONDS);
+ assertTrue("rcvd: "+rcvdContent.getResult(), rcvdContent.valid());
}
private String retainTestSetup(boolean isRetained, MsgGenerator mgen) throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/786d934f/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientTest.java
----------------------------------------------------------------------
diff --git a/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientTest.java b/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientTest.java
index fd16084..4ef65c9 100644
--- a/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientTest.java
+++ b/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientTest.java
@@ -614,25 +614,6 @@ public class WebSocketClientTest extends ConnectorTestBase {
assertTrue("rcvd: "+rcvdContent.getResult(), rcvdContent.valid());
}
- private Condition<Object> newWaitTimeCondition(int seconds) {
- return new Condition<Object>() {
- private long startTime = 0;
- private long endTime = 0;
- private volatile boolean done = false;
- public boolean valid() {
- if (startTime==0) {
- startTime = System.currentTimeMillis();
- endTime = startTime + TimeUnit.SECONDS.toMillis(seconds);
- }
- long now = System.currentTimeMillis();
- done = now >= endTime;
- return done;
- }
- public Object getResult() { return done; }
- };
-
- }
-
@Test
public void testSslClientAuth() throws Exception {
[43/50] [abbrv] incubator-edgent git commit: - Give the multiple
steps another try
Posted by dl...@apache.org.
- Give the multiple steps another try
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/ba5d99e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/ba5d99e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/ba5d99e4
Branch: refs/heads/develop
Commit: ba5d99e4794b177510ce942089f4c2aac461ae29
Parents: f9a1280
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Tue Oct 31 15:50:58 2017 +0100
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Tue Oct 31 15:50:58 2017 +0100
----------------------------------------------------------------------
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/ba5d99e4/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index c8c49a5..63407d4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,7 +35,7 @@ node('ubuntu') {
if(env.BRANCH_NAME == 'develop') {
mavenGoal = "deploy"
} else {
- mavenLocalRepo = "-Dmaven.repo.local=${env.WORKSPACE)/.repository"
+ mavenLocalRepo = "-Dmaven.repo.local=${env.WORKSPACE}/.repository"
}
def mavenFailureMode = "" // consider "--fail-at-end"? Odd ordering side effects?
[27/50] [abbrv] incubator-edgent git commit: improve PressureReliever
tests
Posted by dl...@apache.org.
improve PressureReliever tests
- add "simple" test that verifies relief/dropping
- try to make the "continuous" test better and usable on CI
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/39764b53
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/39764b53
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/39764b53
Branch: refs/heads/develop
Commit: 39764b534663d5f5ae6f15164cf7dcf16481103f
Parents: 177e912
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Fri Oct 27 14:31:30 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Fri Oct 27 14:31:30 2017 -0400
----------------------------------------------------------------------
.../edgent/test/topology/PlumbingTest.java | 144 +++++++++++++------
1 file changed, 100 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/39764b53/api/topology/src/test/java/org/apache/edgent/test/topology/PlumbingTest.java
----------------------------------------------------------------------
diff --git a/api/topology/src/test/java/org/apache/edgent/test/topology/PlumbingTest.java b/api/topology/src/test/java/org/apache/edgent/test/topology/PlumbingTest.java
index 6fe2e2a..644ac4f 100644
--- a/api/topology/src/test/java/org/apache/edgent/test/topology/PlumbingTest.java
+++ b/api/topology/src/test/java/org/apache/edgent/test/topology/PlumbingTest.java
@@ -161,67 +161,49 @@ public abstract class PlumbingTest extends TopologyAbstractTest {
}
@Test
- public void testPressureReliever() throws Exception {
- // Timing variances on shared machines can cause this test to fail
- assumeTrue(!Boolean.getBoolean("edgent.build.ci"));
+ public void testPressureRelieverDrop() throws Exception {
Topology topology = newTopology();
- TStream<TimeAndId> raw = topology.poll(() -> new TimeAndId(), 10, TimeUnit.MILLISECONDS);
-
+ // Verify the pressureReliever drops and retains the most recent when
+ // backpressure exists.
+ //
+ // Here, all the tuples hit the reliever at once, the downstream processing (oneShotDelay)
+ // causes a backup causing the reliever's queue to become full and drop tuples.
+ // The first tuple should be processed, then the last (most recent) N (N==queue depth).
- TStream<TimeAndId> pr = PlumbingStreams.pressureReliever(raw, Functions.unpartitioned(), 5);
+ String[] tuples = {"A", "B", "C", "D", "E", "F", "G", "H"};
+ String[] expTuples = {"A", "F", "G", "H"}; // with queue depth of 3
+ TStream<String> raw = topology.strings(tuples);
- // insert a blocking delay acting as downstream operator that cannot keep up
- TStream<TimeAndId> slow = PlumbingStreams.blockingDelay(pr, 200, TimeUnit.MILLISECONDS);
+ TStream<String> pr = PlumbingStreams.pressureReliever(raw, Functions.unpartitioned(), 3);
- // calculate the delay
- TStream<TimeAndId> slowM = slow.modify(v -> new TimeAndId(v));
-
- // Also process raw that should be unaffected by the slow path
- TStream<String> processed = raw.asString();
+ TStream<String> pr2 = PlumbingStreams.blockingOneShotDelay(pr, 1, TimeUnit.SECONDS);
+ Condition<Long> tcCount = topology.getTester().tupleCount(pr2, expTuples.length);
+ Condition<List<String>> contents = topology.getTester().streamContents(pr2, expTuples);
+ complete(topology, tcCount);
- Condition<Long> tcSlowCount = topology.getTester().atLeastTupleCount(slow, 20);
- Condition<List<TimeAndId>> tcRaw = topology.getTester().streamContents(raw);
- Condition<List<TimeAndId>> tcSlow = topology.getTester().streamContents(slow);
- Condition<List<TimeAndId>> tcSlowM = topology.getTester().streamContents(slowM);
- Condition<List<String>> tcProcessed = topology.getTester().streamContents(processed);
- complete(topology, tcSlowCount);
-
- assertTrue(tcProcessed.getResult().size() > tcSlowM.getResult().size());
- for (TimeAndId delay : tcSlowM.getResult())
- assertTrue("delay:"+delay, delay.ms < 300);
-
- // Must not lose any tuples in the non relieving path
- Set<TimeAndId> uniq = new HashSet<>(tcRaw.getResult());
- assertEquals(tcRaw.getResult().size(), uniq.size());
-
- // Must not lose any tuples in the non relieving path
- Set<String> uniqProcessed = new HashSet<>(tcProcessed.getResult());
- assertEquals(tcProcessed.getResult().size(), uniqProcessed.size());
-
- assertEquals(uniq.size(), uniqProcessed.size());
-
- // Might lose tuples, but must not have send duplicates
- uniq = new HashSet<>(tcSlow.getResult());
- assertEquals(tcSlow.getResult().size(), uniq.size());
+ assertTrue(tcCount.valid());
+ assertTrue(contents.valid());
}
@Test
- public void testPressureRelieverWithInitialDelay() throws Exception {
+ public void testPressureRelieverNoDrop() throws Exception {
Topology topology = newTopology();
+ // Same pipeline config as testPressureRelieverDrop but the reliever queue is
+ // big enough to avoid drops
+ String[] tuples = {"A", "B", "C", "D", "E", "F", "G", "H"};
+ TStream<String> raw = topology.strings(tuples);
- TStream<String> raw = topology.strings("A", "B", "C", "D", "E", "F", "G", "H");
+ TStream<String> pr = PlumbingStreams.pressureReliever(raw, Functions.unpartitioned(), 100);
- TStream<String> pr = PlumbingStreams.pressureReliever(raw, v -> 0, 100);
+ TStream<String> pr2 = PlumbingStreams.blockingOneShotDelay(pr, 1, TimeUnit.SECONDS);
- TStream<String> pr2 = PlumbingStreams.blockingOneShotDelay(pr, 5, TimeUnit.SECONDS);
-
- Condition<Long> tcCount = topology.getTester().tupleCount(pr2, 8);
- Condition<List<String>> contents = topology.getTester().streamContents(pr2, "A", "B", "C", "D", "E", "F", "G", "H");
+ Condition<Long> tcCount = topology.getTester().tupleCount(pr2, tuples.length);
+ Condition<List<String>> contents = topology.getTester().streamContents(pr2, tuples);
complete(topology, tcCount);
assertTrue(tcCount.valid());
@@ -229,6 +211,80 @@ public abstract class PlumbingTest extends TopologyAbstractTest {
}
@Test
+ public void testPressureRelieverContinuous() throws Exception {
+ // Timing variances on shared machines can cause this test to fail
+ //assumeTrue(!Boolean.getBoolean("edgent.build.ci"));
+
+ // Try to verify more continuous reliever behavior instead of just the
+ // the other pressure reliever tests where the backpressure only exists
+ // at the beginning.
+ //
+ // Generate @ 100tps, consume @ 5tps.
+ // With reliever depth=1, roughly should process every 20th tuple, with essentially
+ // no delay in the queue (certainly less than say 50% of the consumer delay, hence < 0.5 * 200ms)
+
+ Topology topology = newTopology();
+
+ TStream<TimeAndId> raw = topology.poll(() -> new TimeAndId(), 10, TimeUnit.MILLISECONDS);
+
+ TStream<TimeAndId> pr = PlumbingStreams.pressureReliever(raw, Functions.unpartitioned(), 1);
+
+ TStream<TimeAndId> slow = PlumbingStreams.blockingDelay(pr, 200, TimeUnit.MILLISECONDS);
+
+ // calculate the delay (queue time + consumer processing)
+ TStream<TimeAndId> slowM = slow.modify(v -> new TimeAndId(v));
+
+ // Also process raw that should be unaffected by the slow path
+ TStream<TimeAndId> processed = raw.filter(t -> true);
+
+
+ Condition<Long> tcSlowMCount = topology.getTester().atLeastTupleCount(slowM, 10);
+ Condition<List<TimeAndId>> tcSlowM = topology.getTester().streamContents(slowM);
+ Condition<List<TimeAndId>> tcProcessed = topology.getTester().streamContents(processed);
+ complete(topology, tcSlowMCount);
+
+ System.out.println(String.format("testPressureRelieverContinuous() fastCnt:%d slowCnt:%d",
+ tcProcessed.getResult().size(), tcSlowM.getResult().size()));
+ System.out.println("slow: "+tcSlowM.getResult());
+
+ // No lost tuples in the fast path (successive Ids, starting @ 1)
+ assertEquals("fastpath tuples dropped",
+ tcProcessed.getResult().size(),
+ tcProcessed.getResult().get(tcProcessed.getResult().size()-1).id);
+
+ // No dup tuples in the fast path
+ Set<TimeAndId> uniqRaw = new HashSet<>(tcProcessed.getResult());
+ assertEquals("fastpath tuples duplicated", tcProcessed.getResult().size(), uniqRaw.size());
+
+ // fastpath count should be roughly 20x the slow delayed/relieved count
+ assertTrue("rawCnt:"+tcProcessed.getResult().size()+" slowMCnt:"+tcSlowM.getResult().size(),
+ tcProcessed.getResult().size() >= 15 * +tcSlowM.getResult().size());
+
+ // slow should process roughly every 20th tuple... not successive ones
+ TimeAndId prevId = null;
+ for (TimeAndId id : tcSlowM.getResult()) {
+ if (prevId == null) {
+ // should have processed the 1st tuple
+ assertEquals("slow firstId", 1, id.id);
+ }
+ else {
+ // seems like this could be sensitive to host load
+ assertTrue("slow ids prevId:"+prevId+" id:"+id,
+ id.id >= prevId.id + 15
+ && id.id <= prevId.id + 25);
+ }
+ prevId = id;
+ }
+
+ // every slow tuple should be processed near instantaneously - shouldn't wait
+ // long in the queue.
+ for (TimeAndId id : tcSlowM.getResult()) {
+ assertTrue("slow delays prevId:"+prevId+" id:"+id,
+ id.ms <= 300); // 200ms consumer processing + up to %50 of that waiting
+ }
+ }
+
+ @Test
public void testValveState() throws Exception {
Valve<Integer> valve = new Valve<>();
assertTrue(valve.isOpen());
[09/50] [abbrv] incubator-edgent git commit: fix previous
PlumbingTest change
Posted by dl...@apache.org.
fix previous PlumbingTest change
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/fcfaf778
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/fcfaf778
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/fcfaf778
Branch: refs/heads/develop
Commit: fcfaf7785368ac1465a62e96f4d9abafb1c409a5
Parents: 56cb7a4
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Oct 24 15:42:12 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Oct 24 15:42:12 2017 -0400
----------------------------------------------------------------------
.../test/java/org/apache/edgent/test/topology/PlumbingTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/fcfaf778/api/topology/src/test/java/org/apache/edgent/test/topology/PlumbingTest.java
----------------------------------------------------------------------
diff --git a/api/topology/src/test/java/org/apache/edgent/test/topology/PlumbingTest.java b/api/topology/src/test/java/org/apache/edgent/test/topology/PlumbingTest.java
index 48a498b..6fe2e2a 100644
--- a/api/topology/src/test/java/org/apache/edgent/test/topology/PlumbingTest.java
+++ b/api/topology/src/test/java/org/apache/edgent/test/topology/PlumbingTest.java
@@ -615,7 +615,7 @@ public abstract class PlumbingTest extends TopologyAbstractTest {
// Verify the balancing seemed to work.
// On loaded systems we've seen eCnt:37 oCnt:23. Settle for expEvenCnt +- 15%
- double thresholdCnt = expEvenChCnt * 0.15;
+ int thresholdCnt = (int) (expEvenChCnt * 0.15);
int evenChCnt = 0;
for (int ch = 0; ch < width; ch++) {
assertTrue("ch:"+ch, chCounts[ch].get() != 0);
[45/50] [abbrv] incubator-edgent git commit: merge in
origin/feature/maven
Posted by dl...@apache.org.
merge in origin/feature/maven
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/9423f7a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/9423f7a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/9423f7a9
Branch: refs/heads/develop
Commit: 9423f7a9233283bf45b6a77d2e87b266e5732bf6
Parents: 4e7f32e ba5d99e
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Oct 31 12:59:49 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Oct 31 12:59:49 2017 -0400
----------------------------------------------------------------------
Jenkinsfile | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[50/50] [abbrv] incubator-edgent git commit: merge
origin/features/maven
Posted by dl...@apache.org.
merge origin/features/maven
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/9ad48657
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/9ad48657
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/9ad48657
Branch: refs/heads/develop
Commit: 9ad48657af74b64a3f3c6eb7ba4c3721a686322f
Parents: e9c7596 902ae4e
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Nov 1 15:05:34 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Nov 1 15:05:34 2017 -0400
----------------------------------------------------------------------
Jenkinsfile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
[03/50] [abbrv] incubator-edgent git commit: - Re added the original
d3.legend.js version (however in a subdirectory) to get things working again.
Posted by dl...@apache.org.
- Re added the original d3.legend.js version (however in a subdirectory) to get things working again.
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/20a9eef9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/20a9eef9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/20a9eef9
Branch: refs/heads/develop
Commit: 20a9eef9d4600c949e978e08ba9d746acf259b5c
Parents: 3be8c49
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Tue Oct 24 08:47:30 2017 +0200
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Tue Oct 24 08:47:30 2017 +0200
----------------------------------------------------------------------
console/servlets/pom.xml | 23 ++-
.../main/webapp/js/ext/d3.legend/d3.legend.js | 191 +++++++++++++++++++
2 files changed, 212 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/20a9eef9/console/servlets/pom.xml
----------------------------------------------------------------------
diff --git a/console/servlets/pom.xml b/console/servlets/pom.xml
index db097fa..3ceeaec 100644
--- a/console/servlets/pom.xml
+++ b/console/servlets/pom.xml
@@ -47,6 +47,25 @@
</resources>
<plugins>
<plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>license-check</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludes combine.children="append">
+ <!-- TODO: Still got one unlicensed file in there ... -->
+ <exclude>src/main/webapp/js/ext/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<configuration>
@@ -112,7 +131,7 @@
</executions>
</plugin>
<!-- Download JavaScript form GitHub -->
- <plugin>
+ <!--plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<version>1.2.1</version>
@@ -130,7 +149,7 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin-->
<plugin>
<!-- Included to enable "mvn tomcat:run" and have a running
console server without using the server jar.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/20a9eef9/console/servlets/src/main/webapp/js/ext/d3.legend/d3.legend.js
----------------------------------------------------------------------
diff --git a/console/servlets/src/main/webapp/js/ext/d3.legend/d3.legend.js b/console/servlets/src/main/webapp/js/ext/d3.legend/d3.legend.js
new file mode 100644
index 0000000..b225804
--- /dev/null
+++ b/console/servlets/src/main/webapp/js/ext/d3.legend/d3.legend.js
@@ -0,0 +1,191 @@
+// d3.legend.js
+// (C) 2012 ziggy.jonsson.nyc@gmail.com
+// MIT licence
+
+(function() {
+ d3.legend = function(g, chartSvg, pItems, legendTitle) {
+ g.each(function() {
+ var g= d3.select(this);
+ var items = {};
+ var svg = !chartSvg ? d3.select(g.property("nearestViewportElement")) : chartSvg;
+ var isTupleFlowLegend = false;
+ var isRect = function(d) {
+ var k = d.key.toUpperCase();
+ return k.startsWith("COUNTEROP")
+ || k.startsWith("STREAMSCOPE");
+ };
+
+ var legendPadding = g.attr("data-style-padding") || 5,
+ lTitleItems = g.selectAll(".legend-title-items").data([true]),
+ lb = g.selectAll(".legend-box").data([true]),
+ li = g.selectAll(".legend-items").data([true])
+
+ lTitleItems.enter().append("g").classed("legend-title-items", true)
+ lb.enter().append("rect").classed("legend-box",true)
+ liG = li.enter().append("g").classed("legend-items",true)
+
+ if (pItems) {
+ pItems.forEach(function(p){
+ if (p.idx !== undefined) {
+ items[p.name] = {color: p.fill, idx: p.idx};
+ isTupleFlowLegend = true;
+ } else {
+ items[p.name] = {color: p.fill};
+ isTupleFlowLegend = false;
+ }
+ });
+ } else {
+ svg.selectAll("[data-legend]").each(function() {
+ var self = d3.select(this);
+ items[self.attr("data-legend")] = {
+ pos : self.attr("data-legend-pos") || this.getBBox().y,
+ color : self.attr("data-legend-color") != undefined ? self.attr("data-legend-color") : self.style("fill") != 'none' ? self.style("fill") : self.style("stroke")
+ }
+ });
+ }
+
+ if (isTupleFlowLegend)
+ items = d3.entries(items).sort(
+ function(a,b) {
+ if (a.value.idx < b.value.idx) {
+ return -1;
+ } else if (a.value.idx > b.value.idx) {
+ return 1;
+ } else {
+ return 0;
+ }
+ });
+ else {
+ items = d3.entries(items).sort(
+ function(a,b) {
+ // rect before circle - graphic positioning code below
+ var ra = isRect(a);
+ var rb = isRect(b);
+ if (ra && !rb) {
+ return -1;
+ } else if (!ra && rb) {
+ return 1;
+ }
+ if (a.key < b.key) {
+ return -1;
+ } else if (a.key > b.key) {
+ return 1;
+ } else {
+ return 0;
+ }
+ });
+ }
+
+ li.selectAll("text")
+ .data(items,function(d) {
+ return d.key}
+ )
+ .call(function(d) { d.enter().append("text")})
+ .call(function(d) { d.exit().remove()})
+ .attr("y",function(d,i) { return i+"em"})
+ .attr("x","1.5em")
+ .text(function(d) {
+ return d.key;
+ })
+
+ var legendOpacity = 0.7;
+ if (legendTitle && legendTitle === "Stream tags") {
+ legendOpacity = 1.0;
+ li.selectAll("rect")
+ .data(items,function(d) {
+ return d.key}
+ )
+ .call(function(d) { d.enter().append("rect")})
+ .call(function(d) { d.exit().remove()})
+ .attr("y", function(d,i) {
+ return i-0.75+ "em"})
+ .attr("width", 10)
+ .attr("height", 8)
+ .style("fill",function(d) {
+ return d.value.color === "#c7c7c7" ? "#008080" : d.value.color;
+ })
+ .style("stroke", "none")
+ .style("fill-opacity", legendOpacity);
+ } else if (legendTitle && legendTitle === "Oplet kind" || legendTitle === "Tuple count"){
+ liG.selectAll("g")
+ .data(items, function(d) {
+ return d.key;
+ })
+ .enter()
+ .append(function(d) {
+ if (isRect(d)) {
+ return document.createElementNS(d3.ns.prefix.svg, 'rect');
+ } else {
+ return document.createElementNS(d3.ns.prefix.svg, 'circle');
+ }
+ });
+
+ // rects before circles
+ var count = 0;
+ li.selectAll("rect")
+ .attr("x", -3)
+ .attr("y", function(d,i) {
+ count++;
+ return i-0.75+ "em"})
+ .attr("width", legendTitle === "Oplet kind" ? 8 : 10)
+ .attr("height", 8)
+ .style("fill",function(d) {
+ return d.value.color
+ })
+ .style("stroke", "none")
+ .style("fill-opacity", legendOpacity);
+
+ li.selectAll("circle")
+ .attr("cy",function(d,i) {
+ return (i+count)-0.25+"em"})
+ .attr("cx",0)
+ .attr("r","0.4em")
+ .style("fill",function(d) {
+ return d.value.color
+ })
+ .style("fill-opacity", legendOpacity);
+
+ } else {
+ li.selectAll("circle")
+ .data(items,function(d) {
+ return d.key}
+ )
+ .call(function(d) { d.enter().append("circle")})
+ .call(function(d) { d.exit().remove()})
+ .attr("cy",function(d,i) { return i-0.25+"em"})
+ .attr("cx",0)
+ .attr("r","0.4em")
+ .style("fill",function(d) {
+ return d.value.color
+ })
+ .style("fill-opacity", legendOpacity);
+ }
+ // Reposition and resize the box
+ var lbbox = li[0][0].getBBox();
+ lb.attr("x",(lbbox.x-legendPadding))
+ .attr("y",(lbbox.y-legendPadding))
+ .attr("height",(lbbox.height+2*legendPadding))
+ .attr("width",((lbbox.width+12) + 2*legendPadding));
+
+ lTitleItems.attr("x", 0)
+ .attr("y", (lbbox.y - legendPadding - 15))
+ .attr("height",15)
+ .attr("width",(lbbox.width+2*legendPadding));
+ if (legendTitle) {
+ lTitleItems.selectAll("text")
+ .data([""],function(d) {
+ return legendTitle;
+ })
+ .call(function(d) { d.enter().append("text")})
+ .call(function(d) { d.exit().remove()})
+ .attr("y",function(d,i) { return "-2em"})
+ .attr("x",(lbbox.x-legendPadding))
+ .text(function(d) {
+ return legendTitle;
+ });
+ }
+
+ })
+ return g
+ }
+})()
[23/50] [abbrv] incubator-edgent git commit: ugh fix prior sloppy
change to WindowTest
Posted by dl...@apache.org.
ugh fix prior sloppy change to WindowTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/458471dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/458471dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/458471dd
Branch: refs/heads/develop
Commit: 458471dd4469caf10264388c33dea5f84df36266
Parents: ca75e6a
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Thu Oct 26 18:31:20 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Thu Oct 26 18:31:20 2017 -0400
----------------------------------------------------------------------
.../src/test/java/org/apache/edgent/test/window/WindowTest.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/458471dd/api/window/src/test/java/org/apache/edgent/test/window/WindowTest.java
----------------------------------------------------------------------
diff --git a/api/window/src/test/java/org/apache/edgent/test/window/WindowTest.java b/api/window/src/test/java/org/apache/edgent/test/window/WindowTest.java
index ca2863d..92002f7 100644
--- a/api/window/src/test/java/org/apache/edgent/test/window/WindowTest.java
+++ b/api/window/src/test/java/org/apache/edgent/test/window/WindowTest.java
@@ -486,7 +486,6 @@ public class WindowTest {
numTuples += batches.get(batches.size() -1).size();
assertEquals("Number of batch tuples", count.get(), numTuples);
- assertEquals("Number of batches", MAX_TUP_CNT/100, batches.size());
assertTrue("Number of batches exp:"+MAX_TUP_CNT/100+" got:"+batches.size(),
withinToleranceAmt((double)MAX_TUP_CNT/100, (double)batches.size(), 1)); // +/- 1
}
[30/50] [abbrv] incubator-edgent git commit: remove all gradle
tooling artifacts and "exclusions" from the repo
Posted by dl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/kafka_2.10-0.8.2.2.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/kafka_2.10-0.8.2.2.AL-2.0 b/licenses/binary-release/kafka_2.10-0.8.2.2.AL-2.0
deleted file mode 100644
index d645695..0000000
--- a/licenses/binary-release/kafka_2.10-0.8.2.2.AL-2.0
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/kafka_2.10-0.8.2.2.NOTICE
----------------------------------------------------------------------
diff --git a/licenses/binary-release/kafka_2.10-0.8.2.2.NOTICE b/licenses/binary-release/kafka_2.10-0.8.2.2.NOTICE
deleted file mode 100644
index ac656d3..0000000
--- a/licenses/binary-release/kafka_2.10-0.8.2.2.NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Kafka
-Copyright 2012 The Apache Software Foundation.
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/log4j-1.2.16.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/log4j-1.2.16.AL-2.0 b/licenses/binary-release/log4j-1.2.16.AL-2.0
deleted file mode 100644
index 6279e52..0000000
--- a/licenses/binary-release/log4j-1.2.16.AL-2.0
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright 1999-2005 The Apache Software Foundation
-
- 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.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/log4j-1.2.16.NOTICE
----------------------------------------------------------------------
diff --git a/licenses/binary-release/log4j-1.2.16.NOTICE b/licenses/binary-release/log4j-1.2.16.NOTICE
deleted file mode 100644
index 0375732..0000000
--- a/licenses/binary-release/log4j-1.2.16.NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache log4j
-Copyright 2007 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/log4j-1.2.17.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/log4j-1.2.17.AL-2.0 b/licenses/binary-release/log4j-1.2.17.AL-2.0
deleted file mode 100644
index 6279e52..0000000
--- a/licenses/binary-release/log4j-1.2.17.AL-2.0
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright 1999-2005 The Apache Software Foundation
-
- 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.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/log4j-1.2.17.NOTICE
----------------------------------------------------------------------
diff --git a/licenses/binary-release/log4j-1.2.17.NOTICE b/licenses/binary-release/log4j-1.2.17.NOTICE
deleted file mode 100644
index 0375732..0000000
--- a/licenses/binary-release/log4j-1.2.17.NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache log4j
-Copyright 2007 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/metrics-core-2.2.0.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/metrics-core-2.2.0.AL-2.0 b/licenses/binary-release/metrics-core-2.2.0.AL-2.0
deleted file mode 100644
index e4ba404..0000000
--- a/licenses/binary-release/metrics-core-2.2.0.AL-2.0
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright 2010-2012 Coda Hale and Yammer, 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.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/metrics-core-2.2.0.NOTICE
----------------------------------------------------------------------
diff --git a/licenses/binary-release/metrics-core-2.2.0.NOTICE b/licenses/binary-release/metrics-core-2.2.0.NOTICE
deleted file mode 100644
index 9c76994..0000000
--- a/licenses/binary-release/metrics-core-2.2.0.NOTICE
+++ /dev/null
@@ -1,11 +0,0 @@
-Metrics
-Copyright 2010-2012 Coda Hale and Yammer, Inc.
-
-This product includes software developed by Coda Hale and Yammer, Inc.
-
-This product includes code derived from the JSR-166 project (ThreadLocalRandom), which was released
-with the following comments:
-
- Written by Doug Lea with assistance from members of JCP JSR-166
- Expert Group and released to the public domain, as explained at
- http://creativecommons.org/publicdomain/zero/1.0/
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/metrics-core-3.1.2.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/metrics-core-3.1.2.AL-2.0 b/licenses/binary-release/metrics-core-3.1.2.AL-2.0
deleted file mode 100644
index e4ba404..0000000
--- a/licenses/binary-release/metrics-core-3.1.2.AL-2.0
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright 2010-2012 Coda Hale and Yammer, 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.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/metrics-core-3.1.2.NOTICE
----------------------------------------------------------------------
diff --git a/licenses/binary-release/metrics-core-3.1.2.NOTICE b/licenses/binary-release/metrics-core-3.1.2.NOTICE
deleted file mode 100644
index 4fe83de..0000000
--- a/licenses/binary-release/metrics-core-3.1.2.NOTICE
+++ /dev/null
@@ -1,11 +0,0 @@
-Metrics
-Copyright 2010-2013 Coda Hale and Yammer, Inc.
-
-This product includes software developed by Coda Hale and Yammer, Inc.
-
-This product includes code derived from the JSR-166 project (ThreadLocalRandom, Striped64,
-LongAdder), which was released with the following comments:
-
- Written by Doug Lea with assistance from members of JCP JSR-166
- Expert Group and released to the public domain, as explained at
- http://creativecommons.org/publicdomain/zero/1.0/
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/mqttv3-1.1.0.EDL-1.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/mqttv3-1.1.0.EDL-1.0 b/licenses/binary-release/mqttv3-1.1.0.EDL-1.0
deleted file mode 100644
index 6555a44..0000000
--- a/licenses/binary-release/mqttv3-1.1.0.EDL-1.0
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p><em>December 9, 2013</em></p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL") and Eclipse Distribution License Version 1.0 ("EDL").
-A copy of the EPL is available at
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
-and a copy of the EDL is available at
-<a href="http://www.eclipse.org/org/documents/edl-v10.php">http://www.eclipse.org/org/documents/edl-v10.php</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/scala-2.10.4.BSD
----------------------------------------------------------------------
diff --git a/licenses/binary-release/scala-2.10.4.BSD b/licenses/binary-release/scala-2.10.4.BSD
deleted file mode 100644
index 4daedef..0000000
--- a/licenses/binary-release/scala-2.10.4.BSD
+++ /dev/null
@@ -1,63 +0,0 @@
-Scala is licensed under the [BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause).
-
-## Scala License
-
-Copyright (c) 2002-2013 EPFL
-
-Copyright (c) 2011-2013 Typesafe, Inc.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of the EPFL nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Other Licenses
-
-This software includes projects with the following licenses,
-which are also included in the `licenses/` directory:
-
-### [Apache License](http://www.apache.org/licenses/LICENSE-2.0.html)
-This license is used by the following third-party libraries:
- * jansi
-
-### [BSD License](http://www.opensource.org/licenses/bsd-license.php)
-This license is used by the following third-party libraries:
- * jline
-
-### [BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause)
-This license is used by the following third-party libraries:
- * asm
-
-### [MIT License](http://www.opensource.org/licenses/MIT)
-This license is used by the following third-party libraries:
- * jquery
- * jquery-ui
- * jquery-layout
- * sizzle
- * tools tooltip
-
-### Public Domain
-The following libraries are freely available in the public domain:
- * forkjoin
-
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/slf4j1.7.12.MIT
----------------------------------------------------------------------
diff --git a/licenses/binary-release/slf4j1.7.12.MIT b/licenses/binary-release/slf4j1.7.12.MIT
deleted file mode 100644
index 346d556..0000000
--- a/licenses/binary-release/slf4j1.7.12.MIT
+++ /dev/null
@@ -1,22 +0,0 @@
- Copyright (c) 2004-2013 QOS.ch
- All rights reserved.
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/watson-iot-0.2.2.EPL-1.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/watson-iot-0.2.2.EPL-1.0 b/licenses/binary-release/watson-iot-0.2.2.EPL-1.0
deleted file mode 100644
index 5032843..0000000
--- a/licenses/binary-release/watson-iot-0.2.2.EPL-1.0
+++ /dev/null
@@ -1,203 +0,0 @@
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
-LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
-CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation
- distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
- i) changes to the Program, and
- ii) additions to the Program;
-
- where such changes and/or additions to the Program originate from and are
- distributed by that particular Contributor. A Contribution 'originates'
- from a Contributor if it was added to the Program by such Contributor
- itself or anyone acting on such Contributor's behalf. Contributions do not
- include additions to the Program which: (i) are separate modules of
- software distributed in conjunction with the Program under their own
- license agreement, and (ii) are not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are
-necessarily infringed by the use or sale of its Contribution alone or when
-combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this
-Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement,
-including all Contributors.
-
-2. GRANT OF RIGHTS
- a) Subject to the terms of this Agreement, each Contributor hereby grants
- Recipient a non-exclusive, worldwide, royalty-free copyright license to
- reproduce, prepare derivative works of, publicly display, publicly
- perform, distribute and sublicense the Contribution of such Contributor,
- if any, and such derivative works, in source code and object code form.
- b) Subject to the terms of this Agreement, each Contributor hereby grants
- Recipient a non-exclusive, worldwide, royalty-free patent license under
- Licensed Patents to make, use, sell, offer to sell, import and otherwise
- transfer the Contribution of such Contributor, if any, in source code and
- object code form. This patent license shall apply to the combination of
- the Contribution and the Program if, at the time the Contribution is
- added by the Contributor, such addition of the Contribution causes such
- combination to be covered by the Licensed Patents. The patent license
- shall not apply to any other combinations which include the Contribution.
- No hardware per se is licensed hereunder.
- c) Recipient understands that although each Contributor grants the licenses
- to its Contributions set forth herein, no assurances are provided by any
- Contributor that the Program does not infringe the patent or other
- intellectual property rights of any other entity. Each Contributor
- disclaims any liability to Recipient for claims brought by any other
- entity based on infringement of intellectual property rights or
- otherwise. As a condition to exercising the rights and licenses granted
- hereunder, each Recipient hereby assumes sole responsibility to secure
- any other intellectual property rights needed, if any. For example, if a
- third party patent license is required to allow Recipient to distribute
- the Program, it is Recipient's responsibility to acquire that license
- before distributing the Program.
- d) Each Contributor represents that to its knowledge it has sufficient
- copyright rights in its Contribution, if any, to grant the copyright
- license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under
-its own license agreement, provided that:
-
- a) it complies with the terms and conditions of this Agreement; and
- b) its license agreement:
- i) effectively disclaims on behalf of all Contributors all warranties
- and conditions, express and implied, including warranties or
- conditions of title and non-infringement, and implied warranties or
- conditions of merchantability and fitness for a particular purpose;
- ii) effectively excludes on behalf of all Contributors all liability for
- damages, including direct, indirect, special, incidental and
- consequential damages, such as lost profits;
- iii) states that any provisions which differ from this Agreement are
- offered by that Contributor alone and not by any other party; and
- iv) states that source code for the Program is available from such
- Contributor, and informs licensees how to obtain it in a reasonable
- manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
- a) it must be made available under this Agreement; and
- b) a copy of this Agreement must be included with each copy of the Program.
- Contributors may not remove or alter any copyright notices contained
- within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution,
-if
-any, in a manner that reasonably allows subsequent Recipients to identify the
-originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with
-respect to end users, business partners and the like. While this license is
-intended to facilitate the commercial use of the Program, the Contributor who
-includes the Program in a commercial product offering should do so in a manner
-which does not create potential liability for other Contributors. Therefore,
-if a Contributor includes the Program in a commercial product offering, such
-Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
-every other Contributor ("Indemnified Contributor") against any losses,
-damages and costs (collectively "Losses") arising from claims, lawsuits and
-other legal actions brought by a third party against the Indemnified
-Contributor to the extent caused by the acts or omissions of such Commercial
-Contributor in connection with its distribution of the Program in a commercial
-product offering. The obligations in this section do not apply to any claims
-or Losses relating to any actual or alleged intellectual property
-infringement. In order to qualify, an Indemnified Contributor must:
-a) promptly notify the Commercial Contributor in writing of such claim, and
-b) allow the Commercial Contributor to control, and cooperate with the
-Commercial Contributor in, the defense and any related settlement
-negotiations. The Indemnified Contributor may participate in any such claim at
-its own expense.
-
-For example, a Contributor might include the Program in a commercial product
-offering, Product X. That Contributor is then a Commercial Contributor. If
-that Commercial Contributor then makes performance claims, or offers
-warranties related to Product X, those performance claims and warranties are
-such Commercial Contributor's responsibility alone. Under this section, the
-Commercial Contributor would have to defend claims against the other
-Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
-Recipient is solely responsible for determining the appropriateness of using
-and distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to the
-risks and costs of program errors, compliance with applicable laws, damage to
-or loss of data, programs or equipment, and unavailability or interruption of
-operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
-LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY
-OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of the
-remainder of the terms of this Agreement, and without further action by the
-parties hereto, such provision shall be reformed to the minimum extent
-necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Program itself
-(excluding combinations of the Program with other software or hardware)
-infringes such Recipient's patent(s), then such Recipient's rights granted
-under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to
-comply with any of the material terms or conditions of this Agreement and does
-not cure such failure in a reasonable period of time after becoming aware of
-such noncompliance. If all Recipient's rights under this Agreement terminate,
-Recipient agrees to cease use and distribution of the Program as soon as
-reasonably practicable. However, Recipient's obligations under this Agreement
-and any licenses granted by Recipient relating to the Program shall continue
-and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in
-order to avoid inconsistency the Agreement is copyrighted and may only be
-modified in the following manner. The Agreement Steward reserves the right to
-publish new versions (including revisions) of this Agreement from time to
-time. No one other than the Agreement Steward has the right to modify this
-Agreement. The Eclipse Foundation is the initial Agreement Steward. The
-Eclipse Foundation may assign the responsibility to serve as the Agreement
-Steward to a suitable separate entity. Each new version of the Agreement will
-be given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version of the
-Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly
-stated in Sections 2(a) and 2(b) above, Recipient receives no rights or
-licenses to the intellectual property of any Contributor under this Agreement,
-whether expressly, by implication, estoppel or otherwise. All rights in the
-Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the
-intellectual property laws of the United States of America. No party to this
-Agreement will bring a legal action under this Agreement more than one year
-after the cause of action arose. Each party waives its rights to a jury trial in
-any resulting litigation.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/websocket-api-9.3.6.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/websocket-api-9.3.6.AL-2.0 b/licenses/binary-release/websocket-api-9.3.6.AL-2.0
deleted file mode 100644
index e13b48d..0000000
--- a/licenses/binary-release/websocket-api-9.3.6.AL-2.0
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>19 May, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). The Content is dual licensed and is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL") as well as the Apache Software License Version 2.0. A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. A copy of the ASL is available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html">http://www.apache.org/licenses/LICENSE-2.0.html</a>. For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-<p><b>jetty-util</b> artifact only:<br/><br/>The UnixCrypt.java code implements the one way cryptography used by
-Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
-modified April 2001 by Iris Van den Broeke, Daniel Deville.
-Permission to use, copy, modify and distribute UnixCrypt
-for non-commercial or commercial purposes and without fee is
-granted provided that the copyright notice appears in all copies.</p>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/websocket-client-9.3.6.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/websocket-client-9.3.6.AL-2.0 b/licenses/binary-release/websocket-client-9.3.6.AL-2.0
deleted file mode 100644
index e13b48d..0000000
--- a/licenses/binary-release/websocket-client-9.3.6.AL-2.0
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>19 May, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). The Content is dual licensed and is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL") as well as the Apache Software License Version 2.0. A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. A copy of the ASL is available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html">http://www.apache.org/licenses/LICENSE-2.0.html</a>. For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-<p><b>jetty-util</b> artifact only:<br/><br/>The UnixCrypt.java code implements the one way cryptography used by
-Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
-modified April 2001 by Iris Van den Broeke, Daniel Deville.
-Permission to use, copy, modify and distribute UnixCrypt
-for non-commercial or commercial purposes and without fee is
-granted provided that the copyright notice appears in all copies.</p>
-
-</body>
-</html>
[47/50] [abbrv] incubator-edgent git commit: doc tweaks
Posted by dl...@apache.org.
doc tweaks
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/709fb97e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/709fb97e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/709fb97e
Branch: refs/heads/develop
Commit: 709fb97e31aba65b9a5f43257fb801d25b331b00
Parents: bd059c5
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Nov 1 09:20:06 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Nov 1 09:20:06 2017 -0400
----------------------------------------------------------------------
DEVELOPMENT.md | 6 ++++++
samples/APPLICATION_DEVELOPMENT.md | 10 ++++------
samples/README.md | 10 ++++++----
3 files changed, 16 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/709fb97e/DEVELOPMENT.md
----------------------------------------------------------------------
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 221f252..5f1c8c8 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -42,6 +42,12 @@ The Ant and Gradle tooling is no longer functional.
It's recommended that developers of Edgent create a new workspace instead of
reusing current gradle-based Edgent workspaces.
+## Branches
+
+The `develop` branch is used for development. Jenkins is setup to build this branch and publish internal SNAPSHOT build results to the ASF Nexus SNAPSHOTS Repository (https://repository.apache.org/content/repositories/snapshots).
+
+The `master` branch contains released code. Releases are published to the ASF Nexus Releases Repository (https://repository.apache.org/content/repositories/releases). The Releases repository is automatically mirrored to the Maven Central Repository.
+
## Setup
Once you have forked the repository and created your local clone you need to download
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/709fb97e/samples/APPLICATION_DEVELOPMENT.md
----------------------------------------------------------------------
diff --git a/samples/APPLICATION_DEVELOPMENT.md b/samples/APPLICATION_DEVELOPMENT.md
index eb6e2fb..9e01074 100644
--- a/samples/APPLICATION_DEVELOPMENT.md
+++ b/samples/APPLICATION_DEVELOPMENT.md
@@ -19,9 +19,11 @@
To develop Edgent applications you will utilize the
Edgent SDK/runtime jars and package your application
-artifacts for deploying to an edge device for execution.
+artifacts for deploying to an edge device or gateway for execution.
-The Edgent SDK/runtime jars are published to maven-central.
+The Edgent SDK/runtime jars are published to the
+[ASF Nexus Repository](https://repository.apache.org/content/repositories/releases/)
+and the Maven Central Repository.
Alternatively, you can build the Edgent SDK yourself from a source release
and the resulting jars will be added to your local maven repository.
@@ -129,10 +131,6 @@ for a tool to get a copy of the Edgent jars.
The bundle is a standalone entity containing
everything that's needed to run your application.
-
-The bundle contains the application's jar
-and the application's dependent Edgent jars and their
-transitive dependencies.
The bundle is copied to the device and unpacked.
A run script forms the appropriate `CLASSPATH`
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/709fb97e/samples/README.md
----------------------------------------------------------------------
diff --git a/samples/README.md b/samples/README.md
index e39fac0..09079d4 100644
--- a/samples/README.md
+++ b/samples/README.md
@@ -123,7 +123,7 @@ and used.
If you want to use Eclipse to clone your fork, use the
Eclipse Git Team Provider plugin
-1. From the *File* menu, select *Import...*
+1. From the Eclipse *File* menu, select *Import...*
2. From the *Git* folder, select *Projects from Git* and click *Next*
3. Select *Clone URI* to clone the remote repository. Click *Next*.
+ In the *Location* section, enter the URI of your fork in the *URI* field
@@ -143,7 +143,7 @@ Once you have cloned the Git repository to your machine or are working
from an unpacked samples source release bundle, import the Maven projects
into your workspace
-1. From the *File* menu, select *Import...*
+1. From the Eclipse *File* menu, select *Import...*
2. From the *Maven* folder, select *Existing Maven Projects* and click *Next*
+ browse to the `samples` directory in the clone or source release directory
and select it. A hierarchy of samples projects / pom.xml files will be
@@ -160,8 +160,10 @@ Eclipse Maven or Git Team Provider.
Once the samples projects have been imported you can run them from
Eclipse in the usual manner. E.g.,
-1. open the `HelloEdgent.java` sample
-2. click on *Run*, *Run As*, then *Java application*.
+1. From the Eclipse *Navigate* menu, select *Open Type*
+ + enter type type name `HelloEdgent` and click *OK*
+2. right click on the `HelloEdgent` class name and from the context menu
+ + click on *Run As*, then *Java application*.
`HelloEdgent` runs and prints to the Console view.
[42/50] [abbrv] incubator-edgent git commit: - Give the multiple
steps another try
Posted by dl...@apache.org.
- Give the multiple steps another try
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/f9a12800
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/f9a12800
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/f9a12800
Branch: refs/heads/develop
Commit: f9a12800eaa63f85fd8c99bd1d385064c7dc529f
Parents: f1adc51
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Tue Oct 31 15:50:18 2017 +0100
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Tue Oct 31 15:50:18 2017 +0100
----------------------------------------------------------------------
Jenkinsfile | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/f9a12800/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index f9b081c..c8c49a5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,15 +29,13 @@ node('ubuntu') {
env.JAVA_HOME="${tool 'JDK 1.8 (latest)'}"
env.PATH="${env.JAVA_HOME}/bin:${env.PATH}"
- def workspace = pwd()
-
// Make sure the feature branches don't change the SNAPSHOTS in Nexus.
def mavenGoal = "install"
def mavenLocalRepo = ""
if(env.BRANCH_NAME == 'develop') {
mavenGoal = "deploy"
} else {
- mavenLocalRepo = "-Dmaven.repo.local=${workspace)@script/.repository"
+ mavenLocalRepo = "-Dmaven.repo.local=${env.WORKSPACE)/.repository"
}
def mavenFailureMode = "" // consider "--fail-at-end"? Odd ordering side effects?
[39/50] [abbrv] incubator-edgent git commit: - Undid the split into
several steps (Seems the files aren't available from another step)
Posted by dl...@apache.org.
- Undid the split into several steps (Seems the files aren't available from another step)
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/29772615
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/29772615
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/29772615
Branch: refs/heads/develop
Commit: 297726159b1f117a0429ab7d1a3f8b404bc64732
Parents: 6044419
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Tue Oct 31 13:11:48 2017 +0100
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Tue Oct 31 13:11:48 2017 +0100
----------------------------------------------------------------------
Jenkinsfile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/29772615/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 38c6849..aef183c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -53,24 +53,24 @@ node('ubuntu') {
stage ('Build Edgent') {
echo 'Building Edgent'
sh "${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-android,platform-java7,distribution,toolchain -Djava8.home=${env.JAVA_HOME} -Dedgent.build.ci=true clean ${mavenGoal} sonar:sonar site:site"
- }
+/* }
- stage ('Build Samples') {
+ stage ('Build Samples') {*/
echo 'Building samples'
sh "cd samples; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} clean package"
sh "cd samples/topology; ./run-sample.sh HelloEdgent"
sh "cd samples; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-java7 clean package"
sh "cd samples/topology; ./run-sample.sh HelloEdgent"
- }
+/* }
- stage ('Build Templates') {
+ stage ('Build Templates') {*/
echo 'Building templates'
sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} clean package; ./run-app.sh"
sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-java7 clean package; ./run-app.sh"
sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-android clean package; ./run-app.sh"
- }
+/* }
- stage ('Verify get-engent-jars') {
+ stage ('Verify get-engent-jars') {*/
echo 'Verifying get-edgent-jars'
sh "cd samples/get-edgent-jars; ./get-edgent-jars.sh"
}
[15/50] [abbrv] incubator-edgent git commit: change JDBC test to not
be TMO dependent on success
Posted by dl...@apache.org.
change JDBC test to not be TMO dependent on success
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/b7897e59
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/b7897e59
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/b7897e59
Branch: refs/heads/develop
Commit: b7897e595072e2c4ae6a084a1a356018c2e5cb44
Parents: e231c41
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Oct 25 14:50:10 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Oct 25 14:50:10 2017 -0400
----------------------------------------------------------------------
.../test/connectors/jdbc/JdbcStreamsTest.java | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/b7897e59/connectors/jdbc/src/test/java/org/apache/edgent/test/connectors/jdbc/JdbcStreamsTest.java
----------------------------------------------------------------------
diff --git a/connectors/jdbc/src/test/java/org/apache/edgent/test/connectors/jdbc/JdbcStreamsTest.java b/connectors/jdbc/src/test/java/org/apache/edgent/test/connectors/jdbc/JdbcStreamsTest.java
index 13ce2d1..a284340 100644
--- a/connectors/jdbc/src/test/java/org/apache/edgent/test/connectors/jdbc/JdbcStreamsTest.java
+++ b/connectors/jdbc/src/test/java/org/apache/edgent/test/connectors/jdbc/JdbcStreamsTest.java
@@ -20,6 +20,7 @@ package org.apache.edgent.test.connectors.jdbc;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue;
import java.lang.reflect.Method;
@@ -42,6 +43,7 @@ import org.apache.edgent.topology.TSink;
import org.apache.edgent.topology.TStream;
import org.apache.edgent.topology.Topology;
import org.apache.edgent.topology.plumbing.PlumbingStreams;
+import org.apache.edgent.topology.tester.Condition;
import org.junit.Test;
/**
@@ -464,6 +466,7 @@ public class JdbcStreamsTest extends ConnectorTestBase {
executionExcCnt.incrementAndGet();
return;
}
+ // don't ever expect to get here in this case
resultSet.next();
int id = resultSet.getInt("id");
String firstName = resultSet.getString("firstname");
@@ -475,10 +478,21 @@ public class JdbcStreamsTest extends ConnectorTestBase {
);
TStream<String> rcvd = rcvdPerson.map(person -> person.toString());
+ // Await completion on having received the correct number of exception.
+ // Then also verify that no non-exceptional results were received.
+ Condition<Object> tc = new Condition<Object>() {
+ public boolean valid() {
+ return executionExcCnt.get() == expectedExcCnt;
+ }
+ public Object getResult() { return executionExcCnt.get(); }
+ };
+ Condition<List<String>> rcvdContents = t.getTester().streamContents(rcvd, expected.toArray(new String[0]));
+
rcvd.sink(tuple -> System.out.println(
String.format("%s rcvd: %s", t.getName(), tuple)));
- completeAndValidate("", t, rcvd, SEC_TIMEOUT, expected.toArray(new String[0]));
+ complete(t, tc, SEC_TIMEOUT, TimeUnit.SECONDS);
assertEquals("executionExcCnt", expectedExcCnt, executionExcCnt.get());
+ assertTrue("rcvd: "+rcvdContents.getResult(), rcvdContents.valid());
}
@Test
[14/50] [abbrv] incubator-edgent git commit: change text file writer
tests to complete on condition instead of TMO
Posted by dl...@apache.org.
change text file writer tests to complete on condition instead of TMO
now generally completes quicker and isn't artifically slowed buy the
edgent.build.ci TMO multiplier change
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/e231c41a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/e231c41a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/e231c41a
Branch: refs/heads/develop
Commit: e231c41ac38ede13d9cdc20473f09e8ea402e323
Parents: d402541
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Oct 25 14:35:12 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Oct 25 14:35:12 2017 -0400
----------------------------------------------------------------------
.../file/FileStreamsTextFileWriterTest.java | 140 +++++++++++++------
1 file changed, 98 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/e231c41a/connectors/file/src/test/java/org/apache/edgent/test/connectors/file/FileStreamsTextFileWriterTest.java
----------------------------------------------------------------------
diff --git a/connectors/file/src/test/java/org/apache/edgent/test/connectors/file/FileStreamsTextFileWriterTest.java b/connectors/file/src/test/java/org/apache/edgent/test/connectors/file/FileStreamsTextFileWriterTest.java
index 4c0b9cb..fe3b54a 100644
--- a/connectors/file/src/test/java/org/apache/edgent/test/connectors/file/FileStreamsTextFileWriterTest.java
+++ b/connectors/file/src/test/java/org/apache/edgent/test/connectors/file/FileStreamsTextFileWriterTest.java
@@ -28,7 +28,6 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
import java.io.BufferedInputStream;
import java.io.BufferedReader;
@@ -318,6 +317,8 @@ public class FileStreamsTextFileWriterTest extends DirectTopologyTestBase {
// default writer policy
TSink<String> sink = FileStreams.textFileWriter(s, () -> basePath.toString());
+ // note, with only 4 tuples, default policy won't cycle (finalize the cur file)
+ // to make the expResults present until job stops (TMO)
completeAndValidateWriter(t, TMO_SEC, basePath, expResults);
assertNotNull(sink);
@@ -447,7 +448,10 @@ public class FileStreamsTextFileWriterTest extends DirectTopologyTestBase {
// The mechanisms of this test no longer work with the
// recent changes to bump the tmo 2x when edgent.build.ci=true.
// So disable while we continue to work on this.
- assumeTrue(!Boolean.getBoolean("edgent.build.ci"));
+ //
+ // With the general changes for completion condition checking,
+ // I think this has the chance of working again.
+// assumeTrue(!Boolean.getBoolean("edgent.build.ci"));
Topology t = newTopology("testRetainAgeBased");
@@ -458,9 +462,8 @@ public class FileStreamsTextFileWriterTest extends DirectTopologyTestBase {
// build expected results
int keepCnt = 2; // only keep the last n files with throttling, age,
- // and TMO_SEC
int ageSec = 5;
- long periodMsec = TimeUnit.SECONDS.toMillis(1);
+ long periodMsec = TimeUnit.SECONDS.toMillis(1); // age retention checking period
// net one tuple per file
List<List<String>> expResults = buildExpResults(lines, tuple -> true);
for (int i = 0; i < keepCnt; i++)
@@ -475,9 +478,11 @@ public class FileStreamsTextFileWriterTest extends DirectTopologyTestBase {
// With 4 tuples, throttleDelay=2sec, and ageSec=5
// t0=add-f1, t1, t2=add-f2, t3, t4=add-f3, t5-rm-f1, t6=add-f4, t7=rm-f2, t8, t9=rm-f3, ...
//
- // So we want to check somewhere around t8 (after t7 and definitely before t9)
- // so all 4 files were created and the first 2 have been aged out.
- // with complete delay = #files-1*throttle + TMO_SEC, should be 6+2 == t8.
+ // The expected results happen somewhere around t8 (after t7 and definitely before t9),
+ // all 4 files were created and the first 2 have been aged out.
+ //
+ // If the "completion condition" doesn't manage to get run during that interval
+ // the test will fail even if the code is working fine.
int throttleSec = 2;
TStream<String> s = PlumbingStreams.blockingThrottle(
@@ -511,7 +516,7 @@ public class FileStreamsTextFileWriterTest extends DirectTopologyTestBase {
IFileWriterPolicy<String> policy = new FileWriterPolicy<String>(
FileWriterFlushConfig.newImplicitConfig(),
- FileWriterCycleConfig.newCountBasedConfig(1000),
+ FileWriterCycleConfig.newCountBasedConfig(expResults.get(0).size()),
FileWriterRetentionConfig.newFileCountBasedConfig(10)
);
FileStreams.textFileWriter(s, () -> basePath.toString(), () -> policy);
@@ -536,7 +541,7 @@ public class FileStreamsTextFileWriterTest extends DirectTopologyTestBase {
IFileWriterPolicy<String> policy = new FileWriterPolicy<String>(
FileWriterFlushConfig.newCountBasedConfig(1), // every tuple
- FileWriterCycleConfig.newCountBasedConfig(1000), // all in 1 file
+ FileWriterCycleConfig.newCountBasedConfig(expResults.get(0).size()), // all in 1 file
FileWriterRetentionConfig.newFileCountBasedConfig(10)
);
FileStreams.textFileWriter(s, () -> basePath.toString(), () -> policy);
@@ -565,7 +570,7 @@ public class FileStreamsTextFileWriterTest extends DirectTopologyTestBase {
IFileWriterPolicy<String> policy = new FileWriterPolicy<String>(
FileWriterFlushConfig.newTimeBasedConfig(TimeUnit.MILLISECONDS.toMillis(250)),
- FileWriterCycleConfig.newCountBasedConfig(1000), // all in 1 file
+ FileWriterCycleConfig.newCountBasedConfig(expResults.get(0).size()), // all in 1 file
FileWriterRetentionConfig.newFileCountBasedConfig(10)
);
FileStreams.textFileWriter(s, () -> basePath.toString(), () -> policy);
@@ -592,7 +597,7 @@ public class FileStreamsTextFileWriterTest extends DirectTopologyTestBase {
IFileWriterPolicy<String> policy = new FileWriterPolicy<String>(
FileWriterFlushConfig.newPredicateBasedConfig(
tuple -> tuple.startsWith("1-") || tuple.startsWith("3-")),
- FileWriterCycleConfig.newCountBasedConfig(1000), // all in 1 file
+ FileWriterCycleConfig.newCountBasedConfig(expResults.get(0).size()), // all in 1 file
FileWriterRetentionConfig.newFileCountBasedConfig(10)
);
FileStreams.textFileWriter(s, () -> basePath.toString(), () -> policy);
@@ -698,7 +703,9 @@ public class FileStreamsTextFileWriterTest extends DirectTopologyTestBase {
// build expected results
// a tuple based config / predicate. in this case should end up with 3 files.
- Predicate<String> cycleIt = tuple -> tuple.startsWith("1-") || tuple.startsWith("3-");
+ // flush on the last tuple too to ensure the test completes before TMO.
+ Predicate<String> cycleIt = tuple -> tuple.startsWith("1-") || tuple.startsWith("3-")
+ || tuple.equals(lines[lines.length-1]);
List<List<String>> expResults = buildExpResults(lines, cycleIt);
assertEquals(3, expResults.size());
@@ -869,34 +876,59 @@ public class FileStreamsTextFileWriterTest extends DirectTopologyTestBase {
Path basePath, List<List<T>> expResults) throws Exception {
try {
- // just let it run to the tmo before we check the file contents
+ // wait until the right number of files and content or we timeout.
+ // (don't use a wait-till-tmo scheme as that's "too slow" especially
+ // when complete() adds a TMO multiplier when edgent.build.ci=true)
Condition<Object> tc = new Condition<Object>() {
- public boolean valid() { return false; }
- public Object getResult() { return null; }
+ public boolean valid() {
+ try {
+ return checkFiles(basePath, expResults, true);
+ } catch (Exception e) {
+ return false;
+ }
+ }
+ public Object getResult() { return getActFiles(basePath).size(); }
};
-
- complete(t, tc, tmoSec, TimeUnit.SECONDS);
- System.out.println("########## "+t.getName());
+ // if we time out we probably need to know which files are present to diagnose
+ try {
+ complete(t, tc, tmoSec, TimeUnit.SECONDS);
+ } catch(Exception e) {
+ System.out.println("completed with exception: "+e);
+ }
- // right number of files?
- List<Path> actFiles = getActFiles(basePath);
- System.out.println("actFiles: "+actFiles);
- assertEquals(actFiles.toString(), expResults.size(), actFiles.size());
+ System.out.println("########## "+t.getName());
- // do the file(s) have the right contents?
- System.out.println("expResults: "+expResults);
- int i = 0;
- for (List<T> expFile : expResults) {
- Path path = actFiles.get(i++);
- checkContents(path, expFile.toArray(new String[0]));
- }
+ checkFiles(basePath, expResults, false);
}
finally {
deleteAll(basePath);
}
}
+ // silent==true => return false on fail; silent==false => asserts/throws on fail
+ private <T> boolean checkFiles(Path basePath, List<List<T>> expResults, boolean silent) {
+
+ // right number of files?
+ List<Path> actFiles = getActFiles(basePath);
+ if (!silent) System.out.println("actFiles: "+actFiles);
+ if (!silent)
+ assertEquals(actFiles.toString(), expResults.size(), actFiles.size());
+ else if (expResults.size() != actFiles.size())
+ return false;
+
+ // do the file(s) have the right contents?
+ if (!silent) System.out.println("expResults: "+expResults);
+ int i = 0;
+ for (List<T> expFile : expResults) {
+ Path path = actFiles.get(i++);
+ if (!checkContents(path, expFile.toArray(new String[0]), silent))
+ return false;
+ }
+
+ return true;
+ }
+
private void deleteAll(Path basePath) {
Path parent = basePath.getParent();
String baseLeaf = basePath.getFileName().toString();
@@ -920,28 +952,39 @@ public class FileStreamsTextFileWriterTest extends DirectTopologyTestBase {
return paths;
}
- private void checkContents(Path path, String[] lines) {
+ // silent==true => return false on fail; silent==false => asserts/throws on fail
+ private boolean checkContents(Path path, String[] lines, boolean silent) {
if (path.getFileName().toString().endsWith(".zip")) {
- checkZipContents(path, lines);
- return;
+ return checkZipContents(path, lines, silent);
}
- System.out.println("checking file "+path);
+ if (!silent) System.out.println("checking file "+path);
int lineCnt = 0;
try (BufferedReader br = newBufferedReader(path)) {
for (String line : lines) {
++lineCnt;
String actLine = br.readLine();
- assertEquals("path:"+path+" line "+lineCnt, line, actLine);
+ if (!silent)
+ assertEquals("path:"+path+" line "+lineCnt, line, actLine);
+ else if (!line.equals(actLine))
+ return false;
}
- assertNull("path:"+path+" line "+lineCnt+" expected EOF", br.readLine());
+ if (!silent)
+ assertNull("path:"+path+" line "+lineCnt+" expected EOF", br.readLine());
+ else if (null != br.readLine())
+ return false;
}
catch (IOException e) {
- assertNull("path:"+path+" line "+lineCnt+" unexpected IOException "+e, e);
+ if (!silent)
+ assertNull("path:"+path+" line "+lineCnt+" unexpected IOException "+e, e);
+ else
+ return false;
}
+ return true;
}
- private void checkZipContents(Path path, String[] lines) {
- System.out.println("checking file "+path);
+ // silent==true => return false on fail; silent==false => asserts/throws on fail
+ private boolean checkZipContents(Path path, String[] lines, boolean silent) {
+ if (!silent) System.out.println("checking file "+path);
String fileName = path.getFileName().toString();
String entryName = fileName.substring(0, fileName.length() - ".zip".length());
int lineCnt = 0;
@@ -952,18 +995,31 @@ public class FileStreamsTextFileWriterTest extends DirectTopologyTestBase {
{
ZipEntry entry = zin.getNextEntry();
- assertEquals(entryName, entry.getName());
+ if (!silent)
+ assertEquals(entryName, entry.getName());
+ else if (!entryName.equals(entry.getName()))
+ return false;
BufferedReader br = new BufferedReader(new InputStreamReader(zin, StandardCharsets.UTF_8));
for (String line : lines) {
++lineCnt;
String actLine = br.readLine();
- assertEquals("path:"+path+" line "+lineCnt, line, actLine);
+ if (!silent)
+ assertEquals("path:"+path+" line "+lineCnt, line, actLine);
+ else if (!line.equals(actLine))
+ return false;
}
- assertNull("path:"+path+" line "+lineCnt+" expected EOF", br.readLine());
+ if (!silent)
+ assertNull("path:"+path+" line "+lineCnt+" expected EOF", br.readLine());
+ else if (null != br.readLine())
+ return false;
}
catch (IOException e) {
- assertNull("path:"+path+" line "+lineCnt+" unexpected IOException "+e, e);
+ if (!silent)
+ assertNull("path:"+path+" line "+lineCnt+" unexpected IOException "+e, e);
+ else
+ return false;
}
+ return true;
}
}
[29/50] [abbrv] incubator-edgent git commit: remove all gradle
tooling artifacts and "exclusions" from the repo
Posted by dl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/websocket-common-9.3.6.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/websocket-common-9.3.6.AL-2.0 b/licenses/binary-release/websocket-common-9.3.6.AL-2.0
deleted file mode 100644
index e13b48d..0000000
--- a/licenses/binary-release/websocket-common-9.3.6.AL-2.0
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>19 May, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). The Content is dual licensed and is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL") as well as the Apache Software License Version 2.0. A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. A copy of the ASL is available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html">http://www.apache.org/licenses/LICENSE-2.0.html</a>. For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-<p><b>jetty-util</b> artifact only:<br/><br/>The UnixCrypt.java code implements the one way cryptography used by
-Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
-modified April 2001 by Iris Van den Broeke, Daniel Deville.
-Permission to use, copy, modify and distribute UnixCrypt
-for non-commercial or commercial purposes and without fee is
-granted provided that the copyright notice appears in all copies.</p>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/zkclient-0.3.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/zkclient-0.3.AL-2.0 b/licenses/binary-release/zkclient-0.3.AL-2.0
deleted file mode 100644
index 2e54031..0000000
--- a/licenses/binary-release/zkclient-0.3.AL-2.0
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright 2009 Stefan Groschupf
-
- 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.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/zookeeper-3.4.6.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/zookeeper-3.4.6.AL-2.0 b/licenses/binary-release/zookeeper-3.4.6.AL-2.0
deleted file mode 100644
index d645695..0000000
--- a/licenses/binary-release/zookeeper-3.4.6.AL-2.0
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index aad2465..819c6d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -356,13 +356,6 @@
<exclude>licenses/binary-release/mqttv3-1.1.0.EDL-1.0</exclude>
<exclude>licenses/binary-release/watson-iot-0.2.2.EPL-1.0</exclude>
<exclude>samples/**</exclude> <!-- samples are separate -->
-
- <!-- TODO: Remove this after finishing the maven migration -->
- <exclude>gradlew</exclude>
- <exclude>gradlew.bat</exclude>
- <exclude>**/build/**</exclude>
- <exclude>**/.gradle/**</exclude>
- <exclude>.gradle-wrapper/**</exclude>
</excludes>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/providers/development/build.gradle
----------------------------------------------------------------------
diff --git a/providers/development/build.gradle b/providers/development/build.gradle
deleted file mode 100644
index a7b9879..0000000
--- a/providers/development/build.gradle
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':providers:direct'
- addTargetDirProjectJarDependency 'compile', ':console:server'
- addTargetDirProjectJarDependency 'compile', ':utils:metrics'
- addTargetDirProjectJarDependency 'compile', ':utils:streamscope'
- addTargetDirProjectJarDependency 'compile', ':runtime:jmxcontrol'
-
- // N.B. root project adds test common dependencies
-}
-
-addCompileTestDependencies ':api:topology', ':utils:streamscope'
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/providers/direct/build.gradle
----------------------------------------------------------------------
diff --git a/providers/direct/build.gradle b/providers/direct/build.gradle
deleted file mode 100644
index 2994a8b..0000000
--- a/providers/direct/build.gradle
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:topology'
- addTargetDirProjectJarDependency 'compile', ':spi:topology'
- addTargetDirProjectJarDependency 'compile', ':spi:graph'
- addTargetDirProjectJarDependency 'compile', ':runtime:appservice'
- addTargetDirProjectJarDependency 'compile', ':runtime:etiao'
- addTargetDirProjectJarDependency 'compile', ':runtime:jsoncontrol'
- addTargetDirCoreExtJarDependencies 'compile'
-
- addTargetDirProjectJarDependency 'testCompile', ':utils:metrics'
- // N.B. root project adds test common dependencies
-}
-
-addCompileTestDependencies ':api:topology', ':utils:metrics', ':runtime:appservice'
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/providers/iot/build.gradle
----------------------------------------------------------------------
diff --git a/providers/iot/build.gradle b/providers/iot/build.gradle
deleted file mode 100644
index 75548ac..0000000
--- a/providers/iot/build.gradle
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':providers:direct'
- addTargetDirProjectJarDependency 'compile', ':runtime:jsoncontrol'
- addTargetDirProjectJarDependency 'compile', ':runtime:appservice'
- addTargetDirProjectJarDependency 'compile', ':connectors:iot'
- addTargetDirProjectJarDependency 'compile', ':connectors:pubsub'
- addTargetDirProjectJarDependency 'compile', ':apps:iot'
- addTargetDirProjectJarDependency 'compile', ':apps:runtime'
-
- // N.B. root project adds test common dependencies
-}
-
-addCompileTestDependencies ':api:topology'
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/runtime/appservice/build.gradle
----------------------------------------------------------------------
diff --git a/runtime/appservice/build.gradle b/runtime/appservice/build.gradle
deleted file mode 100644
index af0d4c1..0000000
--- a/runtime/appservice/build.gradle
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:execution'
- addTargetDirProjectJarDependency 'compile', ':api:topology'
- addTargetDirCoreExtJarDependencies 'compile'
-
- // N.B. root project adds test common dependencies
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/runtime/etiao/build.gradle
----------------------------------------------------------------------
diff --git a/runtime/etiao/build.gradle b/runtime/etiao/build.gradle
deleted file mode 100644
index c9153c2..0000000
--- a/runtime/etiao/build.gradle
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:execution'
- addTargetDirProjectJarDependency 'compile', ':api:graph'
- addTargetDirProjectJarDependency 'compile', ':spi:graph'
- addTargetDirCoreExtJarDependencies 'compile'
-
- // N.B. root project adds test common dependencies
-}
-
-addCompileTestDependencies ':api:graph'
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/runtime/jmxcontrol/build.gradle
----------------------------------------------------------------------
diff --git a/runtime/jmxcontrol/build.gradle b/runtime/jmxcontrol/build.gradle
deleted file mode 100644
index 2e5ded3..0000000
--- a/runtime/jmxcontrol/build.gradle
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:execution'
- addTargetDirProjectJarDependency 'compile', ':api:function'
- addTargetDirCoreExtJarDependencies 'compile'
-
- // N.B. root project adds test common dependencies
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/runtime/jobregistry/build.gradle
----------------------------------------------------------------------
diff --git a/runtime/jobregistry/build.gradle b/runtime/jobregistry/build.gradle
deleted file mode 100644
index af0d4c1..0000000
--- a/runtime/jobregistry/build.gradle
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:execution'
- addTargetDirProjectJarDependency 'compile', ':api:topology'
- addTargetDirCoreExtJarDependencies 'compile'
-
- // N.B. root project adds test common dependencies
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/runtime/jsoncontrol/build.gradle
----------------------------------------------------------------------
diff --git a/runtime/jsoncontrol/build.gradle b/runtime/jsoncontrol/build.gradle
deleted file mode 100644
index 2e5ded3..0000000
--- a/runtime/jsoncontrol/build.gradle
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:execution'
- addTargetDirProjectJarDependency 'compile', ':api:function'
- addTargetDirCoreExtJarDependencies 'compile'
-
- // N.B. root project adds test common dependencies
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/samples/.gitignore
----------------------------------------------------------------------
diff --git a/samples/.gitignore b/samples/.gitignore
index 128a2d4..d555b80 100644
--- a/samples/.gitignore
+++ b/samples/.gitignore
@@ -9,12 +9,7 @@
# More generated artifacts
target/
-/test/svt/lib
-/release-edgent
/reports
-/.gradle/
-build/
-/externalJars
# Mobile Tools for Java (J2ME)
.mtj.tmp/
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/samples/apps/build.gradle
----------------------------------------------------------------------
diff --git a/samples/apps/build.gradle b/samples/apps/build.gradle
deleted file mode 100644
index b94804b..0000000
--- a/samples/apps/build.gradle
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-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.
-*/
-dependencies {
- // N.B. common dependencies are set in root build.gradle
-
- addTargetDirProjectJarDependency 'compile', ':connectors:mqtt'
- addTargetDirProjectJarDependency 'compile', ':connectors:file'
- addTargetDirProjectJarDependency 'compile', ':connectors:serial'
- addTargetDirProjectJarDependency 'compile', ':analytics:math3'
- addTargetDirProjectJarDependency 'compile', ':analytics:sensors'
- addTargetDirProjectJarDependency 'compile', ':samples:utils'
-
- // N.B. root project adds test common dependencies
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/samples/connectors/build.gradle
----------------------------------------------------------------------
diff --git a/samples/connectors/build.gradle b/samples/connectors/build.gradle
deleted file mode 100644
index 909a8e6..0000000
--- a/samples/connectors/build.gradle
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-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.
-*/
-dependencies {
- // N.B. common dependencies are set in root build.gradle
-
- addTargetDirProjectJarDependency 'compile', ':analytics:math3'
- addTargetDirProjectJarDependency 'compile', ':connectors:mqtt'
- addTargetDirProjectJarDependency 'compile', ':connectors:kafka'
- addTargetDirProjectJarDependency 'compile', ':connectors:file'
- addTargetDirProjectJarDependency 'compile', ':connectors:iotp'
- addTargetDirProjectJarDependency 'compile', ':connectors:jdbc'
- addTargetDirProjectJarDependency 'compile', ':connectors:serial'
- addTargetDirProjectJarDependency 'compile', ':samples:topology'
- addTargetDirProjectJarDependency 'compile', ':samples:utils'
-
- // N.B. root project adds test common dependencies
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/samples/console/build.gradle
----------------------------------------------------------------------
diff --git a/samples/console/build.gradle b/samples/console/build.gradle
deleted file mode 100644
index 23795fc..0000000
--- a/samples/console/build.gradle
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-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.
-*/
-dependencies {
- // N.B. common dependencies are set in root build.gradle
-
- addTargetDirProjectJarDependency 'compile', ':console:server'
-
- // N.B. root project adds test common dependencies
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/samples/scenarios/build.gradle
----------------------------------------------------------------------
diff --git a/samples/scenarios/build.gradle b/samples/scenarios/build.gradle
deleted file mode 100644
index f05b459..0000000
--- a/samples/scenarios/build.gradle
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-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.
-*/
-
-sourceSets {
- main {
- java {
- if (System.env.PI4J_LIB == null) {
- exclude "**/scenarios/iotp/range/sensor/**"
- logger.lifecycle 'PI4J_LIB ev not set. Omitting scenarios/iotp/range/sensor/.'
- }
- }
- }
-}
-
-dependencies {
- // N.B. common dependencies are set in root build.gradle
-
- addTargetDirProjectJarDependency 'compile', ':analytics:math3'
- addTargetDirProjectJarDependency 'compile', ':samples:connectors'
- addTargetDirProjectJarDependency 'compile', ':providers:iot'
- addTargetDirProjectJarDependency 'compile', ':connectors:iot'
- addTargetDirProjectJarDependency 'compile', ':connectors:iotp'
-
- // N.B. pi4J is strictly LGPL and hence incompatible with ASF licensing.
- // Users will have to download it themselves and build the sample.
- // addProjectExtDependency 'compile', 'com.pi4j:pi4j-core:1.0'
- if (System.env.PI4J_LIB != null) {
- // addProjectExtDependency 'compile', files("$System.env.PI4J_LIB/pi4j-core.jar")
- compile files("$System.env.PI4J_LIB/pi4j-core.jar")
- }
-
- // N.B. root project adds test common dependencies
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/samples/topology/build.gradle
----------------------------------------------------------------------
diff --git a/samples/topology/build.gradle b/samples/topology/build.gradle
deleted file mode 100644
index 5a8a2b6..0000000
--- a/samples/topology/build.gradle
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-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.
-*/
-
-dependencies {
- // N.B. common dependencies are set in root build.gradle
-
- addTargetDirProjectJarDependency 'compile', ':analytics:math3'
- addTargetDirProjectJarDependency 'compile', ':runtime:jobregistry'
- addTargetDirProjectJarDependency 'compile', ':samples:utils'
-
- // N.B. root project adds test common dependencies
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/samples/utils/build.gradle
----------------------------------------------------------------------
diff --git a/samples/utils/build.gradle b/samples/utils/build.gradle
deleted file mode 100644
index c70a06d..0000000
--- a/samples/utils/build.gradle
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-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.
-*/
-dependencies {
- // N.B. common dependencies are set in root build.gradle
-
- addTargetDirProjectJarDependency 'compile', ':utils:metrics'
- addTargetDirProjectJarDependency 'compile', ':analytics:math3'
- addTargetDirProjectJarDependency 'compile', ':analytics:sensors'
-
- // N.B. root project adds test common dependencies
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/settings.gradle
----------------------------------------------------------------------
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 8a0a385..0000000
--- a/settings.gradle
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-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.
-*/
-
-// N.B. if you add a subproject to a new 'aggregator only' project
-// adjust the 'aggregatorOnlyProjects' list in build.gradle
-
-include 'api:function'
-include 'api:execution'
-include 'api:window'
-include 'api:oplet'
-include 'api:graph'
-include 'api:topology'
-include 'spi:graph'
-include 'spi:topology'
-include 'runtime:appservice'
-include 'runtime:etiao'
-include 'runtime:jmxcontrol'
-include 'runtime:jsoncontrol'
-include 'runtime:jobregistry'
-include 'utils:metrics'
-include 'utils:streamscope'
-include 'providers:direct'
-include 'connectors:command'
-include 'connectors:common'
-include 'connectors:csv'
-include 'connectors:iot'
-include 'connectors:serial'
-include 'connectors:file'
-include 'connectors:http'
-include 'connectors:iotp'
-include 'connectors:jdbc'
-include 'connectors:kafka'
-include 'connectors:mqtt'
-include 'connectors:pubsub'
-include 'connectors:edgent.javax.websocket'
-include 'connectors:javax.websocket-client'
-include 'connectors:javax.websocket-server'
-include 'connectors:wsclient'
-include 'connectors:wsclient-javax.websocket'
-include 'console:server'
-include 'console:servlets'
-include 'apps:iot'
-include 'apps:runtime'
-include 'providers:development'
-include 'providers:iot'
-include 'analytics:math3'
-include 'analytics:sensors'
-include 'samples:utils'
-include 'samples:apps'
-include 'samples:topology'
-include 'samples:connectors'
-include 'samples:console'
-include 'samples:scenarios'
-include 'test:fvtiot'
-include 'test:svt'
-include 'platform:java7'
-include 'platform:android'
-include 'android:topology'
-include 'android:hardware'
-
-rootProject.name = build_name
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/spi/graph/build.gradle
----------------------------------------------------------------------
diff --git a/spi/graph/build.gradle b/spi/graph/build.gradle
deleted file mode 100644
index 3a36a93..0000000
--- a/spi/graph/build.gradle
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:execution'
- addTargetDirProjectJarDependency 'compile', ':api:graph'
- addTargetDirCoreExtJarDependencies 'compile'
-
- // N.B. root project adds test common dependencies
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/spi/topology/build.gradle
----------------------------------------------------------------------
diff --git a/spi/topology/build.gradle b/spi/topology/build.gradle
deleted file mode 100644
index a524e59..0000000
--- a/spi/topology/build.gradle
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:topology'
- addTargetDirCoreExtJarDependencies 'compile'
-
- // N.B. root project adds test common dependencies
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/src/assembly/source-release.xml
----------------------------------------------------------------------
diff --git a/src/assembly/source-release.xml b/src/assembly/source-release.xml
index 4f6fb80..e49aeb4 100644
--- a/src/assembly/source-release.xml
+++ b/src/assembly/source-release.xml
@@ -76,14 +76,6 @@
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude>
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude>
- <!-- confusing gradle build things in the repo not yet dealt with -->
- <exclude>.gradle-wrapper/**</exclude>
- <exclude>*gradle*</exclude>
- <exclude>gradle/**</exclude>
- <exclude>**/build.gradle</exclude>
- <exclude>binary-release/**</exclude>
- <exclude>licenses</exclude>
-
</excludes>
</fileSet>
<!-- license, readme, etc. calculated at build time -->
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/test/fvtiot/build.gradle
----------------------------------------------------------------------
diff --git a/test/fvtiot/build.gradle b/test/fvtiot/build.gradle
deleted file mode 100644
index 7dca64e..0000000
--- a/test/fvtiot/build.gradle
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':providers:iot'
- addTargetDirProjectJarDependency 'compile', ':runtime:appservice'
- addTargetDirProjectJarDependency 'compile', ':runtime:jsoncontrol'
- addTargetDirCoreExtJarDependencies 'compile'
-
- // N.B. root project adds test common dependencies
-}
-
-addCompileTestDependencies ':apps:iot'
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/test/svt/build.gradle
----------------------------------------------------------------------
diff --git a/test/svt/build.gradle b/test/svt/build.gradle
deleted file mode 100644
index 2d16e70..0000000
--- a/test/svt/build.gradle
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-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.
-*/
-def lib= "$target_java8_dir/$project.simpleGroupName/$project.name"
-
-//def lib="${project.distsDir}/lib"
-
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':providers:development'
- addTargetDirProjectJarDependency 'compile', ':samples:apps'
- addTargetDirProjectJarDependency 'compile', ':connectors:iotp'
- addTargetDirCoreExtJarDependencies 'compile'
-
- // N.B. root project adds test common dependencies
-}
-
-tasks.build.doFirst(){
- mkdir lib
-}
-
-tasks.build.doLast(){
- delete lib
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/utils/metrics/build.gradle
----------------------------------------------------------------------
diff --git a/utils/metrics/build.gradle b/utils/metrics/build.gradle
deleted file mode 100644
index 98c37aa..0000000
--- a/utils/metrics/build.gradle
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:topology'
- addTargetDirCoreExtJarDependencies 'compile'
-
- // N.B. root project adds test common dependencies
-}
-
-addCompileTestDependencies ':api:topology'
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/utils/streamscope/build.gradle
----------------------------------------------------------------------
diff --git a/utils/streamscope/build.gradle b/utils/streamscope/build.gradle
deleted file mode 100644
index 4276e03..0000000
--- a/utils/streamscope/build.gradle
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-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.
-*/
-dependencies {
- addTargetDirProjectJarDependency 'compile', ':api:topology'
- addTargetDirCoreExtJarDependencies 'compile'
-
- // N.B. root project adds test common dependencies
-}
-
-addCompileTestDependencies ':api:topology'
-
-test {
- // this project lacks tests and this task fails if attempted
- enabled = false
-}
[33/50] [abbrv] incubator-edgent git commit: remove all gradle
tooling artifacts and "exclusions" from the repo
Posted by dl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/commons-math3-3.4.1.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/commons-math3-3.4.1.AL-2.0 b/licenses/binary-release/commons-math3-3.4.1.AL-2.0
deleted file mode 100644
index d97b49a..0000000
--- a/licenses/binary-release/commons-math3-3.4.1.AL-2.0
+++ /dev/null
@@ -1,457 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
-
-
-Apache Commons Math includes the following code provided to the ASF under the
-Apache License 2.0:
-
- - The inverse error function implementation in the Erf class is based on CUDA
- code developed by Mike Giles, Oxford-Man Institute of Quantitative Finance,
- and published in GPU Computing Gems, volume 2, 2010 (grant received on
- March 23th 2013)
- - The LinearConstraint, LinearObjectiveFunction, LinearOptimizer,
- RelationShip, SimplexSolver and SimplexTableau classes in package
- org.apache.commons.math3.optimization.linear include software developed by
- Benjamin McCann (http://www.benmccann.com) and distributed with
- the following copyright: Copyright 2009 Google Inc. (grant received on
- March 16th 2009)
- - The class "org.apache.commons.math3.exception.util.LocalizedFormatsTest" which
- is an adapted version of "OrekitMessagesTest" test class for the Orekit library
- - The "org.apache.commons.math3.analysis.interpolation.HermiteInterpolator"
- has been imported from the Orekit space flight dynamics library.
-
-===============================================================================
-
-
-
-APACHE COMMONS MATH DERIVATIVE WORKS:
-
-The Apache commons-math library includes a number of subcomponents
-whose implementation is derived from original sources written
-in C or Fortran. License terms of the original sources
-are reproduced below.
-
-===============================================================================
-For the lmder, lmpar and qrsolv Fortran routine from minpack and translated in
-the LevenbergMarquardtOptimizer class in package
-org.apache.commons.math3.optimization.general
-Original source copyright and license statement:
-
-Minpack Copyright Notice (1999) University of Chicago. All rights reserved
-
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the
-following conditions are met:
-
-1. Redistributions of source code must retain the above
-copyright notice, this list of conditions and the following
-disclaimer.
-
-2. Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following
-disclaimer in the documentation and/or other materials
-provided with the distribution.
-
-3. The end-user documentation included with the
-redistribution, if any, must include the following
-acknowledgment:
-
- "This product includes software developed by the
- University of Chicago, as Operator of Argonne National
- Laboratory.
-
-Alternately, this acknowledgment may appear in the software
-itself, if and wherever such third-party acknowledgments
-normally appear.
-
-4. WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS"
-WITHOUT WARRANTY OF ANY KIND. THE COPYRIGHT HOLDER, THE
-UNITED STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND
-THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE
-OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY
-OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR
-USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF
-THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4)
-DO NOT WARRANT THAT THE SOFTWARE WILL FUNCTION
-UNINTERRUPTED, THAT IT IS ERROR-FREE OR THAT ANY ERRORS WILL
-BE CORRECTED.
-
-5. LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT
-HOLDER, THE UNITED STATES, THE UNITED STATES DEPARTMENT OF
-ENERGY, OR THEIR EMPLOYEES: BE LIABLE FOR ANY INDIRECT,
-INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF
-ANY KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF
-PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER
-SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT
-(INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE,
-EVEN IF ANY OF SAID PARTIES HAS BEEN WARNED OF THE
-POSSIBILITY OF SUCH LOSS OR DAMAGES.
-===============================================================================
-
-Copyright and license statement for the odex Fortran routine developed by
-E. Hairer and G. Wanner and translated in GraggBulirschStoerIntegrator class
-in package org.apache.commons.math3.ode.nonstiff:
-
-
-Copyright (c) 2004, Ernst Hairer
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-===============================================================================
-
-Copyright and license statement for the original Mersenne twister C
-routines translated in MersenneTwister class in package
-org.apache.commons.math3.random:
-
- Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- 3. The names of its contributors may not be used to endorse or promote
- products derived from this software without specific prior written
- permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-===============================================================================
-
-The initial code for shuffling an array (originally in class
-"org.apache.commons.math3.random.RandomDataGenerator", now replaced by
-a method in class "org.apache.commons.math3.util.MathArrays") was
-inspired from the algorithm description provided in
-"Algorithms", by Ian Craw and John Pulham (University of Aberdeen 1999).
-The textbook (containing a proof that the shuffle is uniformly random) is
-available here:
- http://citeseerx.ist.psu.edu/viewdoc/download;?doi=10.1.1.173.1898&rep=rep1&type=pdf
-
-===============================================================================
-License statement for the direction numbers in the resource files for Sobol sequences.
-
------------------------------------------------------------------------------
-Licence pertaining to sobol.cc and the accompanying sets of direction numbers
-
------------------------------------------------------------------------------
-Copyright (c) 2008, Frances Y. Kuo and Stephen Joe
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- * Neither the names of the copyright holders nor the names of the
- University of New South Wales and the University of Waikato
- and its contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-===============================================================================
-
-The initial commit of package "org.apache.commons.math3.ml.neuralnet" is
-an adapted version of code developed in the context of the Data Processing
-and Analysis Consortium (DPAC) of the "Gaia" project of the European Space
-Agency (ESA).
-===============================================================================
-
-The initial commit of the class "org.apache.commons.math3.special.BesselJ" is
-an adapted version of code translated from the netlib Fortran program, rjbesl
-http://www.netlib.org/specfun/rjbesl by R.J. Cody at Argonne National
-Laboratory (USA). There is no license or copyright statement included with the
-original Fortran sources.
-===============================================================================
-
-
-The BracketFinder (package org.apache.commons.math3.optimization.univariate)
-and PowellOptimizer (package org.apache.commons.math3.optimization.general)
-classes are based on the Python code in module "optimize.py" (version 0.5)
-developed by Travis E. Oliphant for the SciPy library (http://www.scipy.org/)
-Copyright © 2003-2009 SciPy Developers.
-
-SciPy license
-Copyright © 2001, 2002 Enthought, Inc.
-All rights reserved.
-
-Copyright © 2003-2013 SciPy Developers.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- * Neither the name of Enthought nor the names of the SciPy Developers may
- be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-===============================================================================
-
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/commons-math3-3.4.1.NOTICE
----------------------------------------------------------------------
diff --git a/licenses/binary-release/commons-math3-3.4.1.NOTICE b/licenses/binary-release/commons-math3-3.4.1.NOTICE
deleted file mode 100644
index ce791e4..0000000
--- a/licenses/binary-release/commons-math3-3.4.1.NOTICE
+++ /dev/null
@@ -1,9 +0,0 @@
-Apache Commons Math
-Copyright 2001-2015 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes software developed for Orekit by
-CS Systèmes d'Information (http://www.c-s.fr/)
-Copyright 2010-2012 CS Systèmes d'Information
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/commons-net-3.3.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/commons-net-3.3.AL-2.0 b/licenses/binary-release/commons-net-3.3.AL-2.0
deleted file mode 100644
index 75b5248..0000000
--- a/licenses/binary-release/commons-net-3.3.AL-2.0
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/commons-net-3.3.NOTICE
----------------------------------------------------------------------
diff --git a/licenses/binary-release/commons-net-3.3.NOTICE b/licenses/binary-release/commons-net-3.3.NOTICE
deleted file mode 100644
index c14ed43..0000000
--- a/licenses/binary-release/commons-net-3.3.NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Commons Net
-Copyright 2001-2013 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/gson-2.2.4.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/gson-2.2.4.AL-2.0 b/licenses/binary-release/gson-2.2.4.AL-2.0
deleted file mode 100644
index 892eaed..0000000
--- a/licenses/binary-release/gson-2.2.4.AL-2.0
+++ /dev/null
@@ -1,203 +0,0 @@
-Google Gson
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright 2008-2011 Google 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.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/gson-2.6.1.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/gson-2.6.1.AL-2.0 b/licenses/binary-release/gson-2.6.1.AL-2.0
deleted file mode 100644
index d645695..0000000
--- a/licenses/binary-release/gson-2.6.1.AL-2.0
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/httpclient-4.5.1.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/httpclient-4.5.1.AL-2.0 b/licenses/binary-release/httpclient-4.5.1.AL-2.0
deleted file mode 100644
index d645695..0000000
--- a/licenses/binary-release/httpclient-4.5.1.AL-2.0
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/httpclient-4.5.1.NOTICE
----------------------------------------------------------------------
diff --git a/licenses/binary-release/httpclient-4.5.1.NOTICE b/licenses/binary-release/httpclient-4.5.1.NOTICE
deleted file mode 100644
index c05d4e6..0000000
--- a/licenses/binary-release/httpclient-4.5.1.NOTICE
+++ /dev/null
@@ -1,8 +0,0 @@
-
-Apache HttpClient
-Copyright 1999-2015 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
[05/50] [abbrv] incubator-edgent git commit: - Adjusted the LICENSE
additions to reflect latest changes in the project.
Posted by dl...@apache.org.
- Adjusted the LICENSE additions to reflect latest changes in the project.
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/23205063
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/23205063
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/23205063
Branch: refs/heads/develop
Commit: 2320506306e29a884bcdf5ba8408882c153b7829
Parents: a499fac
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Tue Oct 24 11:38:02 2017 +0200
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Tue Oct 24 11:38:02 2017 +0200
----------------------------------------------------------------------
console/server/src/main/remote-resources/META-INF/LICENSE | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/23205063/console/server/src/main/remote-resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/console/server/src/main/remote-resources/META-INF/LICENSE b/console/server/src/main/remote-resources/META-INF/LICENSE
index 4e78974..044c03e 100644
--- a/console/server/src/main/remote-resources/META-INF/LICENSE
+++ b/console/server/src/main/remote-resources/META-INF/LICENSE
@@ -22,7 +22,8 @@ jquery (org.webjars:jquery:1.11.2)
jquery-ui (org.webjars:jquery-ui:1.11.4)
For details, see META-INF/licenses/jquery-ui-1_11_4-MIT.txt.
-d3.legend.js (https://gist.githubusercontent.com/ZJONSSON/3918369/raw/bf9bce6b68a3b70f87450f155436ca4a84af1ba4/d3.legend.js)
+d3.legend.js (included inside the resources/servlets.war!/js/ext/d3.legend/d3.legend.js)
+ With Edgent specific modifications.
For details, see META-INF/licenses/d3.legend-MIT.txt.
===============================================================================
[34/50] [abbrv] incubator-edgent git commit: remove all gradle
tooling artifacts and "exclusions" from the repo
Posted by dl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/gradle/resources/rat-output-to-html.xsl
----------------------------------------------------------------------
diff --git a/gradle/resources/rat-output-to-html.xsl b/gradle/resources/rat-output-to-html.xsl
deleted file mode 100644
index 291ec3e..0000000
--- a/gradle/resources/rat-output-to-html.xsl
+++ /dev/null
@@ -1,208 +0,0 @@
-<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
-
-<!--***********************************************************
- *
- * 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.
- *
- ***********************************************************-->
-
-<!-- This style sheet converts any rat-report.xml file. -->
-
-<!-- shamelessly copied from https://github.com/apache/samza -->
-
-<xsl:template match="/">
-
- <html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <style type="text/css">
- <!--
-body {margin-top: 0px;font-size: 0.8em;background-color: #F9F7ED;}
-
-h1 {color:red;}
-h2 {color:blue;}
-h3 {color:green;}
-h4 {color:orange;}
-
-/* Table Design */
-
-table,tr,td {text-align:center;font-weight:bold;border:1px solid #000;}
-caption {color:blue;text-align:left;}
-.notes, .binaries, .archives, .standards {width:25%;}
-.notes {background:#D7EDEE;}
-.binaries {background:#D0F2F4;}
-.archives {background:#ABE7E9;}
-.standards {background:#A0F0F4;}
-.licenced, .generated {width:50%;}
-.licenced {background:#C6EBDD;}
-.generated {background:#ABE9D2;}
-.java_note {background:#D6EBC6;}
-.generated_note {background:#C9E7A9;}
-.unknown {width:100%;background:#E92020;}
-.unknown-zero {color:#00CC00;}
-.center{text-align:center;margin:0 auto;}
--->
- </style>
- </head>
- <body>
- <xsl:apply-templates/>
- <xsl:call-template name="generated"/>
- </body>
- </html>
-</xsl:template>
-
-<xsl:template match="rat-report">
-
- <h1>Rat Report</h1>
- <p>This HTML version (yes, it is!) is generated from the RAT xml reports using Saxon9B. All the outputs required are displayed below, similar to the .txt version.
- This is obviously a work in progress; and a prettier, easier to read and manage version will be available soon</p>
-<div class="center">
-<table id="rat-reports summary" cellspacing="0" summary="A snapshot summary of this rat report">
-<caption>
-Table 1: A snapshot summary of this rat report.
-</caption>
- <tr>
- <td colspan="1" class="notes">Notes: <xsl:value-of select="count(descendant::type[attribute::name="notice"])"/></td>
- <td colspan="1" class="binaries">Binaries: <xsl:value-of select="count(descendant::type[attribute::name="binary"])"/></td>
- <td colspan="1" class="archives">Archives: <xsl:value-of select="count(descendant::type[attribute::name="archive"])"/></td>
- <td colspan="1" class="standards">Standards: <xsl:value-of select="count(descendant::type[attribute::name="standard"])"/></td>
- </tr>
- <tr>
- <td colspan="2" class="licenced">Apache Licensed: <xsl:value-of select="count(descendant::header-type[attribute::name="AL "])"/></td>
- <td colspan="2" class="generated">Generated Documents: <xsl:value-of select="count(descendant::header-type[attribute::name="GEN "])"/></td>
- </tr>
- <tr>
- <td colspan="2" class="java_note">Note: JavaDocs are generated and so license header is optional</td>
- <td colspan="2" class="generated_note">Note: Generated files do not require license headers</td>
- </tr>
- <tr>
-<xsl:choose>
- <xsl:when test="count(descendant::header-type[attribute::name="?????"]) > 0">
- <td colspan="4" class="unknown"><xsl:value-of select="count(descendant::header-type[attribute::name="?????"])"/> Unknown Licenses - or files without a license.</td>
- </xsl:when>
- <xsl:otherwise>
- <td colspan="4" class="unknown-zero"><xsl:value-of select="count(descendant::header-type[attribute::name="?????"])"/> Unknown Licenses - or files without a license.</td>
- </xsl:otherwise>
-</xsl:choose>
- </tr>
-</table>
-</div>
-<hr/>
- <h3>Unapproved Licenses:</h3>
-
- <xsl:for-each select="descendant::resource[license-approval/@name="false"]">
- <xsl:text> </xsl:text>
- <xsl:value-of select="@name"/><br/>
- <xsl:text>
-</xsl:text>
-</xsl:for-each>
-<hr/>
-
-<h3>Archives:</h3>
-
-<xsl:for-each select="descendant::resource[type/@name="archive"]">
- + <xsl:value-of select="@name"/>
- <br/>
- </xsl:for-each>
- <hr/>
-
- <p>
- Files with Apache License headers will be marked AL<br/>
- Binary files (which do not require AL headers) will be marked B<br/>
- Compressed archives will be marked A<br/>
- Notices, licenses etc will be marked N<br/>
- </p>
-
- <xsl:for-each select="descendant::resource">
- <xsl:choose>
- <xsl:when test="license-approval/@name="false"">!</xsl:when>
- <xsl:otherwise><xsl:text> </xsl:text></xsl:otherwise>
- </xsl:choose>
- <xsl:choose>
- <xsl:when test="type/@name="notice"">N </xsl:when>
- <xsl:when test="type/@name="archive"">A </xsl:when>
- <xsl:when test="type/@name="binary"">B </xsl:when>
- <xsl:when test="type/@name="standard""><xsl:value-of select="header-type/@name"/></xsl:when>
- <xsl:otherwise>!!!!!</xsl:otherwise>
- </xsl:choose>
- <xsl:text> </xsl:text>
- <xsl:value-of select="@name"/><br/>
- <xsl:text>
- </xsl:text>
- </xsl:for-each>
- <hr/>
-
- <h3>Printing headers for files without AL header...</h3>
-
- <xsl:for-each select="descendant::resource[header-type/@name="?????"]">
-
- <h4><xsl:value-of select="@name"/></h4>
- <xsl:value-of select="header-sample"/>
- <hr/>
-</xsl:for-each>
-<br/>
-
- <!-- <xsl:apply-templates select="resource"/>
- <xsl:apply-templates select="header-sample"/>
- <xsl:apply-templates select="header-type"/>
- <xsl:apply-templates select="license-family"/>
- <xsl:apply-templates select="license-approval"/>
- <xsl:apply-templates select="type"/> -->
-
-</xsl:template>
-
-<xsl:template match="resource">
- <div>
- <h3>Resource: <xsl:value-of select="@name"/></h3>
- <xsl:apply-templates/>
- </div>
-</xsl:template>
-
-<xsl:template match="header-sample">
- <xsl:if test="normalize-space(.) != ''">
- <h4>First few lines of non-compliant file</h4>
- <p>
- <xsl:value-of select="."/>
- </p>
- </xsl:if>
- <h4>Other Info:</h4>
-</xsl:template>
-
-<xsl:template match="header-type">
- Header Type: <xsl:value-of select="@name"/>
- <br/>
-</xsl:template>
-
-<xsl:template match="license-family">
- License Family: <xsl:value-of select="@name"/>
- <br/>
-</xsl:template>
-
-<xsl:template match="license-approval">
- License Approval: <xsl:value-of select="@name"/>
- <br/>
-</xsl:template>
-
-<xsl:template match="type">
- Type: <xsl:value-of select="@name"/>
- <br/>
-</xsl:template>
-
-<xsl:template name="generated">
-</xsl:template>
-</xsl:transform>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/gradle/wrapper.gradle
----------------------------------------------------------------------
diff --git a/gradle/wrapper.gradle b/gradle/wrapper.gradle
deleted file mode 100644
index 557a8f8..0000000
--- a/gradle/wrapper.gradle
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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.
- */
-
-defaultTasks 'wrapper'
-
-task wrapper(type: Wrapper) {
- description = "Initialize the gradle wrapper. Overwrites existing wrapper files."
- jarFile = "${project.projectDir}/.gradle-wrapper/gradle-wrapper.jar"
-
- gradleVersion = project.gradleVersion
- // ugh... must manually set in generated gradle-wrapper.properties
- // distributionSha256Sum = project.gradleDistributionSha256Sum
-
- doLast {
- if (project.hasProperty("gradleDistributionSha256Sum")) {
- File wrapperProps = file(propertiesFile)
- wrapperProps.append("distributionSha256Sum=${project.gradleDistributionSha256Sum}\n");
- }
- }
- doLast {
- println "The gradle wrapper is now initialized." +
- "\nUse ./gradlew for subsequent build operations."
- }
-}
-
-gradle.taskGraph.whenReady {taskGraph ->
- if (!taskGraph.hasTask(wrapper)) {
- if (GradleVersion.current() < GradleVersion.version(gradleVersion)) {
- throw new GradleException('Running with unsupported Gradle Version (' + GradleVersion.current() + ').' +
- '\nUse Gradle Wrapper or with Gradle version >= ' + gradleVersion +
- '\nRun \'gradle\' (default task) to initialize the wrapper.')
- }
- }
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/gradlew
----------------------------------------------------------------------
diff --git a/gradlew b/gradlew
deleted file mode 100755
index 32395ce..0000000
--- a/gradlew
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-## Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
- echo "$*"
-}
-
-die ( ) {
- echo
- echo "$*"
- echo
- exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
- NONSTOP* )
- nonstop=true
- ;;
-esac
-
-CLASSPATH=$APP_HOME/.gradle-wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
- else
- JAVACMD="$JAVA_HOME/bin/java"
- fi
- if [ ! -x "$JAVACMD" ] ; then
- die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
- fi
-else
- JAVACMD="java"
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
- JAVACMD=`cygpath --unix "$JAVACMD"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/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
-
-# Escape application args
-save ( ) {
- for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
- echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
- cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/gradlew.bat
----------------------------------------------------------------------
diff --git a/gradlew.bat b/gradlew.bat
deleted file mode 100644
index ec24650..0000000
--- a/gradlew.bat
+++ /dev/null
@@ -1,84 +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
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-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.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_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=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\.gradle-wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-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 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/commons-codec-1.10.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/commons-codec-1.10.AL-2.0 b/licenses/binary-release/commons-codec-1.10.AL-2.0
deleted file mode 100644
index 75b5248..0000000
--- a/licenses/binary-release/commons-codec-1.10.AL-2.0
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/commons-codec-1.10.NOTICE
----------------------------------------------------------------------
diff --git a/licenses/binary-release/commons-codec-1.10.NOTICE b/licenses/binary-release/commons-codec-1.10.NOTICE
deleted file mode 100644
index efc098c..0000000
--- a/licenses/binary-release/commons-codec-1.10.NOTICE
+++ /dev/null
@@ -1,17 +0,0 @@
-Apache Commons Codec
-Copyright 2002-2014 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
-contains test data from http://aspell.net/test/orig/batch0.tab.
-Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org)
-
-===============================================================================
-
-The content of package org.apache.commons.codec.language.bm has been translated
-from the original php source code available at http://stevemorse.org/phoneticinfo.htm
-with permission from the original authors.
-Original source copyright:
-Copyright (c) 2008 Alexander Beider & Stephen P. Morse.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/commons-codec-1.9.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/commons-codec-1.9.AL-2.0 b/licenses/binary-release/commons-codec-1.9.AL-2.0
deleted file mode 100644
index 75b5248..0000000
--- a/licenses/binary-release/commons-codec-1.9.AL-2.0
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/commons-codec-1.9.NOTICE
----------------------------------------------------------------------
diff --git a/licenses/binary-release/commons-codec-1.9.NOTICE b/licenses/binary-release/commons-codec-1.9.NOTICE
deleted file mode 100644
index 147f78a..0000000
--- a/licenses/binary-release/commons-codec-1.9.NOTICE
+++ /dev/null
@@ -1,9 +0,0 @@
-Apache Commons Codec
-Copyright 2002-2013 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
-contains test data from http://aspell.net/test/orig/batch0.tab.
-Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org)
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/commons-lang3-3.4.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/commons-lang3-3.4.AL-2.0 b/licenses/binary-release/commons-lang3-3.4.AL-2.0
deleted file mode 100644
index d645695..0000000
--- a/licenses/binary-release/commons-lang3-3.4.AL-2.0
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/commons-lang3-3.4.NOTICE
----------------------------------------------------------------------
diff --git a/licenses/binary-release/commons-lang3-3.4.NOTICE b/licenses/binary-release/commons-lang3-3.4.NOTICE
deleted file mode 100644
index 592023a..0000000
--- a/licenses/binary-release/commons-lang3-3.4.NOTICE
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache Commons Lang
-Copyright 2001-2015 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes software from the Spring Framework,
-under the Apache License 2.0 (see: StringUtils.containsWhitespace())
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/commons-logging-1.2.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/commons-logging-1.2.AL-2.0 b/licenses/binary-release/commons-logging-1.2.AL-2.0
deleted file mode 100644
index d645695..0000000
--- a/licenses/binary-release/commons-logging-1.2.AL-2.0
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/commons-logging-1.2.NOTICE
----------------------------------------------------------------------
diff --git a/licenses/binary-release/commons-logging-1.2.NOTICE b/licenses/binary-release/commons-logging-1.2.NOTICE
deleted file mode 100644
index 556bd03..0000000
--- a/licenses/binary-release/commons-logging-1.2.NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-Apache Commons Logging
-Copyright 2003-2014 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
[28/50] [abbrv] incubator-edgent git commit: undo "--fail-at-end"
Posted by dl...@apache.org.
undo "--fail-at-end"
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/89252db6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/89252db6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/89252db6
Branch: refs/heads/develop
Commit: 89252db68de92b154d5841188d6bb133af526995
Parents: 39764b5
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Mon Oct 30 10:01:17 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Mon Oct 30 10:01:17 2017 -0400
----------------------------------------------------------------------
Jenkinsfile | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/89252db6/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index a56ea86..6fa4b55 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -37,7 +37,7 @@ node('ubuntu') {
} else {
mavenLocalRepo = "-Dmaven.repo.local=.repository"
}
- def mavenFailureMode = "--fail-at-end" // vs --fail-fast
+ def mavenFailureMode = "" // consider "--fail-at-end"? Odd ordering side effects?
try {
stage ('Cleanup') {
@@ -64,6 +64,9 @@ node('ubuntu') {
sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} clean package; ./run-app.sh"
sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-java7 clean package; ./run-app.sh"
sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-android clean package; ./run-app.sh"
+
+ echo 'Verify get-edgent-jars'
+ sh "cd samples/get-edgent-jars; ./get-edgent-jars.sh"
}
stage ('Stage Site') {
[49/50] [abbrv] incubator-edgent git commit: getting started updates
Posted by dl...@apache.org.
getting started updates
- fix mvnw in samples/template
- add TempSensorSample
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/e9c75964
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/e9c75964
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/e9c75964
Branch: refs/heads/develop
Commit: e9c75964598397db70bfee86fb73f8d6e9abc9c1
Parents: 709fb97
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Nov 1 15:04:29 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Nov 1 15:04:29 2017 -0400
----------------------------------------------------------------------
samples/README.md | 6 +-
.../.mvn/wrapper/MavenWrapperDownloader.java | 110 +++++++++++++++++++
.../.mvn/wrapper/maven-wrapper.properties | 20 ++++
samples/template/README.md | 2 +-
samples/template/app-run.sh | 15 ++-
samples/topology/run-sample.sh | 1 +
.../edgent/samples/topology/TempSensor.java | 44 ++++++++
.../samples/topology/TempSensorApplication.java | 44 ++++++++
8 files changed, 239 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/e9c75964/samples/README.md
----------------------------------------------------------------------
diff --git a/samples/README.md b/samples/README.md
index 09079d4..6bd26ed 100644
--- a/samples/README.md
+++ b/samples/README.md
@@ -172,7 +172,11 @@ Eclipse in the usual manner. E.g.,
<pre>
HelloEdgent Basic mechanics of declaring a topology and executing
it. Prints Hello Edgent! to standard output.
-
+
+TempSensorApplication A basic Edgent application used by the Edgent
+ "Getting Started Guide":
+ https://edgent.apache.org/docs/edgent-getting-started.html
+
PeriodicSource Create a stream by polling a random number generator
for a new value every second and then prints out the
raw tuple value and a filtered and transformed stream.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/e9c75964/samples/template/.mvn/wrapper/MavenWrapperDownloader.java
----------------------------------------------------------------------
diff --git a/samples/template/.mvn/wrapper/MavenWrapperDownloader.java b/samples/template/.mvn/wrapper/MavenWrapperDownloader.java
new file mode 100644
index 0000000..44f8e00
--- /dev/null
+++ b/samples/template/.mvn/wrapper/MavenWrapperDownloader.java
@@ -0,0 +1,110 @@
+/*
+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.
+*/
+
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+ /**
+ * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+ */
+ private static final String DEFAULT_DOWNLOAD_URL =
+ "https://repo1.maven.org/maven2/io/takari/maven-wrapper/0.2.1/maven-wrapper-0.2.1.jar";
+
+ /**
+ * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+ * use instead of the default one.
+ */
+ private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+ ".mvn/wrapper/maven-wrapper.properties";
+
+ /**
+ * Path where the maven-wrapper.jar will be saved to.
+ */
+ private static final String MAVEN_WRAPPER_JAR_PATH =
+ ".mvn/wrapper/maven-wrapper.jar";
+
+ /**
+ * Name of the property which should be used to override the default download url for the wrapper.
+ */
+ private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+ public static void main(String args[]) {
+ System.out.println("- Downloader started");
+ File baseDirectory = new File(args[0]);
+ System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+ // If the maven-wrapper.properties exists, read it and check if it contains a custom
+ // wrapperUrl parameter.
+ File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+ String url = DEFAULT_DOWNLOAD_URL;
+ if(mavenWrapperPropertyFile.exists()) {
+ FileInputStream mavenWrapperPropertyFileInputStream = null;
+ try {
+ mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+ Properties mavenWrapperProperties = new Properties();
+ mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+ url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+ } catch (IOException e) {
+ System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+ } finally {
+ try {
+ if(mavenWrapperPropertyFileInputStream != null) {
+ mavenWrapperPropertyFileInputStream.close();
+ }
+ } catch (IOException e) {
+ // Ignore ...
+ }
+ }
+ }
+ System.out.println("- Downloading from: : " + url);
+
+ File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+ if(!outputFile.getParentFile().exists()) {
+ if(!outputFile.getParentFile().mkdirs()) {
+ System.out.println(
+ "- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+ }
+ }
+ System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+ try {
+ downloadFileFromURL(url, outputFile);
+ System.out.println("Done");
+ System.exit(0);
+ } catch (Throwable e) {
+ System.out.println("- Error downloading");
+ e.printStackTrace();
+ System.exit(1);
+ }
+ }
+
+ private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+ URL website = new URL(urlString);
+ ReadableByteChannel rbc;
+ rbc = Channels.newChannel(website.openStream());
+ FileOutputStream fos = new FileOutputStream(destination);
+ fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+ fos.close();
+ rbc.close();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/e9c75964/samples/template/.mvn/wrapper/maven-wrapper.properties
----------------------------------------------------------------------
diff --git a/samples/template/.mvn/wrapper/maven-wrapper.properties b/samples/template/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..7e8f382
--- /dev/null
+++ b/samples/template/.mvn/wrapper/maven-wrapper.properties
@@ -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.
+
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip
+
+#wrapperUrl=https://repo1.maven.org/maven2/io/takari/maven-wrapper/0.2.1/maven-wrapper-0.2.1.jar
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/e9c75964/samples/template/README.md
----------------------------------------------------------------------
diff --git a/samples/template/README.md b/samples/template/README.md
index a0763fd..365dc46 100644
--- a/samples/template/README.md
+++ b/samples/template/README.md
@@ -1,6 +1,6 @@
An Edgent Application template project.
-Clone this template project to start your Edgent application project.
+Clone this template project folder to create your Edgent application project.
The project's pom supports
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/e9c75964/samples/template/app-run.sh
----------------------------------------------------------------------
diff --git a/samples/template/app-run.sh b/samples/template/app-run.sh
index 996bfbb..8437275 100755
--- a/samples/template/app-run.sh
+++ b/samples/template/app-run.sh
@@ -20,10 +20,23 @@ APP_DIR=.
UBER_JAR=`echo ${APP_DIR}/target/*-uber.jar`
+FQ_MAIN_CLASS=com.mycompany.app.TemplateApp
+
+USAGE="usage: [--main <main-class>] [<args...>]"
+
+if [ "$1" = "--main" ]; then
+ shift;
+ if [ $# = 0 ]; then
+ echo ${USAGE}
+ exit 1;
+ fi
+ FQ_MAIN_CLASS=$1; shift
+fi
+
# Runs the application
#
# ./app-run.sh
export CLASSPATH=${UBER_JAR}
-java com.mycompany.app.TemplateApp "$*"
+java ${FQ_MAIN_CLASS} "$*"
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/e9c75964/samples/topology/run-sample.sh
----------------------------------------------------------------------
diff --git a/samples/topology/run-sample.sh b/samples/topology/run-sample.sh
index 1614a7d..d6fa8af 100755
--- a/samples/topology/run-sample.sh
+++ b/samples/topology/run-sample.sh
@@ -36,6 +36,7 @@ ${SAMPLE_PACKAGE_BASE}.PeriodicSource
${SAMPLE_PACKAGE_BASE}.SensorsAggregates
${SAMPLE_PACKAGE_BASE}.SimpleFilterTransform
${SAMPLE_PACKAGE_BASE}.SplitWithEnumSample
+${SAMPLE_PACKAGE_BASE}.TempSensorApplication
${SAMPLE_PACKAGE_BASE}.TerminateAfterNTuples
EOF
`
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/e9c75964/samples/topology/src/main/java/org/apache/edgent/samples/topology/TempSensor.java
----------------------------------------------------------------------
diff --git a/samples/topology/src/main/java/org/apache/edgent/samples/topology/TempSensor.java b/samples/topology/src/main/java/org/apache/edgent/samples/topology/TempSensor.java
new file mode 100644
index 0000000..d9b8a40
--- /dev/null
+++ b/samples/topology/src/main/java/org/apache/edgent/samples/topology/TempSensor.java
@@ -0,0 +1,44 @@
+/*
+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.
+*/
+
+package org.apache.edgent.samples.topology;
+
+import java.util.Random;
+
+import org.apache.edgent.function.Supplier;
+
+/**
+ * Every time get() is called, TempSensor generates a temperature reading.
+ */
+public class TempSensor implements Supplier<Double> {
+ double currentTemp = 65.0;
+ Random rand;
+
+ TempSensor(){
+ rand = new Random();
+ }
+
+ @Override
+ public Double get() {
+ // Change the current temperature some random amount
+ double newTemp = rand.nextGaussian() + currentTemp;
+ currentTemp = newTemp;
+ return currentTemp;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/e9c75964/samples/topology/src/main/java/org/apache/edgent/samples/topology/TempSensorApplication.java
----------------------------------------------------------------------
diff --git a/samples/topology/src/main/java/org/apache/edgent/samples/topology/TempSensorApplication.java b/samples/topology/src/main/java/org/apache/edgent/samples/topology/TempSensorApplication.java
new file mode 100644
index 0000000..b1aba6b
--- /dev/null
+++ b/samples/topology/src/main/java/org/apache/edgent/samples/topology/TempSensorApplication.java
@@ -0,0 +1,44 @@
+/*
+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.
+*/
+
+package org.apache.edgent.samples.topology;
+
+import java.util.concurrent.TimeUnit;
+
+import org.apache.edgent.providers.direct.DirectProvider;
+import org.apache.edgent.topology.TStream;
+import org.apache.edgent.topology.Topology;
+
+/*
+ * A basic application used in the Edgent "Getting Started Guide":
+ * https://edgent.apache.org/docs/edgent-getting-started.html
+ */
+public class TempSensorApplication {
+ public static void main(String[] args) throws Exception {
+ TempSensor sensor = new TempSensor();
+ DirectProvider dp = new DirectProvider();
+ Topology topology = dp.newTopology();
+
+ TStream<Double> tempReadings = topology.poll(sensor, 1, TimeUnit.MILLISECONDS);
+ TStream<Double> filteredReadings = tempReadings.filter(reading -> reading < 50 || reading > 80);
+ filteredReadings.print();
+
+ dp.submit(topology);
+ }
+}
[04/50] [abbrv] incubator-edgent git commit: - Adjusted the LICENSE
additions to reflect latest changes in the project.
Posted by dl...@apache.org.
- Adjusted the LICENSE additions to reflect latest changes in the project.
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/a499fac6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/a499fac6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/a499fac6
Branch: refs/heads/develop
Commit: a499fac613f91e0a35937c235ebd7bf4e62e2aa6
Parents: 20a9eef
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Tue Oct 24 11:34:07 2017 +0200
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Tue Oct 24 11:34:07 2017 +0200
----------------------------------------------------------------------
console/servlets/src/main/remote-resources/META-INF/LICENSE | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a499fac6/console/servlets/src/main/remote-resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/console/servlets/src/main/remote-resources/META-INF/LICENSE b/console/servlets/src/main/remote-resources/META-INF/LICENSE
index 4e78974..8573e96 100644
--- a/console/servlets/src/main/remote-resources/META-INF/LICENSE
+++ b/console/servlets/src/main/remote-resources/META-INF/LICENSE
@@ -22,7 +22,8 @@ jquery (org.webjars:jquery:1.11.2)
jquery-ui (org.webjars:jquery-ui:1.11.4)
For details, see META-INF/licenses/jquery-ui-1_11_4-MIT.txt.
-d3.legend.js (https://gist.githubusercontent.com/ZJONSSON/3918369/raw/bf9bce6b68a3b70f87450f155436ca4a84af1ba4/d3.legend.js)
+d3.legend.js (src/main/webapp/js/ext/d3.legend/d3.legend.js)
+ With Edgent specific modifications.
For details, see META-INF/licenses/d3.legend-MIT.txt.
===============================================================================
[32/50] [abbrv] incubator-edgent git commit: remove all gradle
tooling artifacts and "exclusions" from the repo
Posted by dl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/httpcore-4.4.3.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/httpcore-4.4.3.AL-2.0 b/licenses/binary-release/httpcore-4.4.3.AL-2.0
deleted file mode 100644
index 54e4285..0000000
--- a/licenses/binary-release/httpcore-4.4.3.AL-2.0
+++ /dev/null
@@ -1,266 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
-
-=========================================================================
-
-This project contains annotations in the package org.apache.http.annotation
-which are derived from JCIP-ANNOTATIONS
-Copyright (c) 2005 Brian Goetz and Tim Peierls.
-See http://www.jcip.net and the Creative Commons Attribution License
-(http://creativecommons.org/licenses/by/2.5)
-Full text: http://creativecommons.org/licenses/by/2.5/legalcode
-
-License
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
- "Collective Work" means a work, such as a periodical issue, anthology or encyclopedia, in which the Work in its entirety in unmodified form, along with a number of other contributions, constituting separate and independent works in themselves, are assembled into a collective whole. A work that constitutes a Collective Work will not be considered a Derivative Work (as defined below) for the purposes of this License.
- "Derivative Work" means a work based upon the Work or upon the Work and other pre-existing works, such as a translation, musical arrangement, dramatization, fictionalization, motion picture version, sound recording, art reproduction, abridgment, condensation, or any other form in which the Work may be recast, transformed, or adapted, except that a work that constitutes a Collective Work will not be considered a Derivative Work for the purpose of this License. For the avoidance of doubt, where the Work is a musical composition or sound recording, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered a Derivative Work for the purpose of this License.
- "Licensor" means the individual or entity that offers the Work under the terms of this License.
- "Original Author" means the individual or entity who created the Work.
- "Work" means the copyrightable work of authorship offered under the terms of this License.
- "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-
-2. Fair Use Rights. Nothing in this license is intended to reduce, limit, or restrict any rights arising from fair use, first sale or other limitations on the exclusive rights of the copyright owner under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
- to reproduce the Work, to incorporate the Work into one or more Collective Works, and to reproduce the Work as incorporated in the Collective Works;
- to create and reproduce Derivative Works;
- to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission the Work including as incorporated in Collective Works;
- to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission Derivative Works.
-
- For the avoidance of doubt, where the work is a musical composition:
- Performance Royalties Under Blanket Licenses. Licensor waives the exclusive right to collect, whether individually or via a performance rights society (e.g. ASCAP, BMI, SESAC), royalties for the public performance or public digital performance (e.g. webcast) of the Work.
- Mechanical Rights and Statutory Royalties. Licensor waives the exclusive right to collect, whether individually or via a music rights agency or designated agent (e.g. Harry Fox Agency), royalties for any phonorecord You create from the Work ("cover version") and distribute, subject to the compulsory license created by 17 USC Section 115 of the US Copyright Act (or the equivalent in other jurisdictions).
- Webcasting Rights and Statutory Royalties. For the avoidance of doubt, where the Work is a sound recording, Licensor waives the exclusive right to collect, whether individually or via a performance-rights society (e.g. SoundExchange), royalties for the public digital performance (e.g. webcast) of the Work, subject to the compulsory license created by 17 USC Section 114 of the US Copyright Act (or the equivalent in other jurisdictions).
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. All rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions.The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
- You may distribute, publicly display, publicly perform, or publicly digitally perform the Work only under the terms of this License, and You must include a copy of, or the Uniform Resource Identifier for, this License with every copy or phonorecord of the Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Work that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Work as incorporated in a Collective Work, but this does not require the Collective Work apart fr
om the Work itself to be made subject to the terms of this License. If You create a Collective Work, upon notice from any Licensor You must, to the extent practicable, remove from the Collective Work any credit as required by clause 4(b), as requested. If You create a Derivative Work, upon notice from any Licensor You must, to the extent practicable, remove from the Derivative Work any credit as required by clause 4(b), as requested.
- If you distribute, publicly display, publicly perform, or publicly digitally perform the Work or any Derivative Works or Collective Works, You must keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or (ii) if the Original Author and/or Licensor designate another party or parties (e.g. a sponsor institute, publishing entity, journal) for attribution in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; the title of the Work if supplied; to the extent reasonably practicable, the Uniform Resource Identifier, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and in the case of a Derivative Work, a credit identifying the use of the Work in the Derivative Work (e.g., "French t
ranslation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). Such credit may be implemented in any reasonable manner; provided, however, that in the case of a Derivative Work or Collective Work, at a minimum such credit will appear where any other comparable authorship credit appears and in a manner at least as prominent as such other comparable authorship credit.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
- This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Derivative Works or Collective Works from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
- Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
- Each time You distribute or publicly digitally perform the Work or a Collective Work, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
- Each time You distribute or publicly digitally perform a Derivative Work, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
- If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
- No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
- This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/httpcore-4.4.3.NOTICE
----------------------------------------------------------------------
diff --git a/licenses/binary-release/httpcore-4.4.3.NOTICE b/licenses/binary-release/httpcore-4.4.3.NOTICE
deleted file mode 100644
index 976db53..0000000
--- a/licenses/binary-release/httpcore-4.4.3.NOTICE
+++ /dev/null
@@ -1,10 +0,0 @@
-
-Apache HttpCore
-Copyright 2005-2015 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
-This project contains annotations derived from JCIP-ANNOTATIONS
-Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/httpcore-4.4.4.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/httpcore-4.4.4.AL-2.0 b/licenses/binary-release/httpcore-4.4.4.AL-2.0
deleted file mode 100644
index 54e4285..0000000
--- a/licenses/binary-release/httpcore-4.4.4.AL-2.0
+++ /dev/null
@@ -1,266 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
-
-=========================================================================
-
-This project contains annotations in the package org.apache.http.annotation
-which are derived from JCIP-ANNOTATIONS
-Copyright (c) 2005 Brian Goetz and Tim Peierls.
-See http://www.jcip.net and the Creative Commons Attribution License
-(http://creativecommons.org/licenses/by/2.5)
-Full text: http://creativecommons.org/licenses/by/2.5/legalcode
-
-License
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
- "Collective Work" means a work, such as a periodical issue, anthology or encyclopedia, in which the Work in its entirety in unmodified form, along with a number of other contributions, constituting separate and independent works in themselves, are assembled into a collective whole. A work that constitutes a Collective Work will not be considered a Derivative Work (as defined below) for the purposes of this License.
- "Derivative Work" means a work based upon the Work or upon the Work and other pre-existing works, such as a translation, musical arrangement, dramatization, fictionalization, motion picture version, sound recording, art reproduction, abridgment, condensation, or any other form in which the Work may be recast, transformed, or adapted, except that a work that constitutes a Collective Work will not be considered a Derivative Work for the purpose of this License. For the avoidance of doubt, where the Work is a musical composition or sound recording, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered a Derivative Work for the purpose of this License.
- "Licensor" means the individual or entity that offers the Work under the terms of this License.
- "Original Author" means the individual or entity who created the Work.
- "Work" means the copyrightable work of authorship offered under the terms of this License.
- "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-
-2. Fair Use Rights. Nothing in this license is intended to reduce, limit, or restrict any rights arising from fair use, first sale or other limitations on the exclusive rights of the copyright owner under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
- to reproduce the Work, to incorporate the Work into one or more Collective Works, and to reproduce the Work as incorporated in the Collective Works;
- to create and reproduce Derivative Works;
- to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission the Work including as incorporated in Collective Works;
- to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission Derivative Works.
-
- For the avoidance of doubt, where the work is a musical composition:
- Performance Royalties Under Blanket Licenses. Licensor waives the exclusive right to collect, whether individually or via a performance rights society (e.g. ASCAP, BMI, SESAC), royalties for the public performance or public digital performance (e.g. webcast) of the Work.
- Mechanical Rights and Statutory Royalties. Licensor waives the exclusive right to collect, whether individually or via a music rights agency or designated agent (e.g. Harry Fox Agency), royalties for any phonorecord You create from the Work ("cover version") and distribute, subject to the compulsory license created by 17 USC Section 115 of the US Copyright Act (or the equivalent in other jurisdictions).
- Webcasting Rights and Statutory Royalties. For the avoidance of doubt, where the Work is a sound recording, Licensor waives the exclusive right to collect, whether individually or via a performance-rights society (e.g. SoundExchange), royalties for the public digital performance (e.g. webcast) of the Work, subject to the compulsory license created by 17 USC Section 114 of the US Copyright Act (or the equivalent in other jurisdictions).
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. All rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions.The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
- You may distribute, publicly display, publicly perform, or publicly digitally perform the Work only under the terms of this License, and You must include a copy of, or the Uniform Resource Identifier for, this License with every copy or phonorecord of the Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Work that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Work as incorporated in a Collective Work, but this does not require the Collective Work apart fr
om the Work itself to be made subject to the terms of this License. If You create a Collective Work, upon notice from any Licensor You must, to the extent practicable, remove from the Collective Work any credit as required by clause 4(b), as requested. If You create a Derivative Work, upon notice from any Licensor You must, to the extent practicable, remove from the Derivative Work any credit as required by clause 4(b), as requested.
- If you distribute, publicly display, publicly perform, or publicly digitally perform the Work or any Derivative Works or Collective Works, You must keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or (ii) if the Original Author and/or Licensor designate another party or parties (e.g. a sponsor institute, publishing entity, journal) for attribution in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; the title of the Work if supplied; to the extent reasonably practicable, the Uniform Resource Identifier, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and in the case of a Derivative Work, a credit identifying the use of the Work in the Derivative Work (e.g., "French t
ranslation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). Such credit may be implemented in any reasonable manner; provided, however, that in the case of a Derivative Work or Collective Work, at a minimum such credit will appear where any other comparable authorship credit appears and in a manner at least as prominent as such other comparable authorship credit.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
- This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Derivative Works or Collective Works from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
- Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
- Each time You distribute or publicly digitally perform the Work or a Collective Work, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
- Each time You distribute or publicly digitally perform a Derivative Work, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
- If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
- No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
- This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/httpcore-4.4.4.NOTICE
----------------------------------------------------------------------
diff --git a/licenses/binary-release/httpcore-4.4.4.NOTICE b/licenses/binary-release/httpcore-4.4.4.NOTICE
deleted file mode 100644
index 976db53..0000000
--- a/licenses/binary-release/httpcore-4.4.4.NOTICE
+++ /dev/null
@@ -1,10 +0,0 @@
-
-Apache HttpCore
-Copyright 2005-2015 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
-This project contains annotations derived from JCIP-ANNOTATIONS
-Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/javax-websocket-client-impl-9.3.6.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/javax-websocket-client-impl-9.3.6.AL-2.0 b/licenses/binary-release/javax-websocket-client-impl-9.3.6.AL-2.0
deleted file mode 100644
index e13b48d..0000000
--- a/licenses/binary-release/javax-websocket-client-impl-9.3.6.AL-2.0
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>19 May, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). The Content is dual licensed and is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL") as well as the Apache Software License Version 2.0. A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. A copy of the ASL is available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html">http://www.apache.org/licenses/LICENSE-2.0.html</a>. For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-<p><b>jetty-util</b> artifact only:<br/><br/>The UnixCrypt.java code implements the one way cryptography used by
-Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
-modified April 2001 by Iris Van den Broeke, Daniel Deville.
-Permission to use, copy, modify and distribute UnixCrypt
-for non-commercial or commercial purposes and without fee is
-granted provided that the copyright notice appears in all copies.</p>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/javax.servlet-api-3.1.0.CDDL-1.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/javax.servlet-api-3.1.0.CDDL-1.0 b/licenses/binary-release/javax.servlet-api-3.1.0.CDDL-1.0
deleted file mode 100644
index a0ccc93..0000000
--- a/licenses/binary-release/javax.servlet-api-3.1.0.CDDL-1.0
+++ /dev/null
@@ -1,263 +0,0 @@
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-1. Definitions.
-
- 1.1. Contributor. means each individual or entity that creates or contributes to the creation of Modifications.
-
- 1.2. Contributor Version. means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor.
-
- 1.3. Covered Software. means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof.
-
- 1.4. Executable. means the Covered Software in any form other than Source Code.
-
- 1.5. Initial Developer. means the individual or entity that first makes Original Software available under this License.
-
- 1.6. Larger Work. means a work which combines Covered Software or portions thereof with code not governed by the terms of this License.
-
- 1.7. License. means this document.
-
- 1.8. Licensable. means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
-
- 1.9. Modifications. means the Source Code and Executable form of any of the following:
-
- A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications;
-
- B. Any new file that contains any part of the Original Software or previous Modification; or
-
- C. Any new file that is contributed or otherwise made available under the terms of this License.
-
- 1.10. Original Software. means the Source Code and Executable form of computer software code that is originally released under this License.
-
- 1.11. Patent Claims. means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
-
- 1.12. Source Code. means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code.
-
- 1.13. You. (or .Your.) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, .You. includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, .control. means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
-
-2. License Grants.
-
- 2.1. The Initial Developer Grant.
-
- Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license:
-
- (a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and
-
- (b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof).
-
- (c) The licenses granted in Sections 2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License.
-
- (d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1) for code that You delete from the Original Software, or (2) for infringements caused by: (i) the modification of the Original Software, or (ii) the combination of the Original Software with other software or devices.
-
- 2.2. Contributor Grant.
-
- Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:
-
- (a) under intellectual property rights (other than patent or trademark) Licensable by Contributor to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and
-
- (b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: (1) Modifications made by that Contributor (or portions thereof); and (2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination).
-
- (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first distributes or otherwise makes the Modifications available to a third party.
-
- (d) Notwithstanding Section 2.2(b) above, no patent license is granted: (1) for any code that Contributor has deleted from the Contributor Version; (2) for infringements caused by: (i) third party modifications of Contributor Version, or (ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or (3) under Patent Claims infringed by Covered Software in the absence of Modifications made by that Contributor.
-
-3. Distribution Obligations.
-
- 3.1. Availability of Source Code.
- Any Covered Software that You distribute or otherwise make available in Executable form must also be made available in Source Code form and that Source Code form must be distributed only under the terms of this License. You must include a copy of this License with every copy of the Source Code form of the Covered Software You distribute or otherwise make available. You must inform recipients of any such Covered Software in Executable form as to how they can obtain such Covered Software in Source Code form in a reasonable manner on or through a medium customarily used for software exchange.
-
- 3.2. Modifications.
- The Modifications that You create or to which You contribute are governed by the terms of this License. You represent that You believe Your Modifications are Your original creation(s) and/or You have sufficient rights to grant the rights conveyed by this License.
-
- 3.3. Required Notices.
- You must include a notice in each of Your Modifications that identifies You as the Contributor of the Modification. You may not remove or alter any copyright, patent or trademark notices contained within the Covered Software, or any notices of licensing or any descriptive text giving attribution to any Contributor or the Initial Developer.
-
- 3.4. Application of Additional Terms.
- You may not offer or impose any terms on any Covered Software in Source Code form that alters or restricts the applicable version of this License or the recipients. rights hereunder. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, you may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear that any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
-
- 3.5. Distribution of Executable Versions.
- You may distribute the Executable form of the Covered Software under the terms of this License or under the terms of a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable form does not attempt to limit or alter the recipient.s rights in the Source Code form from the rights set forth in this License. If You distribute the Covered Software in Executable form under a different license, You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
-
- 3.6. Larger Works.
- You may create a Larger Work by combining Covered Software with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Software.
-
-4. Versions of the License.
-
- 4.1. New Versions.
- Sun Microsystems, Inc. is the initial license steward and may publish revised and/or new versions of this License from time to time. Each version will be given a distinguishing version number. Except as provided in Section 4.3, no one other than the license steward has the right to modify this License.
-
- 4.2. Effect of New Versions.
- You may always continue to use, distribute or otherwise make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. If the Initial Developer includes a notice in the Original Software prohibiting it from being distributed or otherwise made available under any subsequent version of the License, You must distribute and make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. Otherwise, You may also choose to use, distribute or otherwise make the Covered Software available under the terms of any subsequent version of the License published by the license steward.
-
- 4.3. Modified Versions.
- When You are an Initial Developer and You want to create a new license for Your Original Software, You may create and use a modified version of this License if You: (a) rename the license and remove any references to the name of the license steward (except to note that the license differs from this License); and (b) otherwise make it clear that the license contains terms which differ from this License.
-
-5. DISCLAIMER OF WARRANTY.
-
- COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN .AS IS. BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-6. TERMINATION.
-
- 6.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
-
- 6.2. If You assert a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You assert such claim is referred to as .Participant.) alleging that the Participant Software (meaning the Contributor Version where the Participant is a Contributor or the Original Software where the Participant is the Initial Developer) directly or indirectly infringes any patent, then any and all rights granted directly or indirectly to You by such Participant, the Initial Developer (if the Initial Developer is not the Participant) and all Contributors under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively and automatically at the expiration of such 60 day notice period, unless if within such 60 day period You withdraw Your claim with respect to the Participant Software against such Participant either unilaterally or pursuant to a writte
n agreement with Participant.
-
- 6.3. In the event of termination under Sections 6.1 or 6.2 above, all end user licenses that have been validly granted by You or any distributor hereunder prior to termination (excluding licenses granted to You by any distributor) shall survive termination.
-
-7. LIMITATION OF LIABILITY.
-
- UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY.S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-8. U.S. GOVERNMENT END USERS.
-
- The Covered Software is a .commercial item,. as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as that term is defined at 48 C.F.R. ? 252.227-7014(a)(1)) and .commercial computer software documentation. as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government rights in computer software under this License.
-
-9. MISCELLANEOUS.
-
- This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), excluding such jurisdiction.s conflict-of-law provisions. Any litigation relating to this License shall be subject to the jurisdiction of the courts located in the jurisdiction and venue specified in a notice contained within the Original Software, with the losing party responsible for costs, including, without limitation, court costs and reasonable attorneys. fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract sha
ll be construed against the drafter shall not apply to this License. You agree that You alone are responsible for compliance with the United States export administration regulations (and the export control laws and regulation of any other countries) when You use, distribute or otherwise make available any Covered Software.
-
-10. RESPONSIBILITY FOR CLAIMS.
-
- As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
-
- NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
-
- The code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California.
-
-
-The GNU General Public License (GPL) Version 2, June 1991
-
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-
-Preamble
-
-The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
-
-Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and modification follow.
-
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
-
-1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
-
-3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
-
-If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
-
-5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
-
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
-
-9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-END OF TERMS AND CONDITIONS
-
-
-How to Apply These Terms to Your New Programs
-
-If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
-
-To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
-
- One line to give the program's name and a brief idea of what it does.
-
- Copyright (C)
-
- This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- signature of Ty Coon, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License.
-
-
-"CLASSPATH" EXCEPTION TO THE GPL VERSION 2
-
-Certain source files distributed by Sun Microsystems, Inc. are subject to the following clarification and special exception to the GPL Version 2, but only where Sun has expressly included in the particular source file's header the words
-
-"Sun designates this particular file as subject to the "Classpath" exception as provided by Sun in the License file that accompanied this code."
-
-Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and conditions of the GNU General Public License Version 2 cover the whole combination.
-
-As a special exception, the copyright holders of this library give you permission to link this library with independent modules to produce an executable, regardless of the license terms of these independent modules, and to copy and distribute the resulting executable under terms of your choice, provided that you also meet, for each linked independent module, the terms and conditions of the license of that module.? An independent module is a module which is not derived from or based on this library.? If you modify this library, you may extend this exception to your version of the library, but you are not obligated to do so.? If you do not wish to do so, delete this exception statement from your version.
[02/50] [abbrv] incubator-edgent git commit: - Fixed a problem in the
test code which makes it fail on java7
Posted by dl...@apache.org.
- Fixed a problem in the test code which makes it fail on java7
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/3be8c498
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/3be8c498
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/3be8c498
Branch: refs/heads/develop
Commit: 3be8c498737c0d0b2b5a27ed9d20632eed8c589f
Parents: b176fd2
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Tue Oct 24 00:07:39 2017 +0200
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Tue Oct 24 00:07:39 2017 +0200
----------------------------------------------------------------------
connectors/mqtt/pom.xml | 6 ++++++
.../edgent/test/connectors/mqtt/MqttStreamsTestManual.java | 3 ++-
platforms/java7/connectors/mqtt/pom.xml | 6 ++++++
3 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/3be8c498/connectors/mqtt/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/mqtt/pom.xml b/connectors/mqtt/pom.xml
index 38cdbba..a6ac968 100644
--- a/connectors/mqtt/pom.xml
+++ b/connectors/mqtt/pom.xml
@@ -112,5 +112,11 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.4</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/3be8c498/connectors/mqtt/src/test/java/org/apache/edgent/test/connectors/mqtt/MqttStreamsTestManual.java
----------------------------------------------------------------------
diff --git a/connectors/mqtt/src/test/java/org/apache/edgent/test/connectors/mqtt/MqttStreamsTestManual.java b/connectors/mqtt/src/test/java/org/apache/edgent/test/connectors/mqtt/MqttStreamsTestManual.java
index 3a7938c..018c1c6 100644
--- a/connectors/mqtt/src/test/java/org/apache/edgent/test/connectors/mqtt/MqttStreamsTestManual.java
+++ b/connectors/mqtt/src/test/java/org/apache/edgent/test/connectors/mqtt/MqttStreamsTestManual.java
@@ -39,6 +39,7 @@ import java.util.Properties;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
+import org.apache.commons.lang3.StringUtils;
import org.apache.edgent.connectors.mqtt.MqttConfig;
import org.apache.edgent.connectors.mqtt.MqttStreams;
import org.apache.edgent.function.BiFunction;
@@ -791,7 +792,7 @@ public class MqttStreamsTestManual extends ConnectorTestBase {
// propTester.add("mqtt.persistence", "some.persistence.classname",
// () -> configRef.get().getPersistence());
propTester.add("mqtt.serverURLs", "tcp://somehost:1234,ssl://somehost:5678",
- () -> String.join(",", configRef.get().getServerURLs()));
+ () -> StringUtils.join(configRef.get().getServerURLs(), ","));
propTester.add("mqtt.subscriberIdleReconnectIntervalSec", "14",
() -> ((Integer)configRef.get().getSubscriberIdleReconnectInterval()).toString());
propTester.add("mqtt.trustStore", "some/path/truststore",
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/3be8c498/platforms/java7/connectors/mqtt/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/connectors/mqtt/pom.xml b/platforms/java7/connectors/mqtt/pom.xml
index 71c64ed..438754d 100644
--- a/platforms/java7/connectors/mqtt/pom.xml
+++ b/platforms/java7/connectors/mqtt/pom.xml
@@ -121,5 +121,11 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.4</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
[48/50] [abbrv] incubator-edgent git commit: - Fixed a wrong path in
the Jenkinsfile
Posted by dl...@apache.org.
- Fixed a wrong path in the Jenkinsfile
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/902ae4e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/902ae4e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/902ae4e3
Branch: refs/heads/develop
Commit: 902ae4e38b35d93e791c87e6071d2dea9f06dff7
Parents: 709fb97
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Wed Nov 1 16:24:45 2017 +0100
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Wed Nov 1 16:24:45 2017 +0100
----------------------------------------------------------------------
Jenkinsfile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/902ae4e3/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 6bd1fa1..7e315aa 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -63,7 +63,6 @@ node('ubuntu') {
stage ('Build Site') {
echo 'Building Site'
sh "${mvnHome}/bin/mvn ${mavenLocalRepo} site site:stage"
-
}
stage ('Build Samples') {
@@ -83,7 +82,7 @@ node('ubuntu') {
stage ('Verify get-engent-jars') {
echo 'Verifying get-edgent-jars'
- sh "cd samples/get-edgent-jars; ./get-edgent-jars.sh"
+ sh "cd samples/get-edgent-jars-project; ./get-edgent-jars.sh"
}
}
[44/50] [abbrv] incubator-edgent git commit: use "-incubating"
order in bundle names
Posted by dl...@apache.org.
use "<ver>-incubating" order in bundle names
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/4e7f32ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/4e7f32ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/4e7f32ec
Branch: refs/heads/develop
Commit: 4e7f32eca5d44100f7102ae2fccd966424c69829
Parents: ede4ab6
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Oct 31 12:47:53 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Oct 31 12:47:53 2017 -0400
----------------------------------------------------------------------
pom.xml | 4 ++--
samples/pom.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/4e7f32ec/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 819c6d5..362aba5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -271,7 +271,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<version>2.5.3</version>
<configuration>
- <finalName>apache-edgent-incubating-${project.version}</finalName>
+ <finalName>apache-edgent-${project.version}-incubating</finalName>
</configuration>
</plugin>
@@ -792,7 +792,7 @@
<descriptor>src/assembly/source-release.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
- <finalName>apache-edgent-incubating-${project.version}</finalName>
+ <finalName>apache-edgent-${project.version}-incubating</finalName>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/4e7f32ec/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index ecee16e..98b1b4e 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -168,7 +168,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <finalName>apache-edgent-incubating-samples-${project.version}</finalName>
+ <finalName>apache-edgent-${project.version}-incubating-samples</finalName>
<formats>
<format>zip</format>
<format>tar.gz</format>
[26/50] [abbrv] incubator-edgent git commit: reduce testAdaptablePoll
test time from 9s
Posted by dl...@apache.org.
reduce testAdaptablePoll test time from 9s
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/177e912f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/177e912f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/177e912f
Branch: refs/heads/develop
Commit: 177e912fad882dde649988c843a37038f8546539
Parents: 1231c6b
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Fri Oct 27 12:43:01 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Fri Oct 27 12:43:01 2017 -0400
----------------------------------------------------------------------
.../apache/edgent/test/topology/TopologyTest.java | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/177e912f/api/topology/src/test/java/org/apache/edgent/test/topology/TopologyTest.java
----------------------------------------------------------------------
diff --git a/api/topology/src/test/java/org/apache/edgent/test/topology/TopologyTest.java b/api/topology/src/test/java/org/apache/edgent/test/topology/TopologyTest.java
index cc1c059..033baa9 100644
--- a/api/topology/src/test/java/org/apache/edgent/test/topology/TopologyTest.java
+++ b/api/topology/src/test/java/org/apache/edgent/test/topology/TopologyTest.java
@@ -134,23 +134,23 @@ public abstract class TopologyTest extends TopologyAbstractTest {
job = jf.get();
assertEquals(Job.State.RUNNING, job.getCurrentState());
- setPollFrequency(s, 100, TimeUnit.MILLISECONDS);
+ setPollFrequency(s, 10, TimeUnit.MILLISECONDS);
cnt.set(0);
- Thread.sleep(TimeUnit.SECONDS.toMillis(3));
+ Thread.sleep(TimeUnit.SECONDS.toMillis(1));
int curCnt = cnt.get();
- assertTrue("curCnt="+curCnt, curCnt >= 20);
+ assertTrue("curCnt="+curCnt, curCnt >= 70);
- setPollFrequency(s, 1, TimeUnit.SECONDS);
+ setPollFrequency(s, 100, TimeUnit.MILLISECONDS);
cnt.set(0);
- Thread.sleep(TimeUnit.SECONDS.toMillis(3));
+ Thread.sleep(TimeUnit.SECONDS.toMillis(1));
curCnt = cnt.get();
- assertTrue("curCnt="+curCnt, curCnt >= 2 && curCnt <= 4);
+ assertTrue("curCnt="+curCnt, curCnt >= 5 && curCnt <= 20);
- setPollFrequency(s, 100, TimeUnit.MILLISECONDS);
+ setPollFrequency(s, 10, TimeUnit.MILLISECONDS);
cnt.set(0);
- Thread.sleep(TimeUnit.SECONDS.toMillis(3));
+ Thread.sleep(TimeUnit.SECONDS.toMillis(1));
curCnt = cnt.get();
- assertTrue("curCnt="+curCnt, curCnt >= 20);
+ assertTrue("curCnt="+curCnt, curCnt >= 70);
}
finally {
if (job != null)
[25/50] [abbrv] incubator-edgent git commit: exclude MQTT resource
client.p12 from RAT
Posted by dl...@apache.org.
exclude MQTT resource client.p12 from RAT
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/1231c6b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/1231c6b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/1231c6b9
Branch: refs/heads/develop
Commit: 1231c6b9833c4d50599dd8827115b853934d0578
Parents: ec48aad
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Fri Oct 27 10:42:45 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Fri Oct 27 10:42:45 2017 -0400
----------------------------------------------------------------------
connectors/mqtt/pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/1231c6b9/connectors/mqtt/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/mqtt/pom.xml b/connectors/mqtt/pom.xml
index a6ac968..e8698a6 100644
--- a/connectors/mqtt/pom.xml
+++ b/connectors/mqtt/pom.xml
@@ -55,6 +55,7 @@
<exclude>src/test/resources/keystores/*.key</exclude>
<exclude>src/test/resources/keystores/*.srl</exclude>
<exclude>src/test/resources/keystores/*.csr</exclude>
+ <exclude>src/test/resources/keystores/*.p12</exclude>
<exclude>src/test/resources/keystores/mosquitto-SSL.conf.template</exclude>
<exclude>src/test/resources/keystores/mosquitto.org.crt</exclude>
</excludes>
[21/50] [abbrv] incubator-edgent git commit: Add test dbg output for
testMultiTopologyPollWithError
Posted by dl...@apache.org.
Add test dbg output for testMultiTopologyPollWithError
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/45df0068
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/45df0068
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/45df0068
Branch: refs/heads/develop
Commit: 45df0068b5c222e10fa0e1d4d295759ac08d99ed
Parents: 2428f6f
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Thu Oct 26 16:04:51 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Thu Oct 26 16:04:51 2017 -0400
----------------------------------------------------------------------
.../edgent/test/topology/TStreamTest.java | 56 +++++++++++++++++---
.../topology/spi/tester/AbstractTester.java | 6 +++
2 files changed, 55 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/45df0068/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java
----------------------------------------------------------------------
diff --git a/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java b/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java
index 441d43f..464f8e2 100644
--- a/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java
+++ b/api/topology/src/test/java/org/apache/edgent/test/topology/TStreamTest.java
@@ -745,14 +745,26 @@ public abstract class TStreamTest extends TopologyAbstractTest {
Topology t = newTopology();
TStream<String> s = t.strings("a", "b", "c", "d", "e", "f", "g", "h");
// Throw on the 8th tuple
- s.sink((tuple) -> { if ("h".equals(tuple)) throw new RuntimeException("Expected Test Exception");});
+ s.sink((tuple) -> { if ("h".equals(tuple)) throw new RuntimeException("MTWE Expected Test Exception");});
// Expect 7 tuples out of 8
Condition<Long> tc = t.getTester().tupleCount(s, 7);
- complete(t, tc);
+// complete(t, tc);
+ try {
+ complete(t, tc);
+ } catch (Exception e) {
+ System.err.println("MTWE complete() threw e:"+e);
+ throw e;
+ }
return true;
});
}
- waitForCompletion(completer, executions);
+// waitForCompletion(completer, executions);
+ try {
+ waitForCompletion(completer, executions);
+ } catch (Exception e) {
+ System.err.println("MTWE waitForCompletion() threw e:"+e);
+ throw e;
+ }
}
/**
@@ -762,6 +774,24 @@ public abstract class TStreamTest extends TopologyAbstractTest {
@Test
public void testMultiTopologyPollWithError() throws Exception {
+ /*
+ * It's unclear exactly what this test is supposed to achieve
+ * (hence unclear how to ensure its achieving it).
+ * Is it just trying to verify that a failure in one topology/job
+ * doesn't affect the execution of another?
+ *
+ * The way the test is written I'm not sure there's any guarantee
+ * that the "Expected Exception" will be generated the appropriate
+ * number of times.
+ * Is it possible the completion condition could get evaluated
+ * true (having seen the 7th tuple) before the 8th tuple is generated
+ * and processed by the sink fn raising the exception, resulting in
+ * the job being closed... before the 8th is generated and processed?
+ * I'm also seeing more "Expected Test Exception" traces than I expected.
+ *
+ * Annotate this and the MPWE test a bit to help understand what we're seeing
+ * in the output.
+ */
int executions = 4;
ExecutorCompletionService<Boolean> completer = new ExecutorCompletionService<>(
Executors.newFixedThreadPool(executions));
@@ -771,15 +801,27 @@ public abstract class TStreamTest extends TopologyAbstractTest {
AtomicLong n = new AtomicLong(0);
TStream<Long> s = t.poll(() -> n.incrementAndGet(), 10, TimeUnit.MILLISECONDS);
// Throw on the 8th tuple
- s.sink((tuple) -> { if (8 == n.get()) throw new RuntimeException("Expected Test Exception");});
+ s.sink((tuple) -> { if (8 == n.get()) throw new RuntimeException("MTPWE Expected Test Exception");});
// Expect 7 tuples out of 8
Condition<Long> tc = t.getTester().tupleCount(s, 7);
- complete(t, tc);
+// complete(t, tc);
+ try {
+ complete(t, tc);
+ } catch (Exception e) {
+ System.err.println("MTPWE complete() threw e:"+e);
+ throw e;
+ }
return true;
});
}
- waitForCompletion(completer, executions);
- }
+// waitForCompletion(completer, executions);
+ try {
+ waitForCompletion(completer, executions);
+ } catch (Exception e) {
+ System.err.println("MTPWE waitForCompletion() threw e:"+e);
+ throw e;
+ }
+ }
@Test
public void testJoinWithWindow() throws Exception{
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/45df0068/spi/topology/src/main/java/org/apache/edgent/topology/spi/tester/AbstractTester.java
----------------------------------------------------------------------
diff --git a/spi/topology/src/main/java/org/apache/edgent/topology/spi/tester/AbstractTester.java b/spi/topology/src/main/java/org/apache/edgent/topology/spi/tester/AbstractTester.java
index 0c10a08..3dee72a 100644
--- a/spi/topology/src/main/java/org/apache/edgent/topology/spi/tester/AbstractTester.java
+++ b/spi/topology/src/main/java/org/apache/edgent/topology/spi/tester/AbstractTester.java
@@ -73,8 +73,14 @@ public abstract class AbstractTester implements Tester {
Thread.sleep(100);
}
+ if (!endCondition.valid() && getJob().getCurrentState() != State.CLOSED) {
+ System.err.println("complete(): timed out after " + tmoMsec + "msec");
+ }
+
if (getJob().getCurrentState() != State.CLOSED)
getJob().stateChange(Job.Action.CLOSE);
+ else
+ System.out.println("complete(): Job already closed");
return endCondition.valid();
}
[31/50] [abbrv] incubator-edgent git commit: remove all gradle
tooling artifacts and "exclusions" from the repo
Posted by dl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/javax.websocket-api-1.0.CDDL-1.1
----------------------------------------------------------------------
diff --git a/licenses/binary-release/javax.websocket-api-1.0.CDDL-1.1 b/licenses/binary-release/javax.websocket-api-1.0.CDDL-1.1
deleted file mode 100644
index 58c107c..0000000
--- a/licenses/binary-release/javax.websocket-api-1.0.CDDL-1.1
+++ /dev/null
@@ -1,209 +0,0 @@
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)Version 1.1
-
-1. Definitions.
-
-1.1. “Contributor” means each individual or entity that creates or contributes to the creation of Modifications.
-1.2. “Contributor Version” means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor.
-1.3. “Covered Software” means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof.
-1.4. “Executable” means the Covered Software in any form other than Source Code.
-1.5. “Initial Developer” means the individual or entity that first makes Original Software available under this License.
-1.6. “Larger Work” means a work which combines Covered Software or portions thereof with code not governed by the terms of this License.
-1.7. “License” means this document.
-1.8. “Licensable” means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
-1.9. “Modifications” means the Source Code and Executable form of any of the following:
-A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications;
-B. Any new file that contains any part of the Original Software or previous Modification; or
-C. Any new file that is contributed or otherwise made available under the terms of this License.
-1.10. “Original Software” means the Source Code and Executable form of computer software code that is originally released under this License.
-1.11. “Patent Claims” means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
-1.12. “Source Code” means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code.
-1.13. “You” (or “Your”) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, “You” includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, “control” means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
-2. License Grants.
-
-2.1. The Initial Developer Grant.
-Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license:
-(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and
-(b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof).
-(c) The licenses granted in Sections 2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License.
-(d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1) for code that You delete from the Original Software, or (2) for infringements caused by: (i) the modification of the Original Software, or (ii) the combination of the Original Software with other software or devices.
-2.2. Contributor Grant.
-Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:
-(a) under intellectual property rights (other than patent or trademark) Licensable by Contributor to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and
-(b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: (1) Modifications made by that Contributor (or portions thereof); and (2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination).
-(c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first distributes or otherwise makes the Modifications available to a third party.
-(d) Notwithstanding Section 2.2(b) above, no patent license is granted: (1) for any code that Contributor has deleted from the Contributor Version; (2) for infringements caused by: (i) third party modifications of Contributor Version, or (ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or (3) under Patent Claims infringed by Covered Software in the absence of Modifications made by that Contributor.
-3. Distribution Obligations.
-
-3.1. Availability of Source Code.
-Any Covered Software that You distribute or otherwise make available in Executable form must also be made available in Source Code form and that Source Code form must be distributed only under the terms of this License. You must include a copy of this License with every copy of the Source Code form of the Covered Software You distribute or otherwise make available. You must inform recipients of any such Covered Software in Executable form as to how they can obtain such Covered Software in Source Code form in a reasonable manner on or through a medium customarily used for software exchange.
-3.2. Modifications.
-The Modifications that You create or to which You contribute are governed by the terms of this License. You represent that You believe Your Modifications are Your original creation(s) and/or You have sufficient rights to grant the rights conveyed by this License.
-3.3. Required Notices.
-You must include a notice in each of Your Modifications that identifies You as the Contributor of the Modification. You may not remove or alter any copyright, patent or trademark notices contained within the Covered Software, or any notices of licensing or any descriptive text giving attribution to any Contributor or the Initial Developer.
-3.4. Application of Additional Terms.
-You may not offer or impose any terms on any Covered Software in Source Code form that alters or restricts the applicable version of this License or the recipients' rights hereunder. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, you may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear that any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
-3.5. Distribution of Executable Versions.
-You may distribute the Executable form of the Covered Software under the terms of this License or under the terms of a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable form does not attempt to limit or alter the recipient's rights in the Source Code form from the rights set forth in this License. If You distribute the Covered Software in Executable form under a different license, You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
-3.6. Larger Works.
-You may create a Larger Work by combining Covered Software with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Software.
-4. Versions of the License.
-
-4.1. New Versions.
-Oracle is the initial license steward and may publish revised and/or new versions of this License from time to time. Each version will be given a distinguishing version number. Except as provided in Section 4.3, no one other than the license steward has the right to modify this License.
-4.2. Effect of New Versions.
-You may always continue to use, distribute or otherwise make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. If the Initial Developer includes a notice in the Original Software prohibiting it from being distributed or otherwise made available under any subsequent version of the License, You must distribute and make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. Otherwise, You may also choose to use, distribute or otherwise make the Covered Software available under the terms of any subsequent version of the License published by the license steward.
-4.3. Modified Versions.
-When You are an Initial Developer and You want to create a new license for Your Original Software, You may create and use a modified version of this License if You: (a) rename the license and remove any references to the name of the license steward (except to note that the license differs from this License); and (b) otherwise make it clear that the license contains terms which differ from this License.
-5. DISCLAIMER OF WARRANTY.
-
-COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN “AS IS” BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-6. TERMINATION.
-
-6.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
-6.2. If You assert a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You assert such claim is referred to as “Participant”) alleging that the Participant Software (meaning the Contributor Version where the Participant is a Contributor or the Original Software where the Participant is the Initial Developer) directly or indirectly infringes any patent, then any and all rights granted directly or indirectly to You by such Participant, the Initial Developer (if the Initial Developer is not the Participant) and all Contributors under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively and automatically at the expiration of such 60 day notice period, unless if within such 60 day period You withdraw Your claim with respect to the Participant Software against such Participant either unilaterally or pursuant to a written
agreement with Participant.
-6.3. If You assert a patent infringement claim against Participant alleging that the Participant Software directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license.
-6.4. In the event of termination under Sections 6.1 or 6.2 above, all end user licenses that have been validly granted by You or any distributor hereunder prior to termination (excluding licenses granted to You by any distributor) shall survive termination.
-7. LIMITATION OF LIABILITY.
-
-UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-8. U.S. GOVERNMENT END USERS.
-
-The Covered Software is a “commercial item,” as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of “commercial computer software” (as that term is defined at 48 C.F.R. § 252.227-7014(a)(1)) and “commercial computer software documentation” as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government rights in computer software under this License.
-
-9. MISCELLANEOUS.
-
-This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), excluding such jurisdiction's conflict-of-law provisions. Any litigation relating to this License shall be subject to the jurisdiction of the courts located in the jurisdiction and venue specified in a notice contained within the Original Software, with the losing party responsible for costs, including, without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall
be construed against the drafter shall not apply to this License. You agree that You alone are responsible for compliance with the United States export administration regulations (and the export control laws and regulation of any other countries) when You use, distribute or otherwise make available any Covered Software.
-
-10. RESPONSIBILITY FOR CLAIMS.
-
-As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
-
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
-
-The code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California.
-
-
-
-The GNU General Public License (GPL) Version 2, June 1991
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-
-Preamble
-
-The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
-
-Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and modification follow.
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
-
-1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
-
-a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
-b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
-c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
-These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
-
-3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
-
-a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
-b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
-c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
-The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
-
-If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
-
-5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
-
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
-
-9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-END OF TERMS AND CONDITIONS
-
-How to Apply These Terms to Your New Programs
-
-If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
-
-To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
-
-One line to give the program's name and a brief idea of what it does.
-Copyright (C) <year> <name of author>
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this when it starts in an interactive mode:
-
-Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
-The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:
-
-Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker.
-signature of Ty Coon, 1 April 1989
-Ty Coon, President of Vice
-This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License.
-
-"CLASSPATH" EXCEPTION TO THE GPL VERSION 2
-
-Certain source files distributed by Oracle are subject to the following clarification and special exception to the GPL Version 2, but only where Oracle has expressly included in the particular source file's header the words "Oracle designates this particular file as subject to the "Classpath" exception as provided by Oracle in the License file that accompanied this code."
-
-Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and conditions of the GNU General Public License Version 2 cover the whole combination.
-
-As a special exception, the copyright holders of this library give you permission to link this library with independent modules to produce an executable, regardless of the license terms of these independent modules, and to copy and distribute the resulting executable under terms of your choice, provided that you also meet, for each linked independent module, the terms and conditions of the license of that module. An independent module is a module which is not derived from or based on this library. If you modify this library, you may extend this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version.
-
-
-
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/jetty-http-9.3.6.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/jetty-http-9.3.6.AL-2.0 b/licenses/binary-release/jetty-http-9.3.6.AL-2.0
deleted file mode 100644
index e13b48d..0000000
--- a/licenses/binary-release/jetty-http-9.3.6.AL-2.0
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>19 May, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). The Content is dual licensed and is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL") as well as the Apache Software License Version 2.0. A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. A copy of the ASL is available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html">http://www.apache.org/licenses/LICENSE-2.0.html</a>. For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-<p><b>jetty-util</b> artifact only:<br/><br/>The UnixCrypt.java code implements the one way cryptography used by
-Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
-modified April 2001 by Iris Van den Broeke, Daniel Deville.
-Permission to use, copy, modify and distribute UnixCrypt
-for non-commercial or commercial purposes and without fee is
-granted provided that the copyright notice appears in all copies.</p>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/jetty-io-9.3.6.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/jetty-io-9.3.6.AL-2.0 b/licenses/binary-release/jetty-io-9.3.6.AL-2.0
deleted file mode 100644
index e13b48d..0000000
--- a/licenses/binary-release/jetty-io-9.3.6.AL-2.0
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>19 May, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). The Content is dual licensed and is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL") as well as the Apache Software License Version 2.0. A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. A copy of the ASL is available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html">http://www.apache.org/licenses/LICENSE-2.0.html</a>. For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-<p><b>jetty-util</b> artifact only:<br/><br/>The UnixCrypt.java code implements the one way cryptography used by
-Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
-modified April 2001 by Iris Van den Broeke, Daniel Deville.
-Permission to use, copy, modify and distribute UnixCrypt
-for non-commercial or commercial purposes and without fee is
-granted provided that the copyright notice appears in all copies.</p>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/jetty-security-9.3.6.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/jetty-security-9.3.6.AL-2.0 b/licenses/binary-release/jetty-security-9.3.6.AL-2.0
deleted file mode 100644
index e13b48d..0000000
--- a/licenses/binary-release/jetty-security-9.3.6.AL-2.0
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>19 May, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). The Content is dual licensed and is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL") as well as the Apache Software License Version 2.0. A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. A copy of the ASL is available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html">http://www.apache.org/licenses/LICENSE-2.0.html</a>. For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-<p><b>jetty-util</b> artifact only:<br/><br/>The UnixCrypt.java code implements the one way cryptography used by
-Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
-modified April 2001 by Iris Van den Broeke, Daniel Deville.
-Permission to use, copy, modify and distribute UnixCrypt
-for non-commercial or commercial purposes and without fee is
-granted provided that the copyright notice appears in all copies.</p>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/jetty-server-9.3.6.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/jetty-server-9.3.6.AL-2.0 b/licenses/binary-release/jetty-server-9.3.6.AL-2.0
deleted file mode 100644
index e13b48d..0000000
--- a/licenses/binary-release/jetty-server-9.3.6.AL-2.0
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>19 May, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). The Content is dual licensed and is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL") as well as the Apache Software License Version 2.0. A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. A copy of the ASL is available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html">http://www.apache.org/licenses/LICENSE-2.0.html</a>. For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-<p><b>jetty-util</b> artifact only:<br/><br/>The UnixCrypt.java code implements the one way cryptography used by
-Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
-modified April 2001 by Iris Van den Broeke, Daniel Deville.
-Permission to use, copy, modify and distribute UnixCrypt
-for non-commercial or commercial purposes and without fee is
-granted provided that the copyright notice appears in all copies.</p>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/jetty-servlet-9.3.6.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/jetty-servlet-9.3.6.AL-2.0 b/licenses/binary-release/jetty-servlet-9.3.6.AL-2.0
deleted file mode 100644
index e13b48d..0000000
--- a/licenses/binary-release/jetty-servlet-9.3.6.AL-2.0
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>19 May, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). The Content is dual licensed and is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL") as well as the Apache Software License Version 2.0. A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. A copy of the ASL is available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html">http://www.apache.org/licenses/LICENSE-2.0.html</a>. For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-<p><b>jetty-util</b> artifact only:<br/><br/>The UnixCrypt.java code implements the one way cryptography used by
-Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
-modified April 2001 by Iris Van den Broeke, Daniel Deville.
-Permission to use, copy, modify and distribute UnixCrypt
-for non-commercial or commercial purposes and without fee is
-granted provided that the copyright notice appears in all copies.</p>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/jetty-util-9.3.6.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/jetty-util-9.3.6.AL-2.0 b/licenses/binary-release/jetty-util-9.3.6.AL-2.0
deleted file mode 100644
index e13b48d..0000000
--- a/licenses/binary-release/jetty-util-9.3.6.AL-2.0
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>19 May, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). The Content is dual licensed and is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL") as well as the Apache Software License Version 2.0. A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. A copy of the ASL is available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html">http://www.apache.org/licenses/LICENSE-2.0.html</a>. For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-<p><b>jetty-util</b> artifact only:<br/><br/>The UnixCrypt.java code implements the one way cryptography used by
-Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
-modified April 2001 by Iris Van den Broeke, Daniel Deville.
-Permission to use, copy, modify and distribute UnixCrypt
-for non-commercial or commercial purposes and without fee is
-granted provided that the copyright notice appears in all copies.</p>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/jetty-webapp-9.3.6.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/jetty-webapp-9.3.6.AL-2.0 b/licenses/binary-release/jetty-webapp-9.3.6.AL-2.0
deleted file mode 100644
index e13b48d..0000000
--- a/licenses/binary-release/jetty-webapp-9.3.6.AL-2.0
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>19 May, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). The Content is dual licensed and is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL") as well as the Apache Software License Version 2.0. A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. A copy of the ASL is available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html">http://www.apache.org/licenses/LICENSE-2.0.html</a>. For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-<p><b>jetty-util</b> artifact only:<br/><br/>The UnixCrypt.java code implements the one way cryptography used by
-Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
-modified April 2001 by Iris Van den Broeke, Daniel Deville.
-Permission to use, copy, modify and distribute UnixCrypt
-for non-commercial or commercial purposes and without fee is
-granted provided that the copyright notice appears in all copies.</p>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/jetty-xml-9.3.6.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/jetty-xml-9.3.6.AL-2.0 b/licenses/binary-release/jetty-xml-9.3.6.AL-2.0
deleted file mode 100644
index e13b48d..0000000
--- a/licenses/binary-release/jetty-xml-9.3.6.AL-2.0
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>19 May, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). The Content is dual licensed and is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL") as well as the Apache Software License Version 2.0. A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. A copy of the ASL is available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html">http://www.apache.org/licenses/LICENSE-2.0.html</a>. For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-<p><b>jetty-util</b> artifact only:<br/><br/>The UnixCrypt.java code implements the one way cryptography used by
-Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
-modified April 2001 by Iris Van den Broeke, Daniel Deville.
-Permission to use, copy, modify and distribute UnixCrypt
-for non-commercial or commercial purposes and without fee is
-granted provided that the copyright notice appears in all copies.</p>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/joda-time-2.9.2.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/joda-time-2.9.2.AL-2.0 b/licenses/binary-release/joda-time-2.9.2.AL-2.0
deleted file mode 100644
index 75b5248..0000000
--- a/licenses/binary-release/joda-time-2.9.2.AL-2.0
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/joda-time-2.9.2.NOTICE
----------------------------------------------------------------------
diff --git a/licenses/binary-release/joda-time-2.9.2.NOTICE b/licenses/binary-release/joda-time-2.9.2.NOTICE
deleted file mode 100644
index ac95834..0000000
--- a/licenses/binary-release/joda-time-2.9.2.NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-=============================================================================
-= NOTICE file corresponding to section 4d of the Apache License Version 2.0 =
-=============================================================================
-This product includes software developed by
-Joda.org (http://www.joda.org/).
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/kafka-clients-0.8.2.2.AL-2.0
----------------------------------------------------------------------
diff --git a/licenses/binary-release/kafka-clients-0.8.2.2.AL-2.0 b/licenses/binary-release/kafka-clients-0.8.2.2.AL-2.0
deleted file mode 100644
index d645695..0000000
--- a/licenses/binary-release/kafka-clients-0.8.2.2.AL-2.0
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/52f6fb33/licenses/binary-release/kafka-clients-0.8.2.2.NOTICE
----------------------------------------------------------------------
diff --git a/licenses/binary-release/kafka-clients-0.8.2.2.NOTICE b/licenses/binary-release/kafka-clients-0.8.2.2.NOTICE
deleted file mode 100644
index ac656d3..0000000
--- a/licenses/binary-release/kafka-clients-0.8.2.2.NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Kafka
-Copyright 2012 The Apache Software Foundation.
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
[11/50] [abbrv] incubator-edgent git commit: disable file test
testRetainAgeBased with "ci" for now
Posted by dl...@apache.org.
disable file test testRetainAgeBased with "ci" for now
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/bab6c94d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/bab6c94d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/bab6c94d
Branch: refs/heads/develop
Commit: bab6c94d664a1a1be87c2da6d8ec0ce8d8b2b14b
Parents: 9bd024d
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Oct 24 22:04:35 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Oct 24 22:04:35 2017 -0400
----------------------------------------------------------------------
.../test/connectors/file/FileStreamsTextFileWriterTest.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/bab6c94d/connectors/file/src/test/java/org/apache/edgent/test/connectors/file/FileStreamsTextFileWriterTest.java
----------------------------------------------------------------------
diff --git a/connectors/file/src/test/java/org/apache/edgent/test/connectors/file/FileStreamsTextFileWriterTest.java b/connectors/file/src/test/java/org/apache/edgent/test/connectors/file/FileStreamsTextFileWriterTest.java
index e246639..4c0b9cb 100644
--- a/connectors/file/src/test/java/org/apache/edgent/test/connectors/file/FileStreamsTextFileWriterTest.java
+++ b/connectors/file/src/test/java/org/apache/edgent/test/connectors/file/FileStreamsTextFileWriterTest.java
@@ -28,6 +28,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
import java.io.BufferedInputStream;
import java.io.BufferedReader;
@@ -443,6 +444,11 @@ public class FileStreamsTextFileWriterTest extends DirectTopologyTestBase {
@Test
public void testRetainAgeBased() throws Exception {
+ // The mechanisms of this test no longer work with the
+ // recent changes to bump the tmo 2x when edgent.build.ci=true.
+ // So disable while we continue to work on this.
+ assumeTrue(!Boolean.getBoolean("edgent.build.ci"));
+
Topology t = newTopology("testRetainAgeBased");
// establish a base path
[17/50] [abbrv] incubator-edgent git commit: fix websocket tests to
not use complete() TMO for success completion
Posted by dl...@apache.org.
fix websocket tests to not use complete() TMO for success completion
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/a6db4b8f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/a6db4b8f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/a6db4b8f
Branch: refs/heads/develop
Commit: a6db4b8f9d2d49ba62f815c51fb4fd1cd3edc9b1
Parents: 719fe6d
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Oct 25 16:01:43 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Oct 25 16:01:43 2017 -0400
----------------------------------------------------------------------
.../javax/websocket/WebSocketClientTest.java | 78 ++++++++++++++++++--
1 file changed, 70 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a6db4b8f/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientTest.java
----------------------------------------------------------------------
diff --git a/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientTest.java b/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientTest.java
index 58e7531..fd16084 100644
--- a/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientTest.java
+++ b/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientTest.java
@@ -20,6 +20,7 @@ package org.apache.edgent.test.connectors.wsclient.javax.websocket;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue;
import java.net.InetSocketAddress;
@@ -27,6 +28,7 @@ import java.net.Socket;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.CountDownLatch;
@@ -42,6 +44,7 @@ import org.apache.edgent.topology.TStream;
import org.apache.edgent.topology.Topology;
import org.apache.edgent.topology.json.JsonFunctions;
import org.apache.edgent.topology.plumbing.PlumbingStreams;
+import org.apache.edgent.topology.tester.Condition;
import org.junit.After;
import org.junit.Test;
@@ -596,9 +599,38 @@ public class WebSocketClientTest extends ConnectorTestBase {
s = PlumbingStreams.blockingOneShotDelay(s, 2, TimeUnit.SECONDS);
wsClient.sendString(s);
- TStream<String> rcvd = wsClient.receiveString();
+ TStream<String> rcvd = wsClient.receiveString(); // rcv nothing
+
+ // in this case there's no useful condition that we can check for
+ // to validate this is behaving properly other than the connector doesn't
+ // blow up and that nothing is rcvd, so just wait a short time
+ // before verifying nothing was rcvd.
+ // Don't use the complete() TMO for successful termination.
+
+ Condition<List<String>> rcvdContent = t.getTester().streamContents(rcvd, new String[0]);
+ Condition<Object> tc = newWaitTimeCondition(3);
- completeAndValidate("", t, rcvd, SEC_TMO, new String[0]); //rcv nothing
+ complete(t, tc, SEC_TMO, TimeUnit.SECONDS);
+ assertTrue("rcvd: "+rcvdContent.getResult(), rcvdContent.valid());
+ }
+
+ private Condition<Object> newWaitTimeCondition(int seconds) {
+ return new Condition<Object>() {
+ private long startTime = 0;
+ private long endTime = 0;
+ private volatile boolean done = false;
+ public boolean valid() {
+ if (startTime==0) {
+ startTime = System.currentTimeMillis();
+ endTime = startTime + TimeUnit.SECONDS.toMillis(seconds);
+ }
+ long now = System.currentTimeMillis();
+ done = now >= endTime;
+ return done;
+ }
+ public Object getResult() { return done; }
+ };
+
}
@Test
@@ -675,9 +707,19 @@ public class WebSocketClientTest extends ConnectorTestBase {
s = PlumbingStreams.blockingOneShotDelay(s, 2, TimeUnit.SECONDS);
wsClient.sendString(s);
- TStream<String> rcvd = wsClient.receiveString();
+ TStream<String> rcvd = wsClient.receiveString(); // rcv nothing
+
+ // in this case there's no useful condition that we can check for
+ // to validate this is behaving properly other than the connector doesn't
+ // blow up and that nothing is rcvd, so just wait a short time
+ // before verifying nothing was rcvd.
+ // Don't use the complete() TMO for successful termination.
+
+ Condition<List<String>> rcvdContent = t.getTester().streamContents(rcvd, new String[0]);
+ Condition<Object> tc = newWaitTimeCondition(3);
- completeAndValidate("", t, rcvd, SEC_TMO, new String[0]); // rcv nothing
+ complete(t, tc, SEC_TMO, TimeUnit.SECONDS);
+ assertTrue("rcvd: "+rcvdContent.getResult(), rcvdContent.valid());
}
@Test
@@ -733,9 +775,19 @@ public class WebSocketClientTest extends ConnectorTestBase {
s = PlumbingStreams.blockingOneShotDelay(s, 2, TimeUnit.SECONDS);
wsClient.sendString(s);
- TStream<String> rcvd = wsClient.receiveString();
+ TStream<String> rcvd = wsClient.receiveString(); // rcv nothing
+
+ // in this case there's no useful condition that we can check for
+ // to validate this is behaving properly other than the connector doesn't
+ // blow up and that nothing is rcvd, so just wait a short time
+ // before verifying nothing was rcvd.
+ // Don't use the complete() TMO for successful termination.
- completeAndValidate("", t, rcvd, SEC_TMO, new String[0]); //rcv nothing
+ Condition<List<String>> rcvdContent = t.getTester().streamContents(rcvd, new String[0]);
+ Condition<Object> tc = newWaitTimeCondition(3);
+
+ complete(t, tc, SEC_TMO, TimeUnit.SECONDS);
+ assertTrue("rcvd: "+rcvdContent.getResult(), rcvdContent.valid());
}
private void skipTestIfCantConnect(Properties config) throws Exception {
@@ -847,9 +899,19 @@ public class WebSocketClientTest extends ConnectorTestBase {
s = PlumbingStreams.blockingOneShotDelay(s, 2, TimeUnit.SECONDS);
wsClient.sendString(s);
- TStream<String> rcvd = wsClient.receiveString();
+ TStream<String> rcvd = wsClient.receiveString(); // rcv nothing
+
+ // in this case there's no useful condition that we can check for
+ // to validate this is behaving properly other than the connector doesn't
+ // blow up and that nothing is rcvd, so just wait a short time
+ // before verifying nothing was rcvd.
+ // Don't use the complete() TMO for successful termination.
+
+ Condition<List<String>> rcvdContent = t.getTester().streamContents(rcvd, new String[0]);
+ Condition<Object> tc = newWaitTimeCondition(3);
- completeAndValidate("", t, rcvd, SEC_TMO, new String[0]); //rcv nothing
+ complete(t, tc, SEC_TMO, TimeUnit.SECONDS);
+ assertTrue("rcvd: "+rcvdContent.getResult(), rcvdContent.valid());
}
finally {
sslProps.restore();
[40/50] [abbrv] incubator-edgent git commit: - Give the multiple
steps another try
Posted by dl...@apache.org.
- Give the multiple steps another try
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/d244cc72
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/d244cc72
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/d244cc72
Branch: refs/heads/develop
Commit: d244cc720d06ff1d39c31973d3f26f49764b123c
Parents: 2977261
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Tue Oct 31 15:43:16 2017 +0100
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Tue Oct 31 15:43:16 2017 +0100
----------------------------------------------------------------------
Jenkinsfile | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d244cc72/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index aef183c..852c792 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,13 +29,15 @@ node('ubuntu') {
env.JAVA_HOME="${tool 'JDK 1.8 (latest)'}"
env.PATH="${env.JAVA_HOME}/bin:${env.PATH}"
+ def workspace = pwd()
+
// Make sure the feature branches don't change the SNAPSHOTS in Nexus.
def mavenGoal = "install"
def mavenLocalRepo = ""
if(env.BRANCH_NAME == 'develop') {
mavenGoal = "deploy"
} else {
- mavenLocalRepo = "-Dmaven.repo.local=.repository"
+ mavenLocalRepo = "-Dmaven.repo.local=${workspace)/.repository"
}
def mavenFailureMode = "" // consider "--fail-at-end"? Odd ordering side effects?
@@ -53,24 +55,24 @@ node('ubuntu') {
stage ('Build Edgent') {
echo 'Building Edgent'
sh "${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-android,platform-java7,distribution,toolchain -Djava8.home=${env.JAVA_HOME} -Dedgent.build.ci=true clean ${mavenGoal} sonar:sonar site:site"
-/* }
+ }
- stage ('Build Samples') {*/
+ stage ('Build Samples') {
echo 'Building samples'
sh "cd samples; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} clean package"
sh "cd samples/topology; ./run-sample.sh HelloEdgent"
sh "cd samples; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-java7 clean package"
sh "cd samples/topology; ./run-sample.sh HelloEdgent"
-/* }
+ }
- stage ('Build Templates') {*/
+ stage ('Build Templates') {
echo 'Building templates'
sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} clean package; ./run-app.sh"
sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-java7 clean package; ./run-app.sh"
sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo} -Pplatform-android clean package; ./run-app.sh"
-/* }
+ }
- stage ('Verify get-engent-jars') {*/
+ stage ('Verify get-engent-jars') {
echo 'Verifying get-edgent-jars'
sh "cd samples/get-edgent-jars; ./get-edgent-jars.sh"
}