This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch PLC4X-12 in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 5e46624c2642bee7cfb7cbab409389e3cedba7aa Merge: b6b345f 6f151c8 Author: Christofer Dutz <christofer.d...@c-ware.de> AuthorDate: Mon Dec 25 19:26:18 2017 +0100 Merge branches 'PLC4X-12' and 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into PLC4X-12 .gitignore | 4 + LICENSE | 202 ++++++++ .../protocols/s7 => applications/iotree}/pom.xml | 37 +- .../plc4x/java/applications/iotree/IoTree.java | 105 ++++ .../iotree/src/main/resources/logback.xml | 40 +- .../{es-edgent-logger => plclogger}/pom.xml | 37 +- .../java/applications/plclogger/PlcLogger.java | 99 ++++ .../plclogger/src/main/resources/logback.xml | 40 +- applications/pom.xml | 62 ++- integrations/apache-brooklyn/pom.xml | 2 +- integrations/apache-camel/pom.xml | 129 ++++- .../apache-camel/src/main/docs/PLC4X.adoc | 6 +- .../java/org/apache/plc4x/camel/Constants.java | 10 +- .../org/apache/plc4x/camel/PLC4XComponent.java | 22 +- .../java/org/apache/plc4x/camel/PLC4XEndpoint.java | 62 +++ .../java/org/apache/plc4x/camel/PLC4XProducer.java | 110 +++++ .../services/org/apache/camel/component/plc4x | 2 +- .../java/org/apache/plc4x/camel}/MockDriver.java | 21 +- .../org/apache/plc4x/camel/PLC4XComponentTest.java | 54 ++ .../services/org.apache.plc4x.java.api.PlcDriver | 2 +- .../src/test/resources/log4j2.properties | 7 +- integrations/apache-edgent/pom.xml | 44 +- .../apache/plc4x/edgent/PlcConnectionAdapter.java | 200 ++++++++ .../java/org/apache/plc4x/edgent/PlcFunctions.java | 188 +++++++ .../java/org/apache/plc4x/edgent/package-info.java | 10 +- .../plc4x/edgent/PlcConnectionAdapterTest.java | 544 +++++++++++++++++++++ .../org/apache/plc4x/edgent/PlcFunctionsTest.java | 155 ++++++ .../org/apache/plc4x/edgent/mock/MockAddress.java | 50 +- .../apache/plc4x/edgent/mock/MockConnection.java | 147 ++++++ .../org/apache/plc4x/edgent}/mock/MockDriver.java | 14 +- .../services/org.apache.plc4x.java.api.PlcDriver | 2 +- integrations/apache-mynewt/pom.xml | 2 +- integrations/pom.xml | 2 +- plc4c/pom.xml | 2 +- plc4j/api/pom.xml | 2 +- .../org/apache/plc4x/java/{ => api}/PlcDriver.java | 8 +- .../authentication/PlcAuthentication.java | 2 +- .../PlcUsernamePasswordAuthentication.java | 2 +- .../api/connection/AbstractPlcConnection.java} | 37 +- .../java/{ => api}/connection/PlcConnection.java | 29 +- .../plc4x/java/{ => api}/connection/PlcLister.java | 2 +- .../plc4x/java/{ => api}/connection/PlcReader.java | 10 +- .../plc4x/java/{ => api}/connection/PlcWriter.java | 10 +- .../exceptions/PlcConnectionException.java | 2 +- .../java/{ => api}/exceptions/PlcException.java | 2 +- .../java/{ => api}/exceptions/PlcIoException.java | 2 +- .../{ => api}/exceptions/PlcProtocolException.java | 2 +- .../plc4x/java/{ => api}/messages/PlcMessage.java | 2 +- .../plc4x/java/api/messages/PlcReadRequest.java | 62 +++ .../plc4x/java/api/messages/PlcReadResponse.java} | 23 +- .../plc4x/java/{ => api}/messages/PlcRequest.java | 2 +- .../java/api/messages}/PlcRequestContainer.java | 5 +- .../plc4x/java/{ => api}/messages/PlcResponse.java | 2 +- .../plc4x/java/api/messages/PlcWriteRequest.java | 61 +++ .../plc4x/java/api/messages/PlcWriteResponse.java} | 23 +- .../messages/items/ReadRequestItem.java} | 26 +- .../java/api/messages/items/ReadResponseItem.java} | 33 +- .../messages/items/WriteRequestItem.java} | 32 +- .../api/messages/items/WriteResponseItem.java} | 23 +- .../java/{messages => api/model}/Address.java | 2 +- .../types/ResponseCode.java} | 11 +- .../plc4x/java/messages/PlcSimpleReadRequest.java | 39 -- .../plc4x/java/messages/PlcSimpleReadResponse.java | 45 -- .../plc4x/java/messages/PlcSimpleWriteRequest.java | 46 -- .../java/messages/PlcSimpleWriteResponse.java | 38 -- .../org/apache/plc4x/java/types/BooleanValue.java | 23 - .../org/apache/plc4x/java/types/ByteValue.java | 23 - .../org/apache/plc4x/java/types/IntegerValue.java | 23 - .../org/apache/plc4x/java/types/StringValue.java | 23 - plc4j/api/src/site/asciidoc/design.adoc | 51 ++ plc4j/core/pom.xml | 4 +- .../org/apache/plc4x/java/PlcDriverManager.java | 39 +- .../apache/plc4x/java/PlcDriverManagerTest.java | 6 +- .../apache/plc4x/java/mock/DoubleMockDriver.java | 8 +- .../org/apache/plc4x/java/mock/MockConnection.java | 18 +- .../org/apache/plc4x/java/mock/MockDriver.java | 8 +- ...cDriver => org.apache.plc4x.java.api.PlcDriver} | 0 ...cDriver => org.apache.plc4x.java.api.PlcDriver} | 0 plc4j/pom.xml | 17 +- plc4j/protocols/pom.xml | 2 +- plc4j/protocols/s7-utils/pom.xml | 2 +- .../apache/plc4x/java/s7/utils/PcapGenerator.java | 2 +- plc4j/protocols/s7/pom.xml | 30 +- .../java/isoontcp/mina/IsoOnTcpFilterAdapter.java | 118 ----- .../java/isoontcp/netty/IsoOnTcpProtocol.java | 98 ++++ .../isoontcp/netty/model/IsoOnTcpMessage.java} | 16 +- .../plc4x/java/isotp/mina/IsoTPFilterAdapter.java | 377 -------------- .../plc4x/java/isotp/netty/IsoTPProtocol.java | 358 ++++++++++++++ .../isotp/{mina => netty}/model/IsoTPMessage.java | 10 +- .../model/params/CalledTsapParameter.java | 6 +- .../model/params/CallingTsapParameter.java | 6 +- .../model/params/ChecksumParameter.java | 4 +- .../DisconnectAdditionalInformationParameter.java | 4 +- .../{mina => netty}/model/params/Parameter.java | 4 +- .../model/params/TpduSizeParameter.java | 6 +- .../model/params/TsapParameter.java | 4 +- .../model/tpdus/ConnectionConfirmTpdu.java | 12 +- .../model/tpdus/ConnectionRequestTpdu.java | 12 +- .../model/tpdus/ConnectionTpdu.java | 12 +- .../{mina => netty}/model/tpdus/DataTpdu.java | 10 +- .../model/tpdus/DisconnectConfirmTpdu.java | 10 +- .../model/tpdus/DisconnectRequestTpdu.java | 12 +- .../model/tpdus/DisconnectTpdu.java | 10 +- .../{mina => netty}/model/tpdus/ErrorTpdu.java | 12 +- .../isotp/{mina => netty}/model/tpdus/Tpdu.java | 12 +- .../{mina => netty}/model/types/DeviceGroup.java | 2 +- .../model/types/DisconnectReason.java | 2 +- .../{mina => netty}/model/types/ParameterCode.java | 2 +- .../{mina => netty}/model/types/ProtocolClass.java | 2 +- .../{mina => netty}/model/types/RejectCause.java | 2 +- .../{mina => netty}/model/types/TpduCode.java | 2 +- .../{mina => netty}/model/types/TpduSize.java | 2 +- .../apache/plc4x/java/{mina => netty}/Message.java | 10 +- .../events/S7ConnectionEvent.java} | 18 +- .../java/netty/events/S7ConnectionState.java} | 8 +- .../java/org/apache/plc4x/java/s7/S7PlcDriver.java | 19 +- .../plc4x/java/s7/connection/S7PlcConnection.java | 180 ++++--- .../plc4x/java/s7/mina/Plc4XS7FilterAdapter.java | 192 -------- .../apache/plc4x/java/s7/mina/S7FilterAdapter.java | 367 -------------- .../s7/mina/model/payloads/ReadVarPayload.java | 48 -- .../org/apache/plc4x/java/s7/model/S7Address.java | 4 +- .../apache/plc4x/java/s7/model/S7BitAddress.java | 2 +- .../plc4x/java/s7/model/S7DataBlockAddress.java | 2 +- .../plc4x/java/s7/netty/Plc4XS7Protocol.java | 389 +++++++++++++++ .../org/apache/plc4x/java/s7/netty/S7Protocol.java | 408 ++++++++++++++++ .../{mina => netty}/model/messages/S7Message.java | 12 +- .../model/messages/S7RequestMessage.java | 8 +- .../model/messages/S7ResponseMessage.java | 8 +- .../messages/SetupCommunicationRequestMessage.java | 6 +- .../model/params/CpuServicesParameter.java} | 15 +- .../{mina => netty}/model/params/S7Parameter.java | 4 +- .../model/params/SetupCommunicationParameter.java | 4 +- .../model/params/VarParameter.java} | 24 +- .../model/params/items/S7AnyVarParameterItem.java} | 14 +- .../model/params/items/VarParameterItem.java} | 6 +- .../{mina => netty}/model/payloads/S7Payload.java | 4 +- .../model/payloads/VarPayload.java} | 28 +- .../model/payloads/items/VarPayloadItem.java} | 19 +- .../model/types/DataTransportErrorCode.java | 7 +- .../model/types/DataTransportSize.java | 2 +- .../model/types/HeaderErrorClass.java | 2 +- .../s7/{mina => netty}/model/types/MemoryArea.java | 2 +- .../{mina => netty}/model/types/MessageType.java | 2 +- .../model/types/ParameterError.java | 2 +- .../{mina => netty}/model/types/ParameterType.java | 5 +- .../model/types/SpecificationType.java | 2 +- .../{mina => netty}/model/types/TransportSize.java | 2 +- .../model/types/VariableAddressingMode.java | 2 +- ...cDriver => org.apache.plc4x.java.api.PlcDriver} | 0 plc4j/protocols/s7/src/site/asciidoc/index.adoc | 83 +++- .../java/isoontcp/netty/IsoOnTcpProtocolTest.java | 161 ++++++ .../plc4x/java/isotp/netty/IsoTPProtocolTest.java} | 20 +- .../apache/plc4x/java/netty/NettyTestBase.java} | 7 +- .../org/apache/plc4x/java/s7/S7PlcDriverTest.java | 81 +-- .../apache/plc4x/java/s7/S7PlcReaderSample.java | 99 ++++ .../org/apache/plc4x/java/s7/S7PlcScanner.java | 87 ++++ .../org/apache/plc4x/java/s7/S7PlcTestConsole.java | 79 +++ .../apache/plc4x/java/s7/S7PlcWriterSample.java | 69 +++ .../plc4x/java/s7/netty/Plc4XS7ProtocolTest.java} | 20 +- .../plc4x/java/s7/netty/S7ProtocolTest.java} | 20 +- .../protocols/s7/src/test/resources/logback.xml | 40 +- plc4j/protocols/utils/pom.xml | 2 +- plc4j/src/site/asciidoc/index.adoc | 121 +++++ plc4s/pom.xml | 2 +- pom.xml | 129 ++++- src/site/asciidoc/development/website.adoc | 177 +++++++ src/site/asciidoc/incubation-proposal.adoc | 227 +++++++++ src/site/asciidoc/index.adoc | 2 +- .../protocols/{opc-ua => ehtercat}/index.adoc | 14 +- src/site/asciidoc/protocols/features.adoc | 2 +- src/site/asciidoc/protocols/index.adoc | 9 +- src/site/asciidoc/protocols/modbus/index.adoc | 4 +- src/site/asciidoc/protocols/opc-ua/index.adoc | 4 +- src/site/asciidoc/protocols/s7/index.adoc | 93 ++-- src/site/resources/css/site.css | 3 +- src/site/site.xml | 24 +- 176 files changed, 5629 insertions(+), 2181 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@plc4x.apache.org" <commits@plc4x.apache.org>.