Committing all fixes and changes from Connectathon - Lots of minor fixes, and a DB module

hapi-fhir-base/pom.xml

@@ -131,6 +131,26 @@
 			<version>9.1.1.v20140108</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-server</artifactId>
+			<version>9.1.1.v20140108</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-servlet</artifactId>
+			<version>9.1.1.v20140108</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-util</artifactId>
+			<version>9.1.1.v20140108</version>
+			<scope>test</scope>
+		</dependency>
+		
+		
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>
@@ -152,24 +172,6 @@
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-server</artifactId>
-			<version>9.1.1.v20140108</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-servlet</artifactId>
-			<version>9.1.1.v20140108</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-util</artifactId>
-			<version>9.1.1.v20140108</version>
-			<scope>test</scope>
-		</dependency>
 
 		<dependency>
 			<groupId>commons-httpclient</groupId>

hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java

@@ -41,6 +41,7 @@ import ca.uhn.fhir.rest.client.IRestfulClientFactory;
 import ca.uhn.fhir.rest.client.RestfulClientFactory;
 import ca.uhn.fhir.rest.client.api.IBasicClient;
 import ca.uhn.fhir.rest.client.api.IRestfulClient;
+import ca.uhn.fhir.util.FhirTerser;
 
 /**
  * The FHIR context is the central starting point for the use of the HAPI FHIR API. It should be created once, and then used as a factory for various other types of objects (parsers, clients, etc.).
@@ -90,6 +91,10 @@ public class FhirContext {
 		return myClassToElementDefinition.get(theElementType);
 	}
 	
+	public FhirTerser newTerser() {
+		return new FhirTerser(this);
+	}
+
 	public INarrativeGenerator getNarrativeGenerator() {
 		return myNarrativeGenerator;
 	}

hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java

@@ -55,9 +55,11 @@ import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.Extension;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
 import ca.uhn.fhir.model.dstu.composite.ContainedDt;
 import ca.uhn.fhir.model.dstu.composite.NarrativeDt;
+import ca.uhn.fhir.model.dstu.composite.QuantityDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
 import ca.uhn.fhir.model.primitive.BoundCodeDt;
 import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
@@ -150,6 +152,8 @@ class ModelScanner {
 		toScan.add(CodeDt.class);
 		toScan.add(DecimalDt.class);
 		toScan.add(AttachmentDt.class);
+		toScan.add(ResourceReferenceDt.class);
+		toScan.add(QuantityDt.class); // TODO: why is this required
 		
 		do {
 			for (Class<? extends IElement> nextClass : toScan) {
@@ -530,9 +534,25 @@ class ModelScanner {
 		scanCompositeElementForChildren(theClass, resourceDef);
 
 		myIdToResourceDefinition.put(resourceId, resourceDef);
+		
+		scanResourceForSearchParams(theClass, resourceDef);
+		
+		
 		return resourceName;
 	}
 
+	private void scanResourceForSearchParams(Class<? extends IResource> theClass, RuntimeResourceDefinition theResourceDef) {
+		
+		for (Field nextField : theClass.getFields()) {
+			SearchParamDefinition searchParam = nextField.getAnnotation(SearchParamDefinition.class);
+			if (searchParam != null) {
+				RuntimeSearchParam param = new RuntimeSearchParam(searchParam.name(), searchParam.description(), searchParam.path());
+				theResourceDef.addSearchParam(param);
+			}
+		}
+		
+	}
+
 	public Map<String, RuntimeResourceDefinition> getIdToResourceDefinition() {
 		return myIdToResourceDefinition;
 	}

hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildUndeclaredExtensionDefinition.java

@@ -74,6 +74,10 @@ public class RuntimeChildUndeclaredExtensionDefinition extends BaseRuntimeChildD
 
 		for (BaseRuntimeElementDefinition<?> next : theClassToElementDefinitions.values()) {
 			if (next instanceof IRuntimeDatatypeDefinition) {
+//				if (next.getName().equals("CodeableConcept")) {
+//					System.out.println();
+//				}
+				
 				if (!((IRuntimeDatatypeDefinition) next).isSpecialization()) {
 					String attrName = "value" + WordUtils.capitalize(next.getName());
 					datatypeAttributeNameToDefinition.put(attrName, next);

hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceDefinition.java

@@ -27,6 +27,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -34,6 +35,7 @@ import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.text.WordUtils;
 
+import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IPrimitiveDatatype;
 import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.model.api.annotation.Child;
@@ -48,21 +50,39 @@ import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum;
 
 public class RuntimeResourceDefinition extends BaseRuntimeElementCompositeDefinition<IResource> {
 
-	private String myResourceProfile;
+	private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(RuntimeResourceDefinition.class);
+	private Map<RuntimeChildDeclaredExtensionDefinition, String> myExtensionDefToCode = new HashMap<RuntimeChildDeclaredExtensionDefinition, String>();
+	private Map<String, RuntimeSearchParam> myNameToSearchParam = new LinkedHashMap<String, RuntimeSearchParam>();
 	private Profile myProfileDef;
+	private String myResourceProfile;
 
 	public RuntimeResourceDefinition(Class<? extends IResource> theClass, ResourceDef theResourceAnnotation) {
 		super(theResourceAnnotation.name(), theClass);
 		myResourceProfile = theResourceAnnotation.profile();
 	}
 
+	public RuntimeSearchParam getSearchParam(String theName) {
+		return myNameToSearchParam.get(theName);
+	}
+	
+	public void addSearchParam(RuntimeSearchParam theParam) {
+		myNameToSearchParam.put(theParam.getName(), theParam);
+	}
+
+	@Override
+	public ca.uhn.fhir.context.BaseRuntimeElementDefinition.ChildTypeEnum getChildType() {
+		return ChildTypeEnum.RESOURCE;
+	}
+
 	public String getResourceProfile() {
 		return myResourceProfile;
 	}
 
 	@Override
-	public ca.uhn.fhir.context.BaseRuntimeElementDefinition.ChildTypeEnum getChildType() {
+	public void sealAndInitialize(Map<Class<? extends IElement>, BaseRuntimeElementDefinition<?>> theClassToElementDefinitions) {
-		return ChildTypeEnum.RESOURCE;
+		super.sealAndInitialize(theClassToElementDefinitions);
+
+		myNameToSearchParam = Collections.unmodifiableMap(myNameToSearchParam);
 	}
 
 	public synchronized Profile toProfile() {
@@ -100,51 +120,93 @@ public class RuntimeResourceDefinition extends BaseRuntimeElementCompositeDefini
 		return retVal;
 	}
 
-	private Map<RuntimeChildDeclaredExtensionDefinition, String> myExtensionDefToCode = new HashMap<RuntimeChildDeclaredExtensionDefinition, String>();
+	private void fillBasics(StructureElement theElement, BaseRuntimeElementDefinition<?> def, LinkedList<String> path, BaseRuntimeDeclaredChildDefinition theChild) {
-
+		if (path.isEmpty()) {
-	private void scanForExtensions(Profile theProfile, BaseRuntimeElementDefinition<?> def) {
+			path.add(def.getName());
-		BaseRuntimeElementCompositeDefinition<?> cdef = ((BaseRuntimeElementCompositeDefinition<?>) def);
+			theElement.setName(def.getName());
-
-		for (RuntimeChildDeclaredExtensionDefinition nextChild : cdef.getExtensions()) {
-			if (myExtensionDefToCode.containsKey(nextChild)) {
-				continue;
-			}
-
-			if (nextChild.isDefinedLocally() == false) {
-				continue;
-			}
-
-			ExtensionDefn defn = theProfile.addExtensionDefn();
-			String code = null;
-			if (nextChild.getExtensionUrl().contains("#") && !nextChild.getExtensionUrl().endsWith("#")) {
-				code = nextChild.getExtensionUrl().substring(nextChild.getExtensionUrl().indexOf('#') + 1);
 		} else {
-				throw new ConfigurationException("Locally defined extension has no '#[code]' part in extension URL: " + nextChild.getExtensionUrl());
+			path.add(WordUtils.uncapitalize(theChild.getElementName()));
+			theElement.setName(theChild.getElementName());
+		}
+		theElement.setPath(StringUtils.join(path, '.'));
 	}
 
-			defn.setCode(code);
+	private void fillExtensions(Structure theStruct, LinkedList<String> path, List<RuntimeChildDeclaredExtensionDefinition> extList, String elementName, boolean theIsModifier) {
-			if (myExtensionDefToCode.values().contains(code)) {
+		if (extList.size() > 0) {
-				throw new IllegalStateException("Duplicate extension code: " + code);
+			StructureElement extSlice = theStruct.addElement();
-			}
+			extSlice.setName(elementName);
-			myExtensionDefToCode.put(nextChild, code);
+			extSlice.setPath(join(path, '.') + '.' + elementName);
+			extSlice.getSlicing().getDiscriminator().setValue("url");
+			extSlice.getSlicing().setOrdered(false);
+			extSlice.getSlicing().setRules(SlicingRulesEnum.OPEN);
+			extSlice.getDefinition().addType().setCode(DataTypeEnum.EXTENSION);
 
-			if (nextChild.getChildType() != null && IPrimitiveDatatype.class.isAssignableFrom(nextChild.getChildType())) {
+			for (RuntimeChildDeclaredExtensionDefinition nextExt : extList) {
-				RuntimePrimitiveDatatypeDefinition pdef = (RuntimePrimitiveDatatypeDefinition) nextChild.getSingleChildOrThrow();
+				StructureElement nextProfileExt = theStruct.addElement();
-				defn.getDefinition().addType().setCode(DataTypeEnum.VALUESET_BINDER.fromCodeString(pdef.getName()));
+				nextProfileExt.getDefinition().setIsModifier(theIsModifier);
-			} else {
+				nextProfileExt.setName(extSlice.getName());
-				RuntimeResourceBlockDefinition pdef = (RuntimeResourceBlockDefinition) nextChild.getSingleChildOrThrow();
+				nextProfileExt.setPath(extSlice.getPath());
-				scanForExtensions(theProfile, pdef);
+				fillMinAndMaxAndDefinitions(nextExt, nextProfileExt);
-
+				StructureElementDefinitionType type = nextProfileExt.getDefinition().addType();
-				for (RuntimeChildDeclaredExtensionDefinition nextChildExt : pdef.getExtensions()) {
-					StructureElementDefinitionType type = defn.getDefinition().addType();
 				type.setCode(DataTypeEnum.EXTENSION);
-					type.setProfile("#" + myExtensionDefToCode.get(nextChildExt));
+				if (nextExt.isDefinedLocally()) {
+					type.setProfile(nextExt.getExtensionUrl().substring(nextExt.getExtensionUrl().indexOf('#')));
+				} else {
+					type.setProfile(nextExt.getExtensionUrl());
+				}
+			}
+		} else {
+			StructureElement extSlice = theStruct.addElement();
+			extSlice.setName(elementName);
+			extSlice.setPath(join(path, '.') + '.' + elementName);
+			extSlice.getDefinition().setIsModifier(theIsModifier);
+			extSlice.getDefinition().addType().setCode(DataTypeEnum.EXTENSION);
+			extSlice.getDefinition().setMin(0);
+			extSlice.getDefinition().setMax("*");
+		}
 	}
 
+	private void fillMinAndMaxAndDefinitions(BaseRuntimeDeclaredChildDefinition child, StructureElement elem) {
+		elem.getDefinition().setMin(child.getMin());
+		if (child.getMax() == Child.MAX_UNLIMITED) {
+			elem.getDefinition().setMax("*");
+		} else {
+			elem.getDefinition().setMax(Integer.toString(child.getMax()));
+		}
+
+		if (isNotBlank(child.getShortDefinition())) {
+			elem.getDefinition().getShort().setValue(child.getShortDefinition());
+		}
+		if (isNotBlank(child.getFormalDefinition())) {
+			elem.getDefinition().getFormal().setValue(child.getFormalDefinition());
 		}
 	}
+
+	private void fillName(StructureElement elem, BaseRuntimeElementDefinition<?> nextDef) {
+		if (nextDef instanceof RuntimeResourceReferenceDefinition) {
+			RuntimeResourceReferenceDefinition rr = (RuntimeResourceReferenceDefinition) nextDef;
+			for (Class<? extends IResource> next : rr.getResourceTypes()) {
+				StructureElementDefinitionType type = elem.getDefinition().addType();
+				type.getCode().setValue("ResourceReference");
+
+				if (next != IResource.class) {
+					RuntimeResourceDefinition resDef = rr.getDefinitionForResourceType(next);
+					type.getProfile().setValueAsString(resDef.getResourceProfile());
 				}
-private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(RuntimeResourceDefinition.class);
+			}
+
+			return;
+		}
+
+		StructureElementDefinitionType type = elem.getDefinition().addType();
+		String name = nextDef.getName();
+		DataTypeEnum fromCodeString = DataTypeEnum.VALUESET_BINDER.fromCodeString(name);
+		if (fromCodeString == null) {
+			throw new ConfigurationException("Unknown type: " + name);
+		}
+		type.setCode(fromCodeString);
+	}
+
 	private void fillProfile(Structure theStruct, StructureElement theElement, BaseRuntimeElementDefinition<?> def, LinkedList<String> path, BaseRuntimeDeclaredChildDefinition theChild) {
 
 		fillBasics(theElement, def, path, theChild);
@@ -159,7 +221,6 @@ private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger
 			return;
 		}
 
-		
 		fillExtensions(theStruct, path, def.getExtensionsNonModifier(), "extension", false);
 		fillExtensions(theStruct, path, def.getExtensionsModifier(), "modifierExtension", true);
 
@@ -222,91 +283,47 @@ private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger
 		path.pollLast();
 	}
 
-	private void fillExtensions(Structure theStruct, LinkedList<String> path, List<RuntimeChildDeclaredExtensionDefinition> extList, String elementName, boolean theIsModifier) {
+	private void scanForExtensions(Profile theProfile, BaseRuntimeElementDefinition<?> def) {
-		if (extList.size() > 0) {
+		BaseRuntimeElementCompositeDefinition<?> cdef = ((BaseRuntimeElementCompositeDefinition<?>) def);
-			StructureElement extSlice = theStruct.addElement();
-			extSlice.setName(elementName);
-			extSlice.setPath(join(path, '.') + '.' + elementName);
-			extSlice.getSlicing().getDiscriminator().setValue("url");
-			extSlice.getSlicing().setOrdered(false);
-			extSlice.getSlicing().setRules(SlicingRulesEnum.OPEN);
-			extSlice.getDefinition().addType().setCode(DataTypeEnum.EXTENSION);
 
-			for (RuntimeChildDeclaredExtensionDefinition nextExt : extList) {
+		for (RuntimeChildDeclaredExtensionDefinition nextChild : cdef.getExtensions()) {
-				StructureElement nextProfileExt = theStruct.addElement();
+			if (myExtensionDefToCode.containsKey(nextChild)) {
-				nextProfileExt.getDefinition().setIsModifier(theIsModifier);
+				continue;
-				nextProfileExt.setName(extSlice.getName());
+			}
-				nextProfileExt.setPath(extSlice.getPath());
+
-				fillMinAndMaxAndDefinitions(nextExt, nextProfileExt);
+			if (nextChild.isDefinedLocally() == false) {
-				StructureElementDefinitionType type = nextProfileExt.getDefinition().addType();
+				continue;
+			}
+
+			ExtensionDefn defn = theProfile.addExtensionDefn();
+			String code = null;
+			if (nextChild.getExtensionUrl().contains("#") && !nextChild.getExtensionUrl().endsWith("#")) {
+				code = nextChild.getExtensionUrl().substring(nextChild.getExtensionUrl().indexOf('#') + 1);
+			} else {
+				throw new ConfigurationException("Locally defined extension has no '#[code]' part in extension URL: " + nextChild.getExtensionUrl());
+			}
+
+			defn.setCode(code);
+			if (myExtensionDefToCode.values().contains(code)) {
+				throw new IllegalStateException("Duplicate extension code: " + code);
+			}
+			myExtensionDefToCode.put(nextChild, code);
+
+			if (nextChild.getChildType() != null && IPrimitiveDatatype.class.isAssignableFrom(nextChild.getChildType())) {
+				RuntimePrimitiveDatatypeDefinition pdef = (RuntimePrimitiveDatatypeDefinition) nextChild.getSingleChildOrThrow();
+				defn.getDefinition().addType().setCode(DataTypeEnum.VALUESET_BINDER.fromCodeString(pdef.getName()));
+			} else {
+				RuntimeResourceBlockDefinition pdef = (RuntimeResourceBlockDefinition) nextChild.getSingleChildOrThrow();
+				scanForExtensions(theProfile, pdef);
+
+				for (RuntimeChildDeclaredExtensionDefinition nextChildExt : pdef.getExtensions()) {
+					StructureElementDefinitionType type = defn.getDefinition().addType();
 					type.setCode(DataTypeEnum.EXTENSION);
-				if (nextExt.isDefinedLocally()) {
+					type.setProfile("#" + myExtensionDefToCode.get(nextChildExt));
-					type.setProfile(nextExt.getExtensionUrl().substring(nextExt.getExtensionUrl().indexOf('#')));
+				}
-				} else {
+
-					type.setProfile(nextExt.getExtensionUrl());
+			}
-				}
+		}
-			}
-		} else {
-			StructureElement extSlice = theStruct.addElement();
-			extSlice.setName(elementName);
-			extSlice.setPath(join(path, '.') + '.' + elementName);
-			extSlice.getDefinition().setIsModifier(theIsModifier);
-			extSlice.getDefinition().addType().setCode(DataTypeEnum.EXTENSION);
-			extSlice.getDefinition().setMin(0);
-			extSlice.getDefinition().setMax("*");
-		}
-	}
-
-	private void fillName(StructureElement elem, BaseRuntimeElementDefinition<?> nextDef) {
-		if (nextDef instanceof RuntimeResourceReferenceDefinition) {
-			RuntimeResourceReferenceDefinition rr = (RuntimeResourceReferenceDefinition) nextDef;
-			for (Class<? extends IResource> next : rr.getResourceTypes()) {
-				StructureElementDefinitionType type = elem.getDefinition().addType();
-				type.getCode().setValue("ResourceReference");
-				
-				if (next != IResource.class) {
-					RuntimeResourceDefinition resDef = rr.getDefinitionForResourceType(next);
-					type.getProfile().setValueAsString(resDef.getResourceProfile());
-				}
-			}
-
-			return;
-		}
-
-		StructureElementDefinitionType type = elem.getDefinition().addType();
-		String name = nextDef.getName();
-		DataTypeEnum fromCodeString = DataTypeEnum.VALUESET_BINDER.fromCodeString(name);
-		if (fromCodeString == null) {
-			throw new ConfigurationException("Unknown type: " + name);
-		}
-		type.setCode(fromCodeString);
-	}
-
-	private void fillMinAndMaxAndDefinitions(BaseRuntimeDeclaredChildDefinition child, StructureElement elem) {
-		elem.getDefinition().setMin(child.getMin());
-		if (child.getMax() == Child.MAX_UNLIMITED) {
-			elem.getDefinition().setMax("*");
-		} else {
-			elem.getDefinition().setMax(Integer.toString(child.getMax()));
-		}
-
-		if (isNotBlank(child.getShortDefinition())) {
-			elem.getDefinition().getShort().setValue(child.getShortDefinition());
-		}
-		if (isNotBlank(child.getFormalDefinition())) {
-			elem.getDefinition().getFormal().setValue(child.getFormalDefinition());
-		}
-	}
-
-	private void fillBasics(StructureElement theElement, BaseRuntimeElementDefinition<?> def, LinkedList<String> path, BaseRuntimeDeclaredChildDefinition theChild) {
-		if (path.isEmpty()) {
-			path.add(def.getName());
-			theElement.setName(def.getName());
-		} else {
-			path.add(WordUtils.uncapitalize(theChild.getElementName()));
-			theElement.setName(theChild.getElementName());
-		}
-		theElement.setPath(StringUtils.join(path, '.'));
 	}
 
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeSearchParam.java

@@ -0,0 +1,54 @@
+package ca.uhn.fhir.context;
+
+/*
+ * #%L
+ * HAPI FHIR Library
+ * %%
+ * Copyright (C) 2014 University Health Network
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+import java.util.Arrays;
+import java.util.List;
+
+public class RuntimeSearchParam {
+
+	private String myDescription;
+	private String myName;
+	private String myPath;
+//	private List<String> myPathParts;
+
+	public RuntimeSearchParam(String theName, String theDescription, String thePath) {
+		super();
+		myName = theName;
+		myDescription = theDescription;
+		myPath=thePath;
+//		myPathParts = Arrays.asList(thePath.split("\\."));
+	}
+
+	public String getPath() {
+		return myPath;
+	}
+
+	public String getDescription() {
+		return myDescription;
+	}
+
+	public String getName() {
+		return myName;
+	}
+
+
+}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseElement.java

@@ -35,12 +35,24 @@ public abstract class BaseElement implements IIdentifiableElement, ISupportsUnde
 	private List<ExtensionDt> myUndeclaredModifierExtensions;
 
 	@Override
-	public void addUndeclaredExtension(boolean theIsModifier, String theUrl, IDatatype theValue) {
+	public ExtensionDt addUndeclaredExtension(boolean theIsModifier, String theUrl, IDatatype theValue) {
 		Validate.notEmpty(theUrl, "URL must be populated");
 		Validate.notNull(theValue, "Value must not be null");
-		getUndeclaredExtensions().add(new ExtensionDt(theIsModifier, theUrl, theValue));
+		ExtensionDt retVal = new ExtensionDt(theIsModifier, theUrl, theValue);
+		getUndeclaredExtensions().add(retVal);
+		return retVal;
 	}
 
+	@Override
+	public ExtensionDt addUndeclaredExtension(boolean theIsModifier, String theUrl) {
+		Validate.notEmpty(theUrl, "URL must be populated");
+
+		ExtensionDt retVal = new ExtensionDt(theIsModifier, theUrl);
+		getUndeclaredExtensions().add(retVal);
+		return retVal;
+	}
+
+	
 	@Override
 	public void addUndeclaredExtension(ExtensionDt theExtension) {
 		Validate.notNull(theExtension, "Extension can not be null");

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BundleCategory.java

@@ -40,16 +40,19 @@ public class BundleCategory extends BaseElement implements IElement {
 		return myTerm;
 	}
 
-	public void setLabel(String theLabel) {
+	public BundleCategory setLabel(String theLabel) {
 		myLabel = theLabel;
+		return this;
 	}
 
-	public void setScheme(String theScheme) {
+	public BundleCategory setScheme(String theScheme) {
 		myScheme = theScheme;
+		return this;
 	}
 
-	public void setTerm(String theTerm) {
+	public BundleCategory setTerm(String theTerm) {
 		myTerm = theTerm;
+		return this;
 	}
 
 	@Override

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ExtensionDt.java

@@ -99,7 +99,7 @@ public class ExtensionDt extends BaseElement {
 	
 	@Override
 	public boolean isEmpty() {
-		return super.isBaseEmpty() && myValue == null || myValue.isEmpty();
+		return super.isBaseEmpty() && (myValue == null || myValue.isEmpty());
 	}
 
 	public boolean isModifier() {

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ISupportsUndeclaredExtensions.java

@@ -64,6 +64,13 @@ public interface ISupportsUndeclaredExtensions extends IElement {
 	/**
 	 * Adds an extension to this object
 	 */
-	void addUndeclaredExtension(boolean theIsModifier, String theUrl, IDatatype theValue);
+	ExtensionDt addUndeclaredExtension(boolean theIsModifier, String theUrl, IDatatype theValue);
+
+	/**
+	 * Adds an extension to this object. This method is intended for use when
+	 * an extension is being added which will contain child extensions, as opposed to
+	 * a datatype.
+	 */
+	ExtensionDt addUndeclaredExtension(boolean theIsModifier, String theUrl);
 
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ResourceMetadataKeyEnum.java

@@ -25,17 +25,9 @@ import ca.uhn.fhir.model.primitive.InstantDt;
 public enum ResourceMetadataKeyEnum {
 
 	/**
-	 * The value for this key is the version ID of the resource object.
+	 * The value for this key is the bundle entry <b>Published</b> time. This is
-	 * <p>
+	 * defined by FHIR as "Time resource copied into the feed", which is
-	 * Values for this key are of type <b>{@link IdDt}</b>
+	 * generally best left to the current time.
-	 * </p>
-	 */
-	VERSION_ID,
-	
-	/**
-	 * The value for this key is the bundle entry <b>Published</b> time. This
-	 * is defined by FHIR as "Time resource copied into the feed", which is generally 
-	 * best left to the current time. 
 	 * <p>
 	 * Values for this key are of type <b>{@link InstantDt}</b>
 	 * </p>
@@ -50,16 +42,34 @@ public enum ResourceMetadataKeyEnum {
 	PUBLISHED,
 
 	/**
-	 * The value for this key is the bundle entry <b>Updated</b> time. This
+	 * The value for this key is the list of tags associated with this resource
-	 * is defined by FHIR as "Last Updated for resource". This value is also 
+	 * <p>
-	 * used for populating the "Last-Modified" header in the case of methods
+	 * Values for this key are of type <b>{@link TagList}</b>
-	 * that return a single resource (read, vread, etc.)
+	 * </p>
+	 * 
+	 * @see TagList
+	 */
+	TAG_LIST,
+
+	/**
+	 * The value for this key is the bundle entry <b>Updated</b> time. This is
+	 * defined by FHIR as "Last Updated for resource". This value is also used
+	 * for populating the "Last-Modified" header in the case of methods that
+	 * return a single resource (read, vread, etc.)
 	 * <p>
 	 * Values for this key are of type <b>{@link InstantDt}</b>
 	 * </p>
 	 * 
 	 * @see InstantDt
 	 */
-	UPDATED;
+	UPDATED,
+
+	/**
+	 * The value for this key is the version ID of the resource object.
+	 * <p>
+	 * Values for this key are of type <b>{@link IdDt}</b>
+	 * </p>
+	 */
+	VERSION_ID;
 
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Tag.java

@@ -0,0 +1,145 @@
+package ca.uhn.fhir.model.api;
+
+/*
+ * #%L
+ * HAPI FHIR Library
+ * %%
+ * Copyright (C) 2014 University Health Network
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+import static org.apache.commons.lang3.StringUtils.*;
+
+import java.net.URI;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+public class Tag {
+
+	/**
+	 * Convenience constant containing the "http://hl7.org/fhir/tag" scheme
+	 * value
+	 */
+	public static final String HL7_ORG_FHIR_TAG = "http://hl7.org/fhir/tag";
+
+	private String myLabel;
+	private String myScheme;
+	private String myTerm;
+
+	public Tag() {
+	}
+
+	public Tag(String theTerm) {
+		this(theTerm, null, (String) null);
+	}
+
+	public Tag(String theTerm, String theLabel, String theScheme) {
+		myTerm = theTerm;
+		myLabel = theLabel;
+		myScheme = theScheme;
+	}
+
+	public Tag(String theTerm, String theLabel, URI theScheme) {
+		myTerm = theTerm;
+		myLabel = theLabel;
+		if (theScheme != null) {
+			myScheme = theScheme.toASCIIString();
+		}
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		Tag other = (Tag) obj;
+		if (myLabel == null) {
+			if (other.myLabel != null)
+				return false;
+		} else if (!myLabel.equals(other.myLabel))
+			return false;
+		if (myScheme == null) {
+			if (other.myScheme != null)
+				return false;
+		} else if (!myScheme.equals(other.myScheme))
+			return false;
+		if (myTerm == null) {
+			if (other.myTerm != null)
+				return false;
+		} else if (!myTerm.equals(other.myTerm))
+			return false;
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		ToStringBuilder b = new ToStringBuilder(this, ToStringStyle.SIMPLE_STYLE);
+		b.append("Term", myTerm);
+		b.append("Label", myLabel);
+		b.append("Scheme", myScheme);
+		return b.toString();
+	}
+
+	public String getLabel() {
+		return myLabel;
+	}
+
+	public String getScheme() {
+		return myScheme;
+	}
+
+	public String getTerm() {
+		return myTerm;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((myLabel == null) ? 0 : myLabel.hashCode());
+		result = prime * result + ((myScheme == null) ? 0 : myScheme.hashCode());
+		result = prime * result + ((myTerm == null) ? 0 : myTerm.hashCode());
+		return result;
+	}
+
+	public void setLabel(String theLabel) {
+		myLabel = theLabel;
+	}
+
+	public void setScheme(String theScheme) {
+		myScheme = theScheme;
+	}
+
+	public void setTerm(String theTerm) {
+		myTerm = theTerm;
+	}
+
+	public String toHeaderValue() {
+		StringBuilder b = new StringBuilder();
+		b.append(this.getTerm());
+		if (isNotBlank(this.getLabel())) {
+			b.append("; label=\"").append(this.getLabel()).append('"');
+		}
+		if (isNotBlank(this.getScheme())) {
+			b.append("; scheme=\"").append(this.getScheme()).append('"');
+		}
+		return  b.toString();
+	}
+
+}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/TagList.java

