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 2018/03/25 16:17:07 UTC
[incubator-plc4x] branch master updated (76cbe4b -> ce19c2d)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.
from 76cbe4b - Fixed some of the tests and disabled some of the others.
new d1578cc Moved the kafka initialization to later in the code
new 90c5f6e - Made sure 'logback-classic' isn't included as a compile time dependency.
new ce19c2d - Added some 'community' content to the website.
The 3 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:
.../java/examples/kafkabridge/KafkaBridge.java | 8 ++---
plc4j/protocols/benchmarks/pom.xml | 1 +
plc4j/protocols/driver-bases/base/pom.xml | 1 +
plc4j/protocols/driver-bases/raw-socket/pom.xml | 1 +
plc4j/protocols/driver-bases/serial/pom.xml | 1 +
plc4j/protocols/driver-bases/tcp/pom.xml | 1 +
plc4j/protocols/driver-bases/test/pom.xml | 1 +
plc4j/protocols/modbus/pom.xml | 1 +
plc4j/protocols/s7/pom.xml | 5 +--
pom.xml | 5 +++
src/site/asciidoc/community/conferences.adoc | 36 ++++++++++++++++++++++
.../index.adoc => community/getting-involved.adoc} | 28 ++++++++++++-----
src/site/site.xml | 4 +++
13 files changed, 77 insertions(+), 16 deletions(-)
create mode 100644 src/site/asciidoc/community/conferences.adoc
copy src/site/asciidoc/{protocols/opc-ua/index.adoc => community/getting-involved.adoc} (54%)
--
To stop receiving notification emails like this one, please contact
cdutz@apache.org.
[incubator-plc4x] 02/03: - Made sure 'logback-classic' isn't
included as a compile time dependency.
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 90c5f6ef9925e586e1077c15248d6478651f8813
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Sun Mar 25 18:16:24 2018 +0200
- Made sure 'logback-classic' isn't included as a compile time dependency.
---
plc4j/protocols/benchmarks/pom.xml | 1 +
plc4j/protocols/driver-bases/base/pom.xml | 1 +
plc4j/protocols/driver-bases/raw-socket/pom.xml | 1 +
plc4j/protocols/driver-bases/serial/pom.xml | 1 +
plc4j/protocols/driver-bases/tcp/pom.xml | 1 +
plc4j/protocols/driver-bases/test/pom.xml | 1 +
plc4j/protocols/modbus/pom.xml | 1 +
plc4j/protocols/s7/pom.xml | 5 +----
pom.xml | 5 +++++
9 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/plc4j/protocols/benchmarks/pom.xml b/plc4j/protocols/benchmarks/pom.xml
index 7eecc58..3d0a6b4 100644
--- a/plc4j/protocols/benchmarks/pom.xml
+++ b/plc4j/protocols/benchmarks/pom.xml
@@ -45,6 +45,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
diff --git a/plc4j/protocols/driver-bases/base/pom.xml b/plc4j/protocols/driver-bases/base/pom.xml
index e46a855..3c54e11 100644
--- a/plc4j/protocols/driver-bases/base/pom.xml
+++ b/plc4j/protocols/driver-bases/base/pom.xml
@@ -47,6 +47,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/plc4j/protocols/driver-bases/raw-socket/pom.xml b/plc4j/protocols/driver-bases/raw-socket/pom.xml
index 563176c..e24c6b9 100644
--- a/plc4j/protocols/driver-bases/raw-socket/pom.xml
+++ b/plc4j/protocols/driver-bases/raw-socket/pom.xml
@@ -58,6 +58,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/plc4j/protocols/driver-bases/serial/pom.xml b/plc4j/protocols/driver-bases/serial/pom.xml
index cb70a0d..d1da021 100644
--- a/plc4j/protocols/driver-bases/serial/pom.xml
+++ b/plc4j/protocols/driver-bases/serial/pom.xml
@@ -57,6 +57,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/plc4j/protocols/driver-bases/tcp/pom.xml b/plc4j/protocols/driver-bases/tcp/pom.xml
index a7b9186..be2eade 100644
--- a/plc4j/protocols/driver-bases/tcp/pom.xml
+++ b/plc4j/protocols/driver-bases/tcp/pom.xml
@@ -52,6 +52,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/plc4j/protocols/driver-bases/test/pom.xml b/plc4j/protocols/driver-bases/test/pom.xml
index 1c05750..450c7fd 100644
--- a/plc4j/protocols/driver-bases/test/pom.xml
+++ b/plc4j/protocols/driver-bases/test/pom.xml
@@ -52,6 +52,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/plc4j/protocols/modbus/pom.xml b/plc4j/protocols/modbus/pom.xml
index 5dc8759..4a908e5 100644
--- a/plc4j/protocols/modbus/pom.xml
+++ b/plc4j/protocols/modbus/pom.xml
@@ -75,6 +75,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/plc4j/protocols/s7/pom.xml b/plc4j/protocols/s7/pom.xml
index a71d552..40c5c7e 100644
--- a/plc4j/protocols/s7/pom.xml
+++ b/plc4j/protocols/s7/pom.xml
@@ -75,11 +75,8 @@
<dependency>
<groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 9c1b2f6..c16bf4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,15 +121,20 @@
<dependencyManagement>
<dependencies>
+ <!--
+ Set to provided to ensure that these jars are never automatically
+ included. If required the used still can override it if it is needed. -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>${logback.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
--
To stop receiving notification emails like this one, please contact
cdutz@apache.org.
[incubator-plc4x] 03/03: - Added some 'community' content to the
website.
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit ce19c2dd40c78a6dd9582ac2da3ec45d66b6e2a4
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Sun Mar 25 18:16:51 2018 +0200
- Added some 'community' content to the website.
---
src/site/asciidoc/community/conferences.adoc | 36 +++++++++++++++++++
src/site/asciidoc/community/getting-involved.adoc | 42 +++++++++++++++++++++++
src/site/site.xml | 4 +++
3 files changed, 82 insertions(+)
diff --git a/src/site/asciidoc/community/conferences.adoc b/src/site/asciidoc/community/conferences.adoc
new file mode 100644
index 0000000..9e14a8d
--- /dev/null
+++ b/src/site/asciidoc/community/conferences.adoc
@@ -0,0 +1,36 @@
+//
+// 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.
+//
+
+== Conferences
+
+On this page we are listing options to attend talks dealing with PLC4X.
+
+[width="100%",cols="4,^2,^2,^3,3",options="header"]
+|=========================================================
+|Date |Location |Event |Title |Speaker
+
+|5th April 2018 |Hamburg |https://techcamp.hamburg/[TechCamp Hamburg] |https://techcamp.hamburg/events/revolutionizing-industrial-iot-with-apache-plc4x/[Revolutionizing Industrial IoT with Apache PLC4X] |Christofer Dutz
+
+|4th June 2018 |Colone |https://www.buildingiot.de/[Building IoT] |https://www.buildingiot.de/veranstaltung-6815-industrial-iot-und-edge-computing-mit-apache-plc4x-und-apache-edgent-%5Bsponsored-talk%5D.html?id=6815[Industrial IoT und Edge Computing mit Apache PLC4X und Apache Edgent] |Christofer Dutz
+
+|13th-14th June 2018 |Berlin |http://www.apachecon.com/euroadshow18/#[Apache EU Roadshow] |Revolutionizing the production industry with Apache PLC4X |Christofer Dutz
+
+|=========================================================
+
+Looking forward to meeting you.
+
+If you've got or found any talks we might be missing, please inform us on dev@plc4x.apache.org.
diff --git a/src/site/asciidoc/community/getting-involved.adoc b/src/site/asciidoc/community/getting-involved.adoc
new file mode 100644
index 0000000..ac8420a
--- /dev/null
+++ b/src/site/asciidoc/community/getting-involved.adoc
@@ -0,0 +1,42 @@
+//
+// 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.
+//
+
+== Getting Involved
+
+Being a fairly fresh project we know there is a lot to do.
+If you are looking for a way to get involved, we have compiled a list of areas, where we are looking for help.
+
+If you find something you think you could help out with, please come forward and introduce yourself and tell us about your plans on our mailinglist: dev@plc4x.apache.org.
+
+Possible Areas of contribution (These are the ones we discussed, but this list is definitely not complete):
+
+* Protocol Implementations:
+** OPC-UA
+** Modbus
+** Profinet
+** ...
+* Integrations:
+** Kafka Connect
+** ...
+* Languages:
+** Scala (Maybe just a wrapper)
+** C
+** C++
+** C#
+** JavaScript
+** TypeScript
+** ...
diff --git a/src/site/site.xml b/src/site/site.xml
index 5a5bba9..74c2aaa 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -88,6 +88,10 @@
<head>
</head>
+ <menu name="Community">
+ <item name="Getting Involved" href="community/help-wanted.adoc"/>
+ <item name="Conferences" href="community/conferences.adoc"/>
+ </menu>
<menu name="Users">
<item name="Getting Started" href="users/gettingstarted.html"/>
<item name="Industry 4.0 with Apache" href="users/industry40.html"/>
--
To stop receiving notification emails like this one, please contact
cdutz@apache.org.
[incubator-plc4x] 01/03: Moved the kafka initialization to later in
the code
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit d1578cc0453cfd5c33acc2d473933f99ac4aa19b
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Sun Mar 25 18:14:39 2018 +0200
Moved the kafka initialization to later in the code
---
.../org/apache/plc4x/java/examples/kafkabridge/KafkaBridge.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/examples/kafka-bridge/src/main/java/org/apache/plc4x/java/examples/kafkabridge/KafkaBridge.java b/examples/kafka-bridge/src/main/java/org/apache/plc4x/java/examples/kafkabridge/KafkaBridge.java
index e299c02..0a223ce 100644
--- a/examples/kafka-bridge/src/main/java/org/apache/plc4x/java/examples/kafkabridge/KafkaBridge.java
+++ b/examples/kafka-bridge/src/main/java/org/apache/plc4x/java/examples/kafkabridge/KafkaBridge.java
@@ -71,12 +71,7 @@ public class KafkaBridge {
DirectProvider dp = new DirectProvider();
Topology top = dp.newTopology("kafka-bridge");
- // Create the Kafka Producer broker connector
- Map<String,Object> kafkaConfig = createKafkaConfig();
- KafkaProducer kafka = new KafkaProducer(top, () -> kafkaConfig);
-
Map<String, ReadRequestItem> readRequestItems = new HashMap<>();
-
for(Address address : config.getPlcConfig().getAddresses()) {
try {
org.apache.plc4x.java.api.model.Address plcAddress = plcAdapter.parseAddress(address.getAddress());
@@ -97,6 +92,9 @@ public class KafkaBridge {
TStream<String> stringSource = source.map(value -> Byte.toString(value));
// Publish the stream to the topic. The String tuple is the message value.
+ // Create the Kafka Producer broker connector
+ Map<String,Object> kafkaConfig = createKafkaConfig();
+ KafkaProducer kafka = new KafkaProducer(top, () -> kafkaConfig);
kafka.publish(stringSource, config.getKafkaConfig().getTopicName());
dp.submit(top);
--
To stop receiving notification emails like this one, please contact
cdutz@apache.org.