Merge branch 'master' of https://vcs.factcenter.org/meerkat/meerkat-java into voting-booth-gui

.gitignore

@@ -19,3 +19,20 @@ out
 /meerkat_election_params_tempfile.dat
 /meerkat_booth_system_messages.dat
 local.properties
+# Angular junk
+*/tmp
+*/dist
+*/out-tsc
+*/node_modules
+*/e2e/*.js
+*/e2e/*.map
+*/.sass-cache
+*/connect.lock
+*/coverage
+*/libpeerconnection.log
+npm-debug.log
+testem.log
+*/typings
+bundle.js
+bundle.d.ts
+

build.gradle-template

@@ -1,7 +1,7 @@
 
 plugins {
   id "us.kirchmeier.capsule" version "1.0.2"
-  id 'com.google.protobuf' version '0.8.0'
+  id 'com.google.protobuf' version '0.8.1'
 }
 
 apply plugin: 'java'

bulletin-board-client/build.gradle

@@ -1,7 +1,7 @@
 
 plugins {
     id "us.kirchmeier.capsule" version '1.0.2'
-    id 'com.google.protobuf' version '0.8.0'
+    id 'com.google.protobuf' version '0.8.1'
 }
 
 apply plugin: 'java'

bulletin-board-client/src/main/java/meerkat/bulletinboard/BatchDataContainer.java

@@ -1,6 +1,6 @@
 package meerkat.bulletinboard;
 
-import meerkat.protobuf.BulletinBoardAPI.BatchChunk;
+import meerkat.protobuf.BulletinBoardApi.BatchChunk;
 import meerkat.bulletinboard.AsyncBulletinBoardClient.BatchIdentifier;
 
 import java.util.List;

bulletin-board-client/src/main/java/meerkat/bulletinboard/CachedBulletinBoardClient.java

@@ -3,7 +3,7 @@ package meerkat.bulletinboard;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.protobuf.Timestamp;
 import meerkat.comm.CommunicationException;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 import meerkat.protobuf.Crypto.Signature;
 import meerkat.protobuf.Voting.*;
 

bulletin-board-client/src/main/java/meerkat/bulletinboard/LocalBulletinBoardClient.java

@@ -8,7 +8,7 @@ import meerkat.comm.MessageInputStream;
 import meerkat.comm.MessageInputStream.MessageInputStreamFactory;
 import meerkat.comm.MessageOutputStream;
 import meerkat.crypto.concrete.SHA256Digest;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 import meerkat.protobuf.Crypto.Signature;
 import meerkat.protobuf.Voting.*;
 import meerkat.util.BulletinBoardUtils;

bulletin-board-client/src/main/java/meerkat/bulletinboard/SimpleBulletinBoardClient.java

@@ -6,8 +6,8 @@ import com.google.protobuf.Int64Value;
 import meerkat.bulletinboard.workers.singleserver.*;
 import meerkat.comm.CommunicationException;
 import meerkat.crypto.concrete.SHA256Digest;
-import meerkat.protobuf.BulletinBoardAPI;
+import meerkat.protobuf.BulletinBoardApi;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 import meerkat.protobuf.Voting.*;
 import meerkat.rest.*;
 import meerkat.util.BulletinBoardUtils;

bulletin-board-client/src/main/java/meerkat/bulletinboard/SimpleBulletinBoardSynchronizer.java

@@ -3,7 +3,7 @@ package meerkat.bulletinboard;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.protobuf.ByteString;
 import meerkat.comm.CommunicationException;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 import meerkat.util.BulletinBoardUtils;
 
 import java.util.LinkedList;

bulletin-board-client/src/main/java/meerkat/bulletinboard/SingleServerBulletinBoardClient.java

@@ -9,7 +9,7 @@ import com.google.protobuf.Timestamp;
 import meerkat.bulletinboard.workers.singleserver.*;
 import meerkat.comm.CommunicationException;
 import meerkat.crypto.concrete.SHA256Digest;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 import meerkat.protobuf.Crypto;
 import meerkat.protobuf.Voting.BulletinBoardClientParams;
 import meerkat.util.BulletinBoardUtils;

bulletin-board-client/src/main/java/meerkat/bulletinboard/ThreadedBulletinBoardClient.java

@@ -4,7 +4,7 @@ import com.google.common.util.concurrent.FutureCallback;
 
 import com.google.protobuf.Timestamp;
 import meerkat.bulletinboard.workers.multiserver.*;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 import meerkat.protobuf.Crypto.Signature;
 import meerkat.protobuf.Voting.*;
 

bulletin-board-client/src/main/java/meerkat/bulletinboard/ThreadedBulletinBoardSubscriber.java

@@ -3,10 +3,10 @@ package meerkat.bulletinboard;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.protobuf.Timestamp;
 import meerkat.comm.CommunicationException;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 import meerkat.util.BulletinBoardUtils;
 
-import static meerkat.protobuf.BulletinBoardAPI.FilterType.*;
+import static meerkat.protobuf.BulletinBoardApi.FilterType.*;
 
 import java.util.*;
 import java.util.concurrent.Semaphore;

bulletin-board-client/src/main/java/meerkat/bulletinboard/workers/multiserver/MultiServerGetRedundancyWorker.java

@@ -4,7 +4,7 @@ import com.google.common.util.concurrent.FutureCallback;
 import meerkat.bulletinboard.MultiServerWorker;
 import meerkat.bulletinboard.SingleServerBulletinBoardClient;
 import meerkat.comm.CommunicationException;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 
 import java.util.Iterator;
 import java.util.List;

bulletin-board-client/src/main/java/meerkat/bulletinboard/workers/multiserver/MultiServerPostBatchWorker.java

@@ -2,7 +2,7 @@ package meerkat.bulletinboard.workers.multiserver;
 
 import com.google.common.util.concurrent.FutureCallback;
 import meerkat.bulletinboard.SingleServerBulletinBoardClient;
-import meerkat.protobuf.BulletinBoardAPI.BulletinBoardMessage;
+import meerkat.protobuf.BulletinBoardApi.BulletinBoardMessage;
 
 import java.util.List;
 

bulletin-board-client/src/main/java/meerkat/bulletinboard/workers/multiserver/MultiServerPostMessageWorker.java

@@ -2,7 +2,7 @@ package meerkat.bulletinboard.workers.multiserver;
 
 import com.google.common.util.concurrent.FutureCallback;
 import meerkat.bulletinboard.SingleServerBulletinBoardClient;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 
 import java.util.List;
 

bulletin-board-client/src/main/java/meerkat/bulletinboard/workers/multiserver/MultiServerReadBatchDataWorker.java

@@ -2,7 +2,7 @@ package meerkat.bulletinboard.workers.multiserver;
 
 import com.google.common.util.concurrent.FutureCallback;
 import meerkat.bulletinboard.SingleServerBulletinBoardClient;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 
 import java.util.List;
 

bulletin-board-client/src/main/java/meerkat/bulletinboard/workers/multiserver/MultiServerReadMessageWorker.java

@@ -2,8 +2,8 @@ package meerkat.bulletinboard.workers.multiserver;
 
 import com.google.common.util.concurrent.FutureCallback;
 import meerkat.bulletinboard.SingleServerBulletinBoardClient;
-import meerkat.protobuf.BulletinBoardAPI.BulletinBoardMessage;
+import meerkat.protobuf.BulletinBoardApi.BulletinBoardMessage;
-import meerkat.protobuf.BulletinBoardAPI.MessageID;
+import meerkat.protobuf.BulletinBoardApi.MessageID;
 
 import java.util.List;
 

bulletin-board-client/src/main/java/meerkat/bulletinboard/workers/multiserver/MultiServerReadMessagesWorker.java

