You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by er...@apache.org on 2020/04/06 08:17:49 UTC
[plc4x] branch develop updated (a0acfde -> 049e542)
This is an automated email from the ASF dual-hosted git repository.
erobinet pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
from a0acfde - Enabled the "with-c" profile.
add 38f5ce8 Generating feature.xml with dependencies using maven plugin
add 852c16e Generated features for EIP, S7 and Camel
add dfe424f Merge branch 'develop' of https://github.com/apache/plc4x into osgi
new 37f8a8e Merge branch 'osgi' of https://github.com/apache/plc4x into develop
new 6ead7eb Merge remote-tracking branch 'origin/develop' into develop
new 049e542 Added comparing method
The 3 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:
.../main/java/org/apache/plc4x/camel/TagData.java | 7 +++
plc4j/karaf-features/camel/pom.xml | 67 ++++++++++++++++++++
plc4j/karaf-features/eip/pom.xml | 66 ++++++++++++++++++++
plc4j/karaf-features/pom.xml | 15 +----
plc4j/karaf-features/s7/pom.xml | 72 ++++++----------------
.../karaf-features/s7/src/main/feature/feature.xml | 44 -------------
6 files changed, 161 insertions(+), 110 deletions(-)
create mode 100644 plc4j/karaf-features/camel/pom.xml
create mode 100644 plc4j/karaf-features/eip/pom.xml
delete mode 100644 plc4j/karaf-features/s7/src/main/feature/feature.xml
[plc4x] 01/03: Merge branch 'osgi' of
https://github.com/apache/plc4x into develop
Posted by er...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
erobinet pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 37f8a8e18db59d09a5a2a1d27d2686a59b21d189
Merge: 86e7edb dfe424f
Author: etiennerobinet <61...@users.noreply.github.com>
AuthorDate: Fri Apr 3 16:47:40 2020 +0200
Merge branch 'osgi' of https://github.com/apache/plc4x into develop
plc4j/karaf-features/camel/pom.xml | 67 ++++++++++++++++++++
plc4j/karaf-features/eip/pom.xml | 66 ++++++++++++++++++++
plc4j/karaf-features/pom.xml | 15 +----
plc4j/karaf-features/s7/pom.xml | 72 ++++++----------------
.../karaf-features/s7/src/main/feature/feature.xml | 44 -------------
5 files changed, 154 insertions(+), 110 deletions(-)
[plc4x] 02/03: Merge remote-tracking branch 'origin/develop' into
develop
Posted by er...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
erobinet pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 6ead7eb6967666a76ba3ecbf4a4915c1897b0649
Merge: 37f8a8e a0acfde
Author: etiennerobinet <61...@users.noreply.github.com>
AuthorDate: Mon Apr 6 10:13:00 2020 +0200
Merge remote-tracking branch 'origin/develop' into develop
Jenkinsfile | 2 +-
build-utils/language-c/pom.xml | 58 +++++++++++++++++
.../apache/plc4x/language/c/CLanguageOutput.java | 72 ++++++++++++++++++++++
.../plc4x/language/c/CLanguageTemplateHelper.java | 39 ++++++++++++
...x.plugins.codegenerator.language.LanguageOutput | 19 ++++++
.../resources/templates/c/pojo-template-c.ftlh | 38 ++++++++++++
.../resources/templates/c/pojo-template-h.ftlh | 38 ++++++++++++
build-utils/pom.xml | 1 +
pom.xml | 9 +++
sandbox/plc4c/CMakeLists.txt | 2 +-
sandbox/plc4c/drivers/modbus/CMakeLists.txt | 12 +++-
.../CMakeLists.txt => modbus/src/main/c/Test.c} | 8 +--
.../src/main/include/Test.h} | 8 +--
sandbox/plc4c/drivers/s7/CMakeLists.txt | 12 +++-
.../s7/{CMakeLists.txt => src/main/c/Test.c} | 8 +--
.../s7/{CMakeLists.txt => src/main/include/Test.h} | 8 +--
sandbox/plc4c/pom.xml | 55 +++++++++++++++--
17 files changed, 355 insertions(+), 34 deletions(-)
[plc4x] 03/03: Added comparing method
Posted by er...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
erobinet pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 049e542dcc0ad24bdd045200a2b817b43bc0bbed
Author: Etienne Robinet <et...@gmail.com>
AuthorDate: Mon Apr 6 10:16:52 2020 +0200
Added comparing method
---
.../apache-camel/src/main/java/org/apache/plc4x/camel/TagData.java | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/TagData.java b/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/TagData.java
index f67416f..c6a0ad7 100644
--- a/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/TagData.java
+++ b/plc4j/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/TagData.java
@@ -62,4 +62,11 @@ public class TagData {
public String toString(){
return "("+tagName+") : "+value;
}
+
+ @Override
+ public boolean equals(Object tag){
+ return ((TagData)tag).getValue()== value
+ && ((TagData)tag).getTagName()==tagName
+ && ((TagData)tag).getQuery()==query;
+ }
}