Author: fchrist
Date: Wed Mar 30 13:41:24 2011
New Revision: 1086952
URL: http://svn.apache.org/viewvc?rev=1086952&view=rev
Log:
STANBOL-136 use the configured alias when creating links in the current web UI.
Fixed.
Modified:
incubator/stanbol/trunk/enhancer/generic/jsonld/src/main/java/org/apache/stanbol/jsonld/JsonLd.java
incubator/stanbol/trunk/enhancer/generic/jsonld/src/test/java/org/apache/stanbol/jsonld/JsonLdTest.java
incubator/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/NavigationMixin.java
incubator/stanbol/trunk/enhancer/jersey/src/main/resources/META-INF/templates/imports/common.ftl
incubator/stanbol/trunk/enhancer/jersey/src/main/resources/META-INF/templates/org/apache/stanbol/enhancer/jersey/resource/EnginesRootResource/index.ftl
Modified:
incubator/stanbol/trunk/enhancer/generic/jsonld/src/main/java/org/apache/stanbol/jsonld/JsonLd.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/generic/jsonld/src/main/java/org/apache/stanbol/jsonld/JsonLd.java?rev=1086952&r1=1086951&r2=1086952&view=diff
==============================================================================
---
incubator/stanbol/trunk/enhancer/generic/jsonld/src/main/java/org/apache/stanbol/jsonld/JsonLd.java
(original)
+++
incubator/stanbol/trunk/enhancer/generic/jsonld/src/main/java/org/apache/stanbol/jsonld/JsonLd.java
Wed Mar 30 13:41:24 2011
@@ -9,8 +9,9 @@ import java.util.Map;
import java.util.TreeMap;
/**
- * @author Fabian Christ
- *
+ * JSON-LD serialization API.
+ *
+ * @author fabianc
*/
public class JsonLd {
@@ -25,7 +26,7 @@ public class JsonLd {
* to shorten IRIs to prefix notation during serialization. Default
* value is <code>true</code>.<br />
* <br />
- * If you already put values into this JSON-LD instance with prefix
+ * <b>Note:</b> If you already put values into this JSON-LD instance with
prefix
* notation, you should set this to <code>false</code> before starting
* the serialization.
*/
@@ -37,6 +38,12 @@ public class JsonLd {
* value is <code>true</code>.
*/
private boolean useJointGraphs = true;
+
+ /**
+ * Flag to control whether type coercion should be applied. Default
+ * value is <code>true</code>.
+ */
+ private boolean useTypeCoercion = true;
/**
* Add the given resource to this JsonLd object using the resourceId
@@ -310,4 +317,23 @@ public class JsonLd {
this.applyNamespaces = applyNamespaces;
}
+ /**
+ * Flag to control whether type coercion is applied or not.
+ *
+ * @return <code>True</code> if type coercion is applied,
<code>false</code> otherwise.
+ */
+ public boolean isUseTypeCoercion() {
+ return useTypeCoercion;
+ }
+
+ /**
+ * Control whether type coercion should be applied. Set this to
<code>false</code>
+ * if you don't want to use type coercion in the output.
+ *
+ * @param useTypeCoercion
+ */
+ public void setUseTypeCoercion(boolean useTypeCoercion) {
+ this.useTypeCoercion = useTypeCoercion;
+ }
+
}
Modified:
incubator/stanbol/trunk/enhancer/generic/jsonld/src/test/java/org/apache/stanbol/jsonld/JsonLdTest.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/generic/jsonld/src/test/java/org/apache/stanbol/jsonld/JsonLdTest.java?rev=1086952&r1=1086951&r2=1086952&view=diff
==============================================================================
---
incubator/stanbol/trunk/enhancer/generic/jsonld/src/test/java/org/apache/stanbol/jsonld/JsonLdTest.java
(original)
+++
incubator/stanbol/trunk/enhancer/generic/jsonld/src/test/java/org/apache/stanbol/jsonld/JsonLdTest.java
Wed Mar 30 13:41:24 2011
@@ -25,7 +25,7 @@ public class JsonLdTest {
@Test
public void testSpecExample1() {
JsonLd jsonLd = new JsonLd();
-
+ jsonLd.setUseTypeCoercion(false);
jsonLd.addNamespacePrefix("http://example.org/myvocab#";, "myvocab");
JsonLdResource jsonLdResource = new JsonLdResource();
@@ -48,7 +48,7 @@ public class JsonLdTest {
@Test
public void testSpecExample2_JointGraph() {
JsonLd jsonLd = new JsonLd();
-
+ jsonLd.setUseTypeCoercion(false);
jsonLd.addNamespacePrefix("http://xmlns.com/foaf/0.1/";, "foaf");
JsonLdResource r1 = new JsonLdResource();
@@ -84,8 +84,8 @@ public class JsonLdTest {
@Test
public void testSpecExample2_DisjointGraph() {
JsonLd jsonLd = new JsonLd();
+ jsonLd.setUseTypeCoercion(false);
jsonLd.setUseJointGraphs(false);
-
jsonLd.addNamespacePrefix("http://xmlns.com/foaf/0.1/";, "foaf");
JsonLdResource r1 = new JsonLdResource();
@@ -121,7 +121,7 @@ public class JsonLdTest {
@Test
public void testSpecExample3() {
JsonLd jsonLd = new JsonLd();
-
+ jsonLd.setUseTypeCoercion(false);
jsonLd.addNamespacePrefix("http://microformats.org/profile/hcard#vcard";,
"vcard");
jsonLd.addNamespacePrefix("http://microformats.org/profile/hcard#url";,
"url");
jsonLd.addNamespacePrefix("http://microformats.org/profile/hcard#fn";,
"fn");
@@ -145,7 +145,7 @@ public class JsonLdTest {
@Test
public void testSpecExample3DefaultContext() {
JsonLd jsonLd = new JsonLd();
-
+ jsonLd.setUseTypeCoercion(false);
jsonLd.addNamespacePrefix("http://example.org/default-vocab#","#vocab";);
jsonLd.addNamespacePrefix("http://example.org/baseurl/","#base";);
jsonLd.addNamespacePrefix("http://www.w3.org/2001/XMLSchema#";, "xsd");
@@ -173,6 +173,7 @@ public class JsonLdTest {
@Test
public void testSpecExample4Microformats() {
JsonLd jsonLd = new JsonLd();
+ jsonLd.setUseTypeCoercion(false);
jsonLd.setUseJointGraphs(false);
JsonLdResource r1 = new JsonLdResource();
@@ -208,7 +209,7 @@ public class JsonLdTest {
@Test
public void testSpecExample5TypedLiterals() {
JsonLd jsonLd = new JsonLd();
-
+ jsonLd.setUseTypeCoercion(false);
jsonLd.addNamespacePrefix("http://www.w3.org/2001/XMLSchema#";, "xsd");
jsonLd.addNamespacePrefix("http://purl.org/dc/terms/";, "dc");
@@ -228,7 +229,7 @@ public class JsonLdTest {
@Test
public void testSpecExample6MultipleObjects() {
JsonLd jsonLd = new JsonLd();
-
+ jsonLd.setUseTypeCoercion(false);
jsonLd.addNamespacePrefix("http://www.w3.org/2001/XMLSchema#";, "xsd");
jsonLd.addNamespacePrefix("http://xmlns.com/foaf/0.1/";, "foaf");
@@ -250,8 +251,8 @@ public class JsonLdTest {
@Test
public void testSpecExample7NoNSApply() {
JsonLd jsonLd = new JsonLd();
+ jsonLd.setUseTypeCoercion(false);
jsonLd.setApplyNamespaces(false);
-
jsonLd.addNamespacePrefix("http://www.w3.org/2001/XMLSchema#";, "xsd");
jsonLd.addNamespacePrefix("http://xmlns.com/foaf/0.1/";, "foaf");
@@ -273,6 +274,7 @@ public class JsonLdTest {
@Test
public void testSpecExample8NoNSApply() {
JsonLd jsonLd = new JsonLd();
+ jsonLd.setUseTypeCoercion(false);
jsonLd.setApplyNamespaces(false);
jsonLd.addNamespacePrefix("http://www.w3.org/2001/XMLSchema#";, "xsd");
Modified:
incubator/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/NavigationMixin.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/NavigationMixin.java?rev=1086952&r1=1086951&r2=1086952&view=diff
==============================================================================
---
incubator/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/NavigationMixin.java
(original)
+++
incubator/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/NavigationMixin.java
Wed Mar 30 13:41:24 2011
@@ -18,16 +18,16 @@ public class NavigationMixin {
public List<MenuItem> getMainMenuItems() {
return Arrays.asList(
- new MenuItem("/engines", "/engines", uriInfo),
- new MenuItem("/store", "/store", uriInfo),
- new MenuItem("/sparql", "/sparql", uriInfo));
+ new MenuItem("/engines", "engines", uriInfo),
+ new MenuItem("/store", "store", uriInfo),
+ new MenuItem("/sparql", "sparql", uriInfo));
}
public static class MenuItem {
public MenuItem(String label, String link, UriInfo uriInfo) {
this.label = label;
- this.link = link;
+ this.link = uriInfo.getBaseUri() + link;
cssClass = uriInfo.getPath().startsWith(link.substring(1)) ?
"selected" : "unselected";
}
Modified:
incubator/stanbol/trunk/enhancer/jersey/src/main/resources/META-INF/templates/imports/common.ftl
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/jersey/src/main/resources/META-INF/templates/imports/common.ftl?rev=1086952&r1=1086951&r2=1086952&view=diff
==============================================================================
---
incubator/stanbol/trunk/enhancer/jersey/src/main/resources/META-INF/templates/imports/common.ftl
(original)
+++
incubator/stanbol/trunk/enhancer/jersey/src/main/resources/META-INF/templates/imports/common.ftl
Wed Mar 30 13:41:24 2011
@@ -18,7 +18,7 @@
</head>
<body>
- <div class="home"><a href="/"><img
src="/static/images/apache_stanbol_logo_cropped.png" alt="Stanbol Home"
/></a></div>
+ <div class="home"><a href="${it.publicBaseUri}"><img
src="/static/images/apache_stanbol_logo_cropped.png" alt="Stanbol Home"
/></a></div>
<div class="header">
<h1>The RESTful Semantic Engine</h1>
Modified:
incubator/stanbol/trunk/enhancer/jersey/src/main/resources/META-INF/templates/org/apache/stanbol/enhancer/jersey/resource/EnginesRootResource/index.ftl
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/jersey/src/main/resources/META-INF/templates/org/apache/stanbol/enhancer/jersey/resource/EnginesRootResource/index.ftl?rev=1086952&r1=1086951&r2=1086952&view=diff
==============================================================================
---
incubator/stanbol/trunk/enhancer/jersey/src/main/resources/META-INF/templates/org/apache/stanbol/enhancer/jersey/resource/EnginesRootResource/index.ftl
(original)
+++
incubator/stanbol/trunk/enhancer/jersey/src/main/resources/META-INF/templates/org/apache/stanbol/enhancer/jersey/resource/EnginesRootResource/index.ftl
Wed Mar 30 13:41:24 2011
@@ -61,7 +61,7 @@ function registerFormHandler() {
// submit the form query using Ajax
$.ajax({
type: "POST",
- url: "/engines",
+ url: "${it.publicBaseUri}engines",
data: data,
dataType: "html",
cache: false,