@@ -2,7 +2,7 @@ package meerkat.bulletinboard.workers.multiserver;
 
 import com.google.common.util.concurrent.FutureCallback;
 import meerkat.bulletinboard.SingleServerBulletinBoardClient;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 
 import java.util.List;
 

bulletin-board-client/src/main/java/meerkat/bulletinboard/workers/singleserver/SingleServerBeginBatchWorker.java

@@ -3,7 +3,7 @@ package meerkat.bulletinboard.workers.singleserver;
 import com.google.protobuf.Int64Value;
 import meerkat.bulletinboard.SingleServerWorker;
 import meerkat.comm.CommunicationException;
-import meerkat.protobuf.BulletinBoardAPI.BeginBatchMessage;
+import meerkat.protobuf.BulletinBoardApi.BeginBatchMessage;
 import meerkat.rest.Constants;
 
 import javax.ws.rs.ProcessingException;

bulletin-board-client/src/main/java/meerkat/bulletinboard/workers/singleserver/SingleServerCloseBatchWorker.java

@@ -1,6 +1,6 @@
 package meerkat.bulletinboard.workers.singleserver;
 
-import meerkat.protobuf.BulletinBoardAPI.CloseBatchMessage;
+import meerkat.protobuf.BulletinBoardApi.CloseBatchMessage;
 
 import static meerkat.bulletinboard.BulletinBoardConstants.CLOSE_BATCH_PATH;
 

bulletin-board-client/src/main/java/meerkat/bulletinboard/workers/singleserver/SingleServerGenerateSyncQueryWorker.java

@@ -3,8 +3,8 @@ package meerkat.bulletinboard.workers.singleserver;
 import com.google.protobuf.Int64Value;
 import meerkat.bulletinboard.SingleServerWorker;
 import meerkat.comm.CommunicationException;
-import meerkat.protobuf.BulletinBoardAPI.SyncQuery;
+import meerkat.protobuf.BulletinBoardApi.SyncQuery;
-import meerkat.protobuf.BulletinBoardAPI.GenerateSyncQueryParams;
+import meerkat.protobuf.BulletinBoardApi.GenerateSyncQueryParams;
 import meerkat.rest.Constants;
 
 import javax.ws.rs.ProcessingException;

bulletin-board-client/src/main/java/meerkat/bulletinboard/workers/singleserver/SingleServerGetRedundancyWorker.java

@@ -3,7 +3,7 @@ package meerkat.bulletinboard.workers.singleserver;
 import meerkat.bulletinboard.SingleServerWorker;
 import meerkat.comm.CommunicationException;
 import meerkat.comm.MessageInputStream;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 import meerkat.rest.Constants;
 
 import javax.ws.rs.client.Client;

bulletin-board-client/src/main/java/meerkat/bulletinboard/workers/singleserver/SingleServerPostBatchWorker.java

@@ -1,6 +1,6 @@
 package meerkat.bulletinboard.workers.singleserver;
 
-import meerkat.protobuf.BulletinBoardAPI.BatchMessage;
+import meerkat.protobuf.BulletinBoardApi.BatchMessage;
 
 import static meerkat.bulletinboard.BulletinBoardConstants.POST_BATCH_PATH;
 

bulletin-board-client/src/main/java/meerkat/bulletinboard/workers/singleserver/SingleServerPostMessageWorker.java

@@ -1,6 +1,6 @@
 package meerkat.bulletinboard.workers.singleserver;
 
-import meerkat.protobuf.BulletinBoardAPI.BulletinBoardMessage;
+import meerkat.protobuf.BulletinBoardApi.BulletinBoardMessage;
 
 import static meerkat.bulletinboard.BulletinBoardConstants.POST_MESSAGE_PATH;
 

bulletin-board-client/src/main/java/meerkat/bulletinboard/workers/singleserver/SingleServerQuerySyncWorker.java

@@ -2,8 +2,8 @@ package meerkat.bulletinboard.workers.singleserver;
 
 import meerkat.bulletinboard.SingleServerWorker;
 import meerkat.comm.CommunicationException;
-import meerkat.protobuf.BulletinBoardAPI.SyncQuery;
+import meerkat.protobuf.BulletinBoardApi.SyncQuery;
-import meerkat.protobuf.BulletinBoardAPI.SyncQueryResponse;
+import meerkat.protobuf.BulletinBoardApi.SyncQueryResponse;
 import meerkat.rest.Constants;
 
 import javax.ws.rs.ProcessingException;

bulletin-board-client/src/main/java/meerkat/bulletinboard/workers/singleserver/SingleServerReadBatchWorker.java

@@ -3,7 +3,7 @@ package meerkat.bulletinboard.workers.singleserver;
 import meerkat.bulletinboard.SingleServerWorker;
 import meerkat.comm.CommunicationException;
 import meerkat.comm.MessageInputStream;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 import meerkat.rest.Constants;
 
 import javax.ws.rs.client.Client;

bulletin-board-client/src/main/java/meerkat/bulletinboard/workers/singleserver/SingleServerReadMessagesWorker.java

@@ -3,10 +3,10 @@ package meerkat.bulletinboard.workers.singleserver;
 import meerkat.bulletinboard.SingleServerWorker;
 import meerkat.comm.CommunicationException;
 import meerkat.comm.MessageInputStream;
-import meerkat.protobuf.BulletinBoardAPI;
+import meerkat.protobuf.BulletinBoardApi;
-import meerkat.protobuf.BulletinBoardAPI.BulletinBoardMessageList;
+import meerkat.protobuf.BulletinBoardApi.BulletinBoardMessageList;
-import meerkat.protobuf.BulletinBoardAPI.MessageFilterList;
+import meerkat.protobuf.BulletinBoardApi.MessageFilterList;
-import meerkat.protobuf.BulletinBoardAPI.BulletinBoardMessage;
+import meerkat.protobuf.BulletinBoardApi.BulletinBoardMessage;
 import meerkat.rest.Constants;
 
 import javax.ws.rs.ProcessingException;

bulletin-board-client/src/test/java/meerkat/bulletinboard/BulletinBoardSynchronizerTest.java

@@ -11,7 +11,7 @@ import meerkat.bulletinboard.sqlserver.H2QueryProvider;
 
 import meerkat.comm.CommunicationException;
 import meerkat.crypto.concrete.ECDSASignature;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 import meerkat.util.BulletinBoardMessageComparator;
 import meerkat.util.BulletinBoardMessageGenerator;
 import org.junit.*;

bulletin-board-client/src/test/java/meerkat/bulletinboard/GenericBulletinBoardClientTester.java

@@ -6,7 +6,7 @@ import com.google.protobuf.Timestamp;
 import meerkat.comm.CommunicationException;
 import meerkat.crypto.concrete.ECDSASignature;
 import meerkat.crypto.concrete.SHA256Digest;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 import meerkat.protobuf.Crypto;
 import meerkat.util.BulletinBoardMessageComparator;
 import meerkat.util.BulletinBoardMessageGenerator;

bulletin-board-client/src/test/java/meerkat/bulletinboard/GenericSubscriptionClientTester.java

@@ -5,7 +5,7 @@ import com.google.protobuf.ByteString;
 import com.google.protobuf.Timestamp;
 import meerkat.comm.CommunicationException;
 import meerkat.crypto.concrete.ECDSASignature;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 import meerkat.util.BulletinBoardMessageComparator;
 import meerkat.util.BulletinBoardMessageGenerator;
 

bulletin-board-server-frontend/.angular-cli.json

