include java8 tgt name in externalJars path Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/29ff8814 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/29ff8814 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/29ff8814
Branch: refs/heads/master Commit: 29ff8814522cf856183e5a6ec10090f028a34c46 Parents: a1dafea Author: Dale LaBossiere <dlab...@us.ibm.com> Authored: Fri Sep 30 09:18:37 2016 -0400 Committer: Dale LaBossiere <dlab...@us.ibm.com> Committed: Fri Sep 30 09:18:37 2016 -0400 ---------------------------------------------------------------------- analytics/.classpath | 2 +- build.gradle | 2 +- connectors/.classpath | 72 +++++++++++++++++++++++----------------------- console/.classpath | 18 ++++++------ ext/.classpath | 8 +++--- 5 files changed, 51 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/29ff8814/analytics/.classpath ---------------------------------------------------------------------- diff --git a/analytics/.classpath b/analytics/.classpath index 36e1d49..82ecf3d 100644 --- a/analytics/.classpath +++ b/analytics/.classpath @@ -4,7 +4,7 @@ <classpathentry kind="src" path="math3/src/test/java"/> <classpathentry kind="src" path="sensors/src/main/java"/> <classpathentry kind="src" path="sensors/src/test/java"/> - <classpathentry exported="true" kind="lib" path="../externalJars/analytics/math3/ext/commons-math3-3.4.1.jar"/> + <classpathentry exported="true" kind="lib" path="../externalJars/java8/analytics/math3/ext/commons-math3-3.4.1.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> <classpathentry combineaccessrules="false" kind="src" path="/api"/> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/29ff8814/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 20e9bb3..6fe9d8f 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,7 @@ ext { DSTAMP = String.format('%tY%<tm%<td', now) TSTAMP = String.format('%tH%<tM', now) - external_jars_dir = "$rootProject.projectDir/externalJars" // unaffected by clean + external_jars_dir = "$rootProject.projectDir/externalJars/java8" target_dir = "$distsDir" target_java8_dir = "$target_dir/java8" http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/29ff8814/connectors/.classpath ---------------------------------------------------------------------- diff --git a/connectors/.classpath b/connectors/.classpath index a845278..fa2b4e2 100644 --- a/connectors/.classpath +++ b/connectors/.classpath @@ -28,42 +28,42 @@ <classpathentry kind="src" path="wsclient-javax.websocket/src/main/java"/> <classpathentry kind="src" path="wsclient-javax.websocket/src/test/java"/> <classpathentry kind="src" path="javax.websocket-client/src/main/resources"/> - <classpathentry kind="lib" path="../externalJars/connectors/http/ext/commons-codec-1.9.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/http/ext/commons-logging-1.2.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/http/ext/httpclient-4.5.1.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/http/ext/httpcore-4.4.4.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/iotp/ext/watson-iot-0.1.5.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/iotp/ext/commons-lang3-3.4.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/iotp/ext/commons-codec-1.10.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/iotp/ext/commons-logging-1.2.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/iotp/ext/commons-net-3.3.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/iotp/ext/httpclient-4.5.1.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/iotp/ext/httpcore-4.4.3.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/iotp/ext/joda-time-2.9.2.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/iotp/ext/org.eclipse.paho.client.mqttv3-1.1.0.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/kafka/ext/kafka_2.10-0.8.2.2.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/kafka/ext/kafka-clients-0.8.2.2.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/kafka/ext/log4j-1.2.16.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/kafka/ext/metrics-core-2.2.0.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/kafka/ext/scala-library-2.10.4.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/kafka/ext/zkclient-0.3.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/kafka/ext/zookeeper-3.4.6.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/mqtt/ext/org.eclipse.paho.client.mqttv3-1.0.2.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/javax.websocket-client/ext/javax-websocket-client-impl-9.3.6.v20151106.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/javax.websocket-client/ext/javax.websocket-api-1.0.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/javax.websocket-client/ext/jetty-util-9.3.6.v20151106.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/javax.websocket-client/ext/websocket-api-9.3.6.v20151106.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/javax.websocket-client/ext/websocket-client-9.3.6.v20151106.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/javax.websocket-client/ext/websocket-common-9.3.6.v20151106.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/javax.websocket-server/ext/javax-websocket-server-impl-9.3.6.v20151106.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/javax.websocket-server/ext/jetty-http-9.3.6.v20151106.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/javax.websocket-server/ext/jetty-io-9.3.6.v20151106.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/javax.websocket-server/ext/jetty-security-9.3.6.v20151106.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/javax.websocket-server/ext/jetty-server-9.3.6.v20151106.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/javax.websocket-server/ext/jetty-servlet-9.3.6.v20151106.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/javax.websocket-server/ext/javax.servlet-api-3.1.0.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/javax.websocket-server/ext/websocket-server-9.3.6.v20151106.jar"/> - <classpathentry kind="lib" path="../externalJars/connectors/javax.websocket-server/ext/websocket-servlet-9.3.6.v20151106.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/http/ext/commons-codec-1.9.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/http/ext/commons-logging-1.2.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/http/ext/httpclient-4.5.1.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/http/ext/httpcore-4.4.4.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/iotp/ext/watson-iot-0.1.5.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/iotp/ext/commons-lang3-3.4.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/iotp/ext/commons-codec-1.10.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/iotp/ext/commons-logging-1.2.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/iotp/ext/commons-net-3.3.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/iotp/ext/httpclient-4.5.1.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/iotp/ext/httpcore-4.4.3.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/iotp/ext/joda-time-2.9.2.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/iotp/ext/org.eclipse.paho.client.mqttv3-1.1.0.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/kafka/ext/kafka_2.10-0.8.2.2.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/kafka/ext/kafka-clients-0.8.2.2.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/kafka/ext/log4j-1.2.16.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/kafka/ext/metrics-core-2.2.0.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/kafka/ext/scala-library-2.10.4.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/kafka/ext/zkclient-0.3.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/kafka/ext/zookeeper-3.4.6.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/mqtt/ext/org.eclipse.paho.client.mqttv3-1.0.2.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/javax.websocket-client/ext/javax-websocket-client-impl-9.3.6.v20151106.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/javax.websocket-client/ext/javax.websocket-api-1.0.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/javax.websocket-client/ext/jetty-util-9.3.6.v20151106.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/javax.websocket-client/ext/websocket-api-9.3.6.v20151106.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/javax.websocket-client/ext/websocket-client-9.3.6.v20151106.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/javax.websocket-client/ext/websocket-common-9.3.6.v20151106.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/javax.websocket-server/ext/javax-websocket-server-impl-9.3.6.v20151106.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/javax.websocket-server/ext/jetty-http-9.3.6.v20151106.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/javax.websocket-server/ext/jetty-io-9.3.6.v20151106.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/javax.websocket-server/ext/jetty-security-9.3.6.v20151106.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/javax.websocket-server/ext/jetty-server-9.3.6.v20151106.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/javax.websocket-server/ext/jetty-servlet-9.3.6.v20151106.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/javax.websocket-server/ext/javax.servlet-api-3.1.0.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/javax.websocket-server/ext/websocket-server-9.3.6.v20151106.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/connectors/javax.websocket-server/ext/websocket-servlet-9.3.6.v20151106.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> <classpathentry combineaccessrules="false" kind="src" path="/api"/> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/29ff8814/console/.classpath ---------------------------------------------------------------------- diff --git a/console/.classpath b/console/.classpath index f9a77ba..a2a5a9c 100644 --- a/console/.classpath +++ b/console/.classpath @@ -3,15 +3,15 @@ <classpathentry kind="src" path="server/src/main/java"/> <classpathentry kind="src" path="server/src/test/java"/> <classpathentry kind="src" path="servlets/src/main/java"/> - <classpathentry kind="lib" path="../externalJars/console/server/ext/jetty-http-9.3.6.v20151106.jar"/> - <classpathentry kind="lib" path="../externalJars/console/server/ext/jetty-io-9.3.6.v20151106.jar"/> - <classpathentry kind="lib" path="../externalJars/console/server/ext/jetty-security-9.3.6.v20151106.jar"/> - <classpathentry kind="lib" path="../externalJars/console/server/ext/jetty-server-9.3.6.v20151106.jar"/> - <classpathentry kind="lib" path="../externalJars/console/server/ext/jetty-servlet-9.3.6.v20151106.jar"/> - <classpathentry kind="lib" path="../externalJars/console/server/ext/jetty-util-9.3.6.v20151106.jar"/> - <classpathentry kind="lib" path="../externalJars/console/server/ext/jetty-webapp-9.3.6.v20151106.jar"/> - <classpathentry kind="lib" path="../externalJars/console/server/ext/jetty-xml-9.3.6.v20151106.jar"/> - <classpathentry kind="lib" path="../externalJars/console/server/ext/javax.servlet-api-3.1.0.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/console/server/ext/jetty-http-9.3.6.v20151106.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/console/server/ext/jetty-io-9.3.6.v20151106.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/console/server/ext/jetty-security-9.3.6.v20151106.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/console/server/ext/jetty-server-9.3.6.v20151106.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/console/server/ext/jetty-servlet-9.3.6.v20151106.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/console/server/ext/jetty-util-9.3.6.v20151106.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/console/server/ext/jetty-webapp-9.3.6.v20151106.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/console/server/ext/jetty-xml-9.3.6.v20151106.jar"/> + <classpathentry kind="lib" path="../externalJars/java8/console/server/ext/javax.servlet-api-3.1.0.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> <classpathentry combineaccessrules="false" kind="src" path="/ext"/> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/29ff8814/ext/.classpath ---------------------------------------------------------------------- diff --git a/ext/.classpath b/ext/.classpath index ca61f28..87f01c5 100644 --- a/ext/.classpath +++ b/ext/.classpath @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry exported="true" kind="lib" path="../externalJars/ext/gson-2.2.4.jar"/> - <classpathentry exported="true" kind="lib" path="../externalJars/ext/metrics-core-3.1.2.jar"/> - <classpathentry exported="true" kind="lib" path="../externalJars/ext/slf4j-api-1.7.12.jar"/> - <classpathentry exported="true" kind="lib" path="../externalJars/ext/slf4j-jdk14-1.7.12.jar"/> + <classpathentry exported="true" kind="lib" path="../externalJars/java8/ext/gson-2.2.4.jar"/> + <classpathentry exported="true" kind="lib" path="../externalJars/java8/ext/metrics-core-3.1.2.jar"/> + <classpathentry exported="true" kind="lib" path="../externalJars/java8/ext/slf4j-api-1.7.12.jar"/> + <classpathentry exported="true" kind="lib" path="../externalJars/java8/ext/slf4j-jdk14-1.7.12.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="bin"/> </classpath>
