Fix up examples

bormb.txt

@@ -1,61 +0,0 @@
-	@Override
-	public void invokeServer(RestfulServer theServer, Request theRequest, HttpServletResponse theResponse) throws BaseServerResponseException, IOException {
-		Object[] params = new Object[getParameters().size()];
-		for (int i = 0; i < getParameters().size(); i++) {
-			IParameter param = getParameters().get(i);
-			if (param != null) {
-				params[i] = param.translateQueryParametersIntoServerArgument(theRequest, null);
-			}
-		}
-
-		addParametersForServerRequest(theRequest, params);
-
-		MethodOutcome response = (MethodOutcome) invokeServerMethod(getProvider(), params);
-
-		if (response == null) {
-			if (myReturnVoid == false) {
-				throw new ConfigurationException("Method " + getMethod().getName() + " in type " + getMethod().getDeclaringClass().getCanonicalName() + " returned null");
-			} else {
-				theResponse.setStatus(Constants.STATUS_HTTP_204_NO_CONTENT);
-			}
-		} else if (!myReturnVoid) {
-			if (response.isCreated()) {
-				theResponse.setStatus(Constants.STATUS_HTTP_201_CREATED);
-				StringBuilder b = new StringBuilder();
-				b.append(theRequest.getFhirServerBase());
-				b.append('/');
-				b.append(getResourceName());
-				b.append('/');
-				b.append(response.getId().getValue());
-				if (response.getVersionId() != null && response.getVersionId().isEmpty() == false) {
-					b.append("/_history/");
-					b.append(response.getVersionId().getValue());
-				}
-				theResponse.addHeader("Location", b.toString());
-			} else {
-				theResponse.setStatus(Constants.STATUS_HTTP_200_OK);
-			}
-		} else {
-			theResponse.setStatus(Constants.STATUS_HTTP_204_NO_CONTENT);
-		}
-
-		theServer.addHeadersToResponse(theResponse);
-
-		Writer writer = theResponse.getWriter();
-		try {
-			if (response != null) {
-				OperationOutcome outcome = new OperationOutcome();
-				if (response.getOperationOutcome() != null && response.getOperationOutcome().getIssue() != null) {
-					outcome.getIssue().addAll(response.getOperationOutcome().getIssue());
-				}
-				EncodingUtil encoding = BaseMethodBinding.determineResponseEncoding(theRequest.getServletRequest(), theRequest.getParameters());
-				theResponse.setContentType(encoding.getResourceContentType());
-				IParser parser = encoding.newParser(getContext());
-				parser.encodeResourceToWriter(outcome, writer);
-			}
-		} finally {
-			writer.close();
-		}
-		// getMethod().in
-	}
-

bormbwrp.txt

@@ -1,68 +0,0 @@
-	@Override
-	public void invokeServer(RestfulServer theServer, Request theRequest, HttpServletResponse theResponse) throws BaseServerResponseException, IOException {
-		EncodingUtil encoding = BaseMethodBinding.determineResponseEncoding(theRequest.getServletRequest(), theRequest.getParameters());
-		IParser parser = encoding.newParser(getContext());
-		IResource resource = parser.parseResource(theRequest.getInputReader());
-
-		Object[] params = new Object[getParameters().size()];
-		for (int i = 0; i < getParameters().size(); i++) {
-			IParameter param = getParameters().get(i);
-			if (param == null) {
-				continue;
-			}
-			params[i] = param.translateQueryParametersIntoServerArgument(theRequest, resource);
-		}
-
-		addParametersForServerRequest(theRequest, params);
-
-		MethodOutcome response;
-		try {
-			response = (MethodOutcome) invokeServerMethod(getProvider(), params);
-		} catch (BaseServerResponseException e) {
-			streamOperationOutcome(e, theServer, encoding, theResponse);
-			return;
-		}
-
-		if (response == null) {
-			if (isReturnVoid() == false) {
-				throw new ConfigurationException("Method " + getMethod().getName() + " in type " + getMethod().getDeclaringClass().getCanonicalName() + " returned null");
-			}
-		} else if (!isReturnVoid()) {
-			if (response.isCreated()) {
-				theResponse.setStatus(Constants.STATUS_HTTP_201_CREATED);
-				StringBuilder b = new StringBuilder();
-				b.append(theRequest.getFhirServerBase());
-				b.append('/');
-				b.append(getResourceName());
-				b.append('/');
-				b.append(response.getId().getValue());
-				if (response.getVersionId() != null && response.getVersionId().isEmpty() == false) {
-					b.append("/_history/");
-					b.append(response.getVersionId().getValue());
-				}
-				theResponse.addHeader("Location", b.toString());
-			} else {
-				theResponse.setStatus(Constants.STATUS_HTTP_200_OK);
-			}
-		} else {
-			theResponse.setStatus(Constants.STATUS_HTTP_204_NO_CONTENT);
-		}
-
-		theServer.addHeadersToResponse(theResponse);
-
-		if (response != null && response.getOperationOutcome() != null) {
-			theResponse.setContentType(encoding.getResourceContentType());
-			Writer writer = theResponse.getWriter();
-			try {
-				parser.encodeResourceToWriter(response.getOperationOutcome(), writer);
-			} finally {
-				writer.close();
-			}
-		} else {
-			theResponse.setContentType(Constants.CT_TEXT);
-			Writer writer = theResponse.getWriter();
-			writer.close();
-		}
-
-		// getMethod().in
-	}