@@ -0,0 +1,57 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "project": {
+    "name": "bulletin-board-server-frontend"
+  },
+  "apps": [
+    {
+      "root": "src",
+      "outDir": "dist",
+      "assets": [
+        "assets",
+        "favicon.ico"
+      ],
+      "index": "index.html",
+      "main": "main.ts",
+      "polyfills": "polyfills.ts",
+      "test": "test.ts",
+      "tsconfig": "tsconfig.app.json",
+      "testTsconfig": "tsconfig.spec.json",
+      "prefix": "app",
+      "styles": [
+        "styles.css"
+      ],
+      "scripts": [],
+      "environmentSource": "environments/environment.ts",
+      "environments": {
+        "dev": "environments/environment.ts",
+        "prod": "environments/environment.prod.ts"
+      }
+    }
+  ],
+  "e2e": {
+    "protractor": {
+      "config": "./protractor.conf.js"
+    }
+  },
+  "lint": [
+    {
+      "project": "src/tsconfig.app.json"
+    },
+    {
+      "project": "src/tsconfig.spec.json"
+    },
+    {
+      "project": "e2e/tsconfig.e2e.json"
+    }
+  ],
+  "test": {
+    "karma": {
+      "config": "./karma.conf.js"
+    }
+  },
+  "defaults": {
+    "styleExt": "css",
+    "component": {}
+  }
+}

bulletin-board-server-frontend/.editorconfig

@@ -0,0 +1,13 @@
+# Editor configuration, see http://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false

bulletin-board-server-frontend/.gitignore

@@ -0,0 +1,42 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist
+/tmp
+/out-tsc
+
+# dependencies
+/node_modules
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+testem.log
+/typings
+
+# e2e
+/e2e/*.js
+/e2e/*.map
+
+# System Files
+.DS_Store
+Thumbs.db

bulletin-board-server-frontend/README.md

@@ -0,0 +1,28 @@
+# BulletinBoardServerFrontend
+
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.2.0.
+
+## Development server
+
+Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
+
+## Code scaffolding
+
+Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|module`.
+
+## Build
+
+Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
+
+## Running unit tests
+
+Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Running end-to-end tests
+
+Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
+Before running the tests make sure you are serving the app via `ng serve`.
+
+## Further help
+
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).

bulletin-board-server-frontend/build.gradle

@@ -0,0 +1,60 @@
+plugins {
+  id "com.moowork.node" version "1.2.0"
+}
+
+node {
+  download = true;
+}
+
+ext {
+  bundlejs = "src/app/bundle.js"
+  bundlets = "src/app/bundle.d.ts"
+}
+
+//task installAngularCli(type: NpmTask) {
+//  args = ['install', '@angular/cli']
+//}
+//npm_install.dependsOn(installAngularCli);
+
+task printProtos {
+  doLast {
+    println getProtoFiles().join(" ")
+  }
+}
+printProtos.description = "List all the .proto files we can find."
+
+
+def getProtoFiles() {
+  def protoFiles = []
+
+  rootProject.subprojects { proj ->
+    if (proj.hasProperty('sourceSets') && proj.sourceSets.hasProperty('main') &&
+      proj.sourceSets.main.hasProperty('proto')) {
+      protoFiles = protoFiles + proj.sourceSets.main.proto.getFiles();
+    }
+  }
+  return protoFiles;
+}
+
+
+task generateProtobufBundle(type: NpmTask) {
+  doFirst {
+    // We need do this in doFirst since getProtoFiles won't find all subprojects
+    // until after configuration is complete
+    def protoFiles = getProtoFiles()
+    generateProtobufBundle.args = ['run', 'protoc', '--' ] + protoFiles;
+  }
+
+  dependsOn npm_install
+}
+generateProtobufBundle.description = "Generate the bundle.js/bundle.d.ts files containing compiled protobufs"
+
+
+npm_run_build.dependsOn(npm_install)
+npm_run_build.dependsOn(generateProtobufBundle)
+npm_start.dependsOn(generateProtobufBundle)
+
+
+// It would be nice if this worked, but it seems to get stuck:
+//npm_start.dependsOn(project(':bulletin-board-server').jettyStart);
+

bulletin-board-server-frontend/e2e/app.e2e-spec.ts

@@ -0,0 +1,14 @@
+import { BulletinBoardServerFrontendPage } from './app.po';
+
+describe('bulletin-board-server-frontend App', () => {
+  let page: BulletinBoardServerFrontendPage;
+
+  beforeEach(() => {
+    page = new BulletinBoardServerFrontendPage();
+  });
+
+  it('should display welcome message', () => {
+    page.navigateTo();
+    expect(page.getParagraphText()).toEqual('Welcome to app!!');
+  });
+});

bulletin-board-server-frontend/e2e/app.po.ts

@@ -0,0 +1,11 @@
+import { browser, by, element } from 'protractor';
+
+export class BulletinBoardServerFrontendPage {
+  navigateTo() {
+    return browser.get('/');
+  }
+
+  getParagraphText() {
+    return element(by.css('app-root h1')).getText();
+  }
+}

bulletin-board-server-frontend/e2e/tsconfig.e2e.json

@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/e2e",
+    "module": "commonjs",
+    "target": "es5",
+    "types": [
+      "jasmine",
+      "jasminewd2",
+      "node"
+    ]
+  }
+}

bulletin-board-server-frontend/generate-protobuf.js

@@ -0,0 +1,21 @@
+#!/usr/bin/env node
+const { execFileSync } = require('child_process');
+
+const bundlejs = 'src/app/bundle.js'
+const bundlets = 'src/app/bundle.d.ts'
+
+var pbjs_args = [
+  '-t', 'static-module', '-w', 'commonjs', '-o', bundlejs
+].concat(process.argv.slice(2));
+
+console.log("Running pbjs " + pbjs_args.join(" "));
+var out = execFileSync('pbjs', pbjs_args);
+console.log("" + out);
+
+var pbts_args = [
+  '-o', bundlets, bundlejs
+];
+
+console.log("Running pbts " + pbts_args.join(" "));
+out = execFileSync('pbts', pbts_args);
+console.log("" + out);

bulletin-board-server-frontend/gradlew

@@ -0,0 +1 @@
+../gradlew

bulletin-board-server-frontend/karma.conf.js

@@ -0,0 +1,33 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/0.13/config/configuration-file.html
+
+module.exports = function (config) {
+  config.set({
+    basePath: '',
+    frameworks: ['jasmine', '@angular/cli'],
+    plugins: [
+      require('karma-jasmine'),
+      require('karma-chrome-launcher'),
+      require('karma-jasmine-html-reporter'),
+      require('karma-coverage-istanbul-reporter'),
+      require('@angular/cli/plugins/karma')
+    ],
+    client:{
+      clearContext: false // leave Jasmine Spec Runner output visible in browser
+    },
+    coverageIstanbulReporter: {
+      reports: [ 'html', 'lcovonly' ],
+      fixWebpackSourcePaths: true
+    },
+    angularCli: {
+      environment: 'dev'
+    },
+    reporters: ['progress', 'kjhtml'],
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: true,
+    browsers: ['Chrome'],
+    singleRun: false
+  });
+};

bulletin-board-server-frontend/package.json

@@ -0,0 +1,53 @@
+{
+  "name": "bulletin-board-server-frontend",
+  "version": "0.0.0",
+  "license": "MIT",
+  "scripts": {
+    "ng": "ng",
+    "start": "ng serve --proxy-config proxy.conf.json",
+    "build": "ng build",
+    "test": "ng test",
+    "lint": "ng e2e",
+    "pbts": "pbts",
+    "pbjs": "pbjs",
+    "protoc" : "./generate-protobuf.js"
+  },
+  "private": true,
+  "dependencies": {
+    "@angular/animations": "^4.0.0",
+    "@angular/common": "^4.0.0",
+    "@angular/compiler": "^4.0.0",
+    "@angular/core": "^4.0.0",
+    "@angular/forms": "^4.0.0",
+    "@angular/http": "^4.0.0",
+    "@angular/platform-browser": "^4.0.0",
+    "@angular/platform-browser-dynamic": "^4.0.0",
+    "@angular/router": "^4.0.0",
+    "@types/long": "^3.0.31",
+    "core-js": "^2.4.1",
+    "protobufjs": "^6.8.0",
+    "rxjs": "^5.1.0",
+    "zone.js": "^0.8.4"
+  },
+  "devDependencies": {
+    "@angular/cli": "^1.2.0",
+    "@angular/compiler-cli": "^4.0.0",
+    "@angular/language-service": "^4.0.0",
+    "@types/jasmine": "~2.5.53",
+    "@types/jasminewd2": "~2.0.2",
+    "@types/node": "~6.0.60",
+    "codelyzer": "~3.0.1",
+    "jasmine-core": "~2.6.2",
+    "jasmine-spec-reporter": "~4.1.0",
+    "karma": "~1.7.0",
+    "karma-chrome-launcher": "~2.1.1",
+    "karma-cli": "~1.0.1",
+    "karma-coverage-istanbul-reporter": "^1.2.1",
+    "karma-jasmine": "~1.1.0",
+    "karma-jasmine-html-reporter": "^0.2.2",
+    "protractor": "~5.1.2",
+    "ts-node": "~3.0.4",
+    "tslint": "~5.3.2",
+    "typescript": "~2.3.3"
+  }
+}

bulletin-board-server-frontend/protractor.conf.js

@@ -0,0 +1,28 @@
+// Protractor configuration file, see link for more information
+// https://github.com/angular/protractor/blob/master/lib/config.ts
+
+const { SpecReporter } = require('jasmine-spec-reporter');
+
+exports.config = {
+  allScriptsTimeout: 11000,
+  specs: [
+    './e2e/**/*.e2e-spec.ts'
+  ],
+  capabilities: {
+    'browserName': 'chrome'
+  },
+  directConnect: true,
+  baseUrl: 'http://localhost:4200/',
+  framework: 'jasmine',
+  jasmineNodeOpts: {
+    showColors: true,
+    defaultTimeoutInterval: 30000,
+    print: function() {}
+  },
+  onPrepare() {
+    require('ts-node').register({
+      project: 'e2e/tsconfig.e2e.json'
+    });
+    jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
+  }
+};

