### Eclipse Workspace Patch 1.0 #P org.teiid.designer.dqp.ui Index: src/org/teiid/designer/runtime/ui/GenerateRestWarAction.java =================================================================== --- src/org/teiid/designer/runtime/ui/GenerateRestWarAction.java (revision 1782) +++ src/org/teiid/designer/runtime/ui/GenerateRestWarAction.java (working copy) @@ -230,11 +230,12 @@ int parameterCount = ((ProcedureImpl)eObject).getParameters().size(); int uriParameterCount = 0; RestProcedure restProcedure = new RestProcedure(); - restMethod = ANNOTATION_HELPER.getPropertyValue(eObject, ModelObjectAnnotationHelper.EXTENDED_PROPERTY_NAMESPACE - + "REST-METHOD"); //$NON-NLS-1$ + restMethod = ANNOTATION_HELPER.getPropertyValueAnyCase(eObject, ModelObjectAnnotationHelper.EXTENDED_PROPERTY_NAMESPACE + + "REST-METHOD"); //$NON-NLS-1$ if (restMethod != null) { - uri = ANNOTATION_HELPER.getPropertyValue(eObject, ModelObjectAnnotationHelper.EXTENDED_PROPERTY_NAMESPACE + "URI"); //$NON-NLS-1$ + uri = ANNOTATION_HELPER.getPropertyValueAnyCase(eObject, ModelObjectAnnotationHelper.EXTENDED_PROPERTY_NAMESPACE + + "URI"); //$NON-NLS-1$ if (uri != null) { // Get all child EObjects for this procedure EList contents = eObject.eContents(); #P org.teiid.designer.core Index: src/com/metamatrix/modeler/internal/core/workspace/ModelObjectAnnotationHelper.java =================================================================== --- src/com/metamatrix/modeler/internal/core/workspace/ModelObjectAnnotationHelper.java (revision 1775) +++ src/com/metamatrix/modeler/internal/core/workspace/ModelObjectAnnotationHelper.java (working copy) @@ -68,6 +68,34 @@ } /** + * Retrieves the value of an object stored on an Annotation in the tags map based on the input key uses upper and + * lower case (excluding the namespace which is always lower case). + * + * @param modelObject the EObject. may not be null; + * @param key the key for the mapped value. may not be null; + * @return the object value stored in the annotation's tags + * @throws ModelerCoreException + */ + public Object getPropertyValueAnyCase( final EObject modelObject, + final String key ) throws ModelerCoreException { + CoreArgCheck.isNotNull(modelObject, "modelObject"); //$NON-NLS-1$ + CoreArgCheck.isNotNull(key, "key"); //$NON-NLS-1$ + Annotation annotation = getModelObjectAnnotation(modelObject, false); + if (annotation != null) { + int beginIndex = key.indexOf(":"); //$NON-NLS-1$ + String upperCase = key.substring(0, beginIndex) + key.substring(beginIndex).toUpperCase(); + Object tag = annotation.getTags().get(upperCase); + if (tag == null) { + String lowerCase = key.substring(0, beginIndex) + key.substring(beginIndex).toLowerCase(); + tag = annotation.getTags().get(lowerCase); + } + return tag; + + } + return null; + } + + /** * Returns all properties who's keys are prefixed with the given name-space prefix * * @param modelObject the EObject. may not be null;