From 6eb8ae41ecd68ddf4a01c7aa6d24375c6a8b83e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Go=CC=88tz?= <christian.goetz@dc-square.de>
Date: Sun, 18 May 2014 00:29:30 +0200
Subject: [PATCH 1/2] added maven shade plugin to include fusesource client
 into the jar file

---
 pom.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pom.xml b/pom.xml
index fd981ef..c134754 100755
--- a/pom.xml
+++ b/pom.xml
@@ -71,6 +71,19 @@
 					<target>1.6</target>
 				</configuration>
 			</plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.0</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
 		</plugins>
 	</build>
 </project>

From c561158f2585cccb3e4f317a104a047623116d85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Go=CC=88tz?= <christian.goetz@dc-square.de>
Date: Sun, 18 May 2014 00:30:41 +0200
Subject: [PATCH 2/2] fixed bug in the gui of MQTTPublisher

---
 .../mqtt/control/gui/MQTTPublisherGui.java    | 39 +++++++++----------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/main/java/org/apache/jmeter/protocol/mqtt/control/gui/MQTTPublisherGui.java b/src/main/java/org/apache/jmeter/protocol/mqtt/control/gui/MQTTPublisherGui.java
index 95f38c6..9fb2e70 100644
--- a/src/main/java/org/apache/jmeter/protocol/mqtt/control/gui/MQTTPublisherGui.java
+++ b/src/main/java/org/apache/jmeter/protocol/mqtt/control/gui/MQTTPublisherGui.java
@@ -21,19 +21,6 @@ Licensed to the Apache Software Foundation (ASF) under one
 */
 
 package org.apache.jmeter.protocol.mqtt.control.gui;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.BoxLayout;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 import org.apache.jmeter.gui.util.JLabeledRadioI18N;
 import org.apache.jmeter.gui.util.JSyntaxTextArea;
 import org.apache.jmeter.gui.util.JTextScrollPane;
@@ -45,6 +32,14 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.jorphan.gui.JLabeledPasswordField;
 import org.apache.jorphan.gui.JLabeledTextField;
 
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+
 /**
  * @author Tuan Hiep
  * 
@@ -331,14 +326,16 @@ public void configure(TestElement el) {
 		mqttPwd.setText(sampler.getPassword());
 		textMessage.setInitialText(sampler.getTextMessage());
 		textMessage.setCaretPosition(0);
-		msgChoice.setText(sampler.getMessageChoice());
-		iterations.setText(sampler.getIterations());
-		useAuth.setSelected(sampler.isUseAuth());
-		mqttUser.setEnabled(useAuth.isSelected());
-		mqttPwd.setEnabled(useAuth.isSelected());
-		updateChoice(msgChoice.getText());
-		updateChoice(msgFormat.getText());
-		updateChoice("Suffix="+String.valueOf(this.suffixClientId.isSelected()));
+        clientId.setText(sampler.getCLIENT_ID());
+        connectionPerTopic.setSelected(sampler.isOneConnectionPerTopic());
+        msgChoice.setText(sampler.getMessageChoice());
+        iterations.setText(sampler.getIterations());
+        useAuth.setSelected(sampler.isUseAuth());
+        mqttUser.setEnabled(useAuth.isSelected());
+        mqttPwd.setEnabled(useAuth.isSelected());
+        updateChoice(msgChoice.getText());
+        updateChoice(msgFormat.getText());
+        updateChoice("Suffix=" + String.valueOf(this.suffixClientId.isSelected()));
 	
 	}