bulletin-board-server-frontend/proxy.conf.json

@@ -0,0 +1,6 @@
+{
+  "/bbserver" : {
+    "target" : "http://localhost:8081/",
+    "secure" : false
+  }
+}

bulletin-board-server-frontend/src/app/app.component.html

@@ -0,0 +1,12 @@
+<!--The content below is only a placeholder and can be replaced.-->
+<div style="text-align:center">
+  <h1>
+    Welcome to {{title}}!!
+  </h1>
+
+  <h3>Current status: {{status}}</h3>
+  <img width="300" src="assets/meerkat-logo.svg">
+  <hr>
+  {{errorMessage}}
+</div>
+

bulletin-board-server-frontend/src/app/app.component.spec.ts

@@ -0,0 +1,32 @@
+import { TestBed, async } from '@angular/core/testing';
+
+import { AppComponent } from './app.component';
+
+describe('AppComponent', () => {
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [
+        AppComponent
+      ],
+    }).compileComponents();
+  }));
+
+  it('should create the app', async(() => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.debugElement.componentInstance;
+    expect(app).toBeTruthy();
+  }));
+
+  it(`should have as title 'app'`, async(() => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.debugElement.componentInstance;
+    expect(app.title).toEqual('app');
+  }));
+
+  it('should render title in a h1 tag', async(() => {
+    const fixture = TestBed.createComponent(AppComponent);
+    fixture.detectChanges();
+    const compiled = fixture.debugElement.nativeElement;
+    expect(compiled.querySelector('h1').textContent).toContain('Welcome to app!!');
+  }));
+});

bulletin-board-server-frontend/src/app/app.component.ts

@@ -0,0 +1,55 @@
+import {Component, OnInit} from '@angular/core';
+import {IntervalObservable} from "rxjs/observable/IntervalObservable";
+import {BBService} from "./bb.service";
+
+@Component({
+  selector: 'app-root',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.css'],
+  providers: [BBService]
+})
+
+export class AppComponent implements OnInit {
+
+  title = 'Bulletin-Board Server';
+  status = 'Not connected';
+  errorMessage = '';
+
+  private alive: boolean;  // used to unsubscribe from the IntervalObservable
+                           // when OnDestroy is called.
+
+  constructor(private bbservice : BBService) { }
+
+
+  ngOnInit(): void {
+
+    // Get initial status
+    this.bbservice.getStatus().subscribe(
+      status => { this.status = status.name; this.errorMessage = ""; },
+      error => { this.status = "Not connected"; this.errorMessage = <any>error; }
+    );
+
+    this.alive = true;
+    // Get new status every second
+    let o = IntervalObservable.create(1000)
+      //.takeWhile(() => this.alive) // only fires when component is alive
+      .subscribe(n => {
+        if (!this.alive) {
+          o.unsubscribe();
+          return;
+        }
+        this.bbservice.getStatus().subscribe(
+          status => { this.status = status.name + " " + n; this.errorMessage = ""; },
+          error => { this.errorMessage = <any>error; this.status = "Not connected"; }
+        );
+      });
+  }
+
+
+  ngOnDestroy(){
+    this.alive = false; // switches your IntervalObservable off
+  }
+
+}
+
+

bulletin-board-server-frontend/src/app/app.module.ts

@@ -0,0 +1,20 @@
+import { BrowserModule } from '@angular/platform-browser';
+import { NgModule } from '@angular/core';
+import { HttpModule }    from '@angular/http';
+
+import { AppComponent } from './app.component';
+import {BBService} from "./bb.service";
+
+
+@NgModule({
+  declarations: [
+    AppComponent,
+  ],
+  imports: [
+    BrowserModule,
+    HttpModule,
+  ],
+  providers: [],
+  bootstrap: [AppComponent]
+})
+export class AppModule { }

bulletin-board-server-frontend/src/app/bb.service.ts

@@ -0,0 +1,36 @@
+/// <reference types="@types/long" />
+import { Injectable }    from '@angular/core';
+import {Headers, Http, RequestOptions, ResponseContentType} from '@angular/http';
+
+import { meerkat } from "./bundle.js";
+import {Observable} from "rxjs/Observable";
+import 'rxjs/add/operator/catch';
+import 'rxjs/add/operator/map';
+
+  @Injectable()
+  export class BBService {
+    private headers = new Headers({'Content-Type': 'application/x-protobuf'});
+    private bbUrl = '/bbserver';  // URL to web api
+    private statusPath = '/status';
+
+    constructor(private http: Http) {  }
+
+    getStatus(): Observable<meerkat.ServerStatus> {
+      let options = new RequestOptions({
+        responseType: ResponseContentType.ArrayBuffer
+      });
+
+      let res =  this.http.get(this.bbUrl + this.statusPath, options);
+
+      return res
+        .catch(this.handleError)
+        .map(x => {
+          return meerkat.ServerStatus.decode(new Uint8Array(x.arrayBuffer()));
+        });
+    }
+
+    private handleError(error: any): Promise<any> {
+      console.error('An error occurred', error); // for demo purposes only
+      return Promise.reject(error.message || error);
+    }
+  }

bulletin-board-server-frontend/src/environments/environment.prod.ts

@@ -0,0 +1,3 @@
+export const environment = {
+  production: true
+};

bulletin-board-server-frontend/src/environments/environment.ts

@@ -0,0 +1,8 @@
+// The file contents for the current environment will overwrite these during build.
+// The build system defaults to the dev environment which uses `environment.ts`, but if you do
+// `ng build --env=prod` then `environment.prod.ts` will be used instead.
+// The list of which env maps to which file can be found in `.angular-cli.json`.
+
+export const environment = {
+  production: false
+};

