Work on cobertura

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/

hapi-fhir-cobertura/.classpath

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="build/classes"/>
+</classpath>

hapi-fhir-cobertura/.project

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>hapi-fhir-cobertura</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

hapi-fhir-cobertura/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

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

hapi-fhir-cobertura/.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

hapi-fhir-cobertura/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="java" version="1.7"/>
+</faceted-project>

hapi-fhir-cobertura/pom.xml

@@ -300,7 +300,7 @@
 					<redirectTestOutputToFile>true</redirectTestOutputToFile>
 					<!--<reportFormat>plain</reportFormat>-->
 					<!--<argLine>-Xmx600m -XX:+HeapDumpOnOutOfMemoryError</argLine>-->
-					<reuseForks>false</reuseForks>
+					<!--<reuseForks>false</reuseForks>-->
 				</configuration>
 			</plugin>
 			<plugin>

pom.xml

@@ -1074,6 +1074,21 @@
 									<replacetoken>http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css</replacetoken>
 									<replacevalue>./css/bootstrap-responsive.min.css</replacevalue>
 								</replace>
+								<replace dir="target/site" summary="true">
+									<include name="*.html"/>
+									<replacetoken>http://netdna.bootstrapcd</replacetoken>
+									<replacevalue>https://netdna.bootstrapcd</replacevalue>
+								</replace>
+								<replace dir="target/site" summary="true">
+									<include name="*.html"/>
+									<replacetoken>http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css</replacetoken>
+									<replacevalue>https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css</replacevalue>
+								</replace>
+								<replace dir="target/site" summary="true">
+									<include name="*.html"/>
+									<replacetoken>http://ajax.googleapis</replacetoken>
+									<replacevalue>https://ajax.googleapis</replacevalue>
+								</replace>
 								<replace dir="target/site" summary="true">
 									<include name="index.html"/>
 									<replacetoken><![CDATA[<h2 id="Welcome">Welcome</h2>]]></replacetoken>

src/site/site.xml

@@ -210,7 +210,7 @@
 				<a href="https://github.com/jamesagnew/hapi-fhir"><img src="./images/github-logo-mini.png" alt="Hosted on GitHub" border="0"/></a>
 				<br/>
 				Star us and we will love you!<br />
-				<iframe src="http://ghbtns.com/github-btn.html?user=jamesagnew&repo=hapi-fhir&type=star&count=true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
+				<iframe src="https://ghbtns.com/github-btn.html?user=jamesagnew&repo=hapi-fhir&type=star&count=true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
 			]]></bottomDescription>
 			<brand>
 				<name><![CDATA[

src/site/xdoc/download.xml.vm

@@ -20,7 +20,7 @@
 				<tbody>
 					<tr>
 						<td rowspan="1">hapi-fhir-structures-dstu</td>
-						<td>1.1 - 1.4</td>
+						<td>1.1 - 1.5</td>
 						<td><a href="http://www.hl7.org/fhir/DSTU1/index.html">DSTU1 0.0.82</a></td>
 					</tr>
 					<tr>
@@ -33,7 +33,7 @@
 						<td><a href="http://hl7.org/fhir/2015Sep/index.html">DSTU2 1.0.0</a></td>
 					</tr>
 					<tr>
-						<td>1.3, 1.4</td>
+						<td>1.3 - 1.5</td>
 						<td><a href="http://hl7.org/fhir/2015Sep/index.html">DSTU2 1.0.2</a></td>
 					</tr>
 					<tr>
@@ -46,13 +46,17 @@
 						<td><a href="http://hl7.org/fhir/2015Sep/index.html">DSTU2 1.0.0</a></td>
 					</tr>
 					<tr>
-						<td>1.3, 1.4</td>
+						<td>1.3 - 1.5</td>
 						<td><a href="http://hl7.org/fhir/2015Sep/index.html">DSTU2 1.0.2</a></td>
 					</tr>
 					<tr>
-						<td rowspan="1">hapi-fhir-structures-dstu3</td>
+						<td rowspan="2">hapi-fhir-structures-dstu3</td>
 						<td>1.4</td>
-						<td><a href="http://hl7-fhir.github.io/">DSTU2 1.3.0 Snapshot</a> (SVN 7602)</td>
+						<td><a href="http://hl7-fhir.github.io/">DSTU3 1.3.0 Snapshot</a> (SVN 7602)</td>
+					</tr>
+					<tr>
+						<td>1.5</td>
+						<td><a href="http://hl7-fhir.github.io/">DSTU3 1.4.0 Snapshot</a> (SVN 8138)</td>
 					</tr>
 				</tbody>
 			</table>

src/site/xdoc/index.xml

@@ -11,11 +11,11 @@
 		<!-- The body of the document contains a number of sections -->
 		<section name="Welcome">
 			<p style="float:right; text-align: center;">
-				<iframe src="http://ghbtns.com/github-btn.html?user=jamesagnew&amp;repo=hapi-fhir&amp;type=watch&amp;count=true&amp;v=2" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
+				<iframe src="https://ghbtns.com/github-btn.html?user=jamesagnew&amp;repo=hapi-fhir&amp;type=watch&amp;count=true&amp;v=2" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
 				<br/>
-				<iframe src="http://ghbtns.com/github-btn.html?user=jamesagnew&amp;repo=hapi-fhir&amp;type=star&amp;count=true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
+				<iframe src="https://ghbtns.com/github-btn.html?user=jamesagnew&amp;repo=hapi-fhir&amp;type=star&amp;count=true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
 				<br/>
-				<iframe src="http://ghbtns.com/github-btn.html?user=jamesagnew&amp;repo=hapi-fhir&amp;type=fork&amp;count=true&amp;v=2" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
+				<iframe src="https://ghbtns.com/github-btn.html?user=jamesagnew&amp;repo=hapi-fhir&amp;type=fork&amp;count=true&amp;v=2" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
 				<br/>
 				<a href="https://travis-ci.org/jamesagnew/hapi-fhir"><img src="https://travis-ci.org/jamesagnew/hapi-fhir.svg?branch=master" alt="Build Status"/></a>
 				<br/>
@@ -25,7 +25,7 @@
 				<br/>
 				<a href="https://www.versioneye.com/user/projects/55e1d0d9c6d8f2001c00043e"><img src="https://www.versioneye.com/user/projects/55e1d0d9c6d8f2001c00043e/badge.svg?style=flat" alt="VersionEye"/></a>
 				<br/>
-				<a href="http://jamesagnew.github.io/hapi-fhir/license.html"><img src="https://img.shields.io/badge/license-apache%202.0-ff69b4.svg" alt="Apache 2.0 Licensed"/></a>
+				<a href="http://jamesagnew.github.io/hapi-fhir/license.html"><img src="https://img.shields.io/badge/license-apache%202.0-60C060.svg" alt="Apache 2.0 Licensed"/></a>
 			</p>
 			
 			<p>