You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by og...@apache.org on 2011/03/31 13:54:32 UTC
svn commit: r1087261 - in
/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main:
java/org/apache/stanbol/enhancer/jersey/resource/
resources/org/apache/stanbol/enhancer/jersey/templates/imports/
resources/org/apache/stanbol/enh...
Author: ogrisel
Date: Thu Mar 31 11:54:31 2011
New Revision: 1087261
URL: http://svn.apache.org/viewvc?rev=1087261&view=rev
Log:
STANBOL-120: more fixes for links
Modified:
incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java
incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/StoreRootResource.java
incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/contentitem.ftl
incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/sparql.ftl
incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/EnginesRootResource/index.ftl
incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/StoreRootResource/index.ftl
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java?rev=1087261&r1=1087260&r2=1087261&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java Thu Mar 31 11:54:31 2011
@@ -118,14 +118,14 @@ public class ContentItemResource extends
this.servletContext = servletContext;
if (localId != null) {
- URI rawURI = UriBuilder.fromPath("/store/raw/" + localId).build();
+ URI rawURI = uriInfo.getBaseUriBuilder().path("/store/raw").path(localId).build();
if (ci.getMimeType().equals("text/plain")) {
this.textContent = IOUtils.toString(ci.getStream(), "UTF-8");
} else if (ci.getMimeType().startsWith("image/")) {
this.imageSrc = rawURI;
}
this.downloadHref = rawURI;
- this.metadataHref = UriBuilder.fromPath("/store/metadata/" + localId).build();
+ this.metadataHref = uriInfo.getBaseUriBuilder().path("/store/metadata").path(localId).build();
}
}
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/StoreRootResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/StoreRootResource.java?rev=1087261&r1=1087260&r2=1087261&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/StoreRootResource.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/StoreRootResource.java Thu Mar 31 11:54:31 2011
@@ -269,20 +269,20 @@ public class StoreRootResource extends B
// handle smart redirection to browser view
for (MediaType mt : headers.getAcceptableMediaTypes()) {
if (mt.toString().startsWith(TEXT_HTML)) {
- return Response.temporaryRedirect(
- UriBuilder.fromPath("/store/page/" + localId).build()).build();
+ URI pageUri = uriInfo.getBaseUriBuilder().path("/store/page").path(localId).build();
+ return Response.temporaryRedirect(pageUri).build();
}
}
// handle smart redirection to RDF metadata view
for (MediaType mt : headers.getAcceptableMediaTypes()) {
if (RDF_MEDIA_TYPES.contains(mt.toString())) {
- return Response.temporaryRedirect(
- UriBuilder.fromPath("/store/metadata/" + localId).build()).build();
+ URI metadataUri = uriInfo.getBaseUriBuilder().path("/store/metadata").path(localId).build();
+ return Response.temporaryRedirect(metadataUri).build();
}
}
- return Response.temporaryRedirect(
- UriBuilder.fromPath("/store/raw/" + localId).build()).build();
+ URI rawUri = uriInfo.getBaseUriBuilder().path("/store/raw").path(localId).build();
+ return Response.temporaryRedirect(rawUri).build();
}
@GET
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/contentitem.ftl
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/contentitem.ftl?rev=1087261&r1=1087260&r2=1087261&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/contentitem.ftl (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/contentitem.ftl Thu Mar 31 11:54:31 2011
@@ -57,7 +57,7 @@ $(document).ready(function() {
};
var graphic = new OpenLayers.Layer.Image(
'Default World Map',
- '/static/images/world_map_1024_512.png',
+ '${it.staticRootUrl}/images/world_map_1024_512.png',
extent,
new OpenLayers.Size(1024, 512),
options
@@ -103,7 +103,7 @@ $(document).ready(function() {
var position = new OpenLayers.LonLat(long, lat);
var iconSize = new OpenLayers.Size(32, 32);
var offset = new OpenLayers.Pixel(-(iconSize.w/2), -iconSize.h);
- var markerIcon = new OpenLayers.Icon('/static/images/pin_map_32.png', iconSize, offset);
+ var markerIcon = new OpenLayers.Icon('${it.staticRootUrl}/images/pin_map_32.png', iconSize, offset);
var popupSize = new OpenLayers.Size(200, 20);
var marker = new OpenLayers.Marker(position, markerIcon);
var popup = new OpenLayers.Popup.Anchored("popup-" + id, position, popupSize, label, markerIcon, false);
@@ -117,11 +117,10 @@ $(document).ready(function() {
})(lat, long);
}
-
});
</script>
</div>
</#if>
-</#macro>
\ No newline at end of file
+</#macro>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/sparql.ftl
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/sparql.ftl?rev=1087261&r1=1087260&r2=1087261&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/sparql.ftl (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/sparql.ftl Thu Mar 31 11:54:31 2011
@@ -1,5 +1,5 @@
<#macro form>
-<form id="sparql" action="/sparql" method="GET"
+<form id="sparql" action="${it.rootUrl}/sparql" method="GET"
enctype="application/x-www-form-urlencoded"
accept="application/sparql-results+xml, application/rdf+xml">
<textarea class="query" rows="11" name="query">
@@ -30,7 +30,7 @@ function registersSparqlHandler() {
// submit sparql query using Ajax
$.ajax({
type: "POST",
- url: "/sparql",
+ url: "${it.rootUrl}/sparql",
data: {query: $("#sparql textarea.query").val()},
dataType: "html",
cache: false,
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/EnginesRootResource/index.ftl
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/EnginesRootResource/index.ftl?rev=1087261&r1=1087260&r2=1087261&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/EnginesRootResource/index.ftl (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/EnginesRootResource/index.ftl Thu Mar 31 11:54:31 2011
@@ -80,7 +80,7 @@ function registerFormHandler() {
--></script>
<div id="enginesOuputWaiter" style="display: none">
<p>the Stanbol enhancer is analysing your content...</p>
- <p><img alt="Waiting..." src="/static/images/ajax-loader.gif" /></p>
+ <p><img alt="Waiting..." src="${it.staticRootUrl}/images/ajax-loader.gif" /></p>
</div>
<p id="enginesOuput"></p>
</#if>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/StoreRootResource/index.ftl
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/StoreRootResource/index.ftl?rev=1087261&r1=1087260&r2=1087261&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/StoreRootResource/index.ftl (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/StoreRootResource/index.ftl Thu Mar 31 11:54:31 2011
@@ -10,14 +10,14 @@
<tr>
<th>Local ID</th>
<th>Media type</th>
- <th>Enhancements <img src="/static/images/rdf.png"
+ <th>Enhancements <img src="${it.staticRootUrl}/images/rdf.png"
alt="Format: RDF"/></th>
</tr>
<#list it.recentlyEnhancedItems as item>
<tr>
<td><a href="${item.uri}" title="${item.uri}">${item.localId}</a></td>
<td>${item.mimetype}</td>
- <td><a href="/store/metadata/${item.localId}">${item.enhancements}</a></td>
+ <td><a href="${it.rootUrl}/store/metadata/${item.localId}">${item.enhancements}</a></td>
</tr>
</#list>
</ul>
@@ -100,7 +100,7 @@ done
<p>For instance:</p>
<pre>
curl -i -X POST -H "Content-Type:text/plain" \
- --data "The Stanbol enhacer can detect famous cities such as Paris." \
+ --data "The Stanbol enhancer can detect famous cities such as Paris." \
${it.publicBaseUri}store
HTTP/1.1 201 Created