Merge branch 'release/0.3.0'

openmhealth · Sep 11, 2015 · d28ed23 · d28ed23
2 parents 8040a85 + 6b92299
commit d28ed23
Show file tree

Hide file tree

Showing 279 changed files with 21,319 additions and 7,035 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,14 @@
+language: java
+jdk:
+- oraclejdk8
+
+notifications:
+  slack:
+    rooms:
+      secure: F+o9FPgJxD6KnpcvCGm2VgvY72aCo/+RwBoIZoArB68L41rgiOUoKbqkH3Y1vLaqw6isyqa6dkuBKyFoKVwyjuDYn7Iaw2z86WZWRCB4SkqcAnVWQCUGZVPrFh38hUl++gUEYbzIPDLm8RgKOJr/9XBZaMoATJlmoenI9ZMuncI=
+sudo: false
+
+cache:
+  directories:
+    - $HOME/.gradle/wrapper/dists/gradle-2.6-bin
+    - $HOME/.gradle/caches/modules-2/files-2.1
diff --git a/README.md b/README.md
diff --git a/build.gradle b/build.gradle
@@ -3,21 +3,25 @@ subprojects {
     apply plugin: 'java'
 
     repositories {
-        mavenLocal()
-        mavenCentral()
+        jcenter()
     }
 
     group = 'org.openmhealth.shim'
 
     ext {
-        javaVersion = 1.7
-        shimServerVersion = '0.2.3'
+        javaVersion = 1.8
+        shimmerVersion = '0.3.0.SNAPSHOT'
+        omhSchemaSdkVersion = '1.0.3'
     }
 
     sourceCompatibility = javaVersion
     targetCompatibility = javaVersion
+
+    test {
+        useTestNG()
+    }
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.2.1'
+    gradleVersion = '2.6'
 }
diff --git a/docker-compose-build.yml b/docker-compose-build.yml
@@ -0,0 +1,17 @@
+resourceserver:
+  build: shim-server/docker
+  environment:
+    SPRING_PROFILES_ACTIVE: development
+    OPENMHEALTH_SHIM_SERVER_CALLBACKURLBASE: http://192.168.99.100:8083
+  links:
+    - mongo:mongo
+
+mongo:
+  image: mongo
+
+console:
+  build: shim-server-ui/docker
+  ports:
+    - "8083:8083"
+  links:
+    - resourceserver:resource-server
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,17 @@
+resourceserver:
+  image: openmhealth/shimmer-resource-server
+  environment:
+    SPRING_PROFILES_ACTIVE: development
+    OPENMHEALTH_SHIM_SERVER_CALLBACKURLBASE: http://192.168.99.100:8083
+  links:
+    - mongo:mongo
+
+mongo:
+  image: mongo
+
+console:
+  image: openmhealth/shimmer-console
+  ports:
+    - "8083:8083"
+  links:
+    - resourceserver:resource-server
diff --git a/docker/binary/Dockerfile b/docker/binary/Dockerfile
diff --git a/docker/source/Dockerfile b/docker/source/Dockerfile
diff --git a/docker/source/supervisord.conf b/docker/source/supervisord.conf
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jan 09 15:27:10 CET 2015
+#Wed Sep 09 09:22:31 CEST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip
diff --git a/java-schema-objects/.gitignore b/java-schema-objects/.gitignore
diff --git a/java-schema-objects/build.gradle b/java-schema-objects/build.gradle
diff --git a/java-schema-objects/src/main/java/org/openmhealth/schema/pojos/Activity.java b/java-schema-objects/src/main/java/org/openmhealth/schema/pojos/Activity.java
diff --git a/java-schema-objects/src/main/java/org/openmhealth/schema/pojos/BaseDataPoint.java b/java-schema-objects/src/main/java/org/openmhealth/schema/pojos/BaseDataPoint.java