You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by ke...@apache.org on 2017/12/27 21:54:07 UTC

[incubator-plc4x] branch PLC4X-12 updated (50e29cb -> eb20918)

This is an automated email from the ASF dual-hosted git repository.

keinmark pushed a change to branch PLC4X-12
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.


    from 50e29cb  WIP PLC4X-12: apply current changes to scala core
     add b10875b  add some simple unit tests
     add f1c9435  No need for tests in name
     add f16934e  renamed
     add af79c42  No need for tests in name
     add 736c732  some new test
     add c6edbde  No need for tests in name
     add 2a4d834  No need for tests in name
     add a7ab5ee  wrong constant value
     add ad6bf6f  fix failing test
     add a620f5d  Added License information on the resources used in the site generation
     add 71c8a96  NO JIRA: Right now the site generation generates a lot of timestamps in the output. This causes problems with the gitpubsub system. This is an attempt to rid the output of these timestamps and hereby make the updates to the asf-site branch more readable.
     add 318d321  Merge branches 'feature/fine-tuned-site-generation' and 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x
     add 3e89712  Merge branch 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x
     add aa3cb80  add missing ASF headers
     new eb20918  Merge branch 'master' into PLC4X-12

The 1 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/api/messages/items/APIMessageTests.java   |  215 +++
 .../java/isotp/netty/model/tpdus/ErrorTpdu.java    |    2 +-
 .../plc4x/java/s7/connection/S7PlcConnection.java  |    6 +-
 .../java/isotp/netty/model/IsoTPMessageTests.java  |   59 +
 .../isotp/netty/model/params/ParameterTests.java   |   69 +
 .../netty/model/params/TsapParameterTests.java     |   64 +
 .../isotp/netty/model/tpdus/IsotpModelTests.java   |  158 ++
 .../isotp/netty/model/types/IsotpTypeTests.java    |  172 ++
 .../events/S7StateTests.java}                      |   18 +-
 .../org/apache/plc4x/java/s7/S7PlcDriverTest.java  |    6 +-
 .../java/s7/connection/S7PlcConnectionTests.java   |  105 ++
 .../apache/plc4x/java/s7/model/S7AddressTests.java |   61 +
 .../s7/netty/model/messages/S7MessageTests.java    |   81 +
 .../s7/netty/model/params/S7ParameterTests.java    |   81 +
 .../s7/netty/model/payloads/S7PayloadTests.java    |   63 +
 .../java/s7/netty/model/types/S7TypeTests.java     |  103 ++
 pom.xml                                            |   20 +-
 src/remote-resources/NOTICE                        |   26 +
 .../site/asciidoc/development/building.adoc        |    7 +-
 .../site/asciidoc/development/ci.adoc              |    5 +-
 .../site/asciidoc/development/contributing.adoc    |    5 +-
 src/site/site.xml                                  |    6 +
 src/site/template/maven-site.vm                    | 1786 ++++++++++++++++++++
 23 files changed, 3091 insertions(+), 27 deletions(-)
 create mode 100644 integrations/apache-edgent/src/test/java/org/apache/plc4x/java/api/messages/items/APIMessageTests.java
 create mode 100644 plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isotp/netty/model/IsoTPMessageTests.java
 create mode 100644 plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isotp/netty/model/params/ParameterTests.java
 create mode 100644 plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isotp/netty/model/params/TsapParameterTests.java
 create mode 100644 plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isotp/netty/model/tpdus/IsotpModelTests.java
 create mode 100644 plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/isotp/netty/model/types/IsotpTypeTests.java
 copy plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/{isotp/netty/IsoTPProtocolTest.java => netty/events/S7StateTests.java} (62%)
 create mode 100644 plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/connection/S7PlcConnectionTests.java
 create mode 100644 plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/model/S7AddressTests.java
 create mode 100644 plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/messages/S7MessageTests.java
 create mode 100644 plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/params/S7ParameterTests.java
 create mode 100644 plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/payloads/S7PayloadTests.java
 create mode 100644 plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/types/S7TypeTests.java
 create mode 100644 src/remote-resources/NOTICE
 copy integrations/apache-camel/src/main/docs/PLC4X.adoc => src/site/asciidoc/development/building.adoc (88%)
 copy integrations/apache-camel/src/main/docs/PLC4X.adoc => src/site/asciidoc/development/ci.adoc (88%)
 copy integrations/apache-camel/src/main/docs/PLC4X.adoc => src/site/asciidoc/development/contributing.adoc (88%)
 create mode 100644 src/site/template/maven-site.vm

-- 
To stop receiving notification emails like this one, please contact
['"commits@plc4x.apache.org" <co...@plc4x.apache.org>'].

[incubator-plc4x] 01/01: Merge branch 'master' into PLC4X-12

Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

keinmark pushed a commit to branch PLC4X-12
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git

commit eb20918a8f1e5fdfa177861b213ee32cd4fb3dcf
Merge: 50e29cb aa3cb80
Author: Mark Keinhörster <ma...@codecentric.de>
AuthorDate: Wed Dec 27 22:53:22 2017 +0100

    Merge branch 'master' into PLC4X-12

 .../java/api/messages/items/APIMessageTests.java   |  215 +++
 .../java/isotp/netty/model/tpdus/ErrorTpdu.java    |    2 +-
 .../plc4x/java/s7/connection/S7PlcConnection.java  |    6 +-
 .../java/isotp/netty/model/IsoTPMessageTests.java  |   59 +
 .../isotp/netty/model/params/ParameterTests.java   |   69 +
 .../netty/model/params/TsapParameterTests.java     |   64 +
 .../isotp/netty/model/tpdus/IsotpModelTests.java   |  158 ++
 .../isotp/netty/model/types/IsotpTypeTests.java    |  172 ++
 .../plc4x/java/netty/events/S7StateTests.java      |   45 +
 .../org/apache/plc4x/java/s7/S7PlcDriverTest.java  |    6 +-
 .../java/s7/connection/S7PlcConnectionTests.java   |  105 ++
 .../apache/plc4x/java/s7/model/S7AddressTests.java |   61 +
 .../s7/netty/model/messages/S7MessageTests.java    |   81 +
 .../s7/netty/model/params/S7ParameterTests.java    |   81 +
 .../s7/netty/model/payloads/S7PayloadTests.java    |   63 +
 .../java/s7/netty/model/types/S7TypeTests.java     |  103 ++
 pom.xml                                            |   20 +-
 src/remote-resources/NOTICE                        |   26 +
 src/site/asciidoc/development/building.adoc        |   21 +
 src/site/asciidoc/development/ci.adoc              |   19 +
 src/site/asciidoc/development/contributing.adoc    |   19 +
 src/site/site.xml                                  |    6 +
 src/site/template/maven-site.vm                    | 1786 ++++++++++++++++++++
 23 files changed, 3178 insertions(+), 9 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.