You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2014/10/24 11:30:30 UTC
[1/2] git commit: mqtt changes to LB
Repository: stratos
Updated Branches:
refs/heads/master 9758c8364 -> 424a843f0
mqtt changes to LB
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/193357e8
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/193357e8
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/193357e8
Branch: refs/heads/master
Commit: 193357e863255ef9b645d5431a23e5e2a5c5f58c
Parents: 2758d93
Author: R-Rajkumar <rr...@gmail.com>
Authored: Fri Oct 24 14:59:54 2014 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Fri Oct 24 14:59:54 2014 +0530
----------------------------------------------------------------------
.../org.apache.stratos.load.balancer/pom.xml | 6 +++++-
.../load-balancer/modules/distribution/pom.xml | 5 +++++
.../distribution/src/main/assembly/bin.xml | 11 ++++++++++
.../src/main/conf/mqtttopic.properties | 21 ++++++++++++++++++++
4 files changed, 42 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/193357e8/components/org.apache.stratos.load.balancer/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/pom.xml b/components/org.apache.stratos.load.balancer/pom.xml
index fbc8a1e..ed3a0a2 100644
--- a/components/org.apache.stratos.load.balancer/pom.xml
+++ b/components/org.apache.stratos.load.balancer/pom.xml
@@ -98,7 +98,11 @@
<artifactId>commons-pool</artifactId>
<version>1.6</version>
</dependency>
-
+ <dependency>
+ <groupId>org.eclipse.paho</groupId>
+ <artifactId>mqtt-client</artifactId>
+ <version>0.4.0</version>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/stratos/blob/193357e8/products/load-balancer/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/pom.xml b/products/load-balancer/modules/distribution/pom.xml
index bee82fb..5580b49 100755
--- a/products/load-balancer/modules/distribution/pom.xml
+++ b/products/load-balancer/modules/distribution/pom.xml
@@ -446,6 +446,11 @@
<artifactId>org.wso2.carbon.relay</artifactId>
<version>${carbon.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.paho</groupId>
+ <artifactId>mqtt-client</artifactId>
+ <version>0.4.0</version>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/stratos/blob/193357e8/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/src/main/assembly/bin.xml b/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
index 0d9dfcd..2dbdaad 100755
--- a/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
+++ b/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
@@ -196,6 +196,12 @@
<include>org.wso2.carbon:org.wso2.carbon.event.client:jar</include-->
</includes>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/components/lib</outputDirectory>
+ <includes>
+ <include>org.eclipse.paho:mqtt-client:jar</include>
+ </includes>
+ </dependencySet>
</dependencySets>
<files>
@@ -253,6 +259,11 @@
<destName>jndi.properties</destName>
</file>
<file>
+ <source>src/main/conf/mqtttopic.properties</source>
+ <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory>
+ <destName>mqtttopic.properties</destName>
+ </file>
+ <file>
<source>src/main/conf/log4j.properties</source>
<outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory>
<destName>log4j.properties</destName>
http://git-wip-us.apache.org/repos/asf/stratos/blob/193357e8/products/load-balancer/modules/distribution/src/main/conf/mqtttopic.properties
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/src/main/conf/mqtttopic.properties b/products/load-balancer/modules/distribution/src/main/conf/mqtttopic.properties
new file mode 100644
index 0000000..823c1a9
--- /dev/null
+++ b/products/load-balancer/modules/distribution/src/main/conf/mqtttopic.properties
@@ -0,0 +1,21 @@
+# 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.
+#
+
+mqtturl=tcp://localhost:1883
+clientID=stratos
+tempfilelocation=/tmp
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/stratos
Posted by ra...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/424a843f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/424a843f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/424a843f
Branch: refs/heads/master
Commit: 424a843f0d92e951af3bdc95ee5d021f35a9b6a8
Parents: 193357e 9758c83
Author: R-Rajkumar <rr...@gmail.com>
Authored: Fri Oct 24 15:00:08 2014 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Fri Oct 24 15:00:08 2014 +0530
----------------------------------------------------------------------
.../topology/TopologyEventMessageListener.java | 71 +++++++++-----------
1 file changed, 32 insertions(+), 39 deletions(-)
----------------------------------------------------------------------