diff --git a/apps/dashboard-app/pom.xml b/apps/dashboard-app/pom.xml
index eec979f25..5af203475 100644
--- a/apps/dashboard-app/pom.xml
+++ b/apps/dashboard-app/pom.xml
@@ -1,200 +1,200 @@
shrine-base
net.shrine
1.23.1.0-SNAPSHOT
../../pom.xml
4.0.0
dashboard-app
1.23.1.0-SNAPSHOT
Dashboard App
jar
net.alchim31.maven
scala-maven-plugin
com.github.eirslett
frontend-maven-plugin
0.0.23
src/main/js
install node and npm
install-node-and-npm
v0.10.33
2.7.4
npm install
npm
generate-resources
install
bower install
bower
install
grunt default
grunt
--no-color
log4j
log4j
io.spray
spray-routing_2.11
${spray-version}
io.spray
spray-servlet_2.11
${spray-version}
io.spray
spray-util_2.11
${spray-version}
io.spray
spray-testkit_2.11
${spray-version}
test
com.typesafe.akka
akka-actor_2.11
${akka-version}
com.typesafe.akka
akka-slf4j_2.11
${akka-version}
com.typesafe.akka
akka-testkit_2.11
${akka-testkit-version}
test
org.json4s
json4s-native_2.11
${json4s-version}
com.typesafe.slick
slick_2.11
${slick-version}
org.slf4j
slf4j-log4j12
${slf4j-version}
com.h2database
h2
${h2-version}
test
net.shrine
shrine-protocol
${project.version}
net.shrine
shrine-utility-commons
${project.version}
net.shrine
shrine-crypto
${project.version}
test-jar
test
net.shrine
shrine-auth
${project.version}
net.shrine
shrine-data-commons
${project.version}
mysql
mysql-connector-java
${mysql-version}
io.jsonwebtoken
jjwt
- 0.6.0
+ ${jjwt-version}
net.sourceforge.jtds
jtds
- 1.3.1
+ ${jtds-version}
net.shrine
shrine-adapter-client-api
${project.version}
com.typesafe
config
${typesafe-config-version}
diff --git a/apps/shrine-app/src/test/scala/net/shrine/status/StatusJaxrsTest.scala b/apps/shrine-app/src/test/scala/net/shrine/status/StatusJaxrsTest.scala
index 5523fc29f..50d3bdca1 100644
--- a/apps/shrine-app/src/test/scala/net/shrine/status/StatusJaxrsTest.scala
+++ b/apps/shrine-app/src/test/scala/net/shrine/status/StatusJaxrsTest.scala
@@ -1,128 +1,127 @@
package net.shrine.status
import com.typesafe.config.ConfigFactory
import net.shrine.util.{ShouldMatchersForJUnit, SingleHubModel}
import org.json4s.native.Serialization
import org.json4s.{DefaultFormats, Formats}
import org.junit.Test
import scala.collection.immutable.Map
/**
* Tests for StatusJaxrs
*
* @author david
* @since 12/2/15
*/
class StatusJaxrsTest extends ShouldMatchersForJUnit {
implicit def json4sFormats: Formats = DefaultFormats
- val expectedConfig = ConfigFactory.load("shrine") //new File("/Users/ty/shrine/apps/shrine-app/src/test/resources/shrine.conf"))
+ val expectedConfig = ConfigFactory.load("shrine")
val statusJaxrs = StatusJaxrs(expectedConfig)
@Test
def testVersion() = {
val versionString = statusJaxrs.version
val version = Serialization.read[Version](versionString)
version should equal(Version("changeMe"))
}
@Test
def testConfig() = {
val expectedJson4sConfig = Json4sConfig(expectedConfig)
val configString = statusJaxrs.config
val config = Serialization.read[Json4sConfig](configString)
-
config should equal(expectedJson4sConfig)
val passwordKeys = config.keyValues.filter(x => Json4sConfig.isPassword(x._1))
passwordKeys should equal(Map.empty[String,String])
}
@Test
def testSummary() = {
val summaryString = statusJaxrs.summary
val summary = Serialization.read[Summary](summaryString)
summary.isHub should be (true)
summary.adapterMappingsFileName.isDefined should be (true)
summary.adapterMappingsDate.isEmpty should be (false)
summary.adapterOk should be (true)
summary.keystoreOk should be (true)
summary.hubOk should be (false)
summary.qepOk should be (true)
}
@Test
def testI2b2() = {
val i2b2String = statusJaxrs.i2b2
val i2b2 = Serialization.read[I2b2](i2b2String)
i2b2.crcUrl.isDefined should be (true)
}
@Test
def testOptionalParts() = {
val string = statusJaxrs.optionalParts
val actual = Serialization.read[OptionalParts](string)
actual.isHub should be (true)
actual.stewardEnabled should be (true)
actual.shouldQuerySelf should be (false)
actual.downstreamNodes.size should be (4)
}
@Test
def testHub() = {
val string = statusJaxrs.hub
val actual = Serialization.read[Hub](string)
actual.create should be (true)
actual.shouldQuerySelf should be (false)
actual.downstreamNodes.size should be (4)
}
@Test
def testQep() = {
val string = statusJaxrs.qep
val actual = Serialization.read[Qep](string)
actual.create should be (true)
actual.attachSigningCert should be (true)
actual.authenticationType should be ("PmAuthenticator")
actual.authorizationType should be ("StewardQueryAuthorizationService")
actual.includeAggregateResults should be (false)
actual.maxQueryWaitTimeMillis should be (300000000L)
actual.trustModel should be (SingleHubModel(true).description)
actual.trustModelIsHub should be (true)
actual.broadcasterUrl shouldNot be (None)
}
@Test
def testAdapter() = {
val string = statusJaxrs.adapter
val actual = Serialization.read[Adapter](string)
actual.adapterLockoutAttemptsThreshold should be (0)
}
@Test
def testKeyStore() = {
val string = statusJaxrs.keystore
val actual = Serialization.read[KeyStoreReport](string)
}
}
diff --git a/commons/email/pom.xml b/commons/email/pom.xml
index 51ae05e1e..5d2c5225b 100644
--- a/commons/email/pom.xml
+++ b/commons/email/pom.xml
@@ -1,71 +1,71 @@
4.0.0
SHRINE Email
shrine-email
jar
net.shrine
shrine-base
1.23.1.0-SNAPSHOT
../../pom.xml
org.slf4j
slf4j-simple
- 1.6.4
+ ${slf4j-version}
org.json4s
json4s-native_2.11
${json4s-version}
me.lessis
courier_2.11
- 0.1.3
+ ${courier-version}
net.shrine
shrine-config
${project.version}
net.shrine
shrine-test-commons
${project.version}
test-jar
test
org.jvnet.mock-javamail
mock-javamail
- 1.9
+ ${mock-javamail-version}
test
src/main/scala
src/test/scala
net.alchim31.maven
scala-maven-plugin
org.apache.maven.plugins
maven-jar-plugin
2.6
test-jar
diff --git a/commons/util/pom.xml b/commons/util/pom.xml
index 83839e5eb..4ef88175e 100644
--- a/commons/util/pom.xml
+++ b/commons/util/pom.xml
@@ -1,102 +1,102 @@
4.0.0
SHRINE Utility Code
shrine-util
jar
net.shrine
shrine-base
1.23.1.0-SNAPSHOT
../../pom.xml
com.typesafe.slick
slick_2.11
${slick-version}
io.spray
spray-httpx_2.11
${spray-version}
org.slf4j
slf4j-simple
- 1.6.4
+ ${slf4j-version}
net.liftweb
lift-json_${scala-major-version}
org.scala-lang
scalap
org.scala-lang
scalap
${scala-version}
log4j
log4j
net.shrine
shrine-test-commons
${project.version}
test-jar
test
org.json4s
json4s-native_2.11
${json4s-version}
com.h2database
h2
test
src/main/scala
src/test/scala
src/main/resources
true
shrine-versions.properties
net.alchim31.maven
scala-maven-plugin
org.apache.maven.plugins
maven-jar-plugin
2.6
test-jar
diff --git a/design-scratch/topic.schema.json b/design-scratch/topic.schema.json
index cce70457a..50f8a6051 100644
--- a/design-scratch/topic.schema.json
+++ b/design-scratch/topic.schema.json
@@ -1,5 +1,16 @@
{
- "name": "some-name",
- "description": "This is a description",
- "ID": "some-uuid"
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "type": "object",
+ "title": "Topic.",
+ "description": "Represents the topic that shrine queries run under",
+ "properties": {
+ "name": { "type": "string" },
+ "description": { "type": "string" },
+ "ID": { "type": "uuid" }
+ },
+ "required": [
+ "name",
+ "description",
+ "ID"
+ ]
}
diff --git a/pom.xml b/pom.xml
index 51cd70a80..918f6483a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,387 +1,391 @@
4.0.0
SHRINE
net.shrine
shrine-base
pom
1.23.1.0-SNAPSHOT
UTF-8
4.2.5.RELEASE
- 2.6.2
+ 2.6.2
2.11.8
2.11
4.12
- 1.7.18
+ 1.7.22
1.2.17
1.19
- 2.2.6
+ 2.2.6
3.2.2
- 0.9.6-RC4
- 1.2.1
- 1.4.191
+ 0.9.7
+ 1.3.1
+ 1.4.193
3.4
- 5.1.38
+ 5.1.40
2.3
- 3.0.1
+ 3.0.1
0.9.5
- 1.3.3
- 2.3.14
- 2.4.0
- 3.3.0
+ 1.3.4
+ 2.4.16
+ 2.4.16
+ 3.5.0
3.1.1
3.1.1.1
- 1.55
+ 1.56
+ 0.1.3
+ 1.9
+ 0.7.0
+ 1.3.1
apps/meta-app
apps/meta-war
apps/dashboard-app
apps/dashboard-war
apps/steward-app
apps/steward-war
apps/proxy
apps/shrine-app
apps/war
qep/service
hub/broadcaster-aggregator
hub/broadcaster-service
adapter/adapter-api
adapter/adapter-service
hms-support
tools
commons/util
commons/email
commons/auth
commons/protocol-query
commons/data-commons
commons/protocol
commons/crypto
commons/client
commons/config
commons/ont-support
commons/test-commons
install
integration
shrine-webclient
net.alchim31.maven
scala-maven-plugin
${scala-maven-plugin-version}
compile
compile
compile
test-compile
testCompile
test-compile
process-resources
compile
incremental
true
-XX:+AggressiveOpts
-XX:CompileThreshold=500
-XX:+UseFastAccessorMethods
-XX:+UseStringCache
-XX:+OptimizeStringConcat
-XX:+TieredCompilation
-XX:+UseConcMarkSweepGC
-XX:+DoEscapeAnalysis
-server
-Xms64m
-Xmx1024m
-XX:MaxPermSize=384m
${scala-version}
-Xcheckinit
-unchecked
-deprecation
-Xlint:adapted-args,inaccessible,infer-any,missing-interpolator,private-shadow,type-parameter-shadow,unsound-match
7
maven-compiler-plugin
7
org.codehaus.mojo
buildnumber-maven-plugin
1.1
org.apache.maven.plugins
maven-jar-plugin
2.4
org.apache.maven.plugins
maven-war-plugin
2.1.1
org.codehaus.mojo
buildnumber-maven-plugin
validate
create
{0,date,yyyy-MM-dd HH:mm:ss}
(not available)
org.apache.maven.plugins
maven-jar-plugin
true
${buildNumber}
${scmBranch}
${timestamp}
org.apache.maven.plugins
maven-war-plugin
true
${buildNumber}
${scmBranch}
${timestamp}
org.apache.tomcat.maven
tomcat7-maven-plugin
2.2
true
true
true
true
http://shrine-dev1.catalyst:6060/shrine/rest/happy
scm:git:https://open.med.harvard.edu/stash/scm/shrine/shrine.git
CBMI-Nexus
https://repo.open.med.harvard.edu/nexus/content/groups/public/
com.typesafe
config
${typesafe-config-version}
log4j
log4j
${log4j-version}
org.springframework
spring-jdbc
${spring.version}
test
com.h2database
h2
${h2-version}
test
org.easymock
easymock
${easymock-version}
test
org.slf4j
slf4j-log4j12
${slf4j-version}
test
mysql
mysql-connector-java
${mysql-version}
net.sf.opencsv
opencsv
${opencsv-version}
net.liftweb
lift-json_${scala-major-version}
${lift-version}
com.sun.jersey
jersey-server
${jersey-version}
com.sun.jersey
jersey-servlet
${jersey-version}
com.sun.jersey
jersey-client
${jersey-version}
org.squeryl
squeryl_${scala-major-version}
${squeryl-version}
javax.servlet
javax.servlet-api
${servlet-api-version}
provided
org.bouncycastle
bcpkix-jdk15on
${bouncy-castle-version}
org.scala-lang
scala-library
${scala-version}
junit
junit
${junit-version}
test
org.scalatest
scalatest_${scala-major-version}
${scalatest-version}
test
org.scala-lang
scala-actors
org.scala-lang
scala-reflect
org.scala-lang
scala-actors
${scala-version}
test
org.scala-lang
scala-reflect
${scala-version}
nexus
Nexus Repo
https://repo.open.med.harvard.edu/nexus/content/repositories/snapshots
false
nexus
Nexus Repo
https://repo.open.med.harvard.edu/nexus/content/repositories/releases-internal