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/05/07 12:41:59 UTC
[plc4x] 02/02: - Merged changes from develop ...
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/code-gen
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 06b3ac7747c3eba088e7846b17650041e2306907
Merge: 78bd51d dbaab76
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Tue May 7 14:41:46 2019 +0200
- Merged changes from develop ...
Jenkinsfile | 4 +-
README | 2 +-
integrations/apache-brooklyn/pom.xml | 40 ---
plc4cpp/CMakeLists.txt | 7 +-
plc4cpp/{ => examples}/CMakeLists.txt | 15 +-
.../examples}/pom.xml | 41 +--
plc4cpp/{ => integrations}/CMakeLists.txt | 16 +-
.../apache-mynewt}/CMakeLists.txt | 15 +-
.../integrations}/apache-mynewt/pom.xml | 6 +-
.../edgex-foundry}/CMakeLists.txt | 15 +-
.../integrations/edgex-foundry}/pom.xml | 34 +-
{integrations => plc4cpp/integrations}/pom.xml | 14 +-
plc4cpp/pom.xml | 3 +
{examples => plc4j/examples}/dummy-driver/pom.xml | 6 +-
.../java/examples/dummydriver/DummyDriver.java | 4 +-
.../dummydriver/connection/DummyConnection.java | 0
.../examples/dummydriver/model/DummyField.java | 0
.../examples/dummydriver/netty/DummyProtocol.java | 0
.../services/org.apache.plc4x.java.spi.PlcDriver | 0
.../examples}/hello-cloud-azure/pom.xml | 6 +-
.../java/examples/cloud/azure/CliOptions.java | 0
.../cloud/azure/S7PlcToAzureIoTHubSample.java | 0
.../examples}/hello-cloud-google/README.md | 0
.../examples}/hello-cloud-google/pom.xml | 6 +-
.../java/examples/cloud/google/CliOptions.java | 0
.../cloud/google/S7PlcToGoogleIoTCoreSample.java | 0
.../src/main/resources/logback.xml | 0
.../hello-connectivity-kafka/kafka-connector.yml | 0
.../examples}/hello-connectivity-kafka/pom.xml | 6 +-
.../examples}/hello-connectivity-kafka/server.sh | 0
.../connectivity/kafka/KafkaConnector.java | 0
.../connectivity/kafka/model/Configuration.java | 0
.../connectivity/kafka/model/KafkaConfig.java | 0
.../connectivity/kafka/model/PlcConfig.java | 0
.../connectivity/kafka/model/PlcFieldConfig.java | 0
.../connectivity/kafka/model/PlcMemoryBlock.java | 0
.../src/main/resources/logback.xml | 0
.../hello-connectivity-mqtt/mqtt-connector.yml | 0
.../examples}/hello-connectivity-mqtt/pom.xml | 6 +-
.../examples/connectivity/mqtt/MqttConnector.java | 0
.../connectivity/mqtt/model/Configuration.java | 0
.../connectivity/mqtt/model/MqttConfig.java | 0
.../connectivity/mqtt/model/PlcConfig.java | 0
.../connectivity/mqtt/model/PlcFieldConfig.java | 0
.../connectivity/mqtt/model/PlcMemoryBlock.java | 0
.../src/main/resources/logback.xml | 0
.../examples}/hello-integration-edgent/pom.xml | 6 +-
.../examples/integration/edgent/CliOptions.java | 0
.../examples/integration/edgent/PlcLogger.java | 0
.../src/main/resources/logback.xml | 0
{examples => plc4j/examples}/hello-opm/pom.xml | 6 +-
.../plc4x/java/examples/helloopm/HelloOpm.java | 0
.../hello-opm/src/main/resources/logback.xml | 0
.../hello-storage-elasticsearch/README.adoc | 0
.../examples}/hello-storage-elasticsearch/pom.xml | 6 +-
.../elasticsearch/ElasticsearchStorage.java | 0
.../src/main/resources/log4j2.xml | 0
.../src/main/resources/logback.xml | 0
.../examples}/hello-webapp/client/pom.xml | 17 +-
.../client/src/main/royale/HelloPLC4X.mxml | 0
.../client/src/main/royale/service/RobotService.as | 0
{examples => plc4j/examples}/hello-webapp/pom.xml | 6 +-
.../examples}/hello-webapp/service/pom.xml | 6 +-
.../robot/controllers/RobotController.java | 0
.../examples}/hello-webapp/webapp/pom.xml | 16 +-
.../apache/plc4x/examples/robot/Application.java | 0
.../src/main/resources/application.properties | 0
.../examples}/hello-world-plc4x/pom.xml | 6 +-
.../plc4x/java/examples/helloplc4x/CliOptions.java | 0
.../plc4x/java/examples/helloplc4x/HelloPlc4x.java | 0
.../src/main/resources/logback.xml | 0
{examples => plc4j/examples}/pom.xml | 36 +--
.../integrations}/apache-calcite/pom.xml | 6 +-
.../main/java/org/apache/plc4x/Plc4xBaseTable.java | 0
.../main/java/org/apache/plc4x/Plc4xSchema.java | 0
.../java/org/apache/plc4x/Plc4xSchemaFactory.java | 0
.../java/org/apache/plc4x/Plc4xStreamTable.java | 0
.../src/main/java/org/apache/plc4x/Plc4xTable.java | 0
.../java/org/apache/plc4x/DriverManagerTest.java | 0
.../java/org/apache/plc4x/Plc4XBaseTableTest.java | 0
.../org/apache/plc4x/Plc4xSchemaFactoryTest.java | 2 -
.../apache-calcite/src/test/resources/example.yml | 0
.../apache-calcite}/src/test/resources/logback.xml | 0
.../apache-calcite/src/test/resources/model.json | 0
.../integrations}/apache-camel/pom.xml | 7 +-
.../apache-camel/src/main/docs/PLC4X.adoc | 0
.../java/org/apache/plc4x/camel/Constants.java | 0
.../org/apache/plc4x/camel/Plc4XComponent.java | 0
.../java/org/apache/plc4x/camel/Plc4XConsumer.java | 0
.../java/org/apache/plc4x/camel/Plc4XEndpoint.java | 0
.../apache/plc4x/camel/Plc4XPollingConsumer.java | 0
.../java/org/apache/plc4x/camel/Plc4XProducer.java | 0
.../services/org/apache/camel/component/plc4x | 0
.../java/org/apache/plc4x/camel/ConstantsTest.java | 0
.../java/org/apache/plc4x/camel/ManualTest.java | 0
.../java/org/apache/plc4x/camel/MockDriver.java | 0
.../org/apache/plc4x/camel/Plc4XComponentTest.java | 0
.../org/apache/plc4x/camel/Plc4XConsumerTest.java | 0
.../org/apache/plc4x/camel/Plc4XEndpointTest.java | 0
.../plc4x/camel/Plc4XPollingConsumerTest.java | 0
.../org/apache/plc4x/camel/Plc4XProducerTest.java | 0
.../services/org.apache.plc4x.java.spi.PlcDriver | 0
.../src/test/resources/log4j2.properties | 0
.../apache-camel}/src/test/resources/logback.xml | 0
.../integrations}/apache-edgent/pom.xml | 7 +-
.../apache/plc4x/edgent/PlcConnectionAdapter.java | 0
.../java/org/apache/plc4x/edgent/PlcFunctions.java | 0
.../java/org/apache/plc4x/edgent/package-info.java | 0
.../plc4x/edgent/PlcConnectionAdapterTest.java | 0
.../org/apache/plc4x/edgent/PlcFunctionsTest.java | 0
.../apache/plc4x/edgent/mock/MockConnection.java | 0
.../org/apache/plc4x/edgent/mock/MockDriver.java | 4 +-
.../org/apache/plc4x/edgent/mock/MockField.java | 0
.../apache/plc4x/edgent/mock/MockFieldHandler.java | 0
.../apache/plc4x/edgent/mock/MockFieldItem.java | 0
.../services/org.apache.plc4x.java.spi.PlcDriver | 0
.../integrations}/apache-kafka/README.md | 0
.../apache-kafka/config/sink.properties | 0
.../apache-kafka/config/source.properties | 0
.../integrations}/apache-kafka/pom.xml | 7 +-
.../org/apache/plc4x/kafka/Plc4xSinkConnector.java | 5 +-
.../java/org/apache/plc4x/kafka/Plc4xSinkTask.java | 0
.../apache/plc4x/kafka/Plc4xSourceConnector.java | 3 +-
.../org/apache/plc4x/kafka/Plc4xSourceTask.java | 0
.../org/apache/plc4x/kafka/util/VersionUtil.java | 0
.../apache-karaf/karaf-ads-feature/pom.xml | 15 +-
.../apache-karaf/karaf-demo-server/pom.xml | 28 +-
.../apache-karaf/karaf-ethernet-ip-feature/pom.xml | 15 +-
.../apache-karaf/karaf-modbus-feature/pom.xml | 15 +-
.../apache-karaf/karaf-s7-feature/pom.xml | 15 +-
.../apache-karaf/karaf-simulated-feature/pom.xml | 15 +-
.../integrations}/apache-karaf/pom.xml | 15 +-
.../apache-nifi/nifi-plc4x-nar/false-positives.xml | 0
.../apache-nifi/nifi-plc4x-nar/pom.xml | 23 +-
.../apache-nifi/nifi-plc4x-processors/pom.xml | 6 +-
.../org/apache/plc4x/nifi/BasePlc4xProcessor.java | 0
.../org/apache/plc4x/nifi/Plc4xSinkProcessor.java | 0
.../apache/plc4x/nifi/Plc4xSourceProcessor.java | 0
.../services/org.apache.nifi.processor.Processor | 0
.../plc4x4nifi/Plc4xSinkProcessorTest.java | 0
.../plc4x4nifi/Plc4xSourceProcessorTest.java | 0
.../integrations}/apache-nifi/pom.xml | 6 +-
.../integrations}/pom.xml | 42 +--
plc4j/pom.xml | 296 +++++++++++++++++
plc4j/protocols/delta-v/pom.xml | 15 +
.../python/org/apache/plc4x/PlcDriverManager.py | 1 +
.../org/apache/plc4x/test_PlcDriverManager.py | 3 +-
pom.xml | 353 +--------------------
tools/thrift/src/assembly/python.xml | 7 +
149 files changed, 620 insertions(+), 642 deletions(-)