bulletin-board-server-frontend/src/index.html

@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>BulletinBoardServerFrontend</title>
+  <base href="/">
+
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="icon" type="image/x-icon" href="favicon.ico">
+</head>
+<body>
+  <app-root></app-root>
+</body>
+</html>

bulletin-board-server-frontend/src/main.ts

@@ -0,0 +1,11 @@
+import { enableProdMode } from '@angular/core';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app/app.module';
+import { environment } from './environments/environment';
+
+if (environment.production) {
+  enableProdMode();
+}
+
+platformBrowserDynamic().bootstrapModule(AppModule);

bulletin-board-server-frontend/src/polyfills.ts

@@ -0,0 +1,72 @@
+/**
+ * This file includes polyfills needed by Angular and is loaded before the app.
+ * You can add your own extra polyfills to this file.
+ *
+ * This file is divided into 2 sections:
+ *   1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
+ *   2. Application imports. Files imported after ZoneJS that should be loaded before your main
+ *      file.
+ *
+ * The current setup is for so-called "evergreen" browsers; the last versions of browsers that
+ * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
+ * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
+ *
+ * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
+ */
+
+/***************************************************************************************************
+ * BROWSER POLYFILLS
+ */
+
+/** IE9, IE10 and IE11 requires all of the following polyfills. **/
+// import 'core-js/es6/symbol';
+// import 'core-js/es6/object';
+// import 'core-js/es6/function';
+// import 'core-js/es6/parse-int';
+// import 'core-js/es6/parse-float';
+// import 'core-js/es6/number';
+// import 'core-js/es6/math';
+// import 'core-js/es6/string';
+// import 'core-js/es6/date';
+// import 'core-js/es6/array';
+// import 'core-js/es6/regexp';
+// import 'core-js/es6/map';
+// import 'core-js/es6/weak-map';
+// import 'core-js/es6/set';
+
+/** IE10 and IE11 requires the following for NgClass support on SVG elements */
+// import 'classlist.js';  // Run `npm install --save classlist.js`.
+
+/** Evergreen browsers require these. **/
+import 'core-js/es6/reflect';
+import 'core-js/es7/reflect';
+
+
+/**
+ * Required to support Web Animations `@angular/animation`.
+ * Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation
+ **/
+// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
+
+
+
+/***************************************************************************************************
+ * Zone JS is required by Angular itself.
+ */
+import 'zone.js/dist/zone';  // Included with Angular CLI.
+
+
+
+/***************************************************************************************************
+ * APPLICATION IMPORTS
+ */
+
+/**
+ * Date, currency, decimal and percent pipes.
+ * Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10
+ */
+// import 'intl';  // Run `npm install --save intl`.
+/**
+ * Need to import at least one locale-data with intl.
+ */
+// import 'intl/locale-data/jsonp/en';

bulletin-board-server-frontend/src/styles.css

@@ -0,0 +1 @@
+/* You can add global styles to this file, and also import other style files */

bulletin-board-server-frontend/src/test.ts

@@ -0,0 +1,32 @@
+// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+
+import 'zone.js/dist/long-stack-trace-zone';
+import 'zone.js/dist/proxy.js';
+import 'zone.js/dist/sync-test';
+import 'zone.js/dist/jasmine-patch';
+import 'zone.js/dist/async-test';
+import 'zone.js/dist/fake-async-test';
+import { getTestBed } from '@angular/core/testing';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting
+} from '@angular/platform-browser-dynamic/testing';
+
+// Unfortunately there's no typing for the `__karma__` variable. Just declare it as any.
+declare const __karma__: any;
+declare const require: any;
+
+// Prevent Karma from running prematurely.
+__karma__.loaded = function () {};
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting()
+);
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);
+// Finally, start Karma to run the tests.
+__karma__.start();

bulletin-board-server-frontend/src/tsconfig.app.json

@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/app",
+    "module": "es2015",
+    "baseUrl": "",
+    "types": []
+  },
+  "exclude": [
+    "test.ts",
+    "**/*.spec.ts"
+  ]
+}

bulletin-board-server-frontend/src/tsconfig.spec.json

@@ -0,0 +1,20 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/spec",
+    "module": "commonjs",
+    "target": "es5",
+    "baseUrl": "",
+    "types": [
+      "jasmine",
+      "node"
+    ]
+  },
+  "files": [
+    "test.ts"
+  ],
+  "include": [
+    "**/*.spec.ts",
+    "**/*.d.ts"
+  ]
+}

bulletin-board-server-frontend/src/typings.d.ts

@@ -0,0 +1,5 @@
+/* SystemJS module definition */
+declare var module: NodeModule;
+interface NodeModule {
+  id: string;
+}

bulletin-board-server-frontend/tsconfig.json

@@ -0,0 +1,20 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "outDir": "./dist/out-tsc",
+    "baseUrl": "src",
+    "sourceMap": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "target": "es5",
+    "typeRoots": [
+      "node_modules/@types"
+    ],
+    "lib": [
+      "es2016",
+      "dom"
+    ]
+  }
+}

bulletin-board-server-frontend/tslint.json

@@ -0,0 +1,135 @@
+{
+  "rulesDirectory": [
+    "node_modules/codelyzer"
+  ],
+  "rules": {
+    "arrow-return-shorthand": true,
+    "callable-types": true,
+    "class-name": true,
+    "comment-format": [
+      true,
+      "check-space"
+    ],
+    "curly": true,
+    "eofline": true,
+    "forin": true,
+    "import-blacklist": [
+      true,
+      "rxjs"
+    ],
+    "import-spacing": true,
+    "indent": [
+      true,
+      "spaces"
+    ],
+    "interface-over-type-literal": true,
+    "label-position": true,
+    "max-line-length": [
+      true,
+      140
+    ],
+    "member-access": false,
+    "member-ordering": [
+      true,
+      "static-before-instance",
+      "variables-before-functions"
+    ],
+    "no-arg": true,
+    "no-bitwise": true,
+    "no-console": [
+      true,
+      "debug",
+      "info",
+      "time",
+      "timeEnd",
+      "trace"
+    ],
+    "no-construct": true,
+    "no-debugger": true,
+    "no-duplicate-super": true,
+    "no-empty": false,
+    "no-empty-interface": true,
+    "no-eval": true,
+    "no-inferrable-types": [
+      true,
+      "ignore-params"
+    ],
+    "no-misused-new": true,
+    "no-non-null-assertion": true,
+    "no-shadowed-variable": true,
+    "no-string-literal": false,
+    "no-string-throw": true,
+    "no-switch-case-fall-through": true,
+    "no-trailing-whitespace": true,
+    "no-unnecessary-initializer": true,
+    "no-unused-expression": true,
+    "no-use-before-declare": true,
+    "no-var-keyword": true,
+    "object-literal-sort-keys": false,
+    "one-line": [
+      true,
+      "check-open-brace",
+      "check-catch",
+      "check-else",
+      "check-whitespace"
+    ],
+    "prefer-const": true,
+    "quotemark": [
+      true,
+      "single"
+    ],
+    "radix": true,
+    "semicolon": [
+      "always"
+    ],
+    "triple-equals": [
+      true,
+      "allow-null-check"
+    ],
+    "typedef-whitespace": [
+      true,
+      {
+        "call-signature": "nospace",
+        "index-signature": "nospace",
+        "parameter": "nospace",
+        "property-declaration": "nospace",
+        "variable-declaration": "nospace"
+      }
+    ],
+    "typeof-compare": true,
+    "unified-signatures": true,
+    "variable-name": false,
+    "whitespace": [
+      true,
+      "check-branch",
+      "check-decl",
+      "check-operator",
+      "check-separator",
+      "check-type"
+    ],
+    "directive-selector": [
+      true,
+      "attribute",
+      "app",
+      "camelCase"
+    ],
+    "component-selector": [
+      true,
+      "element",
+      "app",
+      "kebab-case"
+    ],
+    "use-input-property-decorator": true,
+    "use-output-property-decorator": true,
+    "use-host-property-decorator": true,
+    "no-input-rename": true,
+    "no-output-rename": true,
+    "use-life-cycle-interface": true,
+    "use-pipe-transform-interface": true,
+    "component-class-suffix": true,
+    "directive-class-suffix": true,
+    "no-access-missing-member": true,
+    "templates-use-public": true,
+    "invoke-injectable": true
+  }
+}

