From 2adaa4a072af3009837fd9a12c076f82c44319f0 Mon Sep 17 00:00:00 2001
From: jamesagnew <jamesagnew@gmail.com>
Date: Mon, 14 Jul 2014 08:21:50 -0400
Subject: [PATCH] Site updates

---
 hapi-fhir-base/pom.xml                       | 93 +++++++++++++-------
 hapi-fhir-base/src/changes/changes.xml       |  2 +-
 hapi-fhir-base/src/site/site.xml             |  3 +-
 hapi-fhir-base/src/site/xdoc/download.xml.vm |  6 +-
 hapi-fhir-base/src/site/xdoc/index.xml       | 12 ++-
 5 files changed, 79 insertions(+), 37 deletions(-)

diff --git a/hapi-fhir-base/pom.xml b/hapi-fhir-base/pom.xml
index a0a1a5316e2..540ac9a4212 100644
--- a/hapi-fhir-base/pom.xml
+++ b/hapi-fhir-base/pom.xml
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -22,15 +21,13 @@
 			<url>scm:git:git@github.com:jamesagnew/hapi-fhir.git</url>
 		</site>
 
-		<!-- <site> <id>hl7api.sf.net</id> <url>scp://shell.sourceforge.net/home/project-web/hl7api/htdocs/hapi-fhir</url> 
-			</site> -->
+		<!-- <site> <id>hl7api.sf.net</id> <url>scp://shell.sourceforge.net/home/project-web/hl7api/htdocs/hapi-fhir</url> </site> -->
 	</distributionManagement>
 
 	<dependencies>
 
 		<!-- JSON -->
-		<!-- <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> 
-			<version>2.2.4</version> </dependency> -->
+		<!-- <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> <version>2.2.4</version> </dependency> -->
 		<dependency>
 			<groupId>javax.json</groupId>
 			<artifactId>javax.json-api</artifactId>
@@ -49,8 +46,7 @@
 			<version>4.2.0</version>
 		</dependency>
 
-		<!-- <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>stax2-api</artifactId> 
-			<version>3.1.3</version> </dependency> -->
+		<!-- <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>stax2-api</artifactId> <version>3.1.3</version> </dependency> -->
 
 		<dependency>
 			<groupId>org.thymeleaf</groupId>
@@ -231,19 +227,56 @@
 					<escapeHTML>false</escapeHTML>
 				</configuration>
 			</plugin>
-			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> 
-				<version>2.16</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> 
-				<artifactId>maven-javadoc-plugin</artifactId> <version>2.9.1</version> <configuration> 
-				</configuration> <reportSets> <reportSet> <id>default</id> <reports> <report>javadoc</report> 
-				</reports> </reportSet> </reportSets> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> 
-				<artifactId>findbugs-maven-plugin</artifactId> <version>2.5.3</version> </plugin> 
-				<plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jxr-plugin</artifactId> 
-				<version>2.4</version> <reportSets> <reportSet> <id>normal</id> <reports> 
-				<report>jxr</report> </reports> </reportSet> <reportSet> <id>restful-server-example</id> 
-				<reports> <report>jxr</report> </reports> <configuration> <sourcePath>../restful-server-example/src/main/java</sourcePath> 
-				<destDir>${project.reporting.outputDirectory}/rse-xref</destDir> <outputDirectory>tmp</outputDirectory> 
-				<reportOutputDirectory>rse-xref</reportOutputDirectory> </configuration> 
-				</reportSet> </reportSets> </plugin> -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-report-plugin</artifactId>
+				<version>2.16</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.9.1</version>
+				<configuration>
+				</configuration>
+				<reportSets>
+					<reportSet>
+						<id>default</id>
+						<reports>
+							<report>javadoc</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>findbugs-maven-plugin</artifactId>
+				<version>2.5.3</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jxr-plugin</artifactId>
+				<version>2.4</version>
+				<reportSets>
+					<reportSet>
+						<id>normal</id>
+						<reports>
+							<report>jxr</report>
+						</reports>
+					</reportSet>
+					<reportSet>
+						<id>restful-server-example</id>
+						<reports>
+							<report>jxr</report>
+						</reports>
+						<configuration>
+							<sourcePath>../restful-server-example/src/main/java</sourcePath>
+							<destDir>${project.reporting.outputDirectory}/rse-xref</destDir>
+							<outputDirectory>tmp</outputDirectory>
+							<reportOutputDirectory>rse-xref</reportOutputDirectory>
+						</configuration>
+					</reportSet>
+				</reportSets>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-project-info-reports-plugin</artifactId>
@@ -259,8 +292,7 @@
 					</reportSet>
 				</reportSets>
 			</plugin>
-			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-linkcheck-plugin</artifactId> 
-				<version>1.1</version> </plugin> -->
+			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-linkcheck-plugin</artifactId> <version>1.1</version> </plugin> -->
 		</plugins>
 	</reporting>
 
@@ -269,7 +301,7 @@
 		<siteMainDirectory>${user.home}/sites/hapi-fhir</siteMainDirectory>
 		<scmPubCheckoutDirectory>${user.home}/sites/scm/hapi-fhir</scmPubCheckoutDirectory>
 	</properties>
-	
+
 	<build>
 		<pluginManagement>
 			<plugins>
@@ -370,7 +402,9 @@
   m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
   })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
-  ga('create', 'UA-1395874-5', 'sourceforge.net');
+  ga('create', 'UA-1395874-5', 'auto');
+  ga('require', 'displayfeatures');
+  ga('require', 'linkid', 'linkid.js');
   ga('send', 'pageview');
 
 </script>
@@ -479,12 +513,9 @@
 				<filtering>true</filtering>
 			</resource>
 		</resources>
