Merge pull request #72 from robmoffat/master

Fix for #50

chat-workflow/src/main/java/com/github/deutschebank/symphony/workflow/java/Exposed.java

@@ -10,8 +10,4 @@
 
 	String[] rooms() default {};
 
-	/**
-	 * Use this with a pasted table command
-	 */
-	String[] columns() default {};
 }

chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/fixture/Claim.java

@@ -0,0 +1,71 @@
+package com.github.deutschebank.symphony.workflow.fixture;
+
+import com.github.deutschebank.symphony.workflow.content.Author;
+import com.github.deutschebank.symphony.workflow.content.User;
+import com.github.deutschebank.symphony.workflow.java.Work;
+
+@Work(editable = false, instructions = "Expenses Claim")
+public class Claim {
+
+	enum Status { OPEN, APPROVED, PAID };
+
+	String description;
+
+	Author author;
+
+	float amount;
+
+	User approvedBy;
+
+	User paidBy;
+
+	Status status;
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public Author getAuthor() {
+		return author;
+	}
+
+	public void setAuthor(Author author) {
+		this.author = author;
+	}
+
+	public float getAmount() {
+		return amount;
+	}
+
+	public void setAmount(float amount) {
+		this.amount = amount;
+	}
+
+	public User getApprovedBy() {
+		return approvedBy;
+	}
+
+	public void setApprovedBy(User approvedBy) {
+		this.approvedBy = approvedBy;
+	}
+
+	public User getPaidBy() {
+		return paidBy;
+	}
+
+	public void setPaidBy(User paidBy) {
+		this.paidBy = paidBy;
+	}
+
+	public Status getStatus() {
+		return status;
+	}
+
+	public void setStatus(Status status) {
+		this.status = status;
+	}
+}

chat-workflow/src/test/java/com/github/deutschebank/symphony/workflow/fixture/StartClaim.java

@@ -0,0 +1,8 @@
+package com.github.deutschebank.symphony.workflow.fixture;
+
+public class StartClaim {
+
+	String description;
+
+	float amount;
+}

symphony-maven-build-reporter/src/main/java/com/github/deutschebank/symphonyp/maven/ProxyingWrapper.java

@@ -19,8 +19,6 @@
 
 public class ProxyingWrapper {
 
-    private static final String DEFAULT_JKS_RESOURCE = "all_symphony_certs_truststore.jks";
-
     private final List<String> proxyHosts;
 
     private final Logger log;
@@ -39,14 +37,16 @@ public ProxyingWrapper(String jksFile, List<String> proxyHosts, String url, Symp
 
         InputStream is = readJks(jksFile);
 
-        try {
-            TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-            KeyStore keystore = KeyStore.getInstance("JKS");
-            keystore.load(is, null);
-            tmf.init(keystore);
-            builder.setTrustManagers(tmf.getTrustManagers());
-        } catch (Exception e) {
-            throw new RuntimeException("Couldn't instantiate trust store", e);
+        if (is != null) {
+	        try {
+	            TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+	            KeyStore keystore = KeyStore.getInstance("JKS");
+	            keystore.load(is, null);
+	            tmf.init(keystore);
+	            builder.setTrustManagers(tmf.getTrustManagers());
+	        } catch (Exception e) {
+	            throw new RuntimeException("Couldn't instantiate trust store", e);
+	        }
         }
     }
 
@@ -89,7 +89,7 @@ private InputStream readJks(String jksFile) throws IOException {
             return new FileInputStream(jksFile);
         } else {
             log.info("trust-store.jks was not specified, using default jks");
-            return this.getClass().getClassLoader().getResourceAsStream(DEFAULT_JKS_RESOURCE);
+            return null;
         }
     }
 }

symphony-maven-build-reporter/src/main/resources/template.fm

@@ -35,7 +35,7 @@
                               </#if>
                              </td>
                              <td>
-                               ${p.time / 1000} Seconds
+                               ${p.time } ms
                              </td>
                           </tr>
                           </#list>