You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2018/10/25 16:01:39 UTC
[incubator-plc4x] branch master updated (71206e0 -> c9f3181)
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.
from 71206e0 [plc4j-pool] fixed lock mixup
add d21f464 Finished first Implementation of OPM.
add f619b13 Added example of Object-Plc-Mapping.
add 66bf9d9 Changed according to new api.
add 95ca0fe Added new Test and feature.
add 485cfa8 Did some stuff.
add 03b8f03 Current state.
add 17dde04 Added note for Service Loader.
add b65f5ee state.
add b4fc6e1 Added complete "connect" functionality. Ready for some review??
add 50c71bc Small fixes, added logging.
add 4fe9766 Added Documentation.
add e675472 Finished first Implementation of OPM.
add eaad6b4 Added example of Object-Plc-Mapping.
add d9dd331 Added example of Object-Plc-Mapping.
add 5c75e3a Merge remote-tracking branch 'origin/opm-plcentitymanager' into opm-plcentitymanager
add 6839690 Changed according to new api.
add d5efa94 Added new Test and feature.
add 85f1d78 Did some stuff.
add 1669fff Current state.
add 5c0cd67 Added note for Service Loader.
add 4a3bab9 state.
add 60d20dd Added complete "connect" functionality. Ready for some review??
add ba0bcfd Small fixes, added logging.
add 6809a43 Added Documentation.
add 49b4708 Finished first Implementation of OPM.
add a72f383 Merge remote-tracking branch 'origin/opm-plcentitymanager' into opm-plcentitymanager
add 0d74857 Merge remote-tracking branch 'origin/opm-plcentitymanager' into opm-plcentitymanager
add 1d1391c Small fix after rebase.
add 2e0dd07 [plc4j-opm] cleanups: - updated copyrights - removed @author - fixed several small issues - added documentation
add 778b05b Merge branch 'master' into opm-plcentitymanager
new c9f3181 [plc4j-opm] fix build issues
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:
plc4j/utils/opm/pom.xml | 78 +++++
.../org/apache/plc4x/java/opm/OPMException.java} | 16 +-
.../java/org/apache/plc4x/java/opm/PlcEntity.java} | 10 +-
.../apache/plc4x/java/opm/PlcEntityManager.java | 380 +++++++++++++++++++++
.../java/org/apache/plc4x/java/opm/PlcField.java} | 12 +-
.../plc4x/java/opm/PlcEntityManagerTest.java | 339 ++++++++++++++++++
plc4j/utils/pom.xml | 1 +
7 files changed, 819 insertions(+), 17 deletions(-)
create mode 100644 plc4j/utils/opm/pom.xml
copy plc4j/{api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcNotImplementedException.java => utils/opm/src/main/java/org/apache/plc4x/java/opm/OPMException.java} (72%)
copy plc4j/{protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsCommandType.java => utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcEntity.java} (79%)
create mode 100644 plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcEntityManager.java
copy plc4j/{protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsCommandType.java => utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcField.java} (77%)
create mode 100644 plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityManagerTest.java
[incubator-plc4x] 01/01: [plc4j-opm] fix build issues
Posted by sr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit c9f318189f65a42ee4533a53e5835adf7d9edef5
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Oct 25 17:59:28 2018 +0200
[plc4j-opm] fix build issues
---
plc4j/utils/opm/pom.xml | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/plc4j/utils/opm/pom.xml b/plc4j/utils/opm/pom.xml
index c95aa51..04bee62 100644
--- a/plc4j/utils/opm/pom.xml
+++ b/plc4j/utils/opm/pom.xml
@@ -36,15 +36,25 @@
<!--Internal Dependencies-->
<dependency>
<groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-core</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.8.15</version>
</dependency>
+
+ <!-- Utils -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
<!--Testing-->
<dependency>
<groupId>junit</groupId>
@@ -62,12 +72,6 @@
<version>0.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>apache-edgent</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
</dependencies>