bulletin-board-server/build.gradle

@@ -1,14 +1,16 @@
 
 plugins {
     id "us.kirchmeier.capsule" version '1.0.2'
-    id 'com.google.protobuf' version '0.8.0'
+    id 'com.google.protobuf' version '0.8.1'
-    id 'org.akhikhl.gretty' version "1.2.4"
+    id 'org.akhikhl.gretty' version "2.0.0"
 }
 
 apply plugin: 'org.akhikhl.gretty'
+apply plugin: 'com.google.protobuf'
 apply plugin: 'java'
 apply plugin: 'eclipse'
 apply plugin: 'idea'
+apply plugin: 'war'
 
 //apply plugin: 'application'
 
@@ -50,13 +52,24 @@ dependencies {
     compile 'org.apache.commons:commons-dbcp2:2.0.+'
 
     // Servlets
-    compile 'javax.servlet:javax.servlet-api:3.0.+'
+//    compile 'javax.servlet:javax.servlet-api:3.0.+'
 
     // Depend on test resources from meerkat-common
     testCompile project(path: ':meerkat-common', configuration: 'testOutput')
     testCompile 'junit:junit:4.+'
 }
 
+ext {
+    frontendProject = project(":bulletin-board-server-frontend")
+}
+
+war {
+    from frontendProject.projectDir.toPath().resolve("dist").toString()
+}
+
+frontendProject.afterEvaluate {
+    war.dependsOn frontendProject.npm_run_build
+}
 
 test {
     exclude '**/*SQLite*Test*'

bulletin-board-server/src/main/java/meerkat/bulletinboard/service/HelloProtoBuf.java

@@ -3,7 +3,7 @@ package meerkat.bulletinboard.service;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.Message;
 import meerkat.protobuf.Crypto;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 
 import java.util.Arrays;
 import java.util.List;

bulletin-board-server/src/main/java/meerkat/bulletinboard/sqlserver/BulletinBoardSQLServer.java

@@ -18,7 +18,7 @@ import meerkat.comm.MessageOutputStream;
 import meerkat.crypto.DigitalSignature;
 import meerkat.crypto.concrete.SHA256Digest;
 
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 import meerkat.protobuf.Comm;
 import meerkat.protobuf.Crypto.Signature;
 import meerkat.protobuf.Crypto.SignatureVerificationKey;

bulletin-board-server/src/main/java/meerkat/bulletinboard/sqlserver/H2QueryProvider.java

@@ -1,6 +1,6 @@
 package meerkat.bulletinboard.sqlserver;
 
-import meerkat.protobuf.BulletinBoardAPI.FilterType;
+import meerkat.protobuf.BulletinBoardApi.FilterType;
 import org.apache.commons.dbcp2.BasicDataSource;
 
 import javax.sql.DataSource;

bulletin-board-server/src/main/java/meerkat/bulletinboard/sqlserver/MySQLQueryProvider.java

@@ -1,7 +1,7 @@
 package meerkat.bulletinboard.sqlserver;
 
 import meerkat.bulletinboard.sqlserver.BulletinBoardSQLServer.SQLQueryProvider;
-import meerkat.protobuf.BulletinBoardAPI.FilterType;
+import meerkat.protobuf.BulletinBoardApi.FilterType;
 import org.apache.commons.dbcp2.BasicDataSource;
 
 import javax.sql.DataSource;

bulletin-board-server/src/main/java/meerkat/bulletinboard/sqlserver/SQLiteQueryProvider.java

@@ -1,6 +1,6 @@
 package meerkat.bulletinboard.sqlserver;
 
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 import org.apache.commons.dbcp2.BasicDataSource;
 import org.sqlite.SQLiteDataSource;
 

bulletin-board-server/src/main/java/meerkat/bulletinboard/sqlserver/mappers/BatchDataCallbackHandler.java

@@ -1,7 +1,7 @@
 package meerkat.bulletinboard.sqlserver.mappers;
 
 import meerkat.comm.MessageOutputStream;
-import meerkat.protobuf.BulletinBoardAPI.BatchChunk;
+import meerkat.protobuf.BulletinBoardApi.BatchChunk;
 import org.springframework.jdbc.core.RowCallbackHandler;
 
 import java.io.IOException;

bulletin-board-server/src/main/java/meerkat/bulletinboard/sqlserver/mappers/BatchDataDigestHandler.java

@@ -1,7 +1,7 @@
 package meerkat.bulletinboard.sqlserver.mappers;
 
 import meerkat.bulletinboard.BulletinBoardDigest;
-import meerkat.protobuf.BulletinBoardAPI.BatchChunk;
+import meerkat.protobuf.BulletinBoardApi.BatchChunk;
 import org.springframework.jdbc.core.RowCallbackHandler;
 
 import java.io.IOException;

bulletin-board-server/src/main/java/meerkat/bulletinboard/sqlserver/mappers/BeginBatchMessageMapper.java

@@ -1,7 +1,7 @@
 package meerkat.bulletinboard.sqlserver.mappers;
 
 import com.google.protobuf.InvalidProtocolBufferException;
-import meerkat.protobuf.BulletinBoardAPI.BeginBatchMessage;
+import meerkat.protobuf.BulletinBoardApi.BeginBatchMessage;
 import org.springframework.jdbc.core.RowMapper;
 
 import java.sql.ResultSet;

bulletin-board-server/src/main/java/meerkat/bulletinboard/sqlserver/mappers/LongMapper.java

@@ -1,6 +1,6 @@
 package meerkat.bulletinboard.sqlserver.mappers;
 
-import meerkat.protobuf.BulletinBoardAPI.MessageID;
+import meerkat.protobuf.BulletinBoardApi.MessageID;
 import org.springframework.jdbc.core.RowMapper;
 
 import java.sql.ResultSet;

bulletin-board-server/src/main/java/meerkat/bulletinboard/sqlserver/mappers/MessageCallbackHandler.java

@@ -4,7 +4,7 @@ import com.google.protobuf.InvalidProtocolBufferException;
 import meerkat.bulletinboard.sqlserver.BulletinBoardSQLServer.*;
 import meerkat.bulletinboard.sqlserver.BulletinBoardSQLServer.SQLQueryProvider.*;
 import meerkat.comm.MessageOutputStream;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 import meerkat.protobuf.Crypto;
 import org.springframework.jdbc.core.RowCallbackHandler;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;

bulletin-board-server/src/main/java/meerkat/bulletinboard/sqlserver/mappers/MessageMapper.java

@@ -1,8 +1,8 @@
 package meerkat.bulletinboard.sqlserver.mappers;
 
 import com.google.protobuf.InvalidProtocolBufferException;
-import meerkat.protobuf.BulletinBoardAPI.UnsignedBulletinBoardMessage;
+import meerkat.protobuf.BulletinBoardApi.UnsignedBulletinBoardMessage;
-import meerkat.protobuf.BulletinBoardAPI.BulletinBoardMessage;
+import meerkat.protobuf.BulletinBoardApi.BulletinBoardMessage;
 import org.springframework.jdbc.core.RowMapper;
 
 import java.sql.ResultSet;

bulletin-board-server/src/main/java/meerkat/bulletinboard/sqlserver/mappers/MessageStubCallbackHandler.java

@@ -4,8 +4,8 @@ import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import meerkat.bulletinboard.sqlserver.BulletinBoardSQLServer.SQLQueryProvider.QueryType;
 import meerkat.comm.MessageOutputStream;
-import meerkat.protobuf.BulletinBoardAPI.BulletinBoardMessage;
+import meerkat.protobuf.BulletinBoardApi.BulletinBoardMessage;
-import meerkat.protobuf.BulletinBoardAPI.UnsignedBulletinBoardMessage;
+import meerkat.protobuf.BulletinBoardApi.UnsignedBulletinBoardMessage;
 import meerkat.protobuf.Crypto;
 import meerkat.util.BulletinBoardUtils;
 import org.springframework.jdbc.core.RowCallbackHandler;

bulletin-board-server/src/main/java/meerkat/bulletinboard/sqlserver/mappers/MessageStubMapper.java

@@ -2,8 +2,8 @@ package meerkat.bulletinboard.sqlserver.mappers;
 
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
-import meerkat.protobuf.BulletinBoardAPI.BulletinBoardMessage;
+import meerkat.protobuf.BulletinBoardApi.BulletinBoardMessage;
-import meerkat.protobuf.BulletinBoardAPI.UnsignedBulletinBoardMessage;
+import meerkat.protobuf.BulletinBoardApi.UnsignedBulletinBoardMessage;
 import meerkat.util.BulletinBoardUtils;
 import org.springframework.jdbc.core.RowMapper;
 

bulletin-board-server/src/main/java/meerkat/bulletinboard/sqlserver/mappers/SignatureMapper.java

@@ -1,8 +1,8 @@
 package meerkat.bulletinboard.sqlserver.mappers;
 
 import com.google.protobuf.InvalidProtocolBufferException;
-import meerkat.protobuf.BulletinBoardAPI.BulletinBoardMessage;
+import meerkat.protobuf.BulletinBoardApi.BulletinBoardMessage;
-import meerkat.protobuf.BulletinBoardAPI.UnsignedBulletinBoardMessage;
+import meerkat.protobuf.BulletinBoardApi.UnsignedBulletinBoardMessage;
 import meerkat.protobuf.Crypto.Signature;
 import org.springframework.jdbc.core.RowMapper;
 

bulletin-board-server/src/main/java/meerkat/bulletinboard/webapp/BulletinBoardWebApp.java

@@ -3,6 +3,7 @@ package meerkat.bulletinboard.webapp;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
+import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.*;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
@@ -18,7 +19,10 @@ import meerkat.bulletinboard.sqlserver.MySQLQueryProvider;
 import meerkat.bulletinboard.sqlserver.SQLiteQueryProvider;
 import meerkat.comm.CommunicationException;
 import meerkat.comm.MessageOutputStream;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
+import meerkat.protobuf.BulletinBoardWebapp.*;
+
+
 import static meerkat.bulletinboard.BulletinBoardConstants.*;
 import static meerkat.rest.Constants.*;
 
@@ -29,7 +33,7 @@ import java.io.OutputStream;
  * An implementation of the BulletinBoardServer which functions as a WebApp
  */
 @Path(BULLETIN_BOARD_SERVER_PATH)
-public class BulletinBoardWebApp implements BulletinBoardServer, ServletContextListener{
+public class BulletinBoardWebApp implements BulletinBoardServer, ServletContextListener {
 		
 	private static final String BULLETIN_BOARD_ATTRIBUTE_NAME = "bulletinBoard";
 	
@@ -43,22 +47,24 @@ public class BulletinBoardWebApp implements BulletinBoardServer, ServletContextL
 	public void init(){
 		bulletinBoard = (BulletinBoardServer) servletContext.getAttribute(BULLETIN_BOARD_ATTRIBUTE_NAME);
 	}
-	
+
-	@Override
+
+
+    @Override
 	public void contextInitialized(ServletContextEvent servletContextEvent) {
 		ServletContext servletContext = servletContextEvent.getServletContext();
 		String dbType = servletContext.getInitParameter("dbType");
 		String dbName = servletContext.getInitParameter("dbName");
 
-		if ("SQLite".equals(dbType)){
+		if ("SQLite".equalsIgnoreCase(dbType)){
 
 			bulletinBoard = new BulletinBoardSQLServer(new SQLiteQueryProvider(dbName));
 
-		} else if ("H2".equals(dbType)) {
+		} else if ("H2".equalsIgnoreCase(dbType)) {
 
 			bulletinBoard = new BulletinBoardSQLServer(new H2QueryProvider(dbName));
 
-		} else if ("MySQL".equals(dbType)) {
+		} else if ("MySQL".equalsIgnoreCase(dbType)) {
 
 			String dbAddress = servletContext.getInitParameter("dbAddress");
 			int dbPort = Integer.parseInt(servletContext.getInitParameter("dbPort"));
@@ -75,7 +81,24 @@ public class BulletinBoardWebApp implements BulletinBoardServer, ServletContextL
 			System.err.println(e.getMessage());
 		}
 	}
-	
+
+
+    /**
+     * Get the current status of the bulletin board server.
+     * @return
+     * @throws CommunicationException
+     */
+    @Path(STATUS_PATH)
+    @GET
+    @Consumes(MEDIATYPE_PROTOBUF)
+    @Produces(MEDIATYPE_PROTOBUF)
+    public ServerStatus getStatus(@Context HttpServletResponse response) throws CommunicationException {
+        // response.setHeader("Access-Control-Allow-Origin", "*"); // TODO: Remove
+        return ServerStatus.newBuilder()
+                .setName("Hello")
+                .build();
+    }
+
 	@Path(POST_MESSAGE_PATH)
 	@POST
 	@Consumes(MEDIATYPE_PROTOBUF)

bulletin-board-server/src/main/java/meerkat/bulletinboard/webapp/HelloProtoWebApp.java

@@ -4,7 +4,7 @@ import com.google.protobuf.ByteString;
 import com.google.protobuf.Message;
 import meerkat.bulletinboard.service.HelloProtoBuf;
 import meerkat.protobuf.Crypto.*;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 import meerkat.rest.Constants;
 
 import javax.annotation.PostConstruct;

bulletin-board-server/src/main/proto/meerkat/bulletin_board_webapp.proto

@@ -0,0 +1,25 @@
+syntax = "proto3";
+
+package meerkat;
+
+option java_package = "meerkat.protobuf";
+
+import 'meerkat/crypto.proto';
+import 'meerkat/bulletin_board_api.proto';
+import 'google/protobuf/timestamp.proto';
+
+
+// Status of the bulletin board server
+message ServerStatus {
+    enum Mode {
+        MODE_SETUP_AUTH = 0; // Waiting for authorization setup
+        MODE_SETUP_DB = 1; // Needs to complete setup
+        MODE_RUNNING = 2; // Setup is complete
+    }
+
+    Mode mode = 1;
+
+    string name = 2; // Human-readable name
+
+    SignatureVerificationKey pk = 3; // The server's signing public-key
+}

bulletin-board-server/src/main/webapp/WEB-INF/web.xml

@@ -1,6 +1,6 @@
 <web-app>
     <servlet>
-        <servlet-name>Jersey Hello World</servlet-name>
+        <servlet-name>bbserver</servlet-name>
         <servlet-class>
                 org.glassfish.jersey.servlet.ServletContainer
         </servlet-class>
@@ -11,7 +11,11 @@
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet-mapping>
-        <servlet-name>Jersey Hello World</servlet-name>
+        <servlet-name>bbserver</servlet-name>
+        <url-pattern>/bbserver/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>default</servlet-name>
         <url-pattern>/*</url-pattern>
     </servlet-mapping>
     <context-param>

bulletin-board-server/src/test/java/meerkat/bulletinboard/BulletinBoardSQLServerIntegrationTest.java

@@ -8,7 +8,7 @@ import com.google.protobuf.TextFormat;
 import com.google.protobuf.Timestamp;
 import meerkat.comm.MessageInputStream;
 import meerkat.protobuf.Crypto.*;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 import meerkat.protobuf.Comm.*;
 import static meerkat.bulletinboard.BulletinBoardConstants.*;
 import meerkat.rest.Constants;

bulletin-board-server/src/test/java/meerkat/bulletinboard/GenericBulletinBoardServerTest.java

@@ -28,7 +28,7 @@ import meerkat.comm.MessageOutputStream;
 import meerkat.comm.MessageInputStream.MessageInputStreamFactory;
 import meerkat.crypto.concrete.ECDSASignature;
 import meerkat.crypto.concrete.SHA256Digest;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 import meerkat.util.BulletinBoardMessageComparator;
 import meerkat.util.BulletinBoardMessageGenerator;
 import meerkat.util.BulletinBoardUtils;

bulletin-board-server/src/test/java/meerkat/bulletinboard/HelloProtoIntegrationTest.java

@@ -1,6 +1,6 @@
 package meerkat.bulletinboard;
 
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 import meerkat.rest.Constants;
 import meerkat.rest.ProtobufMessageBodyReader;
 import meerkat.rest.ProtobufMessageBodyWriter;

distributed-key-generation/build.gradle

@@ -1,7 +1,7 @@
 
 plugins {
   id "us.kirchmeier.capsule" version '1.0.2'
-  id 'com.google.protobuf' version '0.8.0'
+  id 'com.google.protobuf' version '0.8.1'
 }
 
 apply plugin: 'java'

meerkat-common/build.gradle

@@ -1,7 +1,7 @@
 
 plugins {
   id "us.kirchmeier.capsule" version '1.0.2'
-  id 'com.google.protobuf' version '0.8.0'
+  id 'com.google.protobuf' version '0.8.1'
 }
 
 apply plugin: 'java'

meerkat-common/src/main/java/Demo.java

@@ -1,5 +1,5 @@
 import com.google.protobuf.ByteString;
-import static meerkat.protobuf.BulletinBoardAPI.*;
+import static meerkat.protobuf.BulletinBoardApi.*;
 import java.io.IOException;
 
 /**

meerkat-common/src/main/java/meerkat/bulletinboard/AsyncBulletinBoardClient.java

@@ -2,7 +2,7 @@ package meerkat.bulletinboard;
 
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.protobuf.Timestamp;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 import meerkat.protobuf.Crypto.Signature;
 
 import java.util.List;

meerkat-common/src/main/java/meerkat/bulletinboard/BulletinBoardClient.java

@@ -3,7 +3,7 @@ package meerkat.bulletinboard;
 import meerkat.comm.CommunicationException;
 import meerkat.protobuf.Voting.*;
 
-import static meerkat.protobuf.BulletinBoardAPI.*;
+import static meerkat.protobuf.BulletinBoardApi.*;
 
 import java.util.List;
 

meerkat-common/src/main/java/meerkat/bulletinboard/BulletinBoardConstants.java

@@ -7,7 +7,8 @@ public interface BulletinBoardConstants {
 
     // Relative addresses for Bulletin Board operations
 
-    public static final String BULLETIN_BOARD_SERVER_PATH = "/bbserver";
+    public static final String STATUS_PATH = "/status";
+    public static final String BULLETIN_BOARD_SERVER_PATH = "/"; // The actual prefix is set in web.xml
     public static final String GENERATE_SYNC_QUERY_PATH = "/generatesyncquery";
     public static final String READ_MESSAGES_PATH = "/readmessages";
     public static final String COUNT_MESSAGES_PATH = "/countmessages";

meerkat-common/src/main/java/meerkat/bulletinboard/BulletinBoardDigest.java

@@ -1,7 +1,7 @@
 package meerkat.bulletinboard;
 
 import meerkat.crypto.Digest;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 
 import java.util.List;
 

meerkat-common/src/main/java/meerkat/bulletinboard/BulletinBoardMessageDeleter.java

@@ -2,7 +2,7 @@ package meerkat.bulletinboard;
 
 import com.google.common.util.concurrent.FutureCallback;
 import meerkat.comm.CommunicationException;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 
 /**
  * Created by Arbel Deutsch Peled on 13-Apr-16.

meerkat-common/src/main/java/meerkat/bulletinboard/BulletinBoardServer.java

@@ -5,7 +5,7 @@ import com.google.protobuf.Int32Value;
 import com.google.protobuf.Int64Value;
 import meerkat.comm.CommunicationException;
 import meerkat.comm.MessageOutputStream;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 
 
 /**
@@ -15,7 +15,7 @@ import meerkat.protobuf.BulletinBoardAPI.*;
  * An implementation of this interface may use any DB and be hosted on any machine.
  */
 
-public interface BulletinBoardServer{
+public interface BulletinBoardServer {
 	
 	/**
 	 * This method initializes the server by reading the signature data and storing it
@@ -23,7 +23,7 @@ public interface BulletinBoardServer{
 	 * @throws CommunicationException on DB connection error
 	 */
 	public void init() throws CommunicationException;
-	
+
 	/**
      * Post a message to bulletin board.
      * @param msg is the actual (signed) message

meerkat-common/src/main/java/meerkat/bulletinboard/BulletinBoardSignature.java

@@ -1,9 +1,7 @@
 package meerkat.bulletinboard;
 
 import meerkat.crypto.DigitalSignature;
-import meerkat.protobuf.BulletinBoardAPI.BulletinBoardMessage;
+import meerkat.protobuf.BulletinBoardApi.*;
-import meerkat.protobuf.BulletinBoardAPI.UnsignedBulletinBoardMessage;
-import meerkat.protobuf.Crypto;
 
 import java.security.SignatureException;
 

meerkat-common/src/main/java/meerkat/bulletinboard/BulletinBoardSubscriber.java

@@ -1,8 +1,7 @@
 package meerkat.bulletinboard;
 
 import com.google.common.util.concurrent.FutureCallback;
-import meerkat.protobuf.BulletinBoardAPI.BulletinBoardMessage;
+import meerkat.protobuf.BulletinBoardApi.*;
-import meerkat.protobuf.BulletinBoardAPI.MessageFilterList;
 
 import java.util.List;
 

meerkat-common/src/main/java/meerkat/bulletinboard/BulletinBoardSynchronizer.java

@@ -1,7 +1,7 @@
 package meerkat.bulletinboard;
 
 import meerkat.comm.CommunicationException;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 
 import com.google.common.util.concurrent.FutureCallback;
 

meerkat-common/src/main/java/meerkat/bulletinboard/Checksum.java

@@ -2,8 +2,7 @@ package meerkat.bulletinboard;
 
 import com.google.protobuf.ByteString;
 import meerkat.crypto.Digest;
-import meerkat.protobuf.BulletinBoardAPI.BulletinBoardMessage;
+import meerkat.protobuf.BulletinBoardApi.*;
-import meerkat.protobuf.BulletinBoardAPI.MessageID;
 
 import java.util.Collection;
 

meerkat-common/src/main/java/meerkat/bulletinboard/DeletableBulletinBoardServer.java

@@ -2,7 +2,7 @@ package meerkat.bulletinboard;
 
 import com.google.protobuf.BoolValue;
 import meerkat.comm.CommunicationException;
-import meerkat.protobuf.BulletinBoardAPI.*;
+import meerkat.protobuf.BulletinBoardApi.*;
 
 /**
  * Created by Arbel Deutsch Peled on 13-Apr-16.