@@ -0,0 +1,33 @@
+package ca.uhn.fhir.model.api;
+
+/*
+ * #%L
+ * HAPI FHIR Library
+ * %%
+ * Copyright (C) 2014 University Health Network
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+import java.util.ArrayList;
+
+public class TagList extends ArrayList<Tag> {
+
+	private static final long serialVersionUID = 1L;
+
+	public void addTag(String theTerm, String theLabel, String theScheme) {
+		add(new Tag(theTerm, theLabel, theScheme));		
+	}
+	
+}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/SearchParamDefinition.java

@@ -0,0 +1,38 @@
+package ca.uhn.fhir.model.api.annotation;
+
+/*
+ * #%L
+ * HAPI FHIR Library
+ * %%
+ * Copyright (C) 2014 University Health Network
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(value=ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface SearchParamDefinition {
+
+	String name();
+	
+	String path();
+	
+	String description() default "";
+	
+}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/IdentifierDt.java

@@ -97,6 +97,11 @@ public class IdentifierDt
 		setLabel(theLabel);
 	}
 	
+	@Override
+	public String toString() {
+		return "IdentifierDt[" + getValueAsQueryToken() + "]";
+	}
+
 	@Child(name="use", type=CodeDt.class, order=0, min=0, max=1)	
 	@Description(
 		shortDefinition="usual | official | temp | secondary (If known)",

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/QuantityDt.java

@@ -200,6 +200,19 @@ public class QuantityDt
      * <p>
      * <b>Definition:</b>
      * The value of the measured amount. The value includes an implicit precision in the presentation of the value
+     * </p> 
+	 */
+	public QuantityDt setValue( long theValue) {
+		myValue = new DecimalDt(theValue); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>value</b> (Numerical value (with implicit precision))
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The value of the measured amount. The value includes an implicit precision in the presentation of the value
      * </p> 
 	 */
 	public QuantityDt setValue( double theValue) {
@@ -220,19 +233,6 @@ public class QuantityDt
 		return this; 
 	}
 
-	/**
-	 * Sets the value for <b>value</b> (Numerical value (with implicit precision))
-	 *
-     * <p>
-     * <b>Definition:</b>
-     * The value of the measured amount. The value includes an implicit precision in the presentation of the value
-     * </p> 
-	 */
-	public QuantityDt setValue( long theValue) {
-		myValue = new DecimalDt(theValue); 
-		return this; 
-	}
-
  
 	/**
 	 * Gets the value(s) for <b>comparator</b> (< | <= | >= | > - how to understand the value).

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/SampledDataDt.java

@@ -259,6 +259,19 @@ public class SampledDataDt
      * <p>
      * <b>Definition:</b>
      * The length of time between sampling times, measured in milliseconds
+     * </p> 
+	 */
+	public SampledDataDt setPeriod( long theValue) {
+		myPeriod = new DecimalDt(theValue); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>period</b> (Number of milliseconds between samples)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The length of time between sampling times, measured in milliseconds
      * </p> 
 	 */
 	public SampledDataDt setPeriod( double theValue) {
@@ -279,19 +292,6 @@ public class SampledDataDt
 		return this; 
 	}
 
-	/**
-	 * Sets the value for <b>period</b> (Number of milliseconds between samples)
-	 *
-     * <p>
-     * <b>Definition:</b>
-     * The length of time between sampling times, measured in milliseconds
-     * </p> 
-	 */
-	public SampledDataDt setPeriod( long theValue) {
-		myPeriod = new DecimalDt(theValue); 
-		return this; 
-	}
-
  
 	/**
 	 * Gets the value(s) for <b>factor</b> (Multiply data by this before adding to origin).
@@ -329,6 +329,19 @@ public class SampledDataDt
      * <p>
      * <b>Definition:</b>
      * A correction factor that is applied to the sampled data points before they are added to the origin
+     * </p> 
+	 */
+	public SampledDataDt setFactor( long theValue) {
+		myFactor = new DecimalDt(theValue); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>factor</b> (Multiply data by this before adding to origin)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A correction factor that is applied to the sampled data points before they are added to the origin
      * </p> 
 	 */
 	public SampledDataDt setFactor( double theValue) {
@@ -349,19 +362,6 @@ public class SampledDataDt
 		return this; 
 	}
 
-	/**
-	 * Sets the value for <b>factor</b> (Multiply data by this before adding to origin)
-	 *
-     * <p>
-     * <b>Definition:</b>
-     * A correction factor that is applied to the sampled data points before they are added to the origin
-     * </p> 
-	 */
-	public SampledDataDt setFactor( long theValue) {
-		myFactor = new DecimalDt(theValue); 
-		return this; 
-	}
-
  
 	/**
 	 * Gets the value(s) for <b>lowerLimit</b> (Lower limit of detection).
@@ -399,6 +399,19 @@ public class SampledDataDt
      * <p>
      * <b>Definition:</b>
      * The lower limit of detection of the measured points. This is needed if any of the data points have the value \"L\" (lower than detection limit)
+     * </p> 
+	 */
+	public SampledDataDt setLowerLimit( long theValue) {
+		myLowerLimit = new DecimalDt(theValue); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>lowerLimit</b> (Lower limit of detection)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The lower limit of detection of the measured points. This is needed if any of the data points have the value \"L\" (lower than detection limit)
      * </p> 
 	 */
 	public SampledDataDt setLowerLimit( double theValue) {
@@ -419,19 +432,6 @@ public class SampledDataDt
 		return this; 
 	}
 
-	/**
-	 * Sets the value for <b>lowerLimit</b> (Lower limit of detection)
-	 *
-     * <p>
-     * <b>Definition:</b>
-     * The lower limit of detection of the measured points. This is needed if any of the data points have the value \"L\" (lower than detection limit)
-     * </p> 
-	 */
-	public SampledDataDt setLowerLimit( long theValue) {
-		myLowerLimit = new DecimalDt(theValue); 
-		return this; 
-	}
-
  
 	/**
 	 * Gets the value(s) for <b>upperLimit</b> (Upper limit of detection).
@@ -469,6 +469,19 @@ public class SampledDataDt
      * <p>
      * <b>Definition:</b>
      * The upper limit of detection of the measured points. This is needed if any of the data points have the value \"U\" (higher than detection limit)
+     * </p> 
+	 */
+	public SampledDataDt setUpperLimit( long theValue) {
+		myUpperLimit = new DecimalDt(theValue); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>upperLimit</b> (Upper limit of detection)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The upper limit of detection of the measured points. This is needed if any of the data points have the value \"U\" (higher than detection limit)
      * </p> 
 	 */
 	public SampledDataDt setUpperLimit( double theValue) {
@@ -489,19 +502,6 @@ public class SampledDataDt
 		return this; 
 	}
 
-	/**
-	 * Sets the value for <b>upperLimit</b> (Upper limit of detection)
-	 *
-     * <p>
-     * <b>Definition:</b>
-     * The upper limit of detection of the measured points. This is needed if any of the data points have the value \"U\" (higher than detection limit)
-     * </p> 
-	 */
-	public SampledDataDt setUpperLimit( long theValue) {
-		myUpperLimit = new DecimalDt(theValue); 
-		return this; 
-	}
-
  
 	/**
 	 * Gets the value(s) for <b>dimensions</b> (Number of sample points at each time point).

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ScheduleDt.java

@@ -211,7 +211,7 @@ public class ScheduleDt
      * Identifies a repeating pattern to the intended time periods.
      * </p> 
 	 */
-	@Block(name="Schedule.repeat")	
+	@Block()	
 	public static class Repeat extends BaseElement implements IResourceBlock {
 	
 	@Child(name="frequency", type=IntegerDt.class, order=0, min=0, max=1)	
@@ -396,6 +396,19 @@ public class ScheduleDt
      * <p>
      * <b>Definition:</b>
      * How long each repetition should last
+     * </p> 
+	 */
+	public Repeat setDuration( long theValue) {
+		myDuration = new DecimalDt(theValue); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>duration</b> (Repeating or event-related duration)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * How long each repetition should last
      * </p> 
 	 */
 	public Repeat setDuration( double theValue) {
@@ -416,19 +429,6 @@ public class ScheduleDt
 		return this; 
 	}
 
-	/**
-	 * Sets the value for <b>duration</b> (Repeating or event-related duration)
-	 *
-     * <p>
-     * <b>Definition:</b>
-     * How long each repetition should last
-     * </p> 
-	 */
-	public Repeat setDuration( long theValue) {
-		myDuration = new DecimalDt(theValue); 
-		return this; 
-	}
-
  
 	/**
 	 * Gets the value(s) for <b>units</b> (s | min | h | d | wk | mo | a - unit of time (UCUM)).

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AdverseReaction.java

@@ -50,6 +50,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
@@ -94,6 +95,7 @@ public class AdverseReaction extends BaseResource implements IResource {
 	 * Path: <b>AdverseReaction.symptom.code</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="symptom", path="AdverseReaction.symptom.code", description="One of the symptoms of the reaction")
 	public static final String SP_SYMPTOM = "symptom";
 
 	/**
@@ -104,6 +106,7 @@ public class AdverseReaction extends BaseResource implements IResource {
 	 * Path: <b>AdverseReaction.exposure.substance</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="substance", path="AdverseReaction.exposure.substance", description="The name or code of the substance that produces the sensitivity")
 	public static final String SP_SUBSTANCE = "substance";
 
 	/**
@@ -114,6 +117,7 @@ public class AdverseReaction extends BaseResource implements IResource {
 	 * Path: <b>AdverseReaction.date</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="date", path="AdverseReaction.date", description="The date of the reaction")
 	public static final String SP_DATE = "date";
 
 	/**
@@ -124,6 +128,7 @@ public class AdverseReaction extends BaseResource implements IResource {
 	 * Path: <b>AdverseReaction.subject</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="AdverseReaction.subject", description="The subject that the sensitivity is about")
 	public static final String SP_SUBJECT = "subject";
 
 
@@ -578,7 +583,7 @@ public class AdverseReaction extends BaseResource implements IResource {
      * The signs and symptoms that were observed as part of the reaction
      * </p> 
 	 */
-	@Block(name="AdverseReaction.symptom")	
+	@Block()	
 	public static class Symptom extends BaseElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeableConceptDt.class, order=0, min=1, max=1)	
@@ -698,7 +703,7 @@ public class AdverseReaction extends BaseResource implements IResource {
      * An exposure to a substance that preceded a reaction occurrence
      * </p> 
 	 */
-	@Block(name="AdverseReaction.exposure")	
+	@Block()	
 	public static class Exposure extends BaseElement implements IResourceBlock {
 	
 	@Child(name="date", type=DateTimeDt.class, order=0, min=0, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Alert.java

@@ -45,6 +45,7 @@ import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
@@ -86,6 +87,7 @@ public class Alert extends BaseResource implements IResource {
 	 * Path: <b>Alert.subject</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="Alert.subject", description="The identity of a subject to list alerts for")
 	public static final String SP_SUBJECT = "subject";
 
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AllergyIntolerance.java

@@ -47,6 +47,7 @@ import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
 import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum;
@@ -89,6 +90,7 @@ public class AllergyIntolerance extends BaseResource implements IResource {
 	 * Path: <b>AllergyIntolerance.sensitivityType</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="type", path="AllergyIntolerance.sensitivityType", description="The type of sensitivity")
 	public static final String SP_TYPE = "type";
 
 	/**
@@ -99,6 +101,7 @@ public class AllergyIntolerance extends BaseResource implements IResource {
 	 * Path: <b>AllergyIntolerance.substance</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="substance", path="AllergyIntolerance.substance", description="The name or code of the substance that produces the sensitivity")
 	public static final String SP_SUBSTANCE = "substance";
 
 	/**
@@ -109,6 +112,7 @@ public class AllergyIntolerance extends BaseResource implements IResource {
 	 * Path: <b>AllergyIntolerance.recordedDate</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="date", path="AllergyIntolerance.recordedDate", description="Recorded date/time.")
 	public static final String SP_DATE = "date";
 
 	/**
@@ -119,6 +123,7 @@ public class AllergyIntolerance extends BaseResource implements IResource {
 	 * Path: <b>AllergyIntolerance.status</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="status", path="AllergyIntolerance.status", description="The status of the sensitivity")
 	public static final String SP_STATUS = "status";
 
 	/**
@@ -129,6 +134,7 @@ public class AllergyIntolerance extends BaseResource implements IResource {
 	 * Path: <b>AllergyIntolerance.subject</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="AllergyIntolerance.subject", description="The subject that the sensitivity is about")
 	public static final String SP_SUBJECT = "subject";
 
 	/**
@@ -139,6 +145,7 @@ public class AllergyIntolerance extends BaseResource implements IResource {
 	 * Path: <b>AllergyIntolerance.recorder</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="recorder", path="AllergyIntolerance.recorder", description="Who recorded the sensitivity")
 	public static final String SP_RECORDER = "recorder";
 
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Appointment.java

@@ -50,6 +50,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
@@ -95,6 +96,7 @@ public class Appointment extends BaseResource implements IResource {
 	 * Path: <b>Appointment.start</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="date", path="Appointment.start", description="Appointment date/time.")
 	public static final String SP_DATE = "date";
 
 	/**
@@ -105,6 +107,7 @@ public class Appointment extends BaseResource implements IResource {
 	 * Path: <b>Appointment.status</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="status", path="Appointment.status", description="The overall status of the appointment")
 	public static final String SP_STATUS = "status";
 
 	/**
@@ -115,6 +118,7 @@ public class Appointment extends BaseResource implements IResource {
 	 * Path: <b>Appointment.participant.individual</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="Appointment.participant.individual", description="The subject that the sensitivity is about")
 	public static final String SP_SUBJECT = "subject";
 
 	/**
@@ -125,6 +129,7 @@ public class Appointment extends BaseResource implements IResource {
 	 * Path: <b>Appointment.minutesDuration</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="!duration", path="Appointment.minutesDuration", description="The number of minutes that the appointment is to go for")
 	public static final String SP_DURATION = "!duration";
 
 	/**
@@ -135,6 +140,7 @@ public class Appointment extends BaseResource implements IResource {
 	 * Path: <b>Appointment.participant.status</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="partstatus", path="Appointment.participant.status", description="The Participation status of the subject, or other participant on the appointment ")
 	public static final String SP_PARTSTATUS = "partstatus";
 
 
@@ -529,8 +535,8 @@ public class Appointment extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Appointment setStartWithMillisPrecision( Date theDate) {
+	public Appointment setStart( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myStart = new InstantDt(theDate); 
+		myStart = new InstantDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -542,8 +548,8 @@ public class Appointment extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Appointment setStart( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public Appointment setStartWithMillisPrecision( Date theDate) {
-		myStart = new InstantDt(theDate, thePrecision); 
+		myStart = new InstantDt(theDate); 
 		return this; 
 	}
 
@@ -586,8 +592,8 @@ public class Appointment extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Appointment setEndWithMillisPrecision( Date theDate) {
+	public Appointment setEnd( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myEnd = new InstantDt(theDate); 
+		myEnd = new InstantDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -599,8 +605,8 @@ public class Appointment extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Appointment setEnd( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public Appointment setEndWithMillisPrecision( Date theDate) {
-		myEnd = new InstantDt(theDate, thePrecision); 
+		myEnd = new InstantDt(theDate); 
 		return this; 
 	}
 
@@ -983,7 +989,7 @@ public class Appointment extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	@Block(name="Appointment.participant")	
+	@Block()	
 	public static class Participant extends BaseElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeableConceptDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AppointmentResponse.java

@@ -47,6 +47,7 @@ import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
@@ -91,6 +92,7 @@ public class AppointmentResponse extends BaseResource implements IResource {
 	 * Path: <b>AppointmentResponse.participantStatus</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="partstatus", path="AppointmentResponse.participantStatus", description="The overall status of the appointment")
 	public static final String SP_PARTSTATUS = "partstatus";
 
 	/**
@@ -101,6 +103,7 @@ public class AppointmentResponse extends BaseResource implements IResource {
 	 * Path: <b>AppointmentResponse.individual</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="AppointmentResponse.individual", description="The subject that the appointment response replies for")
 	public static final String SP_SUBJECT = "subject";
 
 	/**
@@ -111,6 +114,7 @@ public class AppointmentResponse extends BaseResource implements IResource {
 	 * Path: <b>AppointmentResponse.appointment</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="appointment", path="AppointmentResponse.appointment", description="The appointment that the response is attached to")
 	public static final String SP_APPOINTMENT = "appointment";
 
 
@@ -568,8 +572,8 @@ public class AppointmentResponse extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public AppointmentResponse setStartWithMillisPrecision( Date theDate) {
+	public AppointmentResponse setStart( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myStart = new InstantDt(theDate); 
+		myStart = new InstantDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -581,8 +585,8 @@ public class AppointmentResponse extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public AppointmentResponse setStart( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public AppointmentResponse setStartWithMillisPrecision( Date theDate) {
-		myStart = new InstantDt(theDate, thePrecision); 
+		myStart = new InstantDt(theDate); 
 		return this; 
 	}
 
@@ -625,8 +629,8 @@ public class AppointmentResponse extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public AppointmentResponse setEndWithMillisPrecision( Date theDate) {
+	public AppointmentResponse setEnd( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myEnd = new InstantDt(theDate); 
+		myEnd = new InstantDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -638,8 +642,8 @@ public class AppointmentResponse extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public AppointmentResponse setEnd( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public AppointmentResponse setEndWithMillisPrecision( Date theDate) {
-		myEnd = new InstantDt(theDate, thePrecision); 
+		myEnd = new InstantDt(theDate); 
 		return this; 
 	}
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Availability.java

@@ -47,6 +47,7 @@ import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.PeriodDt;
@@ -87,6 +88,7 @@ public class Availability extends BaseResource implements IResource {
 	 * Path: <b>Availability.period</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="!period", path="Availability.period", description="Appointment date/time.")
 	public static final String SP_PERIOD = "!period";
 
 	/**
@@ -97,6 +99,7 @@ public class Availability extends BaseResource implements IResource {
 	 * Path: <b>Availability.individual</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="individual", path="Availability.individual", description="The individual to find an availability for")
 	public static final String SP_INDIVIDUAL = "individual";
 
 	/**
@@ -107,6 +110,7 @@ public class Availability extends BaseResource implements IResource {
 	 * Path: <b>Availability.type</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="slottype", path="Availability.type", description="The type of appointments that can be booked into associated slot(s)")
 	public static final String SP_SLOTTYPE = "slottype";
 
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Binary.java

@@ -22,7 +22,6 @@ package ca.uhn.fhir.model.dstu.resource;
 
 import java.util.List;
 
-import ca.uhn.fhir.model.api.BaseElement;
 import ca.uhn.fhir.model.api.BaseResource;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/CarePlan.java

@@ -51,6 +51,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.PeriodDt;
@@ -102,6 +103,7 @@ public class CarePlan extends BaseResource implements IResource {
 	 * Path: <b>CarePlan.patient</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="patient", path="CarePlan.patient", description="")
 	public static final String SP_PATIENT = "patient";
 
 	/**
@@ -112,6 +114,7 @@ public class CarePlan extends BaseResource implements IResource {
 	 * Path: <b>CarePlan.concern</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="condition", path="CarePlan.concern", description="")
 	public static final String SP_CONDITION = "condition";
 
 	/**
@@ -122,6 +125,7 @@ public class CarePlan extends BaseResource implements IResource {
 	 * Path: <b>CarePlan.period</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="date", path="CarePlan.period", description="")
 	public static final String SP_DATE = "date";
 
 	/**
@@ -132,6 +136,7 @@ public class CarePlan extends BaseResource implements IResource {
 	 * Path: <b>CarePlan.participant.member</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="participant", path="CarePlan.participant.member", description="")
 	public static final String SP_PARTICIPANT = "participant";
 
 	/**
@@ -142,6 +147,7 @@ public class CarePlan extends BaseResource implements IResource {
 	 * Path: <b>CarePlan.activity.simple.code</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="activitycode", path="CarePlan.activity.simple.code", description="")
 	public static final String SP_ACTIVITYCODE = "activitycode";
 
 	/**
@@ -152,6 +158,7 @@ public class CarePlan extends BaseResource implements IResource {
 	 * Path: <b>CarePlan.activity.simple.timing[x]</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="activitydate", path="CarePlan.activity.simple.timing[x]", description="Specified date occurs within period specified by CarePlan.activity.timingSchedule")
 	public static final String SP_ACTIVITYDATE = "activitydate";
 
 	/**
@@ -162,6 +169,7 @@ public class CarePlan extends BaseResource implements IResource {
 	 * Path: <b>CarePlan.activity.detail</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="activitydetail", path="CarePlan.activity.detail", description="")
 	public static final String SP_ACTIVITYDETAIL = "activitydetail";
 
 
@@ -788,7 +796,7 @@ public class CarePlan extends BaseResource implements IResource {
      * Identifies all people and organizations who are expected to be involved in the care envisioned by this plan.
      * </p> 
 	 */
-	@Block(name="CarePlan.participant")	
+	@Block()	
 	public static class Participant extends BaseElement implements IResourceBlock {
 	
 	@Child(name="role", type=CodeableConceptDt.class, order=0, min=0, max=1)	
@@ -893,7 +901,7 @@ public class CarePlan extends BaseResource implements IResource {
      * Describes the intended objective(s) of carrying out the Care Plan.
      * </p> 
 	 */
-	@Block(name="CarePlan.goal")	
+	@Block()	
 	public static class Goal extends BaseElement implements IResourceBlock {
 	
 	@Child(name="description", type=StringDt.class, order=0, min=1, max=1)	
@@ -1129,7 +1137,7 @@ public class CarePlan extends BaseResource implements IResource {
      * Identifies a planned action to occur as part of the plan.  For example, a medication to be used, lab tests to perform, self-monitoring, education, etc.
      * </p> 
 	 */
-	@Block(name="CarePlan.activity")	
+	@Block()	
 	public static class Activity extends BaseElement implements IResourceBlock {
 	
 	@Child(name="goal", type=IdrefDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)	
@@ -1505,7 +1513,7 @@ public class CarePlan extends BaseResource implements IResource {
      * A simple summary of details suitable for a general care plan system (e.g. form driven) that doesn't know about specific resources such as procedure etc
      * </p> 
 	 */
-	@Block(name="CarePlan.activity.simple")	
+	@Block()	
 	public static class ActivitySimple extends BaseElement implements IResourceBlock {
 	
 	@Child(name="category", type=CodeDt.class, order=0, min=1, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Claim.java

@@ -50,6 +50,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.AddressDt;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.CodingDt;
@@ -95,6 +96,7 @@ public class Claim extends BaseResource implements IResource {
 	 * Path: <b>Claim.number</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="number", path="Claim.number", description="")
 	public static final String SP_NUMBER = "number";
 
 
@@ -675,7 +677,7 @@ public class Claim extends BaseResource implements IResource {
      * Patient Details.
      * </p> 
 	 */
-	@Block(name="Claim.patient")	
+	@Block()	
 	public static class Patient extends BaseElement implements IResourceBlock {
 	
 	@Child(name="name", type=HumanNameDt.class, order=0, min=0, max=1)	
@@ -884,7 +886,7 @@ public class Claim extends BaseResource implements IResource {
      * Financial instrument by which payment information for health care
      * </p> 
 	 */
-	@Block(name="Claim.coverage")	
+	@Block()	
 	public static class Coverage extends BaseElement implements IResourceBlock {
 	
 	@Child(name="issuer", order=0, min=0, max=1, type={
@@ -1425,7 +1427,7 @@ public class Claim extends BaseResource implements IResource {
      * Th demographics for the individual in whose name the insurance coverage is issued.
      * </p> 
 	 */
-	@Block(name="Claim.coverage.subscriber")	
+	@Block()	
 	public static class CoverageSubscriber extends BaseElement implements IResourceBlock {
 	
 	@Child(name="name", type=HumanNameDt.class, order=0, min=0, max=1)	
@@ -1597,7 +1599,7 @@ public class Claim extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	@Block(name="Claim.service")	
+	@Block()	
 	public static class Service extends BaseElement implements IResourceBlock {
 	
 	@Child(name="service", type=CodeableConceptDt.class, order=0, min=1, max=1)	
@@ -1769,6 +1771,19 @@ public class Claim extends BaseResource implements IResource {
      * <p>
      * <b>Definition:</b>
      * 
+     * </p> 
+	 */
+	public Service setFee( long theValue) {
+		myFee = new DecimalDt(theValue); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>fee</b> (Professional fee)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * 
      * </p> 
 	 */
 	public Service setFee( double theValue) {
@@ -1789,19 +1804,6 @@ public class Claim extends BaseResource implements IResource {
 		return this; 
 	}
 
-	/**
-	 * Sets the value for <b>fee</b> (Professional fee)
-	 *
-     * <p>
-     * <b>Definition:</b>
-     * 
-     * </p> 
-	 */
-	public Service setFee( long theValue) {
-		myFee = new DecimalDt(theValue); 
-		return this; 
-	}
-
  
 	/**
 	 * Gets the value(s) for <b>location</b> (Service Location).
@@ -1907,7 +1909,7 @@ public class Claim extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	@Block(name="Claim.service.lab")	
+	@Block()	
 	public static class ServiceLab extends BaseElement implements IResourceBlock {
 	
 	@Child(name="service", type=CodeableConceptDt.class, order=0, min=1, max=1)	
@@ -2007,6 +2009,19 @@ public class Claim extends BaseResource implements IResource {
      * <p>
      * <b>Definition:</b>
      * The amount to reimbuse for a laboratory service.
+     * </p> 
+	 */
+	public ServiceLab setFee( long theValue) {
+		myFee = new DecimalDt(theValue); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>fee</b> (Lab fee)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The amount to reimbuse for a laboratory service.
      * </p> 
 	 */
 	public ServiceLab setFee( double theValue) {
@@ -2027,19 +2042,6 @@ public class Claim extends BaseResource implements IResource {
 		return this; 
 	}
 
-	/**
-	 * Sets the value for <b>fee</b> (Lab fee)
-	 *
-     * <p>
-     * <b>Definition:</b>
-     * The amount to reimbuse for a laboratory service.
-     * </p> 
-	 */
-	public ServiceLab setFee( long theValue) {
-		myFee = new DecimalDt(theValue); 
-		return this; 
-	}
-
  
 
 	}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Composition.java

@@ -50,6 +50,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.CodingDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
@@ -95,6 +96,7 @@ public class Composition extends BaseResource implements IResource {
 	 * Path: <b>Composition.type</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="type", path="Composition.type", description="")
 	public static final String SP_TYPE = "type";
 
 	/**
@@ -105,6 +107,7 @@ public class Composition extends BaseResource implements IResource {
 	 * Path: <b>Composition.class</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="class", path="Composition.class", description="")
 	public static final String SP_CLASS = "class";
 
 	/**
@@ -115,6 +118,7 @@ public class Composition extends BaseResource implements IResource {
 	 * Path: <b>Composition.date</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="date", path="Composition.date", description="")
 	public static final String SP_DATE = "date";
 
 	/**
@@ -125,6 +129,7 @@ public class Composition extends BaseResource implements IResource {
 	 * Path: <b>Composition.subject</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="Composition.subject", description="")
 	public static final String SP_SUBJECT = "subject";
 
 	/**
@@ -135,6 +140,7 @@ public class Composition extends BaseResource implements IResource {
 	 * Path: <b>Composition.author</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="author", path="Composition.author", description="")
 	public static final String SP_AUTHOR = "author";
 
 	/**
@@ -145,6 +151,7 @@ public class Composition extends BaseResource implements IResource {
 	 * Path: <b>Composition.attester.party</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="attester", path="Composition.attester.party", description="")
 	public static final String SP_ATTESTER = "attester";
 
 	/**
@@ -155,6 +162,7 @@ public class Composition extends BaseResource implements IResource {
 	 * Path: <b>Composition.event.code</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="context", path="Composition.event.code", description="")
 	public static final String SP_CONTEXT = "context";
 
 	/**
@@ -165,6 +173,7 @@ public class Composition extends BaseResource implements IResource {
 	 * Path: <b>Composition.section.code</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="section-type", path="Composition.section.code", description="")
 	public static final String SP_SECTION_TYPE = "section-type";
 
 	/**
@@ -175,6 +184,7 @@ public class Composition extends BaseResource implements IResource {
 	 * Path: <b>Composition.section.content</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="section-content", path="Composition.section.content", description="")
 	public static final String SP_SECTION_CONTENT = "section-content";
 
 	/**
@@ -185,6 +195,7 @@ public class Composition extends BaseResource implements IResource {
 	 * Path: <b>Composition.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="Composition.identifier", description="")
 	public static final String SP_IDENTIFIER = "identifier";
 
 
@@ -891,7 +902,7 @@ public class Composition extends BaseResource implements IResource {
      * A participant who has attested to the accuracy of the composition/document
      * </p> 
 	 */
-	@Block(name="Composition.attester")	
+	@Block()	
 	public static class Attester extends BaseElement implements IResourceBlock {
 	
 	@Child(name="mode", type=CodeDt.class, order=0, min=1, max=Child.MAX_UNLIMITED)	
@@ -1086,7 +1097,7 @@ public class Composition extends BaseResource implements IResource {
      * The main event/act/item, such as a colonoscopy or an appendectomy, being documented
      * </p> 
 	 */
-	@Block(name="Composition.event")	
+	@Block()	
 	public static class Event extends BaseElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeableConceptDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)	
@@ -1274,7 +1285,7 @@ public class Composition extends BaseResource implements IResource {
      * The root of the sections that make up the composition
      * </p> 
 	 */
-	@Block(name="Composition.section")	
+	@Block()	
 	public static class Section extends BaseElement implements IResourceBlock {
 	
 	@Child(name="title", type=StringDt.class, order=0, min=0, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ConceptMap.java

@@ -50,6 +50,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.ContactDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
 import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum;
@@ -93,6 +94,7 @@ public class ConceptMap extends BaseResource implements IResource {
 	 * Path: <b>ConceptMap.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="ConceptMap.identifier", description="The identifier of the concept map")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -103,6 +105,7 @@ public class ConceptMap extends BaseResource implements IResource {
 	 * Path: <b>ConceptMap.version</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="version", path="ConceptMap.version", description="The version identifier of the concept map")
 	public static final String SP_VERSION = "version";
 
 	/**
@@ -113,6 +116,7 @@ public class ConceptMap extends BaseResource implements IResource {
 	 * Path: <b>ConceptMap.name</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="name", path="ConceptMap.name", description="Name of the concept map")
 	public static final String SP_NAME = "name";
 
 	/**
@@ -123,6 +127,7 @@ public class ConceptMap extends BaseResource implements IResource {
 	 * Path: <b>ConceptMap.publisher</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="publisher", path="ConceptMap.publisher", description="Name of the publisher of the concept map")
 	public static final String SP_PUBLISHER = "publisher";
 
 	/**
@@ -133,6 +138,7 @@ public class ConceptMap extends BaseResource implements IResource {
 	 * Path: <b>ConceptMap.description</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="description", path="ConceptMap.description", description="Text search in the description of the concept map")
 	public static final String SP_DESCRIPTION = "description";
 
 	/**
@@ -143,6 +149,7 @@ public class ConceptMap extends BaseResource implements IResource {
 	 * Path: <b>ConceptMap.status</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="status", path="ConceptMap.status", description="Status of the concept map")
 	public static final String SP_STATUS = "status";
 
 	/**
@@ -153,6 +160,7 @@ public class ConceptMap extends BaseResource implements IResource {
 	 * Path: <b>ConceptMap.date</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="date", path="ConceptMap.date", description="The concept map publication date")
 	public static final String SP_DATE = "date";
 
 	/**
@@ -163,6 +171,7 @@ public class ConceptMap extends BaseResource implements IResource {
 	 * Path: <b>ConceptMap.source</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="source", path="ConceptMap.source", description="The system for any concepts mapped by this concept map")
 	public static final String SP_SOURCE = "source";
 
 	/**
@@ -173,6 +182,7 @@ public class ConceptMap extends BaseResource implements IResource {
 	 * Path: <b>ConceptMap.target</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="target", path="ConceptMap.target", description="")
 	public static final String SP_TARGET = "target";
 
 	/**
@@ -183,6 +193,7 @@ public class ConceptMap extends BaseResource implements IResource {
 	 * Path: <b>ConceptMap.concept.map.system</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="system", path="ConceptMap.concept.map.system", description="The system for any destination concepts mapped by this map")
 	public static final String SP_SYSTEM = "system";
 
 	/**
@@ -193,6 +204,7 @@ public class ConceptMap extends BaseResource implements IResource {
 	 * Path: <b>ConceptMap.concept.dependsOn.concept</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="dependson", path="ConceptMap.concept.dependsOn.concept", description="")
 	public static final String SP_DEPENDSON = "dependson";
 
 	/**
@@ -203,6 +215,7 @@ public class ConceptMap extends BaseResource implements IResource {
 	 * Path: <b>ConceptMap.concept.map.product.concept</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="product", path="ConceptMap.concept.map.product.concept", description="")
 	public static final String SP_PRODUCT = "product";
 
 
@@ -914,7 +927,7 @@ public class ConceptMap extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	@Block(name="ConceptMap.concept")	
+	@Block()	
 	public static class Concept extends BaseElement implements IResourceBlock {
 	
 	@Child(name="system", type=UriDt.class, order=0, min=1, max=1)	
@@ -1180,7 +1193,7 @@ public class ConceptMap extends BaseResource implements IResource {
      * A set of additional dependencies for this mapping to hold. This mapping is only applicable if the specified concept can be resolved, and it has the specified value
      * </p> 
 	 */
-	@Block(name="ConceptMap.concept.dependsOn")	
+	@Block()	
 	public static class ConceptDependsOn extends BaseElement implements IResourceBlock {
 	
 	@Child(name="concept", type=UriDt.class, order=0, min=1, max=1)	
@@ -1364,7 +1377,7 @@ public class ConceptMap extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	@Block(name="ConceptMap.concept.map")	
+	@Block()	
 	public static class ConceptMap2 extends BaseElement implements IResourceBlock {
 	
 	@Child(name="system", type=UriDt.class, order=0, min=0, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Condition.java

@@ -51,6 +51,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.AgeDt;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
@@ -96,6 +97,7 @@ public class Condition extends BaseResource implements IResource {
 	 * Path: <b>Condition.code</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="code", path="Condition.code", description="Code for the condition")
 	public static final String SP_CODE = "code";
 
 	/**
@@ -106,6 +108,7 @@ public class Condition extends BaseResource implements IResource {
 	 * Path: <b>Condition.status</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="status", path="Condition.status", description="The status of the condition")
 	public static final String SP_STATUS = "status";
 
 	/**
@@ -116,6 +119,7 @@ public class Condition extends BaseResource implements IResource {
 	 * Path: <b>Condition.severity</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="severity", path="Condition.severity", description="The severity of the condition")
 	public static final String SP_SEVERITY = "severity";
 
 	/**
@@ -126,6 +130,7 @@ public class Condition extends BaseResource implements IResource {
 	 * Path: <b>Condition.category</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="category", path="Condition.category", description="The category of the condition")
 	public static final String SP_CATEGORY = "category";
 
 	/**
@@ -136,6 +141,7 @@ public class Condition extends BaseResource implements IResource {
 	 * Path: <b>Condition.onset[x]</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="onset", path="Condition.onset[x]", description="When the Condition started (if started on a date)")
 	public static final String SP_ONSET = "onset";
 
 	/**
@@ -146,6 +152,7 @@ public class Condition extends BaseResource implements IResource {
 	 * Path: <b>Condition.subject</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="Condition.subject", description="")
 	public static final String SP_SUBJECT = "subject";
 
 	/**
@@ -156,6 +163,7 @@ public class Condition extends BaseResource implements IResource {
 	 * Path: <b>Condition.encounter</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="encounter", path="Condition.encounter", description="")
 	public static final String SP_ENCOUNTER = "encounter";
 
 	/**
@@ -166,6 +174,7 @@ public class Condition extends BaseResource implements IResource {
 	 * Path: <b>Condition.asserter</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="asserter", path="Condition.asserter", description="")
 	public static final String SP_ASSERTER = "asserter";
 
 	/**
@@ -176,6 +185,7 @@ public class Condition extends BaseResource implements IResource {
 	 * Path: <b>Condition.dateAsserted</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="date-asserted", path="Condition.dateAsserted", description="")
 	public static final String SP_DATE_ASSERTED = "date-asserted";
 
 	/**
@@ -186,6 +196,7 @@ public class Condition extends BaseResource implements IResource {
 	 * Path: <b>Condition.evidence.code</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="evidence", path="Condition.evidence.code", description="")
 	public static final String SP_EVIDENCE = "evidence";
 
 	/**
@@ -196,6 +207,7 @@ public class Condition extends BaseResource implements IResource {
 	 * Path: <b>Condition.location.code</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="location", path="Condition.location.code", description="")
 	public static final String SP_LOCATION = "location";
 
 	/**
@@ -206,6 +218,7 @@ public class Condition extends BaseResource implements IResource {
 	 * Path: <b>Condition.relatedItem.target</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="related-item", path="Condition.relatedItem.target", description="")
 	public static final String SP_RELATED_ITEM = "related-item";
 
 	/**
@@ -216,6 +229,7 @@ public class Condition extends BaseResource implements IResource {
 	 * Path: <b>Condition.stage.summary</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="stage", path="Condition.stage.summary", description="")
 	public static final String SP_STAGE = "stage";
 
 	/**
@@ -226,6 +240,7 @@ public class Condition extends BaseResource implements IResource {
 	 * Path: <b>Condition.relatedItem.code</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="related-code", path="Condition.relatedItem.code", description="")
 	public static final String SP_RELATED_CODE = "related-code";
 
 
@@ -1099,7 +1114,7 @@ public class Condition extends BaseResource implements IResource {
      * Clinical stage or grade of a condition. May include formal severity assessments
      * </p> 
 	 */
-	@Block(name="Condition.stage")	
+	@Block()	
 	public static class Stage extends BaseElement implements IResourceBlock {
 	
 	@Child(name="summary", type=CodeableConceptDt.class, order=0, min=0, max=1)	
@@ -1220,7 +1235,7 @@ public class Condition extends BaseResource implements IResource {
      * Supporting Evidence / manifestations that are the basis on which this condition is suspected or confirmed
      * </p> 
 	 */
-	@Block(name="Condition.evidence")	
+	@Block()	
 	public static class Evidence extends BaseElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeableConceptDt.class, order=0, min=0, max=1)	
@@ -1341,7 +1356,7 @@ public class Condition extends BaseResource implements IResource {
      * The anatomical location where this condition manifests itself
      * </p> 
 	 */
-	@Block(name="Condition.location")	
+	@Block()	
 	public static class Location extends BaseElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeableConceptDt.class, order=0, min=0, max=1)	
@@ -1461,7 +1476,7 @@ public class Condition extends BaseResource implements IResource {
      * Further conditions, problems, diagnoses, procedures or events that are related in some way to this condition, or the substance that caused/triggered this Condition
      * </p> 
 	 */
-	@Block(name="Condition.relatedItem")	
+	@Block()	
 	public static class RelatedItem extends BaseElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeDt.class, order=0, min=1, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Conformance.java

@@ -50,6 +50,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.CodingDt;
 import ca.uhn.fhir.model.dstu.composite.ContactDt;
@@ -107,6 +108,7 @@ public class Conformance extends BaseResource implements IResource {
 	 * Path: <b>Conformance.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="Conformance.identifier", description="The identifier of the conformance statement")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -117,6 +119,7 @@ public class Conformance extends BaseResource implements IResource {
 	 * Path: <b>Conformance.version</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="version", path="Conformance.version", description="The version identifier of the conformance statement")
 	public static final String SP_VERSION = "version";
 
 	/**
@@ -127,6 +130,7 @@ public class Conformance extends BaseResource implements IResource {
 	 * Path: <b>Conformance.name</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="name", path="Conformance.name", description="Name of the conformance statement")
 	public static final String SP_NAME = "name";
 
 	/**
@@ -137,6 +141,7 @@ public class Conformance extends BaseResource implements IResource {
 	 * Path: <b>Conformance.publisher</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="publisher", path="Conformance.publisher", description="Name of the publisher of the conformance statement")
 	public static final String SP_PUBLISHER = "publisher";
 
 	/**
@@ -147,6 +152,7 @@ public class Conformance extends BaseResource implements IResource {
 	 * Path: <b>Conformance.description</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="description", path="Conformance.description", description="Text search in the description of the conformance statement")
 	public static final String SP_DESCRIPTION = "description";
 
 	/**
@@ -157,6 +163,7 @@ public class Conformance extends BaseResource implements IResource {
 	 * Path: <b>Conformance.status</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="status", path="Conformance.status", description="The current status of the conformance statement")
 	public static final String SP_STATUS = "status";
 
 	/**
@@ -167,6 +174,7 @@ public class Conformance extends BaseResource implements IResource {
 	 * Path: <b>Conformance.date</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="date", path="Conformance.date", description="The conformance statement publication date")
 	public static final String SP_DATE = "date";
 
 	/**
@@ -177,6 +185,7 @@ public class Conformance extends BaseResource implements IResource {
 	 * Path: <b>Conformance.software.name</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="software", path="Conformance.software.name", description="Part of a the name of a software application")
 	public static final String SP_SOFTWARE = "software";
 
 	/**
@@ -187,6 +196,7 @@ public class Conformance extends BaseResource implements IResource {
 	 * Path: <b>Conformance.version</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="fhirversion", path="Conformance.version", description="The version of FHIR")
 	public static final String SP_FHIRVERSION = "fhirversion";
 
 	/**
@@ -197,6 +207,7 @@ public class Conformance extends BaseResource implements IResource {
 	 * Path: <b>Conformance.rest.resource.type</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="resource", path="Conformance.rest.resource.type", description="Name of a resource mentioned in a conformance statement")
 	public static final String SP_RESOURCE = "resource";
 
 	/**
@@ -207,6 +218,7 @@ public class Conformance extends BaseResource implements IResource {
 	 * Path: <b>Conformance.messaging.event.code</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="event", path="Conformance.messaging.event.code", description="Event code in a conformance statement")
 	public static final String SP_EVENT = "event";
 
 	/**
@@ -217,6 +229,7 @@ public class Conformance extends BaseResource implements IResource {
 	 * Path: <b>Conformance.rest.mode</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="mode", path="Conformance.rest.mode", description="Mode - restful (server/client) or messaging (sender/receiver)")
 	public static final String SP_MODE = "mode";
 
 	/**
@@ -227,6 +240,7 @@ public class Conformance extends BaseResource implements IResource {
 	 * Path: <b>Conformance.rest.resource.profile</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="profile", path="Conformance.rest.resource.profile", description="A profile id invoked in a conformance statement")
 	public static final String SP_PROFILE = "profile";
 
 	/**
@@ -237,6 +251,7 @@ public class Conformance extends BaseResource implements IResource {
 	 * Path: <b>Conformance.format</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="format", path="Conformance.format", description="")
 	public static final String SP_FORMAT = "format";
 
 	/**
@@ -247,6 +262,7 @@ public class Conformance extends BaseResource implements IResource {
 	 * Path: <b>Conformance.rest.security</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="security", path="Conformance.rest.security", description="")
 	public static final String SP_SECURITY = "security";
 
 	/**
@@ -257,6 +273,7 @@ public class Conformance extends BaseResource implements IResource {
 	 * Path: <b>Conformance.profile</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="supported-profile", path="Conformance.profile", description="")
 	public static final String SP_SUPPORTED_PROFILE = "supported-profile";
 
 
@@ -1288,7 +1305,7 @@ public class Conformance extends BaseResource implements IResource {
      * Software that is covered by this conformance statement.  It is used when the profile describes the capabilities of a particular software version, independent of an installation.
      * </p> 
 	 */
-	@Block(name="Conformance.software")	
+	@Block()	
 	public static class Software extends BaseElement implements IResourceBlock {
 	
 	@Child(name="name", type=StringDt.class, order=0, min=1, max=1)	
@@ -1485,7 +1502,7 @@ public class Conformance extends BaseResource implements IResource {
      * Identifies a specific implementation instance that is described by the conformance statement - i.e. a particular installation, rather than the capabilities of a software program
      * </p> 
 	 */
-	@Block(name="Conformance.implementation")	
+	@Block()	
 	public static class Implementation extends BaseElement implements IResourceBlock {
 	
 	@Child(name="description", type=StringDt.class, order=0, min=1, max=1)	
@@ -1618,7 +1635,7 @@ public class Conformance extends BaseResource implements IResource {
      * A definition of the restful capabilities of the solution, if any
      * </p> 
 	 */
-	@Block(name="Conformance.rest")	
+	@Block()	
 	public static class Rest extends BaseElement implements IResourceBlock {
 	
 	@Child(name="mode", type=CodeDt.class, order=0, min=1, max=1)	
@@ -2074,7 +2091,7 @@ public class Conformance extends BaseResource implements IResource {
      * Information about security of implementation
      * </p> 
 	 */
-	@Block(name="Conformance.rest.security")	
+	@Block()	
 	public static class RestSecurity extends BaseElement implements IResourceBlock {
 	
 	@Child(name="cors", type=BooleanDt.class, order=0, min=0, max=1)	
@@ -2337,7 +2354,7 @@ public class Conformance extends BaseResource implements IResource {
      * Certificates associated with security profiles
      * </p> 
 	 */
-	@Block(name="Conformance.rest.security.certificate")	
+	@Block()	
 	public static class RestSecurityCertificate extends BaseElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeDt.class, order=0, min=0, max=1)	
@@ -2471,7 +2488,7 @@ public class Conformance extends BaseResource implements IResource {
      * A specification of the restful capabilities of the solution for a specific resource type
      * </p> 
 	 */
-	@Block(name="Conformance.rest.resource")	
+	@Block()	
 	public static class RestResource extends BaseElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeDt.class, order=0, min=1, max=1)	
@@ -2912,7 +2929,7 @@ public class Conformance extends BaseResource implements IResource {
      * Identifies a restful operation supported by the solution
      * </p> 
 	 */
-	@Block(name="Conformance.rest.resource.operation")	
+	@Block()	
 	public static class RestResourceOperation extends BaseElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeDt.class, order=0, min=1, max=1)	
@@ -3045,7 +3062,7 @@ public class Conformance extends BaseResource implements IResource {
      * Additional search parameters for implementations to support and/or make use of
      * </p> 
 	 */
-	@Block(name="Conformance.rest.resource.searchParam")	
+	@Block()	
 	public static class RestResourceSearchParam extends BaseElement implements IResourceBlock {
 	
 	@Child(name="name", type=StringDt.class, order=0, min=1, max=1)	
@@ -3430,7 +3447,7 @@ public class Conformance extends BaseResource implements IResource {
      * A specification of restful operations supported by the system
      * </p> 
 	 */
-	@Block(name="Conformance.rest.operation")	
+	@Block()	
 	public static class RestOperation extends BaseElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeDt.class, order=0, min=1, max=1)	
@@ -3563,7 +3580,7 @@ public class Conformance extends BaseResource implements IResource {
      * Definition of a named query and its parameters and their meaning
      * </p> 
 	 */
-	@Block(name="Conformance.rest.query")	
+	@Block()	
 	public static class RestQuery extends BaseElement implements IResourceBlock {
 	
 	@Child(name="name", type=StringDt.class, order=0, min=1, max=1)	
@@ -3815,7 +3832,7 @@ public class Conformance extends BaseResource implements IResource {
      * A description of the messaging capabilities of the solution
      * </p> 
 	 */
-	@Block(name="Conformance.messaging")	
+	@Block()	
 	public static class Messaging extends BaseElement implements IResourceBlock {
 	
 	@Child(name="endpoint", type=UriDt.class, order=0, min=0, max=1)	
@@ -4065,7 +4082,7 @@ public class Conformance extends BaseResource implements IResource {
      * A description of the solution's support for an event at this end point.
      * </p> 
 	 */
-	@Block(name="Conformance.messaging.event")	
+	@Block()	
 	public static class MessagingEvent extends BaseElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodingDt.class, order=0, min=1, max=1)	
@@ -4484,7 +4501,7 @@ public class Conformance extends BaseResource implements IResource {
      * A document definition
      * </p> 
 	 */
-	@Block(name="Conformance.document")	
+	@Block()	
 	public static class Document extends BaseElement implements IResourceBlock {
 	
 	@Child(name="mode", type=CodeDt.class, order=0, min=1, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Coverage.java

@@ -50,6 +50,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.AddressDt;
 import ca.uhn.fhir.model.dstu.composite.CodingDt;
 import ca.uhn.fhir.model.dstu.composite.HumanNameDt;
@@ -92,6 +93,7 @@ public class Coverage extends BaseResource implements IResource {
 	 * Path: <b>Coverage.issuer</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="issuer", path="Coverage.issuer", description="The identity of the insurer")
 	public static final String SP_ISSUER = "issuer";
 
 	/**
@@ -102,6 +104,7 @@ public class Coverage extends BaseResource implements IResource {
 	 * Path: <b>Coverage.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="Coverage.identifier", description="The primary identifier of the insured")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -112,6 +115,7 @@ public class Coverage extends BaseResource implements IResource {
 	 * Path: <b>Coverage.type</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="type", path="Coverage.type", description="The kind of coverage")
 	public static final String SP_TYPE = "type";
 
 	/**
@@ -122,6 +126,7 @@ public class Coverage extends BaseResource implements IResource {
 	 * Path: <b>Coverage.plan</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="plan", path="Coverage.plan", description="A plan or policy identifier")
 	public static final String SP_PLAN = "plan";
 
 	/**
@@ -132,6 +137,7 @@ public class Coverage extends BaseResource implements IResource {
 	 * Path: <b>Coverage.subplan</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subplan", path="Coverage.subplan", description="Sub-plan identifier")
 	public static final String SP_SUBPLAN = "subplan";
 
 	/**
@@ -142,6 +148,7 @@ public class Coverage extends BaseResource implements IResource {
 	 * Path: <b>Coverage.group</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="group", path="Coverage.group", description="Group identifier")
 	public static final String SP_GROUP = "group";
 
 	/**
@@ -152,6 +159,7 @@ public class Coverage extends BaseResource implements IResource {
 	 * Path: <b>Coverage.dependent</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="dependent", path="Coverage.dependent", description="Dependent number")
 	public static final String SP_DEPENDENT = "dependent";
 
 	/**
@@ -162,6 +170,7 @@ public class Coverage extends BaseResource implements IResource {
 	 * Path: <b>Coverage.sequence</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="sequence", path="Coverage.sequence", description="Sequence number")
 	public static final String SP_SEQUENCE = "sequence";
 
 	/**
@@ -172,6 +181,7 @@ public class Coverage extends BaseResource implements IResource {
 	 * Path: <b>Coverage.subscriber.name</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="name", path="Coverage.subscriber.name", description="The name of the subscriber")
 	public static final String SP_NAME = "name";
 
 
@@ -710,7 +720,7 @@ public class Coverage extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	@Block(name="Coverage.subscriber")	
+	@Block()	
 	public static class Subscriber extends BaseElement implements IResourceBlock {
 	
 	@Child(name="name", type=HumanNameDt.class, order=0, min=0, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Device.java

@@ -47,6 +47,7 @@ import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.ContactDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
@@ -88,6 +89,7 @@ public class Device extends BaseResource implements IResource {
 	 * Path: <b>Device.type</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="type", path="Device.type", description="The type of the device")
 	public static final String SP_TYPE = "type";
 
 	/**
@@ -98,6 +100,7 @@ public class Device extends BaseResource implements IResource {
 	 * Path: <b>Device.manufacturer</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="manufacturer", path="Device.manufacturer", description="The manufacturer of the device")
 	public static final String SP_MANUFACTURER = "manufacturer";
 
 	/**
@@ -108,6 +111,7 @@ public class Device extends BaseResource implements IResource {
 	 * Path: <b>Device.model</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="model", path="Device.model", description="The model of the device")
 	public static final String SP_MODEL = "model";
 
 	/**
@@ -118,6 +122,7 @@ public class Device extends BaseResource implements IResource {
 	 * Path: <b>Device.owner</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="organization", path="Device.owner", description="The organization responsible for the device")
 	public static final String SP_ORGANIZATION = "organization";
 
 	/**
@@ -128,6 +133,7 @@ public class Device extends BaseResource implements IResource {
 	 * Path: <b>Device.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="Device.identifier", description="")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -138,6 +144,7 @@ public class Device extends BaseResource implements IResource {
 	 * Path: <b>Device.location</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="location", path="Device.location", description="A location, where the resource is found")
 	public static final String SP_LOCATION = "location";
 
 	/**
@@ -148,6 +155,7 @@ public class Device extends BaseResource implements IResource {
 	 * Path: <b>Device.patient</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="patient", path="Device.patient", description="Patient information, if the resource is affixed to a person")
 	public static final String SP_PATIENT = "patient";
 
 	/**
@@ -158,6 +166,7 @@ public class Device extends BaseResource implements IResource {
 	 * Path: <b>Device.udi</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="udi", path="Device.udi", description="")
 	public static final String SP_UDI = "udi";
 
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DeviceObservationReport.java

@@ -50,6 +50,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
@@ -88,6 +89,7 @@ public class DeviceObservationReport extends BaseResource implements IResource {
 	 * Path: <b>DeviceObservationReport.source</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="source", path="DeviceObservationReport.source", description="")
 	public static final String SP_SOURCE = "source";
 
 	/**
@@ -98,6 +100,7 @@ public class DeviceObservationReport extends BaseResource implements IResource {
 	 * Path: <b>DeviceObservationReport.virtualDevice.code</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="code", path="DeviceObservationReport.virtualDevice.code", description="The compatment code")
 	public static final String SP_CODE = "code";
 
 	/**
@@ -108,6 +111,7 @@ public class DeviceObservationReport extends BaseResource implements IResource {
 	 * Path: <b>DeviceObservationReport.virtualDevice.channel.code</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="channel", path="DeviceObservationReport.virtualDevice.channel.code", description="The channel code")
 	public static final String SP_CHANNEL = "channel";
 
 	/**
@@ -118,6 +122,7 @@ public class DeviceObservationReport extends BaseResource implements IResource {
 	 * Path: <b>DeviceObservationReport.virtualDevice.channel.metric.observation</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="observation", path="DeviceObservationReport.virtualDevice.channel.metric.observation", description="")
 	public static final String SP_OBSERVATION = "observation";
 
 	/**
@@ -128,6 +133,7 @@ public class DeviceObservationReport extends BaseResource implements IResource {
 	 * Path: <b>DeviceObservationReport.subject</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="DeviceObservationReport.subject", description="")
 	public static final String SP_SUBJECT = "subject";
 
 
@@ -222,8 +228,8 @@ public class DeviceObservationReport extends BaseResource implements IResource {
      * The point in time that the values are reported
      * </p> 
 	 */
-	public DeviceObservationReport setInstantWithMillisPrecision( Date theDate) {
+	public DeviceObservationReport setInstant( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myInstant = new InstantDt(theDate); 
+		myInstant = new InstantDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -235,8 +241,8 @@ public class DeviceObservationReport extends BaseResource implements IResource {
      * The point in time that the values are reported
      * </p> 
 	 */
-	public DeviceObservationReport setInstant( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public DeviceObservationReport setInstantWithMillisPrecision( Date theDate) {
-		myInstant = new InstantDt(theDate, thePrecision); 
+		myInstant = new InstantDt(theDate); 
 		return this; 
 	}
 
@@ -425,7 +431,7 @@ public class DeviceObservationReport extends BaseResource implements IResource {
      * A medical-related subsystem of a medical device
      * </p> 
 	 */
-	@Block(name="DeviceObservationReport.virtualDevice")	
+	@Block()	
 	public static class VirtualDevice extends BaseElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeableConceptDt.class, order=0, min=0, max=1)	
@@ -560,7 +566,7 @@ public class DeviceObservationReport extends BaseResource implements IResource {
      * Groups together physiological measurement data and derived data
      * </p> 
 	 */
-	@Block(name="DeviceObservationReport.virtualDevice.channel")	
+	@Block()	
 	public static class VirtualDeviceChannel extends BaseElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeableConceptDt.class, order=0, min=0, max=1)	
@@ -695,7 +701,7 @@ public class DeviceObservationReport extends BaseResource implements IResource {
      * A piece of measured or derived data that is reported by the machine
      * </p> 
 	 */
-	@Block(name="DeviceObservationReport.virtualDevice.channel.metric")	
+	@Block()	
 	public static class VirtualDeviceChannelMetric extends BaseElement implements IResourceBlock {
 	
 	@Child(name="observation", order=0, min=1, max=1, type={

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DiagnosticOrder.java

@@ -50,6 +50,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
@@ -93,6 +94,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 	 * Path: <b>DiagnosticOrder.event.actor | DiagnosticOrder.item.event.actor</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="actor", path="DiagnosticOrder.event.actor | DiagnosticOrder.item.event.actor", description="")
 	public static final String SP_ACTOR = "actor";
 
 	/**
@@ -103,6 +105,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 	 * Path: <b>DiagnosticOrder.item.bodySite</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="bodysite", path="DiagnosticOrder.item.bodySite", description="")
 	public static final String SP_BODYSITE = "bodysite";
 
 	/**
@@ -113,6 +116,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 	 * Path: <b>DiagnosticOrder.item.code</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="code", path="DiagnosticOrder.item.code", description="")
 	public static final String SP_CODE = "code";
 
 	/**
@@ -123,6 +127,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 	 * Path: <b>DiagnosticOrder.event.dateTime</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="event-date", path="DiagnosticOrder.event.dateTime", description="")
 	public static final String SP_EVENT_DATE = "event-date";
 
 	/**
@@ -133,6 +138,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 	 * Path: <b>DiagnosticOrder.encounter</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="encounter", path="DiagnosticOrder.encounter", description="")
 	public static final String SP_ENCOUNTER = "encounter";
 
 	/**
@@ -143,6 +149,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 	 * Path: <b>DiagnosticOrder.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="DiagnosticOrder.identifier", description="")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -153,6 +160,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 	 * Path: <b>DiagnosticOrder.item.event.dateTime</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="item-date", path="DiagnosticOrder.item.event.dateTime", description="")
 	public static final String SP_ITEM_DATE = "item-date";
 
 	/**
@@ -163,6 +171,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 	 * Path: <b>DiagnosticOrder.item.event.status</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="item-past-status", path="DiagnosticOrder.item.event.status", description="")
 	public static final String SP_ITEM_PAST_STATUS = "item-past-status";
 
 	/**
@@ -173,6 +182,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 	 * Path: <b>DiagnosticOrder.item.status</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="item-status", path="DiagnosticOrder.item.status", description="")
 	public static final String SP_ITEM_STATUS = "item-status";
 
 	/**
@@ -183,6 +193,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 	 * Path: <b>item-past-status & item-date</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="item-status-date", path="item-past-status & item-date", description="A combination of item-past-status and item-date")
 	public static final String SP_ITEM_STATUS_DATE = "item-status-date";
 
 	/**
@@ -193,6 +204,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 	 * Path: <b>DiagnosticOrder.orderer</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="orderer", path="DiagnosticOrder.orderer", description="")
 	public static final String SP_ORDERER = "orderer";
 
 	/**
@@ -203,6 +215,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 	 * Path: <b>DiagnosticOrder.event.status</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="event-status", path="DiagnosticOrder.event.status", description="")
 	public static final String SP_EVENT_STATUS = "event-status";
 
 	/**
@@ -213,6 +226,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 	 * Path: <b>DiagnosticOrder.specimen | DiagnosticOrder.item.specimen</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="specimen", path="DiagnosticOrder.specimen | DiagnosticOrder.item.specimen", description="")
 	public static final String SP_SPECIMEN = "specimen";
 
 	/**
@@ -223,6 +237,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 	 * Path: <b>DiagnosticOrder.status</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="status", path="DiagnosticOrder.status", description="")
 	public static final String SP_STATUS = "status";
 
 	/**
@@ -233,6 +248,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 	 * Path: <b>event-status & event-date</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="event-status-date", path="event-status & event-date", description="A combination of past-status and date")
 	public static final String SP_EVENT_STATUS_DATE = "event-status-date";
 
 	/**
@@ -243,6 +259,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 	 * Path: <b>DiagnosticOrder.subject</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="DiagnosticOrder.subject", description="")
 	public static final String SP_SUBJECT = "subject";
 
 
@@ -826,7 +843,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
      * A summary of the events of interest that have occurred as the request is processed. E.g. when the order was made, various processing steps (specimens received), when it was completed
      * </p> 
 	 */
-	@Block(name="DiagnosticOrder.event")	
+	@Block()	
 	public static class Event extends BaseElement implements IResourceBlock {
 	
 	@Child(name="status", type=CodeDt.class, order=0, min=1, max=1)	
@@ -1046,7 +1063,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
      * The specific diagnostic investigations that are requested as part of this request. Sometimes, there can only be one item per request, but in most contexts, more than one investigation can be requested
      * </p> 
 	 */
-	@Block(name="DiagnosticOrder.item")	
+	@Block()	
 	public static class Item extends BaseElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeableConceptDt.class, order=0, min=1, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DiagnosticReport.java

@@ -51,6 +51,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
@@ -95,6 +96,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	 * Path: <b>DiagnosticReport.status</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="status", path="DiagnosticReport.status", description="The status of the report")
 	public static final String SP_STATUS = "status";
 
 	/**
@@ -105,6 +107,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	 * Path: <b>DiagnosticReport.issued</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="issued", path="DiagnosticReport.issued", description="When the report was issued")
 	public static final String SP_ISSUED = "issued";
 
 	/**
@@ -115,6 +118,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	 * Path: <b>DiagnosticReport.subject</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="DiagnosticReport.subject", description="The subject of the report")
 	public static final String SP_SUBJECT = "subject";
 
 	/**
@@ -125,6 +129,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	 * Path: <b>DiagnosticReport.performer</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="performer", path="DiagnosticReport.performer", description="Who was the source of the report (organization)")
 	public static final String SP_PERFORMER = "performer";
 
 	/**
@@ -135,6 +140,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	 * Path: <b>DiagnosticReport.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="DiagnosticReport.identifier", description="An identifier for the report")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -145,6 +151,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	 * Path: <b>DiagnosticReport.serviceCategory</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="service", path="DiagnosticReport.serviceCategory", description="Which diagnostic discipline/department created the report")
 	public static final String SP_SERVICE = "service";
 
 	/**
@@ -155,6 +162,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	 * Path: <b>DiagnosticReport.diagnostic[x]</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="date", path="DiagnosticReport.diagnostic[x]", description="The clinically relevant time of the report")
 	public static final String SP_DATE = "date";
 
 	/**
@@ -165,6 +173,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	 * Path: <b>DiagnosticReport.specimen</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="specimen", path="DiagnosticReport.specimen", description="The specimen details")
 	public static final String SP_SPECIMEN = "specimen";
 
 	/**
@@ -175,6 +184,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	 * Path: <b>DiagnosticReport.name</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="name", path="DiagnosticReport.name", description="The name of the report (e.g. the code for the report as a whole, as opposed to codes for the atomic results, which are the names on the observation resource referred to from the result)")
 	public static final String SP_NAME = "name";
 
 	/**
@@ -185,6 +195,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	 * Path: <b>DiagnosticReport.result</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="result", path="DiagnosticReport.result", description="Link to an atomic result (observation resource)")
 	public static final String SP_RESULT = "result";
 
 	/**
@@ -195,6 +206,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	 * Path: <b>DiagnosticReport.codedDiagnosis</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="diagnosis", path="DiagnosticReport.codedDiagnosis", description="A coded diagnosis on the report")
 	public static final String SP_DIAGNOSIS = "diagnosis";
 
 	/**
@@ -205,6 +217,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	 * Path: <b>DiagnosticReport.image.link</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="image", path="DiagnosticReport.image.link", description="")
 	public static final String SP_IMAGE = "image";
 
 	/**
@@ -215,6 +228,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	 * Path: <b>DiagnosticReport.requestDetail</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="request", path="DiagnosticReport.requestDetail", description="")
 	public static final String SP_REQUEST = "request";
 
 
@@ -1065,7 +1079,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
      * A list of key images associated with this report. The images are generally created during the diagnostic process, and may be directly of the patient, or of treated specimens (i.e. slides of interest)
      * </p> 
 	 */
-	@Block(name="DiagnosticReport.image")	
+	@Block()	
 	public static class Image extends BaseElement implements IResourceBlock {
 	
 	@Child(name="comment", type=StringDt.class, order=0, min=0, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DocumentManifest.java

@@ -47,6 +47,7 @@ import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
@@ -90,6 +91,7 @@ public class DocumentManifest extends BaseResource implements IResource {
 	 * Path: <b>DocumentManifest.masterIdentifier | DocumentManifest.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="DocumentManifest.masterIdentifier | DocumentManifest.identifier", description="")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -100,6 +102,7 @@ public class DocumentManifest extends BaseResource implements IResource {
 	 * Path: <b>DocumentManifest.subject</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="DocumentManifest.subject", description="")
 	public static final String SP_SUBJECT = "subject";
 
 	/**
@@ -110,6 +113,7 @@ public class DocumentManifest extends BaseResource implements IResource {
 	 * Path: <b>DocumentManifest.type</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="type", path="DocumentManifest.type", description="")
 	public static final String SP_TYPE = "type";
 
 	/**
@@ -120,6 +124,7 @@ public class DocumentManifest extends BaseResource implements IResource {
 	 * Path: <b>DocumentManifest.recipient</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="recipient", path="DocumentManifest.recipient", description="")
 	public static final String SP_RECIPIENT = "recipient";
 
 	/**
@@ -130,6 +135,7 @@ public class DocumentManifest extends BaseResource implements IResource {
 	 * Path: <b>DocumentManifest.author</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="author", path="DocumentManifest.author", description="")
 	public static final String SP_AUTHOR = "author";
 
 	/**
@@ -140,6 +146,7 @@ public class DocumentManifest extends BaseResource implements IResource {
 	 * Path: <b>DocumentManifest.created</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="created", path="DocumentManifest.created", description="")
 	public static final String SP_CREATED = "created";
 
 	/**
@@ -150,6 +157,7 @@ public class DocumentManifest extends BaseResource implements IResource {
 	 * Path: <b>DocumentManifest.status</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="status", path="DocumentManifest.status", description="")
 	public static final String SP_STATUS = "status";
 
 	/**
@@ -160,6 +168,7 @@ public class DocumentManifest extends BaseResource implements IResource {
 	 * Path: <b>DocumentManifest.supercedes</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="supersedes", path="DocumentManifest.supercedes", description="")
 	public static final String SP_SUPERSEDES = "supersedes";
 
 	/**
@@ -170,6 +179,7 @@ public class DocumentManifest extends BaseResource implements IResource {
 	 * Path: <b>DocumentManifest.description</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="description", path="DocumentManifest.description", description="")
 	public static final String SP_DESCRIPTION = "description";
 
 	/**
@@ -180,6 +190,7 @@ public class DocumentManifest extends BaseResource implements IResource {
 	 * Path: <b>DocumentManifest.confidentiality</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="confidentiality", path="DocumentManifest.confidentiality", description="")
 	public static final String SP_CONFIDENTIALITY = "confidentiality";
 
 	/**
@@ -190,6 +201,7 @@ public class DocumentManifest extends BaseResource implements IResource {
 	 * Path: <b>DocumentManifest.content</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="content", path="DocumentManifest.content", description="")
 	public static final String SP_CONTENT = "content";
 
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DocumentReference.java

@@ -50,6 +50,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.PeriodDt;
@@ -97,6 +98,7 @@ public class DocumentReference extends BaseResource implements IResource {
 	 * Path: <b>DocumentReference.masterIdentifier | DocumentReference.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="DocumentReference.masterIdentifier | DocumentReference.identifier", description="")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -107,6 +109,7 @@ public class DocumentReference extends BaseResource implements IResource {
 	 * Path: <b>DocumentReference.subject</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="DocumentReference.subject", description="")
 	public static final String SP_SUBJECT = "subject";
 
 	/**
@@ -117,6 +120,7 @@ public class DocumentReference extends BaseResource implements IResource {
 	 * Path: <b>DocumentReference.type</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="type", path="DocumentReference.type", description="")
 	public static final String SP_TYPE = "type";
 
 	/**
@@ -127,6 +131,7 @@ public class DocumentReference extends BaseResource implements IResource {
 	 * Path: <b>DocumentReference.class</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="class", path="DocumentReference.class", description="")
 	public static final String SP_CLASS = "class";
 
 	/**
@@ -137,6 +142,7 @@ public class DocumentReference extends BaseResource implements IResource {
 	 * Path: <b>DocumentReference.author</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="author", path="DocumentReference.author", description="")
 	public static final String SP_AUTHOR = "author";
 
 	/**
@@ -147,6 +153,7 @@ public class DocumentReference extends BaseResource implements IResource {
 	 * Path: <b>DocumentReference.custodian</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="custodian", path="DocumentReference.custodian", description="")
 	public static final String SP_CUSTODIAN = "custodian";
 
 	/**
@@ -157,6 +164,7 @@ public class DocumentReference extends BaseResource implements IResource {
 	 * Path: <b>DocumentReference.authenticator</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="authenticator", path="DocumentReference.authenticator", description="")
 	public static final String SP_AUTHENTICATOR = "authenticator";
 
 	/**
@@ -167,6 +175,7 @@ public class DocumentReference extends BaseResource implements IResource {
 	 * Path: <b>DocumentReference.created</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="created", path="DocumentReference.created", description="")
 	public static final String SP_CREATED = "created";
 
 	/**
@@ -177,6 +186,7 @@ public class DocumentReference extends BaseResource implements IResource {
 	 * Path: <b>DocumentReference.indexed</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="indexed", path="DocumentReference.indexed", description="")
 	public static final String SP_INDEXED = "indexed";
 
 	/**
@@ -187,6 +197,7 @@ public class DocumentReference extends BaseResource implements IResource {
 	 * Path: <b>DocumentReference.status</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="status", path="DocumentReference.status", description="")
 	public static final String SP_STATUS = "status";
 
 	/**
@@ -197,6 +208,7 @@ public class DocumentReference extends BaseResource implements IResource {
 	 * Path: <b>DocumentReference.relatesTo.target</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="relatesto", path="DocumentReference.relatesTo.target", description="")
 	public static final String SP_RELATESTO = "relatesto";
 
 	/**
@@ -207,6 +219,7 @@ public class DocumentReference extends BaseResource implements IResource {
 	 * Path: <b>DocumentReference.relatesTo.code</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="relation", path="DocumentReference.relatesTo.code", description="")
 	public static final String SP_RELATION = "relation";
 
 	/**
@@ -217,6 +230,7 @@ public class DocumentReference extends BaseResource implements IResource {
 	 * Path: <b>relatesto & relation</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="relationship", path="relatesto & relation", description="Combination of relation and relatesTo")
 	public static final String SP_RELATIONSHIP = "relationship";
 
 	/**
@@ -227,6 +241,7 @@ public class DocumentReference extends BaseResource implements IResource {
 	 * Path: <b>DocumentReference.description</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="description", path="DocumentReference.description", description="")
 	public static final String SP_DESCRIPTION = "description";
 
 	/**
@@ -237,6 +252,7 @@ public class DocumentReference extends BaseResource implements IResource {
 	 * Path: <b>DocumentReference.confidentiality</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="confidentiality", path="DocumentReference.confidentiality", description="")
 	public static final String SP_CONFIDENTIALITY = "confidentiality";
 
 	/**
@@ -247,6 +263,7 @@ public class DocumentReference extends BaseResource implements IResource {
 	 * Path: <b>DocumentReference.primaryLanguage</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="language", path="DocumentReference.primaryLanguage", description="")
 	public static final String SP_LANGUAGE = "language";
 
 	/**
@@ -257,6 +274,7 @@ public class DocumentReference extends BaseResource implements IResource {
 	 * Path: <b>DocumentReference.format</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="format", path="DocumentReference.format", description="")
 	public static final String SP_FORMAT = "format";
 
 	/**
@@ -267,6 +285,7 @@ public class DocumentReference extends BaseResource implements IResource {
 	 * Path: <b>DocumentReference.size</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="size", path="DocumentReference.size", description="")
 	public static final String SP_SIZE = "size";
 
 	/**
@@ -277,6 +296,7 @@ public class DocumentReference extends BaseResource implements IResource {
 	 * Path: <b>DocumentReference.location</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="location", path="DocumentReference.location", description="")
 	public static final String SP_LOCATION = "location";
 
 	/**
@@ -287,6 +307,7 @@ public class DocumentReference extends BaseResource implements IResource {
 	 * Path: <b>DocumentReference.context.event</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="event", path="DocumentReference.context.event", description="")
 	public static final String SP_EVENT = "event";
 
 	/**
@@ -297,6 +318,7 @@ public class DocumentReference extends BaseResource implements IResource {
 	 * Path: <b>DocumentReference.context.period</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="period", path="DocumentReference.context.period", description="")
 	public static final String SP_PERIOD = "period";
 
 	/**
@@ -307,6 +329,7 @@ public class DocumentReference extends BaseResource implements IResource {
 	 * Path: <b>DocumentReference.context.facilityType</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="facility", path="DocumentReference.context.facilityType", description="")
 	public static final String SP_FACILITY = "facility";
 
 
@@ -980,8 +1003,8 @@ public class DocumentReference extends BaseResource implements IResource {
      * When the document reference was created
      * </p> 
 	 */
-	public DocumentReference setIndexedWithMillisPrecision( Date theDate) {
+	public DocumentReference setIndexed( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myIndexed = new InstantDt(theDate); 
+		myIndexed = new InstantDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -993,8 +1016,8 @@ public class DocumentReference extends BaseResource implements IResource {
      * When the document reference was created
      * </p> 
 	 */
-	public DocumentReference setIndexed( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public DocumentReference setIndexedWithMillisPrecision( Date theDate) {
-		myIndexed = new InstantDt(theDate, thePrecision); 
+		myIndexed = new InstantDt(theDate); 
 		return this; 
 	}
 
@@ -1606,7 +1629,7 @@ public class DocumentReference extends BaseResource implements IResource {
      * Relationships that this document has with other document references that already exist
      * </p> 
 	 */
-	@Block(name="DocumentReference.relatesTo")	
+	@Block()	
 	public static class RelatesTo extends BaseElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeDt.class, order=0, min=1, max=1)	
@@ -1727,7 +1750,7 @@ public class DocumentReference extends BaseResource implements IResource {
      * A description of a service call that can be used to retrieve the document
      * </p> 
 	 */
-	@Block(name="DocumentReference.service")	
+	@Block()	
 	public static class Service extends BaseElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeableConceptDt.class, order=0, min=1, max=1)	
@@ -1913,7 +1936,7 @@ public class DocumentReference extends BaseResource implements IResource {
      * A list of named parameters that is used in the service call
      * </p> 
 	 */
-	@Block(name="DocumentReference.service.parameter")	
+	@Block()	
 	public static class ServiceParameter extends BaseElement implements IResourceBlock {
 	
 	@Child(name="name", type=StringDt.class, order=0, min=1, max=1)	
@@ -2047,7 +2070,7 @@ public class DocumentReference extends BaseResource implements IResource {
      * The clinical context in which the document was prepared
      * </p> 
 	 */
-	@Block(name="DocumentReference.context")	
+	@Block()	
 	public static class Context extends BaseElement implements IResourceBlock {
 	
 	@Child(name="event", type=CodeableConceptDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Encounter.java

@@ -48,6 +48,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.DurationDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
@@ -97,6 +98,7 @@ public class Encounter extends BaseResource implements IResource {
 	 * Path: <b>Encounter.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="Encounter.identifier", description="")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -107,6 +109,7 @@ public class Encounter extends BaseResource implements IResource {
 	 * Path: <b>Encounter.status</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="status", path="Encounter.status", description="")
 	public static final String SP_STATUS = "status";
 
 	/**
@@ -117,6 +120,7 @@ public class Encounter extends BaseResource implements IResource {
 	 * Path: <b>Encounter.period</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="date", path="Encounter.period", description="A date within the period the Encounter lasted")
 	public static final String SP_DATE = "date";
 
 	/**
@@ -127,6 +131,7 @@ public class Encounter extends BaseResource implements IResource {
 	 * Path: <b>Encounter.subject</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="Encounter.subject", description="")
 	public static final String SP_SUBJECT = "subject";
 
 	/**
@@ -137,6 +142,7 @@ public class Encounter extends BaseResource implements IResource {
 	 * Path: <b>Encounter.fulfills</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="!fulfills", path="Encounter.fulfills", description="")
 	public static final String SP_FULFILLS = "!fulfills";
 
 	/**
@@ -147,6 +153,7 @@ public class Encounter extends BaseResource implements IResource {
 	 * Path: <b>Encounter.length</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="length", path="Encounter.length", description="Length of encounter in days")
 	public static final String SP_LENGTH = "length";
 
 	/**
@@ -157,6 +164,7 @@ public class Encounter extends BaseResource implements IResource {
 	 * Path: <b>Encounter.indication</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="indication", path="Encounter.indication", description="")
 	public static final String SP_INDICATION = "indication";
 
 	/**
@@ -167,6 +175,7 @@ public class Encounter extends BaseResource implements IResource {
 	 * Path: <b>Encounter.location.location</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="location", path="Encounter.location.location", description="")
 	public static final String SP_LOCATION = "location";
 
 	/**
@@ -177,6 +186,7 @@ public class Encounter extends BaseResource implements IResource {
 	 * Path: <b>Encounter.location.period</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="location-period", path="Encounter.location.period", description="")
 	public static final String SP_LOCATION_PERIOD = "location-period";
 
 
@@ -966,7 +976,7 @@ public class Encounter extends BaseResource implements IResource {
      * The main practitioner responsible for providing the service
      * </p> 
 	 */
-	@Block(name="Encounter.participant")	
+	@Block()	
 	public static class Participant extends BaseElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeableConceptDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)	
@@ -1097,7 +1107,7 @@ public class Encounter extends BaseResource implements IResource {
      * Details about an admission to a clinic
      * </p> 
 	 */
-	@Block(name="Encounter.hospitalization")	
+	@Block()	
 	public static class Hospitalization extends BaseElement implements IResourceBlock {
 	
 	@Child(name="preAdmissionIdentifier", type=IdentifierDt.class, order=0, min=0, max=1)	
@@ -1725,7 +1735,7 @@ public class Encounter extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	@Block(name="Encounter.hospitalization.accomodation")	
+	@Block()	
 	public static class HospitalizationAccomodation extends BaseElement implements IResourceBlock {
 	
 	@Child(name="bed", order=0, min=0, max=1, type={
@@ -1834,7 +1844,7 @@ public class Encounter extends BaseResource implements IResource {
      * List of locations at which the patient has been
      * </p> 
 	 */
-	@Block(name="Encounter.location")	
+	@Block()	
 	public static class Location extends BaseElement implements IResourceBlock {
 	
 	@Child(name="location", order=0, min=1, max=1, type={

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/FamilyHistory.java

@@ -49,6 +49,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.AgeDt;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
@@ -92,6 +93,7 @@ public class FamilyHistory extends BaseResource implements IResource {
 	 * Path: <b>FamilyHistory.subject</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="FamilyHistory.subject", description="The identity of a subject to list family history items for")
 	public static final String SP_SUBJECT = "subject";
 
 
@@ -379,7 +381,7 @@ public class FamilyHistory extends BaseResource implements IResource {
      * The related person. Each FamilyHistory resource contains the entire family history for a single person.
      * </p> 
 	 */
-	@Block(name="FamilyHistory.relation")	
+	@Block()	
 	public static class Relation extends BaseElement implements IResourceBlock {
 	
 	@Child(name="name", type=StringDt.class, order=0, min=0, max=1)	
@@ -688,7 +690,7 @@ public class FamilyHistory extends BaseResource implements IResource {
      * The significant Conditions (or condition) that the family member had. This is a repeating section to allow a system to represent more than one condition per resource, though there is nothing stopping multiple resources - one per condition.
      * </p> 
 	 */
-	@Block(name="FamilyHistory.relation.condition")	
+	@Block()	
 	public static class RelationCondition extends BaseElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeableConceptDt.class, order=0, min=1, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GVFMeta.java

@@ -50,6 +50,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
 import ca.uhn.fhir.model.primitive.CodeDt;
@@ -90,6 +91,7 @@ public class GVFMeta extends BaseResource implements IResource {
 	 * Path: <b>GVFMeta.subject.patient</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="patient", path="GVFMeta.subject.patient", description="Patient being described in the file")
 	public static final String SP_PATIENT = "patient";
 
 	/**
@@ -100,6 +102,7 @@ public class GVFMeta extends BaseResource implements IResource {
 	 * Path: <b>GVFMeta.sourceFile</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="file", path="GVFMeta.sourceFile", description="URL to source file of the resource")
 	public static final String SP_FILE = "file";
 
 
@@ -980,7 +983,7 @@ public class GVFMeta extends BaseResource implements IResource {
      * Subject being described by the file
      * </p> 
 	 */
-	@Block(name="GVFMeta.subject")	
+	@Block()	
 	public static class Subject extends BaseElement implements IResourceBlock {
 	
 	@Child(name="patient", order=0, min=0, max=1, type={
@@ -1101,7 +1104,7 @@ public class GVFMeta extends BaseResource implements IResource {
      * Technology platform used in the sequencing
      * </p> 
 	 */
-	@Block(name="GVFMeta.platform")	
+	@Block()	
 	public static class Platform extends BaseElement implements IResourceBlock {
 	
 	@Child(name="class", type=CodeDt.class, order=0, min=0, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GVFVariant.java

@@ -48,6 +48,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
 import ca.uhn.fhir.model.primitive.CodeDt;
@@ -87,6 +88,7 @@ public class GVFVariant extends BaseResource implements IResource {
 	 * Path: <b>GVFVariant.subject.patient</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="patient", path="GVFVariant.subject.patient", description="Patient being described ")
 	public static final String SP_PATIENT = "patient";
 
 	/**
@@ -97,6 +99,7 @@ public class GVFVariant extends BaseResource implements IResource {
 	 * Path: <b></b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="coordinate", path="", description="Coordinate of the variant being studied")
 	public static final String SP_COORDINATE = "coordinate";
 
 
@@ -1015,6 +1018,24 @@ public class GVFVariant extends BaseResource implements IResource {
      * Frequency of the variant
      * </p> 
      *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public GVFVariant addVariantFreq( long theValue) {
+		if (myVariantFreq == null) {
+			myVariantFreq = new java.util.ArrayList<DecimalDt>();
+		}
+		myVariantFreq.add(new DecimalDt(theValue));
+		return this; 
+	}
+
+	/**
+	 * Adds a new value for <b>variantFreq</b> (Variant frequency)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Frequency of the variant
+     * </p> 
+     *
      * @return Returns a reference to this object, to allow for simple chaining.
 	 */
 	public GVFVariant addVariantFreq( double theValue) {
@@ -1043,24 +1064,6 @@ public class GVFVariant extends BaseResource implements IResource {
 		return this; 
 	}
 
-	/**
-	 * Adds a new value for <b>variantFreq</b> (Variant frequency)
-	 *
-     * <p>
-     * <b>Definition:</b>
-     * Frequency of the variant
-     * </p> 
-     *
-     * @return Returns a reference to this object, to allow for simple chaining.
-	 */
-	public GVFVariant addVariantFreq( long theValue) {
-		if (myVariantFreq == null) {
-			myVariantFreq = new java.util.ArrayList<DecimalDt>();
-		}
-		myVariantFreq.add(new DecimalDt(theValue));
-		return this; 
-	}
-
  
 	/**
 	 * Gets the value(s) for <b>variantEffect</b> (Variant effect).
@@ -1670,7 +1673,7 @@ public class GVFVariant extends BaseResource implements IResource {
      * Subject described by this segment of GVF file
      * </p> 
 	 */
-	@Block(name="GVFVariant.subject")	
+	@Block()	
 	public static class Subject extends BaseElement implements IResourceBlock {
 	
 	@Child(name="patient", order=0, min=1, max=1, type={
@@ -1791,7 +1794,7 @@ public class GVFVariant extends BaseResource implements IResource {
      * Reference of the feature in a database
      * </p> 
 	 */
-	@Block(name="GVFVariant.dbxref")	
+	@Block()	
 	public static class Dbxref extends BaseElement implements IResourceBlock {
 	
 	@Child(name="database", type=CodeDt.class, order=0, min=1, max=1)	
@@ -1924,7 +1927,7 @@ public class GVFVariant extends BaseResource implements IResource {
      * Effect of the variant
      * </p> 
 	 */
-	@Block(name="GVFVariant.variantEffect")	
+	@Block()	
 	public static class VariantEffect extends BaseElement implements IResourceBlock {
 	
 	@Child(name="sequenceVariant", type=CodeDt.class, order=0, min=1, max=1)	
@@ -2193,7 +2196,7 @@ public class GVFVariant extends BaseResource implements IResource {
      * Attribute describing ambiguity of the start position of the feature
      * </p> 
 	 */
-	@Block(name="GVFVariant.startRange")	
+	@Block()	
 	public static class StartRange extends BaseElement implements IResourceBlock {
 	
 	@Child(name="start", type=IntegerDt.class, order=0, min=1, max=1)	
@@ -2326,7 +2329,7 @@ public class GVFVariant extends BaseResource implements IResource {
      * Attribute describing ambiguity of the end position of the feature
      * </p> 
 	 */
-	@Block(name="GVFVariant.endRange")	
+	@Block()	
 	public static class EndRange extends BaseElement implements IResourceBlock {
 	
 	@Child(name="start", type=IntegerDt.class, order=0, min=1, max=1)	
@@ -2459,7 +2462,7 @@ public class GVFVariant extends BaseResource implements IResource {
      * Coordinate of a variant with zero length
      * </p> 
 	 */
-	@Block(name="GVFVariant.breakpointDetail")	
+	@Block()	
 	public static class BreakpointDetail extends BaseElement implements IResourceBlock {
 	
 	@Child(name="seqid", type=StringDt.class, order=0, min=1, max=1)	
@@ -2694,7 +2697,7 @@ public class GVFVariant extends BaseResource implements IResource {
      * Sequences adjacent to the feature
      * </p> 
 	 */
-	@Block(name="GVFVariant.sequenceContext")	
+	@Block()	
 	public static class SequenceContext extends BaseElement implements IResourceBlock {
 	
 	@Child(name="fivePrime", type=StringDt.class, order=0, min=1, max=1)	
@@ -2827,7 +2830,7 @@ public class GVFVariant extends BaseResource implements IResource {
      * Individual genotypic information
      * </p> 
 	 */
-	@Block(name="GVFVariant.sample")	
+	@Block()	
 	public static class Sample extends BaseElement implements IResourceBlock {
 	
 	@Child(name="phased", type=StringDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GeneExpression.java

@@ -48,6 +48,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
 import ca.uhn.fhir.model.primitive.DecimalDt;
 import ca.uhn.fhir.model.primitive.IntegerDt;
@@ -85,6 +86,7 @@ public class GeneExpression extends BaseResource implements IResource {
 	 * Path: <b>GeneExpression.subject</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="GeneExpression.subject", description="subject being described by the resource")
 	public static final String SP_SUBJECT = "subject";
 
 	/**
@@ -95,6 +97,7 @@ public class GeneExpression extends BaseResource implements IResource {
 	 * Path: <b>GeneExpression.gene.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="gene", path="GeneExpression.gene.identifier", description="Id of the gene")
 	public static final String SP_GENE = "gene";
 
 	/**
@@ -105,6 +108,7 @@ public class GeneExpression extends BaseResource implements IResource {
 	 * Path: <b>GeneExpression.gene.coordinate</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="coordinate", path="GeneExpression.gene.coordinate", description="Coordinate of the gene")
 	public static final String SP_COORDINATE = "coordinate";
 
 
@@ -328,7 +332,7 @@ public class GeneExpression extends BaseResource implements IResource {
      * Gene of study
      * </p> 
 	 */
-	@Block(name="GeneExpression.gene")	
+	@Block()	
 	public static class Gene extends BaseElement implements IResourceBlock {
 	
 	@Child(name="identifier", type=StringDt.class, order=0, min=0, max=1)	
@@ -447,7 +451,7 @@ public class GeneExpression extends BaseResource implements IResource {
      * Coordinate of the gene
      * </p> 
 	 */
-	@Block(name="GeneExpression.gene.coordinate")	
+	@Block()	
 	public static class GeneCoordinate extends BaseElement implements IResourceBlock {
 	
 	@Child(name="chromosome", type=StringDt.class, order=0, min=1, max=1)	
@@ -632,7 +636,7 @@ public class GeneExpression extends BaseResource implements IResource {
      * RNA-Seq that studies the gene
      * </p> 
 	 */
-	@Block(name="GeneExpression.rnaSeq")	
+	@Block()	
 	public static class RnaSeq extends BaseElement implements IResourceBlock {
 	
 	@Child(name="inputLab", order=0, min=0, max=1, type={
@@ -779,6 +783,19 @@ public class GeneExpression extends BaseResource implements IResource {
      * <p>
      * <b>Definition:</b>
      * Expression level of the gene in RPKM
+     * </p> 
+	 */
+	public RnaSeq setExpression( long theValue) {
+		myExpression = new DecimalDt(theValue); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>expression</b> (Expression level of the gene in RPKM)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Expression level of the gene in RPKM
      * </p> 
 	 */
 	public RnaSeq setExpression( double theValue) {
@@ -799,19 +816,6 @@ public class GeneExpression extends BaseResource implements IResource {
 		return this; 
 	}
 
-	/**
-	 * Sets the value for <b>expression</b> (Expression level of the gene in RPKM)
-	 *
-     * <p>
-     * <b>Definition:</b>
-     * Expression level of the gene in RPKM
-     * </p> 
-	 */
-	public RnaSeq setExpression( long theValue) {
-		myExpression = new DecimalDt(theValue); 
-		return this; 
-	}
-
  
 	/**
 	 * Gets the value(s) for <b>isoform</b> (Isoform of the gene).
@@ -884,7 +888,7 @@ public class GeneExpression extends BaseResource implements IResource {
      * Isoform of the gene
      * </p> 
 	 */
-	@Block(name="GeneExpression.rnaSeq.isoform")	
+	@Block()	
 	public static class RnaSeqIsoform extends BaseElement implements IResourceBlock {
 	
 	@Child(name="identity", type=StringDt.class, order=0, min=1, max=1)	
@@ -997,6 +1001,19 @@ public class GeneExpression extends BaseResource implements IResource {
      * <p>
      * <b>Definition:</b>
      * Expression level of the isoform in RPKM
+     * </p> 
+	 */
+	public RnaSeqIsoform setExpression( long theValue) {
+		myExpression = new DecimalDt(theValue); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>expression</b> (Expression level of the isoform in RPKM)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Expression level of the isoform in RPKM
      * </p> 
 	 */
 	public RnaSeqIsoform setExpression( double theValue) {
@@ -1017,19 +1034,6 @@ public class GeneExpression extends BaseResource implements IResource {
 		return this; 
 	}
 
-	/**
-	 * Sets the value for <b>expression</b> (Expression level of the isoform in RPKM)
-	 *
-     * <p>
-     * <b>Definition:</b>
-     * Expression level of the isoform in RPKM
-     * </p> 
-	 */
-	public RnaSeqIsoform setExpression( long theValue) {
-		myExpression = new DecimalDt(theValue); 
-		return this; 
-	}
-
  
 
 	}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GeneticAnalysis.java

@@ -50,6 +50,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodingDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
 import ca.uhn.fhir.model.primitive.DateDt;
@@ -88,6 +89,7 @@ public class GeneticAnalysis extends BaseResource implements IResource {
 	 * Path: <b>GeneticAnalysis.subject</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="GeneticAnalysis.subject", description="Subject of the analysis")
 	public static final String SP_SUBJECT = "subject";
 
 	/**
@@ -98,6 +100,7 @@ public class GeneticAnalysis extends BaseResource implements IResource {
 	 * Path: <b>GeneticAnalysis.author</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="author", path="GeneticAnalysis.author", description="Author of the analysis")
 	public static final String SP_AUTHOR = "author";
 
 	/**
@@ -108,6 +111,7 @@ public class GeneticAnalysis extends BaseResource implements IResource {
 	 * Path: <b>GeneticAnalysis.date</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="date", path="GeneticAnalysis.date", description="Date when result of the analysis is uploaded")
 	public static final String SP_DATE = "date";
 
 
@@ -391,7 +395,7 @@ public class GeneticAnalysis extends BaseResource implements IResource {
      * Summary of the analysis
      * </p> 
 	 */
-	@Block(name="GeneticAnalysis.geneticAnalysisSummary")	
+	@Block()	
 	public static class GeneticAnalysisSummary extends BaseElement implements IResourceBlock {
 	
 	@Child(name="geneticDiseaseAssessed", type=CodingDt.class, order=0, min=0, max=1)	
@@ -752,7 +756,7 @@ public class GeneticAnalysis extends BaseResource implements IResource {
      * Coverage of the genetic test
      * </p> 
 	 */
-	@Block(name="GeneticAnalysis.dnaRegionAnalysisTestCoverage")	
+	@Block()	
 	public static class DnaRegionAnalysisTestCoverage extends BaseElement implements IResourceBlock {
 	
 	@Child(name="dnaRegionOfInterest", order=0, min=0, max=Child.MAX_UNLIMITED)	
@@ -849,7 +853,7 @@ public class GeneticAnalysis extends BaseResource implements IResource {
      * DNA studied
      * </p> 
 	 */
-	@Block(name="GeneticAnalysis.dnaRegionAnalysisTestCoverage.dnaRegionOfInterest")	
+	@Block()	
 	public static class DnaRegionAnalysisTestCoverageDnaRegionOfInterest extends BaseElement implements IResourceBlock {
 	
 	@Child(name="genomicReferenceSequenceIdentifier", type=StringDt.class, order=0, min=0, max=1)	
@@ -1289,7 +1293,7 @@ public class GeneticAnalysis extends BaseResource implements IResource {
      * Genetic analysis discrete result
      * </p> 
 	 */
-	@Block(name="GeneticAnalysis.geneticAnalysisDiscreteResult")	
+	@Block()	
 	public static class GeneticAnalysisDiscreteResult extends BaseElement implements IResourceBlock {
 	
 	@Child(name="dnaAnalysisDiscreteSequenceVariation", type=StringDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Group.java

@@ -49,6 +49,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.QuantityDt;
@@ -94,6 +95,7 @@ public class Group extends BaseResource implements IResource {
 	 * Path: <b>Group.type</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="type", path="Group.type", description="The type of resources the group contains")
 	public static final String SP_TYPE = "type";
 
 	/**
@@ -104,6 +106,7 @@ public class Group extends BaseResource implements IResource {
 	 * Path: <b>Group.code</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="code", path="Group.code", description="The kind of resources contained")
 	public static final String SP_CODE = "code";
 
 	/**
@@ -114,6 +117,7 @@ public class Group extends BaseResource implements IResource {
 	 * Path: <b>Group.actual</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="actual", path="Group.actual", description="")
 	public static final String SP_ACTUAL = "actual";
 
 	/**
@@ -124,6 +128,7 @@ public class Group extends BaseResource implements IResource {
 	 * Path: <b>Group.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="Group.identifier", description="")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -134,6 +139,7 @@ public class Group extends BaseResource implements IResource {
 	 * Path: <b>Group.member</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="member", path="Group.member", description="")
 	public static final String SP_MEMBER = "member";
 
 	/**
@@ -144,6 +150,7 @@ public class Group extends BaseResource implements IResource {
 	 * Path: <b>Group.characteristic.code</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="characteristic", path="Group.characteristic.code", description="")
 	public static final String SP_CHARACTERISTIC = "characteristic";
 
 	/**
@@ -154,6 +161,7 @@ public class Group extends BaseResource implements IResource {
 	 * Path: <b>Group.characteristic.value[x]</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="value", path="Group.characteristic.value[x]", description="")
 	public static final String SP_VALUE = "value";
 
 	/**
@@ -164,6 +172,7 @@ public class Group extends BaseResource implements IResource {
 	 * Path: <b>Group.characteristic.exclude</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="exclude", path="Group.characteristic.exclude", description="")
 	public static final String SP_EXCLUDE = "exclude";
 
 	/**
@@ -174,6 +183,7 @@ public class Group extends BaseResource implements IResource {
 	 * Path: <b>characteristic & value</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="characteristic-value", path="characteristic & value", description="A composite of both characteristic and value")
 	public static final String SP_CHARACTERISTIC_VALUE = "characteristic-value";
 
 
@@ -623,7 +633,7 @@ public class Group extends BaseResource implements IResource {
      * Identifies the traits shared by members of the group
      * </p> 
 	 */
-	@Block(name="Group.characteristic")	
+	@Block()	
 	public static class Characteristic extends BaseElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeableConceptDt.class, order=0, min=1, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ImagingStudy.java

@@ -50,6 +50,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodingDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
@@ -97,6 +98,7 @@ public class ImagingStudy extends BaseResource implements IResource {
 	 * Path: <b>ImagingStudy.subject</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="ImagingStudy.subject", description="Who the study is about")
 	public static final String SP_SUBJECT = "subject";
 
 	/**
@@ -107,6 +109,7 @@ public class ImagingStudy extends BaseResource implements IResource {
 	 * Path: <b>ImagingStudy.dateTime</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="date", path="ImagingStudy.dateTime", description="The date the study was done was taken")
 	public static final String SP_DATE = "date";
 
 	/**
@@ -117,6 +120,7 @@ public class ImagingStudy extends BaseResource implements IResource {
 	 * Path: <b>ImagingStudy.accessionNo</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="accession", path="ImagingStudy.accessionNo", description="The accession id for the image")
 	public static final String SP_ACCESSION = "accession";
 
 	/**
@@ -127,6 +131,7 @@ public class ImagingStudy extends BaseResource implements IResource {
 	 * Path: <b>ImagingStudy.uid</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="study", path="ImagingStudy.uid", description="The study id for the image")
 	public static final String SP_STUDY = "study";
 
 	/**
@@ -137,6 +142,7 @@ public class ImagingStudy extends BaseResource implements IResource {
 	 * Path: <b>ImagingStudy.series.uid</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="series", path="ImagingStudy.series.uid", description="The series id for the image")
 	public static final String SP_SERIES = "series";
 
 	/**
@@ -147,6 +153,7 @@ public class ImagingStudy extends BaseResource implements IResource {
 	 * Path: <b>ImagingStudy.series.modality</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="modality", path="ImagingStudy.series.modality", description="The modality of the image")
 	public static final String SP_MODALITY = "modality";
 
 	/**
@@ -157,6 +164,7 @@ public class ImagingStudy extends BaseResource implements IResource {
 	 * Path: <b></b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="size", path="", description="The size of the image in MB - may include > or < in the value")
 	public static final String SP_SIZE = "size";
 
 	/**
@@ -167,6 +175,7 @@ public class ImagingStudy extends BaseResource implements IResource {
 	 * Path: <b>ImagingStudy.series.bodySite</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="bodysite", path="ImagingStudy.series.bodySite", description="")
 	public static final String SP_BODYSITE = "bodysite";
 
 	/**
@@ -177,6 +186,7 @@ public class ImagingStudy extends BaseResource implements IResource {
 	 * Path: <b>ImagingStudy.series.instance.uid</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="uid", path="ImagingStudy.series.instance.uid", description="")
 	public static final String SP_UID = "uid";
 
 	/**
@@ -187,6 +197,7 @@ public class ImagingStudy extends BaseResource implements IResource {
 	 * Path: <b>ImagingStudy.series.instance.sopclass</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="dicom-class", path="ImagingStudy.series.instance.sopclass", description="")
 	public static final String SP_DICOM_CLASS = "dicom-class";
 
 
@@ -1156,7 +1167,7 @@ public class ImagingStudy extends BaseResource implements IResource {
      * Each study has one or more series of image instances
      * </p> 
 	 */
-	@Block(name="ImagingStudy.series")	
+	@Block()	
 	public static class Series extends BaseElement implements IResourceBlock {
 	
 	@Child(name="number", type=IntegerDt.class, order=0, min=0, max=1)	
@@ -1699,7 +1710,7 @@ public class ImagingStudy extends BaseResource implements IResource {
      * A single image taken from a patient
      * </p> 
 	 */
-	@Block(name="ImagingStudy.series.instance")	
+	@Block()	
 	public static class SeriesInstance extends BaseElement implements IResourceBlock {
 	
 	@Child(name="number", type=IntegerDt.class, order=0, min=0, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Immunization.java

@@ -50,6 +50,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.QuantityDt;
@@ -97,6 +98,7 @@ public class Immunization extends BaseResource implements IResource {
 	 * Path: <b>Immunization.date</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="date", path="Immunization.date", description="Vaccination  Administration / Refusal Date")
 	public static final String SP_DATE = "date";
 
 	/**
@@ -107,6 +109,7 @@ public class Immunization extends BaseResource implements IResource {
 	 * Path: <b>Immunization.vaccinationProtocol.doseSequence</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="dose-sequence", path="Immunization.vaccinationProtocol.doseSequence", description="")
 	public static final String SP_DOSE_SEQUENCE = "dose-sequence";
 
 	/**
@@ -117,6 +120,7 @@ public class Immunization extends BaseResource implements IResource {
 	 * Path: <b>Immunization.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="Immunization.identifier", description="")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -127,6 +131,7 @@ public class Immunization extends BaseResource implements IResource {
 	 * Path: <b>Immunization.location</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="location", path="Immunization.location", description="The service delivery location or facility in which the vaccine was / was to be administered")
 	public static final String SP_LOCATION = "location";
 
 	/**
@@ -137,6 +142,7 @@ public class Immunization extends BaseResource implements IResource {
 	 * Path: <b>Immunization.lotNumber</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="lot-number", path="Immunization.lotNumber", description="Vaccine Lot Number")
 	public static final String SP_LOT_NUMBER = "lot-number";
 
 	/**
@@ -147,6 +153,7 @@ public class Immunization extends BaseResource implements IResource {
 	 * Path: <b>Immunization.manufacturer</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="manufacturer", path="Immunization.manufacturer", description="Vaccine Manufacturer")
 	public static final String SP_MANUFACTURER = "manufacturer";
 
 	/**
@@ -157,6 +164,7 @@ public class Immunization extends BaseResource implements IResource {
 	 * Path: <b>Immunization.performer</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="performer", path="Immunization.performer", description="The practitioner who administered the vaccination")
 	public static final String SP_PERFORMER = "performer";
 
 	/**
@@ -167,6 +175,7 @@ public class Immunization extends BaseResource implements IResource {
 	 * Path: <b>Immunization.reaction.detail</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="reaction", path="Immunization.reaction.detail", description="")
 	public static final String SP_REACTION = "reaction";
 
 	/**
@@ -177,6 +186,7 @@ public class Immunization extends BaseResource implements IResource {
 	 * Path: <b>Immunization.reaction.date</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="reaction-date", path="Immunization.reaction.date", description="")
 	public static final String SP_REACTION_DATE = "reaction-date";
 
 	/**
@@ -187,6 +197,7 @@ public class Immunization extends BaseResource implements IResource {
 	 * Path: <b>Immunization.explanation.reason</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="reason", path="Immunization.explanation.reason", description="")
 	public static final String SP_REASON = "reason";
 
 	/**
@@ -197,6 +208,7 @@ public class Immunization extends BaseResource implements IResource {
 	 * Path: <b>Immunization.explanation.refusalReason</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="refusal-reason", path="Immunization.explanation.refusalReason", description="Explanation of refusal / exemption")
 	public static final String SP_REFUSAL_REASON = "refusal-reason";
 
 	/**
@@ -207,6 +219,7 @@ public class Immunization extends BaseResource implements IResource {
 	 * Path: <b>Immunization.refusedIndicator</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="refused", path="Immunization.refusedIndicator", description="")
 	public static final String SP_REFUSED = "refused";
 
 	/**
@@ -217,6 +230,7 @@ public class Immunization extends BaseResource implements IResource {
 	 * Path: <b>Immunization.requester</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="requester", path="Immunization.requester", description="The practitioner who ordered the vaccination")
 	public static final String SP_REQUESTER = "requester";
 
 	/**
@@ -227,6 +241,7 @@ public class Immunization extends BaseResource implements IResource {
 	 * Path: <b>Immunization.subject</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="Immunization.subject", description="The subject of the vaccination event / refusal")
 	public static final String SP_SUBJECT = "subject";
 
 	/**
@@ -237,6 +252,7 @@ public class Immunization extends BaseResource implements IResource {
 	 * Path: <b>Immunization.vaccineType</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="vaccine-type", path="Immunization.vaccineType", description="Vaccine Product Type Administered")
 	public static final String SP_VACCINE_TYPE = "vaccine-type";
 
 
@@ -1232,7 +1248,7 @@ public class Immunization extends BaseResource implements IResource {
      * Reasons why a vaccine was administered or refused
      * </p> 
 	 */
-	@Block(name="Immunization.explanation")	
+	@Block()	
 	public static class Explanation extends BaseElement implements IResourceBlock {
 	
 	@Child(name="reason", type=CodeableConceptDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)	
@@ -1394,7 +1410,7 @@ public class Immunization extends BaseResource implements IResource {
      * Categorical data indicating that an adverse event is associated in time to an immunization
      * </p> 
 	 */
-	@Block(name="Immunization.reaction")	
+	@Block()	
 	public static class Reaction extends BaseElement implements IResourceBlock {
 	
 	@Child(name="date", type=DateTimeDt.class, order=0, min=0, max=1)	
@@ -1576,7 +1592,7 @@ public class Immunization extends BaseResource implements IResource {
      * Contains information about the protocol(s) under which the vaccine was administered
      * </p> 
 	 */
-	@Block(name="Immunization.vaccinationProtocol")	
+	@Block()	
 	public static class VaccinationProtocol extends BaseElement implements IResourceBlock {
 	
 	@Child(name="doseSequence", type=IntegerDt.class, order=0, min=1, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ImmunizationRecommendation.java

@@ -50,6 +50,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
@@ -93,6 +94,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
 	 * Path: <b>ImmunizationRecommendation.subject</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="ImmunizationRecommendation.subject", description="")
 	public static final String SP_SUBJECT = "subject";
 
 	/**
@@ -103,6 +105,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
 	 * Path: <b>ImmunizationRecommendation.recommendation.vaccineType</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="vaccine-type", path="ImmunizationRecommendation.recommendation.vaccineType", description="")
 	public static final String SP_VACCINE_TYPE = "vaccine-type";
 
 	/**
@@ -113,6 +116,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
 	 * Path: <b>ImmunizationRecommendation.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="ImmunizationRecommendation.identifier", description="")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -123,6 +127,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
 	 * Path: <b>ImmunizationRecommendation.recommendation.date</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="date", path="ImmunizationRecommendation.recommendation.date", description="")
 	public static final String SP_DATE = "date";
 
 	/**
@@ -133,6 +138,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
 	 * Path: <b>ImmunizationRecommendation.recommendation.doseNumber</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="dose-number", path="ImmunizationRecommendation.recommendation.doseNumber", description="")
 	public static final String SP_DOSE_NUMBER = "dose-number";
 
 	/**
@@ -143,6 +149,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
 	 * Path: <b>ImmunizationRecommendation.recommendation.forecastStatus</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="status", path="ImmunizationRecommendation.recommendation.forecastStatus", description="")
 	public static final String SP_STATUS = "status";
 
 	/**
@@ -153,6 +160,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
 	 * Path: <b>ImmunizationRecommendation.recommendation.protocol.doseSequence</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="dose-sequence", path="ImmunizationRecommendation.recommendation.protocol.doseSequence", description="")
 	public static final String SP_DOSE_SEQUENCE = "dose-sequence";
 
 	/**
@@ -163,6 +171,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
 	 * Path: <b>ImmunizationRecommendation.recommendation.supportingImmunization</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="support", path="ImmunizationRecommendation.recommendation.supportingImmunization", description="")
 	public static final String SP_SUPPORT = "support";
 
 	/**
@@ -173,6 +182,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
 	 * Path: <b>ImmunizationRecommendation.recommendation.supportingPatientInformation</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="information", path="ImmunizationRecommendation.recommendation.supportingPatientInformation", description="")
 	public static final String SP_INFORMATION = "information";
 
 
@@ -409,7 +419,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
      * Vaccine administration recommendations
      * </p> 
 	 */
-	@Block(name="ImmunizationRecommendation.recommendation")	
+	@Block()	
 	public static class Recommendation extends BaseElement implements IResourceBlock {
 	
 	@Child(name="date", type=DateTimeDt.class, order=0, min=1, max=1)	
@@ -849,7 +859,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
      * Vaccine date recommendations - e.g. earliest date to administer, latest date to administer, etc.
      * </p> 
 	 */
-	@Block(name="ImmunizationRecommendation.recommendation.dateCriterion")	
+	@Block()	
 	public static class RecommendationDateCriterion extends BaseElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeableConceptDt.class, order=0, min=1, max=1)	
@@ -995,7 +1005,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
      * Contains information about the protocol under which the vaccine was administered
      * </p> 
 	 */
-	@Block(name="ImmunizationRecommendation.recommendation.protocol")	
+	@Block()	
 	public static class RecommendationProtocol extends BaseElement implements IResourceBlock {
 	
 	@Child(name="doseSequence", type=IntegerDt.class, order=0, min=0, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ListResource.java

@@ -50,6 +50,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
@@ -92,6 +93,7 @@ public class ListResource extends BaseResource implements IResource {
 	 * Path: <b>List.source</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="source", path="List.source", description="")
 	public static final String SP_SOURCE = "source";
 
 	/**
@@ -102,6 +104,7 @@ public class ListResource extends BaseResource implements IResource {
 	 * Path: <b>List.entry.item</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="item", path="List.entry.item", description="")
 	public static final String SP_ITEM = "item";
 
 	/**
@@ -112,6 +115,7 @@ public class ListResource extends BaseResource implements IResource {
 	 * Path: <b>List.emptyReason</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="empty-reason", path="List.emptyReason", description="")
 	public static final String SP_EMPTY_REASON = "empty-reason";
 
 	/**
@@ -122,6 +126,7 @@ public class ListResource extends BaseResource implements IResource {
 	 * Path: <b>List.date</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="date", path="List.date", description="")
 	public static final String SP_DATE = "date";
 
 	/**
@@ -132,6 +137,7 @@ public class ListResource extends BaseResource implements IResource {
 	 * Path: <b>List.code</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="code", path="List.code", description="")
 	public static final String SP_CODE = "code";
 
 	/**
@@ -142,6 +148,7 @@ public class ListResource extends BaseResource implements IResource {
 	 * Path: <b>List.subject</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="List.subject", description="")
 	public static final String SP_SUBJECT = "subject";
 
 
@@ -653,7 +660,7 @@ public class ListResource extends BaseResource implements IResource {
      * Entries in this list
      * </p> 
 	 */
-	@Block(name="List.entry")	
+	@Block()	
 	public static class Entry extends BaseElement implements IResourceBlock {
 	
 	@Child(name="flag", type=CodeableConceptDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Location.java

@@ -48,6 +48,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.AddressDt;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.ContactDt;
@@ -95,6 +96,7 @@ public class Location extends BaseResource implements IResource {
 	 * Path: <b>Location.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="Location.identifier", description="")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -105,6 +107,7 @@ public class Location extends BaseResource implements IResource {
 	 * Path: <b>Location.name</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="name", path="Location.name", description="A (portion of the) name of the location")
 	public static final String SP_NAME = "name";
 
 	/**
@@ -115,6 +118,7 @@ public class Location extends BaseResource implements IResource {
 	 * Path: <b>Location.type</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="type", path="Location.type", description="A code for the type of location")
 	public static final String SP_TYPE = "type";
 
 	/**
@@ -125,6 +129,7 @@ public class Location extends BaseResource implements IResource {
 	 * Path: <b>Location.address</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="address", path="Location.address", description="A (part of the) address of the location")
 	public static final String SP_ADDRESS = "address";
 
 	/**
@@ -135,6 +140,7 @@ public class Location extends BaseResource implements IResource {
 	 * Path: <b>Location.status</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="status", path="Location.status", description="Searches for locations with a specific kind of status")
 	public static final String SP_STATUS = "status";
 
 	/**
@@ -145,6 +151,7 @@ public class Location extends BaseResource implements IResource {
 	 * Path: <b>Location.partOf</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="partof", path="Location.partOf", description="The location of which this location is a part")
 	public static final String SP_PARTOF = "partof";
 
 	/**
@@ -155,6 +162,7 @@ public class Location extends BaseResource implements IResource {
 	 * Path: <b></b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="near", path="", description="The coordinates expressed as [lat],[long] (using KML, see notes) to find locations near to (servers may search using a square rather than a circle for efficiency)")
 	public static final String SP_NEAR = "near";
 
 	/**
@@ -165,6 +173,7 @@ public class Location extends BaseResource implements IResource {
 	 * Path: <b></b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="near-distance", path="", description="A distance quantity to limit the near search to locations within a specific distance")
 	public static final String SP_NEAR_DISTANCE = "near-distance";
 
 
@@ -770,7 +779,7 @@ public class Location extends BaseResource implements IResource {
      * The absolute geographic location of the Location, expressed in a KML compatible manner (see notes below for KML)
      * </p> 
 	 */
-	@Block(name="Location.position")	
+	@Block()	
 	public static class Position extends BaseElement implements IResourceBlock {
 	
 	@Child(name="longitude", type=DecimalDt.class, order=0, min=1, max=1)	
@@ -846,6 +855,19 @@ public class Location extends BaseResource implements IResource {
      * <p>
      * <b>Definition:</b>
      * Longitude. The value domain and the interpretation are the same as for the text of the longitude element in KML (see notes below)
+     * </p> 
+	 */
+	public Position setLongitude( long theValue) {
+		myLongitude = new DecimalDt(theValue); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>longitude</b> (Longitude as expressed in KML)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Longitude. The value domain and the interpretation are the same as for the text of the longitude element in KML (see notes below)
      * </p> 
 	 */
 	public Position setLongitude( double theValue) {
@@ -866,19 +888,6 @@ public class Location extends BaseResource implements IResource {
 		return this; 
 	}
 
-	/**
-	 * Sets the value for <b>longitude</b> (Longitude as expressed in KML)
-	 *
-     * <p>
-     * <b>Definition:</b>
-     * Longitude. The value domain and the interpretation are the same as for the text of the longitude element in KML (see notes below)
-     * </p> 
-	 */
-	public Position setLongitude( long theValue) {
-		myLongitude = new DecimalDt(theValue); 
-		return this; 
-	}
-
  
 	/**
 	 * Gets the value(s) for <b>latitude</b> (Latitude as expressed in KML).
@@ -916,6 +925,19 @@ public class Location extends BaseResource implements IResource {
      * <p>
      * <b>Definition:</b>
      * Latitude. The value domain and the interpretation are the same as for the text of the latitude element in KML (see notes below)
+     * </p> 
+	 */
+	public Position setLatitude( long theValue) {
+		myLatitude = new DecimalDt(theValue); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>latitude</b> (Latitude as expressed in KML)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Latitude. The value domain and the interpretation are the same as for the text of the latitude element in KML (see notes below)
      * </p> 
 	 */
 	public Position setLatitude( double theValue) {
@@ -936,19 +958,6 @@ public class Location extends BaseResource implements IResource {
 		return this; 
 	}
 
-	/**
-	 * Sets the value for <b>latitude</b> (Latitude as expressed in KML)
-	 *
-     * <p>
-     * <b>Definition:</b>
-     * Latitude. The value domain and the interpretation are the same as for the text of the latitude element in KML (see notes below)
-     * </p> 
-	 */
-	public Position setLatitude( long theValue) {
-		myLatitude = new DecimalDt(theValue); 
-		return this; 
-	}
-
  
 	/**
 	 * Gets the value(s) for <b>altitude</b> (Altitude as expressed in KML).
@@ -986,6 +995,19 @@ public class Location extends BaseResource implements IResource {
      * <p>
      * <b>Definition:</b>
      * Altitude. The value domain and the interpretation are the same as for the text of the altitude element in KML (see notes below)
+     * </p> 
+	 */
+	public Position setAltitude( long theValue) {
+		myAltitude = new DecimalDt(theValue); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>altitude</b> (Altitude as expressed in KML)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Altitude. The value domain and the interpretation are the same as for the text of the altitude element in KML (see notes below)
      * </p> 
 	 */
 	public Position setAltitude( double theValue) {
@@ -1006,19 +1028,6 @@ public class Location extends BaseResource implements IResource {
 		return this; 
 	}
 
-	/**
-	 * Sets the value for <b>altitude</b> (Altitude as expressed in KML)
-	 *
-     * <p>
-     * <b>Definition:</b>
-     * Altitude. The value domain and the interpretation are the same as for the text of the altitude element in KML (see notes below)
-     * </p> 
-	 */
-	public Position setAltitude( long theValue) {
-		myAltitude = new DecimalDt(theValue); 
-		return this; 
-	}
-
  
 
 	}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Media.java

@@ -47,6 +47,7 @@ import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
@@ -91,6 +92,7 @@ public class Media extends BaseResource implements IResource {
 	 * Path: <b>Media.type</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="type", path="Media.type", description="")
 	public static final String SP_TYPE = "type";
 
 	/**
@@ -101,6 +103,7 @@ public class Media extends BaseResource implements IResource {
 	 * Path: <b>Media.subtype</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subtype", path="Media.subtype", description="")
 	public static final String SP_SUBTYPE = "subtype";
 
 	/**
@@ -111,6 +114,7 @@ public class Media extends BaseResource implements IResource {
 	 * Path: <b>Media.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="Media.identifier", description="")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -121,6 +125,7 @@ public class Media extends BaseResource implements IResource {
 	 * Path: <b>Media.dateTime</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="date", path="Media.dateTime", description="")
 	public static final String SP_DATE = "date";
 
 	/**
@@ -131,6 +136,7 @@ public class Media extends BaseResource implements IResource {
 	 * Path: <b>Media.subject</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="Media.subject", description="")
 	public static final String SP_SUBJECT = "subject";
 
 	/**
@@ -141,6 +147,7 @@ public class Media extends BaseResource implements IResource {
 	 * Path: <b>Media.operator</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="operator", path="Media.operator", description="")
 	public static final String SP_OPERATOR = "operator";
 
 	/**
@@ -151,6 +158,7 @@ public class Media extends BaseResource implements IResource {
 	 * Path: <b>Media.view</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="view", path="Media.view", description="")
 	public static final String SP_VIEW = "view";
 
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Medication.java

@@ -48,6 +48,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.RatioDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
@@ -89,6 +90,7 @@ public class Medication extends BaseResource implements IResource {
 	 * Path: <b>Medication.code</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="code", path="Medication.code", description="")
 	public static final String SP_CODE = "code";
 
 	/**
@@ -99,6 +101,7 @@ public class Medication extends BaseResource implements IResource {
 	 * Path: <b>Medication.name</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="name", path="Medication.name", description="")
 	public static final String SP_NAME = "name";
 
 	/**
@@ -109,6 +112,7 @@ public class Medication extends BaseResource implements IResource {
 	 * Path: <b>Medication.manufacturer</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="manufacturer", path="Medication.manufacturer", description="")
 	public static final String SP_MANUFACTURER = "manufacturer";
 
 	/**
@@ -119,6 +123,7 @@ public class Medication extends BaseResource implements IResource {
 	 * Path: <b>Medication.product.form</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="form", path="Medication.product.form", description="")
 	public static final String SP_FORM = "form";
 
 	/**
@@ -129,6 +134,7 @@ public class Medication extends BaseResource implements IResource {
 	 * Path: <b>Medication.product.ingredient.item</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="ingredient", path="Medication.product.ingredient.item", description="")
 	public static final String SP_INGREDIENT = "ingredient";
 
 	/**
@@ -139,6 +145,7 @@ public class Medication extends BaseResource implements IResource {
 	 * Path: <b>Medication.package.container</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="container", path="Medication.package.container", description="")
 	public static final String SP_CONTAINER = "container";
 
 	/**
@@ -149,6 +156,7 @@ public class Medication extends BaseResource implements IResource {
 	 * Path: <b>Medication.package.content.item</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="content", path="Medication.package.content.item", description="")
 	public static final String SP_CONTENT = "content";
 
 
@@ -495,7 +503,7 @@ public class Medication extends BaseResource implements IResource {
      * Information that only applies to products (not packages)
      * </p> 
 	 */
-	@Block(name="Medication.product")	
+	@Block()	
 	public static class Product extends BaseElement implements IResourceBlock {
 	
 	@Child(name="form", type=CodeableConceptDt.class, order=0, min=0, max=1)	
@@ -630,7 +638,7 @@ public class Medication extends BaseResource implements IResource {
      * Identifies a particular constituent of interest in the product
      * </p> 
 	 */
-	@Block(name="Medication.product.ingredient")	
+	@Block()	
 	public static class ProductIngredient extends BaseElement implements IResourceBlock {
 	
 	@Child(name="item", order=0, min=1, max=1, type={

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationAdministration.java

@@ -49,6 +49,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.PeriodDt;
@@ -95,6 +96,7 @@ public class MedicationAdministration extends BaseResource implements IResource
 	 * Path: <b>MedicationAdministration.device</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="device", path="MedicationAdministration.device", description="Return administrations with this administration device identity")
 	public static final String SP_DEVICE = "device";
 
 	/**
@@ -105,6 +107,7 @@ public class MedicationAdministration extends BaseResource implements IResource
 	 * Path: <b>MedicationAdministration.encounter</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="encounter", path="MedicationAdministration.encounter", description="Return administrations that share this encounter")
 	public static final String SP_ENCOUNTER = "encounter";
 
 	/**
@@ -115,6 +118,7 @@ public class MedicationAdministration extends BaseResource implements IResource
 	 * Path: <b>MedicationAdministration.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="MedicationAdministration.identifier", description="Return administrations with this external identity")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -125,6 +129,7 @@ public class MedicationAdministration extends BaseResource implements IResource
 	 * Path: <b>MedicationAdministration.medication</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="medication", path="MedicationAdministration.medication", description="Return administrations of this medication")
 	public static final String SP_MEDICATION = "medication";
 
 	/**
@@ -135,6 +140,7 @@ public class MedicationAdministration extends BaseResource implements IResource
 	 * Path: <b>MedicationAdministration.wasNotGiven</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="notgiven", path="MedicationAdministration.wasNotGiven", description="Administrations that were not made")
 	public static final String SP_NOTGIVEN = "notgiven";
 
 	/**
@@ -145,6 +151,7 @@ public class MedicationAdministration extends BaseResource implements IResource
 	 * Path: <b>MedicationAdministration.patient</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="patient", path="MedicationAdministration.patient", description="The identity of a patient to list administrations  for")
 	public static final String SP_PATIENT = "patient";
 
 	/**
@@ -155,6 +162,7 @@ public class MedicationAdministration extends BaseResource implements IResource
 	 * Path: <b>MedicationAdministration.prescription</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="prescription", path="MedicationAdministration.prescription", description="The identity of a prescription to list administrations from")
 	public static final String SP_PRESCRIPTION = "prescription";
 
 	/**
@@ -165,6 +173,7 @@ public class MedicationAdministration extends BaseResource implements IResource
 	 * Path: <b>MedicationAdministration.status</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="status", path="MedicationAdministration.status", description="MedicationAdministration event status (for example one of active/paused/completed/nullified)")
 	public static final String SP_STATUS = "status";
 
 	/**
@@ -175,6 +184,7 @@ public class MedicationAdministration extends BaseResource implements IResource
 	 * Path: <b>MedicationAdministration.whenGiven</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="whengiven", path="MedicationAdministration.whenGiven", description="Date of administration")
 	public static final String SP_WHENGIVEN = "whengiven";
 
 
@@ -826,7 +836,7 @@ public class MedicationAdministration extends BaseResource implements IResource
      * Provides details of how much of the medication was administered
      * </p> 
 	 */
-	@Block(name="MedicationAdministration.dosage")	
+	@Block()	
 	public static class Dosage extends BaseElement implements IResourceBlock {
 	
 	@Child(name="timing", order=0, min=0, max=1, type={

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationDispense.java

@@ -51,6 +51,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.PeriodDt;
@@ -98,6 +99,7 @@ public class MedicationDispense extends BaseResource implements IResource {
 	 * Path: <b>MedicationDispense.dispense.destination</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="destination", path="MedicationDispense.dispense.destination", description="Return dispenses that should be sent to a secific destination")
 	public static final String SP_DESTINATION = "destination";
 
 	/**
@@ -108,6 +110,7 @@ public class MedicationDispense extends BaseResource implements IResource {
 	 * Path: <b>MedicationDispense.dispenser</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="dispenser", path="MedicationDispense.dispenser", description="Return all dispenses performed by a specific indiividual")
 	public static final String SP_DISPENSER = "dispenser";
 
 	/**
@@ -118,6 +121,7 @@ public class MedicationDispense extends BaseResource implements IResource {
 	 * Path: <b>MedicationDispense.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="MedicationDispense.identifier", description="Return dispenses with this external identity")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -128,6 +132,7 @@ public class MedicationDispense extends BaseResource implements IResource {
 	 * Path: <b>MedicationDispense.dispense.medication</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="medication", path="MedicationDispense.dispense.medication", description="Returns dispenses of this medicine")
 	public static final String SP_MEDICATION = "medication";
 
 	/**
@@ -138,6 +143,7 @@ public class MedicationDispense extends BaseResource implements IResource {
 	 * Path: <b>MedicationDispense.patient</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="patient", path="MedicationDispense.patient", description="The identity of a patient to list dispenses  for")
 	public static final String SP_PATIENT = "patient";
 
 	/**
@@ -148,6 +154,7 @@ public class MedicationDispense extends BaseResource implements IResource {
 	 * Path: <b>MedicationDispense.authorizingPrescription</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="prescription", path="MedicationDispense.authorizingPrescription", description="The identity of a prescription to list dispenses from")
 	public static final String SP_PRESCRIPTION = "prescription";
 
 	/**
@@ -158,6 +165,7 @@ public class MedicationDispense extends BaseResource implements IResource {
 	 * Path: <b>MedicationDispense.substitution.responsibleParty</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="responsibleparty", path="MedicationDispense.substitution.responsibleParty", description="Return all dispenses with the specified responsible party")
 	public static final String SP_RESPONSIBLEPARTY = "responsibleparty";
 
 	/**
@@ -168,6 +176,7 @@ public class MedicationDispense extends BaseResource implements IResource {
 	 * Path: <b>MedicationDispense.dispense.status</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="status", path="MedicationDispense.dispense.status", description="Status of the dispense")
 	public static final String SP_STATUS = "status";
 
 	/**
@@ -178,6 +187,7 @@ public class MedicationDispense extends BaseResource implements IResource {
 	 * Path: <b>MedicationDispense.dispense.type</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="type", path="MedicationDispense.dispense.type", description="Return all dispenses of a specific type")
 	public static final String SP_TYPE = "type";
 
 	/**
@@ -188,6 +198,7 @@ public class MedicationDispense extends BaseResource implements IResource {
 	 * Path: <b>MedicationDispense.dispense.whenHandedOver</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="whenhandedover", path="MedicationDispense.dispense.whenHandedOver", description="Date when medication handed over to patient (outpatient setting), or supplied to ward or clinic (inpatient setting)")
 	public static final String SP_WHENHANDEDOVER = "whenhandedover";
 
 	/**
@@ -198,6 +209,7 @@ public class MedicationDispense extends BaseResource implements IResource {
 	 * Path: <b>MedicationDispense.dispense.whenPrepared</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="whenprepared", path="MedicationDispense.dispense.whenPrepared", description="Date when medication prepared")
 	public static final String SP_WHENPREPARED = "whenprepared";
 
 
@@ -575,7 +587,7 @@ public class MedicationDispense extends BaseResource implements IResource {
      * Indicates the details of the dispense event such as the days supply and quantity of medication dispensed.
      * </p> 
 	 */
-	@Block(name="MedicationDispense.dispense")	
+	@Block()	
 	public static class Dispense extends BaseElement implements IResourceBlock {
 	
 	@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=1)	
@@ -1170,7 +1182,7 @@ public class MedicationDispense extends BaseResource implements IResource {
      * Indicates how the medication is to be used by the patient
      * </p> 
 	 */
-	@Block(name="MedicationDispense.dispense.dosage")	
+	@Block()	
 	public static class DispenseDosage extends BaseElement implements IResourceBlock {
 	
 	@Child(name="additionalInstructions", type=CodeableConceptDt.class, order=0, min=0, max=1)	
@@ -1592,7 +1604,7 @@ public class MedicationDispense extends BaseResource implements IResource {
      * Indicates whether or not substitution was made as part of the dispense.  In some cases substitution will be expected but doesn't happen, in other cases substitution is not expected but does happen.  This block explains what substitition did or did not happen and why.
      * </p> 
 	 */
-	@Block(name="MedicationDispense.substitution")	
+	@Block()	
 	public static class Substitution extends BaseElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeableConceptDt.class, order=0, min=1, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationPrescription.java

@@ -51,6 +51,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.DurationDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
@@ -101,6 +102,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
 	 * Path: <b>MedicationPrescription.dateWritten</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="datewritten", path="MedicationPrescription.dateWritten", description="Return prescriptions written on this date")
 	public static final String SP_DATEWRITTEN = "datewritten";
 
 	/**
@@ -111,6 +113,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
 	 * Path: <b>MedicationPrescription.encounter</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="encounter", path="MedicationPrescription.encounter", description="Return prescriptions with this encounter identity")
 	public static final String SP_ENCOUNTER = "encounter";
 
 	/**
@@ -121,6 +124,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
 	 * Path: <b>MedicationPrescription.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="MedicationPrescription.identifier", description="Return prescriptions with this external identity")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -131,6 +135,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
 	 * Path: <b>MedicationPrescription.medication</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="medication", path="MedicationPrescription.medication", description="Code for medicine or text in medicine name")
 	public static final String SP_MEDICATION = "medication";
 
 	/**
@@ -141,6 +146,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
 	 * Path: <b>MedicationPrescription.patient</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="patient", path="MedicationPrescription.patient", description="The identity of a patient to list dispenses  for")
 	public static final String SP_PATIENT = "patient";
 
 	/**
@@ -151,6 +157,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
 	 * Path: <b>MedicationPrescription.status</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="status", path="MedicationPrescription.status", description="Status of the prescription")
 	public static final String SP_STATUS = "status";
 
 
@@ -731,7 +738,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
      * Indicates how the medication is to be used by the patient
      * </p> 
 	 */
-	@Block(name="MedicationPrescription.dosageInstruction")	
+	@Block()	
 	public static class DosageInstruction extends BaseElement implements IResourceBlock {
 	
 	@Child(name="text", type=StringDt.class, order=0, min=0, max=1)	
@@ -1203,7 +1210,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
      * Deals with details of the dispense part of the order
      * </p> 
 	 */
-	@Block(name="MedicationPrescription.dispense")	
+	@Block()	
 	public static class Dispense extends BaseElement implements IResourceBlock {
 	
 	@Child(name="medication", order=0, min=0, max=1, type={
@@ -1490,7 +1497,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
      * Indicates whether or not substitution can or should be part of the dispense. In some cases substitution must happen, in other cases substitution must not happen, and in others it does not matter. This block explains the prescriber's intent. If nothing is specified substitution may be done.
      * </p> 
 	 */
-	@Block(name="MedicationPrescription.substitution")	
+	@Block()	
 	public static class Substitution extends BaseElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeableConceptDt.class, order=0, min=1, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationStatement.java

@@ -49,6 +49,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.PeriodDt;
@@ -92,6 +93,7 @@ public class MedicationStatement extends BaseResource implements IResource {
 	 * Path: <b>MedicationStatement.device</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="device", path="MedicationStatement.device", description="Return administrations with this administration device identity")
 	public static final String SP_DEVICE = "device";
 
 	/**
@@ -102,6 +104,7 @@ public class MedicationStatement extends BaseResource implements IResource {
 	 * Path: <b>MedicationStatement.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="MedicationStatement.identifier", description="Return administrations with this external identity")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -112,6 +115,7 @@ public class MedicationStatement extends BaseResource implements IResource {
 	 * Path: <b>MedicationStatement.medication</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="medication", path="MedicationStatement.medication", description="Code for medicine or text in medicine name")
 	public static final String SP_MEDICATION = "medication";
 
 	/**
@@ -122,6 +126,7 @@ public class MedicationStatement extends BaseResource implements IResource {
 	 * Path: <b>MedicationStatement.patient</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="patient", path="MedicationStatement.patient", description="The identity of a patient to list administrations  for")
 	public static final String SP_PATIENT = "patient";
 
 	/**
@@ -132,6 +137,7 @@ public class MedicationStatement extends BaseResource implements IResource {
 	 * Path: <b>MedicationStatement.whenGiven</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="when-given", path="MedicationStatement.whenGiven", description="Date of administration")
 	public static final String SP_WHEN_GIVEN = "when-given";
 
 
@@ -615,7 +621,7 @@ public class MedicationStatement extends BaseResource implements IResource {
      * Indicates how the medication is/was used by the patient
      * </p> 
 	 */
-	@Block(name="MedicationStatement.dosage")	
+	@Block()	
 	public static class Dosage extends BaseElement implements IResourceBlock {
 	
 	@Child(name="timing", type=ScheduleDt.class, order=0, min=0, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MessageHeader.java

@@ -274,8 +274,8 @@ public class MessageHeader extends BaseResource implements IResource {
      * The time that the message was sent
      * </p> 
 	 */
-	public MessageHeader setTimestampWithMillisPrecision( Date theDate) {
+	public MessageHeader setTimestamp( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myTimestamp = new InstantDt(theDate); 
+		myTimestamp = new InstantDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -287,8 +287,8 @@ public class MessageHeader extends BaseResource implements IResource {
      * The time that the message was sent
      * </p> 
 	 */
-	public MessageHeader setTimestamp( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public MessageHeader setTimestampWithMillisPrecision( Date theDate) {
-		myTimestamp = new InstantDt(theDate, thePrecision); 
+		myTimestamp = new InstantDt(theDate); 
 		return this; 
 	}
 
@@ -647,7 +647,7 @@ public class MessageHeader extends BaseResource implements IResource {
      * Information about the message that this message is a response to.  Only present if this message is a response.
      * </p> 
 	 */
-	@Block(name="MessageHeader.response")	
+	@Block()	
 	public static class Response extends BaseElement implements IResourceBlock {
 	
 	@Child(name="identifier", type=IdDt.class, order=0, min=1, max=1)	
@@ -819,7 +819,7 @@ public class MessageHeader extends BaseResource implements IResource {
      * The source application from which this message originated
      * </p> 
 	 */
-	@Block(name="MessageHeader.source")	
+	@Block()	
 	public static class Source extends BaseElement implements IResourceBlock {
 	
 	@Child(name="name", type=StringDt.class, order=0, min=0, max=1)	
@@ -1092,7 +1092,7 @@ public class MessageHeader extends BaseResource implements IResource {
      * The destination application which the message is intended for
      * </p> 
 	 */
-	@Block(name="MessageHeader.destination")	
+	@Block()	
 	public static class Destination extends BaseElement implements IResourceBlock {
 	
 	@Child(name="name", type=StringDt.class, order=0, min=0, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Microarray.java

@@ -50,6 +50,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
 import ca.uhn.fhir.model.primitive.BooleanDt;
@@ -90,6 +91,7 @@ public class Microarray extends BaseResource implements IResource {
 	 * Path: <b>Microarray.subject.patient</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="patient", path="Microarray.subject.patient", description="Patient described by the microarray")
 	public static final String SP_PATIENT = "patient";
 
 	/**
@@ -100,6 +102,7 @@ public class Microarray extends BaseResource implements IResource {
 	 * Path: <b>Microarray.sample.gene.identity</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="gene", path="Microarray.sample.gene.identity", description="Gene studied in the microarray")
 	public static final String SP_GENE = "gene";
 
 	/**
@@ -110,6 +113,7 @@ public class Microarray extends BaseResource implements IResource {
 	 * Path: <b>Microarray.sample.gene.coordinate</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="coordinate", path="Microarray.sample.gene.coordinate", description="Coordinate of the gene")
 	public static final String SP_COORDINATE = "coordinate";
 
 
@@ -412,7 +416,7 @@ public class Microarray extends BaseResource implements IResource {
      * Subject of the microarray
      * </p> 
 	 */
-	@Block(name="Microarray.subject")	
+	@Block()	
 	public static class Subject extends BaseElement implements IResourceBlock {
 	
 	@Child(name="patient", order=0, min=0, max=1, type={
@@ -567,7 +571,7 @@ public class Microarray extends BaseResource implements IResource {
      * Scanner used in the microarray
      * </p> 
 	 */
-	@Block(name="Microarray.scanner")	
+	@Block()	
 	public static class Scanner extends BaseElement implements IResourceBlock {
 	
 	@Child(name="manufacturer", order=0, min=0, max=1, type={
@@ -739,7 +743,7 @@ public class Microarray extends BaseResource implements IResource {
      * Sample of a grid on the chip
      * </p> 
 	 */
-	@Block(name="Microarray.sample")	
+	@Block()	
 	public static class Sample extends BaseElement implements IResourceBlock {
 	
 	@Child(name="identity", type=StringDt.class, order=0, min=1, max=1)	
@@ -973,6 +977,19 @@ public class Microarray extends BaseResource implements IResource {
      * <p>
      * <b>Definition:</b>
      * Intensity(expression) of the gene
+     * </p> 
+	 */
+	public Sample setIntensity( long theValue) {
+		myIntensity = new DecimalDt(theValue); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>intensity</b> (Intensity)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Intensity(expression) of the gene
      * </p> 
 	 */
 	public Sample setIntensity( double theValue) {
@@ -993,19 +1010,6 @@ public class Microarray extends BaseResource implements IResource {
 		return this; 
 	}
 
-	/**
-	 * Sets the value for <b>intensity</b> (Intensity)
-	 *
-     * <p>
-     * <b>Definition:</b>
-     * Intensity(expression) of the gene
-     * </p> 
-	 */
-	public Sample setIntensity( long theValue) {
-		myIntensity = new DecimalDt(theValue); 
-		return this; 
-	}
-
  
 	/**
 	 * Gets the value(s) for <b>isControl</b> (Control).
@@ -1062,7 +1066,7 @@ public class Microarray extends BaseResource implements IResource {
      * Specimen used on the grid
      * </p> 
 	 */
-	@Block(name="Microarray.sample.specimen")	
+	@Block()	
 	public static class SampleSpecimen extends BaseElement implements IResourceBlock {
 	
 	@Child(name="type", type=StringDt.class, order=0, min=1, max=1)	
@@ -1182,7 +1186,7 @@ public class Microarray extends BaseResource implements IResource {
      * Gene of study
      * </p> 
 	 */
-	@Block(name="Microarray.sample.gene")	
+	@Block()	
 	public static class SampleGene extends BaseElement implements IResourceBlock {
 	
 	@Child(name="identity", type=StringDt.class, order=0, min=0, max=1)	
@@ -1301,7 +1305,7 @@ public class Microarray extends BaseResource implements IResource {
      * Coordinate of the gene
      * </p> 
 	 */
-	@Block(name="Microarray.sample.gene.coordinate")	
+	@Block()	
 	public static class SampleGeneCoordinate extends BaseElement implements IResourceBlock {
 	
 	@Child(name="chromosome", type=StringDt.class, order=0, min=1, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Observation.java

@@ -51,6 +51,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
@@ -105,6 +106,7 @@ public class Observation extends BaseResource implements IResource {
 	 * Path: <b>Observation.name</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="name", path="Observation.name", description="The name of the observation type")
 	public static final String SP_NAME = "name";
 
 	/**
@@ -115,6 +117,7 @@ public class Observation extends BaseResource implements IResource {
 	 * Path: <b>Observation.value[x]</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="value-quantity", path="Observation.value[x]", description="The value of the observation, if the value is a Quantity, or a SampledData (just search on the bounds of the values in sampled data)")
 	public static final String SP_VALUE_QUANTITY = "value-quantity";
 
 	/**
@@ -125,6 +128,7 @@ public class Observation extends BaseResource implements IResource {
 	 * Path: <b>Observation.value[x]</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="value-concept", path="Observation.value[x]", description="The value of the observation, if the value is a CodeableConcept")
 	public static final String SP_VALUE_CONCEPT = "value-concept";
 
 	/**
@@ -135,6 +139,7 @@ public class Observation extends BaseResource implements IResource {
 	 * Path: <b>Observation.value[x]</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="value-date", path="Observation.value[x]", description="The value of the observation, if the value is a Period")
 	public static final String SP_VALUE_DATE = "value-date";
 
 	/**
@@ -145,6 +150,7 @@ public class Observation extends BaseResource implements IResource {
 	 * Path: <b>Observation.value[x]</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="value-string", path="Observation.value[x]", description="The value of the observation, if the value is a string, and also searches in CodeableConcept.text")
 	public static final String SP_VALUE_STRING = "value-string";
 
 	/**
@@ -155,6 +161,7 @@ public class Observation extends BaseResource implements IResource {
 	 * Path: <b>name & value-[x]</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="name-value-[x]", path="name & value-[x]", description="Both name and one of the value parameters")
 	public static final String SP_NAME_VALUE_X = "name-value-[x]";
 
 	/**
@@ -165,6 +172,7 @@ public class Observation extends BaseResource implements IResource {
 	 * Path: <b>Observation.applies[x]</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="date", path="Observation.applies[x]", description="Obtained date/time. If the obtained element is a period, a date that falls in the period")
 	public static final String SP_DATE = "date";
 
 	/**
@@ -175,6 +183,7 @@ public class Observation extends BaseResource implements IResource {
 	 * Path: <b>Observation.status</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="status", path="Observation.status", description="The status of the observation")
 	public static final String SP_STATUS = "status";
 
 	/**
@@ -185,6 +194,7 @@ public class Observation extends BaseResource implements IResource {
 	 * Path: <b>Observation.reliability</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="reliability", path="Observation.reliability", description="The reliability of the observation")
 	public static final String SP_RELIABILITY = "reliability";
 
 	/**
@@ -195,6 +205,7 @@ public class Observation extends BaseResource implements IResource {
 	 * Path: <b>Observation.subject</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="Observation.subject", description="The subject that the observation is about")
 	public static final String SP_SUBJECT = "subject";
 
 	/**
@@ -205,6 +216,7 @@ public class Observation extends BaseResource implements IResource {
 	 * Path: <b>Observation.performer</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="performer", path="Observation.performer", description="Who and/or what performed the observation")
 	public static final String SP_PERFORMER = "performer";
 
 	/**
@@ -215,6 +227,7 @@ public class Observation extends BaseResource implements IResource {
 	 * Path: <b>Observation.specimen</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="specimen", path="Observation.specimen", description="")
 	public static final String SP_SPECIMEN = "specimen";
 
 	/**
@@ -225,6 +238,7 @@ public class Observation extends BaseResource implements IResource {
 	 * Path: <b>Observation.related.type</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="related-type", path="Observation.related.type", description="")
 	public static final String SP_RELATED_TYPE = "related-type";
 
 	/**
@@ -235,6 +249,7 @@ public class Observation extends BaseResource implements IResource {
 	 * Path: <b>Observation.related.target</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="related-target", path="Observation.related.target", description="")
 	public static final String SP_RELATED_TARGET = "related-target";
 
 	/**
@@ -245,6 +260,7 @@ public class Observation extends BaseResource implements IResource {
 	 * Path: <b>related-target & related-type</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="related", path="related-target & related-type", description="Related Observations - search on related-type and related-target together")
 	public static final String SP_RELATED = "related";
 
 
@@ -594,8 +610,8 @@ public class Observation extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Observation setIssuedWithMillisPrecision( Date theDate) {
+	public Observation setIssued( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myIssued = new InstantDt(theDate); 
+		myIssued = new InstantDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -607,8 +623,8 @@ public class Observation extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Observation setIssued( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public Observation setIssuedWithMillisPrecision( Date theDate) {
-		myIssued = new InstantDt(theDate, thePrecision); 
+		myIssued = new InstantDt(theDate); 
 		return this; 
 	}
 
@@ -1048,7 +1064,7 @@ public class Observation extends BaseResource implements IResource {
      * Guidance on how to interpret the value by comparison to a normal or recommended range
      * </p> 
 	 */
-	@Block(name="Observation.referenceRange")	
+	@Block()	
 	public static class ReferenceRange extends BaseElement implements IResourceBlock {
 	
 	@Child(name="low", type=QuantityDt.class, order=0, min=0, max=1)	
@@ -1335,7 +1351,7 @@ public class Observation extends BaseResource implements IResource {
      * Related observations - either components, or previous observations, or statements of derivation
      * </p> 
 	 */
-	@Block(name="Observation.related")	
+	@Block()	
 	public static class Related extends BaseElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeDt.class, order=0, min=0, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/OperationOutcome.java

@@ -170,7 +170,7 @@ public class OperationOutcome extends BaseResource implements IResource {
      * An error, warning or information message that results from a system action
      * </p> 
 	 */
-	@Block(name="OperationOutcome.issue")	
+	@Block()	
 	public static class Issue extends BaseElement implements IResourceBlock {
 	
 	@Child(name="severity", type=CodeDt.class, order=0, min=1, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Order.java

@@ -51,6 +51,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
@@ -90,6 +91,7 @@ public class Order extends BaseResource implements IResource {
 	 * Path: <b>Order.date</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="date", path="Order.date", description="")
 	public static final String SP_DATE = "date";
 
 	/**
@@ -100,6 +102,7 @@ public class Order extends BaseResource implements IResource {
 	 * Path: <b>Order.subject</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="Order.subject", description="")
 	public static final String SP_SUBJECT = "subject";
 
 	/**
@@ -110,6 +113,7 @@ public class Order extends BaseResource implements IResource {
 	 * Path: <b>Order.source</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="source", path="Order.source", description="")
 	public static final String SP_SOURCE = "source";
 
 	/**
@@ -120,6 +124,7 @@ public class Order extends BaseResource implements IResource {
 	 * Path: <b>Order.target</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="target", path="Order.target", description="")
 	public static final String SP_TARGET = "target";
 
 	/**
@@ -130,6 +135,7 @@ public class Order extends BaseResource implements IResource {
 	 * Path: <b>Order.authority</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="authority", path="Order.authority", description="")
 	public static final String SP_AUTHORITY = "authority";
 
 	/**
@@ -140,6 +146,7 @@ public class Order extends BaseResource implements IResource {
 	 * Path: <b>Order.when.code</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="when_code", path="Order.when.code", description="")
 	public static final String SP_WHEN_CODE = "when_code";
 
 	/**
@@ -150,6 +157,7 @@ public class Order extends BaseResource implements IResource {
 	 * Path: <b>Order.when.schedule</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="when", path="Order.when.schedule", description="")
 	public static final String SP_WHEN = "when";
 
 	/**
@@ -160,6 +168,7 @@ public class Order extends BaseResource implements IResource {
 	 * Path: <b>Order.detail</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="detail", path="Order.detail", description="")
 	public static final String SP_DETAIL = "detail";
 
 
@@ -633,7 +642,7 @@ public class Order extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	@Block(name="Order.when")	
+	@Block()	
 	public static class When extends BaseElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeableConceptDt.class, order=0, min=0, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/OrderResponse.java

@@ -48,6 +48,7 @@ import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
@@ -90,6 +91,7 @@ public class OrderResponse extends BaseResource implements IResource {
 	 * Path: <b>OrderResponse.request</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="request", path="OrderResponse.request", description="")
 	public static final String SP_REQUEST = "request";
 
 	/**
@@ -100,6 +102,7 @@ public class OrderResponse extends BaseResource implements IResource {
 	 * Path: <b>OrderResponse.date</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="date", path="OrderResponse.date", description="")
 	public static final String SP_DATE = "date";
 
 	/**
@@ -110,6 +113,7 @@ public class OrderResponse extends BaseResource implements IResource {
 	 * Path: <b>OrderResponse.who</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="who", path="OrderResponse.who", description="")
 	public static final String SP_WHO = "who";
 
 	/**
@@ -120,6 +124,7 @@ public class OrderResponse extends BaseResource implements IResource {
 	 * Path: <b>OrderResponse.code</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="code", path="OrderResponse.code", description="")
 	public static final String SP_CODE = "code";
 
 	/**
@@ -130,6 +135,7 @@ public class OrderResponse extends BaseResource implements IResource {
 	 * Path: <b>OrderResponse.fulfillment</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="fulfillment", path="OrderResponse.fulfillment", description="")
 	public static final String SP_FULFILLMENT = "fulfillment";
 
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Organization.java

@@ -48,6 +48,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.AddressDt;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.ContactDt;
@@ -93,6 +94,7 @@ public class Organization extends BaseResource implements IResource {
 	 * Path: <b>Organization.name</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="name", path="Organization.name", description="A portion of the organization's name")
 	public static final String SP_NAME = "name";
 
 	/**
@@ -103,6 +105,7 @@ public class Organization extends BaseResource implements IResource {
 	 * Path: <b></b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="phonetic", path="", description="A portion of the organization's name using some kind of phonetic matching algorithm")
 	public static final String SP_PHONETIC = "phonetic";
 
 	/**
@@ -113,6 +116,7 @@ public class Organization extends BaseResource implements IResource {
 	 * Path: <b>Organization.type</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="type", path="Organization.type", description="A code for the type of organization")
 	public static final String SP_TYPE = "type";
 
 	/**
@@ -123,6 +127,7 @@ public class Organization extends BaseResource implements IResource {
 	 * Path: <b>Organization.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="Organization.identifier", description="Any identifier for the organization (not the accreditation issuer's identifier)")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -133,6 +138,7 @@ public class Organization extends BaseResource implements IResource {
 	 * Path: <b>Organization.accreditation.code</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="!accreditation", path="Organization.accreditation.code", description="Any accreditation code")
 	public static final String SP_ACCREDITATION = "!accreditation";
 
 	/**
@@ -143,6 +149,7 @@ public class Organization extends BaseResource implements IResource {
 	 * Path: <b>Organization.partOf</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="partof", path="Organization.partOf", description="Search all organizations that are part of the given organization")
 	public static final String SP_PARTOF = "partof";
 
 	/**
@@ -153,6 +160,7 @@ public class Organization extends BaseResource implements IResource {
 	 * Path: <b>Organization.active</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="active", path="Organization.active", description="Whether the organization's record is active")
 	public static final String SP_ACTIVE = "active";
 
 
@@ -728,7 +736,7 @@ public class Organization extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	@Block(name="Organization.contact")	
+	@Block()	
 	public static class Contact extends BaseElement implements IResourceBlock {
 	
 	@Child(name="purpose", type=CodeableConceptDt.class, order=0, min=0, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Other.java

@@ -47,6 +47,7 @@ import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
@@ -85,6 +86,7 @@ public class Other extends BaseResource implements IResource {
 	 * Path: <b>Other.subject</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="Other.subject", description="")
 	public static final String SP_SUBJECT = "subject";
 
 	/**
@@ -95,6 +97,7 @@ public class Other extends BaseResource implements IResource {
 	 * Path: <b>Other.created</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="created", path="Other.created", description="")
 	public static final String SP_CREATED = "created";
 
 	/**
@@ -105,6 +108,7 @@ public class Other extends BaseResource implements IResource {
 	 * Path: <b>Other.code</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="code", path="Other.code", description="")
 	public static final String SP_CODE = "code";
 
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Patient.java

@@ -51,6 +51,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.AddressDt;
 import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
@@ -102,6 +103,7 @@ public class Patient extends BaseResource implements IResource {
 	 * Path: <b>Patient.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="Patient.identifier", description="A patient identifier")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -112,6 +114,7 @@ public class Patient extends BaseResource implements IResource {
 	 * Path: <b>Patient.name</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="name", path="Patient.name", description="A portion of either family or given name of the patient")
 	public static final String SP_NAME = "name";
 
 	/**
@@ -122,6 +125,7 @@ public class Patient extends BaseResource implements IResource {
 	 * Path: <b>Patient.name.family</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="family", path="Patient.name.family", description="A portion of the family name of the patient")
 	public static final String SP_FAMILY = "family";
 
 	/**
@@ -132,6 +136,7 @@ public class Patient extends BaseResource implements IResource {
 	 * Path: <b>Patient.name.given</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="given", path="Patient.name.given", description="A portion of the given name of the patient")
 	public static final String SP_GIVEN = "given";
 
 	/**
@@ -142,6 +147,7 @@ public class Patient extends BaseResource implements IResource {
 	 * Path: <b></b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="phonetic", path="", description="A portion of either family or given name using some kind of phonetic matching algorithm")
 	public static final String SP_PHONETIC = "phonetic";
 
 	/**
@@ -152,6 +158,7 @@ public class Patient extends BaseResource implements IResource {
 	 * Path: <b>Patient.telecom</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="telecom", path="Patient.telecom", description="The value in any kind of telecom details of the patient")
 	public static final String SP_TELECOM = "telecom";
 
 	/**
@@ -162,6 +169,7 @@ public class Patient extends BaseResource implements IResource {
 	 * Path: <b>Patient.address</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="address", path="Patient.address", description="An address in any kind of address/part of the patient")
 	public static final String SP_ADDRESS = "address";
 
 	/**
@@ -172,6 +180,7 @@ public class Patient extends BaseResource implements IResource {
 	 * Path: <b>Patient.gender</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="gender", path="Patient.gender", description="Gender of the patient")
 	public static final String SP_GENDER = "gender";
 
 	/**
@@ -182,6 +191,7 @@ public class Patient extends BaseResource implements IResource {
 	 * Path: <b>Patient.communication</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="language", path="Patient.communication", description="Language code (irrespective of use value)")
 	public static final String SP_LANGUAGE = "language";
 
 	/**
@@ -192,6 +202,7 @@ public class Patient extends BaseResource implements IResource {
 	 * Path: <b>Patient.birthDate</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="birthdate", path="Patient.birthDate", description="The patient's date of birth")
 	public static final String SP_BIRTHDATE = "birthdate";
 
 	/**
@@ -202,6 +213,7 @@ public class Patient extends BaseResource implements IResource {
 	 * Path: <b>Patient.managingOrganization</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="provider", path="Patient.managingOrganization", description="The organization at which this person is a patient")
 	public static final String SP_PROVIDER = "provider";
 
 	/**
@@ -212,6 +224,7 @@ public class Patient extends BaseResource implements IResource {
 	 * Path: <b>Patient.active</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="active", path="Patient.active", description="Whether the patient record is active")
 	public static final String SP_ACTIVE = "active";
 
 	/**
@@ -222,6 +235,7 @@ public class Patient extends BaseResource implements IResource {
 	 * Path: <b>Patient.animal.species</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="animal-species", path="Patient.animal.species", description="The species for animal patients")
 	public static final String SP_ANIMAL_SPECIES = "animal-species";
 
 	/**
@@ -232,6 +246,7 @@ public class Patient extends BaseResource implements IResource {
 	 * Path: <b>Patient.animal.breed</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="animal-breed", path="Patient.animal.breed", description="The breed for animal patients")
 	public static final String SP_ANIMAL_BREED = "animal-breed";
 
 	/**
@@ -242,6 +257,7 @@ public class Patient extends BaseResource implements IResource {
 	 * Path: <b>Patient.link.other</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="link", path="Patient.link.other", description="All patients linked to the given patient")
 	public static final String SP_LINK = "link";
 
 
@@ -1256,7 +1272,7 @@ public class Patient extends BaseResource implements IResource {
      * A contact party (e.g. guardian, partner, friend) for the patient
      * </p> 
 	 */
-	@Block(name="Patient.contact")	
+	@Block()	
 	public static class Contact extends BaseElement implements IResourceBlock {
 	
 	@Child(name="relationship", type=CodeableConceptDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)	
@@ -1587,7 +1603,7 @@ public class Patient extends BaseResource implements IResource {
      * This element has a value if the patient is an animal
      * </p> 
 	 */
-	@Block(name="Patient.animal")	
+	@Block()	
 	public static class Animal extends BaseElement implements IResourceBlock {
 	
 	@Child(name="species", type=CodeableConceptDt.class, order=0, min=1, max=1)	
@@ -1745,7 +1761,7 @@ public class Patient extends BaseResource implements IResource {
      * Link to another patient resource that concerns the same actual person
      * </p> 
 	 */
-	@Block(name="Patient.link")	
+	@Block()	
 	public static class Link extends BaseElement implements IResourceBlock {
 	
 	@Child(name="other", order=0, min=1, max=1, type={

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Practitioner.java

@@ -50,6 +50,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.AddressDt;
 import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
@@ -97,6 +98,7 @@ public class Practitioner extends BaseResource implements IResource {
 	 * Path: <b>Practitioner.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="Practitioner.identifier", description="A practitioner's Identifier")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -107,6 +109,7 @@ public class Practitioner extends BaseResource implements IResource {
 	 * Path: <b>Practitioner.name</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="name", path="Practitioner.name", description="A portion of either family or given name")
 	public static final String SP_NAME = "name";
 
 	/**
@@ -117,6 +120,7 @@ public class Practitioner extends BaseResource implements IResource {
 	 * Path: <b>Practitioner.name</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="family", path="Practitioner.name", description="A portion of the family name")
 	public static final String SP_FAMILY = "family";
 
 	/**
@@ -127,6 +131,7 @@ public class Practitioner extends BaseResource implements IResource {
 	 * Path: <b>Practitioner.name</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="given", path="Practitioner.name", description="A portion of the given name")
 	public static final String SP_GIVEN = "given";
 
 	/**
@@ -137,6 +142,7 @@ public class Practitioner extends BaseResource implements IResource {
 	 * Path: <b>Practitioner.name</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="phonetic", path="Practitioner.name", description="A portion of either family or given name using some kind of phonetic matching algorithm")
 	public static final String SP_PHONETIC = "phonetic";
 
 	/**
@@ -147,6 +153,7 @@ public class Practitioner extends BaseResource implements IResource {
 	 * Path: <b>Practitioner.telecom</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="telecom", path="Practitioner.telecom", description="The value in any kind of contact")
 	public static final String SP_TELECOM = "telecom";
 
 	/**
@@ -157,6 +164,7 @@ public class Practitioner extends BaseResource implements IResource {
 	 * Path: <b>Practitioner.address</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="address", path="Practitioner.address", description="An address in any kind of address/part")
 	public static final String SP_ADDRESS = "address";
 
 	/**
@@ -167,6 +175,7 @@ public class Practitioner extends BaseResource implements IResource {
 	 * Path: <b>Practitioner.gender</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="gender", path="Practitioner.gender", description="Gender of the practitioner")
 	public static final String SP_GENDER = "gender";
 
 	/**
@@ -177,6 +186,7 @@ public class Practitioner extends BaseResource implements IResource {
 	 * Path: <b>Practitioner.organization</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="organization", path="Practitioner.organization", description="The identity of the organization the practitioner represents / acts on behalf of")
 	public static final String SP_ORGANIZATION = "organization";
 
 
@@ -1023,7 +1033,7 @@ public class Practitioner extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	@Block(name="Practitioner.qualification")	
+	@Block()	
 	public static class Qualification extends BaseElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeableConceptDt.class, order=0, min=1, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Procedure.java

@@ -48,6 +48,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.PeriodDt;
@@ -90,6 +91,7 @@ public class Procedure extends BaseResource implements IResource {
 	 * Path: <b>Procedure.type</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="type", path="Procedure.type", description="Type of procedure")
 	public static final String SP_TYPE = "type";
 
 	/**
@@ -100,6 +102,7 @@ public class Procedure extends BaseResource implements IResource {
 	 * Path: <b>Procedure.subject</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="Procedure.subject", description="The identity of a patient to list procedures  for")
 	public static final String SP_SUBJECT = "subject";
 
 	/**
@@ -110,6 +113,7 @@ public class Procedure extends BaseResource implements IResource {
 	 * Path: <b>Procedure.date</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="date", path="Procedure.date", description="The date the procedure was performed on")
 	public static final String SP_DATE = "date";
 
 
@@ -934,7 +938,7 @@ public class Procedure extends BaseResource implements IResource {
      * Limited to 'real' people rather than equipment
      * </p> 
 	 */
-	@Block(name="Procedure.performer")	
+	@Block()	
 	public static class Performer extends BaseElement implements IResourceBlock {
 	
 	@Child(name="person", order=0, min=0, max=1, type={
@@ -1042,7 +1046,7 @@ public class Procedure extends BaseResource implements IResource {
      * Procedures may be related to other items such as procedures or medications. For example treating wound dehiscence following a previous procedure
      * </p> 
 	 */
-	@Block(name="Procedure.relatedItem")	
+	@Block()	
 	public static class RelatedItem extends BaseElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeDt.class, order=0, min=0, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Profile.java

@@ -51,6 +51,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodingDt;
 import ca.uhn.fhir.model.dstu.composite.ContactDt;
 import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum;
@@ -105,6 +106,7 @@ public class Profile extends BaseResource implements IResource {
 	 * Path: <b>Profile.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="Profile.identifier", description="The identifier of the profile")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -115,6 +117,7 @@ public class Profile extends BaseResource implements IResource {
 	 * Path: <b>Profile.version</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="version", path="Profile.version", description="The version identifier of the profile")
 	public static final String SP_VERSION = "version";
 
 	/**
@@ -125,6 +128,7 @@ public class Profile extends BaseResource implements IResource {
 	 * Path: <b>Profile.name</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="name", path="Profile.name", description="Name of the profile")
 	public static final String SP_NAME = "name";
 
 	/**
@@ -135,6 +139,7 @@ public class Profile extends BaseResource implements IResource {
 	 * Path: <b>Profile.publisher</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="publisher", path="Profile.publisher", description="Name of the publisher of the profile")
 	public static final String SP_PUBLISHER = "publisher";
 
 	/**
@@ -145,6 +150,7 @@ public class Profile extends BaseResource implements IResource {
 	 * Path: <b>Profile.description</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="description", path="Profile.description", description="Text search in the description of the profile")
 	public static final String SP_DESCRIPTION = "description";
 
 	/**
@@ -155,6 +161,7 @@ public class Profile extends BaseResource implements IResource {
 	 * Path: <b>Profile.status</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="status", path="Profile.status", description="The current status of the profile")
 	public static final String SP_STATUS = "status";
 
 	/**
@@ -165,6 +172,7 @@ public class Profile extends BaseResource implements IResource {
 	 * Path: <b>Profile.date</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="date", path="Profile.date", description="The profile publication date")
 	public static final String SP_DATE = "date";
 
 	/**
@@ -175,6 +183,7 @@ public class Profile extends BaseResource implements IResource {
 	 * Path: <b>Profile.code</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="code", path="Profile.code", description="A code for the profile in the format uri::code (server may choose to do subsumption)")
 	public static final String SP_CODE = "code";
 
 	/**
@@ -185,6 +194,7 @@ public class Profile extends BaseResource implements IResource {
 	 * Path: <b>Profile.extensionDefn.code</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="extension", path="Profile.extensionDefn.code", description="An extension code (use or definition)")
 	public static final String SP_EXTENSION = "extension";
 
 	/**
@@ -195,6 +205,7 @@ public class Profile extends BaseResource implements IResource {
 	 * Path: <b>Profile.structure.element.definition.binding.reference[x]</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="valueset", path="Profile.structure.element.definition.binding.reference[x]", description="A vocabulary binding code")
 	public static final String SP_VALUESET = "valueset";
 
 	/**
@@ -205,6 +216,7 @@ public class Profile extends BaseResource implements IResource {
 	 * Path: <b>Profile.structure.type</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="type", path="Profile.structure.type", description="Type of resource that is constrained in the profile")
 	public static final String SP_TYPE = "type";
 
 
@@ -1157,7 +1169,7 @@ public class Profile extends BaseResource implements IResource {
      * An external specification that the content is mapped to
      * </p> 
 	 */
-	@Block(name="Profile.mapping")	
+	@Block()	
 	public static class Mapping extends BaseElement implements IResourceBlock {
 	
 	@Child(name="identity", type=IdDt.class, order=0, min=1, max=1)	
@@ -1392,7 +1404,7 @@ public class Profile extends BaseResource implements IResource {
      * A constraint statement about what contents a resource or data type may have
      * </p> 
 	 */
-	@Block(name="Profile.structure")	
+	@Block()	
 	public static class Structure extends BaseElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeDt.class, order=0, min=1, max=1)	
@@ -1760,7 +1772,7 @@ public class Profile extends BaseResource implements IResource {
      * Captures constraints on each element within the resource
      * </p> 
 	 */
-	@Block(name="Profile.structure.element")	
+	@Block()	
 	public static class StructureElement extends BaseElement implements IResourceBlock {
 	
 	@Child(name="path", type=StringDt.class, order=0, min=1, max=1)	
@@ -2032,7 +2044,7 @@ public class Profile extends BaseResource implements IResource {
      * Indicates that the element is sliced into a set of alternative definitions (there are multiple definitions on a single element in the base resource). The set of slices is any elements that come after this in the element sequence that have the same path, until a shorter path occurs (the shorter path terminates the set)
      * </p> 
 	 */
-	@Block(name="Profile.structure.element.slicing")	
+	@Block()	
 	public static class StructureElementSlicing extends BaseElement implements IResourceBlock {
 	
 	@Child(name="discriminator", type=IdDt.class, order=0, min=1, max=1)	
@@ -2216,7 +2228,7 @@ public class Profile extends BaseResource implements IResource {
      * Definition of the content of the element to provide a more specific definition than that contained for the element in the base resource
      * </p> 
 	 */
-	@Block(name="Profile.structure.element.definition")	
+	@Block()	
 	public static class StructureElementDefinition extends BaseElement implements IResourceBlock {
 	
 	@Child(name="short", type=StringDt.class, order=0, min=1, max=1)	
@@ -3235,7 +3247,7 @@ public class Profile extends BaseResource implements IResource {
      * The data type or resource that the value of this element is permitted to be
      * </p> 
 	 */
-	@Block(name="Profile.structure.element.definition.type")	
+	@Block()	
 	public static class StructureElementDefinitionType extends BaseElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeDt.class, order=0, min=1, max=1)	
@@ -3432,7 +3444,7 @@ public class Profile extends BaseResource implements IResource {
      * Formal constraints such as co-occurrence and other constraints that can be computationally evaluated within the context of the instance
      * </p> 
 	 */
-	@Block(name="Profile.structure.element.definition.constraint")	
+	@Block()	
 	public static class StructureElementDefinitionConstraint extends BaseElement implements IResourceBlock {
 	
 	@Child(name="key", type=IdDt.class, order=0, min=1, max=1)	
@@ -3718,7 +3730,7 @@ public class Profile extends BaseResource implements IResource {
      * Binds to a value set if this element is coded (code, Coding, CodeableConcept)
      * </p> 
 	 */
-	@Block(name="Profile.structure.element.definition.binding")	
+	@Block()	
 	public static class StructureElementDefinitionBinding extends BaseElement implements IResourceBlock {
 	
 	@Child(name="name", type=StringDt.class, order=0, min=1, max=1)	
@@ -3989,7 +4001,7 @@ public class Profile extends BaseResource implements IResource {
      * Identifies a concept from an external specification that roughly corresponds to this element
      * </p> 
 	 */
-	@Block(name="Profile.structure.element.definition.mapping")	
+	@Block()	
 	public static class StructureElementDefinitionMapping extends BaseElement implements IResourceBlock {
 	
 	@Child(name="identity", type=IdDt.class, order=0, min=1, max=1)	
@@ -4124,7 +4136,7 @@ public class Profile extends BaseResource implements IResource {
      * Additional search parameters for implementations to support and/or make use of
      * </p> 
 	 */
-	@Block(name="Profile.structure.searchParam")	
+	@Block()	
 	public static class StructureSearchParam extends BaseElement implements IResourceBlock {
 	
 	@Child(name="name", type=StringDt.class, order=0, min=1, max=1)	
@@ -4424,7 +4436,7 @@ public class Profile extends BaseResource implements IResource {
      * An extension defined as part of the profile
      * </p> 
 	 */
-	@Block(name="Profile.extensionDefn")	
+	@Block()	
 	public static class ExtensionDefn extends BaseElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeDt.class, order=0, min=1, max=1)	
@@ -4731,7 +4743,7 @@ public class Profile extends BaseResource implements IResource {
      * Definition of a named query and its parameters and their meaning
      * </p> 
 	 */
-	@Block(name="Profile.query")	
+	@Block()	
 	public static class Query extends BaseElement implements IResourceBlock {
 	
 	@Child(name="name", type=StringDt.class, order=0, min=1, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Provenance.java

@@ -50,6 +50,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.CodingDt;
 import ca.uhn.fhir.model.dstu.composite.PeriodDt;
@@ -93,6 +94,7 @@ public class Provenance extends BaseResource implements IResource {
 	 * Path: <b>Provenance.target</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="target", path="Provenance.target", description="")
 	public static final String SP_TARGET = "target";
 
 	/**
@@ -103,6 +105,7 @@ public class Provenance extends BaseResource implements IResource {
 	 * Path: <b>Provenance.period.start</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="start", path="Provenance.period.start", description="")
 	public static final String SP_START = "start";
 
 	/**
@@ -113,6 +116,7 @@ public class Provenance extends BaseResource implements IResource {
 	 * Path: <b>Provenance.period.end</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="end", path="Provenance.period.end", description="")
 	public static final String SP_END = "end";
 
 	/**
@@ -123,6 +127,7 @@ public class Provenance extends BaseResource implements IResource {
 	 * Path: <b>Provenance.location</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="location", path="Provenance.location", description="")
 	public static final String SP_LOCATION = "location";
 
 	/**
@@ -133,6 +138,7 @@ public class Provenance extends BaseResource implements IResource {
 	 * Path: <b>Provenance.agent.reference</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="party", path="Provenance.agent.reference", description="")
 	public static final String SP_PARTY = "party";
 
 	/**
@@ -143,6 +149,7 @@ public class Provenance extends BaseResource implements IResource {
 	 * Path: <b>Provenance.agent.type</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="partytype", path="Provenance.agent.type", description="")
 	public static final String SP_PARTYTYPE = "partytype";
 
 
@@ -340,8 +347,8 @@ public class Provenance extends BaseResource implements IResource {
      * The instant of time at which the activity was recorded
      * </p> 
 	 */
-	public Provenance setRecordedWithMillisPrecision( Date theDate) {
+	public Provenance setRecorded( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myRecorded = new InstantDt(theDate); 
+		myRecorded = new InstantDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -353,8 +360,8 @@ public class Provenance extends BaseResource implements IResource {
      * The instant of time at which the activity was recorded
      * </p> 
 	 */
-	public Provenance setRecorded( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public Provenance setRecordedWithMillisPrecision( Date theDate) {
-		myRecorded = new InstantDt(theDate, thePrecision); 
+		myRecorded = new InstantDt(theDate); 
 		return this; 
 	}
 
@@ -671,7 +678,7 @@ public class Provenance extends BaseResource implements IResource {
      * An agent takes a role in an activity such that the agent can be assigned some degree of responsibility for the activity taking place. An agent can be a person, a piece of software, an inanimate object, an organization, or other entities that may be ascribed responsibility
      * </p> 
 	 */
-	@Block(name="Provenance.agent")	
+	@Block()	
 	public static class Agent extends BaseElement implements IResourceBlock {
 	
 	@Child(name="role", type=CodingDt.class, order=0, min=1, max=1)	
@@ -880,7 +887,7 @@ public class Provenance extends BaseResource implements IResource {
      * An entity used in this activity
      * </p> 
 	 */
-	@Block(name="Provenance.entity")	
+	@Block()	
 	public static class Entity extends BaseElement implements IResourceBlock {
 	
 	@Child(name="role", type=CodeDt.class, order=0, min=1, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Query.java

@@ -49,6 +49,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
 import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum;
 import ca.uhn.fhir.model.primitive.BoundCodeDt;
@@ -88,6 +89,7 @@ public class Query extends BaseResource implements IResource {
 	 * Path: <b>Query.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="Query.identifier", description="")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -98,6 +100,7 @@ public class Query extends BaseResource implements IResource {
 	 * Path: <b>Query.response.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="response", path="Query.response.identifier", description="")
 	public static final String SP_RESPONSE = "response";
 
 
@@ -281,7 +284,7 @@ public class Query extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	@Block(name="Query.response")	
+	@Block()	
 	public static class Response extends BaseElement implements IResourceBlock {
 	
 	@Child(name="identifier", type=UriDt.class, order=0, min=1, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Questionnaire.java

@@ -51,6 +51,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.CodingDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
@@ -102,6 +103,7 @@ public class Questionnaire extends BaseResource implements IResource {
 	 * Path: <b>Questionnaire.status</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="status", path="Questionnaire.status", description="The status of the questionnaire")
 	public static final String SP_STATUS = "status";
 
 	/**
@@ -112,6 +114,7 @@ public class Questionnaire extends BaseResource implements IResource {
 	 * Path: <b>Questionnaire.authored</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="authored", path="Questionnaire.authored", description="When the questionnaire was authored")
 	public static final String SP_AUTHORED = "authored";
 
 	/**
@@ -122,6 +125,7 @@ public class Questionnaire extends BaseResource implements IResource {
 	 * Path: <b>Questionnaire.subject</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="Questionnaire.subject", description="The subject of the questionnaire")
 	public static final String SP_SUBJECT = "subject";
 
 	/**
@@ -132,6 +136,7 @@ public class Questionnaire extends BaseResource implements IResource {
 	 * Path: <b>Questionnaire.author</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="author", path="Questionnaire.author", description="The author of the questionnaire")
 	public static final String SP_AUTHOR = "author";
 
 	/**
@@ -142,6 +147,7 @@ public class Questionnaire extends BaseResource implements IResource {
 	 * Path: <b>Questionnaire.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="Questionnaire.identifier", description="An identifier for the questionnaire")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -152,6 +158,7 @@ public class Questionnaire extends BaseResource implements IResource {
 	 * Path: <b>Questionnaire.name</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="name", path="Questionnaire.name", description="Name of the questionnaire")
 	public static final String SP_NAME = "name";
 
 	/**
@@ -162,6 +169,7 @@ public class Questionnaire extends BaseResource implements IResource {
 	 * Path: <b>Questionnaire.encounter</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="encounter", path="Questionnaire.encounter", description="Encounter during which questionnaire was authored")
 	public static final String SP_ENCOUNTER = "encounter";
 
 
@@ -643,7 +651,7 @@ public class Questionnaire extends BaseResource implements IResource {
      * A group of questions to a possibly similarly grouped set of questions in the questionnaire
      * </p> 
 	 */
-	@Block(name="Questionnaire.group")	
+	@Block()	
 	public static class Group extends BaseElement implements IResourceBlock {
 	
 	@Child(name="name", type=CodeableConceptDt.class, order=0, min=0, max=1)	
@@ -999,7 +1007,7 @@ public class Questionnaire extends BaseResource implements IResource {
      * Set of questions within this group. The order of questions within the group is relevant
      * </p> 
 	 */
-	@Block(name="Questionnaire.group.question")	
+	@Block()	
 	public static class GroupQuestion extends BaseElement implements IResourceBlock {
 	
 	@Child(name="name", type=CodeableConceptDt.class, order=0, min=0, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/RelatedPerson.java

@@ -45,6 +45,7 @@ import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.AddressDt;
 import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
@@ -89,6 +90,7 @@ public class RelatedPerson extends BaseResource implements IResource {
 	 * Path: <b>RelatedPerson.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="RelatedPerson.identifier", description="A patient Identifier")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -99,6 +101,7 @@ public class RelatedPerson extends BaseResource implements IResource {
 	 * Path: <b>RelatedPerson.name</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="name", path="RelatedPerson.name", description="A portion of name in any name part")
 	public static final String SP_NAME = "name";
 
 	/**
@@ -109,6 +112,7 @@ public class RelatedPerson extends BaseResource implements IResource {
 	 * Path: <b></b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="phonetic", path="", description="A portion of name using some kind of phonetic matching algorithm")
 	public static final String SP_PHONETIC = "phonetic";
 
 	/**
@@ -119,6 +123,7 @@ public class RelatedPerson extends BaseResource implements IResource {
 	 * Path: <b>RelatedPerson.telecom</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="telecom", path="RelatedPerson.telecom", description="The value in any kind of contact")
 	public static final String SP_TELECOM = "telecom";
 
 	/**
@@ -129,6 +134,7 @@ public class RelatedPerson extends BaseResource implements IResource {
 	 * Path: <b>RelatedPerson.address</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="address", path="RelatedPerson.address", description="An address in any kind of address/part")
 	public static final String SP_ADDRESS = "address";
 
 	/**
@@ -139,6 +145,7 @@ public class RelatedPerson extends BaseResource implements IResource {
 	 * Path: <b>RelatedPerson.gender</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="gender", path="RelatedPerson.gender", description="Gender of the person")
 	public static final String SP_GENDER = "gender";
 
 	/**
@@ -149,6 +156,7 @@ public class RelatedPerson extends BaseResource implements IResource {
 	 * Path: <b>RelatedPerson.patient</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="patient", path="RelatedPerson.patient", description="The patient this person is related to")
 	public static final String SP_PATIENT = "patient";
 
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Remittance.java

@@ -48,6 +48,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
@@ -86,6 +87,7 @@ public class Remittance extends BaseResource implements IResource {
 	 * Path: <b>Remittance.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="Remittance.identifier", description="")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -96,6 +98,7 @@ public class Remittance extends BaseResource implements IResource {
 	 * Path: <b>Remittance.service.code</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="service", path="Remittance.service.code", description="")
 	public static final String SP_SERVICE = "service";
 
 
@@ -254,7 +257,7 @@ public class Remittance extends BaseResource implements IResource {
      * A service paid as part of remittance
      * </p> 
 	 */
-	@Block(name="Remittance.service")	
+	@Block()	
 	public static class Service extends BaseElement implements IResourceBlock {
 	
 	@Child(name="instance", type=IntegerDt.class, order=0, min=1, max=1)	
@@ -412,6 +415,19 @@ public class Remittance extends BaseResource implements IResource {
      * <p>
      * <b>Definition:</b>
      * The percent of the service fee which would be elegible for coverage
+     * </p> 
+	 */
+	public Service setRate( long theValue) {
+		myRate = new DecimalDt(theValue); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>rate</b> (Benefit Rate %)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The percent of the service fee which would be elegible for coverage
      * </p> 
 	 */
 	public Service setRate( double theValue) {
@@ -432,19 +448,6 @@ public class Remittance extends BaseResource implements IResource {
 		return this; 
 	}
 
-	/**
-	 * Sets the value for <b>rate</b> (Benefit Rate %)
-	 *
-     * <p>
-     * <b>Definition:</b>
-     * The percent of the service fee which would be elegible for coverage
-     * </p> 
-	 */
-	public Service setRate( long theValue) {
-		myRate = new DecimalDt(theValue); 
-		return this; 
-	}
-
  
 	/**
 	 * Gets the value(s) for <b>benefit</b> (Benefit amount).
@@ -482,6 +485,19 @@ public class Remittance extends BaseResource implements IResource {
      * <p>
      * <b>Definition:</b>
      * The amount payable for a submitted service (includes both professional and lab fees.)
+     * </p> 
+	 */
+	public Service setBenefit( long theValue) {
+		myBenefit = new DecimalDt(theValue); 
+		return this; 
+	}
+
+	/**
+	 * Sets the value for <b>benefit</b> (Benefit amount)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The amount payable for a submitted service (includes both professional and lab fees.)
      * </p> 
 	 */
 	public Service setBenefit( double theValue) {
@@ -502,19 +518,6 @@ public class Remittance extends BaseResource implements IResource {
 		return this; 
 	}
 
-	/**
-	 * Sets the value for <b>benefit</b> (Benefit amount)
-	 *
-     * <p>
-     * <b>Definition:</b>
-     * The amount payable for a submitted service (includes both professional and lab fees.)
-     * </p> 
-	 */
-	public Service setBenefit( long theValue) {
-		myBenefit = new DecimalDt(theValue); 
-		return this; 
-	}
-
  
 
 	}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SecurityEvent.java

@@ -50,6 +50,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.CodingDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
@@ -102,6 +103,7 @@ public class SecurityEvent extends BaseResource implements IResource {
 	 * Path: <b>SecurityEvent.event.type</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="type", path="SecurityEvent.event.type", description="")
 	public static final String SP_TYPE = "type";
 
 	/**
@@ -112,6 +114,7 @@ public class SecurityEvent extends BaseResource implements IResource {
 	 * Path: <b>SecurityEvent.event.action</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="action", path="SecurityEvent.event.action", description="")
 	public static final String SP_ACTION = "action";
 
 	/**
@@ -122,6 +125,7 @@ public class SecurityEvent extends BaseResource implements IResource {
 	 * Path: <b>SecurityEvent.event.dateTime</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="date", path="SecurityEvent.event.dateTime", description="")
 	public static final String SP_DATE = "date";
 
 	/**
@@ -132,6 +136,7 @@ public class SecurityEvent extends BaseResource implements IResource {
 	 * Path: <b>SecurityEvent.event.subtype</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subtype", path="SecurityEvent.event.subtype", description="")
 	public static final String SP_SUBTYPE = "subtype";
 
 	/**
@@ -142,6 +147,7 @@ public class SecurityEvent extends BaseResource implements IResource {
 	 * Path: <b>SecurityEvent.participant.userId</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="user", path="SecurityEvent.participant.userId", description="")
 	public static final String SP_USER = "user";
 
 	/**
@@ -152,6 +158,7 @@ public class SecurityEvent extends BaseResource implements IResource {
 	 * Path: <b>SecurityEvent.participant.name</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="name", path="SecurityEvent.participant.name", description="")
 	public static final String SP_NAME = "name";
 
 	/**
@@ -162,6 +169,7 @@ public class SecurityEvent extends BaseResource implements IResource {
 	 * Path: <b>SecurityEvent.participant.network.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="address", path="SecurityEvent.participant.network.identifier", description="")
 	public static final String SP_ADDRESS = "address";
 
 	/**
@@ -172,6 +180,7 @@ public class SecurityEvent extends BaseResource implements IResource {
 	 * Path: <b>SecurityEvent.source.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="source", path="SecurityEvent.source.identifier", description="")
 	public static final String SP_SOURCE = "source";
 
 	/**
@@ -182,6 +191,7 @@ public class SecurityEvent extends BaseResource implements IResource {
 	 * Path: <b>SecurityEvent.source.site</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="site", path="SecurityEvent.source.site", description="")
 	public static final String SP_SITE = "site";
 
 	/**
@@ -192,6 +202,7 @@ public class SecurityEvent extends BaseResource implements IResource {
 	 * Path: <b>SecurityEvent.object.type</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="object-type", path="SecurityEvent.object.type", description="")
 	public static final String SP_OBJECT_TYPE = "object-type";
 
 	/**
@@ -202,6 +213,7 @@ public class SecurityEvent extends BaseResource implements IResource {
 	 * Path: <b>SecurityEvent.object.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identity", path="SecurityEvent.object.identifier", description="")
 	public static final String SP_IDENTITY = "identity";
 
 	/**
@@ -212,6 +224,7 @@ public class SecurityEvent extends BaseResource implements IResource {
 	 * Path: <b>SecurityEvent.object.reference</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="reference", path="SecurityEvent.object.reference", description="")
 	public static final String SP_REFERENCE = "reference";
 
 	/**
@@ -222,6 +235,7 @@ public class SecurityEvent extends BaseResource implements IResource {
 	 * Path: <b>SecurityEvent.object.name</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="desc", path="SecurityEvent.object.name", description="")
 	public static final String SP_DESC = "desc";
 
 	/**
@@ -232,6 +246,7 @@ public class SecurityEvent extends BaseResource implements IResource {
 	 * Path: <b></b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="patientid", path="", description="The id of the patient (one of multiple kinds of participations)")
 	public static final String SP_PATIENTID = "patientid";
 
 	/**
@@ -242,6 +257,7 @@ public class SecurityEvent extends BaseResource implements IResource {
 	 * Path: <b>SecurityEvent.participant.altId</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="altid", path="SecurityEvent.participant.altId", description="")
 	public static final String SP_ALTID = "altid";
 
 
@@ -479,7 +495,7 @@ public class SecurityEvent extends BaseResource implements IResource {
      * Identifies the name, action type, time, and disposition of the audited event
      * </p> 
 	 */
-	@Block(name="SecurityEvent.event")	
+	@Block()	
 	public static class Event extends BaseElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeableConceptDt.class, order=0, min=1, max=1)	
@@ -713,8 +729,8 @@ public class SecurityEvent extends BaseResource implements IResource {
      * The time when the event occurred on the source
      * </p> 
 	 */
-	public Event setDateTimeWithMillisPrecision( Date theDate) {
+	public Event setDateTime( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myDateTime = new InstantDt(theDate); 
+		myDateTime = new InstantDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -726,8 +742,8 @@ public class SecurityEvent extends BaseResource implements IResource {
      * The time when the event occurred on the source
      * </p> 
 	 */
-	public Event setDateTime( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public Event setDateTimeWithMillisPrecision( Date theDate) {
-		myDateTime = new InstantDt(theDate, thePrecision); 
+		myDateTime = new InstantDt(theDate); 
 		return this; 
 	}
 
@@ -832,7 +848,7 @@ public class SecurityEvent extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	@Block(name="SecurityEvent.participant")	
+	@Block()	
 	public static class Participant extends BaseElement implements IResourceBlock {
 	
 	@Child(name="role", type=CodeableConceptDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)	
@@ -1245,7 +1261,7 @@ public class SecurityEvent extends BaseResource implements IResource {
      * Logical network location for application activity, if the activity has a network location
      * </p> 
 	 */
-	@Block(name="SecurityEvent.participant.network")	
+	@Block()	
 	public static class ParticipantNetwork extends BaseElement implements IResourceBlock {
 	
 	@Child(name="identifier", type=StringDt.class, order=0, min=0, max=1)	
@@ -1379,7 +1395,7 @@ public class SecurityEvent extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	@Block(name="SecurityEvent.source")	
+	@Block()	
 	public static class Source extends BaseElement implements IResourceBlock {
 	
 	@Child(name="site", type=StringDt.class, order=0, min=0, max=1)	
@@ -1579,7 +1595,7 @@ public class SecurityEvent extends BaseResource implements IResource {
      * Specific instances of data or objects that have been accessed
      * </p> 
 	 */
-	@Block(name="SecurityEvent.object")	
+	@Block()	
 	public static class Object extends BaseElement implements IResourceBlock {
 	
 	@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=1)	
@@ -2136,7 +2152,7 @@ public class SecurityEvent extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	@Block(name="SecurityEvent.object.detail")	
+	@Block()	
 	public static class ObjectDetail extends BaseElement implements IResourceBlock {
 	
 	@Child(name="type", type=StringDt.class, order=0, min=1, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SequencingAnalysis.java

@@ -50,6 +50,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
 import ca.uhn.fhir.model.primitive.CodeDt;
@@ -88,6 +89,7 @@ public class SequencingAnalysis extends BaseResource implements IResource {
 	 * Path: <b>SequencingAnalysis.subject</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="SequencingAnalysis.subject", description="Subject of the analysis")
 	public static final String SP_SUBJECT = "subject";
 
 	/**
@@ -98,6 +100,7 @@ public class SequencingAnalysis extends BaseResource implements IResource {
 	 * Path: <b>SequencingAnalysis.date</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="date", path="SequencingAnalysis.date", description="Date when result of the analysis is updated")
 	public static final String SP_DATE = "date";
 
 	/**
@@ -108,6 +111,7 @@ public class SequencingAnalysis extends BaseResource implements IResource {
 	 * Path: <b>SequencingAnalysis.genome.name</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="genome", path="SequencingAnalysis.genome.name", description="Name of the reference genome used in the analysis")
 	public static final String SP_GENOME = "genome";
 
 
@@ -498,7 +502,7 @@ public class SequencingAnalysis extends BaseResource implements IResource {
      * Reference genome used in the analysis
      * </p> 
 	 */
-	@Block(name="SequencingAnalysis.genome")	
+	@Block()	
 	public static class Genome extends BaseElement implements IResourceBlock {
 	
 	@Child(name="name", type=CodeDt.class, order=0, min=1, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SequencingLab.java

@@ -50,6 +50,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
@@ -89,6 +90,7 @@ public class SequencingLab extends BaseResource implements IResource {
 	 * Path: <b>SequencingLab.subject</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="SequencingLab.subject", description="Subject of the lab")
 	public static final String SP_SUBJECT = "subject";
 
 	/**
@@ -99,6 +101,7 @@ public class SequencingLab extends BaseResource implements IResource {
 	 * Path: <b>SequencingLab.specimen.type</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="specimen", path="SequencingLab.specimen.type", description="Type of the specimen used for the lab")
 	public static final String SP_SPECIMEN = "specimen";
 
 	/**
@@ -109,6 +112,7 @@ public class SequencingLab extends BaseResource implements IResource {
 	 * Path: <b>SequencingLab.date</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="date", path="SequencingLab.date", description="Date when result of the lab is uploaded")
 	public static final String SP_DATE = "date";
 
 	/**
@@ -119,6 +123,7 @@ public class SequencingLab extends BaseResource implements IResource {
 	 * Path: <b>SequencingLab.organization</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="organization", path="SequencingLab.organization", description="Organization that does the lab")
 	public static final String SP_ORGANIZATION = "organization";
 
 	/**
@@ -129,6 +134,7 @@ public class SequencingLab extends BaseResource implements IResource {
 	 * Path: <b>SequencingLab.system.class</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="system-class", path="SequencingLab.system.class", description="Class of the sequencing system")
 	public static final String SP_SYSTEM_CLASS = "system-class";
 
 	/**
@@ -139,6 +145,7 @@ public class SequencingLab extends BaseResource implements IResource {
 	 * Path: <b>SequencingLab.system.name</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="system-name", path="SequencingLab.system.name", description="Name of the sequencing system")
 	public static final String SP_SYSTEM_NAME = "system-name";
 
 
@@ -565,7 +572,7 @@ public class SequencingLab extends BaseResource implements IResource {
      * System of machine used for sequencing
      * </p> 
 	 */
-	@Block(name="SequencingLab.system")	
+	@Block()	
 	public static class System extends BaseElement implements IResourceBlock {
 	
 	@Child(name="class", type=CodeDt.class, order=0, min=0, max=1)	
@@ -800,7 +807,7 @@ public class SequencingLab extends BaseResource implements IResource {
      * Specimen of the lab
      * </p> 
 	 */
-	@Block(name="SequencingLab.specimen")	
+	@Block()	
 	public static class Specimen extends BaseElement implements IResourceBlock {
 	
 	@Child(name="type", type=CodeDt.class, order=0, min=1, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Slot.java

@@ -47,6 +47,7 @@ import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
@@ -88,6 +89,7 @@ public class Slot extends BaseResource implements IResource {
 	 * Path: <b>Slot.type</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="slottype", path="Slot.type", description="The type of appointments that can be booked into the slot")
 	public static final String SP_SLOTTYPE = "slottype";
 
 	/**
@@ -98,6 +100,7 @@ public class Slot extends BaseResource implements IResource {
 	 * Path: <b>Slot.availability</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="availability", path="Slot.availability", description="The Availability Resource that we are seeking a slot within")
 	public static final String SP_AVAILABILITY = "availability";
 
 	/**
@@ -108,6 +111,7 @@ public class Slot extends BaseResource implements IResource {
 	 * Path: <b>Slot.start</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="start", path="Slot.start", description="Appointment date/time.")
 	public static final String SP_START = "start";
 
 	/**
@@ -118,6 +122,7 @@ public class Slot extends BaseResource implements IResource {
 	 * Path: <b>Slot.freeBusyType</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="fbtype", path="Slot.freeBusyType", description="The free/busy status of the appointment")
 	public static final String SP_FBTYPE = "fbtype";
 
 
@@ -442,8 +447,8 @@ public class Slot extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Slot setStartWithMillisPrecision( Date theDate) {
+	public Slot setStart( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myStart = new InstantDt(theDate); 
+		myStart = new InstantDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -455,8 +460,8 @@ public class Slot extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Slot setStart( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public Slot setStartWithMillisPrecision( Date theDate) {
-		myStart = new InstantDt(theDate, thePrecision); 
+		myStart = new InstantDt(theDate); 
 		return this; 
 	}
 
@@ -499,8 +504,8 @@ public class Slot extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Slot setEndWithMillisPrecision( Date theDate) {
+	public Slot setEnd( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myEnd = new InstantDt(theDate); 
+		myEnd = new InstantDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -512,8 +517,8 @@ public class Slot extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Slot setEnd( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public Slot setEndWithMillisPrecision( Date theDate) {
-		myEnd = new InstantDt(theDate, thePrecision); 
+		myEnd = new InstantDt(theDate); 
 		return this; 
 	}
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Specimen.java

@@ -51,6 +51,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.PeriodDt;
@@ -99,6 +100,7 @@ public class Specimen extends BaseResource implements IResource {
 	 * Path: <b>Specimen.subject</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="subject", path="Specimen.subject", description="The subject of the specimen")
 	public static final String SP_SUBJECT = "subject";
 
 
@@ -670,7 +672,7 @@ public class Specimen extends BaseResource implements IResource {
      * Parent specimen from which the focal specimen was a component
      * </p> 
 	 */
-	@Block(name="Specimen.source")	
+	@Block()	
 	public static class Source extends BaseElement implements IResourceBlock {
 	
 	@Child(name="relationship", type=CodeDt.class, order=0, min=1, max=1)	
@@ -804,7 +806,7 @@ public class Specimen extends BaseResource implements IResource {
      * Details concerning the specimen collection
      * </p> 
 	 */
-	@Block(name="Specimen.collection")	
+	@Block()	
 	public static class Collection extends BaseElement implements IResourceBlock {
 	
 	@Child(name="collector", order=0, min=0, max=1, type={
@@ -1174,7 +1176,7 @@ public class Specimen extends BaseResource implements IResource {
      * Details concerning treatment and processing steps for the specimen
      * </p> 
 	 */
-	@Block(name="Specimen.treatment")	
+	@Block()	
 	public static class Treatment extends BaseElement implements IResourceBlock {
 	
 	@Child(name="description", type=StringDt.class, order=0, min=0, max=1)	
@@ -1359,7 +1361,7 @@ public class Specimen extends BaseResource implements IResource {
      * The container holding the specimen.  The recursive nature of containers; i.e. blood in tube in tray in rack is not addressed here.
      * </p> 
 	 */
-	@Block(name="Specimen.container")	
+	@Block()	
 	public static class Container extends BaseElement implements IResourceBlock {
 	
 	@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Substance.java

@@ -50,6 +50,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.QuantityDt;
@@ -94,6 +95,7 @@ public class Substance extends BaseResource implements IResource {
 	 * Path: <b>Substance.type</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="type", path="Substance.type", description="The type of the substance")
 	public static final String SP_TYPE = "type";
 
 	/**
@@ -104,6 +106,7 @@ public class Substance extends BaseResource implements IResource {
 	 * Path: <b>Substance.instance.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="Substance.instance.identifier", description="")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -114,6 +117,7 @@ public class Substance extends BaseResource implements IResource {
 	 * Path: <b>Substance.instance.expiry</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="expiry", path="Substance.instance.expiry", description="")
 	public static final String SP_EXPIRY = "expiry";
 
 	/**
@@ -124,6 +128,7 @@ public class Substance extends BaseResource implements IResource {
 	 * Path: <b>Substance.instance.quantity</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="quantity", path="Substance.instance.quantity", description="")
 	public static final String SP_QUANTITY = "quantity";
 
 	/**
@@ -134,6 +139,7 @@ public class Substance extends BaseResource implements IResource {
 	 * Path: <b>Substance.ingredient.substance</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="substance", path="Substance.ingredient.substance", description="")
 	public static final String SP_SUBSTANCE = "substance";
 
 
@@ -368,7 +374,7 @@ public class Substance extends BaseResource implements IResource {
      * Substance may be used to describe a kind of substance, or a specific package/container of the substance: an instance
      * </p> 
 	 */
-	@Block(name="Substance.instance")	
+	@Block()	
 	public static class Instance extends BaseElement implements IResourceBlock {
 	
 	@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=1)	
@@ -617,7 +623,7 @@ public class Substance extends BaseResource implements IResource {
      * A substance can be composed of other substances
      * </p> 
 	 */
-	@Block(name="Substance.ingredient")	
+	@Block()	
 	public static class Ingredient extends BaseElement implements IResourceBlock {
 	
 	@Child(name="quantity", type=RatioDt.class, order=0, min=0, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Supply.java

@@ -48,6 +48,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.composite.PeriodDt;
@@ -95,6 +96,7 @@ public class Supply extends BaseResource implements IResource {
 	 * Path: <b>Supply.kind</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="kind", path="Supply.kind", description="")
 	public static final String SP_KIND = "kind";
 
 	/**
@@ -105,6 +107,7 @@ public class Supply extends BaseResource implements IResource {
 	 * Path: <b>Supply.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="Supply.identifier", description="")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -115,6 +118,7 @@ public class Supply extends BaseResource implements IResource {
 	 * Path: <b>Supply.status</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="status", path="Supply.status", description="")
 	public static final String SP_STATUS = "status";
 
 	/**
@@ -125,6 +129,7 @@ public class Supply extends BaseResource implements IResource {
 	 * Path: <b>Supply.patient</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="patient", path="Supply.patient", description="")
 	public static final String SP_PATIENT = "patient";
 
 	/**
@@ -135,6 +140,7 @@ public class Supply extends BaseResource implements IResource {
 	 * Path: <b>Supply.dispense.supplier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="supplier", path="Supply.dispense.supplier", description="")
 	public static final String SP_SUPPLIER = "supplier";
 
 	/**
@@ -145,6 +151,7 @@ public class Supply extends BaseResource implements IResource {
 	 * Path: <b>Supply.dispense.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="dispenseid", path="Supply.dispense.identifier", description="")
 	public static final String SP_DISPENSEID = "dispenseid";
 
 	/**
@@ -155,6 +162,7 @@ public class Supply extends BaseResource implements IResource {
 	 * Path: <b>Supply.dispense.status</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="dispensestatus", path="Supply.dispense.status", description="")
 	public static final String SP_DISPENSESTATUS = "dispensestatus";
 
 
@@ -490,7 +498,7 @@ public class Supply extends BaseResource implements IResource {
      * Indicates the details of the dispense event such as the days supply and quantity of a supply dispensed.
      * </p> 
 	 */
-	@Block(name="Supply.dispense")	
+	@Block()	
 	public static class Dispense extends BaseElement implements IResourceBlock {
 	
 	@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Test.java

@@ -737,6 +737,24 @@ public class Test extends BaseResource implements IResource {
      * 
      * </p> 
      *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public Test addDecimalErr( long theValue) {
+		if (myDecimalErr == null) {
+			myDecimalErr = new java.util.ArrayList<DecimalDt>();
+		}
+		myDecimalErr.add(new DecimalDt(theValue));
+		return this; 
+	}
+
+	/**
+	 * Adds a new value for <b>decimalErr</b> (Decimals with invalid content)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * 
+     * </p> 
+     *
      * @return Returns a reference to this object, to allow for simple chaining.
 	 */
 	public Test addDecimalErr( double theValue) {
@@ -765,24 +783,6 @@ public class Test extends BaseResource implements IResource {
 		return this; 
 	}
 
-	/**
-	 * Adds a new value for <b>decimalErr</b> (Decimals with invalid content)
-	 *
-     * <p>
-     * <b>Definition:</b>
-     * 
-     * </p> 
-     *
-     * @return Returns a reference to this object, to allow for simple chaining.
-	 */
-	public Test addDecimalErr( long theValue) {
-		if (myDecimalErr == null) {
-			myDecimalErr = new java.util.ArrayList<DecimalDt>();
-		}
-		myDecimalErr.add(new DecimalDt(theValue));
-		return this; 
-	}
-
  
 	/**
 	 * Gets the value(s) for <b>decimalCorr</b> (Decimals with correct content).
@@ -851,6 +851,24 @@ public class Test extends BaseResource implements IResource {
      * 
      * </p> 
      *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public Test addDecimalCorr( long theValue) {
+		if (myDecimalCorr == null) {
+			myDecimalCorr = new java.util.ArrayList<DecimalDt>();
+		}
+		myDecimalCorr.add(new DecimalDt(theValue));
+		return this; 
+	}
+
+	/**
+	 * Adds a new value for <b>decimalCorr</b> (Decimals with correct content)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * 
+     * </p> 
+     *
      * @return Returns a reference to this object, to allow for simple chaining.
 	 */
 	public Test addDecimalCorr( double theValue) {
@@ -879,24 +897,6 @@ public class Test extends BaseResource implements IResource {
 		return this; 
 	}
 
-	/**
-	 * Adds a new value for <b>decimalCorr</b> (Decimals with correct content)
-	 *
-     * <p>
-     * <b>Definition:</b>
-     * 
-     * </p> 
-     *
-     * @return Returns a reference to this object, to allow for simple chaining.
-	 */
-	public Test addDecimalCorr( long theValue) {
-		if (myDecimalCorr == null) {
-			myDecimalCorr = new java.util.ArrayList<DecimalDt>();
-		}
-		myDecimalCorr.add(new DecimalDt(theValue));
-		return this; 
-	}
-
  
 	/**
 	 * Gets the value(s) for <b>b64Err</b> (Binaries with invalid content).
@@ -1123,11 +1123,11 @@ public class Test extends BaseResource implements IResource {
      *
      * @return Returns a reference to this object, to allow for simple chaining.
 	 */
-	public Test addInstantErr( Date theDate) {
+	public Test addInstantErr( Date theDate,  TemporalPrecisionEnum thePrecision) {
 		if (myInstantErr == null) {
 			myInstantErr = new java.util.ArrayList<InstantDt>();
 		}
-		myInstantErr.add(new InstantDt(theDate));
+		myInstantErr.add(new InstantDt(theDate, thePrecision));
 		return this; 
 	}
 
@@ -1141,11 +1141,11 @@ public class Test extends BaseResource implements IResource {
      *
      * @return Returns a reference to this object, to allow for simple chaining.
 	 */
-	public Test addInstantErr( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public Test addInstantErr( Date theDate) {
 		if (myInstantErr == null) {
 			myInstantErr = new java.util.ArrayList<InstantDt>();
 		}
-		myInstantErr.add(new InstantDt(theDate, thePrecision));
+		myInstantErr.add(new InstantDt(theDate));
 		return this; 
 	}
 
@@ -1219,11 +1219,11 @@ public class Test extends BaseResource implements IResource {
      *
      * @return Returns a reference to this object, to allow for simple chaining.
 	 */
-	public Test addInstantCorr( Date theDate) {
+	public Test addInstantCorr( Date theDate,  TemporalPrecisionEnum thePrecision) {
 		if (myInstantCorr == null) {
 			myInstantCorr = new java.util.ArrayList<InstantDt>();
 		}
-		myInstantCorr.add(new InstantDt(theDate));
+		myInstantCorr.add(new InstantDt(theDate, thePrecision));
 		return this; 
 	}
 
@@ -1237,11 +1237,11 @@ public class Test extends BaseResource implements IResource {
      *
      * @return Returns a reference to this object, to allow for simple chaining.
 	 */
-	public Test addInstantCorr( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public Test addInstantCorr( Date theDate) {
 		if (myInstantCorr == null) {
 			myInstantCorr = new java.util.ArrayList<InstantDt>();
 		}
-		myInstantCorr.add(new InstantDt(theDate, thePrecision));
+		myInstantCorr.add(new InstantDt(theDate));
 		return this; 
 	}
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/User.java

@@ -45,6 +45,7 @@ import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.ContactDt;
 import ca.uhn.fhir.model.dstu.composite.HumanNameDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
@@ -85,6 +86,7 @@ public class User extends BaseResource implements IResource {
 	 * Path: <b>User.name</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="name", path="User.name", description="")
 	public static final String SP_NAME = "name";
 
 	/**
@@ -95,6 +97,7 @@ public class User extends BaseResource implements IResource {
 	 * Path: <b>User.provider</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="provider", path="User.provider", description="")
 	public static final String SP_PROVIDER = "provider";
 
 	/**
@@ -105,6 +108,7 @@ public class User extends BaseResource implements IResource {
 	 * Path: <b>User.login</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="login", path="User.login", description="")
 	public static final String SP_LOGIN = "login";
 
 	/**
@@ -115,6 +119,7 @@ public class User extends BaseResource implements IResource {
 	 * Path: <b>User.level</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="level", path="User.level", description="")
 	public static final String SP_LEVEL = "level";
 
 	/**
@@ -125,6 +130,7 @@ public class User extends BaseResource implements IResource {
 	 * Path: <b>User.patient</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="patient", path="User.patient", description="")
 	public static final String SP_PATIENT = "patient";
 
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ValueSet.java

@@ -50,6 +50,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.dstu.composite.ContactDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
 import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum;
@@ -95,6 +96,7 @@ public class ValueSet extends BaseResource implements IResource {
 	 * Path: <b>ValueSet.identifier</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="identifier", path="ValueSet.identifier", description="The identifier of the value set")
 	public static final String SP_IDENTIFIER = "identifier";
 
 	/**
@@ -105,6 +107,7 @@ public class ValueSet extends BaseResource implements IResource {
 	 * Path: <b>ValueSet.version</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="version", path="ValueSet.version", description="The version identifier of the value set")
 	public static final String SP_VERSION = "version";
 
 	/**
@@ -115,6 +118,7 @@ public class ValueSet extends BaseResource implements IResource {
 	 * Path: <b>ValueSet.name</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="name", path="ValueSet.name", description="The name of the value set")
 	public static final String SP_NAME = "name";
 
 	/**
@@ -125,6 +129,7 @@ public class ValueSet extends BaseResource implements IResource {
 	 * Path: <b>ValueSet.publisher</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="publisher", path="ValueSet.publisher", description="Name of the publisher of the value set")
 	public static final String SP_PUBLISHER = "publisher";
 
 	/**
@@ -135,6 +140,7 @@ public class ValueSet extends BaseResource implements IResource {
 	 * Path: <b>ValueSet.description</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="description", path="ValueSet.description", description="Text search in the description of the value set")
 	public static final String SP_DESCRIPTION = "description";
 
 	/**
@@ -145,6 +151,7 @@ public class ValueSet extends BaseResource implements IResource {
 	 * Path: <b>ValueSet.status</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="status", path="ValueSet.status", description="The status of the value set")
 	public static final String SP_STATUS = "status";
 
 	/**
@@ -155,6 +162,7 @@ public class ValueSet extends BaseResource implements IResource {
 	 * Path: <b>ValueSet.date</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="date", path="ValueSet.date", description="The value set publication date")
 	public static final String SP_DATE = "date";
 
 	/**
@@ -165,6 +173,7 @@ public class ValueSet extends BaseResource implements IResource {
 	 * Path: <b>ValueSet.define.system</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="system", path="ValueSet.define.system", description="The system for any codes defined by this value set")
 	public static final String SP_SYSTEM = "system";
 
 	/**
@@ -175,6 +184,7 @@ public class ValueSet extends BaseResource implements IResource {
 	 * Path: <b>ValueSet.define.concept.code</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="code", path="ValueSet.define.concept.code", description="A code defined in the value set")
 	public static final String SP_CODE = "code";
 
 	/**
@@ -185,6 +195,7 @@ public class ValueSet extends BaseResource implements IResource {
 	 * Path: <b>ValueSet.compose.include.system</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="reference", path="ValueSet.compose.include.system", description="A code system included or excluded in the value set or an imported value set")
 	public static final String SP_REFERENCE = "reference";
 
 	/**
@@ -195,6 +206,7 @@ public class ValueSet extends BaseResource implements IResource {
 	 * Path: <b>ValueSet.compose.restricts</b><br/>
 	 * </p>
 	 */
+	@SearchParamDefinition(name="!restricts", path="ValueSet.compose.restricts", description="A value set listed in the restricts list")
 	public static final String SP_RESTRICTS = "!restricts";
 
 
@@ -926,7 +938,7 @@ public class ValueSet extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	@Block(name="ValueSet.define")	
+	@Block()	
 	public static class Define extends BaseElement implements IResourceBlock {
 	
 	@Child(name="system", type=UriDt.class, order=0, min=1, max=1)	
@@ -1176,7 +1188,7 @@ public class ValueSet extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	@Block(name="ValueSet.define.concept")	
+	@Block()	
 	public static class DefineConcept extends BaseElement implements IResourceBlock {
 	
 	@Child(name="code", type=CodeDt.class, order=0, min=1, max=1)	
@@ -1479,7 +1491,7 @@ public class ValueSet extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	@Block(name="ValueSet.compose")	
+	@Block()	
 	public static class Compose extends BaseElement implements IResourceBlock {
 	
 	@Child(name="import", type=UriDt.class, order=0, min=0, max=Child.MAX_UNLIMITED)	
@@ -1728,7 +1740,7 @@ public class ValueSet extends BaseResource implements IResource {
      * Include one or more codes from a code system
      * </p> 
 	 */
-	@Block(name="ValueSet.compose.include")	
+	@Block()	
 	public static class ComposeInclude extends BaseElement implements IResourceBlock {
 	
 	@Child(name="system", type=UriDt.class, order=0, min=1, max=1)	
@@ -2012,7 +2024,7 @@ public class ValueSet extends BaseResource implements IResource {
      * Select concepts by specify a matching criteria based on the properties (including relationships) defined by the system. If multiple filters are specified, they SHALL all be true.
      * </p> 
 	 */
-	@Block(name="ValueSet.compose.include.filter")	
+	@Block()	
 	public static class ComposeIncludeFilter extends BaseElement implements IResourceBlock {
 	
 	@Child(name="property", type=CodeDt.class, order=0, min=1, max=1)	
@@ -2198,7 +2210,7 @@ public class ValueSet extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	@Block(name="ValueSet.expansion")	
+	@Block()	
 	public static class Expansion extends BaseElement implements IResourceBlock {
 	
 	@Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=1)	
@@ -2333,8 +2345,8 @@ public class ValueSet extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Expansion setTimestampWithMillisPrecision( Date theDate) {
+	public Expansion setTimestamp( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myTimestamp = new InstantDt(theDate); 
+		myTimestamp = new InstantDt(theDate, thePrecision); 
 		return this; 
 	}
 
@@ -2346,8 +2358,8 @@ public class ValueSet extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public Expansion setTimestamp( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public Expansion setTimestampWithMillisPrecision( Date theDate) {
-		myTimestamp = new InstantDt(theDate, thePrecision); 
+		myTimestamp = new InstantDt(theDate); 
 		return this; 
 	}
 
@@ -2423,7 +2435,7 @@ public class ValueSet extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	@Block(name="ValueSet.expansion.contains")	
+	@Block()	
 	public static class ExpansionContains extends BaseElement implements IResourceBlock {
 	
 	@Child(name="system", type=UriDt.class, order=0, min=0, max=1)	

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BoundCodeableConceptDt.java

@@ -31,7 +31,7 @@ import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
 import ca.uhn.fhir.model.dstu.composite.CodingDt;
 
-@DatatypeDef(name = "CodeableConcept")
+@DatatypeDef(name = "CodeableConcept", isSpecialization=true)
 public class BoundCodeableConceptDt<T extends Enum<?>> extends CodeableConceptDt {
 
 	private IValueSetEnumBinder<T> myBinder;

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/InstantDt.java

@@ -38,10 +38,13 @@ public class InstantDt extends BaseDateTimeDt {
 	public static final TemporalPrecisionEnum DEFAULT_PRECISION = TemporalPrecisionEnum.MILLI;
 
 	/**
-	 * Constructor which creates an InstantDt with <b>no timne value</b>. Note that unlike the default constructor for the Java {@link Date} or {@link Calendar} objects, this constructor does not
+	 * Constructor which creates an InstantDt with <b>no timne value</b>. Note
-	 * initialize the object with the current time.
+	 * that unlike the default constructor for the Java {@link Date} or
+	 * {@link Calendar} objects, this constructor does not initialize the object
+	 * with the current time.
 	 * 
-	 * @see #withCurrentTime() to create a new object that has been initialized with the current time.
+	 * @see #withCurrentTime() to create a new object that has been initialized
+	 *      with the current time.
 	 */
 	public InstantDt() {
 		super();
@@ -67,7 +70,8 @@ public class InstantDt extends BaseDateTimeDt {
 	}
 
 	/**
-	 * Constructor which accepts a date value and a precision value. Valid precisions values for this type are:
+	 * Constructor which accepts a date value and a precision value. Valid
+	 * precisions values for this type are:
 	 * <ul>
 	 * <li>{@link TemporalPrecisionEnum#SECOND}
 	 * <li>{@link TemporalPrecisionEnum#MILLI}
@@ -84,13 +88,47 @@ public class InstantDt extends BaseDateTimeDt {
 	 * Create a new InstantDt from a string value
 	 * 
 	 * @param theString
-	 *            The string representation of the string. Must be in a valid format according to the FHIR specification
+	 *            The string representation of the string. Must be in a valid
+	 *            format according to the FHIR specification
 	 * @throws DataFormatException
 	 */
 	public InstantDt(String theString) {
 		setValueAsString(theString);
 	}
 
+	/**
+	 * Invokes {@link Date#after(Date)} on the contained Date against the given
+	 * date
+	 * 
+	 * @throws NullPointerException
+	 *             If the {@link #getValue() contained Date} is null
+	 */
+	public boolean after(Date theDate) {
+		return getValue().after(theDate);
+	}
+
+	/**
+	 * Invokes {@link Date#before(Date)} on the contained Date against the given
+	 * date
+	 * 
+	 * @throws NullPointerException
+	 *             If the {@link #getValue() contained Date} is null
+	 */
+	public boolean before(Date theDate) {
+		return getValue().before(theDate);
+	}
+
+	/**
+	 * Sets the value of this instant to the current time (from the system
+	 * clock) and the local/default timezone (as retrieved using
+	 * {@link TimeZone#getDefault()}. This TimeZone is generally obtained from
+	 * the underlying OS.
+	 */
+	public void setToCurrentTimeInLocalTimeZone() {
+		setValue(new Date());
+		setTimeZone(TimeZone.getDefault());
+	}
+
 	@Override
 	boolean isPrecisionAllowed(TemporalPrecisionEnum thePrecision) {
 		switch (thePrecision) {
@@ -103,16 +141,8 @@ public class InstantDt extends BaseDateTimeDt {
 	}
 
 	/**
-	 * Sets the value of this instant to the current time (from the system clock) and the local/default timezone (as retrieved using {@link TimeZone#getDefault()}. This TimeZone is generally obtained
+	 * Factory method which creates a new InstantDt and initializes it with the
-	 * from the underlying OS.
+	 * current time.
-	 */
-	public void setToCurrentTimeInLocalTimeZone() {
-		setValue(new Date());
-		setTimeZone(TimeZone.getDefault());
-	}
-
-	/**
-	 * Factory method which creates a new InstantDt and initializes it with the current time.
 	 */
 	public static InstantDt withCurrentTime() {
 		return new InstantDt(new Date());

hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java

@@ -61,6 +61,7 @@ import ca.uhn.fhir.context.RuntimeChildUndeclaredExtensionDefinition;
 import ca.uhn.fhir.context.RuntimeResourceDefinition;
 import ca.uhn.fhir.model.api.BaseBundle;
 import ca.uhn.fhir.model.api.Bundle;
+import ca.uhn.fhir.model.api.BundleCategory;
 import ca.uhn.fhir.model.api.BundleEntry;
 import ca.uhn.fhir.model.api.ExtensionDt;
 import ca.uhn.fhir.model.api.IElement;
@@ -181,6 +182,18 @@ public class JsonParser extends BaseParser implements IParser {
 			writeOptionalTagWithTextNode(eventWriter, "updated", nextEntry.getUpdated());
 			writeOptionalTagWithTextNode(eventWriter, "published", nextEntry.getPublished());
 
+			if (nextEntry.getCategories() != null) {
+				eventWriter.writeStartArray("category");
+				for (BundleCategory next : nextEntry.getCategories()) {
+					eventWriter.writeStartObject();
+					eventWriter.write("term", defaultString(next.getTerm()));
+					eventWriter.write("label", defaultString(next.getLabel()));
+					eventWriter.write("scheme", defaultString(next.getScheme()));
+					eventWriter.writeEnd();
+				}
+				eventWriter.writeEnd();
+			}
+
 			writeAuthor(nextEntry, eventWriter);
 
 			IResource resource = nextEntry.getResource();

hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java

@@ -67,9 +67,9 @@ class ParserState<T extends IElement> {
 
 	private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ParserState.class);
 	private FhirContext myContext;
+	private boolean myJsonMode;
 	private T myObject;
 	private BaseState myState;
-	private boolean myJsonMode;
 
 	private ParserState(FhirContext theContext, boolean theJsonMode) {
 		myContext = theContext;
@@ -101,6 +101,10 @@ class ParserState<T extends IElement> {
 		return myObject != null;
 	}
 
+	public boolean isPreResource() {
+		return myState.isPreResource();
+	}
+
 	public void string(String theData) {
 		myState.string(theData);
 	}
@@ -176,6 +180,15 @@ class ParserState<T extends IElement> {
 
 	public class AtomCategoryState extends BaseState {
 
+		private static final int STATE_LABEL = 2;
+		private static final int STATE_NONE = 0;
+
+		private static final int STATE_SCHEME = 3;
+
+		private static final int STATE_TERM = 1;
+
+		private int myCatState = STATE_NONE;
+
 		private BundleCategory myInstance;
 
 		public AtomCategoryState(BundleCategory theEntry) {
@@ -191,17 +204,47 @@ class ParserState<T extends IElement> {
 				myInstance.setLabel(theValue);
 			} else if ("scheme".equals(theName)) {
 				myInstance.setScheme(theValue);
+			} else if ("value".equals(theName)) {
+				// This is for the JSON parsing, which is weird for Categories..
+				switch (myCatState) {
+				case STATE_LABEL:
+					myInstance.setLabel(theValue);
+					break;
+				case STATE_TERM:
+					myInstance.setTerm(theValue);
+					break;
+				case STATE_SCHEME:
+					myInstance.setScheme(theValue);
+					break;
+				default:
+					super.string(theValue);
+					break;
+				}
+
 			}
 		}
 
 		@Override
 		public void endingElement() throws DataFormatException {
+			if (myCatState != STATE_NONE) {
+				myCatState = STATE_NONE;
+			} else {
 				pop();
 			}
+		}
 
 		@Override
-		public void enteringNewElement(String theNamespaceURI, String theLocalPart) throws DataFormatException {
+		public void enteringNewElement(String theNamespaceURI, String theName) throws DataFormatException {
-			throw new DataFormatException("Unexpected element: " + theLocalPart);
+			if (myCatState != STATE_NONE) {
+				throw new DataFormatException("Unexpected element in entry: " + theName);
+			}
+			if ("term".equals(theName)) {
+				myCatState = STATE_TERM;
+			} else if ("label".equals(theName)) {
+				myCatState = STATE_LABEL;
+			} else if ("scheme".equals(theName)) {
+				myCatState = STATE_SCHEME;
+			}
 		}
 
 	}
@@ -224,6 +267,33 @@ class ParserState<T extends IElement> {
 			pop();
 		}
 
+		@Override
+		public void enteringNewElement(String theNamespaceURI, String theLocalPart) throws DataFormatException {
+			if ("title".equals(theLocalPart)) {
+				push(new AtomPrimitiveState(myEntry.getTitle()));
+			} else if ("id".equals(theLocalPart)) {
+				push(new AtomPrimitiveState(myEntry.getId()));
+			} else if ("link".equals(theLocalPart)) {
+				push(new AtomLinkState(myEntry));
+			} else if ("updated".equals(theLocalPart)) {
+				push(new AtomPrimitiveState(myEntry.getUpdated()));
+			} else if ("published".equals(theLocalPart)) {
+				push(new AtomPrimitiveState(myEntry.getPublished()));
+			} else if ("author".equals(theLocalPart)) {
+				push(new AtomAuthorState(myEntry));
+			} else if ("content".equals(theLocalPart)) {
+				push(new PreResourceState(myEntry, myResourceType));
+			} else if ("summary".equals(theLocalPart)) {
+				push(new XhtmlState(getPreResourceState(), myEntry.getSummary(), false));
+			} else if ("category".equals(theLocalPart)) {
+				push(new AtomCategoryState(myEntry.addCategory()));
+			} else {
+				throw new DataFormatException("Unexpected element in entry: " + theLocalPart);
+			}
+
+			// TODO: handle category
+		}
+
 		private void populateResourceMetadata() {
 			if (myEntry.getResource() == null) {
 				return;
@@ -262,33 +332,6 @@ class ParserState<T extends IElement> {
 
 		}
 
-		@Override
-		public void enteringNewElement(String theNamespaceURI, String theLocalPart) throws DataFormatException {
-			if ("title".equals(theLocalPart)) {
-				push(new AtomPrimitiveState(myEntry.getTitle()));
-			} else if ("id".equals(theLocalPart)) {
-				push(new AtomPrimitiveState(myEntry.getId()));
-			} else if ("link".equals(theLocalPart)) {
-				push(new AtomLinkState(myEntry));
-			} else if ("updated".equals(theLocalPart)) {
-				push(new AtomPrimitiveState(myEntry.getUpdated()));
-			} else if ("published".equals(theLocalPart)) {
-				push(new AtomPrimitiveState(myEntry.getPublished()));
-			} else if ("author".equals(theLocalPart)) {
-				push(new AtomAuthorState(myEntry));
-			} else if ("content".equals(theLocalPart)) {
-				push(new PreResourceState(myEntry, myResourceType));
-			} else if ("summary".equals(theLocalPart)) {
-				push(new XhtmlState(getPreResourceState(), myEntry.getSummary(), false));
-			} else if ("category".equals(theLocalPart)) {
-				push(new AtomCategoryState(myEntry.addCategory()));
-			} else {
-				throw new DataFormatException("Unexpected element in entry: " + theLocalPart);
-			}
-
-			// TODO: handle category
-		}
-
 	}
 
 	private class AtomLinkState extends BaseState {
@@ -414,15 +457,19 @@ class ParserState<T extends IElement> {
 				push(new AtomPrimitiveState(myInstance.getBundleId()));
 			} else if ("link".equals(theLocalPart)) {
 				push(new AtomLinkState(myInstance));
-			} else if ("totalResults".equals(theLocalPart) && verifyNamespace(XmlParser.OPENSEARCH_NS, theNamespaceURI)) {
+			} else if ("totalResults".equals(theLocalPart) && (verifyNamespace(XmlParser.OPENSEARCH_NS, theNamespaceURI) || verifyNamespace(Constants.OPENSEARCH_NS_OLDER, theNamespaceURI))) {
 				push(new AtomPrimitiveState(myInstance.getTotalResults()));
 			} else if ("updated".equals(theLocalPart)) {
 				push(new AtomPrimitiveState(myInstance.getUpdated()));
 			} else if ("author".equals(theLocalPart)) {
 				push(new AtomAuthorState(myInstance));
+			} else {
+				if (theNamespaceURI != null) {
+					throw new DataFormatException("Unexpected element: {" + theNamespaceURI + "}" + theLocalPart);
 				} else {
 					throw new DataFormatException("Unexpected element: " + theLocalPart);
 				}
+			}
 
 			// TODO: handle category and DSig
 		}
@@ -481,6 +528,10 @@ class ParserState<T extends IElement> {
 			return myPreResourceState;
 		}
 
+		public boolean isPreResource() {
+			return false;
+		}
+
 		public void setStack(BaseState theState) {
 			myStack = theState;
 		}
@@ -501,10 +552,6 @@ class ParserState<T extends IElement> {
 			return null;
 		}
 
-		public boolean isPreResource() {
-			return false;
-		}
-
 	}
 
 	private class ContainedResourcesState extends PreResourceState {
@@ -614,29 +661,6 @@ class ParserState<T extends IElement> {
 
 	}
 
-	private class SwallowChildrenWholeState extends BaseState {
-
-		private int myDepth;
-
-		public SwallowChildrenWholeState(PreResourceState thePreResourceState) {
-			super(thePreResourceState);
-		}
-
-		@Override
-		public void endingElement() throws DataFormatException {
-			myDepth--;
-			if (myDepth < 0) {
-				pop();
-			}
-		}
-
-		@Override
-		public void enteringNewElement(String theNamespaceURI, String theLocalPart) throws DataFormatException {
-			myDepth++;
-		}
-
-	}
-
 	private class ElementCompositeState extends BaseState {
 
 		private BaseRuntimeElementCompositeDefinition<?> myDefinition;
@@ -878,11 +902,6 @@ class ParserState<T extends IElement> {
 
 		private Class<? extends IResource> myResourceType;
 
-		@Override
-		public boolean isPreResource() {
-			return true;
-		}
-
 		public PreResourceState(BundleEntry theEntry, Class<? extends IResource> theResourceType) {
 			super(null);
 			myEntry = theEntry;
@@ -939,6 +958,11 @@ class ParserState<T extends IElement> {
 			return myResourceReferences;
 		}
 
+		@Override
+		public boolean isPreResource() {
+			return true;
+		}
+
 		@SuppressWarnings("unchecked")
 		@Override
 		public void wereBack() {
@@ -1090,6 +1114,29 @@ class ParserState<T extends IElement> {
 		DISPLAY, INITIAL, REFERENCE
 	}
 
+	private class SwallowChildrenWholeState extends BaseState {
+
+		private int myDepth;
+
+		public SwallowChildrenWholeState(PreResourceState thePreResourceState) {
+			super(thePreResourceState);
+		}
+
+		@Override
+		public void endingElement() throws DataFormatException {
+			myDepth--;
+			if (myDepth < 0) {
+				pop();
+			}
+		}
+
+		@Override
+		public void enteringNewElement(String theNamespaceURI, String theLocalPart) throws DataFormatException {
+			myDepth++;
+		}
+
+	}
+
 	private class XhtmlState extends BaseState {
 		private int myDepth;
 		private XhtmlDt myDt;
@@ -1150,8 +1197,4 @@ class ParserState<T extends IElement> {
 
 	}
 
-	public boolean isPreResource() {
-		return myState.isPreResource();
-	}
-
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java

@@ -20,8 +20,7 @@ package ca.uhn.fhir.parser;
  * #L%
  */
 
-import static org.apache.commons.lang3.StringUtils.isBlank;
+import static org.apache.commons.lang3.StringUtils.*;
-import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
 import java.io.Reader;
 import java.io.StringWriter;
@@ -57,6 +56,7 @@ import ca.uhn.fhir.context.RuntimeChildNarrativeDefinition;
 import ca.uhn.fhir.context.RuntimeChildUndeclaredExtensionDefinition;
 import ca.uhn.fhir.context.RuntimeResourceDefinition;
 import ca.uhn.fhir.model.api.Bundle;
+import ca.uhn.fhir.model.api.BundleCategory;
 import ca.uhn.fhir.model.api.BundleEntry;
 import ca.uhn.fhir.model.api.ExtensionDt;
 import ca.uhn.fhir.model.api.IElement;
@@ -74,7 +74,6 @@ import ca.uhn.fhir.narrative.INarrativeGenerator;
 import ca.uhn.fhir.util.PrettyPrintWriterWrapper;
 
 public class XmlParser extends BaseParser implements IParser {
-	@SuppressWarnings("unused")
 	private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(XmlParser.class);
 	static final String ATOM_NS = "http://www.w3.org/2005/Atom";
 	static final String FHIR_NS = "http://hl7.org/fhir";
@@ -147,6 +146,16 @@ public class XmlParser extends BaseParser implements IParser {
 				writeOptionalTagWithTextNode(eventWriter, "updated", nextEntry.getUpdated());
 				writeOptionalTagWithTextNode(eventWriter, "published", nextEntry.getPublished());
 
+				if (nextEntry.getCategories() != null) {
+					for (BundleCategory next : nextEntry.getCategories()) {
+						eventWriter.writeStartElement("category");
+						eventWriter.writeAttribute("term", defaultString(next.getTerm()));
+						eventWriter.writeAttribute("label", defaultString(next.getLabel()));
+						eventWriter.writeAttribute("scheme", defaultString(next.getScheme()));
+						eventWriter.writeEndElement();
+					}
+				}
+				
 				if (!nextEntry.getLinkSelf().isEmpty()) {
 					writeAtomLink(eventWriter, "self", nextEntry.getLinkSelf());
 				}
@@ -155,7 +164,11 @@ public class XmlParser extends BaseParser implements IParser {
 				eventWriter.writeAttribute("type", "text/xml");
 
 				IResource resource = nextEntry.getResource();
+				if (resource != null) {
 					encodeResourceToXmlStreamWriter(resource, eventWriter, false);
+				} else {
+					ourLog.warn("Bundle entry contains null resource");
+				}
 
 				eventWriter.writeEndElement(); // content
 				eventWriter.writeEndElement(); // entry
@@ -193,7 +206,6 @@ public class XmlParser extends BaseParser implements IParser {
 		}
 	}
 
-
 	@Override
 	public <T extends IResource> Bundle parseBundle(Class<T> theResourceType, Reader theReader) {
 		XMLEventReader streamReader;
@@ -301,8 +313,8 @@ public class XmlParser extends BaseParser implements IParser {
 		}
 	}
 
-	private void encodeChildElementToStreamWriter(RuntimeResourceDefinition theResDef, IResource theResource, XMLStreamWriter theEventWriter, IElement nextValue, String childName,
+	private void encodeChildElementToStreamWriter(RuntimeResourceDefinition theResDef, IResource theResource, XMLStreamWriter theEventWriter, IElement nextValue, String childName, BaseRuntimeElementDefinition<?> childDef, String theExtensionUrl, boolean theIncludedResource)
-			BaseRuntimeElementDefinition<?> childDef, String theExtensionUrl, boolean theIncludedResource) throws XMLStreamException, DataFormatException {
+			throws XMLStreamException, DataFormatException {
 		if (nextValue.isEmpty()) {
 			return;
 		}
@@ -366,8 +378,8 @@ public class XmlParser extends BaseParser implements IParser {
 
 	}
 
-	private void encodeCompositeElementChildrenToStreamWriter(RuntimeResourceDefinition theResDef, IResource theResource, IElement theElement, XMLStreamWriter theEventWriter,
+	private void encodeCompositeElementChildrenToStreamWriter(RuntimeResourceDefinition theResDef, IResource theResource, IElement theElement, XMLStreamWriter theEventWriter, List<? extends BaseRuntimeChildDefinition> children, boolean theIncludedResource)
-			List<? extends BaseRuntimeChildDefinition> children, boolean theIncludedResource) throws XMLStreamException, DataFormatException {
+			throws XMLStreamException, DataFormatException {
 		for (BaseRuntimeChildDefinition nextChild : children) {
 			if (nextChild instanceof RuntimeChildNarrativeDefinition && !theIncludedResource) {
 				INarrativeGenerator gen = myContext.getNarrativeGenerator();
@@ -418,8 +430,8 @@ public class XmlParser extends BaseParser implements IParser {
 		}
 	}
 
-	private void encodeCompositeElementToStreamWriter(RuntimeResourceDefinition theResDef, IResource theResource, IElement theElement, XMLStreamWriter theEventWriter,
+	private void encodeCompositeElementToStreamWriter(RuntimeResourceDefinition theResDef, IResource theResource, IElement theElement, XMLStreamWriter theEventWriter, BaseRuntimeElementCompositeDefinition<?> resDef, boolean theIncludedResource) throws XMLStreamException,
-			BaseRuntimeElementCompositeDefinition<?> resDef, boolean theIncludedResource) throws XMLStreamException, DataFormatException {
+			DataFormatException {
 		encodeExtensionsIfPresent(theResDef, theResource, theEventWriter, theElement, theIncludedResource);
 		encodeCompositeElementChildrenToStreamWriter(theResDef, theResource, theElement, theEventWriter, resDef.getExtensions(), theIncludedResource);
 		encodeCompositeElementChildrenToStreamWriter(theResDef, theResource, theElement, theEventWriter, resDef.getChildren(), theIncludedResource);
@@ -455,7 +467,9 @@ public class XmlParser extends BaseParser implements IParser {
 
 	/**
 	 * @param theIncludedResource
-	 *            Set to true only if this resource is an "included" resource, as opposed to a "root level" resource by itself or in a bundle entry
+	 *            Set to true only if this resource is an "included" resource,
+	 *            as opposed to a "root level" resource by itself or in a bundle
+	 *            entry
 	 * 
 	 */
 	private void encodeResourceToXmlStreamWriter(IResource theResource, XMLStreamWriter theEventWriter, boolean theIncludedResource) throws XMLStreamException, DataFormatException {
@@ -478,8 +492,7 @@ public class XmlParser extends BaseParser implements IParser {
 		theEventWriter.writeEndElement();
 	}
 
-	private void encodeUndeclaredExtensions(RuntimeResourceDefinition theResDef, IResource theResource, XMLStreamWriter theWriter, List<ExtensionDt> extensions, String tagName, boolean theIncludedResource)
+	private void encodeUndeclaredExtensions(RuntimeResourceDefinition theResDef, IResource theResource, XMLStreamWriter theWriter, List<ExtensionDt> extensions, String tagName, boolean theIncludedResource) throws XMLStreamException, DataFormatException {
-			throws XMLStreamException, DataFormatException {
 		for (ExtensionDt next : extensions) {
 			theWriter.writeStartElement(tagName);
 			theWriter.writeAttribute("url", next.getUrl().getValue());

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Sort.java

@@ -1,5 +1,25 @@
 package ca.uhn.fhir.rest.annotation;
 
+/*
+ * #%L
+ * HAPI FHIR Library
+ * %%
+ * Copyright (C) 2014 University Health Network
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/SortOrderEnum.java

@@ -1,5 +1,25 @@
 package ca.uhn.fhir.rest.api;
 
+/*
+ * #%L
+ * HAPI FHIR Library
+ * %%
+ * Copyright (C) 2014 University Health Network
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
 public enum SortOrderEnum {
 
 	ASC,

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/SortSpec.java

@@ -1,5 +1,25 @@
 package ca.uhn.fhir.rest.api;
 
+/*
+ * #%L
+ * HAPI FHIR Library
+ * %%
+ * Copyright (C) 2014 University Health Network
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
 /**
  * Represents values for <a
  * href="http://hl7.org/implement/standards/fhir/search.html#sort">sorting</a>

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/BaseClientInvocation.java

@@ -22,14 +22,26 @@ package ca.uhn.fhir.rest.client;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import org.apache.http.Header;
 import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.http.message.BasicHeader;
 
 public abstract class BaseClientInvocation {
 
+	private List<Header> myHeaders;
+
+	public void addHeader(String theName, String theValue) {
+		if (myHeaders == null) {
+			myHeaders = new ArrayList<Header>();
+		}
+		myHeaders.add(new BasicHeader(theName, theValue));
+	}
+
 	/**
 	 * Create an HTTP request out of this client request
 	 * 
@@ -64,4 +76,12 @@ public abstract class BaseClientInvocation {
 		}
 	}
 
+	public void addHeadersToRequest(HttpRequestBase theHttpRequest) {
+		if (myHeaders != null) {
+			for (Header next : myHeaders) {
+				theHttpRequest.addHeader(next);
+			}
+		}
+	}
+
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/BaseClientInvocationWithContents.java

@@ -42,7 +42,6 @@ public abstract class BaseClientInvocationWithContents extends BaseClientInvocat
 
 	private final Bundle myBundle;
 	private final FhirContext myContext;
-	private List<Header> myHeaders;
 	private final IResource myResource;
 	private String myUrlExtension;
 
@@ -61,13 +60,6 @@ public abstract class BaseClientInvocationWithContents extends BaseClientInvocat
 		myUrlExtension = theUrlExtension;
 	}
 
-	public void addHeader(String theName, String theValue) {
-		if (myHeaders == null) {
-			myHeaders = new ArrayList<Header>();
-		}
-		myHeaders.add(new BasicHeader(theName, theValue));
-	}
-
 	@Override
 	public HttpRequestBase asHttpRequest(String theUrlBase, Map<String, List<String>> theExtraParams) throws DataFormatException {
 		StringBuilder b = new StringBuilder();
@@ -83,13 +75,9 @@ public abstract class BaseClientInvocationWithContents extends BaseClientInvocat
 		String contents = myContext.newXmlParser().encodeResourceToString(myResource);
 		StringEntity entity = new StringEntity(contents, ContentType.create(Constants.CT_FHIR_XML, "UTF-8"));
 
-		HttpRequestBase http = createRequest(url, entity);
+		HttpRequestBase retVal = createRequest(url, entity);
-		if (myHeaders != null) {
+		super.addHeadersToRequest(retVal);
-			for (Header next : myHeaders) {
+		return retVal;
-				http.addHeader(next);
-			}
-		}
-		return http;
 	}
 
 	protected abstract HttpRequestBase createRequest(String url, StringEntity theEntity);

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/DeleteClientInvocation.java

@@ -48,6 +48,7 @@ public class DeleteClientInvocation extends BaseClientInvocation {
 		appendExtraParamsWithQuestionMark(theExtraParams, b,true);
 
 		HttpDelete retVal = new HttpDelete(b.toString());
+		super.addHeadersToRequest(retVal);
 		return retVal;
 	}
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/GenericClient.java

@@ -175,6 +175,7 @@ public class GenericClient extends BaseClient implements IGenericClient {
 		return resp;
 	}
 
+	@Override
 	public MethodOutcome create(IResource theResource) {
 		BaseClientInvocation invocation = CreateMethodBinding.createCreateInvocation(theResource, myContext);
 		if (isKeepResponses()) {

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/GetClientInvocation.java

@@ -95,7 +95,10 @@ public class GetClientInvocation extends BaseClientInvocation {
 		
 		appendExtraParamsWithQuestionMark(theExtraParams, b, first);
 		
-		return new HttpGet(b.toString());
+		HttpGet retVal = new HttpGet(b.toString());
+		super.addHeadersToRequest(retVal);
+		
+		return retVal;
 	}
 
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/IGenericClient.java

@@ -98,4 +98,11 @@ public interface IGenericClient {
 	 */
 	Conformance conformance();
 
+	/**
+	 * Implementation of the "type create" method.
+	 * @param theResource The resource to create
+	 * @return An outcome
+	 */
+	MethodOutcome create(IResource theResource);
+
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IRestfulClient.java

@@ -24,6 +24,7 @@ package ca.uhn.fhir.rest.client.api;
 import org.apache.http.client.HttpClient;
 
 import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.rest.server.EncodingEnum;
 
 public interface IRestfulClient {
 
@@ -31,6 +32,21 @@ public interface IRestfulClient {
 	
 	HttpClient getHttpClient();
 	
+	/**
+	 * Specifies that the client should use the given encoding to do its 
+	 * queries. This means that the client will append the "_format" param
+	 * to GET methods (read/search/etc), and will add an appropriate header for
+	 * write methods. 
+	 */
+	void setEncoding(EncodingEnum theEncoding);
+	
+	/**
+	 * Specifies that the client should request that the server respond with "pretty printing"
+	 * enabled. Note that this is a non-standard parameter, so it may only 
+	 * work against HAPI based servers.
+	 */
+	void setPrettyPrint(boolean thePrettyPrint);
+	
 	/**
 	 * Base URL for the server, with no trailing "/"
 	 */

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseMethodBinding.java

@@ -116,6 +116,14 @@ public abstract class BaseMethodBinding implements IClientResponseHandler {
 			parser = getContext().newXmlParser();
 		} else if (Constants.CT_FHIR_XML.equals(theResponseMimeType)) {
 			parser = getContext().newXmlParser();
+		} else if (Constants.CT_FHIR_JSON.equals(theResponseMimeType)) {
+			parser = getContext().newJsonParser(); // TODO: move all this so it only happens in one place in the lib, and maybe use a hashmap? 
+		} else if ("application/json".equals(theResponseMimeType)) {
+			parser = getContext().newJsonParser();
+		} else if ("application/xml".equals(theResponseMimeType)) {
+			parser = getContext().newXmlParser(); 
+		} else if ("text/xml".equals(theResponseMimeType)) {
+			parser = getContext().newXmlParser(); 
 		} else {
 			throw new NonFhirResponseException("Response contains non-FHIR content-type: " + theResponseMimeType, theResponseMimeType, theResponseStatusCode, IOUtils.toString(theResponseReader));
 		}
@@ -185,7 +193,7 @@ public abstract class BaseMethodBinding implements IClientResponseHandler {
 						+ " - Must return a resource type or a collection (List, Set) of a resource type");
 			}
 		} else {
-			if (!verifyIsValidResourceReturnType(returnTypeFromMethod)) {
+			if (!IResource.class.equals(returnTypeFromMethod) && !verifyIsValidResourceReturnType(returnTypeFromMethod)) {
 				throw new ConfigurationException("Method '" + theMethod.getName() + "' from " + IResourceProvider.class.getSimpleName() + " type " + theMethod.getDeclaringClass().getCanonicalName() + " returns " + toLogString(returnTypeFromMethod)
 						+ " - Must return a resource type");
 			}

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseOutcomeReturningMethodBinding.java

@@ -347,8 +347,10 @@ public abstract class BaseOutcomeReturningMethodBinding extends BaseMethodBindin
 
 				if (reader != null) {
 					IParser parser = ct.newParser(theContext);
-					OperationOutcome outcome = parser.parseResource(OperationOutcome.class, reader);
+					IResource outcome = parser.parseResource(reader);
-					retVal.setOperationOutcome(outcome);
+					if (outcome instanceof OperationOutcome) {
+						retVal.setOperationOutcome((OperationOutcome) outcome);
+					}
 				}
 
 			} else {