You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by cd...@apache.org on 2017/11/21 11:50:41 UTC
[01/50] incubator-edgent-samples git commit: - Added the config to
make the servlet.war available to the examples in "edgent-samples-topology"
Repository: incubator-edgent-samples
Updated Branches:
refs/heads/develop [created] 82e4b8076
- Added the config to make the servlet.war available to the examples in "edgent-samples-topology"
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/9a0ef885
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/9a0ef885
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/9a0ef885
Branch: refs/heads/develop
Commit: 9a0ef885b63a85ff6dd88a54506f3fea31639887
Parents: 6e8d3e2
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Mon Aug 14 15:39:23 2017 +0200
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Mon Aug 14 15:39:23 2017 +0200
----------------------------------------------------------------------
topology/pom.xml | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/9a0ef885/topology/pom.xml
----------------------------------------------------------------------
diff --git a/topology/pom.xml b/topology/pom.xml
index 76231e2..0a2581c 100644
--- a/topology/pom.xml
+++ b/topology/pom.xml
@@ -32,6 +32,36 @@
<name>Apache Edgent: Samples: Topology</name>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.0.1</version>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.edgent.console</groupId>
+ <artifactId>edgent-console-servlets</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <outputDirectory>${project.build.directory}/war-resources</outputDirectory>
+ <destFileName>servlets.war</destFileName>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<!-- parent pom has Edgent provider and SLF4J dependencies -->
[25/50] incubator-edgent-samples git commit: fix NOTICE initial
copyright dates
Posted by cd...@apache.org.
fix NOTICE initial copyright dates
- fix initial copyright date in NOTICE files
- and add 'non-IBM' NOTICE files to achieve the above
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/3a5355dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/3a5355dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/3a5355dd
Branch: refs/heads/develop
Commit: 3a5355dd3b54223d494c03a3003d85be79f7a1f3
Parents: 2bfdbf4
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Oct 4 11:24:14 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Oct 4 11:24:14 2017 -0400
----------------------------------------------------------------------
apps/src/main/resources/META-INF/NOTICE | 2 +-
connectors/src/main/resources/META-INF/NOTICE | 2 +-
console/src/main/resources/META-INF/NOTICE | 2 +-
scenarios/src/main/resources/META-INF/NOTICE | 6 ++++++
topology/src/main/resources/META-INF/NOTICE | 2 +-
utils/src/main/resources/META-INF/NOTICE | 2 +-
6 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3a5355dd/apps/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/apps/src/main/resources/META-INF/NOTICE b/apps/src/main/resources/META-INF/NOTICE
index 42d63a2..4b208a9 100644
--- a/apps/src/main/resources/META-INF/NOTICE
+++ b/apps/src/main/resources/META-INF/NOTICE
@@ -1,6 +1,6 @@
Apache Edgent: Samples: Apps
-Copyright 2017 The Apache Software Foundation
+Copyright 2016-2017 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-samples/blob/3a5355dd/connectors/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/connectors/src/main/resources/META-INF/NOTICE b/connectors/src/main/resources/META-INF/NOTICE
index dc8d2dd..cce431c 100644
--- a/connectors/src/main/resources/META-INF/NOTICE
+++ b/connectors/src/main/resources/META-INF/NOTICE
@@ -1,6 +1,6 @@
Apache Edgent: Samples: Connectors
-Copyright 2017 The Apache Software Foundation
+Copyright 2016-2017 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-samples/blob/3a5355dd/console/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/console/src/main/resources/META-INF/NOTICE b/console/src/main/resources/META-INF/NOTICE
index 8fa37cf..0b5f6e3 100644
--- a/console/src/main/resources/META-INF/NOTICE
+++ b/console/src/main/resources/META-INF/NOTICE
@@ -1,6 +1,6 @@
Apache Edgent: Samples: Console
-Copyright 2017 The Apache Software Foundation
+Copyright 2016-2017 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-samples/blob/3a5355dd/scenarios/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/scenarios/src/main/resources/META-INF/NOTICE b/scenarios/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..2f9c926
--- /dev/null
+++ b/scenarios/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,6 @@
+
+Apache Edgent: Samples: Scenarios
+Copyright 2016-2017 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-samples/blob/3a5355dd/topology/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/topology/src/main/resources/META-INF/NOTICE b/topology/src/main/resources/META-INF/NOTICE
index 8933656..e02f844 100644
--- a/topology/src/main/resources/META-INF/NOTICE
+++ b/topology/src/main/resources/META-INF/NOTICE
@@ -1,6 +1,6 @@
Apache Edgent: Samples: Topology
-Copyright 2017 The Apache Software Foundation
+Copyright 2016-2017 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-samples/blob/3a5355dd/utils/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/utils/src/main/resources/META-INF/NOTICE b/utils/src/main/resources/META-INF/NOTICE
index 0b428dc..a581fd5 100644
--- a/utils/src/main/resources/META-INF/NOTICE
+++ b/utils/src/main/resources/META-INF/NOTICE
@@ -1,6 +1,6 @@
Apache Edgent: Samples: Utils
-Copyright 2017 The Apache Software Foundation
+Copyright 2016-2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
[16/50] incubator-edgent-samples git commit: - Fixed an invalid
groupId
Posted by cd...@apache.org.
- Fixed an invalid groupId
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/7d38a3e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/7d38a3e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/7d38a3e8
Branch: refs/heads/develop
Commit: 7d38a3e87505493446bed21eaa2b79daef14c44a
Parents: 3f3e932
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Tue Sep 26 21:12:53 2017 +0200
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Tue Sep 26 21:12:53 2017 +0200
----------------------------------------------------------------------
apps/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/7d38a3e8/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index 2fba1ca..d6d7ea4 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -55,7 +55,7 @@
<version>1.2.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.edgent.connectors</groupId>
+ <groupId>${edgent.base.groupId}.connectors</groupId>
<artifactId>edgent-connectors-iotp</artifactId>
<version>1.2.0-SNAPSHOT</version>
</dependency>
[12/50] incubator-edgent-samples git commit: tweak get-edgent-jars.sh
Posted by cd...@apache.org.
tweak get-edgent-jars.sh
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/1bfb8fc4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/1bfb8fc4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/1bfb8fc4
Branch: refs/heads/develop
Commit: 1bfb8fc4fd9c5e78289ca00f7c70bc7f2c9ae16f
Parents: e7e0b32
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Sep 19 15:07:10 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Sep 19 15:07:10 2017 -0400
----------------------------------------------------------------------
get-edgent-jars.sh | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/1bfb8fc4/get-edgent-jars.sh
----------------------------------------------------------------------
diff --git a/get-edgent-jars.sh b/get-edgent-jars.sh
index f5354bc..c00e72d 100755
--- a/get-edgent-jars.sh
+++ b/get-edgent-jars.sh
@@ -31,14 +31,6 @@
##
## Creates the directory get-edgent-jars-project and a maven project in it
-### TODO
-### missing console/servlets/target/edgent-console-servlets-1.2.0-SNAPSHOT.war
-### before manually adding it below, figure out why it's not automatically pulled in as a dep
-### note, as is, even if putting that war in the classpath, DevelopmentSample doesn't work
-###
-### connector-websocket doesn't work??? / check on correct set of wsclient deps
-### FWIW, HelloEdgent and IotpQuickstart work against the jars retrieved by this script.
-
USAGE="usage: [--platform {java8|java7|android}] [--version edgent-version] [--artifacts csv-gav-list] [--file gav-file]"
set -e
@@ -73,6 +65,15 @@ fi
# would directly declare/use and let these components
# (most typically the provider) pull in the rest of the
# Edgent jars (and their dependencies)
+#
+# Explicitly add edgent-connectors-websocket-jetty
+# as there's not a direct dependency on it from connectors-websocket.
+#
+# Hmm... consider adding org.apache.edgent.console:edgent-console-servlets:{EV}:war
+# It's bundled in edgent-console-server.jar. Having it separately available
+# would enable having the "console" in a Servler engine of the user's choosing.
+# If added, may want to put it in a directory other than edgent-jars.
+#
DEFAULT_GAVS=`cat << EOF
org.slf4j:slf4j-jdk14:${SLF4J_VERSION}
org.apache.edgent.analytics:edgent-analytics-math3:{EV}
@@ -89,9 +90,7 @@ org.apache.edgent.connectors:edgent-connectors-mqtt:{EV}
org.apache.edgent.connectors:edgent-connectors-pubsub:{EV}
org.apache.edgent.connectors:edgent-connectors-serial:{EV}
org.apache.edgent.connectors:edgent-connectors-websocket:{EV}
-org.apache.edgent.connectors:edgent-connectors-websocket-base:{EV}
org.apache.edgent.connectors:edgent-connectors-websocket-jetty:{EV}
-org.apache.edgent.connectors:edgent-connectors-websocket-misc:{EV}
org.apache.edgent.providers:edgent-providers-development:{EV}
org.apache.edgent.providers:edgent-providers-direct:{EV}
org.apache.edgent.providers:edgent-providers-iot:{EV}
@@ -158,7 +157,7 @@ mkdir -p target
DEP_DECLS_FILE=target/tmp-dep-decls
rm -f ${DEP_DECLS_FILE}
for i in ${ARTIFACT_GAVS}; do
- echo $i | awk -F : '{ printf "<dependency>\n <groupId>%s</groupId>\n <artifactId>%s</artifactId>\n <version>%s</version>\n</dependency>\n", $1, $2, $3 }' >> ${DEP_DECLS_FILE}
+ echo $i | awk -F : '{ type=""; if ($4 != "") type=" <type>" $4 "</type>\n"; printf "<dependency>\n <groupId>%s</groupId>\n <artifactId>%s</artifactId>\n <version>%s</version>\n%s</dependency>\n", $1, $2, $3, type }' >> ${DEP_DECLS_FILE}
done
DEP_DECLS=`cat ${DEP_DECLS_FILE}`
[45/50] incubator-edgent-samples git commit: getting started updates
Posted by cd...@apache.org.
getting started updates
- fix mvnw in samples/template
- add TempSensorSample
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/2b267b2d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/2b267b2d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/2b267b2d
Branch: refs/heads/develop
Commit: 2b267b2d2a99f3d0f1dcae04bb1686f9d6cce80d
Parents: b4ae7a8
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
----------------------------------------------------------------------
README.md | 6 +-
.../.mvn/wrapper/MavenWrapperDownloader.java | 110 +++++++++++++++++++
template/.mvn/wrapper/maven-wrapper.properties | 20 ++++
template/README.md | 2 +-
template/app-run.sh | 15 ++-
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-samples/blob/2b267b2d/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 09079d4..6bd26ed 100644
--- a/README.md
+++ b/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-samples/blob/2b267b2d/template/.mvn/wrapper/MavenWrapperDownloader.java
----------------------------------------------------------------------
diff --git a/template/.mvn/wrapper/MavenWrapperDownloader.java b/template/.mvn/wrapper/MavenWrapperDownloader.java
new file mode 100644
index 0000000..44f8e00
--- /dev/null
+++ b/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-samples/blob/2b267b2d/template/.mvn/wrapper/maven-wrapper.properties
----------------------------------------------------------------------
diff --git a/template/.mvn/wrapper/maven-wrapper.properties b/template/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..7e8f382
--- /dev/null
+++ b/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-samples/blob/2b267b2d/template/README.md
----------------------------------------------------------------------
diff --git a/template/README.md b/template/README.md
index a0763fd..365dc46 100644
--- a/template/README.md
+++ b/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-samples/blob/2b267b2d/template/app-run.sh
----------------------------------------------------------------------
diff --git a/template/app-run.sh b/template/app-run.sh
index 996bfbb..8437275 100755
--- a/template/app-run.sh
+++ b/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-samples/blob/2b267b2d/topology/run-sample.sh
----------------------------------------------------------------------
diff --git a/topology/run-sample.sh b/topology/run-sample.sh
index 1614a7d..d6fa8af 100755
--- a/topology/run-sample.sh
+++ b/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-samples/blob/2b267b2d/topology/src/main/java/org/apache/edgent/samples/topology/TempSensor.java
----------------------------------------------------------------------
diff --git a/topology/src/main/java/org/apache/edgent/samples/topology/TempSensor.java b/topology/src/main/java/org/apache/edgent/samples/topology/TempSensor.java
new file mode 100644
index 0000000..d9b8a40
--- /dev/null
+++ b/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-samples/blob/2b267b2d/topology/src/main/java/org/apache/edgent/samples/topology/TempSensorApplication.java
----------------------------------------------------------------------
diff --git a/topology/src/main/java/org/apache/edgent/samples/topology/TempSensorApplication.java b/topology/src/main/java/org/apache/edgent/samples/topology/TempSensorApplication.java
new file mode 100644
index 0000000..b1aba6b
--- /dev/null
+++ b/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);
+ }
+}
[49/50] incubator-edgent-samples git commit: Update sample poms for
1.2.0-SNAPSHOT to 1.3.0-SNAPSHOT
Posted by cd...@apache.org.
Update sample poms for 1.2.0-SNAPSHOT to 1.3.0-SNAPSHOT
commit a221f2f changed a lot of the poms but didn't get these.
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/3943bd57
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/3943bd57
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/3943bd57
Branch: refs/heads/develop
Commit: 3943bd572cd4430838a470b6e1c3b428f183cf31
Parents: eb42102
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Mon Nov 6 18:30:09 2017 -0500
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Mon Nov 6 18:30:09 2017 -0500
----------------------------------------------------------------------
apps/pom.xml | 2 +-
connectors/pom.xml | 2 +-
console/pom.xml | 2 +-
console/run-sample.sh | 1 -
get-edgent-jars-project/README.md | 2 +-
get-edgent-jars-project/pom.xml.template | 2 +-
pom.xml | 2 +-
scenarios/pom.xml | 2 +-
scenarios/run-sample.sh | 1 -
template/pom.xml | 2 +-
topology/pom.xml | 2 +-
topology/run-sample.sh | 1 -
utils/pom.xml | 2 +-
utils/run-sample.sh | 1 -
14 files changed, 10 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3943bd57/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index 7ee0b34..3423571 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.edgent</groupId>
<artifactId>edgent-samples</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<artifactId>edgent-samples-apps</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3943bd57/connectors/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/pom.xml b/connectors/pom.xml
index 1ef7756..1f7b3dd 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.edgent</groupId>
<artifactId>edgent-samples</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<artifactId>edgent-samples-connectors</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3943bd57/console/pom.xml
----------------------------------------------------------------------
diff --git a/console/pom.xml b/console/pom.xml
index 8cad8ad..da45e56 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.edgent</groupId>
<artifactId>edgent-samples</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<artifactId>edgent-samples-console</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3943bd57/console/run-sample.sh
----------------------------------------------------------------------
diff --git a/console/run-sample.sh b/console/run-sample.sh
index b11529e..f97b058 100755
--- a/console/run-sample.sh
+++ b/console/run-sample.sh
@@ -20,7 +20,6 @@ USAGE="usage: `basename $0` [--list] simple-main-class-name [sample-args]"
CATEGORY=console
-#UBER_JAR=target/edgent-samples-topology-1.2.0-SNAPSHOT-uber.jar
UBER_JAR=target/edgent-samples-${CATEGORY}-*-uber.jar
SAMPLE_PACKAGE_BASE=org.apache.edgent.samples.${CATEGORY}
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3943bd57/get-edgent-jars-project/README.md
----------------------------------------------------------------------
diff --git a/get-edgent-jars-project/README.md b/get-edgent-jars-project/README.md
index ad176b9..174980c 100644
--- a/get-edgent-jars-project/README.md
+++ b/get-edgent-jars-project/README.md
@@ -28,7 +28,7 @@ project's default Edgent version.
``` sh
cd get-edgent-jars-project
-./get-edgent-jars.sh --version 1.2.0-SNAPSHOT # retrieve the Edgent 1.2.0-SNAPSHOT java8 jars
+./get-edgent-jars.sh --version 1.3.0-SNAPSHOT # retrieve the Edgent 1.3.0-SNAPSHOT java8 jars
##### Generating dependency decls...
##### Generating pom.xml...
...
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3943bd57/get-edgent-jars-project/pom.xml.template
----------------------------------------------------------------------
diff --git a/get-edgent-jars-project/pom.xml.template b/get-edgent-jars-project/pom.xml.template
index 2027f84..8c89690 100644
--- a/get-edgent-jars-project/pom.xml.template
+++ b/get-edgent-jars-project/pom.xml.template
@@ -30,7 +30,7 @@
<groupId>org.apache.edgent</groupId>
<artifactId>get-edgent-jars-project</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<name>Apache Edgent get-edgent-jars-project ${samples.projname.platform}</name>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3943bd57/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 98b1b4e..a3ca547 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.edgent</groupId>
<artifactId>edgent-samples</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Edgent Samples ${samples.projname.platform}:</name>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3943bd57/scenarios/pom.xml
----------------------------------------------------------------------
diff --git a/scenarios/pom.xml b/scenarios/pom.xml
index e6eabc5..2880387 100644
--- a/scenarios/pom.xml
+++ b/scenarios/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.edgent</groupId>
<artifactId>edgent-samples</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<artifactId>edgent-samples-scenarios</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3943bd57/scenarios/run-sample.sh
----------------------------------------------------------------------
diff --git a/scenarios/run-sample.sh b/scenarios/run-sample.sh
index 2b2c92b..99536c1 100755
--- a/scenarios/run-sample.sh
+++ b/scenarios/run-sample.sh
@@ -20,7 +20,6 @@ USAGE="usage: `basename $0` [--list] simple-main-class-name [sample-args]"
CATEGORY=scenarios
-#UBER_JAR=target/edgent-samples-topology-1.2.0-SNAPSHOT-uber.jar
UBER_JAR=target/edgent-samples-${CATEGORY}-*-uber.jar
SAMPLE_PACKAGE_BASE=org.apache.edgent.samples.${CATEGORY}
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3943bd57/template/pom.xml
----------------------------------------------------------------------
diff --git a/template/pom.xml b/template/pom.xml
index e1e855d..72739d2 100644
--- a/template/pom.xml
+++ b/template/pom.xml
@@ -37,7 +37,7 @@
<properties>
<edgent.runtime.platform/> <!-- set by -Pplatform-* -->
<edgent.runtime.groupId>org.apache.edgent${edgent.runtime.platform}</edgent.runtime.groupId>
- <edgent.runtime.version>1.2.0-SNAPSHOT</edgent.runtime.version>
+ <edgent.runtime.version>1.3.0-SNAPSHOT</edgent.runtime.version>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3943bd57/topology/pom.xml
----------------------------------------------------------------------
diff --git a/topology/pom.xml b/topology/pom.xml
index 8fcaa89..8aa5274 100644
--- a/topology/pom.xml
+++ b/topology/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.edgent</groupId>
<artifactId>edgent-samples</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<artifactId>edgent-samples-topology</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3943bd57/topology/run-sample.sh
----------------------------------------------------------------------
diff --git a/topology/run-sample.sh b/topology/run-sample.sh
index d6fa8af..c7a6e05 100755
--- a/topology/run-sample.sh
+++ b/topology/run-sample.sh
@@ -20,7 +20,6 @@ USAGE="usage: `basename $0` [--list] simple-main-class-name [sample-args]"
CATEGORY=topology
-#UBER_JAR=target/edgent-samples-topology-1.2.0-SNAPSHOT-uber.jar
UBER_JAR=target/edgent-samples-${CATEGORY}-*-uber.jar
SAMPLE_PACKAGE_BASE=org.apache.edgent.samples.${CATEGORY}
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3943bd57/utils/pom.xml
----------------------------------------------------------------------
diff --git a/utils/pom.xml b/utils/pom.xml
index 2a2cd0c..4eff56a 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.edgent</groupId>
<artifactId>edgent-samples</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<artifactId>edgent-samples-utils</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3943bd57/utils/run-sample.sh
----------------------------------------------------------------------
diff --git a/utils/run-sample.sh b/utils/run-sample.sh
index 697f44f..760c5bc 100755
--- a/utils/run-sample.sh
+++ b/utils/run-sample.sh
@@ -20,7 +20,6 @@ USAGE="usage: `basename $0` [--list] simple-main-class-name [sample-args]"
CATEGORY=utils
-#UBER_JAR=target/edgent-samples-topology-1.2.0-SNAPSHOT-uber.jar
UBER_JAR=target/edgent-samples-${CATEGORY}-*-uber.jar
SAMPLE_PACKAGE_BASE=org.apache.edgent.samples.${CATEGORY}
[33/50] incubator-edgent-samples git commit: fix get-edgent-jars for
j7 and android
Posted by cd...@apache.org.
fix get-edgent-jars for j7 and android
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/ab0098af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/ab0098af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/ab0098af
Branch: refs/heads/develop
Commit: ab0098af645b2a0c6e85cf10e6bf9f308cacec87
Parents: 6c7236f
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Oct 11 10:00:38 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Oct 11 10:00:38 2017 -0400
----------------------------------------------------------------------
.gitignore | 42 ++++++++++++++++++++++++++++++++++++++++++
console/.gitignore | 2 +-
cron/.gitignore | 2 +-
get-edgent-jars.sh | 30 ++++++++++++++++++++++++------
pom.xml | 2 +-
template/pom.xml | 4 ++--
6 files changed, 71 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab0098af/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ea30b70
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,42 @@
+
+# get-edgent-jars generated outout
+get-edgent-jars-project
+
+*.class
+
+# Local developers toolchain
+/toolchains-local.xml
+
+# Exclude the maven-wrapper.jar
+.mvn/wrapper/maven-wrapper.jar
+
+# More generated artifacts
+target/
+/test/svt/lib
+/release-edgent
+/reports
+/.gradle/
+build/
+/externalJars
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+# IntelliJ Idea
+.idea/
+*.iml
+
+# Eclipse
+.classpath
+.project
+.settings/
+
+# Emacs
+*~
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab0098af/console/.gitignore
----------------------------------------------------------------------
diff --git a/console/.gitignore b/console/.gitignore
index a50dafe..d3cd401 100644
--- a/console/.gitignore
+++ b/console/.gitignore
@@ -1,2 +1,2 @@
# sample's output file
-consoleUrl.txt
\ No newline at end of file
+consoleUrl.txt
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab0098af/cron/.gitignore
----------------------------------------------------------------------
diff --git a/cron/.gitignore b/cron/.gitignore
index ed3454e..127f7ab 100644
--- a/cron/.gitignore
+++ b/cron/.gitignore
@@ -1,3 +1,3 @@
# mkcrontab generated output
-startapp.cron
\ No newline at end of file
+startapp.cron
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab0098af/get-edgent-jars.sh
----------------------------------------------------------------------
diff --git a/get-edgent-jars.sh b/get-edgent-jars.sh
index c00e72d..46a2bbf 100755
--- a/get-edgent-jars.sh
+++ b/get-edgent-jars.sh
@@ -17,7 +17,6 @@
#
## Get the Apache Edgent jars and their transitive external dependencies.
-## Requires that maven (mvn) be installed and on the PATH
##
## By default get the Edgent java8 platform jars for the script's default Edgent version.
##
@@ -28,13 +27,17 @@
## --file gav-file get only the specified artifacts. Not restricted to Edgent jars.
## The Edgent version is substituted for all instances of '{EV}'
## Lines that begin with '#' are ignored.
+## --mvn mvn-cmd use mvn-cmd instead of "./mvnw"
##
## Creates the directory get-edgent-jars-project and a maven project in it
-USAGE="usage: [--platform {java8|java7|android}] [--version edgent-version] [--artifacts csv-gav-list] [--file gav-file]"
+USAGE="usage: [--platform {java8|java7|android}] [--version edgent-version] [--artifacts csv-gav-list] [--file gav-file] [--mvn mvn-cmd]"
set -e
+SAMPLES_DIR=`(cd $(dirname $0); pwd)`
+MVN_CMD=${SAMPLES_DIR}/mvnw
+
EDGENT_PLATFORM=java8
EDGENT_VERSION=1.2.0
SLF4J_VERSION=1.7.12
@@ -56,6 +59,9 @@ if [ "$1" = "--file" -a $# -gt 1 ]; then
OPT_GAVS_FILE=$2; shift; shift
OPT_GAVS=`sed -e '/^#/d' < ${OPT_GAVS_FILE}`
fi
+if [ "$1" = "--mvn" -a $# -gt 1 ]; then
+ MVN_CMD=$2; shift; shift
+fi
if [ $# != 0 ]; then
echo "$USAGE"
exit 1
@@ -132,11 +138,19 @@ confirm "Continue?" || exit
###########################
if [ ! -d ${PROJ_DIR} ]; then
echo "##### Generating maven project ${PROJ_DIR}..."
- mvn -B archetype:generate \
+ # ensure a standalone pom (no parent) to avoid unwanted inherited deps
+ TMP_PROJ=${PROJ_DIR}-tmp
+ mkdir ${TMP_PROJ}
+ cd ${TMP_PROJ}
+ ${MVN_CMD} -B archetype:generate \
-DarchetypeGroupId=org.apache.maven.archeTypes \
+ -DarchetypeArtifactId=maven-archetype-quickstart \
-DgroupId=org.apache.edgent.tools \
-DartifactId=${PROJ_DIR} \
-Dversion=1.0
+ cd ..
+ mv ${TMP_PROJ}/${PROJ_DIR} ${PROJ_DIR}
+ rmdir ${TMP_PROJ}
cp ${PROJ_DIR}/pom.xml ${PROJ_DIR}/pom.xml.orig
else
cp ${PROJ_DIR}/pom.xml.orig ${PROJ_DIR}/pom.xml
@@ -175,12 +189,16 @@ EOF
###########################
echo
echo "##### Retrieving jars into local maven repo..."
-mvn clean compile
+${MVN_CMD} clean compile
###########################
echo
echo "##### Copying jars..."
-mvn dependency:copy-dependencies -DincludeScope=runtime
+# if someone screws up j7 or android deps, uncomment the following and
+# it will help identify wrong jars that are getting included / copied
+# (and otherwise overwriting each other).
+#DEBUG_DEPS=-Dmdep.prependGroupId=true
+${MVN_CMD} dependency:copy-dependencies -DincludeScope=runtime ${DEBUG_DEPS}
DEPS_SRC_DIR=target/dependency
EDGENT_DEPS_DIR=${EDGENT_PLATFORM}/edgent-jars
@@ -191,7 +209,7 @@ rm -rf "${EXT_DEPS_DIR}"; mkdir -p ${EXT_DEPS_DIR}
cp ${DEPS_SRC_DIR}/* ${EXT_DEPS_DIR}
-for i in `find ${EXT_DEPS_DIR} -name 'edgent-*.*ar'`; do
+for i in `find ${EXT_DEPS_DIR} -name '*edgent-*.*ar'`; do
mv $i ${EDGENT_DEPS_DIR}
done
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab0098af/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 794cc89..966abf8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
<name>Apache Edgent: Samples</name>
<properties>
- <edgent.platform></edgent.platform>
+ <edgent.platform/> <!-- set by -Pplatform-* -->
<edgent.base.groupId>org.apache.edgent${edgent.platform}</edgent.base.groupId>
<edgent.version>1.2.0-SNAPSHOT</edgent.version>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab0098af/template/pom.xml
----------------------------------------------------------------------
diff --git a/template/pom.xml b/template/pom.xml
index 593b958..fd8e7d4 100644
--- a/template/pom.xml
+++ b/template/pom.xml
@@ -21,11 +21,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
+ <!--parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>18</version>
- </parent>
+ </parent-->
<!-- your Edgent Application coordinates here -->
<groupId>com.mycompany.app</groupId>
[38/50] incubator-edgent-samples git commit: more doc work
Posted by cd...@apache.org.
more doc work
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/51ddbc28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/51ddbc28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/51ddbc28
Branch: refs/heads/develop
Commit: 51ddbc28273108d9767353f03868d114ccbe7d8f
Parents: fdc2723
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Oct 17 16:56:48 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Oct 17 16:56:48 2017 -0400
----------------------------------------------------------------------
APPLICATION_DEVELOPMENT.md | 65 ++++++++++++++++++-----------------------
README.md | 2 +-
pom.xml | 2 ++
3 files changed, 32 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/51ddbc28/APPLICATION_DEVELOPMENT.md
----------------------------------------------------------------------
diff --git a/APPLICATION_DEVELOPMENT.md b/APPLICATION_DEVELOPMENT.md
index 3166931..92f0099 100644
--- a/APPLICATION_DEVELOPMENT.md
+++ b/APPLICATION_DEVELOPMENT.md
@@ -38,6 +38,8 @@ Java 8 and Java 7 respectively.
See `JAVA_SUPPORT.md` for more information on artifact coordinates, etc.
+## Writing Your Application
+
The Edgent API is most easily used by using Java8 lambda expressions.
If you only want to deploy your Edgent application to a java8 environment
then your application may use any java8 features it chooses. You compile
@@ -63,22 +65,20 @@ Eclipse or IntelliJ). The tooling transparently downloads the
required Edgent jars from the maven repository if they aren't
already present in your local maven repository.
-The supplied Edgent samples poms include support for building for
-a java8, java7 or android execution environment. The poms are
-configured for the generation of a standard jar as well as an
-uber jar for a sample application.
-
-You can clone the `samples/template` project as a starting point
-for your Edgent application. See `samples/template/README.md`.
+### Edgent Application Template
+
+You can clone the `template` project as a starting point for your
+Edgent application. See [samples/template/README.md](template/README.md).
TODO: we would like to provide a maven Edgent Application archetype
that users can use to create an application project template.
+### Using Non-maven-integrated Tooling
+
If you can't or don't want to use maven-repository-enabled tooling
you will need to get a local copy of the Edgent jars and their
dependencies and add them to your compile classpath. This case
-is covered in the following sections.
-
+is covered in subsequent sections.
## Packaging and Execution
@@ -106,11 +106,26 @@ The uber jar contains the application's classes and
the application's dependent Edgent classes and their
transitive dependencies.
-The Edgent samples template project's pom and
+The template project's pom and
the Edgent samples poms contain configuration information
that generates an uber jar in addition to the standard
application jar. Eclipse can also export an uber jar.
+### Separately manage the application and Edgent jars
+
+Copy the application's jars to the device.
+Get a copy of the Edgent jars and their dependencies
+onto the device. It's possible for multiple Edgent
+applications to share the Edgent jars.
+
+The Apache Edgent project does not release a
+binary bundle containing all of the Edgent jars
+and their dependencies. The binary artifacts
+are only released to maven central.
+
+See [samples/get-edgent-jars-project](get-edgent-jars-project/README.md)
+for a tool to get a copy of the Edgent jars.
+
### Create an application package bundle
The bundle is a standalone entity containing
@@ -124,37 +139,15 @@ The bundle is copied to the device and unpacked.
A run script forms the appropriate `CLASSPATH`
to the package's jars and starts the application.
-The Edgent supplied `package-app.sh` tool supports this mode.
-Eclipse can also export a similar collection
-of information.
-
-### Separately manage the application and Edgent jars
-
-Copy the application's jars to the device.
-Get a copy of the Edgent jars and their dependencies
-onto the device to be shared by any Edgent applications
-that want to use them.
-
-The Apache Edgent project does not release a
-binary bundle containing all of the Edgent jars
-and their dependencies. The binary artifacts
-are only released to maven central.
-
-See `samples/get-edgent-jars-project` for a tool
-to get a copy of the Edgent jars.
-
-## package-app.sh
-
-The `package-app.sh` script creates an application bundle.
-The application bundle can be copied to an edge-device,
-unpacked and then used to run the application.
+The supplied `package-app.sh` script creates an
+application bundle.
The application bundle contains the application's jar,
the application's dependent Edgent jars (as specified in
the application's pom) and the Edgent jars' dependencies,
and a run-app.sh script.
-The application's pom specified Edgent runtime jars and
+The application's dependent Edgent runtime jars and
their dependencies are retrieved from a local or remote
maven repository.
@@ -185,5 +178,5 @@ package-app.sh --mainClass com.mycompany.app.MyApp --appjar target/my-app-1.0-SN
For more usage information:
``` sh
-package-app.sh -h
+./package-app.sh -h
```
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/51ddbc28/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index b78b6e2..97adf54 100644
--- a/README.md
+++ b/README.md
@@ -105,7 +105,7 @@ in the sample category's target directory: `<category>/target`.
## Running the samples
-See the README.md in each sample category directory for information
+See the `README.md` in each sample category directory for information
on running the samples.
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/51ddbc28/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 60c3d06..7e4efdc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,9 @@
<module>apps</module>
<module>connectors</module>
<module>console</module>
+ <!-- <module>get-edgent-jars-project</module> intentionally omitted -->
<module>scenarios</module>
+ <!-- <module>template</module> intentionally omitted -->
<module>topology</module>
<module>utils</module>
</modules>
[18/50] incubator-edgent-samples git commit: - Make the java7 version
of the samples build
Posted by cd...@apache.org.
- Make the java7 version of the samples build
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/972363ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/972363ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/972363ea
Branch: refs/heads/develop
Commit: 972363eae8bb97841dbc40f28414cdf9f352bd0b
Parents: 9dfe051
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Tue Sep 26 22:52:34 2017 +0200
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Tue Sep 26 22:52:34 2017 +0200
----------------------------------------------------------------------
apps/pom.xml | 1 +
connectors/pom.xml | 1 +
console/pom.xml | 1 +
scenarios/pom.xml | 1 +
topology/pom.xml | 1 +
utils/pom.xml | 1 +
6 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/972363ea/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index d6d7ea4..6041636 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -27,6 +27,7 @@
<version>1.2.0-SNAPSHOT</version>
</parent>
+ <groupId>${edgent.base.groupId}.samples</groupId>
<artifactId>edgent-samples-apps</artifactId>
<name>Apache Edgent: Samples: Apps</name>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/972363ea/connectors/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/pom.xml b/connectors/pom.xml
index 8a76cb7..d57b618 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -27,6 +27,7 @@
<version>1.2.0-SNAPSHOT</version>
</parent>
+ <groupId>${edgent.base.groupId}.samples</groupId>
<artifactId>edgent-samples-connectors</artifactId>
<name>Apache Edgent: Samples: Connectors</name>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/972363ea/console/pom.xml
----------------------------------------------------------------------
diff --git a/console/pom.xml b/console/pom.xml
index 046a035..4bde53f 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -27,6 +27,7 @@
<version>1.2.0-SNAPSHOT</version>
</parent>
+ <groupId>${edgent.base.groupId}.samples</groupId>
<artifactId>edgent-samples-console</artifactId>
<name>Apache Edgent: Samples: Console</name>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/972363ea/scenarios/pom.xml
----------------------------------------------------------------------
diff --git a/scenarios/pom.xml b/scenarios/pom.xml
index 15befaa..cba1c78 100644
--- a/scenarios/pom.xml
+++ b/scenarios/pom.xml
@@ -27,6 +27,7 @@
<version>1.2.0-SNAPSHOT</version>
</parent>
+ <groupId>${edgent.base.groupId}.samples</groupId>
<artifactId>edgent-samples-scenarios</artifactId>
<name>Apache Edgent: Samples: Scenarios</name>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/972363ea/topology/pom.xml
----------------------------------------------------------------------
diff --git a/topology/pom.xml b/topology/pom.xml
index 1d1f6b8..7dd9df3 100644
--- a/topology/pom.xml
+++ b/topology/pom.xml
@@ -27,6 +27,7 @@
<version>1.2.0-SNAPSHOT</version>
</parent>
+ <groupId>${edgent.base.groupId}.samples</groupId>
<artifactId>edgent-samples-topology</artifactId>
<name>Apache Edgent: Samples: Topology</name>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/972363ea/utils/pom.xml
----------------------------------------------------------------------
diff --git a/utils/pom.xml b/utils/pom.xml
index 898a11b..45bb1dd 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -27,6 +27,7 @@
<version>1.2.0-SNAPSHOT</version>
</parent>
+ <groupId>${edgent.base.groupId}.samples</groupId>
<artifactId>edgent-samples-utils</artifactId>
<name>Apache Edgent: Samples: Utils</name>
[14/50] incubator-edgent-samples git commit: cleanup and tweak
samples poms and doc for android
Posted by cd...@apache.org.
cleanup and tweak samples poms and doc for android
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/150c308d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/150c308d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/150c308d
Branch: refs/heads/develop
Commit: 150c308d2f45be0ed029f1728a47911d2899db5c
Parents: 3f3e932
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Sep 26 11:28:11 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Sep 26 11:28:11 2017 -0400
----------------------------------------------------------------------
README.md | 17 ++++++----
pom.xml | 9 ++++--
template/README.md | 18 +++++------
template/pom.xml | 85 ++-----------------------------------------------
4 files changed, 27 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/150c308d/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 48f5f15..2589e01 100644
--- a/README.md
+++ b/README.md
@@ -21,25 +21,28 @@ information on Edgent Application Development, Packaging and Execution.
Additional information may also be found in
Getting Started https://edgent.apache.org/docs/edgent-getting-started
-#Building the Edgent samples
+# Building the Edgent samples
By default Java8 class files are generated.
-Java7 and Android platform class files are produced when the appropriate
+Java7 platform class files are produced when the appropriate
profile is specified.
+Currently, building and running the samples for the Android platform
+is not supported. Many samples use the `DevelopmentProvider` and
+the `DevelopmentProvider` is not supported on the Android platform.
```sh
-./mvnw clean package # -Pplatform-java7,platform-android as needed
+./mvnw clean package # -Pplatform-java7 as needed
```
-A standard jar and uber jar is created for each sample category
+A standard jar and uber jar are created for each sample category
in the sample category's target directory: `<category>/target`.
-##Running the samples
+## Running the samples
See the README.md in each sample category directory.
-#Using Eclipse
+# Using Eclipse
The Edgent Git repository, or samples source release bundle, contains
Maven project definitions for the samples.
@@ -80,7 +83,7 @@ E.g.,
1. open the `HelloEdgent.java` sample
2. click on *Run*, *Run As*, then *Java application*. `HelloEdgent` runs and prints to the Console view.
-#Samples Summary
+# Samples Summary
<pre>
HelloEdgent Basic mechanics of declaring a topology and executing
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/150c308d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 713b1e4..f5032e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -193,7 +193,12 @@
</plugins>
</build>
</profile>
- <profile>
+ <!-- Currently, many samples use the DevelopmentProvider,
+ which doesn't exist for the android platform.
+ For now don't support building/running the
+ samples for that context.
+ -->
+ <!--profile>
<id>platform-android</id>
<properties>
<platform.android>true</platform.android>
@@ -216,7 +221,7 @@
</plugin>
</plugins>
</build>
- </profile>
+ </profile-->
</profiles>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/150c308d/template/README.md
----------------------------------------------------------------------
diff --git a/template/README.md b/template/README.md
index ef39700..096ef15 100644
--- a/template/README.md
+++ b/template/README.md
@@ -3,34 +3,32 @@ An Edgent Application template project.
Clone this template project to start your Edgent application project.
The project's pom supports
+
- building for java8, java7 or android execution environments
- building a standard jar and uber jar
-Edit the pom for your application. Adjust for your application's maven coordinates.
+Edit the pom for your application. Adjust it for your application's maven coordinates.
The pom has potential Edgent dependenacies present and commented out.
Include the Edgent Providers, Analytics, Utils, and Connectors used by your application.
Read `../README.md` for general information about Edgent Application development.
-#Building the project
-
+# Building the project
```sh
-./mvnw clean install # add -Pplatform-java7 or -Pplatform-java8 as needed
+./mvnw clean install # add -Pplatform-java7 or -Pplatform-android as needed
```
-#Running the application
-
-You can copy app-run.sh and the generated target/*-uber.jar to the edge device
+# Running the application
+You can copy `app-run.sh` and the generated `target/*-uber.jar` to the edge device
```sh
./app-run.sh
```
-#Using package-app.sh with the project
+# Using package-app.sh with the project
Adjust the main class name and application jar path below for your application.
-
```sh
-PLATFORM= # add "--platform java7" or "--platform android" if appropriate
+PLATFORM= # add "--platform java7" or "--platform android" as appropriate
../package-app.sh $PLATFORM --mainClass com.mycompany.app.TemplateApp --appjar target/my-app-1.0-SNAPSHOT.jar
```
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/150c308d/template/pom.xml
----------------------------------------------------------------------
diff --git a/template/pom.xml b/template/pom.xml
index 8d913d9..f225640 100644
--- a/template/pom.xml
+++ b/template/pom.xml
@@ -146,77 +146,8 @@
</dependencies>
<profiles>
- <!--
- This defines a self-activating profile which is only enabled for
- for projects that have a src/main/java directory (effectivley excludes
- it from the current pom module.
- -->
- <!--profile>
- <id>generate-classpath</id>
- <activation>
- <file>
- <exists>src/main/java</exists>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>dump-dependency-tree</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>tree</goal>
- </goals>
- <configuration>
- <outputFile>${project.build.directory}/dependency-tree.graphml</outputFile>
- <outputType>graphml</outputType>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xml-maven-plugin</artifactId>
- <version>1.0.1</version>
- <executions>
- <execution>
- <id>transform-dependency-tree</id>
- <goals>
- <goal>transform</goal>
- </goals>
- <configuration>
- <transformationSets>
- <transformationSet>
- <file>${project.build.directory}/dependency-tree.graphml</file>
- <stylesheet>${project.basedir}/../src/main/xslt/classpath.xsl</stylesheet>
- <parameters>
- <parameter>
- <name>groupId</name>
- <value>${project.groupId}</value>
- </parameter>
- <parameter>
- <name>artifactId</name>
- <value>${project.artifactId}</value>
- </parameter>
- <parameter>
- <name>version</name>
- <value>${project.version}</value>
- </parameter>
- </parameters>
- </transformationSet>
- </transformationSets>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile-->
-
<profile>
+ <!-- build app to run on Java7 platform -->
<id>platform-java7</id>
<properties>
<platform.java7>true</platform.java7>
@@ -241,6 +172,7 @@
</build>
</profile>
<profile>
+ <!-- build app to run on Android platform -->
<id>platform-android</id>
<properties>
<platform.android>true</platform.android>
@@ -295,19 +227,6 @@
</execution>
</executions>
</plugin>
-
- <!-- Inject the "incubating" into the output filename -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <finalName>apache-edgent-incubating-samples-${project.version}</finalName>
- <formats>
- <format>zip</format>
- <format>tar.gz</format>
- </formats>
- </configuration>
- </plugin>
</plugins>
</pluginManagement>
[03/50] incubator-edgent-samples git commit: - Fixed all the
remaining errors and warnings in Eclipse
Posted by cd...@apache.org.
- Fixed all the remaining errors and warnings in Eclipse
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/55efbe1e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/55efbe1e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/55efbe1e
Branch: refs/heads/develop
Commit: 55efbe1e306418d7c1fac49c69687192d0ae4911
Parents: d507d89
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Wed Aug 16 09:19:12 2017 +0200
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Wed Aug 16 09:19:12 2017 +0200
----------------------------------------------------------------------
apps/pom.xml | 1 -
connectors/pom.xml | 1 -
console/pom.xml | 1 -
scenarios/pom.xml | 1 -
topology/pom.xml | 1 -
utils/pom.xml | 1 -
6 files changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/55efbe1e/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index b7c2f5c..2fba1ca 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -28,7 +28,6 @@
</parent>
<artifactId>edgent-samples-apps</artifactId>
- <version>1.2.0-SNAPSHOT</version>
<name>Apache Edgent: Samples: Apps</name>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/55efbe1e/connectors/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/pom.xml b/connectors/pom.xml
index f38fc64..8a76cb7 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -28,7 +28,6 @@
</parent>
<artifactId>edgent-samples-connectors</artifactId>
- <version>1.2.0-SNAPSHOT</version>
<name>Apache Edgent: Samples: Connectors</name>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/55efbe1e/console/pom.xml
----------------------------------------------------------------------
diff --git a/console/pom.xml b/console/pom.xml
index cf11787..046a035 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -28,7 +28,6 @@
</parent>
<artifactId>edgent-samples-console</artifactId>
- <version>1.2.0-SNAPSHOT</version>
<name>Apache Edgent: Samples: Console</name>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/55efbe1e/scenarios/pom.xml
----------------------------------------------------------------------
diff --git a/scenarios/pom.xml b/scenarios/pom.xml
index 2737986..15befaa 100644
--- a/scenarios/pom.xml
+++ b/scenarios/pom.xml
@@ -28,7 +28,6 @@
</parent>
<artifactId>edgent-samples-scenarios</artifactId>
- <version>1.2.0-SNAPSHOT</version>
<name>Apache Edgent: Samples: Scenarios</name>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/55efbe1e/topology/pom.xml
----------------------------------------------------------------------
diff --git a/topology/pom.xml b/topology/pom.xml
index 76231e2..1d1f6b8 100644
--- a/topology/pom.xml
+++ b/topology/pom.xml
@@ -28,7 +28,6 @@
</parent>
<artifactId>edgent-samples-topology</artifactId>
- <version>1.2.0-SNAPSHOT</version>
<name>Apache Edgent: Samples: Topology</name>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/55efbe1e/utils/pom.xml
----------------------------------------------------------------------
diff --git a/utils/pom.xml b/utils/pom.xml
index 575772c..898a11b 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -28,7 +28,6 @@
</parent>
<artifactId>edgent-samples-utils</artifactId>
- <version>1.2.0-SNAPSHOT</version>
<name>Apache Edgent: Samples: Utils</name>
[47/50] incubator-edgent-samples git commit: update doc:
RELEASE_NOTES, samples/README.md
Posted by cd...@apache.org.
update doc: RELEASE_NOTES, samples/README.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/cc6bd62f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/cc6bd62f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/cc6bd62f
Branch: refs/heads/develop
Commit: cc6bd62fac21482d37a04252f6be70ca01e1895a
Parents: 2b267b2
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Mon Nov 6 13:12:42 2017 -0500
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Mon Nov 6 13:12:42 2017 -0500
----------------------------------------------------------------------
README.md | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cc6bd62f/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 6bd26ed..ba18312 100644
--- a/README.md
+++ b/README.md
@@ -213,8 +213,7 @@ SensorAnalytics Demonstrates a more complex sample that includes
conditional stream tracing.
</pre>
-Other samples are provided but have not yet been noted above.
-Feel free to explore.
+Many other samples are provided but have not yet been noted above. Explore!
# Licensing
[07/50] incubator-edgent-samples git commit: squelch eclipse warnings
on samples/pom.xml
Posted by cd...@apache.org.
squelch eclipse warnings on samples/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/28a5305c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/28a5305c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/28a5305c
Branch: refs/heads/develop
Commit: 28a5305cf43b7c0f2f8de7fbe14047d99029f548
Parents: c355475
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Sep 6 16:31:02 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Sep 6 16:31:02 2017 -0400
----------------------------------------------------------------------
pom.xml | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/28a5305c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c54819e..713b1e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -261,6 +261,48 @@
</formats>
</configuration>
</plugin>
+
+ <!--
+ This is a fake plugin which is used to tell m2e (Eclipse) how
+ to process this maven project.
+ -->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <versionRange>[1.0.0,)</versionRange>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore/>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <versionRange>[1.0.0,)</versionRange>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore/>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
[23/50] incubator-edgent-samples git commit: add correct NOTICE to
samples
Posted by cd...@apache.org.
add correct NOTICE to samples
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/3c6b1849
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/3c6b1849
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/3c6b1849
Branch: refs/heads/develop
Commit: 3c6b1849421b2b1cbf0dbcf0272ebcc63f08bd7f
Parents: d0dea84
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Mon Oct 2 13:57:27 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Mon Oct 2 13:57:27 2017 -0400
----------------------------------------------------------------------
NOTICE | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3c6b1849/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..9c9c1c3
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,11 @@
+Apache Edgent
+Copyright 2016-2017 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
[44/50] incubator-edgent-samples git commit: doc tweaks
Posted by cd...@apache.org.
doc tweaks
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/b4ae7a8b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/b4ae7a8b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/b4ae7a8b
Branch: refs/heads/develop
Commit: b4ae7a8b9605b2ab1f0b5488ac99bf29fdfa86da
Parents: 548ecc5
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
----------------------------------------------------------------------
APPLICATION_DEVELOPMENT.md | 10 ++++------
README.md | 10 ++++++----
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/b4ae7a8b/APPLICATION_DEVELOPMENT.md
----------------------------------------------------------------------
diff --git a/APPLICATION_DEVELOPMENT.md b/APPLICATION_DEVELOPMENT.md
index eb6e2fb..9e01074 100644
--- a/APPLICATION_DEVELOPMENT.md
+++ b/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-samples/blob/b4ae7a8b/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index e39fac0..09079d4 100644
--- a/README.md
+++ b/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.
[09/50] incubator-edgent-samples git commit: remove maven-wrapper.jar
from repo
Posted by cd...@apache.org.
remove maven-wrapper.jar from repo
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/51ed7d17
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/51ed7d17
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/51ed7d17
Branch: refs/heads/develop
Commit: 51ed7d17b8569ab0e3eeea227637889c473a3000
Parents: eeaa2bd
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Sep 12 13:52:08 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Sep 12 13:52:08 2017 -0400
----------------------------------------------------------------------
.mvn/wrapper/maven-wrapper.jar | Bin 47610 -> 0 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/51ed7d17/.mvn/wrapper/maven-wrapper.jar
----------------------------------------------------------------------
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
deleted file mode 100644
index 9cc84ea..0000000
Binary files a/.mvn/wrapper/maven-wrapper.jar and /dev/null differ
[28/50] incubator-edgent-samples git commit: more distribution &
samples doc tweaks
Posted by cd...@apache.org.
more distribution & samples doc tweaks
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/a11725cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/a11725cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/a11725cd
Branch: refs/heads/develop
Commit: a11725cdf0da92dcc07e605a2df334923bc6eb92
Parents: afe46c3
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Mon Oct 9 13:11:28 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Mon Oct 9 13:11:28 2017 -0400
----------------------------------------------------------------------
LICENSE | 201 ++++++++++++++++++++++++++++++++++++++++++++++++
template/README.md | 2 +-
2 files changed, 202 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/a11725cd/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..8dada3e
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,201 @@
+ 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-samples/blob/a11725cd/template/README.md
----------------------------------------------------------------------
diff --git a/template/README.md b/template/README.md
index 096ef15..1588906 100644
--- a/template/README.md
+++ b/template/README.md
@@ -15,7 +15,7 @@ Read `../README.md` for general information about Edgent Application development
# Building the project
```sh
-./mvnw clean install # add -Pplatform-java7 or -Pplatform-android as needed
+./mvnw clean package # add -Pplatform-java7 or -Pplatform-android as needed
```
# Running the application
[46/50] incubator-edgent-samples git commit: - Disabled the "Cleanup"
step of the build. - Fine tuned the Jenkinsfile to run "sonar" and
"site-generation" only on the develop branch. - Fixed some warnings in the
get-edgent-jars.sh script
Posted by cd...@apache.org.
- Disabled the "Cleanup" step of the build.
- Fine tuned the Jenkinsfile to run "sonar" and "site-generation" only on the develop branch.
- Fixed some warnings in the get-edgent-jars.sh script
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/3ed00490
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/3ed00490
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/3ed00490
Branch: refs/heads/develop
Commit: 3ed0049089df8deb42cfa50744ffa6a18adfaed7
Parents: 2b267b2
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Sun Nov 5 16:01:21 2017 +0100
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Sun Nov 5 16:01:21 2017 +0100
----------------------------------------------------------------------
get-edgent-jars-project/get-edgent-jars.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3ed00490/get-edgent-jars-project/get-edgent-jars.sh
----------------------------------------------------------------------
diff --git a/get-edgent-jars-project/get-edgent-jars.sh b/get-edgent-jars-project/get-edgent-jars.sh
index a8c50f7..8d0c5ce 100755
--- a/get-edgent-jars-project/get-edgent-jars.sh
+++ b/get-edgent-jars-project/get-edgent-jars.sh
@@ -120,7 +120,7 @@ function confirm () { # [$1: question]
# call with a prompt string or use a default
/bin/echo -n "${1:-Are you sure?}"
read -r -p " [y/n] " response
- case $response in
+ case ${response} in
[yY]) return `true` ;;
[nN]) return `false` ;;
*) echo "illegal response '$response'" ;;
@@ -136,7 +136,7 @@ mkdir -p target
DEP_DECLS_FILE=target/tmp-dep-decls
rm -f ${DEP_DECLS_FILE}
for i in ${ARTIFACT_GAVS}; do
- echo $i | awk -F : '{ type=""; if ($3 == "{EV}") $3="${edgent.runtime.version}"; if ($4 != "") type=" <type>" $4 "</type>\n"; printf "<dependency>\n <groupId>%s</groupId>\n <artifactId>%s</artifactId>\n <version>%s</version>\n%s</dependency>\n", $1, $2, $3, type }' >> ${DEP_DECLS_FILE}
+ echo ${i} | awk -F : '{ type=""; if ($3 == "{EV}") $3="${edgent.runtime.version}"; if ($4 != "") type=" <type>" $4 "</type>\n"; printf "<dependency>\n <groupId>%s</groupId>\n <artifactId>%s</artifactId>\n <version>%s</version>\n%s</dependency>\n", $1, $2, $3, type }' >> ${DEP_DECLS_FILE}
done
DEP_DECLS=`cat ${DEP_DECLS_FILE}`
[24/50] incubator-edgent-samples git commit: - Removed the
"DEPENDENCIES" generation (not needed) - Removed the now no longer needed
optional dependencies - Reduced the number of bundled license texts to only
the required ones
Posted by cd...@apache.org.
- Removed the "DEPENDENCIES" generation (not needed)
- Removed the now no longer needed optional dependencies
- Reduced the number of bundled license texts to only the required ones
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/2bfdbf41
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/2bfdbf41
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/2bfdbf41
Branch: refs/heads/develop
Commit: 2bfdbf41715ec3c2bb1e69b085c008339737e473
Parents: 3c6b184
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Wed Oct 4 10:29:35 2017 +0200
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Wed Oct 4 10:29:35 2017 +0200
----------------------------------------------------------------------
pom.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/2bfdbf41/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 794cc89..b3d1061 100644
--- a/pom.xml
+++ b/pom.xml
@@ -326,7 +326,6 @@
</goals>
<configuration>
<resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
<!-- Will generate META-INF/DISCLAIMER -->
<resourceBundle>org.apache.apache.resources:apache-incubator-disclaimer-resource-bundle:1.2-SNAPSHOT</resourceBundle>
</resourceBundles>
[31/50] incubator-edgent-samples git commit: add commented out
edgent-android deps to sample template
Posted by cd...@apache.org.
add commented out edgent-android deps to sample template
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/bba42c21
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/bba42c21
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/bba42c21
Branch: refs/heads/develop
Commit: bba42c21c1538fc63df09c2f3d76660b0e09577a
Parents: 97aa739
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Oct 10 11:23:00 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Oct 10 11:23:00 2017 -0400
----------------------------------------------------------------------
template/pom.xml | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/bba42c21/template/pom.xml
----------------------------------------------------------------------
diff --git a/template/pom.xml b/template/pom.xml
index f225640..5d67cd2 100644
--- a/template/pom.xml
+++ b/template/pom.xml
@@ -84,6 +84,19 @@
<version>${edgent.version}</version>
</dependency-->
+ <!-- declare Edgent Android dependencies
+ -->
+ <!--dependency>
+ <groupId>${edgent.base.groupId}.android</groupId>
+ <artifactId>edgent-android-hardware</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </dependency-->
+ <!--dependency>
+ <groupId>${edgent.base.groupId}.android</groupId>
+ <artifactId>edgent-android-topology</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </dependency-->
+
<!-- declare Edgent Analytics dependencies
-->
<!--dependency>
[05/50] incubator-edgent-samples git commit: cleanup/fix some sample
README and scripts
Posted by cd...@apache.org.
cleanup/fix some sample README and scripts
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/d6db0081
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/d6db0081
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/d6db0081
Branch: refs/heads/develop
Commit: d6db0081056734c816a654e675163d1a35ea9223
Parents: 7db0380
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Sep 6 15:14:47 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Sep 6 15:14:47 2017 -0400
----------------------------------------------------------------------
APPLICATION_DEVELOPMENT.md | 216 ++++++++++++++++++++++++++++++++++++++++
README.md | 201 +------------------------------------
console/run-sample.sh | 2 +-
scenarios/README.md | 52 ++++++----
scenarios/run-sample.sh | 3 +-
topology/run-sample.sh | 2 +-
utils/README.md | 2 +-
utils/run-sample.sh | 2 +-
8 files changed, 258 insertions(+), 222 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/d6db0081/APPLICATION_DEVELOPMENT.md
----------------------------------------------------------------------
diff --git a/APPLICATION_DEVELOPMENT.md b/APPLICATION_DEVELOPMENT.md
new file mode 100644
index 0000000..9199c94
--- /dev/null
+++ b/APPLICATION_DEVELOPMENT.md
@@ -0,0 +1,216 @@
+<!--
+ 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.
+-->
+
+#Edgent Application Development, Packaging and Execution.
+
+This file is a work-in-progress.
+
+To develop Edgent applications you will utilize the
+Edgent SDK/runtime jars, package your application
+artifacts for deploying to an edge device for execution.
+
+The Edgent SDK/runtime jars are published to maven-central.
+Alternatively, you can build the Edgent SDK yourself from a source release
+and the resulting jars will be added to your local maven repository.
+
+There are a set of Edgent jars for each supported platform: java8, java7, and android.
+The artifact groupId prefix is: org.apache.edgent (for java8),
+org.apache.edgent.java7 and org.apache.edgent.android. e.g.
+ org.apache.edgent.api org.apache.edgent.api.java7
+
+See `JAVA_SUPPORT.md` for more information on coordinates, etc.
+
+The Edgent API is most easily used by using java8 lambda expressions.
+If you only want to deploy your Edgent application to a java8 environment
+then your application may use any java8 features it chooses. You compile
+and run against the Edgent java8 jars.
+
+If you want to deploy your Edgent application to a java7 or android
+environment, it's still easiest to write your application using the Edgent APIs
+with java8 lambda expressions. You compile with java8 but constrain
+your application to using java7 features plus java8 lambda expressions.
+The Retrolambda tool is used to convert your application's generated
+class files to java7.
+(the java7 and android Edgent jars were created in that manner too)
+Your application would then be run against the appropriate
+Edgent platform jars. Alternatively you can forgo the use of lambda
+expressions and write your application in java7 and compile
+and run against the appropriate Edgent platform jars.
+
+For convenience it's easiest to build your Edgent applcation using
+maven-repository-enabled build tooling (e.g., maven, maven-enabled
+Eclipse or IntelliJ). The tooling transparently downloads the
+required Edgent jars from the maven repository.
+
+The supplied Edgent samples poms include support for building for
+a java8, java7 or android execution environent. The poms are
+configured for the generation of a standard jar as well as an
+uber jar for a sample application.
+
+You can clone the samples/template project as a starting point
+for your Edgent application. See `samples/template/README.md`.
+
+TODO: we would like to provide a maven Edgent Application archetype
+that users can use to create an application project template.
+
+If you can't or don't want to use maven-repository-enabled tooling
+you will need to get a local copy of the Edgent jars and their
+dependencies and add them to your compile classpath.
+The Edgent supplied get-edgent-jars.sh tool can be used to
+get copies of the jars from a maven repository.
+
+
+##Packaging and Execution
+
+Edgent doesn't provide any "deployment" mechanisms other than its primitive
+"register jar" feature (see the IotProvider javadoc). Generally, managing
+the deployment of application and Edgent jars to edge devices is left to
+others (as an example, the IBM Watson IoT Platform has device APIs to
+support "firmware" download/update).
+
+To run your Edgent application on an edge device, your application
+jar(s) need to be on the device. Additionally, the application's
+dependent Edgent jars (and their transitive dependencies) need to
+be on the device. It's unlikely the device will be able to retrieve
+the dependencies directly from a remote maven repository such as
+maven central.
+
+Here are three options for dealing with this:
+
+a) construct an uber-jar for your application.
+ The uber jar contains the application's classes and
+ the application's dependent Edgent classes and their
+ transitive dependencies.
+
+ The uber jar is a standalone entity containing
+ everything that's needed to run your application.
+
+ The Edgent samples poms contain configuration information
+ that generates an uber jar in addition to the standard
+ application jar. Eclipse can also export an uber jar.
+
+b) create an application package bundle.
+ 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
+ to the package's jars and starts the application.
+
+ The Edgent supplied package-app.sh tool supports this mode.
+ Eclipse can also export a similar collection
+ of information.
+
+c) separately manage the application's jars and the
+ Edgent jars and their dependencies.
+ Copy the application's jars to the device.
+ Get a copy of the Edgent jars and their dependencies
+ onto the device to be shared by any Edgent applications
+ that want to use them.
+
+ The Apache Edgent project does not release a
+ binary bundle containing all of the Edgent jars
+ and their dependencies. The binary artifacts
+ are only released to maven central.
+
+ The Edgent supplied get-edgent-jars.sh tool supports this mode.
+
+##get-edgent-jars.sh
+
+The `get-edgent-jars.sh` script copies the Edgent runtime jars and their
+dependencies from a local or remote maven repository.
+
+The user may then directly use the jars in CLASSPATH specifications
+for Edgent application compilation or execution.
+A `classpath.sh` script is generated to assist with this.
+
+By default the script retrieves the Edgent java8 platform jars for the
+script's default Edgent version.
+
+The script creates and builds a small maven project as
+part of its execution.
+
+```sh
+get-edgent-jars.sh --version 1.2.0-SNAPSHOT # retrieve the Edgent 1.2.0-SNAPSHOT java8 jars
+This command downloads the Apache Edgent jars and their transitive external dependencies.
+The external dependencies have their own licensing term that you should review.
+A summary of the external dependencies can be found here <TODO URL>.
+Continue? [y/n] y
+##### Generating maven project get-edgent-jars-project...
+##### Generating dependency decls...
+##### Adding dependency decls to pom...
+##### Retrieving jars into local maven repo...
+...
+##### Copying jars...
+##### Generating classpath.sh...
+##### The Edgent jars are in get-edgent-jars-project/edgent-jars
+##### The external jars are in get-edgent-jars-project/ext-jars
+##### CLASSPATH may be set by copying get-edgent-jars-project/java8/classpath.sh and using it like:
+##### export CLASSPATH=`classpath.sh path-to-parent-of-edgent-jars-dir`
+```
+
+For more usage information:
+
+```sh
+get-edgent-jars.sh -h
+```
+
+##package-app.sh
+
+The `package-app.sh` script creates an application bundle.
+The application bundle can be copied to an edge-device,
+unpacked and then used to run the application.
+
+The application bundle contains the application's jar,
+the application's dependent Edgent jars (as specified in
+the application's pom) and the Edgent jars' dependencies,
+and a run-app.sh script.
+
+The application's pom specified Edgent runtime jars and
+their dependencies are retrieved from a local or remote
+maven repository.
+
+If the application was built using java8, complied against
+the java8 Edgent jars, and the execution environment is
+java7 or android, use the appropriate script options
+to retrieve the appropriate Edgent platform jars for
+execution.
+
+The run-app.sh script configures the CLASSPATH and runs
+the application.
+
+E.g.,
+
+```sh
+cd MyApp # the project directory
+package-app.sh --mainClass com.mycompany.app.MyApp --appjar target/my-app-1.0-SNAPSHOT.jar
+##### get the app specific dependencies...
+...
+##### create target/app-run.sh...
+##### create target/app-pkg.tar...
+##### Copy target/app-pkg.tar to the destination system"
+##### To run the app:"
+##### mkdir app-pkg"
+##### tar xf app-pkg.tar -C app-pkg"
+##### (cd app-pkg; ./app-run.sh)"
+```
+
+For more usage information:
+
+```sh
+package-app.sh -h
+```
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/d6db0081/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index b9b0dee..15e4fdb 100644
--- a/README.md
+++ b/README.md
@@ -14,204 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-#Apache Edgent SDK samples.
-This file is a work-in-progress.
-
-The following describes Edgent Application development in general
-and the Edgent SDK samples in particular.
-
-#Edgent Application Development, Packaging and Execution.
-
-The Edgent SDK/runtime jars are published to maven-central.
-
-There are a set of Edgent jars for each supported platform: java8, java7, and android.
-The artifact groupId prefix is: org.apache.edgent (for java8),
-org.apache.edgent.java7 and org.apache.edgent.android. e.g.
- org.apache.edgent.api org.apache.edgent.api.java7
-
-See `JAVA_SUPPORT.md` for more information on coordinates, etc.
-
-The Edgent API is most easily used by using java8 lambda expressions.
-If you only want to deploy your Edgent application to a java8 environment
-then your application may use any java8 features it chooses. You compile
-and run against the Edgent java8 jars.
-
-If you want to deploy your Edgent application to a java7 or android
-environment, it easiest to write your application using the Edgent APIs
-with java8 lambda expressions. You compile with java8 but constrain
-your application to using java7 features plus java8 lambda expressions.
-The Retrolambda tool is used to convert your application's generated
-class files to java7.
-(the java7 and android Edgent jars were created in that manner too)
-Your application would then be run against the appropriate
-Edgent platform jars. Alternatively you can forgo the use of lambda
-expressions and write your application in java7 and compile
-and run against the appropriate Edgent platform jars.
-
-For convenience it's easiest to build your Edgent applcation using
-maven-repository-enabled build tooling (e.g., maven, maven-enabled
-Eclipse or IntelliJ). The tooling transparently downloads the
-required Edgent jars from the maven repository.
-
-The supplied Edgent samples poms include support for building for
-a java8, java7 or android execution environent. The poms are
-configured for the generation of a standard jar as well as an
-uber jar for a sample application.
-
-You can clone the samples/template project as a starting point
-for your Edgent application. See samples/template/README.md.
-
-TODO: we would like to provide a maven Edgent Application archetype
-that users can use to create an application project template.
-
-If you can't or don't want to use maven-repository-enabled tooling
-you will need to get a local copy of the Edgent jars and their
-dependencies and add them to your compile classpath.
-The Edgent supplied get-edgent-jars.sh tool can be used to
-get copies of the jars from a maven repository.
-
-
-##Packaging and Execution
-
-Edgent doesn't provide any "deployment" mechanisms other than its primitive
-"register jar" feature (see the IotProvider javadoc). Generally, managing
-the deployment of application and Edgent jars to edge devices is left to
-others (as an example, the IBM Watson IoT Platform has device APIs to
-support "firmware" download/update).
-
-To run your Edgent application on an edge device, your application
-jar(s) need to be on the device. Additionally, the application's
-dependent Edgent jars (and their transitive dependencies) need to
-be on the device. It's unlikely the device will be able to retrieve
-the dependencies directly from a remote maven repository such as
-maven central.
-
-Here are three options for dealing with this:
-
-a) construct an uber-jar for your application.
- The uber jar contains the application's classes and
- the application's dependent Edgent classes and their
- transitive dependencies.
-
- The uber jar is a standalone entity containing
- everything that's needed to run your application.
-
- The Edgent samples poms contain configuration information
- that generates an uber jar in addition to the standard
- application jar. Eclipse can also export an uber jar.
-
-b) create an application package bundle.
- 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
- to the package's jars and starts the application.
-
- The Edgent supplied package-app.sh tool supports this mode.
- Eclipse can also export a similar collection
- of information.
-
-c) separately manage the application's jars and the
- Edgent jars and their dependencies.
- Copy the application's jars to the device.
- Get a copy of the Edgent jars and their dependencies
- onto the device to be shared by any Edgent applications
- that want to use them.
-
- The Apache Edgent project does not release a
- binary bundle containing all of the Edgent jars
- and their dependencies. The binary artifacts
- are only released to maven central.
-
- The Edgent supplied get-edgent-jars.sh tool supports this mode.
-
-##get-edgent-jars.sh
-
-The `get-edgent-jars.sh` script copies the Edgent runtime jars and their
-dependencies from a local or remote maven repository.
-
-The user may then directly use the jars in CLASSPATH specifications
-for Edgent application compilation or execution.
-A `classpath.sh` script is generated to assist with this.
-
-By default the script retrieves the Edgent java8 platform jars for the
-script's default Edgent version.
-
-The script creates and builds a small maven project as
-part of its execution.
-
-```sh
-get-edgent-jars.sh --version 1.2.0-SNAPSHOT # retrieve the Edgent 1.2.0-SNAPSHOT java8 jars
-This command downloads the Apache Edgent jars and their transitive external dependencies.
-The external dependencies have their own licensing term that you should review.
-A summary of the external dependencies can be found here <TODO URL>.
-Continue? [y/n] y
-##### Generating maven project get-edgent-jars-project...
-##### Generating dependency decls...
-##### Adding dependency decls to pom...
-##### Retrieving jars into local maven repo...
-...
-##### Copying jars...
-##### Generating classpath.sh...
-##### The Edgent jars are in get-edgent-jars-project/edgent-jars
-##### The external jars are in get-edgent-jars-project/ext-jars
-##### CLASSPATH may be set by copying get-edgent-jars-project/java8/classpath.sh and using it like:
-##### export CLASSPATH=`classpath.sh path-to-parent-of-edgent-jars-dir`
-```
-
-For more usage information:
-
-```sh
-get-edgent-jars.sh -h
-```
-
-##package-app.sh
-
-The `package-app.sh` script creates an application bundle.
-The application bundle can be copied to an edge-device,
-unpacked and then used to run the application.
-
-The application bundle contains the application's jar,
-the application's dependent Edgent jars (as specified in
-the application's pom) and the Edgent jars' dependencies,
-and a run-app.sh script.
-
-The application's pom specified Edgent runtime jars and
-their dependencies are retrieved from a local or remote
-maven repository.
-
-If the application was built using java8, complied against
-the java8 Edgent jars, and the execution environment is
-java7 or android, use the appropriate script options
-to retrieve the appropriate Edgent platform jars for
-execution.
-
-The run-app.sh script configures the CLASSPATH and runs
-the application.
-
-E.g.,
-
-```sh
-cd MyApp # the project directory
-package-app.sh --mainClass com.mycompany.app.MyApp --appjar target/my-app-1.0-SNAPSHOT.jar
-##### get the app specific dependencies...
-...
-##### create target/app-run.sh...
-##### create target/app-pkg.tar...
-##### Copy target/app-pkg.tar to the destination system"
-##### To run the app:"
-##### mkdir app-pkg"
-##### tar xf app-pkg.tar -C app-pkg"
-##### (cd app-pkg; ./app-run.sh)"
-```
-
-For more usage information:
-
-```sh
-package-app.sh -h
-```
+See [APPLICATION_DEVELOPMENT.md](APPLICATION_DEVELOPMENT.md) for general
+information on Edgent Application Development, Packaging and Execution.
#Building the Edgent samples
@@ -229,4 +34,4 @@ in the sample category's target directory: `<category>/target`.
##Running the samples
-See the README in each sample category directory.
+See the README.md in each sample category directory.
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/d6db0081/console/run-sample.sh
----------------------------------------------------------------------
diff --git a/console/run-sample.sh b/console/run-sample.sh
index 7cbd42a..b11529e 100755
--- a/console/run-sample.sh
+++ b/console/run-sample.sh
@@ -60,5 +60,5 @@ if [ "${SAMPLE_FQ}" = "" ]; then
exit 1
fi
-java -cp ${UBER_JAR} "${SAMPLE_FQ}" "$*"
+java -cp ${UBER_JAR} "${SAMPLE_FQ}" "$@"
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/d6db0081/scenarios/README.md
----------------------------------------------------------------------
diff --git a/scenarios/README.md b/scenarios/README.md
index 7a2d3ac..da1d9e3 100644
--- a/scenarios/README.md
+++ b/scenarios/README.md
@@ -20,36 +20,50 @@
See the Recipe this was created for [here](https://developer.ibm.com/recipes/tutorials/apache-quarks-on-pi-to-watson-iot-foundation/). If that link doesn't work, try [here](https://developer.ibm.com/recipes/tutorials/apache-edgent-on-pi-to-watson-iot-foundation/).
-## Requirements:
-* You must have Pi4J installed on the device (if you are running outside of a Raspberry Pi, you will have to download the JARs and include them in your classpath)
-* You must have Edgent downloaded and built
-* You will need to have an HC-SR04 Range sensor hooked up with your EchoPin set to pin 18 and your TripPin at pin 16 (see these instructions on hardware setup: http://www.modmypi.com/blog/hc-sr04-ultrasonic-range-sensor-on-the-raspberry-pi). To use a simulated sensor, pass in true as your second argument.
-* You will need to have an LED hooked up to pin 12 (See these instructions to set up an LED, however use pin 12 as your control pin: https://projects.drogon.net/raspberry-pi/gpio-examples/tux-crossing/gpio-examples-1-a-single-led/). To use a simulated LED, pass in true as your third argument.
-* You will need to have your device registered with Watson IoTF and a device.cfg file, or you can use a quickstart version by passing in "quickstart" as your first argument.
-
-To compile, export your Edgent install and PI4J libraries (on Raspberry Pi, the default Pi4J location is `/opt/pi4j/lib`):
+See the README.md in the samples root directory for information on building the samples.
+
+The build generated uber jar contains all of the dependent
+Edgent jars and their transitive dependencies.
-`$ EDGENT=<edgent-root-dir>`
+The desired sample can be run using the run-sample.sh script. e.g.,
-`$ export PI4J_LIB=<Pi4J-libs> # directory where pi4j-core.jar resides`
+```sh
+cd scenarios
+./run-sample.sh IotpRangeSensor quickstart true true # see below
+```
-`$ cd $EDGENT`
+For usage information:
-`$ ./gradlew # builds the range sensor sample only if the PI4J_LIB environment variable is set`
+```sh
+./run-sample.sh
+./run-sample.sh --list
+```
-To run:
-
-`$ CP=$EDGENT/build/distributions/java8/samples/lib/edgent.samples.scenarios.jar`
+If you want to run a sample from the standard jar there are two options:
+a) get a local copy of all of the Edgent jars and their dependencies.
+ Form a CLASSPATH to the jars and run the sample's main class.
+ The get-edgent-jars.sh script can be used to get the jars from
+ a maven repository (local or remote).
+b) create an application package bundle. The bundle includes the
+ sample(s) jar and a copy of all of the dependent Edgent jars
+ and their dependencies. The package-app.sh script can be
+ used to create this bundle.
+ The package-app.sh script also creates a run-app.sh script.
+ The run-app.sh script configures the CLASSPATH and runs the main class.
-`$ MAIN=org.apache.edgent.samples.scenarios.iotp.range.sensor.IotpRangeSensor`
+
+## Requirements:
+* You will need to have an HC-SR04 Range sensor hooked up with your EchoPin set to pin 18 and your TripPin at pin 16 (see these instructions on hardware setup: http://www.modmypi.com/blog/hc-sr04-ultrasonic-range-sensor-on-the-raspberry-pi). To use a simulated sensor, pass in true as your second argument.
+* You will need to have an LED hooked up to pin 12 (See these instructions to set up an LED, however use pin 12 as your control pin: https://projects.drogon.net/raspberry-pi/gpio-examples/tux-crossing/gpio-examples-1-a-single-led/). To use a simulated LED, pass in true as your third argument.
+* You will need to have your device registered with Watson IoTF and a device.cfg file, or you can use a quickstart version by passing in "quickstart" as your first argument.
-`$ java -cp $CP $MAIN <device cfg file> <simulatedSensor?> <simulatedLED?>`
+`./run-sample.sh IotpRangeSensor <device cfg file> <simulatedSensor?> <simulatedLED?>`
To run with a device.cfg file, range sensor, and LED:
-`$ java -cp $CP $MAIN device.cfg false false`
+`./run-sample.sh IotpRangeSensor device.cfg false false`
To run in fully simulated mode (no sensors and using IoTF quickstart):
-`$ java -cp $CP $MAIN quickstart true true`
\ No newline at end of file
+`./run-sample.sh IotpRangeSensor quickstart true true`
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/d6db0081/scenarios/run-sample.sh
----------------------------------------------------------------------
diff --git a/scenarios/run-sample.sh b/scenarios/run-sample.sh
index fea6ead..2b2c92b 100755
--- a/scenarios/run-sample.sh
+++ b/scenarios/run-sample.sh
@@ -60,5 +60,6 @@ if [ "${SAMPLE_FQ}" = "" ]; then
exit 1
fi
-java -cp ${UBER_JAR} "${SAMPLE_FQ}" "$*"
+set -x
+java -cp ${UBER_JAR} "${SAMPLE_FQ}" "$@"
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/d6db0081/topology/run-sample.sh
----------------------------------------------------------------------
diff --git a/topology/run-sample.sh b/topology/run-sample.sh
index c9568d5..1614a7d 100755
--- a/topology/run-sample.sh
+++ b/topology/run-sample.sh
@@ -70,5 +70,5 @@ if [ "${SAMPLE_FQ}" = "" ]; then
exit 1
fi
-java -cp ${UBER_JAR} "${SAMPLE_FQ}" "$*"
+java -cp ${UBER_JAR} "${SAMPLE_FQ}" "$@"
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/d6db0081/utils/README.md
----------------------------------------------------------------------
diff --git a/utils/README.md b/utils/README.md
index 348edae..7381f2e 100644
--- a/utils/README.md
+++ b/utils/README.md
@@ -6,7 +6,7 @@ Edgent jars and their transitive dependencies.
The desired sample can be run using the run-sample.sh script. e.g.,
```sh
-cd topology
+cd utils
./run-sample.sh PeriodicSourceWithMetrics
```
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/d6db0081/utils/run-sample.sh
----------------------------------------------------------------------
diff --git a/utils/run-sample.sh b/utils/run-sample.sh
index 8e9128a..697f44f 100755
--- a/utils/run-sample.sh
+++ b/utils/run-sample.sh
@@ -60,5 +60,5 @@ if [ "${SAMPLE_FQ}" = "" ]; then
exit 1
fi
-java -cp ${UBER_JAR} "${SAMPLE_FQ}" "$*"
+java -cp ${UBER_JAR} "${SAMPLE_FQ}" "$@"
[15/50] incubator-edgent-samples git commit: Adjust javadoc
overview.html for getting started and samples
Posted by cd...@apache.org.
Adjust javadoc overview.html for getting started and samples
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/d6d72853
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/d6d72853
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/d6d72853
Branch: refs/heads/develop
Commit: d6d728539f39beedd7cac49989f53badef942ba0
Parents: 150c308
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Sep 26 15:12:20 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Sep 26 15:12:20 2017 -0400
----------------------------------------------------------------------
README.md | 59 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 48 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/d6d72853/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 2589e01..84c392a 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,37 @@ information on Edgent Application Development, Packaging and Execution.
Additional information may also be found in
Getting Started https://edgent.apache.org/docs/edgent-getting-started
+# Setup
+
+Once you have downloaded and unpacked the samples source bundle
+or cloned the the samples repository you need to download
+these additional development software tools.
+
+* Java 8 - The development setup assumes Java 8
+* Maven - *(optional) (https://maven.apache.org/)*
+
+Maven is used as build tool. Currently there are two options:
+
+1. Using the maven-wrapper (the `mvnw` or `mvnw.bat` command - preferred)
+2. Using an installed version of Maven (the `mvn` command)
+
+The maven-wrapper will automatically download and install the
+correct Maven version and use that. Besides this, there is no
+difference between using the `mvn` and `mvnw` command.
+
+You may also use a maven-integrated IDE with the samples.
+e.g., see the _Using Eclipse_ section below.
+
+The samples use Edgent SDK jars that have been released
+in a maven repository such as Maven Central.
+
+Alternatively, you can download the Edgent SDK sources and build them,
+populating your local maven repository. The samples
+will then use those Edgent SDK jars. Adjust the `edgent.version`
+property in the top level samples `pom.xml` accordingly.
+See [downloads](https://edgent.apache.org/docs/downloads)
+for downloading the Edgent SDK sources.
+
# Building the Edgent samples
By default Java8 class files are generated.
@@ -29,7 +60,9 @@ profile is specified.
Currently, building and running the samples for the Android platform
is not supported. Many samples use the `DevelopmentProvider` and
-the `DevelopmentProvider` is not supported on the Android platform.
+the `DevelopmentProvider` is not supported on the Android platform.
+
+Build the samples
```sh
./mvnw clean package # -Pplatform-java7 as needed
```
@@ -47,14 +80,14 @@ See the README.md in each sample category directory.
The Edgent Git repository, or samples source release bundle, contains
Maven project definitions for the samples.
-Once you import the Maven projects into your workspace,
-builds and JUnit testing of Edgent in Eclipse use the
-same artifacts as the Maven command line tooling. Like
-the command line tooling, the jars for dependent projects
+Once you import the Maven projects into your workspace, builds
+in Eclipse use the same artifacts as the Maven command line tooling.
+Like the command line tooling, the jars for dependent projects
are automatically downloaded to the local maven repository
and used.
-If you want to use Eclipse to clone your fork, use the Eclipse Git Team Provider plugin
+If you want to use Eclipse to clone your fork, use the
+Eclipse Git Team Provider plugin
1. From the *File* menu, select *Import...*
2. From the *Git* folder, select *Projects from Git* and click *Next*
@@ -65,7 +98,9 @@ If you want to use Eclipse to clone your fork, use the Eclipse Git Team Provider
4. In the *Select a wizard to use for importing projects* window, click *Cancel*. Then follow the steps below to import the Maven projects.
-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
+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...*
2. From the *Maven* folder, select *Existing Maven Projects* and click *Next*
@@ -73,12 +108,14 @@ Once you have cloned the Git repository to your machine or are working from an u
+ Verify the *Add project(s) to working set* checkbox is checked
+ Click *Finish*. Eclipse starts the import process and builds the workspace.
-Top-level artifacts such as `README.md` are available under the `edgent-samples` project.
+Top-level artifacts such as `README.md` are available under the
+`edgent-samples` project.
-Note: Specifics may change depending on your version of Eclipse or the Eclipse Maven or Git Team Provider.
+Note: Specifics may change depending on your version of Eclipse or the
+Eclipse Maven or Git Team Provider.
-Once the samples projects have been imported you can run them as any Eclipse application.
-E.g.,
+Once the samples projects have been imported you can run them as any
+Eclipse application. E.g.,
1. open the `HelloEdgent.java` sample
2. click on *Run*, *Run As*, then *Java application*. `HelloEdgent` runs and prints to the Console view.
[22/50] incubator-edgent-samples git commit: add DISCLAIMER to
samples source bundle
Posted by cd...@apache.org.
add DISCLAIMER to samples source bundle
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/d0dea843
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/d0dea843
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/d0dea843
Branch: refs/heads/develop
Commit: d0dea8437d17cacec5bbd2e73fc5276f60df461d
Parents: 67d8fdf
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Mon Oct 2 13:55:00 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Mon Oct 2 13:55:00 2017 -0400
----------------------------------------------------------------------
pom.xml | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/d0dea843/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f5032e3..794cc89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -312,6 +312,28 @@
</pluginManagement>
<plugins>
+
+ <!-- Make sure the DISCLAIMER contains the incubator version -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.5</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>process-resource-bundles</id>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ <!-- Will generate META-INF/DISCLAIMER -->
+ <resourceBundle>org.apache.apache.resources:apache-incubator-disclaimer-resource-bundle:1.2-SNAPSHOT</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<!-- build an uber JAR -->
<groupId>org.apache.maven.plugins</groupId>
[02/50] incubator-edgent-samples git commit: - Fixed JDBCTests not
working with usernames containing special characters ("christofer.dutz" in my
case) - Finetuned the jacoco config - Changed the console server application
to contain the war as embedded r
Posted by cd...@apache.org.
- Fixed JDBCTests not working with usernames containing special characters ("christofer.dutz" in my case)
- Finetuned the jacoco config
- Changed the console server application to contain the war as embedded resource (Making it work in examples)
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/d507d892
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/d507d892
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/d507d892
Branch: refs/heads/develop
Commit: d507d89221624e0b607dab969106e831ed0656ce
Parents: 9a0ef88
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Tue Aug 15 21:48:56 2017 +0200
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Tue Aug 15 21:48:56 2017 +0200
----------------------------------------------------------------------
topology/pom.xml | 30 ------------------------------
1 file changed, 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/d507d892/topology/pom.xml
----------------------------------------------------------------------
diff --git a/topology/pom.xml b/topology/pom.xml
index 0a2581c..76231e2 100644
--- a/topology/pom.xml
+++ b/topology/pom.xml
@@ -32,36 +32,6 @@
<name>Apache Edgent: Samples: Topology</name>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>3.0.1</version>
- <executions>
- <execution>
- <id>copy</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.edgent.console</groupId>
- <artifactId>edgent-console-servlets</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- <outputDirectory>${project.build.directory}/war-resources</outputDirectory>
- <destFileName>servlets.war</destFileName>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<!-- parent pom has Edgent provider and SLF4J dependencies -->
[37/50] incubator-edgent-samples git commit: rework
get-edgent-jars.sh, add get-edgent-jars-project
Posted by cd...@apache.org.
rework get-edgent-jars.sh, add get-edgent-jars-project
The new approach uses the same maven "distribution"
mechanism that as the source release's "mvn package -Pdistribution".
The commonality of the generated bundles is goodness
and the included DEPENDENCIES (licensing doc) file
is valuable for users.
At this time the original script is retained as
old-get-edgent-jars.sh.
Updated relevant doc.
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/fdc2723c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/fdc2723c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/fdc2723c
Branch: refs/heads/develop
Commit: fdc2723cfc27896c69b5fc6ec1fe1c1eca0a1b1c
Parents: e1812af
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Oct 17 13:59:03 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Oct 17 13:59:03 2017 -0400
----------------------------------------------------------------------
.gitignore | 3 -
APPLICATION_DEVELOPMENT.md | 59 +----
get-edgent-jars-project/.gitignore | 6 +
get-edgent-jars-project/README.md | 54 ++++
get-edgent-jars-project/get-edgent-jars.sh | 226 +++++++++++++++++
get-edgent-jars-project/old-get-edgent-jars.sh | 254 +++++++++++++++++++
get-edgent-jars-project/pom.xml.template | 148 +++++++++++
.../src/assembly/distribution.xml | 81 ++++++
.../src/main/resources/README | 12 +
get-edgent-jars.sh | 254 -------------------
template/README.md | 7 +
11 files changed, 797 insertions(+), 307 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/fdc2723c/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index ea30b70..128a2d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,4 @@
-# get-edgent-jars generated outout
-get-edgent-jars-project
-
*.class
# Local developers toolchain
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/fdc2723c/APPLICATION_DEVELOPMENT.md
----------------------------------------------------------------------
diff --git a/APPLICATION_DEVELOPMENT.md b/APPLICATION_DEVELOPMENT.md
index 44e3230..3166931 100644
--- a/APPLICATION_DEVELOPMENT.md
+++ b/APPLICATION_DEVELOPMENT.md
@@ -17,8 +17,6 @@
# Edgent Application Development, Packaging and Execution.
-This file is a work-in-progress.
-
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.
@@ -78,9 +76,8 @@ that users can use to create an application project template.
If you can't or don't want to use maven-repository-enabled tooling
you will need to get a local copy of the Edgent jars and their
-dependencies and add them to your compile classpath.
-The Edgent supplied `get-edgent-jars.sh` tool can be used to
-get copies of the jars from a maven repository.
+dependencies and add them to your compile classpath. This case
+is covered in the following sections.
## Packaging and Execution
@@ -109,7 +106,8 @@ The uber jar contains the application's classes and
the application's dependent Edgent classes and their
transitive dependencies.
-The Edgent samples poms contain configuration information
+The Edgent samples template project's pom and
+the Edgent samples poms contain configuration information
that generates an uber jar in addition to the standard
application jar. Eclipse can also export an uber jar.
@@ -142,46 +140,8 @@ binary bundle containing all of the Edgent jars
and their dependencies. The binary artifacts
are only released to maven central.
-The Edgent supplied get-edgent-jars.sh tool supports this mode.
-
-## get-edgent-jars.sh
-
-The `get-edgent-jars.sh` script copies the Edgent runtime jars and their
-dependencies from a local or remote maven repository into a local folder.
-
-The user may then directly use the jars in CLASSPATH specifications
-for Edgent application compilation or execution.
-A `classpath.sh` script is generated to assist with this.
-
-By default the script retrieves the Edgent java8 platform jars for the
-script's default Edgent version.
-
-The script creates and builds a small maven project as
-part of its execution.
-
-``` sh
-get-edgent-jars.sh --version 1.2.0-SNAPSHOT # retrieve the Edgent 1.2.0-SNAPSHOT java8 jars
-This command downloads the Apache Edgent jars and their transitive external dependencies.
-The external dependencies have their own licensing term that you should review.
-A summary of the external dependencies can be found here <TODO URL>.
-Continue? [y/n] y
-##### Generating maven project get-edgent-jars-project...
-##### Generating dependency decls...
-##### Adding dependency decls to pom...
-##### Retrieving jars into local maven repo...
-...
-##### Copying jars...
-##### Generating classpath.sh...
-##### The Edgent jars are in get-edgent-jars-project/edgent-jars
-##### The external jars are in get-edgent-jars-project/ext-jars
-##### CLASSPATH may be set by copying get-edgent-jars-project/java8/classpath.sh and using it like:
-##### export CLASSPATH=`classpath.sh path-to-parent-of-edgent-jars-dir`
-```
-
-For more usage information:
-``` sh
-get-edgent-jars.sh -h
-```
+See `samples/get-edgent-jars-project` for a tool
+to get a copy of the Edgent jars.
## package-app.sh
@@ -198,14 +158,13 @@ The application's pom specified Edgent runtime jars and
their dependencies are retrieved from a local or remote
maven repository.
-If the application was built using java8, complied against
-the java8 Edgent jars, and the execution environment is
+If the application's execution environment is
java7 or android, use the appropriate script options
to retrieve the appropriate Edgent platform jars for
execution.
-The run-app.sh script configures the CLASSPATH and runs
-the application.
+The generated run-app.sh script configures the CLASSPATH
+and runs the application.
E.g.,
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/fdc2723c/get-edgent-jars-project/.gitignore
----------------------------------------------------------------------
diff --git a/get-edgent-jars-project/.gitignore b/get-edgent-jars-project/.gitignore
new file mode 100644
index 0000000..574159f
--- /dev/null
+++ b/get-edgent-jars-project/.gitignore
@@ -0,0 +1,6 @@
+
+# generated from pom.xml.template
+pom.xml
+
+# old-get-edgent-jars.sh generated outout
+tmp-get-edgent-jars-project
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/fdc2723c/get-edgent-jars-project/README.md
----------------------------------------------------------------------
diff --git a/get-edgent-jars-project/README.md b/get-edgent-jars-project/README.md
new file mode 100644
index 0000000..ad176b9
--- /dev/null
+++ b/get-edgent-jars-project/README.md
@@ -0,0 +1,54 @@
+<!--
+ 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.
+-->
+
+The `get-edgent-jars-project` can be used to copy Apache Edgent jars
+and their transitive dependencies from a local or remote maven
+repository into bundles under `target`.
+
+Use `get-edgent-jars.sh` to create bundles containing the jars.
+The script also creates `target/classpath.sh` for composing a classpath
+to use the Edgent jars.
+
+By default the script retrieves the Edgent java8 platform jars for the
+project's default Edgent version.
+
+``` sh
+cd get-edgent-jars-project
+./get-edgent-jars.sh --version 1.2.0-SNAPSHOT # retrieve the Edgent 1.2.0-SNAPSHOT java8 jars
+##### Generating dependency decls...
+##### Generating pom.xml...
+...
+##### Generating the bundles...
+...
+##### Generating classpath.sh...
+##### Bundle LICENSING information:
+...
+##### Using a bundle:
+
+ copy a bundle from target and unpack it
+ copy target/classpath.sh and use it to compose a classpath:
+
+ export CLASSPATH=`./classpath.sh --add-slf4j-jdk <path-to-unpacked-bundle>`
+
+ Omit "--add-slf4j-jdk" to omit an slf4j-jdk* implementation jar from the classpath.
+```
+
+
+For more usage information:
+``` sh
+get-edgent-jars.sh -h
+```
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/fdc2723c/get-edgent-jars-project/get-edgent-jars.sh
----------------------------------------------------------------------
diff --git a/get-edgent-jars-project/get-edgent-jars.sh b/get-edgent-jars-project/get-edgent-jars.sh
new file mode 100755
index 0000000..4b4194a
--- /dev/null
+++ b/get-edgent-jars-project/get-edgent-jars.sh
@@ -0,0 +1,226 @@
+#!/bin/sh
+#
+# 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.
+#
+
+## Get the Apache Edgent jars and their transitive external dependencies.
+##
+## By default get the Edgent java8 platform jars for the script's default Edgent version.
+##
+## --platform {java8|java7|android} get the specified target platform jars
+## --version edgent-version get the specified version's jars (e.g., 1.2.0-SNAPSHOT)
+## --artifacts csv-gav-list get only the specified artifacts. Not restricted to Edgent jars.
+## The Edgent version is substituted for all instances of '{EV}'
+## --file gav-file get only the specified artifacts. Not restricted to Edgent jars.
+## The Edgent version is substituted for all instances of '{EV}'
+## Lines that begin with '#' are ignored.
+## --mvn mvn-cmd use mvn-cmd instead of "./mvnw"
+##
+## Creates bundles and classpath.sh in the target dir.
+
+USAGE="usage: [--platform {java8|java7|android}] [--version edgent-version] [--artifacts csv-gav-list] [--file gav-file] [--mvn mvn-cmd]"
+
+set -e
+
+# project dir is whereever this script resides
+PROJ_DIR=`(cd $(dirname $0); pwd)`
+
+SAMPLES_DIR=`(cd $(dirname $0); pwd)`/..
+MVN_CMD=${SAMPLES_DIR}/mvnw
+
+EDGENT_PLATFORM=java8
+EDGENT_VERSION=
+SLF4J_VERSION=1.7.12
+
+if [ "$1" = "--platform" -a $# -gt 1 ]; then
+ EDGENT_PLATFORM=$2; shift; shift
+fi
+if [ "$1" = "--version" -a $# -gt 1 ]; then
+ EDGENT_VERSION=$2; shift; shift
+fi
+OPT_GAVS=
+if [ "$1" = "--artifacts" -a $# -gt 1 ]; then
+ OPT_CSV_GAVS=$2; shift; shift
+ OPT_GAVS=`echo "${OPT_CSV_GAVS}" | sed -e 's/,/ /g'`
+fi
+if [ "$1" = "--file" -a $# -gt 1 ]; then
+ OPT_GAVS_FILE=$2; shift; shift
+ OPT_GAVS=`sed -e '/^#/d' < ${OPT_GAVS_FILE}`
+fi
+if [ "$1" = "--mvn" -a $# -gt 1 ]; then
+ MVN_CMD=$2; shift; shift
+fi
+if [ $# != 0 ]; then
+ echo "$USAGE"
+ exit 1
+fi
+
+# only declare "top level" Edgent components that a user
+# would directly declare/use and let these components
+# (most typically the provider) pull in the rest of the
+# Edgent jars (and their dependencies)
+#
+# Explicitly add edgent-connectors-websocket-jetty
+# as there's not a direct dependency on it from connectors-websocket.
+#
+# Hmm... consider adding org.apache.edgent.console:edgent-console-servlets:{EV}:war
+# It's bundled in edgent-console-server.jar. Having it separately available
+# would enable having the "console" in a Servler engine of the user's choosing.
+# If added, may want to put it in a directory other than edgent-jars.
+#
+DEFAULT_GAVS=`cat << EOF
+org.slf4j:slf4j-jdk14:${SLF4J_VERSION}
+org.apache.edgent.analytics:edgent-analytics-math3:{EV}
+org.apache.edgent.analytics:edgent-analytics-sensors:{EV}
+org.apache.edgent.connectors:edgent-connectors-command:{EV}
+org.apache.edgent.connectors:edgent-connectors-csv:{EV}
+org.apache.edgent.connectors:edgent-connectors-file:{EV}
+org.apache.edgent.connectors:edgent-connectors-http:{EV}
+org.apache.edgent.connectors:edgent-connectors-iot:{EV}
+org.apache.edgent.connectors:edgent-connectors-iotp:{EV}
+org.apache.edgent.connectors:edgent-connectors-jdbc:{EV}
+org.apache.edgent.connectors:edgent-connectors-kafka:{EV}
+org.apache.edgent.connectors:edgent-connectors-mqtt:{EV}
+org.apache.edgent.connectors:edgent-connectors-pubsub:{EV}
+org.apache.edgent.connectors:edgent-connectors-serial:{EV}
+org.apache.edgent.connectors:edgent-connectors-websocket:{EV}
+org.apache.edgent.connectors:edgent-connectors-websocket-jetty:{EV}
+org.apache.edgent.providers:edgent-providers-development:{EV}
+org.apache.edgent.providers:edgent-providers-direct:{EV}
+org.apache.edgent.providers:edgent-providers-iot:{EV}
+org.apache.edgent.utils:edgent-utils-metrics:{EV}
+org.apache.edgent.utils:edgent-utils-streamscope:{EV}
+EOF
+`
+if [ "${EDGENT_PLATFORM}" != "java8" ]; then
+ DEFAULT_GAVS=`echo "${DEFAULT_GAVS}" | sed -e "s/apache.edgent/apache.edgent.${EDGENT_PLATFORM}/"`
+fi
+if [ "${EDGENT_PLATFORM}" == "android" ]; then
+ DEFAULT_GAVS=`echo "${DEFAULT_GAVS}" | sed -e "/edgent-providers-development/d"`
+ DEFAULT_GAVS=`echo "${DEFAULT_GAVS}"; echo "org.apache.edgent.android.android:edgent-android-hardware:{EV}"`
+ DEFAULT_GAVS=`echo "${DEFAULT_GAVS}"; echo "org.apache.edgent.android.android:edgent-android-topology:{EV}"`
+fi
+
+
+function confirm () { # [$1: question]
+ while true; do
+ # call with a prompt string or use a default
+ /bin/echo -n "${1:-Are you sure?}"
+ read -r -p " [y/n] " response
+ case $response in
+ [yY]) return `true` ;;
+ [nN]) return `false` ;;
+ *) echo "illegal response '$response'" ;;
+ esac
+ done
+}
+
+###########################
+echo
+echo "##### Generating dependency decls..."
+ARTIFACT_GAVS="${OPT_GAVS:-${DEFAULT_GAVS}}"
+mkdir -p target
+DEP_DECLS_FILE=target/tmp-dep-decls
+rm -f ${DEP_DECLS_FILE}
+for i in ${ARTIFACT_GAVS}; do
+ echo $i | awk -F : '{ type=""; if ($3 == "{EV}") $3="${edgent.core.version}"; if ($4 != "") type=" <type>" $4 "</type>\n"; printf "<dependency>\n <groupId>%s</groupId>\n <artifactId>%s</artifactId>\n <version>%s</version>\n%s</dependency>\n", $1, $2, $3, type }' >> ${DEP_DECLS_FILE}
+done
+DEP_DECLS=`cat ${DEP_DECLS_FILE}`
+
+###########################
+echo
+echo "##### Generating pom.xml..."
+cd ${PROJ_DIR}
+cp pom.xml.template pom.xml
+ed -s pom.xml <<EOF
+/INJECT_DEPENDENCIES_HERE
+a
+${DEP_DECLS}
+.
+wq
+EOF
+
+###########################
+echo
+echo "##### Generating the bundles..."
+EDGENT_VERSION_PROPERTY=
+if [ "${EDGENT_VERSION}" ]; then
+ EDGENT_VERSION_PROPERTY=-Dedgent.core.version=${EDGENT_VERSION}
+fi
+PLATFORM_PROFILE=
+if [ ${EDGENT_PLATFORM} != "java8" ]; then
+ PLATFORM_PROFILE="-Pplatform-${EDGENT_PLATFORM}"
+fi
+${MVN_CMD} clean package ${EDGENT_VERSION_PROPERTY} ${PLATFORM_PROFILE}
+
+
+###########################
+echo
+echo "##### Generating classpath.sh..."
+cat << 'EOF' > ${PROJ_DIR}/target/classpath.sh
+#!/bin/sh
+USAGE="usage: classpath.sh [--add-slf4j-jdk] <path-to-unpacked-bundle>"
+set -e
+if [ "${1}" == "--add-slf4j-jdk" ]; then
+ ADD_SLF4J_IMPL=slf4j-jdk
+ shift
+fi
+if [ $# != 1 ] || [[ ${1} == -* ]] ; then
+ echo "${USAGE}"
+ exit 1
+fi
+BASEDIR=${1}
+cd ${BASEDIR}
+SEP=
+CP=
+if [ "`ls libs 2>/dev/null`" != "" ]; then
+ for i in libs/*; do
+ CP="${CP}${SEP}${BASEDIR}/${i}"
+ SEP=":"
+ done
+fi
+if [ "`ls ext 2>/dev/null`" != "" ]; then
+ for i in ext/*; do
+ if [[ ${i} == */slf4j-* ]] && [[ ${i} != */slf4j-api-* ]] ; then
+ # it's an slf4j impl
+ if [[ "${ADD_SLF4J_IMPL}" == "" ]] || [[ ${i} != */${ADD_SLF4J_IMPL}* ]] ; then
+ continue
+ fi
+ fi
+ CP="${CP}${SEP}${BASEDIR}/${i}"
+ SEP=":"
+ done
+fi
+echo "${CP}"
+EOF
+chmod +x target/classpath.sh
+
+###########################
+echo
+echo "##### Bundle LICENSING information:"
+echo
+cat ${PROJ_DIR}/src/main/resources/README
+echo
+cat <<'EOF'
+##### Using a bundle:
+
+ copy a bundle from target and unpack it
+ copy target/classpath.sh and use it to compose a classpath:
+
+ export CLASSPATH=`./classpath.sh --add-slf4j-jdk <path-to-unpacked-bundle>`
+
+ Omit "--add-slf4j-jdk" to omit an slf4j-jdk* implementation jar from the classpath.
+EOF
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/fdc2723c/get-edgent-jars-project/old-get-edgent-jars.sh
----------------------------------------------------------------------
diff --git a/get-edgent-jars-project/old-get-edgent-jars.sh b/get-edgent-jars-project/old-get-edgent-jars.sh
new file mode 100755
index 0000000..fffb747
--- /dev/null
+++ b/get-edgent-jars-project/old-get-edgent-jars.sh
@@ -0,0 +1,254 @@
+#!/bin/sh
+#
+# 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.
+#
+
+## Get the Apache Edgent jars and their transitive external dependencies.
+##
+## By default get the Edgent java8 platform jars for the script's default Edgent version.
+##
+## --platform {java8|java7|android} get the specified target platform jars
+## --version edgent-version get the specified version's jars (e.g., 1.2.0-SNAPSHOT)
+## --artifacts csv-gav-list get only the specified artifacts. Not restricted to Edgent jars.
+## The Edgent version is substituted for all instances of '{EV}'
+## --file gav-file get only the specified artifacts. Not restricted to Edgent jars.
+## The Edgent version is substituted for all instances of '{EV}'
+## Lines that begin with '#' are ignored.
+## --mvn mvn-cmd use mvn-cmd instead of "./mvnw"
+##
+## Creates the directory get-edgent-jars-project and a maven project in it
+
+USAGE="usage: [--platform {java8|java7|android}] [--version edgent-version] [--artifacts csv-gav-list] [--file gav-file] [--mvn mvn-cmd]"
+
+set -e
+
+SAMPLES_DIR=`(cd $(dirname $0); pwd)`
+MVN_CMD=${SAMPLES_DIR}/mvnw
+
+EDGENT_PLATFORM=java8
+EDGENT_VERSION=1.2.0
+SLF4J_VERSION=1.7.12
+
+PROJ_DIR=tmp-get-edgent-jars-project
+
+if [ "$1" = "--platform" -a $# -gt 1 ]; then
+ EDGENT_PLATFORM=$2; shift; shift
+fi
+if [ "$1" = "--version" -a $# -gt 1 ]; then
+ EDGENT_VERSION=$2; shift; shift
+fi
+OPT_GAVS=
+if [ "$1" = "--artifacts" -a $# -gt 1 ]; then
+ OPT_CSV_GAVS=$2; shift; shift
+ OPT_GAVS=`echo "${OPT_CSV_GAVS}" | sed -e 's/,/ /g'`
+fi
+if [ "$1" = "--file" -a $# -gt 1 ]; then
+ OPT_GAVS_FILE=$2; shift; shift
+ OPT_GAVS=`sed -e '/^#/d' < ${OPT_GAVS_FILE}`
+fi
+if [ "$1" = "--mvn" -a $# -gt 1 ]; then
+ MVN_CMD=$2; shift; shift
+fi
+if [ $# != 0 ]; then
+ echo "$USAGE"
+ exit 1
+fi
+
+# only declare "top level" Edgent components that a user
+# would directly declare/use and let these components
+# (most typically the provider) pull in the rest of the
+# Edgent jars (and their dependencies)
+#
+# Explicitly add edgent-connectors-websocket-jetty
+# as there's not a direct dependency on it from connectors-websocket.
+#
+# Hmm... consider adding org.apache.edgent.console:edgent-console-servlets:{EV}:war
+# It's bundled in edgent-console-server.jar. Having it separately available
+# would enable having the "console" in a Servler engine of the user's choosing.
+# If added, may want to put it in a directory other than edgent-jars.
+#
+DEFAULT_GAVS=`cat << EOF
+org.slf4j:slf4j-jdk14:${SLF4J_VERSION}
+org.apache.edgent.analytics:edgent-analytics-math3:{EV}
+org.apache.edgent.analytics:edgent-analytics-sensors:{EV}
+org.apache.edgent.connectors:edgent-connectors-command:{EV}
+org.apache.edgent.connectors:edgent-connectors-csv:{EV}
+org.apache.edgent.connectors:edgent-connectors-file:{EV}
+org.apache.edgent.connectors:edgent-connectors-http:{EV}
+org.apache.edgent.connectors:edgent-connectors-iot:{EV}
+org.apache.edgent.connectors:edgent-connectors-iotp:{EV}
+org.apache.edgent.connectors:edgent-connectors-jdbc:{EV}
+org.apache.edgent.connectors:edgent-connectors-kafka:{EV}
+org.apache.edgent.connectors:edgent-connectors-mqtt:{EV}
+org.apache.edgent.connectors:edgent-connectors-pubsub:{EV}
+org.apache.edgent.connectors:edgent-connectors-serial:{EV}
+org.apache.edgent.connectors:edgent-connectors-websocket:{EV}
+org.apache.edgent.connectors:edgent-connectors-websocket-jetty:{EV}
+org.apache.edgent.providers:edgent-providers-development:{EV}
+org.apache.edgent.providers:edgent-providers-direct:{EV}
+org.apache.edgent.providers:edgent-providers-iot:{EV}
+org.apache.edgent.utils:edgent-utils-metrics:{EV}
+org.apache.edgent.utils:edgent-utils-streamscope:{EV}
+EOF
+`
+if [ "${EDGENT_PLATFORM}" != "java8" ]; then
+ DEFAULT_GAVS=`echo "${DEFAULT_GAVS}" | sed -e "s/apache.edgent/apache.edgent.${EDGENT_PLATFORM}/"`
+fi
+if [ "${EDGENT_PLATFORM}" == "android" ]; then
+ DEFAULT_GAVS=`echo "${DEFAULT_GAVS}" | sed -e "/edgent-providers-development/d"`
+ DEFAULT_GAVS=`echo "${DEFAULT_GAVS}"; echo "org.apache.edgent.android.android:edgent-android-hardware:{EV}"`
+ DEFAULT_GAVS=`echo "${DEFAULT_GAVS}"; echo "org.apache.edgent.android.android:edgent-android-topology:{EV}"`
+fi
+
+
+function confirm () { # [$1: question]
+ while true; do
+ # call with a prompt string or use a default
+ /bin/echo -n "${1:-Are you sure?}"
+ read -r -p " [y/n] " response
+ case $response in
+ [yY]) return `true` ;;
+ [nN]) return `false` ;;
+ *) echo "illegal response '$response'" ;;
+ esac
+ done
+}
+
+###########################
+cat <<EOF
+This command downloads the Apache Edgent jars and their transitive external dependencies.
+The external dependencies have their own licensing term that you should review.
+A summary of the external dependencies can be found here <TODO URL>.
+EOF
+confirm "Continue?" || exit
+
+###########################
+if [ ! -d ${PROJ_DIR} ]; then
+ echo "##### Generating maven project ${PROJ_DIR}..."
+ # ensure a standalone pom (no parent) to avoid unwanted inherited deps
+ TMP_PROJ=${PROJ_DIR}-tmp
+ mkdir ${TMP_PROJ}
+ cd ${TMP_PROJ}
+ ${MVN_CMD} -B archetype:generate \
+ -DarchetypeGroupId=org.apache.maven.archeTypes \
+ -DarchetypeArtifactId=maven-archetype-quickstart \
+ -DgroupId=org.apache.edgent.tools \
+ -DartifactId=${PROJ_DIR} \
+ -Dversion=1.0
+ cd ..
+ mv ${TMP_PROJ}/${PROJ_DIR} ${PROJ_DIR}
+ rmdir ${TMP_PROJ}
+ cp ${PROJ_DIR}/pom.xml ${PROJ_DIR}/pom.xml.orig
+else
+ cp ${PROJ_DIR}/pom.xml.orig ${PROJ_DIR}/pom.xml
+fi
+
+###########################
+
+cd ${PROJ_DIR}
+
+###########################
+
+###########################
+echo
+echo "##### Generating dependency decls..."
+ARTIFACT_GAVS="${OPT_GAVS:-${DEFAULT_GAVS}}"
+ARTIFACT_GAVS=`echo "${ARTIFACT_GAVS}" | sed -e "s/{EV}/${EDGENT_VERSION}/g"`
+mkdir -p target
+DEP_DECLS_FILE=target/tmp-dep-decls
+rm -f ${DEP_DECLS_FILE}
+for i in ${ARTIFACT_GAVS}; do
+ echo $i | awk -F : '{ type=""; if ($4 != "") type=" <type>" $4 "</type>\n"; printf "<dependency>\n <groupId>%s</groupId>\n <artifactId>%s</artifactId>\n <version>%s</version>\n%s</dependency>\n", $1, $2, $3, type }' >> ${DEP_DECLS_FILE}
+done
+DEP_DECLS=`cat ${DEP_DECLS_FILE}`
+
+###########################
+echo
+echo "##### Adding dependency decls to pom..."
+ed pom.xml <<EOF
+/<dependencies>
+a
+${DEP_DECLS}
+.
+wq
+EOF
+
+###########################
+echo
+echo "##### Retrieving jars into local maven repo..."
+${MVN_CMD} clean compile
+
+###########################
+echo
+echo "##### Copying jars..."
+# if someone screws up j7 or android deps, uncomment the following and
+# it will help identify wrong jars that are getting included / copied
+# (and otherwise overwriting each other).
+#DEBUG_DEPS=-Dmdep.prependGroupId=true
+${MVN_CMD} dependency:copy-dependencies -DincludeScope=runtime ${DEBUG_DEPS}
+
+DEPS_SRC_DIR=target/dependency
+EDGENT_DEPS_DIR=${EDGENT_PLATFORM}/edgent-jars
+EXT_DEPS_DIR=${EDGENT_PLATFORM}/ext-jars
+
+rm -rf "${EDGENT_DEPS_DIR}"; mkdir -p ${EDGENT_DEPS_DIR}
+rm -rf "${EXT_DEPS_DIR}"; mkdir -p ${EXT_DEPS_DIR}
+
+cp ${DEPS_SRC_DIR}/* ${EXT_DEPS_DIR}
+
+for i in `find ${EXT_DEPS_DIR} -name '*edgent-*.*ar'`; do
+ mv $i ${EDGENT_DEPS_DIR}
+done
+
+###########################
+echo
+echo "##### Generating classpath.sh..."
+cat << 'EOF' > ${EDGENT_PLATFORM}/classpath.sh
+#!/bin/sh
+set -e
+if [ "${1}" = "" -o "${1}" = "-?" -o "${1}" = "-help" ]; then
+ echo "usage: classpath.sh <path-to-parent-of-edgent-jars-dir>"
+ exit 1
+fi
+BASEDIR=${1}
+cd ${BASEDIR}
+SEP=
+CP=
+if [ "`ls edgent-jars 2>/dev/null`" != "" ]; then
+ for i in edgent-jars/*; do
+ CP="${CP}${SEP}${BASEDIR}/${i}"
+ SEP=":"
+ done
+fi
+if [ "`ls ext-jars 2>/dev/null`" != "" ]; then
+ for i in ext-jars/*; do
+ if [[ ${i} == */slf4j-* ]] && [[ ${i} != */slf4j-api-* ]] ; then
+ continue
+ fi
+ CP="${CP}${SEP}${BASEDIR}/${i}"
+ SEP=":"
+ done
+fi
+echo "${CP}"
+EOF
+chmod +x ${EDGENT_PLATFORM}/classpath.sh
+
+###########################
+echo
+echo "##### The Edgent jars are in ${PROJ_DIR}/${EDGENT_DEPS_DIR}"
+echo "##### The external jars are in ${PROJ_DIR}/${EXT_DEPS_DIR}"
+echo "##### CLASSPATH may be set by copying ${PROJ_DIR}/${EDGENT_PLATFORM}/classpath.sh and using it like:"
+echo '##### export CLASSPATH=`classpath.sh path-to-parent-of-edgent-jars-dir`'
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/fdc2723c/get-edgent-jars-project/pom.xml.template
----------------------------------------------------------------------
diff --git a/get-edgent-jars-project/pom.xml.template b/get-edgent-jars-project/pom.xml.template
new file mode 100644
index 0000000..bae3613
--- /dev/null
+++ b/get-edgent-jars-project/pom.xml.template
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- standalone project -->
+ <!--parent>
+ <groupId>org.apache.edgent</groupId>
+ <artifactId>edgent-parent</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent-->
+
+ <groupId>org.apache.edgent.get-edgent-jars</groupId>
+ <artifactId>get-edgent-jars</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+
+ <name>Apache Edgent get-edgent-jars ${samples.projname.platform}</name>
+
+ <properties>
+ <samples.projname.platform> (Java 8)</samples.projname.platform> <!-- tweaked by -Pplatform-* -->
+ <edgent.platform>java8</edgent.platform> <!-- tweaked by -Pplatform-* -->
+ <edgent.groupId.platform/> <!-- tweaked by -Pplatform-* -->
+ <edgent.base.groupId>org.apache.edgent${edgent.groupId.platform}</edgent.base.groupId>
+ <!-- at least for now, the samples version is lockstep with the core
+ so default to using the same core as the this project.
+ get-edgent-jars.sh overrides via -Dedgent.core.version=...
+ -->
+ <edgent.core.version>${project.version}</edgent.core.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.5.3</version>
+ <configuration>
+ <finalName>edgent-${edgent.platform}-jars-${edgent.core.version}</finalName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.5</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>process-resource-bundles</id>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <!-- Will generate META-INF/{DEPENDENCIES,LICENSE,NOTICE} -->
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ <!-- Will generate META-INF/DISCLAIMER (incubator version) -->
+ <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
+ </resourceBundles>
+ <!-- Content in this directory will be appended to generated resources -->
+ <appendedResourcesDirectory>${remote-resources-maven-plugin.remote-resources.dir}</appendedResourcesDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptor>src/assembly/distribution.xml</descriptor>
+ </configuration>
+ <executions>
+ <execution>
+ <id>create-archive</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- We don't need any jars as output in this module -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-jar</id>
+ <phase>none</phase>
+ </execution>
+ <execution>
+ <id>default</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>platform-java7</id>
+ <properties>
+ <edgent.platform>java7</edgent.platform>
+ <edgent.groupId.platform>.${edgent.platform}</edgent.groupId.platform>
+ <platform.java7>true</platform.java7>
+ <samples.projname.platform> (Java 7)</samples.projname.platform>
+ </properties>
+ </profile>
+ <profile>
+ <id>platform-android</id>
+ <properties>
+ <edgent.platform>android</edgent.platform>
+ <edgent.groupId.platform>.${edgent.platform}</edgent.groupId.platform>
+ <platform.android>true</platform.android>
+ <samples.projname.platform> (Android)</samples.projname.platform>
+ </properties>
+ </profile>
+ </profiles>
+
+ <dependencies>
+<!-- INJECT_DEPENDENCIES_HERE -->
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/fdc2723c/get-edgent-jars-project/src/assembly/distribution.xml
----------------------------------------------------------------------
diff --git a/get-edgent-jars-project/src/assembly/distribution.xml b/get-edgent-jars-project/src/assembly/distribution.xml
new file mode 100644
index 0000000..843bbf5
--- /dev/null
+++ b/get-edgent-jars-project/src/assembly/distribution.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+
+ <!--
+ NOTE: each platform (platforms/java7 and platforms/android) have their
+ own distribution project and a copy of this configuration file that
+ must be manually kept in sync.
+ -->
+
+ <id>bin</id>
+
+ <formats>
+ <format>tar.gz</format>
+ <format>tar.bz2</format>
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.outputDirectory}/META-INF</directory>
+ <includes>
+ <include>DISCLAIMER</include>
+ <include>DEPENDENCIES</include>
+ </includes>
+ <outputDirectory/>
+ </fileSet>
+
+ <fileSet>
+ <directory>${project.build.outputDirectory}</directory>
+ <includes>
+ <include>README</include>
+ </includes>
+ <outputDirectory/>
+ </fileSet>
+
+ </fileSets>
+
+ <dependencySets>
+ <!-- Any edgent libs -->
+ <dependencySet>
+ <outputDirectory>libs</outputDirectory>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.apache.edgent*</include>
+ </includes>
+ <excludes>
+ <exclude>org.apache.edgent.get-edgent-jars*</exclude>
+ </excludes>
+ </dependencySet>
+
+ <!-- All other libs are treated as external libs -->
+ <dependencySet>
+ <outputDirectory>ext</outputDirectory>
+ <scope>runtime</scope>
+ <excludes>
+ <exclude>org.apache.edgent*</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/fdc2723c/get-edgent-jars-project/src/main/resources/README
----------------------------------------------------------------------
diff --git a/get-edgent-jars-project/src/main/resources/README b/get-edgent-jars-project/src/main/resources/README
new file mode 100644
index 0000000..d91c7ff
--- /dev/null
+++ b/get-edgent-jars-project/src/main/resources/README
@@ -0,0 +1,12 @@
+This bundle includes a number of artifacts with separate
+copyright notices and license terms. Your use of an artifact
+is subject to that artifact’s licensing terms and conditions.
+
+The Apache Edgent artifacts (everything in lib) all have the
+license “Apache License Version 2.0”.
+
+Edgent’s dependent artifacts in “ext” have all been evaluated
+to be compatible with Edgent’s license.
+
+A bundled artifact's advertised license information may be
+found in the DEPENDENCIES file in this bundle.
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/fdc2723c/get-edgent-jars.sh
----------------------------------------------------------------------
diff --git a/get-edgent-jars.sh b/get-edgent-jars.sh
deleted file mode 100755
index 46a2bbf..0000000
--- a/get-edgent-jars.sh
+++ /dev/null
@@ -1,254 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-
-## Get the Apache Edgent jars and their transitive external dependencies.
-##
-## By default get the Edgent java8 platform jars for the script's default Edgent version.
-##
-## --platform {java8|java7|android} get the specified target platform jars
-## --version edgent-version get the specified version's jars (e.g., 1.2.0-SNAPSHOT)
-## --artifacts csv-gav-list get only the specified artifacts. Not restricted to Edgent jars.
-## The Edgent version is substituted for all instances of '{EV}'
-## --file gav-file get only the specified artifacts. Not restricted to Edgent jars.
-## The Edgent version is substituted for all instances of '{EV}'
-## Lines that begin with '#' are ignored.
-## --mvn mvn-cmd use mvn-cmd instead of "./mvnw"
-##
-## Creates the directory get-edgent-jars-project and a maven project in it
-
-USAGE="usage: [--platform {java8|java7|android}] [--version edgent-version] [--artifacts csv-gav-list] [--file gav-file] [--mvn mvn-cmd]"
-
-set -e
-
-SAMPLES_DIR=`(cd $(dirname $0); pwd)`
-MVN_CMD=${SAMPLES_DIR}/mvnw
-
-EDGENT_PLATFORM=java8
-EDGENT_VERSION=1.2.0
-SLF4J_VERSION=1.7.12
-
-PROJ_DIR=get-edgent-jars-project
-
-if [ "$1" = "--platform" -a $# -gt 1 ]; then
- EDGENT_PLATFORM=$2; shift; shift
-fi
-if [ "$1" = "--version" -a $# -gt 1 ]; then
- EDGENT_VERSION=$2; shift; shift
-fi
-OPT_GAVS=
-if [ "$1" = "--artifacts" -a $# -gt 1 ]; then
- OPT_CSV_GAVS=$2; shift; shift
- OPT_GAVS=`echo "${OPT_CSV_GAVS}" | sed -e 's/,/ /g'`
-fi
-if [ "$1" = "--file" -a $# -gt 1 ]; then
- OPT_GAVS_FILE=$2; shift; shift
- OPT_GAVS=`sed -e '/^#/d' < ${OPT_GAVS_FILE}`
-fi
-if [ "$1" = "--mvn" -a $# -gt 1 ]; then
- MVN_CMD=$2; shift; shift
-fi
-if [ $# != 0 ]; then
- echo "$USAGE"
- exit 1
-fi
-
-# only declare "top level" Edgent components that a user
-# would directly declare/use and let these components
-# (most typically the provider) pull in the rest of the
-# Edgent jars (and their dependencies)
-#
-# Explicitly add edgent-connectors-websocket-jetty
-# as there's not a direct dependency on it from connectors-websocket.
-#
-# Hmm... consider adding org.apache.edgent.console:edgent-console-servlets:{EV}:war
-# It's bundled in edgent-console-server.jar. Having it separately available
-# would enable having the "console" in a Servler engine of the user's choosing.
-# If added, may want to put it in a directory other than edgent-jars.
-#
-DEFAULT_GAVS=`cat << EOF
-org.slf4j:slf4j-jdk14:${SLF4J_VERSION}
-org.apache.edgent.analytics:edgent-analytics-math3:{EV}
-org.apache.edgent.analytics:edgent-analytics-sensors:{EV}
-org.apache.edgent.connectors:edgent-connectors-command:{EV}
-org.apache.edgent.connectors:edgent-connectors-csv:{EV}
-org.apache.edgent.connectors:edgent-connectors-file:{EV}
-org.apache.edgent.connectors:edgent-connectors-http:{EV}
-org.apache.edgent.connectors:edgent-connectors-iot:{EV}
-org.apache.edgent.connectors:edgent-connectors-iotp:{EV}
-org.apache.edgent.connectors:edgent-connectors-jdbc:{EV}
-org.apache.edgent.connectors:edgent-connectors-kafka:{EV}
-org.apache.edgent.connectors:edgent-connectors-mqtt:{EV}
-org.apache.edgent.connectors:edgent-connectors-pubsub:{EV}
-org.apache.edgent.connectors:edgent-connectors-serial:{EV}
-org.apache.edgent.connectors:edgent-connectors-websocket:{EV}
-org.apache.edgent.connectors:edgent-connectors-websocket-jetty:{EV}
-org.apache.edgent.providers:edgent-providers-development:{EV}
-org.apache.edgent.providers:edgent-providers-direct:{EV}
-org.apache.edgent.providers:edgent-providers-iot:{EV}
-org.apache.edgent.utils:edgent-utils-metrics:{EV}
-org.apache.edgent.utils:edgent-utils-streamscope:{EV}
-EOF
-`
-if [ "${EDGENT_PLATFORM}" != "java8" ]; then
- DEFAULT_GAVS=`echo "${DEFAULT_GAVS}" | sed -e "s/apache.edgent/apache.edgent.${EDGENT_PLATFORM}/"`
-fi
-if [ "${EDGENT_PLATFORM}" == "android" ]; then
- DEFAULT_GAVS=`echo "${DEFAULT_GAVS}" | sed -e "/edgent-providers-development/d"`
- DEFAULT_GAVS=`echo "${DEFAULT_GAVS}"; echo "org.apache.edgent.android.android:edgent-android-hardware:{EV}"`
- DEFAULT_GAVS=`echo "${DEFAULT_GAVS}"; echo "org.apache.edgent.android.android:edgent-android-topology:{EV}"`
-fi
-
-
-function confirm () { # [$1: question]
- while true; do
- # call with a prompt string or use a default
- /bin/echo -n "${1:-Are you sure?}"
- read -r -p " [y/n] " response
- case $response in
- [yY]) return `true` ;;
- [nN]) return `false` ;;
- *) echo "illegal response '$response'" ;;
- esac
- done
-}
-
-###########################
-cat <<EOF
-This command downloads the Apache Edgent jars and their transitive external dependencies.
-The external dependencies have their own licensing term that you should review.
-A summary of the external dependencies can be found here <TODO URL>.
-EOF
-confirm "Continue?" || exit
-
-###########################
-if [ ! -d ${PROJ_DIR} ]; then
- echo "##### Generating maven project ${PROJ_DIR}..."
- # ensure a standalone pom (no parent) to avoid unwanted inherited deps
- TMP_PROJ=${PROJ_DIR}-tmp
- mkdir ${TMP_PROJ}
- cd ${TMP_PROJ}
- ${MVN_CMD} -B archetype:generate \
- -DarchetypeGroupId=org.apache.maven.archeTypes \
- -DarchetypeArtifactId=maven-archetype-quickstart \
- -DgroupId=org.apache.edgent.tools \
- -DartifactId=${PROJ_DIR} \
- -Dversion=1.0
- cd ..
- mv ${TMP_PROJ}/${PROJ_DIR} ${PROJ_DIR}
- rmdir ${TMP_PROJ}
- cp ${PROJ_DIR}/pom.xml ${PROJ_DIR}/pom.xml.orig
-else
- cp ${PROJ_DIR}/pom.xml.orig ${PROJ_DIR}/pom.xml
-fi
-
-###########################
-
-cd ${PROJ_DIR}
-
-###########################
-
-###########################
-echo
-echo "##### Generating dependency decls..."
-ARTIFACT_GAVS="${OPT_GAVS:-${DEFAULT_GAVS}}"
-ARTIFACT_GAVS=`echo "${ARTIFACT_GAVS}" | sed -e "s/{EV}/${EDGENT_VERSION}/g"`
-mkdir -p target
-DEP_DECLS_FILE=target/tmp-dep-decls
-rm -f ${DEP_DECLS_FILE}
-for i in ${ARTIFACT_GAVS}; do
- echo $i | awk -F : '{ type=""; if ($4 != "") type=" <type>" $4 "</type>\n"; printf "<dependency>\n <groupId>%s</groupId>\n <artifactId>%s</artifactId>\n <version>%s</version>\n%s</dependency>\n", $1, $2, $3, type }' >> ${DEP_DECLS_FILE}
-done
-DEP_DECLS=`cat ${DEP_DECLS_FILE}`
-
-###########################
-echo
-echo "##### Adding dependency decls to pom..."
-ed pom.xml <<EOF
-/<dependencies>
-a
-${DEP_DECLS}
-.
-wq
-EOF
-
-###########################
-echo
-echo "##### Retrieving jars into local maven repo..."
-${MVN_CMD} clean compile
-
-###########################
-echo
-echo "##### Copying jars..."
-# if someone screws up j7 or android deps, uncomment the following and
-# it will help identify wrong jars that are getting included / copied
-# (and otherwise overwriting each other).
-#DEBUG_DEPS=-Dmdep.prependGroupId=true
-${MVN_CMD} dependency:copy-dependencies -DincludeScope=runtime ${DEBUG_DEPS}
-
-DEPS_SRC_DIR=target/dependency
-EDGENT_DEPS_DIR=${EDGENT_PLATFORM}/edgent-jars
-EXT_DEPS_DIR=${EDGENT_PLATFORM}/ext-jars
-
-rm -rf "${EDGENT_DEPS_DIR}"; mkdir -p ${EDGENT_DEPS_DIR}
-rm -rf "${EXT_DEPS_DIR}"; mkdir -p ${EXT_DEPS_DIR}
-
-cp ${DEPS_SRC_DIR}/* ${EXT_DEPS_DIR}
-
-for i in `find ${EXT_DEPS_DIR} -name '*edgent-*.*ar'`; do
- mv $i ${EDGENT_DEPS_DIR}
-done
-
-###########################
-echo
-echo "##### Generating classpath.sh..."
-cat << 'EOF' > ${EDGENT_PLATFORM}/classpath.sh
-#!/bin/sh
-set -e
-if [ "${1}" = "" -o "${1}" = "-?" -o "${1}" = "-help" ]; then
- echo "usage: classpath.sh <path-to-parent-of-edgent-jars-dir>"
- exit 1
-fi
-BASEDIR=${1}
-cd ${BASEDIR}
-SEP=
-CP=
-if [ "`ls edgent-jars 2>/dev/null`" != "" ]; then
- for i in edgent-jars/*; do
- CP="${CP}${SEP}${BASEDIR}/${i}"
- SEP=":"
- done
-fi
-if [ "`ls ext-jars 2>/dev/null`" != "" ]; then
- for i in ext-jars/*; do
- if [[ ${i} == */slf4j-* ]] && [[ ${i} != */slf4j-api-* ]] ; then
- continue
- fi
- CP="${CP}${SEP}${BASEDIR}/${i}"
- SEP=":"
- done
-fi
-echo "${CP}"
-EOF
-chmod +x ${EDGENT_PLATFORM}/classpath.sh
-
-###########################
-echo
-echo "##### The Edgent jars are in ${PROJ_DIR}/${EDGENT_DEPS_DIR}"
-echo "##### The external jars are in ${PROJ_DIR}/${EXT_DEPS_DIR}"
-echo "##### CLASSPATH may be set by copying ${PROJ_DIR}/${EDGENT_PLATFORM}/classpath.sh and using it like:"
-echo '##### export CLASSPATH=`classpath.sh path-to-parent-of-edgent-jars-dir`'
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/fdc2723c/template/README.md
----------------------------------------------------------------------
diff --git a/template/README.md b/template/README.md
index 2c7d300..a0763fd 100644
--- a/template/README.md
+++ b/template/README.md
@@ -36,3 +36,10 @@ Adjust the main class name and application jar path below for your application.
PLATFORM= # add "--platform java7" or "--platform android" as appropriate
../package-app.sh $PLATFORM --mainClass com.mycompany.app.TemplateApp --appjar target/my-app-1.0-SNAPSHOT.jar
```
+
+# Using get-edgent-jars-project
+
+If you don't want to use the generated uber jar or `package-app.sh`
+approaches, you can copy the application's standard jar and a
+`get-edgent-jars-project` generated jar bundle to the edge device.
+See `samples/get-edgent-jars-project`.
[17/50] incubator-edgent-samples git commit: Merge remote-tracking
branch 'origin/feature/maven' into feature/maven
Posted by cd...@apache.org.
Merge remote-tracking branch 'origin/feature/maven' into feature/maven
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/9dfe051a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/9dfe051a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/9dfe051a
Branch: refs/heads/develop
Commit: 9dfe051a25ccb285036811092de9c0ef19ba2135
Parents: 7d38a3e d6d7285
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Tue Sep 26 21:13:04 2017 +0200
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Tue Sep 26 21:13:04 2017 +0200
----------------------------------------------------------------------
README.md | 74 ++++++++++++++++++++++++++++++++----------
pom.xml | 9 ++++--
template/README.md | 18 +++++------
template/pom.xml | 85 ++-----------------------------------------------
4 files changed, 74 insertions(+), 112 deletions(-)
----------------------------------------------------------------------
[39/50] incubator-edgent-samples git commit: minor doc stuff
Posted by cd...@apache.org.
minor doc stuff
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/22d0c288
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/22d0c288
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/22d0c288
Branch: refs/heads/develop
Commit: 22d0c288bdf0301c1ae933381bbcaa95eceb5448
Parents: 51ddbc2
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Oct 17 20:09:25 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Oct 17 20:09:25 2017 -0400
----------------------------------------------------------------------
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/22d0c288/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 97adf54..e39fac0 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@
# Quickstart
You must have Java 8 installed on your system. Maven will be automatically
-downloaded installed by the maven wrapper `mvnw`.
+downloaded and installed by the maven wrapper `mvnw`.
Build the samples for Java 8
```sh
[48/50] incubator-edgent-samples git commit: Merge pull request #317
Posted by cd...@apache.org.
Merge pull request #317
This closes #317
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/eb42102e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/eb42102e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/eb42102e
Branch: refs/heads/develop
Commit: eb42102ef784dd13479b84d134b3b3a37665e20e
Parents: 3ed0049 cc6bd62
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Mon Nov 6 13:15:13 2017 -0500
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Mon Nov 6 13:15:13 2017 -0500
----------------------------------------------------------------------
README.md | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
[36/50] incubator-edgent-samples git commit: fix (finally?) samples
and j7
Posted by cd...@apache.org.
fix (finally?) samples and j7
- the prior "rototil" commit wasn't complete
- it didn't actually compile anything for j7... woops
- started to flesh that out but...
- had 2nd thoughts and decided should be able to simplify
- undo the rototil and simply build the samples with either j8 or j7
edgent jars
- don't have separate j8,j7 samples groupIds; samples artifacts will
be j8 unless built with -Pplatform-java7
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/e1812af8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/e1812af8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/e1812af8
Branch: refs/heads/develop
Commit: e1812af8958cbc1ab39c23662d9851280be4e98c
Parents: d70a181
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Mon Oct 16 14:39:58 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Mon Oct 16 14:39:58 2017 -0400
----------------------------------------------------------------------
apps/pom.xml | 23 +---
buildtools/update-platform-poms.sh | 21 ----
connectors/pom.xml | 23 +---
console/pom.xml | 21 +---
platforms/java7/apps/pom.xml | 93 ----------------
platforms/java7/connectors/pom.xml | 98 -----------------
platforms/java7/console/pom.xml | 67 ------------
platforms/java7/pom.xml | 186 --------------------------------
platforms/java7/scenarios/pom.xml | 102 ------------------
platforms/java7/topology/pom.xml | 68 ------------
platforms/java7/utils/pom.xml | 78 --------------
platforms/pom.xml | 59 ----------
pom.xml | 57 ++++++++--
scenarios/pom.xml | 23 +---
topology/pom.xml | 23 +---
utils/pom.xml | 21 +---
16 files changed, 66 insertions(+), 897 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index bebae83..602c970 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -21,8 +21,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <!-- UPDATE_PLATFORM_POMS_MSG_PLACEHOLDER -->
-
<parent>
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples</artifactId>
@@ -32,25 +30,10 @@
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-apps</artifactId>
- <name>Apache Edgent${samples.projname.platform}: Samples: Apps</name>
+ <name>Apache Edgent Samples${samples.projname.platform}: Apps</name>
<dependencies>
- <!-- parent pom has SLF4J dependencies -->
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-development</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
+ <!-- parent pom has Platforms and SLF4J dependencies -->
<dependency>
<groupId>${edgent.base.groupId}.analytics</groupId>
@@ -84,7 +67,7 @@
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.samples</groupId>
+ <groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-utils</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/buildtools/update-platform-poms.sh
----------------------------------------------------------------------
diff --git a/buildtools/update-platform-poms.sh b/buildtools/update-platform-poms.sh
deleted file mode 100755
index 56cf1bb..0000000
--- a/buildtools/update-platform-poms.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-# copy the java8 version of the poms to the other platform hierarchies,
-# adjusting the groupIds accordingly
-#
-# usage: buildtools/update-platform-poms.sh
-
-J8_PROJECTS="apps connectors console scenarios topology utils"
-PLATFORMS=java7
-
-for p in ${PLATFORMS}; do
- for proj in ${J8_PROJECTS}; do
- echo Updating platforms/${p}/${proj}/pom.xml...
- if [ ! -d platforms/${p}/${proj} ]; then
- mkdir -p platforms/${p}/${proj}
- fi
- sed -e "s/org.apache.edgent.samples/org.apache.edgent.${p}.samples/g" \
- -e "s/UPDATE_PLATFORM_POMS_MSG_PLACEHOLDER/DO NOT EDIT - GENERATED BY update_platform_poms.sh/" \
- < ${proj}/pom.xml > platforms/${p}/${proj}/pom.xml
- done
-done
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/connectors/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/pom.xml b/connectors/pom.xml
index 9f293c8..cf8549a 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -21,8 +21,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <!-- UPDATE_PLATFORM_POMS_MSG_PLACEHOLDER -->
-
<parent>
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples</artifactId>
@@ -32,25 +30,10 @@
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-connectors</artifactId>
- <name>Apache Edgent${samples.projname.platform}: Samples: Connectors</name>
+ <name>Apache Edgent Samples${samples.projname.platform}: Connectors</name>
<dependencies>
- <!-- parent pom has SLF4J dependencies -->
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-development</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
+ <!-- parent pom has Platforms and SLF4J dependencies -->
<dependency>
<groupId>${edgent.base.groupId}.connectors</groupId>
@@ -89,7 +72,7 @@
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.samples</groupId>
+ <groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-topology</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/console/pom.xml
----------------------------------------------------------------------
diff --git a/console/pom.xml b/console/pom.xml
index 52961e5..dfd35c5 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -21,8 +21,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <!-- UPDATE_PLATFORM_POMS_MSG_PLACEHOLDER -->
-
<parent>
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples</artifactId>
@@ -32,25 +30,10 @@
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-console</artifactId>
- <name>Apache Edgent${samples.projname.platform}: Samples: Console</name>
+ <name>Apache Edgent Samples${samples.projname.platform}: Console</name>
<dependencies>
- <!-- parent pom has SLF4J dependencies -->
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-development</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
+ <!-- parent pom has Platforms and SLF4J dependencies -->
<dependency>
<groupId>${edgent.base.groupId}.console</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/platforms/java7/apps/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/apps/pom.xml b/platforms/java7/apps/pom.xml
deleted file mode 100644
index 6a81391..0000000
--- a/platforms/java7/apps/pom.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- DO NOT EDIT - GENERATED BY update_platform_poms.sh -->
-
- <parent>
- <groupId>org.apache.edgent.java7.samples</groupId>
- <artifactId>edgent-samples</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.edgent.java7.samples</groupId>
- <artifactId>edgent-samples-apps</artifactId>
-
- <name>Apache Edgent${samples.projname.platform}: Samples: Apps</name>
-
- <dependencies>
- <!-- parent pom has SLF4J dependencies -->
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-development</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
- <artifactId>edgent-analytics-sensors</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
- <artifactId>edgent-connectors-file</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
- <artifactId>edgent-analytics-math3</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
- <artifactId>edgent-connectors-iot</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
- <artifactId>edgent-connectors-iotp</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
- <artifactId>edgent-connectors-mqtt</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${edgent.base.groupId}.samples</groupId>
- <artifactId>edgent-samples-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/platforms/java7/connectors/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/connectors/pom.xml b/platforms/java7/connectors/pom.xml
deleted file mode 100644
index b8c4341..0000000
--- a/platforms/java7/connectors/pom.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- DO NOT EDIT - GENERATED BY update_platform_poms.sh -->
-
- <parent>
- <groupId>org.apache.edgent.java7.samples</groupId>
- <artifactId>edgent-samples</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.edgent.java7.samples</groupId>
- <artifactId>edgent-samples-connectors</artifactId>
-
- <name>Apache Edgent${samples.projname.platform}: Samples: Connectors</name>
-
- <dependencies>
- <!-- parent pom has SLF4J dependencies -->
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-development</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
- <artifactId>edgent-connectors-mqtt</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
- <artifactId>edgent-connectors-kafka</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
- <artifactId>edgent-connectors-jdbc</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
- <artifactId>edgent-connectors-serial</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
- <artifactId>edgent-connectors-file</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
- <artifactId>edgent-connectors-iotp</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
- <artifactId>edgent-analytics-math3</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${edgent.base.groupId}.samples</groupId>
- <artifactId>edgent-samples-topology</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/platforms/java7/console/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/console/pom.xml b/platforms/java7/console/pom.xml
deleted file mode 100644
index f2ec5c7..0000000
--- a/platforms/java7/console/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- DO NOT EDIT - GENERATED BY update_platform_poms.sh -->
-
- <parent>
- <groupId>org.apache.edgent.java7.samples</groupId>
- <artifactId>edgent-samples</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.edgent.java7.samples</groupId>
- <artifactId>edgent-samples-console</artifactId>
-
- <name>Apache Edgent${samples.projname.platform}: Samples: Console</name>
-
- <dependencies>
- <!-- parent pom has SLF4J dependencies -->
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-development</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${edgent.base.groupId}.console</groupId>
- <artifactId>edgent-console-server</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.utils</groupId>
- <artifactId>edgent-utils-metrics</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/platforms/java7/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/pom.xml b/platforms/java7/pom.xml
deleted file mode 100644
index a27a837..0000000
--- a/platforms/java7/pom.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.edgent.samples.platforms</groupId>
- <artifactId>edgent-samples-platforms</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.edgent.java7.samples</groupId>
- <artifactId>edgent-samples</artifactId>
- <packaging>pom</packaging>
-
- <name>Apache Edgent${samples.projname.platform}: Samples</name>
-
- <properties>
- <edgent.base.groupId>org.apache.edgent.java7</edgent.base.groupId>
- </properties>
-
- <modules>
- <module>apps</module>
- <module>connectors</module>
- <module>console</module>
- <module>scenarios</module>
- <module>topology</module>
- <module>utils</module>
- </modules>
-
- <build>
- <plugins>
- <!-- Convert the Java8 classes to Java7 classes -->
- <plugin>
- <groupId>net.orfjackal.retrolambda</groupId>
- <artifactId>retrolambda-maven-plugin</artifactId>
- <version>2.5.1</version>
- <executions>
- <execution>
- <goals>
- <goal>process-main</goal>
- <goal>process-test</goal>
- </goals>
- <configuration>
- <!-- I was getting random failures if not running retrolambda in a separate process -->
- <fork>true</fork>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Test.class</include>
- </includes>
- <testClassesDirectory>${project.build.testOutputDirectory}</testClassesDirectory>
- </configuration>
- </plugin>
- <!-- Check artifacts against Java7 signatures -->
- <!--
- Let the plugin run in the process-test-classes so we immediately know if
- test run problems could be related to using APIs unavailable to Java7.
- -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.15</version>
- <executions>
- <execution>
- <id>check-jdk-signatures</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java17</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <!-- Additionally build the binary distribution package. -->
- <profile>
- <id>distribution</id>
- <modules>
- <module>distribution</module>
- </modules>
- </profile>
- <!-- Switch all default plugins to use Java7 instead of Java8 -->
- <profile>
- <id>toolchain</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-toolchains-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <goals>
- <goal>toolchain</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <toolchains>
- <jdk>
- <version>1.7</version>
- <vendor>oracle</vendor>
- </jdk>
- </toolchains>
- </configuration>
- </plugin>
- <!--
- The retrolambda plugin requires Java 8 to operate, but we set the toolchain
- to Java 7. Therefore we need to provide a path to the Java 8 home directory.
- This check ensures this property is set and provides an understandable error
- message.
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4.1</version>
- <executions>
- <execution>
- <id>enforce-property</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireProperty>
- <property>java8.home</property>
- <message>The retrolambda-maven-plugin requires a path to Java 8. You must set a 'java8.home' property!</message>
- </requireProperty>
- </rules>
- <fail>true</fail>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>net.orfjackal.retrolambda</groupId>
- <artifactId>retrolambda-maven-plugin</artifactId>
- <version>2.5.1</version>
- <executions>
- <execution>
- <configuration>
- <java8home>${java8.home}</java8home>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/platforms/java7/scenarios/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/scenarios/pom.xml b/platforms/java7/scenarios/pom.xml
deleted file mode 100644
index ae6a18f..0000000
--- a/platforms/java7/scenarios/pom.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- DO NOT EDIT - GENERATED BY update_platform_poms.sh -->
-
- <parent>
- <groupId>org.apache.edgent.java7.samples</groupId>
- <artifactId>edgent-samples</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.edgent.java7.samples</groupId>
- <artifactId>edgent-samples-scenarios</artifactId>
-
- <name>Apache Edgent${samples.projname.platform}: Samples: Scenarios</name>
-
- <build>
- <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">
- <exclude>src/main/resources/**/*.cfg</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <!-- parent pom has SLF4J dependencies -->
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-development</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
- <artifactId>edgent-connectors-iotp</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
- <artifactId>edgent-analytics-math3</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${edgent.base.groupId}.samples</groupId>
- <artifactId>edgent-samples-connectors</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.pi4j</groupId>
- <artifactId>pi4j-core</artifactId>
- <version>1.1</version>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/platforms/java7/topology/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/topology/pom.xml b/platforms/java7/topology/pom.xml
deleted file mode 100644
index 91cb6e6..0000000
--- a/platforms/java7/topology/pom.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- DO NOT EDIT - GENERATED BY update_platform_poms.sh -->
-
- <parent>
- <groupId>org.apache.edgent.java7.samples</groupId>
- <artifactId>edgent-samples</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.edgent.java7.samples</groupId>
- <artifactId>edgent-samples-topology</artifactId>
-
- <name>Apache Edgent${samples.projname.platform}: Samples: Topology</name>
-
- <dependencies>
- <!-- parent pom has SLF4J dependencies -->
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-development</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
- <artifactId>edgent-analytics-math3</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${edgent.base.groupId}.samples</groupId>
- <artifactId>edgent-samples-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/platforms/java7/utils/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/utils/pom.xml b/platforms/java7/utils/pom.xml
deleted file mode 100644
index ef1242e..0000000
--- a/platforms/java7/utils/pom.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- DO NOT EDIT - GENERATED BY update_platform_poms.sh -->
-
- <parent>
- <groupId>org.apache.edgent.java7.samples</groupId>
- <artifactId>edgent-samples</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.edgent.java7.samples</groupId>
- <artifactId>edgent-samples-utils</artifactId>
-
- <name>Apache Edgent${samples.projname.platform}: Samples: Utils</name>
-
- <dependencies>
- <!-- parent pom has SLF4J dependencies -->
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-development</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${edgent.base.groupId}.utils</groupId>
- <artifactId>edgent-utils-metrics</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
- <artifactId>edgent-analytics-sensors</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.console</groupId>
- <artifactId>edgent-console-server</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math3</artifactId>
- <version>3.4.1</version>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/platforms/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/pom.xml b/platforms/pom.xml
deleted file mode 100644
index d47411c..0000000
--- a/platforms/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.edgent.samples</groupId>
- <artifactId>edgent-samples</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.edgent.samples.platforms</groupId>
- <artifactId>edgent-samples-platforms</artifactId>
- <packaging>pom</packaging>
-
- <name>Apache Edgent${samples.projname.platform}: Samples: Platforms</name>
-
- <profiles>
- <profile>
- <id>platform-java7</id>
- <modules>
- <module>java7</module>
- </modules>
- <properties>
- <platform.java7>true</platform.java7>
- <samples.projname.platform> (Java 7)</samples.projname.platform>
- </properties>
- </profile>
- <profile>
- <id>platform-android</id>
- <modules>
- <module>android</module>
- </modules>
- <properties>
- <platform.android>true</platform.android>
- <samples.projname.platform> (Android)</samples.projname.platform>
- </properties>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8bb8727..60c3d06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,8 @@
<properties>
<samples.projname.platform> (Java 8)</samples.projname.platform> <!-- tweaked by -Pplatform-* -->
- <edgent.base.groupId>org.apache.edgent</edgent.base.groupId>
+ <edgent.platform/> <!-- set by -Pplatform-* -->
+ <edgent.base.groupId>org.apache.edgent${edgent.platform}</edgent.base.groupId>
<!-- at least for now, the samples version is lockstep with the core -->
<edgent.core.version>${project.version}</edgent.core.version>
@@ -58,8 +59,38 @@
<module>scenarios</module>
<module>topology</module>
<module>utils</module>
- <module>platforms</module>
</modules>
+
+ <profiles>
+ <profile>
+ <id>platform-java7</id>
+ <properties>
+ <edgent.platform>.java7</edgent.platform>
+ <platform.java7>true</platform.java7>
+ <samples.projname.platform> (Java 7)</samples.projname.platform>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>net.orfjackal.retrolambda</groupId>
+ <artifactId>retrolambda-maven-plugin</artifactId>
+ <version>${retrolambda.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process-main</goal>
+ <goal>process-test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <!-- We don't currently support building samples for Android as many
+ depend on the Development provider / Edgent Console
+ -->
+ </profiles>
<dependencies>
<!--
@@ -81,11 +112,23 @@
<scope>runtime</scope>
</dependency>
- <!-- each sample module declares its own (platform specific) Edgent dependencies, etc -->
- <!-- HEADS UP, NO PLATFORM SPECIFIC EDGENT DEPS HERE
- at they will be inherited by other platform specific
- projects - which will cause problems.
- -->
+ <!-- Other common sample dependencies -->
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-direct</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-development</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-iot</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/scenarios/pom.xml
----------------------------------------------------------------------
diff --git a/scenarios/pom.xml b/scenarios/pom.xml
index c7bab58..31ce2fa 100644
--- a/scenarios/pom.xml
+++ b/scenarios/pom.xml
@@ -21,8 +21,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <!-- UPDATE_PLATFORM_POMS_MSG_PLACEHOLDER -->
-
<parent>
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples</artifactId>
@@ -32,7 +30,7 @@
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-scenarios</artifactId>
- <name>Apache Edgent${samples.projname.platform}: Samples: Scenarios</name>
+ <name>Apache Edgent Samples${samples.projname.platform}: Scenarios</name>
<build>
<plugins>
@@ -58,22 +56,7 @@
</build>
<dependencies>
- <!-- parent pom has SLF4J dependencies -->
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-development</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
+ <!-- parent pom has Providers and SLF4J dependencies -->
<dependency>
<groupId>${edgent.base.groupId}.connectors</groupId>
@@ -87,7 +70,7 @@
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.samples</groupId>
+ <groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-connectors</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/topology/pom.xml
----------------------------------------------------------------------
diff --git a/topology/pom.xml b/topology/pom.xml
index a47dbd6..5259752 100644
--- a/topology/pom.xml
+++ b/topology/pom.xml
@@ -21,8 +21,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <!-- UPDATE_PLATFORM_POMS_MSG_PLACEHOLDER -->
-
<parent>
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples</artifactId>
@@ -32,25 +30,10 @@
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-topology</artifactId>
- <name>Apache Edgent${samples.projname.platform}: Samples: Topology</name>
+ <name>Apache Edgent Samples${samples.projname.platform}: Topology</name>
<dependencies>
- <!-- parent pom has SLF4J dependencies -->
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-development</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
+ <!-- parent pom has Providers and SLF4J dependencies -->
<dependency>
<groupId>${edgent.base.groupId}.analytics</groupId>
@@ -59,7 +42,7 @@
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.samples</groupId>
+ <groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-utils</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/utils/pom.xml
----------------------------------------------------------------------
diff --git a/utils/pom.xml b/utils/pom.xml
index a208120..523a1ae 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -21,8 +21,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <!-- UPDATE_PLATFORM_POMS_MSG_PLACEHOLDER -->
-
<parent>
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples</artifactId>
@@ -32,25 +30,10 @@
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-utils</artifactId>
- <name>Apache Edgent${samples.projname.platform}: Samples: Utils</name>
+ <name>Apache Edgent Samples${samples.projname.platform}: Utils</name>
<dependencies>
- <!-- parent pom has SLF4J dependencies -->
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-development</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
+ <!-- parent pom has Providers and SLF4J dependencies -->
<dependency>
<groupId>${edgent.base.groupId}.utils</groupId>
[04/50] incubator-edgent-samples git commit: tweak samples/README.md
Posted by cd...@apache.org.
tweak samples/README.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/7db0380b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/7db0380b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/7db0380b
Branch: refs/heads/develop
Commit: 7db0380b2e6f2f7d411cfff2e95e4498f86fffb9
Parents: 55efbe1
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Aug 30 17:43:16 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Aug 30 17:43:16 2017 -0400
----------------------------------------------------------------------
README.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/7db0380b/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 2e28660..b9b0dee 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ environment, it easiest to write your application using the Edgent APIs
with java8 lambda expressions. You compile with java8 but constrain
your application to using java7 features plus java8 lambda expressions.
The Retrolambda tool is used to convert your application's generated
-lass files to java7.
+class files to java7.
(the java7 and android Edgent jars were created in that manner too)
Your application would then be run against the appropriate
Edgent platform jars. Alternatively you can forgo the use of lambda
@@ -57,7 +57,7 @@ required Edgent jars from the maven repository.
The supplied Edgent samples poms include support for building for
a java8, java7 or android execution environent. The poms are
configured for the generation of a standard jar as well as an
-uber jar.
+uber jar for a sample application.
You can clone the samples/template project as a starting point
for your Edgent application. See samples/template/README.md.
@@ -134,7 +134,7 @@ dependencies from a local or remote maven repository.
The user may then directly use the jars in CLASSPATH specifications
for Edgent application compilation or execution.
-A `classpath.sh` script generated to assist with this.
+A `classpath.sh` script is generated to assist with this.
By default the script retrieves the Edgent java8 platform jars for the
script's default Edgent version.
[27/50] incubator-edgent-samples git commit: - Adjusted the
distribution to include required licensing information.
Posted by cd...@apache.org.
- Adjusted the distribution to include required licensing information.
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/afe46c32
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/afe46c32
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/afe46c32
Branch: refs/heads/develop
Commit: afe46c321e6f3635d787c15ec225ea95a7b272b9
Parents: 88dc329
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Wed Oct 4 21:03:00 2017 +0200
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Wed Oct 4 21:03:00 2017 +0200
----------------------------------------------------------------------
pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/afe46c32/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b3d1061..794cc89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -326,6 +326,7 @@
</goals>
<configuration>
<resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
<!-- Will generate META-INF/DISCLAIMER -->
<resourceBundle>org.apache.apache.resources:apache-incubator-disclaimer-resource-bundle:1.2-SNAPSHOT</resourceBundle>
</resourceBundles>
[06/50] incubator-edgent-samples git commit: add .mvn to samples to
make mvnw work
Posted by cd...@apache.org.
add .mvn to samples to make mvnw work
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/c3554752
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/c3554752
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/c3554752
Branch: refs/heads/develop
Commit: c35547526290caf517740826e6e3aaf4d90875ca
Parents: d6db008
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Sep 6 15:54:12 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Sep 6 15:54:12 2017 -0400
----------------------------------------------------------------------
.mvn/wrapper/MavenWrapperDownloader.java | 110 ++++++++++++++++++++++++++
.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 47610 bytes
.mvn/wrapper/maven-wrapper.properties | 20 +++++
README.md | 2 +-
4 files changed, 131 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/c3554752/.mvn/wrapper/MavenWrapperDownloader.java
----------------------------------------------------------------------
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java
new file mode 100644
index 0000000..fdbdd02
--- /dev/null
+++ b/.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 =
+ "http://central.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-samples/blob/c3554752/.mvn/wrapper/maven-wrapper.jar
----------------------------------------------------------------------
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 0000000..9cc84ea
Binary files /dev/null and b/.mvn/wrapper/maven-wrapper.jar differ
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/c3554752/.mvn/wrapper/maven-wrapper.properties
----------------------------------------------------------------------
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..d7c1f4b
--- /dev/null
+++ b/.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=http://central.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-samples/blob/c3554752/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 15e4fdb..cda4749 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Java7 and Android platform class files are produced when the appropriate
profile is specified.
```sh
-./mvnw clean install # -Pplatform-java7 or -Pplatform-android as needed
+./mvnw clean package # -Pplatform-java7 or -Pplatform-android as needed
```
A standard jar and uber jar is created for each sample category
[13/50] incubator-edgent-samples git commit: - Added IBM contrib
NOTICE versions to all modules contributed by IBM
Posted by cd...@apache.org.
- Added IBM contrib NOTICE versions to all modules contributed by IBM
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/3f3e932a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/3f3e932a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/3f3e932a
Branch: refs/heads/develop
Commit: 3f3e932a6f60f0e292e7f1207238a674d6ee034d
Parents: 1bfb8fc
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Mon Sep 25 16:02:50 2017 +0200
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Mon Sep 25 16:02:50 2017 +0200
----------------------------------------------------------------------
apps/src/main/resources/META-INF/NOTICE | 12 ++++++++++++
connectors/src/main/resources/META-INF/NOTICE | 12 ++++++++++++
console/src/main/resources/META-INF/NOTICE | 12 ++++++++++++
topology/src/main/resources/META-INF/NOTICE | 12 ++++++++++++
utils/src/main/resources/META-INF/NOTICE | 12 ++++++++++++
5 files changed, 60 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3f3e932a/apps/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/apps/src/main/resources/META-INF/NOTICE b/apps/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..42d63a2
--- /dev/null
+++ b/apps/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,12 @@
+
+Apache Edgent: Samples: Apps
+Copyright 2017 The Apache Software Foundation
+
+This product 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
+
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3f3e932a/connectors/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/connectors/src/main/resources/META-INF/NOTICE b/connectors/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..dc8d2dd
--- /dev/null
+++ b/connectors/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,12 @@
+
+Apache Edgent: Samples: Connectors
+Copyright 2017 The Apache Software Foundation
+
+This product 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
+
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3f3e932a/console/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/console/src/main/resources/META-INF/NOTICE b/console/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..8fa37cf
--- /dev/null
+++ b/console/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,12 @@
+
+Apache Edgent: Samples: Console
+Copyright 2017 The Apache Software Foundation
+
+This product 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
+
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3f3e932a/topology/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/topology/src/main/resources/META-INF/NOTICE b/topology/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..8933656
--- /dev/null
+++ b/topology/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,12 @@
+
+Apache Edgent: Samples: Topology
+Copyright 2017 The Apache Software Foundation
+
+This product 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
+
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3f3e932a/utils/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/utils/src/main/resources/META-INF/NOTICE b/utils/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..0b428dc
--- /dev/null
+++ b/utils/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,12 @@
+
+Apache Edgent: Samples: Utils
+Copyright 2017 The Apache Software Foundation
+
+This product 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
+
[19/50] incubator-edgent-samples git commit:
APPLICATION_DEVELOPMENT.md tweaks
Posted by cd...@apache.org.
APPLICATION_DEVELOPMENT.md tweaks
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/0b4b3130
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/0b4b3130
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/0b4b3130
Branch: refs/heads/develop
Commit: 0b4b31305f69a8bed92fb054095ddb69e63b64f6
Parents: d6d7285
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Sep 26 17:16:04 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Sep 26 17:16:04 2017 -0400
----------------------------------------------------------------------
APPLICATION_DEVELOPMENT.md | 142 ++++++++++++++++++++++------------------
1 file changed, 78 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/0b4b3130/APPLICATION_DEVELOPMENT.md
----------------------------------------------------------------------
diff --git a/APPLICATION_DEVELOPMENT.md b/APPLICATION_DEVELOPMENT.md
index 9199c94..44e3230 100644
--- a/APPLICATION_DEVELOPMENT.md
+++ b/APPLICATION_DEVELOPMENT.md
@@ -15,12 +15,12 @@
limitations under the License.
-->
-#Edgent Application Development, Packaging and Execution.
+# Edgent Application Development, Packaging and Execution.
This file is a work-in-progress.
To develop Edgent applications you will utilize the
-Edgent SDK/runtime jars, package your application
+Edgent SDK/runtime jars and package your application
artifacts for deploying to an edge device for execution.
The Edgent SDK/runtime jars are published to maven-central.
@@ -28,13 +28,19 @@ Alternatively, you can build the Edgent SDK yourself from a source release
and the resulting jars will be added to your local maven repository.
There are a set of Edgent jars for each supported platform: java8, java7, and android.
-The artifact groupId prefix is: org.apache.edgent (for java8),
-org.apache.edgent.java7 and org.apache.edgent.android. e.g.
- org.apache.edgent.api org.apache.edgent.api.java7
+The maven artifact groupId prefixes are:
-See `JAVA_SUPPORT.md` for more information on coordinates, etc.
+- `org.apache.edgent` - for java8,
+- `org.apache.edgent.java7`
+- `org.apache.edgent.android`
-The Edgent API is most easily used by using java8 lambda expressions.
+e.g., the groupIds for the Edgent API artifacts are
+`org.apache.edgent.api` and `org.apache.edgent.api.java7` for
+Java 8 and Java 7 respectively.
+
+See `JAVA_SUPPORT.md` for more information on artifact coordinates, etc.
+
+The Edgent API is most easily used by using Java8 lambda expressions.
If you only want to deploy your Edgent application to a java8 environment
then your application may use any java8 features it chooses. You compile
and run against the Edgent java8 jars.
@@ -45,23 +51,26 @@ with java8 lambda expressions. You compile with java8 but constrain
your application to using java7 features plus java8 lambda expressions.
The Retrolambda tool is used to convert your application's generated
class files to java7.
-(the java7 and android Edgent jars were created in that manner too)
+The Edgent java7 and android platform jars were created in that manner too.
Your application would then be run against the appropriate
-Edgent platform jars. Alternatively you can forgo the use of lambda
+Edgent platform jars.
+
+Alternatively you can forgo the use of lambda
expressions and write your application in java7 and compile
and run against the appropriate Edgent platform jars.
-For convenience it's easiest to build your Edgent applcation using
+For convenience it's easiest to build your Edgent application using
maven-repository-enabled build tooling (e.g., maven, maven-enabled
Eclipse or IntelliJ). The tooling transparently downloads the
-required Edgent jars from the maven repository.
+required Edgent jars from the maven repository if they aren't
+already present in your local maven repository.
The supplied Edgent samples poms include support for building for
-a java8, java7 or android execution environent. The poms are
+a java8, java7 or android execution environment. The poms are
configured for the generation of a standard jar as well as an
uber jar for a sample application.
-You can clone the samples/template project as a starting point
+You can clone the `samples/template` project as a starting point
for your Edgent application. See `samples/template/README.md`.
TODO: we would like to provide a maven Edgent Application archetype
@@ -70,14 +79,14 @@ that users can use to create an application project template.
If you can't or don't want to use maven-repository-enabled tooling
you will need to get a local copy of the Edgent jars and their
dependencies and add them to your compile classpath.
-The Edgent supplied get-edgent-jars.sh tool can be used to
+The Edgent supplied `get-edgent-jars.sh` tool can be used to
get copies of the jars from a maven repository.
-##Packaging and Execution
+## Packaging and Execution
Edgent doesn't provide any "deployment" mechanisms other than its primitive
-"register jar" feature (see the IotProvider javadoc). Generally, managing
+"register jar" feature (see the `IotProvider` javadoc). Generally, managing
the deployment of application and Edgent jars to edge devices is left to
others (as an example, the IBM Watson IoT Platform has device APIs to
support "firmware" download/update).
@@ -89,50 +98,56 @@ be on the device. It's unlikely the device will be able to retrieve
the dependencies directly from a remote maven repository such as
maven central.
-Here are three options for dealing with this:
-
-a) construct an uber-jar for your application.
- The uber jar contains the application's classes and
- the application's dependent Edgent classes and their
- transitive dependencies.
-
- The uber jar is a standalone entity containing
- everything that's needed to run your application.
-
- The Edgent samples poms contain configuration information
- that generates an uber jar in addition to the standard
- application jar. Eclipse can also export an uber jar.
-
-b) create an application package bundle.
- 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
- to the package's jars and starts the application.
-
- The Edgent supplied package-app.sh tool supports this mode.
- Eclipse can also export a similar collection
- of information.
-
-c) separately manage the application's jars and the
- Edgent jars and their dependencies.
- Copy the application's jars to the device.
- Get a copy of the Edgent jars and their dependencies
- onto the device to be shared by any Edgent applications
- that want to use them.
-
- The Apache Edgent project does not release a
- binary bundle containing all of the Edgent jars
- and their dependencies. The binary artifacts
- are only released to maven central.
-
- The Edgent supplied get-edgent-jars.sh tool supports this mode.
+Here are three options for dealing with this.
+
+### Create an uber-jar for your application
+
+The uber jar is a standalone entity containing
+everything that's needed to run your application.
+
+The uber jar contains the application's classes and
+the application's dependent Edgent classes and their
+transitive dependencies.
+
+The Edgent samples poms contain configuration information
+that generates an uber jar in addition to the standard
+application jar. Eclipse can also export an uber jar.
+
+### Create an application package bundle
+
+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`
+to the package's jars and starts the application.
+
+The Edgent supplied `package-app.sh` tool supports this mode.
+Eclipse can also export a similar collection
+of information.
+
+### Separately manage the application and Edgent jars
+
+Copy the application's jars to the device.
+Get a copy of the Edgent jars and their dependencies
+onto the device to be shared by any Edgent applications
+that want to use them.
+
+The Apache Edgent project does not release a
+binary bundle containing all of the Edgent jars
+and their dependencies. The binary artifacts
+are only released to maven central.
+
+The Edgent supplied get-edgent-jars.sh tool supports this mode.
-##get-edgent-jars.sh
+## get-edgent-jars.sh
The `get-edgent-jars.sh` script copies the Edgent runtime jars and their
-dependencies from a local or remote maven repository.
+dependencies from a local or remote maven repository into a local folder.
The user may then directly use the jars in CLASSPATH specifications
for Edgent application compilation or execution.
@@ -144,7 +159,7 @@ script's default Edgent version.
The script creates and builds a small maven project as
part of its execution.
-```sh
+``` sh
get-edgent-jars.sh --version 1.2.0-SNAPSHOT # retrieve the Edgent 1.2.0-SNAPSHOT java8 jars
This command downloads the Apache Edgent jars and their transitive external dependencies.
The external dependencies have their own licensing term that you should review.
@@ -164,12 +179,11 @@ Continue? [y/n] y
```
For more usage information:
-
-```sh
+``` sh
get-edgent-jars.sh -h
```
-##package-app.sh
+## package-app.sh
The `package-app.sh` script creates an application bundle.
The application bundle can be copied to an edge-device,
@@ -195,8 +209,8 @@ the application.
E.g.,
-```sh
-cd MyApp # the project directory
+``` sh
+cd MyApp # the application's project directory
package-app.sh --mainClass com.mycompany.app.MyApp --appjar target/my-app-1.0-SNAPSHOT.jar
##### get the app specific dependencies...
...
@@ -211,6 +225,6 @@ package-app.sh --mainClass com.mycompany.app.MyApp --appjar target/my-app-1.0-SN
For more usage information:
-```sh
+``` sh
package-app.sh -h
```
[50/50] incubator-edgent-samples git commit: Complete the
1.2.0-SNAPSHOT to 1.3.0-SNAPSHOT changes
Posted by cd...@apache.org.
Complete the 1.2.0-SNAPSHOT to 1.3.0-SNAPSHOT changes
This is just a short term change to get the develop branch back in
working order. Longer term the automation needs to make all of the
needed changes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/82e4b807
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/82e4b807
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/82e4b807
Branch: refs/heads/develop
Commit: 82e4b80769572268db715c97cd691ae6cd99a408
Parents: 3943bd5
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Nov 7 13:02:48 2017 -0500
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Nov 7 13:02:48 2017 -0500
----------------------------------------------------------------------
get-edgent-jars-project/get-edgent-jars.sh | 2 +-
get-edgent-jars-project/old-get-edgent-jars.sh | 2 +-
get-edgent-jars-project/pom.xml.template | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/82e4b807/get-edgent-jars-project/get-edgent-jars.sh
----------------------------------------------------------------------
diff --git a/get-edgent-jars-project/get-edgent-jars.sh b/get-edgent-jars-project/get-edgent-jars.sh
index 8d0c5ce..3bdacd6 100755
--- a/get-edgent-jars-project/get-edgent-jars.sh
+++ b/get-edgent-jars-project/get-edgent-jars.sh
@@ -21,7 +21,7 @@
## By default get the Edgent java8 platform jars for the script's default Edgent version.
##
## --platform {java8|java7|android} get the specified target platform jars
-## --version edgent-version get the specified version's jars (e.g., 1.2.0-SNAPSHOT)
+## --version edgent-version get the specified version's jars (e.g., 1.2.0)
## --artifacts csv-gav-list get only the specified artifacts. Not restricted to Edgent jars.
## The Edgent version is substituted for all instances of '{EV}'
## --file gav-file get only the specified artifacts. Not restricted to Edgent jars.
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/82e4b807/get-edgent-jars-project/old-get-edgent-jars.sh
----------------------------------------------------------------------
diff --git a/get-edgent-jars-project/old-get-edgent-jars.sh b/get-edgent-jars-project/old-get-edgent-jars.sh
index 40f5e07..102467e 100755
--- a/get-edgent-jars-project/old-get-edgent-jars.sh
+++ b/get-edgent-jars-project/old-get-edgent-jars.sh
@@ -21,7 +21,7 @@
## By default get the Edgent java8 platform jars for the script's default Edgent version.
##
## --platform {java8|java7|android} get the specified target platform jars
-## --version edgent-version get the specified version's jars (e.g., 1.2.0-SNAPSHOT)
+## --version edgent-version get the specified version's jars (e.g., 1.2.0)
## --artifacts csv-gav-list get only the specified artifacts. Not restricted to Edgent jars.
## The Edgent version is substituted for all instances of '{EV}'
## --file gav-file get only the specified artifacts. Not restricted to Edgent jars.
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/82e4b807/get-edgent-jars-project/pom.xml.template
----------------------------------------------------------------------
diff --git a/get-edgent-jars-project/pom.xml.template b/get-edgent-jars-project/pom.xml.template
index 8c89690..f8c9f1a 100644
--- a/get-edgent-jars-project/pom.xml.template
+++ b/get-edgent-jars-project/pom.xml.template
@@ -25,7 +25,7 @@
<!--parent>
<groupId>org.apache.edgent</groupId>
<artifactId>edgent-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
</parent-->
<groupId>org.apache.edgent</groupId>
[20/50] incubator-edgent-samples git commit: merge from
origin/feature/maven
Posted by cd...@apache.org.
merge from origin/feature/maven
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/c9e18ce7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/c9e18ce7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/c9e18ce7
Branch: refs/heads/develop
Commit: c9e18ce79dee6f9082c7ddbe999d7854f4a6b43c
Parents: 0b4b313 972363e
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Sep 26 17:18:01 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Sep 26 17:18:01 2017 -0400
----------------------------------------------------------------------
apps/pom.xml | 3 ++-
connectors/pom.xml | 1 +
console/pom.xml | 1 +
scenarios/pom.xml | 1 +
topology/pom.xml | 1 +
utils/pom.xml | 1 +
6 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[11/50] incubator-edgent-samples git commit: Add sample list to
samples/R.md, couple of other doc cleanup
Posted by cd...@apache.org.
Add sample list to samples/R.md, couple of other doc cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/e7e0b322
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/e7e0b322
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/e7e0b322
Branch: refs/heads/develop
Commit: e7e0b3226d8d05ef566ac21c12a6bdd0d9cc14d6
Parents: 4456eb2
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Mon Sep 18 11:38:34 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Mon Sep 18 11:38:34 2017 -0400
----------------------------------------------------------------------
README.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e7e0b322/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index ceea313..48f5f15 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,7 @@ are automatically downloaded to the local maven repository
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...*
2. From the *Git* folder, select *Projects from Git* and click *Next*
3. Select *Clone URI* to clone the remote repository. Click *Next*.
@@ -62,6 +63,7 @@ If you want to use Eclipse to clone your fork, use the Eclipse Git Team Provider
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...*
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 listed and all selected.
@@ -74,5 +76,52 @@ Note: Specifics may change depending on your version of Eclipse or the Eclipse M
Once the samples projects have been imported you can run them as any Eclipse application.
E.g.,
+
1. open the `HelloEdgent.java` sample
2. click on *Run*, *Run As*, then *Java application*. `HelloEdgent` runs and prints to the Console view.
+
+#Samples Summary
+
+<pre>
+HelloEdgent Basic mechanics of declaring a topology and executing
+ it. Prints Hello Edgent! to standard output.
+
+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.
+
+SensorAggregates Demonstrates partitioned window aggregation and
+ filtering of simulated sensors that are bursty in
+ nature, so that only intermittently is the data output
+ to standard output.
+
+File Use the File stream connector to write a stream of
+ tuples to files. Also watch a directory for new files
+ and create a stream of tuples from the file contents.
+
+Iotp Use the IBM Watson IoT Platform connector to send
+ simulated sensor readings to an IBM Watson IoT Platform
+ instance as device events. Receive device commands.
+
+JDBC Use the JDBC stream connector to write a stream of
+ tuples to an Apache Derby database table. Create a
+ stream of tuples by reading a table.
+
+Kafka Use the Kafka stream connector to publish a stream of
+ tuples to a Kafka topic. Create a stream of tuples by
+ subscribing to a topic and receiving messages from it.
+
+MQTT Use the MQTT stream connector to publish a stream of
+ tuples to a MQTT topic. Create a stream of tuples by
+ subscribing to a topic and receiving messages from it.
+
+SensorAnalytics Demonstrates a more complex sample that includes
+ configuration control, a device of one or more sensors
+ and some typical analytics, use of MQTT for publishing
+ results and receiving commands, local results logging,
+ conditional stream tracing.
+</pre>
+
+Other samples are provided but have not yet been fully documented.
+Feel free to explore.
+
[43/50] incubator-edgent-samples git commit: use "-incubating"
order in bundle names
Posted by cd...@apache.org.
use "<ver>-incubating" order in bundle names
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/548ecc52
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/548ecc52
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/548ecc52
Branch: refs/heads/develop
Commit: 548ecc5269d27565938390c7082c127238bad4b2
Parents: eed412f
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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/548ecc52/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ecee16e..98b1b4e 100644
--- a/pom.xml
+++ b/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] incubator-edgent-samples git commit: add samples/template
NOTICE
Posted by cd...@apache.org.
add samples/template NOTICE
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/88dc329e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/88dc329e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/88dc329e
Branch: refs/heads/develop
Commit: 88dc329ee5f7bc114cc50e4ef6bceefbb3b3d5b5
Parents: 3a5355d
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Oct 4 11:30:55 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Oct 4 11:30:55 2017 -0400
----------------------------------------------------------------------
template/src/main/resources/META-INF/NOTICE | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/88dc329e/template/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/template/src/main/resources/META-INF/NOTICE b/template/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..d31fd13
--- /dev/null
+++ b/template/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,6 @@
+
+Apache Edgent: Samples: Template
+Copyright 2016-2017 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
[40/50] incubator-edgent-samples git commit: switch to
groupId-per-platform
Posted by cd...@apache.org.
switch to groupId-per-platform
straightforward / minimal-style changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/cd3c96e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/cd3c96e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/cd3c96e4
Branch: refs/heads/develop
Commit: cd3c96e484dd88d320fbd9f70239304dc6e6cbf2
Parents: 22d0c28
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Oct 18 17:49:58 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Oct 18 17:49:58 2017 -0400
----------------------------------------------------------------------
APPLICATION_DEVELOPMENT.md | 7 +-
apps/pom.xml | 31 +++++----
connectors/pom.xml | 35 +++++-----
console/pom.xml | 13 ++--
get-edgent-jars-project/get-edgent-jars.sh | 52 +++++++--------
get-edgent-jars-project/old-get-edgent-jars.sh | 46 ++++++-------
get-edgent-jars-project/pom.xml.template | 12 ++--
.../src/assembly/distribution.xml | 2 +-
pom.xml | 30 ++++-----
scenarios/pom.xml | 15 ++---
template/pom.xml | 70 ++++++++++----------
topology/pom.xml | 11 ++-
utils/pom.xml | 17 +++--
13 files changed, 167 insertions(+), 174 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cd3c96e4/APPLICATION_DEVELOPMENT.md
----------------------------------------------------------------------
diff --git a/APPLICATION_DEVELOPMENT.md b/APPLICATION_DEVELOPMENT.md
index 92f0099..eb6e2fb 100644
--- a/APPLICATION_DEVELOPMENT.md
+++ b/APPLICATION_DEVELOPMENT.md
@@ -26,15 +26,14 @@ Alternatively, you can build the Edgent SDK yourself from a source release
and the resulting jars will be added to your local maven repository.
There are a set of Edgent jars for each supported platform: java8, java7, and android.
-The maven artifact groupId prefixes are:
+The maven artifact groupIds for the Edgent jars are:
- `org.apache.edgent` - for java8,
- `org.apache.edgent.java7`
- `org.apache.edgent.android`
-e.g., the groupIds for the Edgent API artifacts are
-`org.apache.edgent.api` and `org.apache.edgent.api.java7` for
-Java 8 and Java 7 respectively.
+Note, the Java package names for Edgent components do not incorporate
+the platform kind; the package names are the same regardless of the platform.
See `JAVA_SUPPORT.md` for more information on artifact coordinates, etc.
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cd3c96e4/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index 602c970..0fc7223 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -22,52 +22,51 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.edgent.samples</groupId>
+ <groupId>org.apache.edgent</groupId> <!-- EDGENT_BUILD_PARENT_GROUPID -->
<artifactId>edgent-samples</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-apps</artifactId>
- <name>Apache Edgent Samples${samples.projname.platform}: Apps</name>
+ <name>Apache Edgent Samples ${samples.projname.platform}: Apps</name>
<dependencies>
<!-- parent pom has Platforms and SLF4J dependencies -->
<dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-analytics-sensors</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-file</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-analytics-math3</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-iot</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-iotp</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-mqtt</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.edgent.samples</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-samples-utils</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cd3c96e4/connectors/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/pom.xml b/connectors/pom.xml
index cf8549a..6094cbe 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -22,57 +22,56 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.edgent.samples</groupId>
+ <groupId>org.apache.edgent</groupId> <!-- EDGENT_BUILD_PARENT_GROUPID -->
<artifactId>edgent-samples</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-connectors</artifactId>
- <name>Apache Edgent Samples${samples.projname.platform}: Connectors</name>
+ <name>Apache Edgent Samples ${samples.projname.platform}: Connectors</name>
<dependencies>
<!-- parent pom has Platforms and SLF4J dependencies -->
<dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-mqtt</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-kafka</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-jdbc</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-serial</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-file</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-iotp</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-analytics-math3</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.edgent.samples</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-samples-topology</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cd3c96e4/console/pom.xml
----------------------------------------------------------------------
diff --git a/console/pom.xml b/console/pom.xml
index dfd35c5..59d6a54 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -22,28 +22,27 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.edgent.samples</groupId>
+ <groupId>org.apache.edgent</groupId> <!-- EDGENT_BUILD_PARENT_GROUPID -->
<artifactId>edgent-samples</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-console</artifactId>
- <name>Apache Edgent Samples${samples.projname.platform}: Console</name>
+ <name>Apache Edgent Samples ${samples.projname.platform}: Console</name>
<dependencies>
<!-- parent pom has Platforms and SLF4J dependencies -->
<dependency>
- <groupId>${edgent.base.groupId}.console</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-console-server</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.utils</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-utils-metrics</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cd3c96e4/get-edgent-jars-project/get-edgent-jars.sh
----------------------------------------------------------------------
diff --git a/get-edgent-jars-project/get-edgent-jars.sh b/get-edgent-jars-project/get-edgent-jars.sh
index 4b4194a..a8c50f7 100755
--- a/get-edgent-jars-project/get-edgent-jars.sh
+++ b/get-edgent-jars-project/get-edgent-jars.sh
@@ -27,7 +27,7 @@
## --file gav-file get only the specified artifacts. Not restricted to Edgent jars.
## The Edgent version is substituted for all instances of '{EV}'
## Lines that begin with '#' are ignored.
-## --mvn mvn-cmd use mvn-cmd instead of "./mvnw"
+## --mvn mvn-cmd use mvn-cmd instead of "../mvnw"
##
## Creates bundles and classpath.sh in the target dir.
@@ -35,7 +35,7 @@ USAGE="usage: [--platform {java8|java7|android}] [--version edgent-version] [--a
set -e
-# project dir is whereever this script resides
+# project dir is where this script resides
PROJ_DIR=`(cd $(dirname $0); pwd)`
SAMPLES_DIR=`(cd $(dirname $0); pwd)`/..
@@ -83,26 +83,26 @@ fi
#
DEFAULT_GAVS=`cat << EOF
org.slf4j:slf4j-jdk14:${SLF4J_VERSION}
-org.apache.edgent.analytics:edgent-analytics-math3:{EV}
-org.apache.edgent.analytics:edgent-analytics-sensors:{EV}
-org.apache.edgent.connectors:edgent-connectors-command:{EV}
-org.apache.edgent.connectors:edgent-connectors-csv:{EV}
-org.apache.edgent.connectors:edgent-connectors-file:{EV}
-org.apache.edgent.connectors:edgent-connectors-http:{EV}
-org.apache.edgent.connectors:edgent-connectors-iot:{EV}
-org.apache.edgent.connectors:edgent-connectors-iotp:{EV}
-org.apache.edgent.connectors:edgent-connectors-jdbc:{EV}
-org.apache.edgent.connectors:edgent-connectors-kafka:{EV}
-org.apache.edgent.connectors:edgent-connectors-mqtt:{EV}
-org.apache.edgent.connectors:edgent-connectors-pubsub:{EV}
-org.apache.edgent.connectors:edgent-connectors-serial:{EV}
-org.apache.edgent.connectors:edgent-connectors-websocket:{EV}
-org.apache.edgent.connectors:edgent-connectors-websocket-jetty:{EV}
-org.apache.edgent.providers:edgent-providers-development:{EV}
-org.apache.edgent.providers:edgent-providers-direct:{EV}
-org.apache.edgent.providers:edgent-providers-iot:{EV}
-org.apache.edgent.utils:edgent-utils-metrics:{EV}
-org.apache.edgent.utils:edgent-utils-streamscope:{EV}
+org.apache.edgent:edgent-analytics-math3:{EV}
+org.apache.edgent:edgent-analytics-sensors:{EV}
+org.apache.edgent:edgent-connectors-command:{EV}
+org.apache.edgent:edgent-connectors-csv:{EV}
+org.apache.edgent:edgent-connectors-file:{EV}
+org.apache.edgent:edgent-connectors-http:{EV}
+org.apache.edgent:edgent-connectors-iot:{EV}
+org.apache.edgent:edgent-connectors-iotp:{EV}
+org.apache.edgent:edgent-connectors-jdbc:{EV}
+org.apache.edgent:edgent-connectors-kafka:{EV}
+org.apache.edgent:edgent-connectors-mqtt:{EV}
+org.apache.edgent:edgent-connectors-pubsub:{EV}
+org.apache.edgent:edgent-connectors-serial:{EV}
+org.apache.edgent:edgent-connectors-websocket:{EV}
+org.apache.edgent:edgent-connectors-websocket-jetty:{EV}
+org.apache.edgent:edgent-providers-development:{EV}
+org.apache.edgent:edgent-providers-direct:{EV}
+org.apache.edgent:edgent-providers-iot:{EV}
+org.apache.edgent:edgent-utils-metrics:{EV}
+org.apache.edgent:edgent-utils-streamscope:{EV}
EOF
`
if [ "${EDGENT_PLATFORM}" != "java8" ]; then
@@ -110,8 +110,8 @@ if [ "${EDGENT_PLATFORM}" != "java8" ]; then
fi
if [ "${EDGENT_PLATFORM}" == "android" ]; then
DEFAULT_GAVS=`echo "${DEFAULT_GAVS}" | sed -e "/edgent-providers-development/d"`
- DEFAULT_GAVS=`echo "${DEFAULT_GAVS}"; echo "org.apache.edgent.android.android:edgent-android-hardware:{EV}"`
- DEFAULT_GAVS=`echo "${DEFAULT_GAVS}"; echo "org.apache.edgent.android.android:edgent-android-topology:{EV}"`
+ DEFAULT_GAVS=`echo "${DEFAULT_GAVS}"; echo "org.apache.edgent.android:edgent-android-hardware:{EV}"`
+ DEFAULT_GAVS=`echo "${DEFAULT_GAVS}"; echo "org.apache.edgent.android:edgent-android-topology:{EV}"`
fi
@@ -136,7 +136,7 @@ mkdir -p target
DEP_DECLS_FILE=target/tmp-dep-decls
rm -f ${DEP_DECLS_FILE}
for i in ${ARTIFACT_GAVS}; do
- echo $i | awk -F : '{ type=""; if ($3 == "{EV}") $3="${edgent.core.version}"; if ($4 != "") type=" <type>" $4 "</type>\n"; printf "<dependency>\n <groupId>%s</groupId>\n <artifactId>%s</artifactId>\n <version>%s</version>\n%s</dependency>\n", $1, $2, $3, type }' >> ${DEP_DECLS_FILE}
+ echo $i | awk -F : '{ type=""; if ($3 == "{EV}") $3="${edgent.runtime.version}"; if ($4 != "") type=" <type>" $4 "</type>\n"; printf "<dependency>\n <groupId>%s</groupId>\n <artifactId>%s</artifactId>\n <version>%s</version>\n%s</dependency>\n", $1, $2, $3, type }' >> ${DEP_DECLS_FILE}
done
DEP_DECLS=`cat ${DEP_DECLS_FILE}`
@@ -158,7 +158,7 @@ echo
echo "##### Generating the bundles..."
EDGENT_VERSION_PROPERTY=
if [ "${EDGENT_VERSION}" ]; then
- EDGENT_VERSION_PROPERTY=-Dedgent.core.version=${EDGENT_VERSION}
+ EDGENT_VERSION_PROPERTY=-Dedgent.runtime.version=${EDGENT_VERSION}
fi
PLATFORM_PROFILE=
if [ ${EDGENT_PLATFORM} != "java8" ]; then
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cd3c96e4/get-edgent-jars-project/old-get-edgent-jars.sh
----------------------------------------------------------------------
diff --git a/get-edgent-jars-project/old-get-edgent-jars.sh b/get-edgent-jars-project/old-get-edgent-jars.sh
index fffb747..40f5e07 100755
--- a/get-edgent-jars-project/old-get-edgent-jars.sh
+++ b/get-edgent-jars-project/old-get-edgent-jars.sh
@@ -35,7 +35,7 @@ USAGE="usage: [--platform {java8|java7|android}] [--version edgent-version] [--a
set -e
-SAMPLES_DIR=`(cd $(dirname $0); pwd)`
+SAMPLES_DIR=`(cd $(dirname $0); pwd)`/..
MVN_CMD=${SAMPLES_DIR}/mvnw
EDGENT_PLATFORM=java8
@@ -82,26 +82,26 @@ fi
#
DEFAULT_GAVS=`cat << EOF
org.slf4j:slf4j-jdk14:${SLF4J_VERSION}
-org.apache.edgent.analytics:edgent-analytics-math3:{EV}
-org.apache.edgent.analytics:edgent-analytics-sensors:{EV}
-org.apache.edgent.connectors:edgent-connectors-command:{EV}
-org.apache.edgent.connectors:edgent-connectors-csv:{EV}
-org.apache.edgent.connectors:edgent-connectors-file:{EV}
-org.apache.edgent.connectors:edgent-connectors-http:{EV}
-org.apache.edgent.connectors:edgent-connectors-iot:{EV}
-org.apache.edgent.connectors:edgent-connectors-iotp:{EV}
-org.apache.edgent.connectors:edgent-connectors-jdbc:{EV}
-org.apache.edgent.connectors:edgent-connectors-kafka:{EV}
-org.apache.edgent.connectors:edgent-connectors-mqtt:{EV}
-org.apache.edgent.connectors:edgent-connectors-pubsub:{EV}
-org.apache.edgent.connectors:edgent-connectors-serial:{EV}
-org.apache.edgent.connectors:edgent-connectors-websocket:{EV}
-org.apache.edgent.connectors:edgent-connectors-websocket-jetty:{EV}
-org.apache.edgent.providers:edgent-providers-development:{EV}
-org.apache.edgent.providers:edgent-providers-direct:{EV}
-org.apache.edgent.providers:edgent-providers-iot:{EV}
-org.apache.edgent.utils:edgent-utils-metrics:{EV}
-org.apache.edgent.utils:edgent-utils-streamscope:{EV}
+org.apache.edgent:edgent-analytics-math3:{EV}
+org.apache.edgent:edgent-analytics-sensors:{EV}
+org.apache.edgent:edgent-connectors-command:{EV}
+org.apache.edgent:edgent-connectors-csv:{EV}
+org.apache.edgent:edgent-connectors-file:{EV}
+org.apache.edgent:edgent-connectors-http:{EV}
+org.apache.edgent:edgent-connectors-iot:{EV}
+org.apache.edgent:edgent-connectors-iotp:{EV}
+org.apache.edgent:edgent-connectors-jdbc:{EV}
+org.apache.edgent:edgent-connectors-kafka:{EV}
+org.apache.edgent:edgent-connectors-mqtt:{EV}
+org.apache.edgent:edgent-connectors-pubsub:{EV}
+org.apache.edgent:edgent-connectors-serial:{EV}
+org.apache.edgent:edgent-connectors-websocket:{EV}
+org.apache.edgent:edgent-connectors-websocket-jetty:{EV}
+org.apache.edgent:edgent-providers-development:{EV}
+org.apache.edgent:edgent-providers-direct:{EV}
+org.apache.edgent:edgent-providers-iot:{EV}
+org.apache.edgent:edgent-utils-metrics:{EV}
+org.apache.edgent:edgent-utils-streamscope:{EV}
EOF
`
if [ "${EDGENT_PLATFORM}" != "java8" ]; then
@@ -109,8 +109,8 @@ if [ "${EDGENT_PLATFORM}" != "java8" ]; then
fi
if [ "${EDGENT_PLATFORM}" == "android" ]; then
DEFAULT_GAVS=`echo "${DEFAULT_GAVS}" | sed -e "/edgent-providers-development/d"`
- DEFAULT_GAVS=`echo "${DEFAULT_GAVS}"; echo "org.apache.edgent.android.android:edgent-android-hardware:{EV}"`
- DEFAULT_GAVS=`echo "${DEFAULT_GAVS}"; echo "org.apache.edgent.android.android:edgent-android-topology:{EV}"`
+ DEFAULT_GAVS=`echo "${DEFAULT_GAVS}"; echo "org.apache.edgent.android:edgent-android-hardware:{EV}"`
+ DEFAULT_GAVS=`echo "${DEFAULT_GAVS}"; echo "org.apache.edgent.android:edgent-android-topology:{EV}"`
fi
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cd3c96e4/get-edgent-jars-project/pom.xml.template
----------------------------------------------------------------------
diff --git a/get-edgent-jars-project/pom.xml.template b/get-edgent-jars-project/pom.xml.template
index bae3613..2027f84 100644
--- a/get-edgent-jars-project/pom.xml.template
+++ b/get-edgent-jars-project/pom.xml.template
@@ -28,11 +28,11 @@
<version>1.2.0-SNAPSHOT</version>
</parent-->
- <groupId>org.apache.edgent.get-edgent-jars</groupId>
- <artifactId>get-edgent-jars</artifactId>
+ <groupId>org.apache.edgent</groupId>
+ <artifactId>get-edgent-jars-project</artifactId>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache Edgent get-edgent-jars ${samples.projname.platform}</name>
+ <name>Apache Edgent get-edgent-jars-project ${samples.projname.platform}</name>
<properties>
<samples.projname.platform> (Java 8)</samples.projname.platform> <!-- tweaked by -Pplatform-* -->
@@ -41,9 +41,9 @@
<edgent.base.groupId>org.apache.edgent${edgent.groupId.platform}</edgent.base.groupId>
<!-- at least for now, the samples version is lockstep with the core
so default to using the same core as the this project.
- get-edgent-jars.sh overrides via -Dedgent.core.version=...
+ get-edgent-jars.sh overrides via -Dedgent.runtime.version=...
-->
- <edgent.core.version>${project.version}</edgent.core.version>
+ <edgent.runtime.version>${project.version}</edgent.runtime.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -55,7 +55,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<version>2.5.3</version>
<configuration>
- <finalName>edgent-${edgent.platform}-jars-${edgent.core.version}</finalName>
+ <finalName>edgent-${edgent.platform}-jars-${edgent.runtime.version}</finalName>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cd3c96e4/get-edgent-jars-project/src/assembly/distribution.xml
----------------------------------------------------------------------
diff --git a/get-edgent-jars-project/src/assembly/distribution.xml b/get-edgent-jars-project/src/assembly/distribution.xml
index 843bbf5..2f6da23 100644
--- a/get-edgent-jars-project/src/assembly/distribution.xml
+++ b/get-edgent-jars-project/src/assembly/distribution.xml
@@ -64,7 +64,7 @@
<include>org.apache.edgent*</include>
</includes>
<excludes>
- <exclude>org.apache.edgent.get-edgent-jars*</exclude>
+ <exclude>org.apache.edgent*:get-edgent-jars-project</exclude>
</excludes>
</dependencySet>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cd3c96e4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7e4efdc..45a0834 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,24 +22,24 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId>
+ <groupId>org.apache</groupId> <!-- EDGENT_BUILD_PARENT_GROUPID -->
<artifactId>apache</artifactId>
<version>18</version>
</parent>
- <groupId>org.apache.edgent.samples</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>edgent-samples</artifactId>
<version>1.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Apache Edgent${samples.projname.platform}: Samples</name>
+ <name>Apache Edgent Samples ${samples.projname.platform}:</name>
<properties>
- <samples.projname.platform> (Java 8)</samples.projname.platform> <!-- tweaked by -Pplatform-* -->
- <edgent.platform/> <!-- set by -Pplatform-* -->
- <edgent.base.groupId>org.apache.edgent${edgent.platform}</edgent.base.groupId>
+ <samples.projname.platform>(Java 8)</samples.projname.platform> <!-- tweaked by -Pplatform-* -->
+ <edgent.runtime.platform/> <!-- set by -Pplatform-* -->
+ <edgent.runtime.groupId>org.apache.edgent${edgent.runtime.platform}</edgent.runtime.groupId>
<!-- at least for now, the samples version is lockstep with the core -->
- <edgent.core.version>${project.version}</edgent.core.version>
+ <edgent.runtime.version>${project.version}</edgent.runtime.version>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,9 +67,9 @@
<profile>
<id>platform-java7</id>
<properties>
- <edgent.platform>.java7</edgent.platform>
+ <edgent.runtime.platform>.java7</edgent.runtime.platform>
<platform.java7>true</platform.java7>
- <samples.projname.platform> (Java 7)</samples.projname.platform>
+ <samples.projname.platform>(Java 7)</samples.projname.platform>
</properties>
<build>
<plugins>
@@ -116,19 +116,19 @@
<!-- Other common sample dependencies -->
<dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-providers-development</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cd3c96e4/scenarios/pom.xml
----------------------------------------------------------------------
diff --git a/scenarios/pom.xml b/scenarios/pom.xml
index 31ce2fa..9b8628d 100644
--- a/scenarios/pom.xml
+++ b/scenarios/pom.xml
@@ -22,15 +22,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.edgent.samples</groupId>
+ <groupId>org.apache.edgent</groupId> <!-- EDGENT_BUILD_PARENT_GROUPID -->
<artifactId>edgent-samples</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-scenarios</artifactId>
- <name>Apache Edgent Samples${samples.projname.platform}: Scenarios</name>
+ <name>Apache Edgent Samples ${samples.projname.platform}: Scenarios</name>
<build>
<plugins>
@@ -59,18 +58,18 @@
<!-- parent pom has Providers and SLF4J dependencies -->
<dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-iotp</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-analytics-math3</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.edgent.samples</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-samples-connectors</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cd3c96e4/template/pom.xml
----------------------------------------------------------------------
diff --git a/template/pom.xml b/template/pom.xml
index ab67e31..e1e855d 100644
--- a/template/pom.xml
+++ b/template/pom.xml
@@ -35,9 +35,9 @@
<name>My Edgent Application</name>
<properties>
- <edgent.platform/> <!-- set by -Pplatform-* -->
- <edgent.base.groupId>org.apache.edgent${edgent.platform}</edgent.base.groupId>
- <edgent.version>1.2.0-SNAPSHOT</edgent.version>
+ <edgent.runtime.platform/> <!-- set by -Pplatform-* -->
+ <edgent.runtime.groupId>org.apache.edgent${edgent.runtime.platform}</edgent.runtime.groupId>
+ <edgent.runtime.version>1.2.0-SNAPSHOT</edgent.runtime.version>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -69,91 +69,91 @@
<!-- declare the Edgent provider(s) being used -->
<dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<!--dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-providers-development</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
<!--dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
<!-- declare Edgent Android dependencies
-->
<!--dependency>
- <groupId>${edgent.base.groupId}.android</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-android-hardware</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
<!--dependency>
- <groupId>${edgent.base.groupId}.android</groupId>
+ <groupId>${edgent.runtime.groupId}.android</groupId>
<artifactId>edgent-android-topology</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
<!-- declare Edgent Analytics dependencies
-->
<!--dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-analytics-math3</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
<!--dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-analytics-sensors</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
<!-- declare Edgent Utils dependencies
-->
<!--dependency>
- <groupId>${edgent.base.groupId}.utils</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-utils-metrics</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
<!-- declare Edgent Connector dependencies
-->
<!--dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-file</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
<!--dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-iot</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
<!--dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-iotp</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
<!--dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-jdbc</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
<!--dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-kafka</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
<!--dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-mqtt</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
<!--dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-serial</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
</dependencies>
@@ -164,7 +164,7 @@
<id>platform-java7</id>
<properties>
<platform.java7>true</platform.java7>
- <edgent.platform>.java7</edgent.platform>
+ <edgent.runtime.platform>.java7</edgent.runtime.platform>
</properties>
<build>
<plugins>
@@ -192,7 +192,7 @@
<id>platform-android</id>
<properties>
<platform.android>true</platform.android>
- <edgent.platform>.android</edgent.platform>
+ <edgent.runtime.platform>.android</edgent.runtime.platform>
</properties>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cd3c96e4/topology/pom.xml
----------------------------------------------------------------------
diff --git a/topology/pom.xml b/topology/pom.xml
index 5259752..28d1ac3 100644
--- a/topology/pom.xml
+++ b/topology/pom.xml
@@ -22,27 +22,26 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.edgent.samples</groupId>
+ <groupId>org.apache.edgent</groupId> <!-- EDGENT_BUILD_PARENT_GROUPID -->
<artifactId>edgent-samples</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-topology</artifactId>
- <name>Apache Edgent Samples${samples.projname.platform}: Topology</name>
+ <name>Apache Edgent Samples ${samples.projname.platform}: Topology</name>
<dependencies>
<!-- parent pom has Providers and SLF4J dependencies -->
<dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-analytics-math3</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.edgent.samples</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-samples-utils</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cd3c96e4/utils/pom.xml
----------------------------------------------------------------------
diff --git a/utils/pom.xml b/utils/pom.xml
index 523a1ae..da2f87a 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -22,33 +22,32 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.edgent.samples</groupId>
+ <groupId>org.apache.edgent</groupId> <!-- EDGENT_BUILD_PARENT_GROUPID -->
<artifactId>edgent-samples</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-utils</artifactId>
- <name>Apache Edgent Samples${samples.projname.platform}: Utils</name>
+ <name>Apache Edgent Samples ${samples.projname.platform}: Utils</name>
<dependencies>
<!-- parent pom has Providers and SLF4J dependencies -->
<dependency>
- <groupId>${edgent.base.groupId}.utils</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-utils-metrics</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-analytics-sensors</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.console</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-console-server</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
[10/50] incubator-edgent-samples git commit: remove
runjdbcsample.sh.orig
Posted by cd...@apache.org.
remove runjdbcsample.sh.orig
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/4456eb29
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/4456eb29
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/4456eb29
Branch: refs/heads/develop
Commit: 4456eb29d80569ca41e408f4892c17752868cf86
Parents: 51ed7d1
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Sep 12 18:25:32 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Sep 12 18:25:32 2017 -0400
----------------------------------------------------------------------
connectors/scripts/jdbc/runjdbcsample.sh.orig | 46 ----------------------
1 file changed, 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/4456eb29/connectors/scripts/jdbc/runjdbcsample.sh.orig
----------------------------------------------------------------------
diff --git a/connectors/scripts/jdbc/runjdbcsample.sh.orig b/connectors/scripts/jdbc/runjdbcsample.sh.orig
deleted file mode 100755
index 46d8f04..0000000
--- a/connectors/scripts/jdbc/runjdbcsample.sh.orig
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-
-edgent=../../..
-
-# Runs the Sample JDBC Writer or Reader
-#
-# ./runjdbcsample.sh writer
-# ./runjdbcsample.sh reader
-
-if [ -z "$DERBY_HOME" ]; then
- echo "\$DERBY_HOME not defined."
- exit 1;
-fi
-if [ ! -f $DERBY_HOME/lib/derby.jar ]; then
- echo "\$DERBY_HOME/lib/derby.jar: file not found"
- exit 1;
-fi
-
-export CLASSPATH=${edgent}/samples/lib/edgent.samples.connectors.jar:$DERBY_HOME/lib/derby.jar
-
-app=$1; shift
-if [ "$app" == "writer" ]; then
- java org.apache.edgent.samples.connectors.jdbc.SimpleWriterApp jdbc.properties
-elif [ "$app" == "reader" ]; then
- java org.apache.edgent.samples.connectors.jdbc.SimpleReaderApp jdbc.properties
-else
- echo "unrecognized mode '$app'"
- echo "usage: $0 writer|reader"
- exit 1
-fi
[42/50] incubator-edgent-samples git commit: remove all gradle
tooling artifacts and "exclusions" from the repo
Posted by cd...@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-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/eed412fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/eed412fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/eed412fd
Branch: refs/heads/develop
Commit: eed412fd6311737e92a562217671fd2c85ad2ac9
Parents: ef1c55d
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 -----
apps/build.gradle | 30 ---------------------------
connectors/build.gradle | 33 -----------------------------
console/build.gradle | 25 ----------------------
scenarios/build.gradle | 49 --------------------------------------------
topology/build.gradle | 28 -------------------------
utils/build.gradle | 27 ------------------------
7 files changed, 197 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/eed412fd/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 128a2d4..d555b80 100644
--- a/.gitignore
+++ b/.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-samples/blob/eed412fd/apps/build.gradle
----------------------------------------------------------------------
diff --git a/apps/build.gradle b/apps/build.gradle
deleted file mode 100644
index b94804b..0000000
--- a/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-samples/blob/eed412fd/connectors/build.gradle
----------------------------------------------------------------------
diff --git a/connectors/build.gradle b/connectors/build.gradle
deleted file mode 100644
index 909a8e6..0000000
--- a/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-samples/blob/eed412fd/console/build.gradle
----------------------------------------------------------------------
diff --git a/console/build.gradle b/console/build.gradle
deleted file mode 100644
index 23795fc..0000000
--- a/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-samples/blob/eed412fd/scenarios/build.gradle
----------------------------------------------------------------------
diff --git a/scenarios/build.gradle b/scenarios/build.gradle
deleted file mode 100644
index f05b459..0000000
--- a/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-samples/blob/eed412fd/topology/build.gradle
----------------------------------------------------------------------
diff --git a/topology/build.gradle b/topology/build.gradle
deleted file mode 100644
index 5a8a2b6..0000000
--- a/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-samples/blob/eed412fd/utils/build.gradle
----------------------------------------------------------------------
diff --git a/utils/build.gradle b/utils/build.gradle
deleted file mode 100644
index c70a06d..0000000
--- a/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
-}
[35/50] incubator-edgent-samples git commit: more samples build
tweaking
Posted by cd...@apache.org.
more samples build tweaking
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/d70a1815
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/d70a1815
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/d70a1815
Branch: refs/heads/develop
Commit: d70a1815c312f152f97cca2dce800e489ad078c1
Parents: ab768c4
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Oct 11 16:02:54 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Oct 11 16:02:54 2017 -0400
----------------------------------------------------------------------
buildtools/update-platform-poms.sh | 1 +
pom.xml | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/d70a1815/buildtools/update-platform-poms.sh
----------------------------------------------------------------------
diff --git a/buildtools/update-platform-poms.sh b/buildtools/update-platform-poms.sh
index 07cbc53..56cf1bb 100755
--- a/buildtools/update-platform-poms.sh
+++ b/buildtools/update-platform-poms.sh
@@ -10,6 +10,7 @@ PLATFORMS=java7
for p in ${PLATFORMS}; do
for proj in ${J8_PROJECTS}; do
+ echo Updating platforms/${p}/${proj}/pom.xml...
if [ ! -d platforms/${p}/${proj} ]; then
mkdir -p platforms/${p}/${proj}
fi
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/d70a1815/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d63493a..8bb8727 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,8 @@
<properties>
<samples.projname.platform> (Java 8)</samples.projname.platform> <!-- tweaked by -Pplatform-* -->
<edgent.base.groupId>org.apache.edgent</edgent.base.groupId>
- <edgent.core.version>1.2.0-SNAPSHOT</edgent.core.version>
+ <!-- at least for now, the samples version is lockstep with the core -->
+ <edgent.core.version>${project.version}</edgent.core.version>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
[30/50] incubator-edgent-samples git commit: source bundle README
updates
Posted by cd...@apache.org.
source bundle README updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/97aa739d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/97aa739d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/97aa739d
Branch: refs/heads/develop
Commit: 97aa739d9f5e625409cd14f77bf02cc16a3b90f8
Parents: c7df9e4
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Mon Oct 9 19:11:53 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Mon Oct 9 19:11:53 2017 -0400
----------------------------------------------------------------------
README.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/97aa739d/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 271feef..b78b6e2 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,8 @@
# Quickstart
-You must have Java 8 installed on your system.
+You must have Java 8 installed on your system. Maven will be automatically
+downloaded installed by the maven wrapper `mvnw`.
Build the samples for Java 8
```sh
[32/50] incubator-edgent-samples git commit: tweaks to package-app.sh
Posted by cd...@apache.org.
tweaks to package-app.sh
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/6c7236ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/6c7236ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/6c7236ff
Branch: refs/heads/develop
Commit: 6c7236ff84529b05ba54c63b01887ebad2a1a7fe
Parents: bba42c2
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Oct 10 17:29:38 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Oct 10 17:29:38 2017 -0400
----------------------------------------------------------------------
package-app.sh | 13 +++++++++----
template/pom.xml | 2 +-
2 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/6c7236ff/package-app.sh
----------------------------------------------------------------------
diff --git a/package-app.sh b/package-app.sh
index 75b8ff2..c27edcc 100755
--- a/package-app.sh
+++ b/package-app.sh
@@ -19,11 +19,9 @@
## Create a self contained application specific tar bundle that can be
## brought to a system, unpacked and run.
##
-## Requires that maven (mvn) be installed and on the PATH
-##
## Run from the Application project's top level directory.
-USAGE="usage: `basename $0` [--platform {java8|java7|android}] [--mainClass classname] [--appjar jarname] [--add csv-paths]"
+USAGE="usage: `basename $0` [--platform {java8|java7|android}] [--mainClass classname] [--appjar jarname] [--add csv-paths] [--mvn mvn-cmd]"
## --platform the platform the app was built for (default: java8. options: java7, android)
## This controls which Edgent platform jars are collected.
@@ -35,9 +33,13 @@ USAGE="usage: `basename $0` [--platform {java8|java7|android}] [--mainClass clas
## Works best for paths in/under the App's project dir.
## NOTE: anything in the App's src/main/resources dir generally
## gets included in the App's jar.
+## --mvn mvn-cmd use mvn-cmd instead of "./mvnw"
set -e
+SAMPLES_DIR=`(cd $(dirname $0); pwd)`
+MVN_CMD=${SAMPLES_DIR}/mvnw
+
MAIN_CLASS=com.mycompany.app.App
APP_JAR=my-app-1.0-SNAPSHOT.jar
ADD_PATHS=
@@ -73,7 +75,10 @@ if [ "${PLATFORM}" ] ; then
PROFILES="-Pplatform-${PLATFORM}"
fi
rm -rf target/dependency
-mvn dependency:copy-dependencies -DincludeScope=runtime ${PROFILES}
+# if someone screws up j7 or android deps, uncomment the following and
+# it will help identify wrong jars that are getting included / copied.
+#DEBUG_DEPS=-Dmdep.prependGroupId=true
+${MVN_CMD} dependency:copy-dependencies -DincludeScope=runtime ${PROFILES} ${DEBUG_DEPS}
echo
echo "##### create target/app-run.sh..."
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/6c7236ff/template/pom.xml
----------------------------------------------------------------------
diff --git a/template/pom.xml b/template/pom.xml
index 5d67cd2..593b958 100644
--- a/template/pom.xml
+++ b/template/pom.xml
@@ -35,7 +35,7 @@
<name>My Edgent Application</name>
<properties>
- <edgent.platform></edgent.platform>
+ <edgent.platform/> <!-- set by -Pplatform-* -->
<edgent.base.groupId>org.apache.edgent${edgent.platform}</edgent.base.groupId>
<edgent.version>1.2.0-SNAPSHOT</edgent.version>
[41/50] incubator-edgent-samples git commit: Additional pom
transformations: increase pom commonality/generality, lessen errors
Posted by cd...@apache.org.
Additional pom transformations: increase pom commonality/generality,
lessen errors
- use ${package.groupId}
- use ${package.version}
- add edgent.retrolambda.srcArtifactGroupId - (platform) groupId of
transformation's input artifacts (jars)
- add edgent.projname.platform - platform text fragment for proj name
- add edgent.runtime.groupId - groupId for the platform's jars
- rename edgent.version to edgent.runtime.version
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/ef1c55df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/ef1c55df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/ef1c55df
Branch: refs/heads/develop
Commit: ef1c55df7d543fdc12722b1442263993fd487fee
Parents: cd3c96e
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Mon Oct 23 10:02:12 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Mon Oct 23 10:02:12 2017 -0400
----------------------------------------------------------------------
apps/pom.xml | 2 +-
connectors/pom.xml | 2 +-
console/pom.xml | 2 +-
pom.xml | 2 +-
scenarios/pom.xml | 2 +-
topology/pom.xml | 2 +-
utils/pom.xml | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ef1c55df/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index 0fc7223..7ee0b34 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.edgent</groupId> <!-- EDGENT_BUILD_PARENT_GROUPID -->
+ <groupId>org.apache.edgent</groupId>
<artifactId>edgent-samples</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ef1c55df/connectors/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/pom.xml b/connectors/pom.xml
index 6094cbe..1ef7756 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.edgent</groupId> <!-- EDGENT_BUILD_PARENT_GROUPID -->
+ <groupId>org.apache.edgent</groupId>
<artifactId>edgent-samples</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ef1c55df/console/pom.xml
----------------------------------------------------------------------
diff --git a/console/pom.xml b/console/pom.xml
index 59d6a54..8cad8ad 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.edgent</groupId> <!-- EDGENT_BUILD_PARENT_GROUPID -->
+ <groupId>org.apache.edgent</groupId>
<artifactId>edgent-samples</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ef1c55df/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 45a0834..ecee16e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId> <!-- EDGENT_BUILD_PARENT_GROUPID -->
+ <groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>18</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ef1c55df/scenarios/pom.xml
----------------------------------------------------------------------
diff --git a/scenarios/pom.xml b/scenarios/pom.xml
index 9b8628d..e6eabc5 100644
--- a/scenarios/pom.xml
+++ b/scenarios/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.edgent</groupId> <!-- EDGENT_BUILD_PARENT_GROUPID -->
+ <groupId>org.apache.edgent</groupId>
<artifactId>edgent-samples</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ef1c55df/topology/pom.xml
----------------------------------------------------------------------
diff --git a/topology/pom.xml b/topology/pom.xml
index 28d1ac3..8fcaa89 100644
--- a/topology/pom.xml
+++ b/topology/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.edgent</groupId> <!-- EDGENT_BUILD_PARENT_GROUPID -->
+ <groupId>org.apache.edgent</groupId>
<artifactId>edgent-samples</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ef1c55df/utils/pom.xml
----------------------------------------------------------------------
diff --git a/utils/pom.xml b/utils/pom.xml
index da2f87a..2a2cd0c 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.edgent</groupId> <!-- EDGENT_BUILD_PARENT_GROUPID -->
+ <groupId>org.apache.edgent</groupId>
<artifactId>edgent-samples</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
[21/50] incubator-edgent-samples git commit: sync samples mvn wrapper
with changes in parent
Posted by cd...@apache.org.
sync samples mvn wrapper with changes in parent
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/67d8fdf0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/67d8fdf0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/67d8fdf0
Branch: refs/heads/develop
Commit: 67d8fdf06ca3286b0fa35cf5e74113a8ba935f91
Parents: c9e18ce
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Mon Oct 2 13:40:49 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Mon Oct 2 13:40:49 2017 -0400
----------------------------------------------------------------------
.mvn/wrapper/MavenWrapperDownloader.java | 2 +-
.mvn/wrapper/maven-wrapper.properties | 2 +-
mvnw | 2 +-
mvnw.cmd | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/67d8fdf0/.mvn/wrapper/MavenWrapperDownloader.java
----------------------------------------------------------------------
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java
index fdbdd02..44f8e00 100644
--- a/.mvn/wrapper/MavenWrapperDownloader.java
+++ b/.mvn/wrapper/MavenWrapperDownloader.java
@@ -28,7 +28,7 @@ public class MavenWrapperDownloader {
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
*/
private static final String DEFAULT_DOWNLOAD_URL =
- "http://central.maven.org/maven2/io/takari/maven-wrapper/0.2.1/maven-wrapper-0.2.1.jar";
+ "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
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/67d8fdf0/.mvn/wrapper/maven-wrapper.properties
----------------------------------------------------------------------
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index d7c1f4b..7e8f382 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -17,4 +17,4 @@
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip
-#wrapperUrl=http://central.maven.org/maven2/io/takari/maven-wrapper/0.2.1/maven-wrapper-0.2.1.jar
+#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-samples/blob/67d8fdf0/mvnw
----------------------------------------------------------------------
diff --git a/mvnw b/mvnw
index 78d4420..53d9860 100755
--- a/mvnw
+++ b/mvnw
@@ -209,7 +209,7 @@ if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
else
echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
- jarUrl="http://central.maven.org/maven2/io/takari/maven-wrapper/0.2.1/maven-wrapper-0.2.1.jar"
+ jarUrl="https://repo1.maven.org/maven2/io/takari/maven-wrapper/0.2.1/maven-wrapper-0.2.1.jar"
while IFS="=" read key value; do
case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
esac
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/67d8fdf0/mvnw.cmd
----------------------------------------------------------------------
diff --git a/mvnw.cmd b/mvnw.cmd
index cdcd27b..898fb06 100644
--- a/mvnw.cmd
+++ b/mvnw.cmd
@@ -118,7 +118,7 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-set DOWNLOAD_URL="http://central.maven.org/maven2/io/takari/maven-wrapper/0.2.1/maven-wrapper-0.2.1.jar"
+set DOWNLOAD_URL="https://repo1.maven.org/maven2/io/takari/maven-wrapper/0.2.1/maven-wrapper-0.2.1.jar"
FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
)
[08/50] incubator-edgent-samples git commit: more D.md and README
cleanup
Posted by cd...@apache.org.
more D.md and README cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/eeaa2bd0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/eeaa2bd0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/eeaa2bd0
Branch: refs/heads/develop
Commit: eeaa2bd0d685d1701eec1ecbd88d89f79cd77dd8
Parents: 28a5305
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Sep 12 12:30:01 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Sep 12 12:30:01 2017 -0400
----------------------------------------------------------------------
README.md | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 43 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/eeaa2bd0/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index cda4749..ceea313 100644
--- a/README.md
+++ b/README.md
@@ -18,14 +18,17 @@
See [APPLICATION_DEVELOPMENT.md](APPLICATION_DEVELOPMENT.md) for general
information on Edgent Application Development, Packaging and Execution.
+Additional information may also be found in
+Getting Started https://edgent.apache.org/docs/edgent-getting-started
+
#Building the Edgent samples
-By default java8 class files are generated.
+By default Java8 class files are generated.
Java7 and Android platform class files are produced when the appropriate
profile is specified.
```sh
-./mvnw clean package # -Pplatform-java7 or -Pplatform-android as needed
+./mvnw clean package # -Pplatform-java7,platform-android as needed
```
A standard jar and uber jar is created for each sample category
@@ -35,3 +38,41 @@ in the sample category's target directory: `<category>/target`.
##Running the samples
See the README.md in each sample category directory.
+
+#Using Eclipse
+
+The Edgent Git repository, or samples source release bundle, contains
+Maven project definitions for the samples.
+
+Once you import the Maven projects into your workspace,
+builds and JUnit testing of Edgent in Eclipse use the
+same artifacts as the Maven command line tooling. Like
+the command line tooling, the jars for dependent projects
+are automatically downloaded to the local maven repository
+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...*
+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 (e.g., `git@github.com:<username>/incubator-edgent.git`). The other fields will be populated automatically. Click *Next*. If required, enter your passphrase.
+ + In the *Source Git Repository* window, select the branch (usually `master`) and click *Next*
+ + Specify the directory where your local clone will be stored and click *Next*. The repository will be cloned. Note: You can build and run tests using Maven in this directory.
+4. In the *Select a wizard to use for importing projects* window, click *Cancel*. Then follow the steps below to import the Maven projects.
+
+
+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...*
+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 listed and all selected.
+ + Verify the *Add project(s) to working set* checkbox is checked
+ + Click *Finish*. Eclipse starts the import process and builds the workspace.
+
+Top-level artifacts such as `README.md` are available under the `edgent-samples` project.
+
+Note: Specifics may change depending on your version of Eclipse or the Eclipse Maven or Git Team Provider.
+
+Once the samples projects have been imported you can run them as any Eclipse application.
+E.g.,
+1. open the `HelloEdgent.java` sample
+2. click on *Run*, *Run As*, then *Java application*. `HelloEdgent` runs and prints to the Console view.
[29/50] incubator-edgent-samples git commit: more samples doc work
Posted by cd...@apache.org.
more samples doc work
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/c7df9e4d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/c7df9e4d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/c7df9e4d
Branch: refs/heads/develop
Commit: c7df9e4da267983cf34cc9441572a83565b942b9
Parents: a11725c
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Mon Oct 9 18:59:17 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Mon Oct 9 18:59:17 2017 -0400
----------------------------------------------------------------------
README.md | 97 ++++++++++++++++++++++++++++++++++++++-----------
template/README.md | 6 ++-
2 files changed, 81 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/c7df9e4d/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 84c392a..271feef 100644
--- a/README.md
+++ b/README.md
@@ -15,12 +15,46 @@
limitations under the License.
-->
+# Quickstart
+
+You must have Java 8 installed on your system.
+
+Build the samples for Java 8
+```sh
+./mvnw clean package
+```
+
+Run the HelloEdgent sample
+```sh
+cd topology
+./run-sample.sh HelloEdgent # prints a hello message and terminates
+ Hello
+ Edgent!
+ ...
+```
+
+# Overview
+
+The Edgent samples provide a starting point for jump starting your
+use of Edgent. See the _Samples Summary_ section for a list of the samples.
+
+The Edgent samples are organized into a few categories (subdirectories)
+and are a collection of maven projects. They can be built using maven
+or other maven-integrated tooling such as Eclipse.
+
+An Edgent application template maven project is supplied.
+It may be a useful starting point to clone for your application.
+The template has a standalone maven project pom, rather than a
+stylized one used by the rest of the samples.
+See [template/README.md](template/README.md).
+
See [APPLICATION_DEVELOPMENT.md](APPLICATION_DEVELOPMENT.md) for general
information on Edgent Application Development, Packaging and Execution.
Additional information may also be found in
Getting Started https://edgent.apache.org/docs/edgent-getting-started
+
# Setup
Once you have downloaded and unpacked the samples source bundle
@@ -28,16 +62,13 @@ or cloned the the samples repository you need to download
these additional development software tools.
* Java 8 - The development setup assumes Java 8
-* Maven - *(optional) (https://maven.apache.org/)*
-
-Maven is used as build tool. Currently there are two options:
-1. Using the maven-wrapper (the `mvnw` or `mvnw.bat` command - preferred)
-2. Using an installed version of Maven (the `mvn` command)
+Maven is used as build tool and a maven-wrapper
+script (`mvwn` or `mvnw.bat`) is included.
-The maven-wrapper will automatically download and install the
-correct Maven version and use that. Besides this, there is no
-difference between using the `mvn` and `mvnw` command.
+The maven-wrapper automatically downloads and installs the
+correct Maven version and use it. Besides this, there is no
+difference between using the `mvnw` command and the `mvn` command.
You may also use a maven-integrated IDE with the samples.
e.g., see the _Using Eclipse_ section below.
@@ -59,8 +90,8 @@ Java7 platform class files are produced when the appropriate
profile is specified.
Currently, building and running the samples for the Android platform
-is not supported. Many samples use the `DevelopmentProvider` and
-the `DevelopmentProvider` is not supported on the Android platform.
+is not supported. Many samples happen to use the `DevelopmentProvider`,
+which is not supported on the Android platform.
Build the samples
```sh
@@ -73,11 +104,13 @@ in the sample category's target directory: `<category>/target`.
## Running the samples
-See the README.md in each sample category directory.
+See the README.md in each sample category directory for information
+on running the samples.
+
# Using Eclipse
-The Edgent Git repository, or samples source release bundle, contains
+The Edgent Git repository and samples source release bundle contains
Maven project definitions for the samples.
Once you import the Maven projects into your workspace, builds
@@ -92,10 +125,17 @@ Eclipse Git Team Provider plugin
1. From the *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 (e.g., `git@github.com:<username>/incubator-edgent.git`). The other fields will be populated automatically. Click *Next*. If required, enter your passphrase.
- + In the *Source Git Repository* window, select the branch (usually `master`) and click *Next*
- + Specify the directory where your local clone will be stored and click *Next*. The repository will be cloned. Note: You can build and run tests using Maven in this directory.
-4. In the *Select a wizard to use for importing projects* window, click *Cancel*. Then follow the steps below to import the Maven projects.
+ + In the *Location* section, enter the URI of your fork in the *URI* field
+ (e.g., `git@github.com:<username>/incubator-edgent.git`).
+ The other fields will be populated automatically.
+ Click *Next*. If required, enter your passphrase.
+ + In the *Source Git Repository* window, select the branch
+ (usually `master`) and click *Next*
+ + Specify the directory where your local clone will be stored
+ and click *Next*. The repository will be cloned.
+ Note: You can build and run tests using Maven in this directory.
+4. In the *Select a wizard to use for importing projects* window, click *Cancel*.
+ Then follow the steps below to import the Maven projects.
Once you have cloned the Git repository to your machine or are working
@@ -104,7 +144,9 @@ into your workspace
1. From the *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 listed and all selected.
+ + 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
+ listed and all selected.
+ Verify the *Add project(s) to working set* checkbox is checked
+ Click *Finish*. Eclipse starts the import process and builds the workspace.
@@ -114,11 +156,13 @@ Top-level artifacts such as `README.md` are available under the
Note: Specifics may change depending on your version of Eclipse or the
Eclipse Maven or Git Team Provider.
-Once the samples projects have been imported you can run them as any
-Eclipse application. E.g.,
+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*. `HelloEdgent` runs and prints to the Console view.
+2. click on *Run*, *Run As*, then *Java application*.
+ `HelloEdgent` runs and prints to the Console view.
+
# Samples Summary
@@ -162,6 +206,17 @@ SensorAnalytics Demonstrates a more complex sample that includes
conditional stream tracing.
</pre>
-Other samples are provided but have not yet been fully documented.
+Other samples are provided but have not yet been noted above.
Feel free to explore.
+# Licensing
+
+Apache Edgent samples are released under the Apache License Version 2.0.
+
+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-samples/blob/c7df9e4d/template/README.md
----------------------------------------------------------------------
diff --git a/template/README.md b/template/README.md
index 1588906..2c7d300 100644
--- a/template/README.md
+++ b/template/README.md
@@ -13,6 +13,9 @@ Include the Edgent Providers, Analytics, Utils, and Connectors used by your appl
Read `../README.md` for general information about Edgent Application development.
+The template includes a maven wrapper script to eliminate the need to
+manually download and install maven.
+
# Building the project
```sh
./mvnw clean package # add -Pplatform-java7 or -Pplatform-android as needed
@@ -20,7 +23,8 @@ Read `../README.md` for general information about Edgent Application development
# Running the application
-You can copy `app-run.sh` and the generated `target/*-uber.jar` to the edge device
+You can copy `app-run.sh` and the generated `target/*-uber.jar` to the
+edge device and then run it
```sh
./app-run.sh
```
[34/50] incubator-edgent-samples git commit: rototill samples poms
for j7 support
Posted by cd...@apache.org.
rototill samples poms for j7 support
- model like the Edgent core's platform pom structure (ugh)
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/ab768c46
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/ab768c46
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/ab768c46
Branch: refs/heads/develop
Commit: ab768c465b0b4b1e60f15651a39246d4eed14be8
Parents: ab0098a
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Oct 11 15:35:50 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Oct 11 15:35:50 2017 -0400
----------------------------------------------------------------------
apps/pom.xml | 40 +++++--
buildtools/update-platform-poms.sh | 20 ++++
connectors/pom.xml | 39 +++++--
console/pom.xml | 27 ++++-
platforms/java7/apps/pom.xml | 93 ++++++++++++++++
platforms/java7/connectors/pom.xml | 98 +++++++++++++++++
platforms/java7/console/pom.xml | 67 ++++++++++++
platforms/java7/pom.xml | 186 ++++++++++++++++++++++++++++++++
platforms/java7/scenarios/pom.xml | 102 ++++++++++++++++++
platforms/java7/topology/pom.xml | 68 ++++++++++++
platforms/java7/utils/pom.xml | 78 ++++++++++++++
platforms/pom.xml | 59 ++++++++++
pom.xml | 157 ++-------------------------
scenarios/pom.xml | 30 ++++--
template/pom.xml | 30 +++---
topology/pom.xml | 28 ++++-
utils/pom.xml | 38 +++++--
17 files changed, 953 insertions(+), 207 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab768c46/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index 6041636..bebae83 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -21,54 +21,72 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <!-- UPDATE_PLATFORM_POMS_MSG_PLACEHOLDER -->
+
<parent>
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
-
- <groupId>${edgent.base.groupId}.samples</groupId>
+
+ <groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-apps</artifactId>
- <name>Apache Edgent: Samples: Apps</name>
+ <name>Apache Edgent${samples.projname.platform}: Samples: Apps</name>
<dependencies>
- <!-- parent pom has Edgent provider and SLF4J dependencies -->
+ <!-- parent pom has SLF4J dependencies -->
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-direct</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-development</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-iot</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
<dependency>
<groupId>${edgent.base.groupId}.analytics</groupId>
<artifactId>edgent-analytics-sensors</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.core.version}</version>
</dependency>
<dependency>
<groupId>${edgent.base.groupId}.connectors</groupId>
<artifactId>edgent-connectors-file</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.core.version}</version>
</dependency>
<dependency>
<groupId>${edgent.base.groupId}.analytics</groupId>
<artifactId>edgent-analytics-math3</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.core.version}</version>
</dependency>
<dependency>
<groupId>${edgent.base.groupId}.connectors</groupId>
<artifactId>edgent-connectors-iot</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.core.version}</version>
</dependency>
<dependency>
<groupId>${edgent.base.groupId}.connectors</groupId>
<artifactId>edgent-connectors-iotp</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.core.version}</version>
</dependency>
<dependency>
<groupId>${edgent.base.groupId}.connectors</groupId>
<artifactId>edgent-connectors-mqtt</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.core.version}</version>
</dependency>
+
<dependency>
<groupId>${edgent.base.groupId}.samples</groupId>
<artifactId>edgent-samples-utils</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab768c46/buildtools/update-platform-poms.sh
----------------------------------------------------------------------
diff --git a/buildtools/update-platform-poms.sh b/buildtools/update-platform-poms.sh
new file mode 100755
index 0000000..07cbc53
--- /dev/null
+++ b/buildtools/update-platform-poms.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# copy the java8 version of the poms to the other platform hierarchies,
+# adjusting the groupIds accordingly
+#
+# usage: buildtools/update-platform-poms.sh
+
+J8_PROJECTS="apps connectors console scenarios topology utils"
+PLATFORMS=java7
+
+for p in ${PLATFORMS}; do
+ for proj in ${J8_PROJECTS}; do
+ if [ ! -d platforms/${p}/${proj} ]; then
+ mkdir -p platforms/${p}/${proj}
+ fi
+ sed -e "s/org.apache.edgent.samples/org.apache.edgent.${p}.samples/g" \
+ -e "s/UPDATE_PLATFORM_POMS_MSG_PLACEHOLDER/DO NOT EDIT - GENERATED BY update_platform_poms.sh/" \
+ < ${proj}/pom.xml > platforms/${p}/${proj}/pom.xml
+ done
+done
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab768c46/connectors/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/pom.xml b/connectors/pom.xml
index d57b618..9f293c8 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -21,60 +21,77 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <!-- UPDATE_PLATFORM_POMS_MSG_PLACEHOLDER -->
+
<parent>
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>${edgent.base.groupId}.samples</groupId>
+ <groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-connectors</artifactId>
- <name>Apache Edgent: Samples: Connectors</name>
+ <name>Apache Edgent${samples.projname.platform}: Samples: Connectors</name>
<dependencies>
- <!-- parent pom has Edgent provider and SLF4J dependencies -->
+ <!-- parent pom has SLF4J dependencies -->
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-direct</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-development</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-iot</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
<dependency>
<groupId>${edgent.base.groupId}.connectors</groupId>
<artifactId>edgent-connectors-mqtt</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.core.version}</version>
</dependency>
<dependency>
<groupId>${edgent.base.groupId}.connectors</groupId>
<artifactId>edgent-connectors-kafka</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.core.version}</version>
</dependency>
<dependency>
<groupId>${edgent.base.groupId}.connectors</groupId>
<artifactId>edgent-connectors-jdbc</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.core.version}</version>
</dependency>
<dependency>
<groupId>${edgent.base.groupId}.connectors</groupId>
<artifactId>edgent-connectors-serial</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.core.version}</version>
</dependency>
<dependency>
<groupId>${edgent.base.groupId}.connectors</groupId>
<artifactId>edgent-connectors-file</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.core.version}</version>
</dependency>
<dependency>
<groupId>${edgent.base.groupId}.connectors</groupId>
<artifactId>edgent-connectors-iotp</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.core.version}</version>
</dependency>
<dependency>
<groupId>${edgent.base.groupId}.analytics</groupId>
<artifactId>edgent-analytics-math3</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.core.version}</version>
</dependency>
<dependency>
<groupId>${edgent.base.groupId}.samples</groupId>
<artifactId>edgent-samples-topology</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab768c46/console/pom.xml
----------------------------------------------------------------------
diff --git a/console/pom.xml b/console/pom.xml
index 4bde53f..52961e5 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -21,29 +21,46 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <!-- UPDATE_PLATFORM_POMS_MSG_PLACEHOLDER -->
+
<parent>
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>${edgent.base.groupId}.samples</groupId>
+ <groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-console</artifactId>
- <name>Apache Edgent: Samples: Console</name>
+ <name>Apache Edgent${samples.projname.platform}: Samples: Console</name>
<dependencies>
- <!-- parent pom has Edgent provider and SLF4J dependencies -->
+ <!-- parent pom has SLF4J dependencies -->
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-direct</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-development</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-iot</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
<dependency>
<groupId>${edgent.base.groupId}.console</groupId>
<artifactId>edgent-console-server</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.core.version}</version>
</dependency>
<dependency>
<groupId>${edgent.base.groupId}.utils</groupId>
<artifactId>edgent-utils-metrics</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.core.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab768c46/platforms/java7/apps/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/apps/pom.xml b/platforms/java7/apps/pom.xml
new file mode 100644
index 0000000..6a81391
--- /dev/null
+++ b/platforms/java7/apps/pom.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- DO NOT EDIT - GENERATED BY update_platform_poms.sh -->
+
+ <parent>
+ <groupId>org.apache.edgent.java7.samples</groupId>
+ <artifactId>edgent-samples</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.edgent.java7.samples</groupId>
+ <artifactId>edgent-samples-apps</artifactId>
+
+ <name>Apache Edgent${samples.projname.platform}: Samples: Apps</name>
+
+ <dependencies>
+ <!-- parent pom has SLF4J dependencies -->
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-direct</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-development</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-iot</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${edgent.base.groupId}.analytics</groupId>
+ <artifactId>edgent-analytics-sensors</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.connectors</groupId>
+ <artifactId>edgent-connectors-file</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.analytics</groupId>
+ <artifactId>edgent-analytics-math3</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.connectors</groupId>
+ <artifactId>edgent-connectors-iot</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.connectors</groupId>
+ <artifactId>edgent-connectors-iotp</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.connectors</groupId>
+ <artifactId>edgent-connectors-mqtt</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${edgent.base.groupId}.samples</groupId>
+ <artifactId>edgent-samples-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab768c46/platforms/java7/connectors/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/connectors/pom.xml b/platforms/java7/connectors/pom.xml
new file mode 100644
index 0000000..b8c4341
--- /dev/null
+++ b/platforms/java7/connectors/pom.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- DO NOT EDIT - GENERATED BY update_platform_poms.sh -->
+
+ <parent>
+ <groupId>org.apache.edgent.java7.samples</groupId>
+ <artifactId>edgent-samples</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.edgent.java7.samples</groupId>
+ <artifactId>edgent-samples-connectors</artifactId>
+
+ <name>Apache Edgent${samples.projname.platform}: Samples: Connectors</name>
+
+ <dependencies>
+ <!-- parent pom has SLF4J dependencies -->
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-direct</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-development</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-iot</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${edgent.base.groupId}.connectors</groupId>
+ <artifactId>edgent-connectors-mqtt</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.connectors</groupId>
+ <artifactId>edgent-connectors-kafka</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.connectors</groupId>
+ <artifactId>edgent-connectors-jdbc</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.connectors</groupId>
+ <artifactId>edgent-connectors-serial</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.connectors</groupId>
+ <artifactId>edgent-connectors-file</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.connectors</groupId>
+ <artifactId>edgent-connectors-iotp</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.analytics</groupId>
+ <artifactId>edgent-analytics-math3</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${edgent.base.groupId}.samples</groupId>
+ <artifactId>edgent-samples-topology</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab768c46/platforms/java7/console/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/console/pom.xml b/platforms/java7/console/pom.xml
new file mode 100644
index 0000000..f2ec5c7
--- /dev/null
+++ b/platforms/java7/console/pom.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- DO NOT EDIT - GENERATED BY update_platform_poms.sh -->
+
+ <parent>
+ <groupId>org.apache.edgent.java7.samples</groupId>
+ <artifactId>edgent-samples</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.edgent.java7.samples</groupId>
+ <artifactId>edgent-samples-console</artifactId>
+
+ <name>Apache Edgent${samples.projname.platform}: Samples: Console</name>
+
+ <dependencies>
+ <!-- parent pom has SLF4J dependencies -->
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-direct</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-development</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-iot</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${edgent.base.groupId}.console</groupId>
+ <artifactId>edgent-console-server</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.utils</groupId>
+ <artifactId>edgent-utils-metrics</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab768c46/platforms/java7/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/pom.xml b/platforms/java7/pom.xml
new file mode 100644
index 0000000..a27a837
--- /dev/null
+++ b/platforms/java7/pom.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.edgent.samples.platforms</groupId>
+ <artifactId>edgent-samples-platforms</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.edgent.java7.samples</groupId>
+ <artifactId>edgent-samples</artifactId>
+ <packaging>pom</packaging>
+
+ <name>Apache Edgent${samples.projname.platform}: Samples</name>
+
+ <properties>
+ <edgent.base.groupId>org.apache.edgent.java7</edgent.base.groupId>
+ </properties>
+
+ <modules>
+ <module>apps</module>
+ <module>connectors</module>
+ <module>console</module>
+ <module>scenarios</module>
+ <module>topology</module>
+ <module>utils</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <!-- Convert the Java8 classes to Java7 classes -->
+ <plugin>
+ <groupId>net.orfjackal.retrolambda</groupId>
+ <artifactId>retrolambda-maven-plugin</artifactId>
+ <version>2.5.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process-main</goal>
+ <goal>process-test</goal>
+ </goals>
+ <configuration>
+ <!-- I was getting random failures if not running retrolambda in a separate process -->
+ <fork>true</fork>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Test.class</include>
+ </includes>
+ <testClassesDirectory>${project.build.testOutputDirectory}</testClassesDirectory>
+ </configuration>
+ </plugin>
+ <!-- Check artifacts against Java7 signatures -->
+ <!--
+ Let the plugin run in the process-test-classes so we immediately know if
+ test run problems could be related to using APIs unavailable to Java7.
+ -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>animal-sniffer-maven-plugin</artifactId>
+ <version>1.15</version>
+ <executions>
+ <execution>
+ <id>check-jdk-signatures</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <signature>
+ <groupId>org.codehaus.mojo.signature</groupId>
+ <artifactId>java17</artifactId>
+ <version>1.0</version>
+ </signature>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <!-- Additionally build the binary distribution package. -->
+ <profile>
+ <id>distribution</id>
+ <modules>
+ <module>distribution</module>
+ </modules>
+ </profile>
+ <!-- Switch all default plugins to use Java7 instead of Java8 -->
+ <profile>
+ <id>toolchain</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-toolchains-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>toolchain</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <toolchains>
+ <jdk>
+ <version>1.7</version>
+ <vendor>oracle</vendor>
+ </jdk>
+ </toolchains>
+ </configuration>
+ </plugin>
+ <!--
+ The retrolambda plugin requires Java 8 to operate, but we set the toolchain
+ to Java 7. Therefore we need to provide a path to the Java 8 home directory.
+ This check ensures this property is set and provides an understandable error
+ message.
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.4.1</version>
+ <executions>
+ <execution>
+ <id>enforce-property</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireProperty>
+ <property>java8.home</property>
+ <message>The retrolambda-maven-plugin requires a path to Java 8. You must set a 'java8.home' property!</message>
+ </requireProperty>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>net.orfjackal.retrolambda</groupId>
+ <artifactId>retrolambda-maven-plugin</artifactId>
+ <version>2.5.1</version>
+ <executions>
+ <execution>
+ <configuration>
+ <java8home>${java8.home}</java8home>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab768c46/platforms/java7/scenarios/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/scenarios/pom.xml b/platforms/java7/scenarios/pom.xml
new file mode 100644
index 0000000..ae6a18f
--- /dev/null
+++ b/platforms/java7/scenarios/pom.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- DO NOT EDIT - GENERATED BY update_platform_poms.sh -->
+
+ <parent>
+ <groupId>org.apache.edgent.java7.samples</groupId>
+ <artifactId>edgent-samples</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.edgent.java7.samples</groupId>
+ <artifactId>edgent-samples-scenarios</artifactId>
+
+ <name>Apache Edgent${samples.projname.platform}: Samples: Scenarios</name>
+
+ <build>
+ <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">
+ <exclude>src/main/resources/**/*.cfg</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <!-- parent pom has SLF4J dependencies -->
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-direct</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-development</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-iot</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${edgent.base.groupId}.connectors</groupId>
+ <artifactId>edgent-connectors-iotp</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.analytics</groupId>
+ <artifactId>edgent-analytics-math3</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${edgent.base.groupId}.samples</groupId>
+ <artifactId>edgent-samples-connectors</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.pi4j</groupId>
+ <artifactId>pi4j-core</artifactId>
+ <version>1.1</version>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab768c46/platforms/java7/topology/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/topology/pom.xml b/platforms/java7/topology/pom.xml
new file mode 100644
index 0000000..91cb6e6
--- /dev/null
+++ b/platforms/java7/topology/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- DO NOT EDIT - GENERATED BY update_platform_poms.sh -->
+
+ <parent>
+ <groupId>org.apache.edgent.java7.samples</groupId>
+ <artifactId>edgent-samples</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.edgent.java7.samples</groupId>
+ <artifactId>edgent-samples-topology</artifactId>
+
+ <name>Apache Edgent${samples.projname.platform}: Samples: Topology</name>
+
+ <dependencies>
+ <!-- parent pom has SLF4J dependencies -->
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-direct</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-development</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-iot</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${edgent.base.groupId}.analytics</groupId>
+ <artifactId>edgent-analytics-math3</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${edgent.base.groupId}.samples</groupId>
+ <artifactId>edgent-samples-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab768c46/platforms/java7/utils/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/utils/pom.xml b/platforms/java7/utils/pom.xml
new file mode 100644
index 0000000..ef1242e
--- /dev/null
+++ b/platforms/java7/utils/pom.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- DO NOT EDIT - GENERATED BY update_platform_poms.sh -->
+
+ <parent>
+ <groupId>org.apache.edgent.java7.samples</groupId>
+ <artifactId>edgent-samples</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.edgent.java7.samples</groupId>
+ <artifactId>edgent-samples-utils</artifactId>
+
+ <name>Apache Edgent${samples.projname.platform}: Samples: Utils</name>
+
+ <dependencies>
+ <!-- parent pom has SLF4J dependencies -->
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-direct</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-development</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-iot</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${edgent.base.groupId}.utils</groupId>
+ <artifactId>edgent-utils-metrics</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.analytics</groupId>
+ <artifactId>edgent-analytics-sensors</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.console</groupId>
+ <artifactId>edgent-console-server</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math3</artifactId>
+ <version>3.4.1</version>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab768c46/platforms/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/pom.xml b/platforms/pom.xml
new file mode 100644
index 0000000..d47411c
--- /dev/null
+++ b/platforms/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.edgent.samples</groupId>
+ <artifactId>edgent-samples</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.edgent.samples.platforms</groupId>
+ <artifactId>edgent-samples-platforms</artifactId>
+ <packaging>pom</packaging>
+
+ <name>Apache Edgent${samples.projname.platform}: Samples: Platforms</name>
+
+ <profiles>
+ <profile>
+ <id>platform-java7</id>
+ <modules>
+ <module>java7</module>
+ </modules>
+ <properties>
+ <platform.java7>true</platform.java7>
+ <samples.projname.platform> (Java 7)</samples.projname.platform>
+ </properties>
+ </profile>
+ <profile>
+ <id>platform-android</id>
+ <modules>
+ <module>android</module>
+ </modules>
+ <properties>
+ <platform.android>true</platform.android>
+ <samples.projname.platform> (Android)</samples.projname.platform>
+ </properties>
+ </profile>
+ </profiles>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab768c46/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 966abf8..d63493a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,12 +32,12 @@
<version>1.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Apache Edgent: Samples</name>
+ <name>Apache Edgent${samples.projname.platform}: Samples</name>
<properties>
- <edgent.platform/> <!-- set by -Pplatform-* -->
- <edgent.base.groupId>org.apache.edgent${edgent.platform}</edgent.base.groupId>
- <edgent.version>1.2.0-SNAPSHOT</edgent.version>
+ <samples.projname.platform> (Java 8)</samples.projname.platform> <!-- tweaked by -Pplatform-* -->
+ <edgent.base.groupId>org.apache.edgent</edgent.base.groupId>
+ <edgent.core.version>1.2.0-SNAPSHOT</edgent.core.version>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -57,6 +57,7 @@
<module>scenarios</module>
<module>topology</module>
<module>utils</module>
+ <module>platforms</module>
</modules>
<dependencies>
@@ -79,150 +80,12 @@
<scope>runtime</scope>
</dependency>
- <!-- the Edgent provider(s) being used -->
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-development</artifactId>
- <version>${edgent.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.version}</version>
- </dependency>
- <!-- each sample module declares its own connector dependencies, etc -->
- </dependencies>
-
- <profiles>
- <!--
- This defines a self-activating profile which is only enabled for
- for projects that have a src/main/java directory (effectivley excludes
- it from the current pom module.
+ <!-- each sample module declares its own (platform specific) Edgent dependencies, etc -->
+ <!-- HEADS UP, NO PLATFORM SPECIFIC EDGENT DEPS HERE
+ at they will be inherited by other platform specific
+ projects - which will cause problems.
-->
- <!--profile>
- <id>generate-classpath</id>
- <activation>
- <file>
- <exists>src/main/java</exists>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>dump-dependency-tree</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>tree</goal>
- </goals>
- <configuration>
- <outputFile>${project.build.directory}/dependency-tree.graphml</outputFile>
- <outputType>graphml</outputType>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xml-maven-plugin</artifactId>
- <version>1.0.1</version>
- <executions>
- <execution>
- <id>transform-dependency-tree</id>
- <goals>
- <goal>transform</goal>
- </goals>
- <configuration>
- <transformationSets>
- <transformationSet>
- <file>${project.build.directory}/dependency-tree.graphml</file>
- <stylesheet>${project.basedir}/../src/main/xslt/classpath.xsl</stylesheet>
- <parameters>
- <parameter>
- <name>groupId</name>
- <value>${project.groupId}</value>
- </parameter>
- <parameter>
- <name>artifactId</name>
- <value>${project.artifactId}</value>
- </parameter>
- <parameter>
- <name>version</name>
- <value>${project.version}</value>
- </parameter>
- </parameters>
- </transformationSet>
- </transformationSets>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile-->
-
- <profile>
- <id>platform-java7</id>
- <properties>
- <platform.java7>true</platform.java7>
- <edgent.platform>.java7</edgent.platform>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>net.orfjackal.retrolambda</groupId>
- <artifactId>retrolambda-maven-plugin</artifactId>
- <version>${retrolambda.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>process-main</goal>
- <goal>process-test</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <!-- Currently, many samples use the DevelopmentProvider,
- which doesn't exist for the android platform.
- For now don't support building/running the
- samples for that context.
- -->
- <!--profile>
- <id>platform-android</id>
- <properties>
- <platform.android>true</platform.android>
- <edgent.platform>.android</edgent.platform>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>net.orfjackal.retrolambda</groupId>
- <artifactId>retrolambda-maven-plugin</artifactId>
- <version>${retrolambda.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>process-main</goal>
- <goal>process-test</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile-->
- </profiles>
+ </dependencies>
<build>
<pluginManagement>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab768c46/scenarios/pom.xml
----------------------------------------------------------------------
diff --git a/scenarios/pom.xml b/scenarios/pom.xml
index cba1c78..c7bab58 100644
--- a/scenarios/pom.xml
+++ b/scenarios/pom.xml
@@ -21,16 +21,18 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <!-- UPDATE_PLATFORM_POMS_MSG_PLACEHOLDER -->
+
<parent>
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>${edgent.base.groupId}.samples</groupId>
+ <groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-scenarios</artifactId>
- <name>Apache Edgent: Samples: Scenarios</name>
+ <name>Apache Edgent${samples.projname.platform}: Samples: Scenarios</name>
<build>
<plugins>
@@ -56,24 +58,40 @@
</build>
<dependencies>
- <!-- parent pom has Edgent provider and SLF4J dependencies -->
+ <!-- parent pom has SLF4J dependencies -->
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-direct</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-development</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-iot</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
<dependency>
<groupId>${edgent.base.groupId}.connectors</groupId>
<artifactId>edgent-connectors-iotp</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.core.version}</version>
</dependency>
<dependency>
<groupId>${edgent.base.groupId}.analytics</groupId>
<artifactId>edgent-analytics-math3</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.core.version}</version>
</dependency>
<dependency>
<groupId>${edgent.base.groupId}.samples</groupId>
<artifactId>edgent-samples-connectors</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>com.pi4j</groupId>
<artifactId>pi4j-core</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab768c46/template/pom.xml
----------------------------------------------------------------------
diff --git a/template/pom.xml b/template/pom.xml
index fd8e7d4..ab67e31 100644
--- a/template/pom.xml
+++ b/template/pom.xml
@@ -89,12 +89,12 @@
<!--dependency>
<groupId>${edgent.base.groupId}.android</groupId>
<artifactId>edgent-android-hardware</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.version}</version>
</dependency-->
<!--dependency>
<groupId>${edgent.base.groupId}.android</groupId>
<artifactId>edgent-android-topology</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.version}</version>
</dependency-->
<!-- declare Edgent Analytics dependencies
@@ -102,12 +102,12 @@
<!--dependency>
<groupId>${edgent.base.groupId}.analytics</groupId>
<artifactId>edgent-analytics-math3</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.version}</version>
</dependency-->
<!--dependency>
<groupId>${edgent.base.groupId}.analytics</groupId>
<artifactId>edgent-analytics-sensors</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.version}</version>
</dependency-->
<!-- declare Edgent Utils dependencies
@@ -115,7 +115,7 @@
<!--dependency>
<groupId>${edgent.base.groupId}.utils</groupId>
<artifactId>edgent-utils-metrics</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.version}</version>
</dependency-->
<!-- declare Edgent Connector dependencies
@@ -123,37 +123,37 @@
<!--dependency>
<groupId>${edgent.base.groupId}.connectors</groupId>
<artifactId>edgent-connectors-file</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.version}</version>
</dependency-->
<!--dependency>
<groupId>${edgent.base.groupId}.connectors</groupId>
<artifactId>edgent-connectors-iot</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.version}</version>
</dependency-->
<!--dependency>
<groupId>${edgent.base.groupId}.connectors</groupId>
<artifactId>edgent-connectors-iotp</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.version}</version>
</dependency-->
<!--dependency>
<groupId>${edgent.base.groupId}.connectors</groupId>
<artifactId>edgent-connectors-jdbc</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.version}</version>
</dependency-->
<!--dependency>
<groupId>${edgent.base.groupId}.connectors</groupId>
<artifactId>edgent-connectors-kafka</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.version}</version>
</dependency-->
<!--dependency>
<groupId>${edgent.base.groupId}.connectors</groupId>
<artifactId>edgent-connectors-mqtt</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.version}</version>
</dependency-->
<!--dependency>
<groupId>${edgent.base.groupId}.connectors</groupId>
<artifactId>edgent-connectors-serial</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.version}</version>
</dependency-->
</dependencies>
@@ -178,6 +178,9 @@
<goal>process-main</goal>
<goal>process-test</goal>
</goals>
+ <configuration>
+ <fork>true</fork>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -203,6 +206,9 @@
<goal>process-main</goal>
<goal>process-test</goal>
</goals>
+ <configuration>
+ <fork>true</fork>
+ </configuration>
</execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab768c46/topology/pom.xml
----------------------------------------------------------------------
diff --git a/topology/pom.xml b/topology/pom.xml
index 7dd9df3..a47dbd6 100644
--- a/topology/pom.xml
+++ b/topology/pom.xml
@@ -21,29 +21,47 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <!-- UPDATE_PLATFORM_POMS_MSG_PLACEHOLDER -->
+
<parent>
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>${edgent.base.groupId}.samples</groupId>
+ <groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-topology</artifactId>
- <name>Apache Edgent: Samples: Topology</name>
+ <name>Apache Edgent${samples.projname.platform}: Samples: Topology</name>
<dependencies>
- <!-- parent pom has Edgent provider and SLF4J dependencies -->
+ <!-- parent pom has SLF4J dependencies -->
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-direct</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-development</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-iot</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
<dependency>
<groupId>${edgent.base.groupId}.analytics</groupId>
<artifactId>edgent-analytics-math3</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.core.version}</version>
</dependency>
+
<dependency>
<groupId>${edgent.base.groupId}.samples</groupId>
<artifactId>edgent-samples-utils</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab768c46/utils/pom.xml
----------------------------------------------------------------------
diff --git a/utils/pom.xml b/utils/pom.xml
index 45bb1dd..a208120 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -21,40 +21,58 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <!-- UPDATE_PLATFORM_POMS_MSG_PLACEHOLDER -->
+
<parent>
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>${edgent.base.groupId}.samples</groupId>
+ <groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-utils</artifactId>
- <name>Apache Edgent: Samples: Utils</name>
+ <name>Apache Edgent${samples.projname.platform}: Samples: Utils</name>
<dependencies>
- <!-- parent pom has Edgent provider and SLF4J dependencies -->
+ <!-- parent pom has SLF4J dependencies -->
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-direct</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-development</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-iot</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
<dependency>
<groupId>${edgent.base.groupId}.utils</groupId>
<artifactId>edgent-utils-metrics</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.core.version}</version>
</dependency>
<dependency>
<groupId>${edgent.base.groupId}.analytics</groupId>
<artifactId>edgent-analytics-sensors</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.console</groupId>
+ <artifactId>edgent-console-server</artifactId>
+ <version>${edgent.core.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
<version>3.4.1</version>
</dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.console</groupId>
- <artifactId>edgent-console-server</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </dependency>
</dependencies>
</project>