Skip to content

Commit

Permalink
Updated build in pom.xml to include classes that were removed for
Browse files Browse the repository at this point in the history
minimize. This required a dummy clas setup as well in the Harmony
Server.
  • Loading branch information
bwssytems committed Nov 4, 2015
1 parent 2e6944d commit 718ba5a
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 8 deletions.
30 changes: 22 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/com/bwssystems/harmony/HarmonyServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,22 @@
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
private HarmonyClient harmonyClient;

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 {
Expand All @@ -47,6 +50,8 @@ public static HarmonyServer setup(BridgeSettings bridgeSettings) throws Exceptio
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)
Expand Down

0 comments on commit 718ba5a

Please sign in to comment.