-		<!-- <extensions> <extension> <groupId>org.apache.maven.wagon</groupId> 
-			<artifactId>wagon-scm</artifactId> <version>2.6</version> </extension> <extension> 
-			<groupId>org.apache.maven.scm</groupId> <artifactId>maven-scm-manager-plexus</artifactId> 
-			<version>1.9</version> </extension> <extension> <groupId>org.apache.maven.scm</groupId> 
-			<artifactId>maven-scm-provider-gitexe</artifactId> <version>1.9</version> 
-			</extension> </extensions> -->
+		<!-- <extensions> <extension> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-scm</artifactId> <version>2.6</version> </extension> <extension> <groupId>org.apache.maven.scm</groupId> 
+			<artifactId>maven-scm-manager-plexus</artifactId> <version>1.9</version> </extension> <extension> <groupId>org.apache.maven.scm</groupId> <artifactId>maven-scm-provider-gitexe</artifactId> 
+			<version>1.9</version> </extension> </extensions> -->
 	</build>
 
 	<profiles>
diff --git a/hapi-fhir-base/src/changes/changes.xml b/hapi-fhir-base/src/changes/changes.xml
index 93ce76babb7..e9dea06f6d7 100644
--- a/hapi-fhir-base/src/changes/changes.xml
+++ b/hapi-fhir-base/src/changes/changes.xml
@@ -8,7 +8,7 @@
 	<body>
 		<release version="0.3" date="2014-May-12" description="This release corrects lots of bugs and introduces the fluent client mode">
         </release>			
-		<release version="0.4" date="TBD">
+		<release version="0.4" date="2014-Jul-13">
 			<action type="add">
 				<![CDATA[<b>BREAKING CHANGE:</b>]]>: IdDt has been modified so that it 
 				contains a partial or complete resource identity. Previously it contained
diff --git a/hapi-fhir-base/src/site/site.xml b/hapi-fhir-base/src/site/site.xml
index 50a9795740a..9150ee27639 100644
--- a/hapi-fhir-base/src/site/site.xml
+++ b/hapi-fhir-base/src/site/site.xml
@@ -40,7 +40,7 @@
 		</head>
 
 		<links>
-			<item name="Sourceforge Project Page" href="https://sourceforge.net/projects/hl7api/" />
+			<item name="GitHub Page" href="https://github.com/jamesagnew/hapi-fhir/" />
 			<item name="hl7.org" href="http://hl7.org/" />
 			<item name="University Health Network" href="http://www.uhn.ca/" />
 		</links>
@@ -48,6 +48,7 @@
 		<menu name="Welcome">
 			<item name="Welcome" href="index.html" />
 			<item name="Download" href="./download.html" />
+			<item name="Changelog" href="./changes-report.html" />
 		</menu>
 
 		<menu name="Documentation">
diff --git a/hapi-fhir-base/src/site/xdoc/download.xml.vm b/hapi-fhir-base/src/site/xdoc/download.xml.vm
index 96a93706dd7..71aaeea0a6f 100644
--- a/hapi-fhir-base/src/site/xdoc/download.xml.vm
+++ b/hapi-fhir-base/src/site/xdoc/download.xml.vm
@@ -13,7 +13,7 @@
 			<p>
 				The easiest way to get started with HAPI-FHIR is to either download the
 				source code from our
-				<a href="https://sourceforge.net/p/hl7api/fhircode/ci/master/tree/">Git Repository</a>
+				<a href="https://github.com/jamesagnew/hapi-fhir/">Git Repository</a>
 				, or to use Maven:
 			</p>
 			<source><![CDATA[<dependency>
@@ -25,8 +25,8 @@
 			<subsection name="Non-Maven Users">
 				
 				<p>
-					Non-maven users can grab the files from the
-					<a href="https://sourceforge.net/projects/hl7api/files/hapi-fhir/">Sourceforge File Release System</a>.
+					Non-maven users can grab the binary releases from the
+					<a href="https://github.com/jamesagnew/hapi-fhir/releases">GitHub Release Section</a>.
 				</p>
 			
 			</subsection>
diff --git a/hapi-fhir-base/src/site/xdoc/index.xml b/hapi-fhir-base/src/site/xdoc/index.xml
index 1f6d7b8adc0..c6a012b051f 100644
--- a/hapi-fhir-base/src/site/xdoc/index.xml
+++ b/hapi-fhir-base/src/site/xdoc/index.xml
@@ -28,12 +28,22 @@
 
 		<section name="Announcements">
 		
+			<p>
+				<b>July 14, 2014 - HAPI FHIR 0.4 Released</b> - The next release of HAPI has been
+				tagged an uploaded to the Maven global repos and the GitHub releases section. See the changelog
+				for more information. This release contains a large number of minor bugfixes and quite a few new
+				features. Upgrading should be relatively simple, although there is one breaking API change (IdDt
+				now can contain the complete URL of a resource, not just the logical ID).
+				<br/>
+				- <a href="mailto:jamesagnew@users.sourceforge.net">James Agnew</a>
+			</p>
+
 			<p>
 				<b>May 12, 2014 - HAPI FHIR 0.3 Released</b> - A new release of HAPI FHIR has been deployed
 				to the Maven repos and the Sourceforge download system. This release corrects a large number of 
 				bugs and includes fixes which were implemented in the recent FHIR Connectathon.
 				<br/>
-				<![CDATA[&nbsp;&nbsp;&nbsp;&emdash;&nbsp;]]><a href="mailto:jamesagnew@users.sourceforge.net">James Agnew</a>
+				- <a href="mailto:jamesagnew@users.sourceforge.net">James Agnew</a>
 			</p>
 			
 		</section>