Bug 533289 - Generated dialogs do not respect the 'baseuri' context
param
Changed to use URIBuilder with OSLC4JUtils.getServletURI() &
uriInfo.getPath()
Change-Id: I14c32de7e306eb98eb66c3bf429cae38d8192329
Signed-off-by: Jad El-khoury <jad@kth.se>
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceService.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceService.mtl
index 31d2cde..5cccd4e 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceService.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceService.mtl
@@ -245,7 +245,7 @@
// [protected (dialogMethodName(aSelectionDialog, true).concat('_init'))]
// [/protected]
- httpServletRequest.setAttribute("selectionUri",uriInfo.getAbsolutePath().toString());
+ httpServletRequest.setAttribute("selectionUri",UriBuilder.fromUri(OSLC4JUtils.getServletURI()).path(uriInfo.getPath()).build().toString());
// [protected (dialogMethodName(aSelectionDialog, true).concat('_setAttributes'))]
// [/protected]
@@ -326,7 +326,7 @@
// [protected (dialogMethodName(aCreationDialog, false))]
// [/protected]
- httpServletRequest.setAttribute("creatorUri", uriInfo.getAbsolutePath().toString());
+ httpServletRequest.setAttribute("creatorUri", UriBuilder.fromUri(OSLC4JUtils.getServletURI()).path(uriInfo.getPath()).build().toString());
[for (aPathParameter: String | JAXRSPathParameters(aCreationDialog.URI(false)))]
httpServletRequest.setAttribute("[aPathParameter/]", [aPathParameter/]);
[/for]
