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 2017/12/27 13:33:20 UTC
[incubator-plc4x] branch PLC4X-12 updated (b6b345f -> b85290a)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch PLC4X-12
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.
from b6b345f Move conversions between Java and Scala API objects to separate file
add ac655f6 Add equals, hashCode and toString to AbstractValue
add ef10028 #3 Make Value implementations immutable
add 4fa633d !4 Make connection closable
add 86fde75 Merge branch '4-make-connection-closable' into 'master'
add 628569c Merge branch 'master' into 2-add-equals-hashcode-and-tostring-implementations-to-value-implementations
add 0ad6734 Merge branch '2-add-equals-hashcode-and-tostring-implementations-to-value-implementations' into 'master'
add 763ebcf Values should not be constructed with wrapped null values
add 34cfb61 - Made the connection send out the "connection close request" upon connection close.
add aaacab7 Merge branches 'master' and 'task/abstractvalue-input-parameter-check' of https://gitlab.codecentric.de/iot/plc4x into task/abstractvalue-input-parameter-check
add 392af98 Merge branch 'task/abstractvalue-input-parameter-check' into 'master'
add 6197899 - Added a draft notice to the generated site
add 17c1645 - Added a draft notice to the generated site
add 405c904 - Added a draft notice to the generated site
add 9a7af46 - Updated Siemens Protocol chart
add 9975d1d - First implementation of an Edgent based stream reading from a PLC
add 0aaa677 - Moved all the api classes into an api package to avoid split packages which could cause problems with java 9
add abb4601 - Added the Apache header to the logback config.
add ae2d2e8 Compile patterns only once
add cee63c5 Merge branch 'task/compile-patterns-only-once' into 'master'
add 08d2df3 - Added a document on design principals
add ead7f91 - Made the connection return reader, writer and lister optionals
add e73f922 - Fixed an obvious logic error
add 047ef63 - Changed the PlcLogger to the changes in the PlcConnection api.
add 1b44b95 initial camel component implementation
add fa9615f Refactor s7 to Netty
add 4f08570 - Added the incubation proposal to the project site
add df5a7a8 Finished converting PLC4X to use Netty instead of Mina
add f59f780 - Added a workaround to the site generation that caused all diagram images of asciidoctor diagrams to be generated in the root modules site/img directory (This requires a double execution of asciidoctor so this is just a workaround that should be fixed as soon as possible)
add 373fc60 - Increased each headline by one level as the HTML backend doesn't seem to like using Level 0 (With only one "=") - Added some more documentation on the S7 implementation.
add 37d3938 - Greatly refactored the API - Removed the usage of the "Value" types - Added a SendReadRequest/Response and SendWriteRequest/Response message type for every supported datatype. - Made the connection auto connect as part of the "Driver.getConnection" logic - Fixed a big concurrency bug in my Netty version of the S7 driver
add 0f13c59 - Added a profile for creating executable jars which contain all dependencies for the "applications" module.
add e0e4a7e - Fixed the groupId to the correct one (thanks to Dale for finding this) ;-)
add fba3006 - Fixed the groupId to the correct one (thanks to Dale for finding this) ;-)
add 40e825d Merge branches '5-add-camel-integration-camel-consumer-producer' and 'master' of https://gitlab.codecentric.de/iot/plc4x into 5-add-camel-integration-camel-consumer-producer
add 2f76655 Merge branches '5-add-camel-integration-camel-consumer-producer' and 'master' of https://gitlab.codecentric.de/iot/plc4x into 5-add-camel-integration-camel-consumer-producer
add b27914b Updated documentation on the S7 protocol implementation.
add 0c3f32c .gitignore additions for Eclipse and Emacs
add 71436e6 Merge remote-tracking branch 'origin/master'
add d43c0a8 Merge remote-tracking branch 'origin/master' into 5-add-camel-integration-camel-consumer-producer
add 1e5d391 Cleanup: - added TODOs - ignore Mock tests - removed unnecessary
add f8cb59b Added tests and documentation for StreamUtils
add a1b365b fixed failing build due to missing documentation.
add d0254d0 fixed site generation
add 9ab42c9 move to generic plc4x component
add 9f8446a simplify code
add 7b08edf change to mockito mocks
add 0394f52 added Sebastian Rühl to authors
add 9fae9e7 Merge branch '5-add-camel-integration-camel-consumer-producer' into 'master'
add 8e32aec Some more updates on the incubation proposal due to some chatter on the incubation mailing list.
add 66d7f211 Fixed a typo in an email address
add e527943 initial edgent integration
add b5269e7 Merge branch 'master' into 'feature/edgent-integration'
add b1a2a92 fix pom for plx4x -> plc4x rename
add 329f99e migrate all the nuts and bolts into the PlcConnectionAdapter
add 3cfecf5 add PlcConnectionAdapter tests
add 5efdc10 cleanup
add b3c9ca9 add PlcFunctionsTest
add 8ef0d9a add PlcLogger sample that uses the Edgent Connector
add dc2bea1 un-WIP-ify the Edgent integration package names
add 708eb4d Merge branch 'feature/edgent-integration' into 'master'
add d067fc4 Applied the feedback dale provided in the vote thread at https://gitlab.codecentric.de/iot/plc4x/issues/10
add aea5f66 Adjusted the links section in the s7 protocol page.
add cb4c68d Updated the risk section to a more positive version, that doesn't contain my speculations about what the other companies could think or do. (https://gitlab.codecentric.de/iot/plc4x/issues/10)
add 7c6061b Add license
add 02f3e40 Rearanged the methods of PlcConnection.java and added a redefinition of "close" to make it more obvious that PlcConnection has a public connect AND a close method.
add 343091e Switched from my initial implementation to Dales that makes use of the Edgent integration package.
add 62fe796 - Moved the dependency to "core" from being a test dependency to a runtime dependency, this way a user only has to reference the driver and he gets the DriverManager included automatically. - Updated the S7PlcDriverSample.java to using some cooler async code
add 98afd30 - Added some more information on using PLC4J - Added some links regarding raw ip sockets in Java - Added some links on the EtherCAT protocol
add d1b95a6 - Fixed a lot of problems when reading other datatypes - Added support for Short datatype - Started implementing the IoTree application
add fc61d5c - Implemented writing to a PLC - Implemented the Float/REAL datatype - Refactored some of the S7 internal datatypes after noticing the similatiry of read and write types
add 14d5609 #16 - Refactor the Requests and Responses - Removed all the Type specific request and response messages - One Read-/Write request can now have multiple items to read/write - With this change it is not only possible to write arrays of data, but also join multiple read-/write-requests to one
add 6e4d936 #14 - Implement a testing framework for protocols #12 - Use AsertJ to write more readable test?
add 5a7e507 - Increased test-coverage for IsoOnTcp to 100%
add 68a65b5 - Updated to the release version of Edgent 1.2.0
add 933616a PLC4X-10 - Setup the build for Apache on builds.apache.org
add 6841742 PLC4X-11 - Setup the site generation
add 60d62f9 PLC4X-11 - Setup the site generation
add a9e9ac4 PLC4X-11 - Setup the site generation
add b98257e PLC4X-11 - Setup the site generation
add bb76bbb PLC4X-11 - Setup the site generation
add 447bed6 NO JIRA:
add 6f151c8 NO JIRA:
new 5e46624 Merge branches 'PLC4X-12' and 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into PLC4X-12
new b85290a - Re-synced the branch with the latest changes in master - Still the PlcMessageConversions.scala needs adjusting to the new request/response types
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:
.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/FloatValue.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/api/pom.xml | 6 +-
.../org/apache/plc4x/scala/api/PlcDriver.scala | 2 +-
.../plc4x/scala/api/connection/PlcConnection.scala | 2 +-
.../plc4x/scala/api/connection/PlcReader.scala | 2 +-
.../plc4x/scala/api/messages/PlcMessage.scala | 2 +-
plc4s/core/pom.xml | 8 +-
.../plc4x/scala/core/JPlcConnectionWrapper.scala | 2 +-
.../plc4x/scala/core/JPlcDriverWrapper.scala | 4 +-
plc4s/pom.xml | 6 +-
pom.xml | 129 ++++-
src/site/asciidoc/development/website.adoc | 177 +++++++
src/site/asciidoc/incubation-proposal.adoc | 227 +++++++++
src/site/asciidoc/index.adoc | 2 +-
.../protocols/{modbus => ehtercat}/index.adoc | 12 +-
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 +-
184 files changed, 5645 insertions(+), 2195 deletions(-)
create mode 100644 LICENSE
copy {plc4j/protocols/s7 => applications/iotree}/pom.xml (62%)
create mode 100644 applications/iotree/src/main/java/org/apache/plc4x/java/applications/iotree/IoTree.java
copy integrations/apache-mynewt/pom.xml => applications/iotree/src/main/resources/logback.xml (54%)
rename applications/{es-edgent-logger => plclogger}/pom.xml (56%)
create mode 100644 applications/plclogger/src/main/java/org/apache/plc4x/java/applications/plclogger/PlcLogger.java
copy integrations/apache-mynewt/pom.xml => applications/plclogger/src/main/resources/logback.xml (54%)
copy plc4j/protocols/s7/src/site/asciidoc/index.adoc => integrations/apache-camel/src/main/docs/PLC4X.adoc (88%)
copy plc4j/api/src/main/java/org/apache/plc4x/java/messages/PlcMessage.java => integrations/apache-camel/src/main/java/org/apache/plc4x/camel/Constants.java (81%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/mina/S7Handler.java => integrations/apache-camel/src/main/java/org/apache/plc4x/camel/PLC4XComponent.java (64%)
create mode 100644 integrations/apache-camel/src/main/java/org/apache/plc4x/camel/PLC4XEndpoint.java
create mode 100644 integrations/apache-camel/src/main/java/org/apache/plc4x/camel/PLC4XProducer.java
copy plc4j/protocols/s7/src/main/resources/META-INF/services/org.apache.plc4x.java.PlcDriver => integrations/apache-camel/src/main/resources/META-INF/services/org/apache/camel/component/plc4x (94%)
copy {plc4j/core/src/test/java/org/apache/plc4x/java/mock => integrations/apache-camel/src/test/java/org/apache/plc4x/camel}/MockDriver.java (65%)
create mode 100644 integrations/apache-camel/src/test/java/org/apache/plc4x/camel/PLC4XComponentTest.java
copy plc4j/protocols/s7/src/main/resources/META-INF/services/org.apache.plc4x.java.PlcDriver => integrations/apache-camel/src/test/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver (95%)
copy plc4j/protocols/s7/src/main/resources/META-INF/services/org.apache.plc4x.java.PlcDriver => integrations/apache-camel/src/test/resources/log4j2.properties (79%)
create mode 100644 integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java
create mode 100644 integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcFunctions.java
copy plc4j/api/src/main/java/org/apache/plc4x/java/connection/PlcLister.java => integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/package-info.java (79%)
create mode 100644 integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/PlcConnectionAdapterTest.java
create mode 100644 integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/PlcFunctionsTest.java
copy plc4j/api/src/main/java/org/apache/plc4x/java/exceptions/PlcConnectionException.java => integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockAddress.java (55%)
create mode 100644 integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java
copy {plc4j/core/src/test/java/org/apache/plc4x/java => integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent}/mock/MockDriver.java (76%)
copy plc4j/protocols/s7/src/main/resources/META-INF/services/org.apache.plc4x.java.PlcDriver => integrations/apache-edgent/src/test/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver (95%)
rename plc4j/api/src/main/java/org/apache/plc4x/java/{ => api}/PlcDriver.java (89%)
rename plc4j/api/src/main/java/org/apache/plc4x/java/{ => api}/authentication/PlcAuthentication.java (94%)
rename plc4j/api/src/main/java/org/apache/plc4x/java/{ => api}/authentication/PlcUsernamePasswordAuthentication.java (96%)
copy plc4j/{core/src/test/java/org/apache/plc4x/java/mock/MockDriver.java => api/src/main/java/org/apache/plc4x/java/api/connection/AbstractPlcConnection.java} (50%)
rename plc4j/api/src/main/java/org/apache/plc4x/java/{ => api}/connection/PlcConnection.java (68%)
rename plc4j/api/src/main/java/org/apache/plc4x/java/{ => api}/connection/PlcLister.java (95%)
rename plc4j/api/src/main/java/org/apache/plc4x/java/{ => api}/connection/PlcReader.java (76%)
rename plc4j/api/src/main/java/org/apache/plc4x/java/{ => api}/connection/PlcWriter.java (76%)
rename plc4j/api/src/main/java/org/apache/plc4x/java/{ => api}/exceptions/PlcConnectionException.java (96%)
rename plc4j/api/src/main/java/org/apache/plc4x/java/{ => api}/exceptions/PlcException.java (96%)
rename plc4j/api/src/main/java/org/apache/plc4x/java/{ => api}/exceptions/PlcIoException.java (96%)
rename plc4j/api/src/main/java/org/apache/plc4x/java/{ => api}/exceptions/PlcProtocolException.java (97%)
rename plc4j/api/src/main/java/org/apache/plc4x/java/{ => api}/messages/PlcMessage.java (95%)
create mode 100644 plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadRequest.java
copy plc4j/{protocols/s7/src/main/java/org/apache/plc4x/java/mina/PlcRequestContainer.java => api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadResponse.java} (59%)
rename plc4j/api/src/main/java/org/apache/plc4x/java/{ => api}/messages/PlcRequest.java (95%)
copy plc4j/{protocols/s7/src/main/java/org/apache/plc4x/java/mina => api/src/main/java/org/apache/plc4x/java/api/messages}/PlcRequestContainer.java (90%)
rename plc4j/api/src/main/java/org/apache/plc4x/java/{ => api}/messages/PlcResponse.java (95%)
create mode 100644 plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java
rename plc4j/{protocols/s7/src/main/java/org/apache/plc4x/java/mina/PlcRequestContainer.java => api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteResponse.java} (59%)
copy plc4j/api/src/main/java/org/apache/plc4x/java/{messages/AbstractPlcSimpleResourceMessage.java => api/messages/items/ReadRequestItem.java} (67%)
copy plc4j/{protocols/s7/src/main/java/org/apache/plc4x/java/s7/mina/model/params/ReadVarParameter.java => api/src/main/java/org/apache/plc4x/java/api/messages/items/ReadResponseItem.java} (54%)
rename plc4j/api/src/main/java/org/apache/plc4x/java/{messages/AbstractPlcSimpleResourceMessage.java => api/messages/items/WriteRequestItem.java} (60%)
copy plc4j/{protocols/s7/src/main/java/org/apache/plc4x/java/isotp/mina/model/params/DisconnectAdditionalInformationParameter.java => api/src/main/java/org/apache/plc4x/java/api/messages/items/WriteResponseItem.java} (59%)
rename plc4j/api/src/main/java/org/apache/plc4x/java/{messages => api/model}/Address.java (97%)
rename plc4j/api/src/main/java/org/apache/plc4x/java/{types/CalendarValue.java => api/types/ResponseCode.java} (85%)
delete mode 100644 plc4j/api/src/main/java/org/apache/plc4x/java/messages/PlcSimpleReadRequest.java
delete mode 100644 plc4j/api/src/main/java/org/apache/plc4x/java/messages/PlcSimpleReadResponse.java
delete mode 100644 plc4j/api/src/main/java/org/apache/plc4x/java/messages/PlcSimpleWriteRequest.java
delete mode 100644 plc4j/api/src/main/java/org/apache/plc4x/java/messages/PlcSimpleWriteResponse.java
delete mode 100644 plc4j/api/src/main/java/org/apache/plc4x/java/types/BooleanValue.java
delete mode 100644 plc4j/api/src/main/java/org/apache/plc4x/java/types/FloatValue.java
delete mode 100644 plc4j/api/src/main/java/org/apache/plc4x/java/types/IntegerValue.java
delete mode 100644 plc4j/api/src/main/java/org/apache/plc4x/java/types/StringValue.java
create mode 100644 plc4j/api/src/site/asciidoc/design.adoc
rename plc4j/core/src/test/resources/META-INF/services/{org.apache.plc4x.java.PlcDriver => org.apache.plc4x.java.api.PlcDriver} (100%)
rename plc4j/core/src/test/resources/test/META-INF/services/{org.apache.plc4x.java.PlcDriver => org.apache.plc4x.java.api.PlcDriver} (100%)
delete mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isoontcp/mina/IsoOnTcpFilterAdapter.java
create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isoontcp/netty/IsoOnTcpProtocol.java
rename plc4j/{api/src/main/java/org/apache/plc4x/java/types/AbstractValue.java => protocols/s7/src/main/java/org/apache/plc4x/java/isoontcp/netty/model/IsoOnTcpMessage.java} (75%)
delete mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/mina/IsoTPFilterAdapter.java
create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/IsoTPProtocol.java
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/{mina => netty}/model/IsoTPMessage.java (79%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/{mina => netty}/model/params/CalledTsapParameter.java (84%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/{mina => netty}/model/params/CallingTsapParameter.java (85%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/{mina => netty}/model/params/ChecksumParameter.java (89%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/{mina => netty}/model/params/DisconnectAdditionalInformationParameter.java (90%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/{mina => netty}/model/params/Parameter.java (86%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/{mina => netty}/model/params/TpduSizeParameter.java (85%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/{mina => netty}/model/params/TsapParameter.java (91%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/{mina => netty}/model/tpdus/ConnectionConfirmTpdu.java (77%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/{mina => netty}/model/tpdus/ConnectionRequestTpdu.java (77%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/{mina => netty}/model/tpdus/ConnectionTpdu.java (82%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/{mina => netty}/model/tpdus/DataTpdu.java (82%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/{mina => netty}/model/tpdus/DisconnectConfirmTpdu.java (77%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/{mina => netty}/model/tpdus/DisconnectRequestTpdu.java (79%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/{mina => netty}/model/tpdus/DisconnectTpdu.java (81%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/{mina => netty}/model/tpdus/ErrorTpdu.java (79%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/{mina => netty}/model/tpdus/Tpdu.java (81%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/{mina => netty}/model/types/DeviceGroup.java (96%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/{mina => netty}/model/types/DisconnectReason.java (97%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/{mina => netty}/model/types/ParameterCode.java (97%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/{mina => netty}/model/types/ProtocolClass.java (96%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/{mina => netty}/model/types/RejectCause.java (96%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/{mina => netty}/model/types/TpduCode.java (96%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/{mina => netty}/model/types/TpduSize.java (96%)
copy plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/{mina => netty}/Message.java (82%)
copy plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/{mina/Message.java => netty/events/S7ConnectionEvent.java} (69%)
rename plc4j/{api/src/main/java/org/apache/plc4x/java/types/ByteValue.java => protocols/s7/src/main/java/org/apache/plc4x/java/netty/events/S7ConnectionState.java} (83%)
delete mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/mina/Plc4XS7FilterAdapter.java
delete mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/mina/S7FilterAdapter.java
delete mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/mina/model/payloads/ReadVarPayload.java
create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
create mode 100644 plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/{mina => netty}/model/messages/S7Message.java (85%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/{mina => netty}/model/messages/S7RequestMessage.java (81%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/{mina => netty}/model/messages/S7ResponseMessage.java (85%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/{mina => netty}/model/messages/SetupCommunicationRequestMessage.java (85%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/{mina/model/params/items/DBReadVarRequestItem.java => netty/model/params/CpuServicesParameter.java} (72%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/{mina => netty}/model/params/S7Parameter.java (87%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/{mina => netty}/model/params/SetupCommunicationParameter.java (92%)
copy plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/{mina/model/params/ReadVarParameter.java => netty/model/params/VarParameter.java} (62%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/{mina/model/params/items/S7AnyReadVarRequestItem.java => netty/model/params/items/S7AnyVarParameterItem.java} (77%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/{mina/model/params/items/ReadVarRequestItem.java => netty/model/params/items/VarParameterItem.java} (82%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/{mina => netty}/model/payloads/S7Payload.java (87%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/{mina/model/params/ReadVarParameter.java => netty/model/payloads/VarPayload.java} (57%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/{mina/model/payloads/S7AnyReadVarPayload.java => netty/model/payloads/items/VarPayloadItem.java} (64%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/{mina => netty}/model/types/DataTransportErrorCode.java (86%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/{mina => netty}/model/types/DataTransportSize.java (97%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/{mina => netty}/model/types/HeaderErrorClass.java (95%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/{mina => netty}/model/types/MemoryArea.java (97%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/{mina => netty}/model/types/MessageType.java (96%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/{mina => netty}/model/types/ParameterError.java (97%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/{mina => netty}/model/types/ParameterType.java (90%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/{mina => netty}/model/types/SpecificationType.java (96%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/{mina => netty}/model/types/TransportSize.java (97%)
rename plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/{mina => netty}/model/types/VariableAddressingMode.java (97%)
rename plc4j/protocols/s7/src/main/resources/META-INF/services/{org.apache.plc4x.java.PlcDriver => org.apache.plc4x.java.api.PlcDriver} (100%)
create mode 100644 plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isoontcp/netty/IsoOnTcpProtocolTest.java
copy plc4j/protocols/s7/src/{main/java/org/apache/plc4x/java/mina/Message.java => test/java/org/apache/plc4x/java/isotp/netty/IsoTPProtocolTest.java} (70%)
rename plc4j/{api/src/main/java/org/apache/plc4x/java/types/Value.java => protocols/s7/src/test/java/org/apache/plc4x/java/netty/NettyTestBase.java} (89%)
create mode 100644 plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcReaderSample.java
create mode 100644 plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcScanner.java
create mode 100644 plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcTestConsole.java
create mode 100644 plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcWriterSample.java
copy plc4j/protocols/s7/src/{main/java/org/apache/plc4x/java/mina/Message.java => test/java/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolTest.java} (70%)
rename plc4j/protocols/s7/src/{main/java/org/apache/plc4x/java/mina/Message.java => test/java/org/apache/plc4x/java/s7/netty/S7ProtocolTest.java} (70%)
copy integrations/apache-mynewt/pom.xml => plc4j/protocols/s7/src/test/resources/logback.xml (54%)
create mode 100644 plc4j/src/site/asciidoc/index.adoc
create mode 100644 src/site/asciidoc/development/website.adoc
create mode 100644 src/site/asciidoc/incubation-proposal.adoc
copy src/site/asciidoc/protocols/{modbus => ehtercat}/index.adoc (69%)
--
To stop receiving notification emails like this one, please contact
['"commits@plc4x.apache.org" <co...@plc4x.apache.org>'].
[incubator-plc4x] 01/02: Merge branches 'PLC4X-12' and 'master' of
https://gitbox.apache.org/repos/asf/incubator-plc4x into PLC4X-12
Posted by cd...@apache.org.
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 <ch...@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" <co...@plc4x.apache.org>.
[incubator-plc4x] 02/02: - Re-synced the branch with the latest
changes in master - Still the PlcMessageConversions.scala needs adjusting
to the new request/response types
Posted by cd...@apache.org.
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 b85290ab0831c0b70fe8dff1c546cf79b8f59045
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Dec 27 14:33:07 2017 +0100
- Re-synced the branch with the latest changes in master
- Still the PlcMessageConversions.scala needs adjusting to the new request/response types
---
plc4s/api/pom.xml | 6 +++---
.../api/src/main/scala/org/apache/plc4x/scala/api/PlcDriver.scala | 2 +-
.../org/apache/plc4x/scala/api/connection/PlcConnection.scala | 2 +-
.../scala/org/apache/plc4x/scala/api/connection/PlcReader.scala | 2 +-
.../scala/org/apache/plc4x/scala/api/messages/PlcMessage.scala | 2 +-
plc4s/core/pom.xml | 8 ++++----
.../scala/org/apache/plc4x/scala/core/JPlcConnectionWrapper.scala | 2 +-
.../scala/org/apache/plc4x/scala/core/JPlcDriverWrapper.scala | 4 ++--
plc4s/pom.xml | 4 ++--
9 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/plc4s/api/pom.xml b/plc4s/api/pom.xml
index 3406be9..dcf05e6 100644
--- a/plc4s/api/pom.xml
+++ b/plc4s/api/pom.xml
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.plx4x</groupId>
+ <groupId>org.apache.plc4x</groupId>
<artifactId>plc4s</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
@@ -46,11 +46,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.plx4x</groupId>
+ <groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.plx4x</groupId>
+ <groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-core</artifactId>
</dependency>
<dependency>
diff --git a/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/PlcDriver.scala b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/PlcDriver.scala
index 647ef0f..075d86f 100644
--- a/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/PlcDriver.scala
+++ b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/PlcDriver.scala
@@ -18,7 +18,7 @@ under the License.
*/
package org.apache.plc4x.scala.api
-import org.apache.plc4x.java.authentication.PlcAuthentication
+import org.apache.plc4x.java.api.authentication.PlcAuthentication
import org.apache.plc4x.scala.api.connection.PlcConnection
/**
diff --git a/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcConnection.scala b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcConnection.scala
index 84213ba..e54294f 100644
--- a/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcConnection.scala
+++ b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcConnection.scala
@@ -18,7 +18,7 @@ under the License.
*/
package org.apache.plc4x.scala.api.connection
-import org.apache.plc4x.java.messages.Address
+import org.apache.plc4x.java.api.model.Address
import org.apache.plc4x.scala.api.PlcError
/**
diff --git a/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcReader.scala b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcReader.scala
index 4fe8380..1bb3111 100644
--- a/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcReader.scala
+++ b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/connection/PlcReader.scala
@@ -18,7 +18,7 @@ under the License.
*/
package org.apache.plc4x.scala.api.connection
-import org.apache.plc4x.java.connection.{PlcReader => JPlcReader}
+import org.apache.plc4x.java.api.connection.{PlcReader => JPlcReader}
import org.apache.plc4x.scala.api.connection.PlcMessageConversions._
import org.apache.plc4x.scala.api.messages.{SimpleReadRequest, SimpleReadResponse}
diff --git a/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/messages/PlcMessage.scala b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/messages/PlcMessage.scala
index b08f270..b0af69d 100644
--- a/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/messages/PlcMessage.scala
+++ b/plc4s/api/src/main/scala/org/apache/plc4x/scala/api/messages/PlcMessage.scala
@@ -18,7 +18,7 @@ under the License.
*/
package org.apache.plc4x.scala.api.messages
-import org.apache.plc4x.java.messages.Address
+import org.apache.plc4x.java.api.model.Address
sealed trait PlcMessage
diff --git a/plc4s/core/pom.xml b/plc4s/core/pom.xml
index 07d6fb1..b61b12a 100644
--- a/plc4s/core/pom.xml
+++ b/plc4s/core/pom.xml
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.plx4x</groupId>
+ <groupId>org.apache.plc4x</groupId>
<artifactId>plc4s</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
@@ -46,15 +46,15 @@
<dependencies>
<dependency>
- <groupId>org.apache.plx4x</groupId>
+ <groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.plx4x</groupId>
+ <groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.plx4x</groupId>
+ <groupId>org.apache.plc4x</groupId>
<artifactId>plc4s-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
diff --git a/plc4s/core/src/main/scala/org/apache/plc4x/scala/core/JPlcConnectionWrapper.scala b/plc4s/core/src/main/scala/org/apache/plc4x/scala/core/JPlcConnectionWrapper.scala
index 65ac689..89fa847 100644
--- a/plc4s/core/src/main/scala/org/apache/plc4x/scala/core/JPlcConnectionWrapper.scala
+++ b/plc4s/core/src/main/scala/org/apache/plc4x/scala/core/JPlcConnectionWrapper.scala
@@ -18,7 +18,7 @@ under the License.
*/
package org.apache.plc4x.scala.core
-import org.apache.plc4x.java.connection.{PlcConnection => JPlcConnection}
+import org.apache.plc4x.java.api.connection.{PlcConnection => JPlcConnection}
import org.apache.plc4x.scala.api.PlcConnectionError
import org.apache.plc4x.scala.api.connection.PlcConnection
diff --git a/plc4s/core/src/main/scala/org/apache/plc4x/scala/core/JPlcDriverWrapper.scala b/plc4s/core/src/main/scala/org/apache/plc4x/scala/core/JPlcDriverWrapper.scala
index 49859ec..84d2e28 100644
--- a/plc4s/core/src/main/scala/org/apache/plc4x/scala/core/JPlcDriverWrapper.scala
+++ b/plc4s/core/src/main/scala/org/apache/plc4x/scala/core/JPlcDriverWrapper.scala
@@ -18,8 +18,8 @@ under the License.
*/
package org.apache.plc4x.scala.core
-import org.apache.plc4x.java.authentication.PlcAuthentication
-import org.apache.plc4x.java.{PlcDriver => JPlcDriver}
+import org.apache.plc4x.java.api.authentication.PlcAuthentication
+import org.apache.plc4x.java.api.{PlcDriver => JPlcDriver}
import org.apache.plc4x.scala.api.{PlcConnectionError, PlcDriver}
import scala.util.{Failure, Success, Try}
diff --git a/plc4s/pom.xml b/plc4s/pom.xml
index bb1ac82..ab06f44 100644
--- a/plc4s/pom.xml
+++ b/plc4s/pom.xml
@@ -81,12 +81,12 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.plx4x</groupId>
+ <groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.plx4x</groupId>
+ <groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-core</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.