You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2019/10/28 16:36:58 UTC
[plc4x] branch rel/0.5 updated (8276642 -> e409376)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch rel/0.5
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
from 8276642 [maven-release-plugin] prepare for next development iteration
new 6a312eb - Merged latest changes from develop back to the release branch
new e409376 - Replaced the auto-generated config files with ones written by me (Resolving the need to reference in the LICENSE or other resources)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
LICENSE | 11 ++-
README.md | 12 +--
.../src/remote-resources/LICENSE | 4 +-
.../src/remote-resources => licenses}/UNLICENSE | 0
plc4cpp/pom.xml | 8 +-
plc4j/examples/hello-storage-elasticsearch/pom.xml | 6 ++
.../apache/plc4x/edgent/PlcConnectionAdapter.java | 37 +--------
plc4j/integrations/logstash-plugin/pom.xml | 8 +-
plc4j/karaf-features/karaf-itest/pom.xml | 7 +-
pom.xml | 10 +--
.../java/streampipes/bacnetip/BacNetIpAdapter.java | 6 +-
.../streampipes/bacnetip/config/ConfigKeys.java | 46 ++++++-----
.../bacnetip/config/ConnectWorkerConfig.java | 95 +++++++++-------------
src/main/script/prerequisiteCheck.groovy | 2 -
src/site/asciidoc/developers/release.adoc | 9 +-
src/site/asciidoc/index.adoc | 4 +-
tools/check_sigs.sh | 2 +-
tools/download_staged_release.sh | 2 +-
tools/thrift/pom.xml | 36 ++++++--
19 files changed, 147 insertions(+), 158 deletions(-)
copy {build-utils/protocol-base-mspec/src/remote-resources => licenses}/UNLICENSE (100%)
[plc4x] 01/02: - Merged latest changes from develop back to the
release branch
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch rel/0.5
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 6a312ebbd802f101ba6dee04bf943834cf7b54f9
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon Oct 28 13:22:11 2019 +0100
- Merged latest changes from develop back to the release branch
---
LICENSE | 11 +++++--
README.md | 12 +++----
.../src/remote-resources/LICENSE | 4 +--
licenses/UNLICENSE | 24 ++++++++++++++
plc4cpp/pom.xml | 8 ++---
plc4j/examples/hello-storage-elasticsearch/pom.xml | 6 ++++
.../apache/plc4x/edgent/PlcConnectionAdapter.java | 37 +---------------------
plc4j/integrations/logstash-plugin/pom.xml | 8 +++--
plc4j/karaf-features/karaf-itest/pom.xml | 7 ++--
pom.xml | 10 +++---
.../streampipes/bacnetip/config/ConfigKeys.java | 1 +
.../bacnetip/config/ConnectWorkerConfig.java | 1 -
src/main/script/prerequisiteCheck.groovy | 2 --
src/site/asciidoc/developers/release.adoc | 9 +++++-
src/site/asciidoc/index.adoc | 4 +--
tools/check_sigs.sh | 2 +-
tools/download_staged_release.sh | 2 +-
tools/thrift/pom.xml | 36 +++++++++++++++++----
18 files changed, 108 insertions(+), 76 deletions(-)
diff --git a/LICENSE b/LICENSE
index 7f53f08..033d5d4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -203,15 +203,20 @@
===============================================================
-The Files:
+The files:
plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawEthernetSocket.java
plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawIpSocket.java
plc4j/utils/raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets/attic/RawSocketListener.java
Are copyrighted by the The Netty Project which is distributed under the Apache 2.0 license.
-The Files:
+The files:
.mvn/wrapper/MavenWrapperDownloader.java
mvnw
mvnw.cmd
Are provided from the Github Project: https://github.com/takari/maven-wrapper
-which is distributed under the Apache 2.0 license.
\ No newline at end of file
+which is distributed under the Apache 2.0 license.
+
+The file:
+build-utils/protocol-base-mspec/src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/Expression.g4
+is licensed under the Category A: "UNLICENSE" which is available here:
+UNLICENSE file in the licenses directory.
diff --git a/README.md b/README.md
index 818d6be..b909fde 100644
--- a/README.md
+++ b/README.md
@@ -82,7 +82,7 @@ See the PLC4J user guide on the website to start using PLC4X in your Java applic
Currently the project is configured to require the following software:
-1. Java 8 JDK: For running Maven in general as well as compiling the Java and Scala modules `JAVA_HOME configured to
+1. Java 8 JDK: For running Maven in general as well as compiling the Java and Scala modules `JAVA_HOME` configured to
point to that.
2. libpcap/WinPcap for raw socket tests in Java
3. (Optional) Graphwiz: For generating the graphs in the documentation (http://www.graphviz.org/)
@@ -144,8 +144,8 @@ Not quite sure which elements are really needed, better just install all of them
WARNING: If you don't use the installer version of the distribution. The build will probably fail and it will be pretty
impossible to see the problem. When manually executing the command, a popup will appear complaining about not being able
-to find some DLL. So if you are having these problems, please try using the installer instead of the manually unpackable
-archive.
+to find some DLL. So if you are having these problems, please try using the installer instead of manually unpacking
+the archive.
For Bison, please download the Setup installer version from here: http://gnuwin32.sourceforge.net/packages/bison.htm (When using the zip version the bison.exe couldn't find some DLL files)
It seems the official 2.4.1 version has issues when installed in a directory which's path contains spaces. Please make sure you replace the exe with a patched version form here: http://marin.jb.free.fr/bison/bison-2.4.1-modified.zip
@@ -172,8 +172,8 @@ Build PLC4X Java jars and install them in your local maven repository
./mvnw install -P with-java # add -DskipTests to omit running the tests
```
-You can now construct Java applications that use PLC4X. The PLC4X samples
-are a good place to start and are available inside the `examples`
+You can now construct Java applications that use PLC4X. The PLC4X examples
+are a good place to start and are available inside the `plc4j/examples`
directory.
If you want to also build the C++ libraries, this has to be enabled by activating
@@ -195,7 +195,7 @@ However both of these are in a pretty experimental state.
In order to build everything the following command should work:
```
-./mvnw -P with-java,with-cpp,with-dotnet,with-python,with-proxies,with-sandbox install
+./mvnw -P with-boost,with-cpp,with-dotnet,with-java,with-logstash,with-proxies,with-python,with-sandbox install
```
### Installing libpcap/WinPcap
diff --git a/build-utils/protocol-base-mspec/src/remote-resources/LICENSE b/build-utils/protocol-base-mspec/src/remote-resources/LICENSE
index 41526f2..497b8a9 100644
--- a/build-utils/protocol-base-mspec/src/remote-resources/LICENSE
+++ b/build-utils/protocol-base-mspec/src/remote-resources/LICENSE
@@ -1,3 +1,3 @@
-src/main/antlr4/org/apache/plc4x/codegenerator/parser/expression/Expression.g4
+src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/Expression.g4
is licensed under the Category A: "UNLICENSE" which is available here:
-UNLICENSE file paralell to this file.
+UNLICENSE file parallel to this file.
diff --git a/licenses/UNLICENSE b/licenses/UNLICENSE
new file mode 100644
index 0000000..c32dd18
--- /dev/null
+++ b/licenses/UNLICENSE
@@ -0,0 +1,24 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <https://unlicense.org/>
\ No newline at end of file
diff --git a/plc4cpp/pom.xml b/plc4cpp/pom.xml
index 3703a4e..80d0fca 100644
--- a/plc4cpp/pom.xml
+++ b/plc4cpp/pom.xml
@@ -145,7 +145,7 @@
<artifactItem>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-tools-thrift</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>zip</type>
<classifier>cpp-${os.classifier}</classifier>
<outputDirectory>${project.build.directory}/lib/thrift</outputDirectory>
@@ -202,7 +202,7 @@
<artifactItem>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-tools-boost</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>zip</type>
<classifier>lib-${os.classifier}</classifier>
<outputDirectory>${project.build.directory}/lib/boost</outputDirectory>
@@ -211,7 +211,7 @@
<artifactItem>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-protocols-proxy</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/protocol-spec</outputDirectory>
@@ -220,7 +220,7 @@
<artifactItem>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-tools-thrift</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>zip</type>
<classifier>compiler-${os.classifier}</classifier>
<overWrite>true</overWrite>
diff --git a/plc4j/examples/hello-storage-elasticsearch/pom.xml b/plc4j/examples/hello-storage-elasticsearch/pom.xml
index acedd39..14b9719 100644
--- a/plc4j/examples/hello-storage-elasticsearch/pom.xml
+++ b/plc4j/examples/hello-storage-elasticsearch/pom.xml
@@ -88,6 +88,11 @@
<groupId>org.elasticsearch.plugin</groupId>
<artifactId>transport-netty4-client</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.locationtech.spatial4j</groupId>
+ <artifactId>spatial4j</artifactId>
+ <version>0.7</version>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -178,6 +183,7 @@
<usedDependency>org.apache.plc4x:plc4j-driver-s7</usedDependency>
<usedDependency>org.apache.plc4x:plc4j-driver-simulated</usedDependency>
<usedDependency>org.apache.logging.log4j:log4j-slf4j-impl</usedDependency>
+ <usedDependency>org.locationtech.spatial4j:spatial4j</usedDependency>
</usedDependencies>
</configuration>
</plugin>
diff --git a/plc4j/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java b/plc4j/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java
index 822a503..de43ea3 100644
--- a/plc4j/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java
+++ b/plc4j/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java
@@ -166,42 +166,7 @@ public class PlcConnectionAdapter implements AutoCloseable {
connection = getConnection();
PlcReadRequest readRequest = connection.readRequestBuilder().addItem(FIELD_NAME, fieldQuery).build();
PlcReadResponse readResponse = readRequest.execute().get();
- Object value = null;
- switch (clientDatatype) {
- case BOOLEAN:
- value = readResponse.getBoolean(FIELD_NAME);
- break;
- case BYTE:
- value = readResponse.getByte(FIELD_NAME);
- break;
- case SHORT:
- value = readResponse.getShort(FIELD_NAME);
- break;
- case INTEGER:
- value = readResponse.getInteger(FIELD_NAME);
- break;
- case LONG:
- value = readResponse.getLong(FIELD_NAME);
- break;
- case FLOAT:
- value = readResponse.getFloat(FIELD_NAME);
- break;
- case DOUBLE:
- value = readResponse.getDouble(FIELD_NAME);
- break;
- case STRING:
- value = readResponse.getString(FIELD_NAME);
- break;
- case TIME:
- value = readResponse.getTime(FIELD_NAME);
- break;
- case DATE:
- value = readResponse.getDate(FIELD_NAME);
- break;
- case DATE_TIME:
- value = readResponse.getDateTime(FIELD_NAME);
- break;
- }
+ Object value = readResponse.getObject(FIELD_NAME);
if (value != null) {
if (genericDatatype.isAssignableFrom(value.getClass())) {
return (T) value;
diff --git a/plc4j/integrations/logstash-plugin/pom.xml b/plc4j/integrations/logstash-plugin/pom.xml
index d2672c0..2e63e6a 100644
--- a/plc4j/integrations/logstash-plugin/pom.xml
+++ b/plc4j/integrations/logstash-plugin/pom.xml
@@ -17,7 +17,9 @@
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">
+<project 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"
+ xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -38,7 +40,7 @@
<build>
<plugins>
<!--
- As ruby and gem seem to have problems wirh Maven SNAPSHOT versions,
+ As ruby and gem seem to have problems with Maven SNAPSHOT versions,
calculate how the version would be without the "SNAPSHOT" prefix and
make this available in the property "current-full-version".
-->
@@ -59,7 +61,7 @@
def currentVersion = project.version as String
def match = (currentVersion =~ /(\d+)\.(\d+)\.(\d+)(-SNAPSHOT)?/)
print "\nCurrent version: " + currentVersion
- if(match.count >= 1) {
+ if(match.count >= 1) {
def majorVersion = match[0][1] as Integer
def minorVersion = match[0][2] as Integer
def bugfixVersion = match[0][3] as Integer
diff --git a/plc4j/karaf-features/karaf-itest/pom.xml b/plc4j/karaf-features/karaf-itest/pom.xml
index 8349ea3..04a3d3f 100644
--- a/plc4j/karaf-features/karaf-itest/pom.xml
+++ b/plc4j/karaf-features/karaf-itest/pom.xml
@@ -18,12 +18,13 @@
-->
<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>
- <artifactId>karaf-features</artifactId>
<groupId>org.apache.plc4x</groupId>
- <version>0.5.1-SNAPSHOT</version>
+ <artifactId>karaf-features</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>karaf-itest</artifactId>
diff --git a/pom.xml b/pom.xml
index 0142d62..75bce13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,11 +108,11 @@
<asm.version>5.0.4</asm.version>
<assertj.version>3.11.1</assertj.version>
<bouncycastle.version>1.60</bouncycastle.version>
- <boost.version>1.70.0</boost.version>
- <boost.version.underline-short>1_70</boost.version.underline-short>
+ <boost.version>1.71.0</boost.version>
+ <boost.version.underline-short>1_71</boost.version.underline-short>
<boost.version.underline>${boost.version.underline-short}_0</boost.version.underline>
<byte-buddy.version>1.9.10</byte-buddy.version>
- <cmake-version>3.14.5</cmake-version>
+ <cmake-version>3.15.4</cmake-version>
<commons-codec.version>1.12</commons-codec.version>
<commons-collections4.version>4.1</commons-collections4.version>
<commons-configuration2.version>2.6</commons-configuration2.version>
@@ -145,7 +145,7 @@
<log4j.version>2.11.1</log4j.version>
<logback.version>1.2.3</logback.version>
<logstash.version>7.4.0</logstash.version>
- <lucene.version>8.0.0</lucene.version>
+ <lucene.version>8.2.0</lucene.version>
<metrics-core.version>3.1.2</metrics-core.version>
<mockito.version>2.24.5</mockito.version>
<netty.version>4.1.39.Final</netty.version>
@@ -157,7 +157,7 @@
<spock-reports.version>1.6.1</spock-reports.version>
<spock.version>1.2-groovy-2.5</spock.version>
<t-digest.version>3.2</t-digest.version>
- <thrift.version>0.12.0</thrift.version>
+ <thrift.version>0.13.0</thrift.version>
<xmlunit.version>2.6.3</xmlunit.version>
<!-- Site properties -->
diff --git a/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConfigKeys.java b/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConfigKeys.java
index ccdf39b..ecce008 100644
--- a/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConfigKeys.java
+++ b/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConfigKeys.java
@@ -18,6 +18,7 @@
package org.apache.plc4x.java.streampipes.bacnetip.config;
public class ConfigKeys {
+
final static String KAFKA_HOST = "SP_KAFKA_HOST";
final static String KAFKA_PORT = "SP_KAFKA_PORT";
diff --git a/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConnectWorkerConfig.java b/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConnectWorkerConfig.java
index 64357f0..2892a94 100644
--- a/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConnectWorkerConfig.java
+++ b/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConnectWorkerConfig.java
@@ -38,7 +38,6 @@ public enum ConnectWorkerConfig {
config.register(ConfigKeys.CONNECT_CONTAINER_MASTER_PORT, Config.MASTER_PORT, "The port of the connect container");
config.register(ConfigKeys.CONNECT_CONTAINER_MASTER_HOST, Config.MASTER_HOST, "The hostname of the connect container");
-
}
public String getConnectContainerWorkerUrl() {
diff --git a/src/main/script/prerequisiteCheck.groovy b/src/main/script/prerequisiteCheck.groovy
index 72a1558..97b65aa 100644
--- a/src/main/script/prerequisiteCheck.groovy
+++ b/src/main/script/prerequisiteCheck.groovy
@@ -153,8 +153,6 @@ def checkPython() {
def stdErr = new StringBuilder()
process.consumeProcessOutput(stdOut, stdErr)
process.waitForOrKill(500)
- println "StdOut: " + stdOut
- println "StrErr: " + stdErr
Matcher matcher = extractVersion(stdErr)
if(matcher.size() > 0) {
def curVersion = matcher[0][1]
diff --git a/src/site/asciidoc/developers/release.adoc b/src/site/asciidoc/developers/release.adoc
index 585bc5e..2bde5c0 100644
--- a/src/site/asciidoc/developers/release.adoc
+++ b/src/site/asciidoc/developers/release.adoc
@@ -105,7 +105,7 @@ This is the version the `develop` branch will be changed to.
The parameter `autoVersionSubmodules` will tell the release plugin to release all modules with the same version.
Otherwise we would have to define the working copy version for each module.
- mvn release:branch -P with-cpp,with-dotnet,with-java,with-proxies,with-python,with-sandbox -DbranchName=rel/{minor-version} -DautoVersionSubmodules=true
+ mvn release:branch -P with-cpp,with-dotnet,with-java,with-proxies,with-python,with-sandbox,with-boost,with-logstash -DbranchName=rel/{minor-version} -DautoVersionSubmodules=true
Per default the plugin suggests the next bugfix version as working version, however we want it to use the next minor version.
So in case of preparing the release branch for `0.5.0-SNAPSHOT` the command would be the following:
@@ -288,6 +288,13 @@ The directory structure of this directory is as follows:
./{current-full-version}/rc1/apache-plc4x-{current-full-version}-source-release.zip.sha512
----
+You can generally import the stuff, by preparing a directory structure like above locally and then using `svn import` to do the importing:
+
+----
+cd ./{current-full-version}
+svn import rc1 https://dist.apache.org/repos/dist/dev/plc4x/{current-full-version}/rc1 -m"Staging of rc1 of PLC4X {current-full-version}"
+----
+
The `KEYS` file contains the PGP public key which belongs to the private key used to sign the release artifacts.
If this is your first release be sure to add your key to this file.
diff --git a/src/site/asciidoc/index.adoc b/src/site/asciidoc/index.adoc
index 67194c5..76492b2 100644
--- a/src/site/asciidoc/index.adoc
+++ b/src/site/asciidoc/index.adoc
@@ -50,7 +50,7 @@ The major benefits of PLC4X™ over OPC-UA, from our point of view are:
- Activating OPC-UA support on existing PLCs greatly increases the load on the PLCs
- No need to pay for licenses to activate OPC-UA support
-At first we will be concentrating on providing adapters for the most widely used protocol such as:
+At first we will be concentrating on providing adapters for the most widely used protocols such as:
- icon:pause-circle[role=light-gray] BACnet
- icon:check[role=green] link:protocols/ads/index.html[Beckhoff ADS (TCP)]
@@ -81,7 +81,7 @@ a|image::apache_nifi_logo.svg[width=80%,link=https://nifi.apache.org] a|image::a
|icon:wrench[role=yellow] https://nifi.apache.org[Apache Nifi™] |icon:pause-circle[role=light-gray] https://brooklyn.apache.org[Apache Brooklyn™] |icon:pause-circle[role=light-gray] https://mynewt.apache.org[Apache Mynewt™]
|===
-Hereby greatly reducing the barriers and the learning curve for creating industrial IoT applications.
+This greatly reduces the barriers and the learning curve for creating industrial IoT applications.
=== Upcoming Conferences & Meetups
diff --git a/tools/check_sigs.sh b/tools/check_sigs.sh
index d385ba3..3cd874c 100755
--- a/tools/check_sigs.sh
+++ b/tools/check_sigs.sh
@@ -43,7 +43,7 @@ function checkFile() {
echo
echo "Checking $FILE..."
- HASH=`shasum -p -a 512 "${FILE}" | awk '{print$1}'`
+ HASH=`shasum -a 512 "${FILE}" | awk '{print$1}'`
CHECK=`cat "${FILE}.sha512"`
if [ "$HASH" != "$CHECK" ]
diff --git a/tools/download_staged_release.sh b/tools/download_staged_release.sh
index 28eec59..4726c2f 100755
--- a/tools/download_staged_release.sh
+++ b/tools/download_staged_release.sh
@@ -114,7 +114,7 @@ fi
mkdir -p ${DST_VER_DIR}
cd ${DST_VER_DIR}
-mywget ${URL}/README
+mywget ${URL}/README.md
mywget ${URL}/RELEASE_NOTES
getSignedBundle ${URL}/apache-plc4x-${VER}-source-release.zip
diff --git a/tools/thrift/pom.xml b/tools/thrift/pom.xml
index 9e17036..9afa100 100644
--- a/tools/thrift/pom.xml
+++ b/tools/thrift/pom.xml
@@ -210,6 +210,33 @@
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-boost</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4x-tools-boost</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ <classifier>lib-${os.classifier}</classifier>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/boost</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<groupId>com.googlecode.cmake-maven-project</groupId>
<artifactId>cmake-maven-plugin</artifactId>
<version>3.7.2-b1</version>
@@ -248,12 +275,9 @@
<option>-DBUILD_JAVA=OFF</option>
<option>-DBUILD_PYTHON=${thrift.with.python}</option>
<option>-DBUILD_HASKELL=OFF</option>
- <!--
- Forcefully disable Boost detection as we don't need it and
- having Boost 1.70 available breaks the Thrift build.
- Boost would be needed, if we were planning on running tests.
- -->
- <option>-DBoost_NO_BOOST_CMAKE=ON</option>
+ <!-- Tell CMake where our boost includes and libs are located -->
+ <option>-DBOOST_INCLUDEDIR=${project.build.directory}/boost/include</option>
+ <option>-DBOOST_LIBRARYDIR=${project.build.directory}/boost/lib</option>
</options>
</configuration>
</execution>
[plc4x] 02/02: - Replaced the auto-generated config files with ones
written by me (Resolving the need to reference in the LICENSE or other
resources)
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch rel/0.5
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit e409376a68518e335e8a66a8bbd88004fe9351dd
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon Oct 28 17:36:51 2019 +0100
- Replaced the auto-generated config files with ones written by me (Resolving the need to reference in the LICENSE or other resources)
---
.../java/streampipes/bacnetip/BacNetIpAdapter.java | 6 +-
.../streampipes/bacnetip/config/ConfigKeys.java | 45 ++++++-----
.../bacnetip/config/ConnectWorkerConfig.java | 94 +++++++++-------------
3 files changed, 63 insertions(+), 82 deletions(-)
diff --git a/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/BacNetIpAdapter.java b/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/BacNetIpAdapter.java
index aa9a2d8..7ba09d6 100644
--- a/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/BacNetIpAdapter.java
+++ b/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/BacNetIpAdapter.java
@@ -326,9 +326,9 @@ public class BacNetIpAdapter extends SpecificDataStreamAdapter {
.getInstance()
.add(new BacNetIpAdapter());
- String workerUrl = ConnectWorkerConfig.INSTANCE.getConnectContainerWorkerUrl();
- String masterUrl = ConnectWorkerConfig.INSTANCE.getConnectContainerMasterUrl();
- Integer workerPort = ConnectWorkerConfig.INSTANCE.getConnectContainerWorkerPort();
+ String workerUrl = ConnectWorkerConfig.getInstance().getConnectContainerWorkerUrl();
+ String masterUrl = ConnectWorkerConfig.getInstance().getConnectContainerMasterUrl();
+ Integer workerPort = ConnectWorkerConfig.getInstance().getConnectContainerWorkerPort();
new BacNetIpAdapterInit().init(workerUrl, masterUrl, workerPort);
}
diff --git a/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConfigKeys.java b/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConfigKeys.java
index ecce008..832c8a6 100644
--- a/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConfigKeys.java
+++ b/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConfigKeys.java
@@ -1,31 +1,32 @@
/*
- * Copyright 2019 FZI Forschungszentrum Informatik
- *
- * 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.
- *
- */
+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.plc4x.java.streampipes.bacnetip.config;
-public class ConfigKeys {
+public interface ConfigKeys {
- final static String KAFKA_HOST = "SP_KAFKA_HOST";
- final static String KAFKA_PORT = "SP_KAFKA_PORT";
+ String SP_KAFKA_HOST = "SP_KAFKA_HOST";
+ String SP_KAFKA_PORT = "SP_KAFKA_PORT";
- final static String CONNECT_CONTAINER_WORKER_HOST = "SP_CONNECT_CONTAINER_WORKER_HOST";
- final static String CONNECT_CONTAINER_WORKER_PORT = "SP_CONNECT_CONTAINER_WORKER_PORT";
+ String SP_CONNECT_CONTAINER_MASTER_HOST = "SP_CONNECT_CONTAINER_MASTER_HOST";
+ String SP_CONNECT_CONTAINER_MASTER_PORT = "SP_CONNECT_CONTAINER_MASTER_PORT";
- final static String CONNECT_CONTAINER_MASTER_HOST = "SP_CONNECT_CONTAINER_MASTER_HOST";
- final static String CONNECT_CONTAINER_MASTER_PORT = "SP_CONNECT_CONTAINER_MASTER_PORT";
+ String SP_CONNECT_CONTAINER_WORKER_HOST = "SP_CONNECT_CONTAINER_WORKER_HOST";
+ String SP_CONNECT_CONTAINER_WORKER_PORT = "SP_CONNECT_CONTAINER_WORKER_PORT";
}
diff --git a/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConnectWorkerConfig.java b/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConnectWorkerConfig.java
index 2892a94..ba64541 100644
--- a/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConnectWorkerConfig.java
+++ b/sandbox/streampipes-connectors/src/main/java/org/apache/plc4x/java/streampipes/bacnetip/config/ConnectWorkerConfig.java
@@ -1,83 +1,63 @@
/*
- * Copyright 2019 FZI Forschungszentrum Informatik
- *
- * 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.
- *
- */
-
+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.plc4x.java.streampipes.bacnetip.config;
import org.streampipes.config.SpConfig;
import org.streampipes.connect.init.Config;
-public enum ConnectWorkerConfig {
+public class ConnectWorkerConfig {
- INSTANCE;
+ private static ConnectWorkerConfig instance = new ConnectWorkerConfig();
+ public static ConnectWorkerConfig getInstance() {
+ return instance;
+ }
private SpConfig config;
- ConnectWorkerConfig() {
+ private ConnectWorkerConfig() {
String name = "bacnetip-connect-worker-main";
+
config = SpConfig.getSpConfig(name);
- config.register(ConfigKeys.KAFKA_HOST, "kafka", "Hostname for backend service for kafka");
- config.register(ConfigKeys.KAFKA_PORT, 9092, "Port for backend service for kafka");
+ config.register(ConfigKeys.SP_KAFKA_HOST, "kafka", "");
+ config.register(ConfigKeys.SP_KAFKA_PORT, 9092, "");
- config.register(ConfigKeys.CONNECT_CONTAINER_WORKER_PORT, Config.WORKER_PORT, "The port of the connect container");
- config.register(ConfigKeys.CONNECT_CONTAINER_WORKER_HOST, name, "The hostname of the connect container");
+ config.register(ConfigKeys.SP_CONNECT_CONTAINER_MASTER_HOST, name, "");
+ config.register(ConfigKeys.SP_CONNECT_CONTAINER_MASTER_PORT, Config.WORKER_PORT, "");
- config.register(ConfigKeys.CONNECT_CONTAINER_MASTER_PORT, Config.MASTER_PORT, "The port of the connect container");
- config.register(ConfigKeys.CONNECT_CONTAINER_MASTER_HOST, Config.MASTER_HOST, "The hostname of the connect container");
- }
+ config.register(ConfigKeys.SP_CONNECT_CONTAINER_WORKER_HOST, Config.MASTER_HOST, "");
+ config.register(ConfigKeys.SP_CONNECT_CONTAINER_WORKER_PORT, Config.MASTER_PORT, "");
- public String getConnectContainerWorkerUrl() {
- return "http://" + config.getString(ConfigKeys.CONNECT_CONTAINER_WORKER_HOST) + ":" + config.getInteger(ConfigKeys.CONNECT_CONTAINER_WORKER_PORT) + "/";
}
public String getConnectContainerMasterUrl() {
- return "http://" + config.getString(ConfigKeys.CONNECT_CONTAINER_MASTER_HOST) + ":" + config.getInteger(ConfigKeys.CONNECT_CONTAINER_MASTER_PORT) + "/";
- }
-
- public String getKafkaHost() {
- return config.getString(ConfigKeys.KAFKA_HOST);
- }
-
- public void setKafkaHost(String s) {
- config.setString(ConfigKeys.KAFKA_HOST, s);
+ return "http://" + config.getString(ConfigKeys.SP_CONNECT_CONTAINER_MASTER_HOST) + ":" +
+ config.getInteger(ConfigKeys.SP_CONNECT_CONTAINER_MASTER_PORT) + "/";
}
- public int getKafkaPort() {
- return config.getInteger(ConfigKeys.KAFKA_PORT);
- }
-
- public String getKafkaUrl() {
- return getKafkaHost() + ":" + getKafkaPort();
- }
-
- public String getConnectContainerWorkerHost() {
- return config.getString(ConfigKeys.CONNECT_CONTAINER_WORKER_HOST);
- }
-
- public Integer getConnectContainerWorkerPort() {
- return config.getInteger(ConfigKeys.CONNECT_CONTAINER_WORKER_PORT);
- }
-
- public String getConnectContainerMasterHost() {
- return config.getString(ConfigKeys.CONNECT_CONTAINER_MASTER_HOST);
+ public String getConnectContainerWorkerUrl() {
+ return "http://" + config.getString(ConfigKeys.SP_CONNECT_CONTAINER_WORKER_HOST) + ":" +
+ config.getInteger(ConfigKeys.SP_CONNECT_CONTAINER_WORKER_PORT) + "/";
}
- public Integer getConnectContainerMasterPort() {
- return config.getInteger(ConfigKeys.CONNECT_CONTAINER_MASTER_PORT);
+ public int getConnectContainerWorkerPort() {
+ return config.getInteger(ConfigKeys.SP_CONNECT_CONTAINER_WORKER_PORT);
}
}