check_for_maven_updates.sh

@@ -0,0 +1,3 @@
+mvn versions:display-dependency-updates
+mvn versions:display-plugin-updates
+

hapi-fhir-base/pom.xml

@@ -40,7 +40,7 @@
 		<dependency>
 			<groupId>org.codehaus.woodstox</groupId>
 			<artifactId>woodstox-core-asl</artifactId>
-			<version>4.2.0</version>
+			<version>${woodstox_version}</version>
 		</dependency>
 
 		<!-- Only required for OpenID Connect Support -->
@@ -106,7 +106,7 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.2.1</version>
+			<version>${commons_lang_version}</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-codec</groupId>
@@ -274,7 +274,7 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>17.0</version>
+			<version>${guava_version}</version>
 			<scope>test</scope>
 		</dependency>
 		<!-- 
@@ -355,6 +355,7 @@
 			<plugins>
 				<plugin>
 					<artifactId>maven-site-plugin</artifactId>
+					<version>${maven_site_plugin_version}</version>
 					<configuration>
 						<skip>false</skip>
 						<skipDeploy>true</skipDeploy>
@@ -520,6 +521,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-site-plugin</artifactId>
+				<version>${maven_site_plugin_version}</version>
 				<executions>
 					<execution>
 						<id>stage-for-scm-publish</id>
@@ -675,6 +677,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-source-plugin</artifactId>
+						<version>${maven_source_plugin_version}</version>
 						<executions>
 							<execution>
 								<phase>package</phase>
@@ -686,7 +689,7 @@
 					</plugin>
 					<plugin>
 						<artifactId>maven-assembly-plugin</artifactId>
-						<version>2.4</version>
+						<version>${maven_assembly_plugin_version}</version>
 						<executions>
 							<execution>
 								<phase>package</phase>
@@ -706,6 +709,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>license-maven-plugin</artifactId>
+						<version>${maven_license_plugin_version}</version>
 						<executions>
 							<execution>
 								<id>first</id>

hapi-fhir-base/src/test/resources/logback-test.xml

@@ -7,10 +7,9 @@
 		</encoder>
 	</appender>
 
-<!-- 
+	<logger name="org.eclipse" additivity="false" level="info">
-	<logger name="org.eclipse" additivity="false">
+		<appender-ref ref="STDOUT" />
 	</logger>
--->
 
 	<!-- 
 	<logger name="ca.uhn.fhir.rest.client" additivity="false" level="trace">

hapi-fhir-jpaserver-test/pom.xml

@@ -27,7 +27,7 @@
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>1.1.1</version>
+			<version>${logback_version}</version>
 		</dependency>
 
 		<dependency>
