You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by cd...@apache.org on 2018/03/11 16:40:23 UTC
[6/6] incubator-edgent git commit: - Added Java 7 and Android
versions of the RabbitMQ connector - Added the RabbitMQ connector to the
distributions - Added "Vino Yang" to the CONTRIBUTORS for version 1.3.0 -
Added "EDGENT-447 Add RabbitMQ connector" to
- Added Java 7 and Android versions of the RabbitMQ connector
- Added the RabbitMQ connector to the distributions
- Added "Vino Yang" to the CONTRIBUTORS for version 1.3.0
- Added "EDGENT-447 Add RabbitMQ connector" to the RELEASE_NOTES for version 1.3.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/d8d6c40f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/d8d6c40f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/d8d6c40f
Branch: refs/heads/develop
Commit: d8d6c40fcb80c917c6f9f26c3549dedb35314be2
Parents: 411ec24
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Sun Mar 11 17:40:06 2018 +0100
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Sun Mar 11 17:40:06 2018 +0100
----------------------------------------------------------------------
CONTRIBUTORS | 1 +
RELEASE_NOTES | 3 +-
connectors/pom.xml | 2 +-
connectors/rabbitmq/pom.xml | 20 +---
distribution/pom.xml | 5 +
platforms/android/connectors/pom.xml | 1 +
platforms/android/connectors/rabbitmq/pom.xml | 99 ++++++++++++++++
platforms/android/distribution/pom.xml | 5 +
platforms/java7/connectors/pom.xml | 1 +
platforms/java7/connectors/rabbitmq/pom.xml | 127 +++++++++++++++++++++
platforms/java7/distribution/pom.xml | 5 +
11 files changed, 253 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d8d6c40f/CONTRIBUTORS
----------------------------------------------------------------------
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b6db687..00b69a0 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -23,6 +23,7 @@ Apache Edgent(incubating) 1.3.0
---------------------
Dale LaBossiere
Christofer Dutz
+Vino Yang
Apache Edgent(incubating) 1.2.0
---------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d8d6c40f/RELEASE_NOTES
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index baf2cd5..caa4d96 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -5,7 +5,8 @@ TODO - summary
New Features
--------------------
TODO
-EDGENT-439 Optionally specify TCP port for Edgent console
+EDGENT-439 Optionally specify TCP port for Edgent console
+EDGENT-447 Add RabbitMQ connector
Incompatible API changes
------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d8d6c40f/connectors/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/pom.xml b/connectors/pom.xml
index edc2e5b..40be3b5 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -43,13 +43,13 @@
<module>kafka</module>
<module>mqtt</module>
<module>pubsub</module>
+ <module>rabbitmq</module>
<module>serial</module>
<module>websocket</module>
<module>websocket-base</module>
<module>websocket-jetty</module>
<module>websocket-misc</module>
<module>websocket-server</module>
- <module>rabbitmq</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d8d6c40f/connectors/rabbitmq/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/rabbitmq/pom.xml b/connectors/rabbitmq/pom.xml
index a648b61..caa4138 100644
--- a/connectors/rabbitmq/pom.xml
+++ b/connectors/rabbitmq/pom.xml
@@ -32,21 +32,22 @@
<name>Apache Edgent (Java 8): Connectors: RabbitMQ</name>
<properties>
- <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
- <edgent.version></edgent.version>
<rabbitmq.version>5.1.2</rabbitmq.version>
</properties>
<dependencies>
- <!-- edgent start -->
<dependency>
<groupId>org.apache.edgent</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
- <!-- edgent end -->
- <!-- edgent test start -->
+ <dependency>
+ <groupId>com.rabbitmq</groupId>
+ <artifactId>amqp-client</artifactId>
+ <version>${rabbitmq.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.edgent</groupId>
<artifactId>edgent-providers-direct</artifactId>
@@ -74,15 +75,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <!-- edgent test end -->
-
- <!-- rabbitmq start -->
- <dependency>
- <groupId>com.rabbitmq</groupId>
- <artifactId>amqp-client</artifactId>
- <version>${rabbitmq.version}</version>
- </dependency>
- <!-- rabbitmq end -->
</dependencies>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d8d6c40f/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index a96e40f..43bc4dc 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -184,6 +184,11 @@
</dependency>
<dependency>
<groupId>org.apache.edgent</groupId>
+ <artifactId>edgent-connectors-rabbitmq</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.edgent</groupId>
<artifactId>edgent-connectors-serial</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d8d6c40f/platforms/android/connectors/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/connectors/pom.xml b/platforms/android/connectors/pom.xml
index 4219449..15f3c7e 100644
--- a/platforms/android/connectors/pom.xml
+++ b/platforms/android/connectors/pom.xml
@@ -43,6 +43,7 @@
<module>kafka</module>
<module>mqtt</module>
<module>pubsub</module>
+ <module>rabbitmq</module>
<module>serial</module>
<module>websocket</module>
<module>websocket-base</module>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d8d6c40f/platforms/android/connectors/rabbitmq/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/connectors/rabbitmq/pom.xml b/platforms/android/connectors/rabbitmq/pom.xml
new file mode 100644
index 0000000..7c47297
--- /dev/null
+++ b/platforms/android/connectors/rabbitmq/pom.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.edgent.android</groupId>
+ <artifactId>edgent-connectors</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>edgent-connectors-rabbitmq</artifactId>
+
+ <name>Apache Edgent (Android): Connectors: RabbitMQ</name>
+
+ <properties>
+ <rabbitmq.version>5.1.2</rabbitmq.version>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.edgent</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ <excludes>META-INF/**</excludes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.edgent</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+ <excludes>META-INF/**</excludes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.edgent.android</groupId>
+ <artifactId>edgent-api-topology</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.rabbitmq</groupId>
+ <artifactId>amqp-client</artifactId>
+ <version>${rabbitmq.version}</version>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d8d6c40f/platforms/android/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/distribution/pom.xml b/platforms/android/distribution/pom.xml
index dded491..cacd83b 100644
--- a/platforms/android/distribution/pom.xml
+++ b/platforms/android/distribution/pom.xml
@@ -198,6 +198,11 @@
</dependency>
<dependency>
<groupId>org.apache.edgent.android</groupId>
+ <artifactId>edgent-connectors-rabbitmq</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.edgent.android</groupId>
<artifactId>edgent-connectors-serial</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d8d6c40f/platforms/java7/connectors/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/connectors/pom.xml b/platforms/java7/connectors/pom.xml
index aca7bc6..2e29784 100644
--- a/platforms/java7/connectors/pom.xml
+++ b/platforms/java7/connectors/pom.xml
@@ -43,6 +43,7 @@
<module>kafka</module>
<module>mqtt</module>
<module>pubsub</module>
+ <module>rabbitmq</module>
<module>serial</module>
<module>websocket</module>
<module>websocket-base</module>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d8d6c40f/platforms/java7/connectors/rabbitmq/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/connectors/rabbitmq/pom.xml b/platforms/java7/connectors/rabbitmq/pom.xml
new file mode 100644
index 0000000..1218377
--- /dev/null
+++ b/platforms/java7/connectors/rabbitmq/pom.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.edgent.java7</groupId>
+ <artifactId>edgent-connectors</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>edgent-connectors-rabbitmq</artifactId>
+
+ <name>Apache Edgent (Java 7): Connectors: RabbitMQ</name>
+
+ <properties>
+ <rabbitmq.version>5.1.2</rabbitmq.version>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.edgent</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ <excludes>META-INF/**</excludes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.edgent</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+ <excludes>META-INF/**</excludes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.edgent.java7</groupId>
+ <artifactId>edgent-api-topology</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.rabbitmq</groupId>
+ <artifactId>amqp-client</artifactId>
+ <version>${rabbitmq.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.edgent.java7</groupId>
+ <artifactId>edgent-providers-direct</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.edgent.java7</groupId>
+ <artifactId>edgent-providers-direct</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.edgent.java7</groupId>
+ <artifactId>edgent-connectors-common</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.edgent.java7</groupId>
+ <artifactId>edgent-api-topology</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d8d6c40f/platforms/java7/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/distribution/pom.xml b/platforms/java7/distribution/pom.xml
index 4b90bb7..1a6376b 100644
--- a/platforms/java7/distribution/pom.xml
+++ b/platforms/java7/distribution/pom.xml
@@ -184,6 +184,11 @@
</dependency>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
+ <artifactId>edgent-connectors-rabbitmq</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.edgent.java7</groupId>
<artifactId>edgent-connectors-serial</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>