From 07d86c50d69e4cef5d6f765fe2d40c77a43e2336 Mon Sep 17 00:00:00 2001 From: James Agnew Date: Wed, 13 Apr 2016 08:09:51 -0400 Subject: [PATCH] Work on cobertura --- README.md | 2 +- hapi-fhir-cobertura/.classpath | 10 +++++++ hapi-fhir-cobertura/.project | 29 +++++++++++++++++++ .../org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.jdt.core.prefs | 7 +++++ .../.settings/org.eclipse.m2e.core.prefs | 4 +++ ....eclipse.wst.common.project.facet.core.xml | 4 +++ hapi-fhir-cobertura/pom.xml | 2 +- pom.xml | 15 ++++++++++ src/site/site.xml | 2 +- src/site/xdoc/download.xml.vm | 14 +++++---- src/site/xdoc/index.xml | 8 ++--- 12 files changed, 87 insertions(+), 12 deletions(-) create mode 100644 hapi-fhir-cobertura/.classpath create mode 100644 hapi-fhir-cobertura/.project create mode 100644 hapi-fhir-cobertura/.settings/org.eclipse.core.resources.prefs create mode 100644 hapi-fhir-cobertura/.settings/org.eclipse.jdt.core.prefs create mode 100644 hapi-fhir-cobertura/.settings/org.eclipse.m2e.core.prefs create mode 100644 hapi-fhir-cobertura/.settings/org.eclipse.wst.common.project.facet.core.xml diff --git a/README.md b/README.md index 8dbce63a151..183bb3e76a3 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ HAPI FHIR - Java API for HL7 FHIR Clients and Servers [![Coverage Status](https://coveralls.io/repos/jamesagnew/hapi-fhir/badge.svg?branch=master&service=github)](https://coveralls.io/github/jamesagnew/hapi-fhir?branch=master) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/ca.uhn.hapi.fhir/hapi-fhir-base/badge.svg)](http://search.maven.org/#search|ga|1|ca.uhn.hapi.fhir) [![Dependency Status](https://www.versioneye.com/user/projects/55e1d0d9c6d8f2001c00043e/badge.svg?style=flat)](https://www.versioneye.com/user/projects/55e1d0d9c6d8f2001c00043e) -[![License](https://img.shields.io/badge/license-apache%202.0-ff69b4.svg)](http://jamesagnew.github.io/hapi-fhir/license.html) +[![License](https://img.shields.io/badge/license-apache%202.0-60C060.svg)](http://jamesagnew.github.io/hapi-fhir/license.html) Complete project documentation is available here: http://jamesagnew.github.io/hapi-fhir/ diff --git a/hapi-fhir-cobertura/.classpath b/hapi-fhir-cobertura/.classpath new file mode 100644 index 00000000000..534617148b0 --- /dev/null +++ b/hapi-fhir-cobertura/.classpath @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/hapi-fhir-cobertura/.project b/hapi-fhir-cobertura/.project new file mode 100644 index 00000000000..f339ae91d38 --- /dev/null +++ b/hapi-fhir-cobertura/.project @@ -0,0 +1,29 @@ + + + hapi-fhir-cobertura + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.jdt.core.javanature + + diff --git a/hapi-fhir-cobertura/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-cobertura/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000000..99f26c0203a --- /dev/null +++ b/hapi-fhir-cobertura/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/hapi-fhir-cobertura/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-cobertura/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..f42de363afa --- /dev/null +++ b/hapi-fhir-cobertura/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/hapi-fhir-cobertura/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-cobertura/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000000..f897a7f1cb2 --- /dev/null +++ b/hapi-fhir-cobertura/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/hapi-fhir-cobertura/.settings/org.eclipse.wst.common.project.facet.core.xml b/hapi-fhir-cobertura/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100644 index 00000000000..bc0009a4558 --- /dev/null +++ b/hapi-fhir-cobertura/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,4 @@ + + + + diff --git a/hapi-fhir-cobertura/pom.xml b/hapi-fhir-cobertura/pom.xml index 40d4fc936bd..6819840adfc 100644 --- a/hapi-fhir-cobertura/pom.xml +++ b/hapi-fhir-cobertura/pom.xml @@ -300,7 +300,7 @@ true - false + diff --git a/pom.xml b/pom.xml index 4d250931fde..2b5a6061ebd 100644 --- a/pom.xml +++ b/pom.xml @@ -1074,6 +1074,21 @@ http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css ./css/bootstrap-responsive.min.css + + + http://netdna.bootstrapcd + https://netdna.bootstrapcd + + + + http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css + https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css + + + + http://ajax.googleapis + https://ajax.googleapis + Welcome]]> diff --git a/src/site/site.xml b/src/site/site.xml index 9e0933173b0..1cecd14f04c 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -210,7 +210,7 @@ Hosted on GitHub
Star us and we will love you!
- + ]]> hapi-fhir-structures-dstu - 1.1 - 1.4 + 1.1 - 1.5 DSTU1 0.0.82 @@ -33,7 +33,7 @@ DSTU2 1.0.0 - 1.3, 1.4 + 1.3 - 1.5 DSTU2 1.0.2 @@ -46,13 +46,17 @@ DSTU2 1.0.0 - 1.3, 1.4 + 1.3 - 1.5 DSTU2 1.0.2 - hapi-fhir-structures-dstu3 + hapi-fhir-structures-dstu3 1.4 - DSTU2 1.3.0 Snapshot (SVN 7602) + DSTU3 1.3.0 Snapshot (SVN 7602) + + + 1.5 + DSTU3 1.4.0 Snapshot (SVN 8138) diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index 123763c0471..b173cbf4c50 100644 --- a/src/site/xdoc/index.xml +++ b/src/site/xdoc/index.xml @@ -11,11 +11,11 @@

- +
- +
- +
Build Status
@@ -25,7 +25,7 @@
VersionEye
- Apache 2.0 Licensed + Apache 2.0 Licensed