From 718ba5a5c219f7cfa9cdf639066d1a68dab3ea75 Mon Sep 17 00:00:00 2001
From: Admin <info@bwssystems.com>
Date: Wed, 4 Nov 2015 11:00:46 -0600
Subject: [PATCH] Updated build in pom.xml to include classes that were removed
 for minimize. This required a dummy clas setup as well in the Harmony Server.

---
 pom.xml                                       | 30 ++++++++++++++-----
 .../com/bwssystems/harmony/HarmonyServer.java |  5 ++++
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5845783..0aa81ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>1.0.6</version>
+	<version>1.0.7</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
@@ -80,11 +80,6 @@
 		  <artifactId>smack-core</artifactId>
 		  <version>4.0.7</version>
 		</dependency>
-		<dependency>
-		  <groupId>org.igniterealtime.smack</groupId>
-		  <artifactId>smack-debug</artifactId>
-		  <version>4.0.7</version>
-		</dependency>
 	</dependencies>
 
 	<build>
@@ -126,11 +121,12 @@
 										<exclude>META-INF/*.RSA</exclude>
 										<exclude>META-INF/*.txt</exclude>
 										<exclude>META-INF/maven/**</exclude>
-										<exclude>META-INF/services/**</exclude>
-										<exclude>META-INF/DEPENDENCIES</exclude>
 										<exclude>about_files/**</exclude>
 									</excludes>
 								</filter>
+								<filter>
+									<artifact>*:*</artifact>
+								</filter>
 								<filter>
 									<artifact>org.slf4j:*</artifact>
 									<includes>
@@ -143,6 +139,24 @@
 										<include>**</include>
 									</includes>
 								</filter>
+								<filter>
+									<artifact>xpp3:xpp3</artifact>
+									<includes>
+										<include>**</include>
+									</includes>
+								</filter>
+								<filter>
+									<artifact>org.igniterealtime.smack:*</artifact>
+									<includes>
+										<include>**</include>
+									</includes>
+								</filter>
+								<filter>
+									<artifact>com.github.bwssytems:harmony-java-client</artifact>
+									<includes>
+										<include>**</include>
+									</includes>
+								</filter>
 							</filters>
 							<transformers>
 								<transformer
diff --git a/src/main/java/com/bwssystems/harmony/HarmonyServer.java b/src/main/java/com/bwssystems/harmony/HarmonyServer.java
index 417744c..bb5fe4f 100644
--- a/src/main/java/com/bwssystems/harmony/HarmonyServer.java
+++ b/src/main/java/com/bwssystems/harmony/HarmonyServer.java
@@ -15,6 +15,7 @@ import net.whistlingfish.harmony.ActivityChangeListener;
 import net.whistlingfish.harmony.HarmonyClient;
 import net.whistlingfish.harmony.HarmonyClientModule;
 import net.whistlingfish.harmony.config.Activity;
+import net.whistlingfish.harmony.protocol.OAReplyProvider;
 
 public class HarmonyServer {
     @Inject
@@ -22,12 +23,14 @@ public class HarmonyServer {
     
     private HarmonyHandler myHarmony;
     private DevModeResponse devResponse;
+    private OAReplyProvider dummyProvider;
     
     private Logger log = LoggerFactory.getLogger(HarmonyServer.class);
 
 	public HarmonyServer() {
 		super();
 		myHarmony = null;
+		dummyProvider = null;
 	}
 
 	public static HarmonyServer setup(BridgeSettings bridgeSettings) throws Exception {
@@ -47,6 +50,8 @@ public class HarmonyServer {
 	private void execute(BridgeSettings mySettings) throws Exception {
         Boolean noopCalls = Boolean.parseBoolean(System.getProperty("noop.calls", "false"));
         String modeString = "";
+        if(dummyProvider != null)
+        	log.debug("something is very wrong as dummyProvider is not null...");
         if(mySettings.isDevMode())
         	modeString = " (development mode)";
         if(noopCalls)