@@ -51,7 +51,7 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>17.0</version>
+			<version>${guava_version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>

pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_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/maven-v4_0_0.xsd">
 
 	<parent>
 		<groupId>org.sonatype.oss</groupId>
@@ -39,6 +40,10 @@
 	<dependencies>
 	</dependencies>
 
+	<prerequisites>
+		<maven>3.0.1</maven>
+	</prerequisites>
+	
 	<developers>
 		<developer>
 			<name>James Agnew</name>
@@ -80,28 +85,32 @@
 	</modules>
 
 	<properties>
+		<commons_lang_version>3.3.2</commons_lang_version>
 		<derby_version>10.10.2.0</derby_version>
-		<guava_version>14.0.1</guava_version>
+		<guava_version>18.0</guava_version>
 		<hamcrest_version>1.3</hamcrest_version>
 		<hibernate_version>4.2.12.Final</hibernate_version>
 		<hibernate_validator_version>5.1.0.Final</hibernate_validator_version>
-		<jetty_version>9.1.1.v20140108</jetty_version>
+		<jetty_version>9.2.2.v20140723</jetty_version>
-		<jetty_version>9.1.1.v20140108</jetty_version>
 		<jscience_version>4.3.1</jscience_version>
 		<junit_version>4.11</junit_version>
 		<logback_version>1.1.1</logback_version>
+		<maven_assembly_plugin_version>2.4.1</maven_assembly_plugin_version>
 		<maven_javadoc_plugin_version>2.9.1</maven_javadoc_plugin_version>
+		<maven_license_plugin_version>1.7</maven_license_plugin_version>
 		<maven_surefire_plugin_version>2.17</maven_surefire_plugin_version>
 		<maven_site_plugin_version>3.4</maven_site_plugin_version>
+		<maven_source_plugin_version>2.3</maven_source_plugin_version>
 		<mitreid-connect-version>1.1.8</mitreid-connect-version>
 		<mockito_version>1.9.5</mockito_version>
 		<phloc_schematron_version>2.7.1</phloc_schematron_version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<slf4j_version>1.7.7</slf4j_version>
-		<spring_version>4.0.1.RELEASE</spring_version>
+		<spring_version>4.0.6.RELEASE</spring_version>
 		<spring_security_version>3.2.4.RELEASE</spring_security_version>
 		<thymeleaf-version>2.1.3.RELEASE</thymeleaf-version>
 		<ebay_cors_filter_version>1.0.1</ebay_cors_filter_version>
+		<woodstox_version>4.4.0</woodstox_version>
 	</properties>
 
 	<build>
@@ -153,50 +162,26 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-source-plugin</artifactId>
-					<version>2.2.1</version>
+					<version>${maven_source_plugin_version}</version>
 				</plugin>
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>license-maven-plugin</artifactId>
-					<version>1.6</version>
+					<version>${maven_license_plugin_version}</version>
 					<configuration>
-						<verbose>false</verbose>
+						<verbose>true</verbose>
 						<addSvnKeyWords>false</addSvnKeyWords>
 					</configuration>
 				</plugin>
-				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+				<!--This plugin's configuration is used to store Eclipse m2e settings 
-				<!-- 
+					only. It has no influence on the Maven build itself. -->
-				<plugin>
+				<!-- <plugin> <groupId>org.eclipse.m2e</groupId> <artifactId>lifecycle-mapping</artifactId> 
-					<groupId>org.eclipse.m2e</groupId>
+					<version>1.0.0</version> <configuration> <lifecycleMappingMetadata> <pluginExecutions> 
-					<artifactId>lifecycle-mapping</artifactId>
+					<pluginExecution> <pluginExecutionFilter> <groupId> org.apache.maven.plugins 
-					<version>1.0.0</version>
+					</groupId> <artifactId> maven-antrun-plugin </artifactId> <versionRange> 
-					<configuration>
+					[1.7,) </versionRange> <goals> <goal>run</goal> </goals> </pluginExecutionFilter> 
-						<lifecycleMappingMetadata>
+					<action> <ignore></ignore> </action> </pluginExecution> </pluginExecutions> 
-							<pluginExecutions>
+					</lifecycleMappingMetadata> </configuration> </plugin> -->
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>
-											org.apache.maven.plugins
-										</groupId>
-										<artifactId>
-											maven-antrun-plugin
-										</artifactId>
-										<versionRange>
-											[1.7,)
-										</versionRange>
-										<goals>
-											<goal>run</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-				 -->
 			</plugins>
 		</pluginManagement>
 

restful-server-example-test/.classpath

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

restful-server-example-test/.gitignore

@@ -0,0 +1 @@
+/target/

restful-server-example-test/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>restful-server-example-test</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>

restful-server-example-test/.settings/org.eclipse.core.resources.prefs

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

restful-server-example-test/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6

restful-server-example-test/.settings/org.eclipse.m2e.core.prefs

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

restful-server-example-test/pom.xml

@@ -0,0 +1,79 @@
+<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>
+		<groupId>ca.uhn.hapi.fhir</groupId>
+		<artifactId>hapi-fhir</artifactId>
+		<version>0.6-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>restful-server-example-test</artifactId>
+	<packaging>jar</packaging>
+
+	<name>HAPI Tinder Plugin - Test Project</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-base</artifactId>
+			<version>0.6-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>${logback_version}</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit_version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-servlets</artifactId>
+			<version>${jetty_version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-servlet</artifactId>
+			<version>${jetty_version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-server</artifactId>
+			<version>${jetty_version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-util</artifactId>
+			<version>${jetty_version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-webapp</artifactId>
+			<version>${jetty_version}</version>
+			<scope>test</scope>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>		
+	</build>
+
+</project>

restful-server-example-test/src/test/java/ca/uhn/example/ExampleTest.java

@@ -0,0 +1,61 @@
+package ca.uhn.example;
+
+import static org.junit.Assert.*;
+
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.webapp.WebAppContext;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.model.api.Bundle;
+import ca.uhn.fhir.model.dstu.resource.Patient;
+import ca.uhn.fhir.rest.client.IGenericClient;
+
+public class ExampleTest {
+
+	private static int ourPort;
+	private static Server ourServer;
+	private static FhirContext ourCtx;
+	private static IGenericClient ourClient;
+
+	@AfterClass
+	public static void afterClass() throws Exception {
+		ourServer.stop();
+	}
+	
+	@Test
+	public void test01Search() {
+		Bundle results = ourClient.search().forResource(Patient.class).execute();
+		assertEquals(1, results.size());
+	
+		
+	}
+	
+	
+	@BeforeClass
+	public static void beforeClass() throws Exception {
+		
+		ourPort = RandomServerPortProvider.findFreePort();
+		ourServer = new Server(ourPort);
+
+		WebAppContext root = new WebAppContext();
+
+		root.setWar("file:../restful-server-example/target/restful-server-example.war");
+		root.setContextPath("/");
+		root.setAttribute(WebAppContext.BASETEMPDIR, "target/tempextrtact");
+		root.setParentLoaderPriority(false);
+		root.setCopyWebInf(true);
+		root.setCopyWebDir(true);
+
+		ourServer.setHandler(root);
+
+		ourServer.start();
+
+		ourCtx = new FhirContext();
+		ourClient = ourCtx.newRestfulGenericClient("http://localhost:" + ourPort+"/fhir");
+		
+	}
+	
+}

restful-server-example-test/src/test/java/ca/uhn/example/RandomServerPortProvider.java

@@ -0,0 +1,37 @@
+package ca.uhn.example;
+
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Provides server ports
+ */
+public class RandomServerPortProvider {
+
+	private static List<Integer> ourPorts = new ArrayList<Integer>(); 
+	
+	public static int findFreePort() {
+		ServerSocket server;
+		try {
+			server = new ServerSocket(0);
+			int port = server.getLocalPort();
+			ourPorts.add(port);
+			server.close();
+			Thread.sleep(500);
+			return port;
+		} catch (IOException e) {
+			throw new Error(e);
+		} catch (InterruptedException e) {
+			throw new Error(e);
+		}
+	}
+
+	public static List<Integer> list() {
+		return ourPorts;
+	}
+
+}
+ 

restful-server-example/.settings/org.eclipse.wst.common.component

@@ -6,7 +6,7 @@
         <dependent-module archiveName="hapi-fhir-base-0.6-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/hapi-fhir-base/hapi-fhir-base">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module deploy-path="/" handle="module:/overlay/var/M2_REPO/ca/uhn/hapi/fhir/hapi-fhir-testpage-overlay/0.6-SNAPSHOT/hapi-fhir-testpage-overlay-0.6-SNAPSHOT.war?unpackFolder=target/m2e-wtp/overlays&amp;includes=**/**&amp;excludes=META-INF/MANIFEST.MF">
+        <dependent-module deploy-path="/" handle="module:/overlay/prj/hapi-fhir-testpage-overlay?includes=**/**&amp;excludes=META-INF/MANIFEST.MF">
             <dependency-type>consumes</dependency-type>
         </dependent-module>
         <dependent-module deploy-path="/" handle="module:/overlay/slf/?includes=**/**&amp;excludes=META-INF/MANIFEST.MF">

restful-server-example/pom.xml

@@ -70,7 +70,6 @@
 			<groupId>org.thymeleaf</groupId>
 			<artifactId>thymeleaf</artifactId>
 			<version>2.1.3.RELEASE</version>
-			<optional>true</optional>
 		</dependency>
 
 		<!-- Used for CORS support -->
@@ -78,7 +77,6 @@
 			<groupId>org.ebaysf.web</groupId>
 			<artifactId>cors-filter</artifactId>
 			<version>1.0.1</version>
-			<optional>true</optional>
 			<exclusions>
 				<exclusion>
 					<artifactId>servlet-api</artifactId>

restful-server-example/src/main/java/ca/uhn/example/provider/OrganizationResourceProvider.java

@@ -50,6 +50,7 @@ public class OrganizationResourceProvider implements IResourceProvider {
 		}
 		
 		MyOrganization retVal = new MyOrganization();
+		retVal.setId("1");
 		retVal.addIdentifier("urn:example:orgs", "FooOrganization");
 		retVal.addAddress().addLine("123 Fake Street").setCity("Toronto");
 		retVal.addTelecom().setUse(ContactUseEnum.WORK).setValue("1-888-123-4567");

restful-server-example/src/main/java/ca/uhn/example/provider/PatientResourceProvider.java

@@ -30,8 +30,8 @@ import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException;
 import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException;
 
 /**
- * This is a resource provider which stores Patient resources in memory using a HashMap. This is obviously not a production-ready solution for many reasons, but it is useful to help illustrate how to
+ * This is a resource provider which stores Patient resources in memory using a HashMap. This is obviously not a production-ready solution for many reasons, 
- * build a fully-functional server.
+ * but it is useful to help illustrate how to build a fully-functional server.
  */
 public class PatientResourceProvider implements IResourceProvider {
 
@@ -49,7 +49,10 @@ public class PatientResourceProvider implements IResourceProvider {
 	 * Constructor, which pre-populates the provider with one resource instance.
 	 */
 	public PatientResourceProvider() {
+		long resourceId = myNextId++;
+		
 		Patient patient = new Patient();
+		patient.setId(Long.toString(resourceId));
 		patient.addIdentifier();
 		patient.getIdentifier().get(0).setSystem(new UriDt("urn:hapitest:mrns"));
 		patient.getIdentifier().get(0).setValue("00002");
@@ -59,7 +62,9 @@ public class PatientResourceProvider implements IResourceProvider {
 
 		LinkedList<Patient> list = new LinkedList<Patient>();
 		list.add(patient);
-		myIdToPatientVersions.put(myNextId++, list);
+		
+		
+		myIdToPatientVersions.put(resourceId, list);
 
 	}
 
@@ -90,11 +95,12 @@ public class PatientResourceProvider implements IResourceProvider {
 
 		Deque<Patient> existingVersions = myIdToPatientVersions.get(theId);
 
-		/*
+		// We just use the current number of versions as the next version number
-		 * We just use the current number of versions as the next version number
+		String newVersion = Integer.toString(existingVersions.size());
-		 */
+		
-		IdDt version = new IdDt(existingVersions.size());
+		// Create an ID with the new version and assign it back to the resource
-		thePatient.getResourceMetadata().put(ResourceMetadataKeyEnum.VERSION_ID, version);
+		IdDt newId = new IdDt("Patient", Long.toString(theId), newVersion);
+		thePatient.setId(newId);
 		
 		existingVersions.add(thePatient);
 	}
@@ -152,6 +158,19 @@ public class PatientResourceProvider implements IResourceProvider {
 		return retVal;
 	}
 
+	@Search
+	public List<Patient> findPatientsUsingArbitraryCtriteria() {
+		LinkedList<Patient> retVal = new LinkedList<Patient>();
+
+		for (Deque<Patient> nextPatientList : myIdToPatientVersions.values()) {
+			Patient nextPatient = nextPatientList.getLast();
+			retVal.add(nextPatient);
+		}
+	
+		return retVal;
+	}
+	
+	
 	/**
 	 * The getResourceType method comes from IResourceProvider, and must be overridden to indicate what type of resource this provider supplies.
 	 */