Author: reto
Date: Wed Jan 13 22:06:07 2010
New Revision: 898964
URL: http://svn.apache.org/viewvc?rev=898964&view=rev
Log:
some renaming around templates, modes and arguments
Added:
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/META-INF/static-web/concepts/scripts/concept-find-create.js
- copied, changed from r898896,
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/META-INF/static-web/concepts/scripts/concept-suggestions.js
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-existing-subjects.ssp
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-find-create.ssp
- copied, changed from r898896,
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-suggestions.ssp
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-tagging.ssp
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/skos-collection-json.ssp
- copied unchanged from r898896,
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concepts-search-results.ssp
Removed:
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/META-INF/static-web/concepts/scripts/concept-suggestions.js
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-suggestions.ssp
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concepts-search-results.ssp
Modified:
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/README.txt
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptManipulator.java
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptsFinder.java
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ResourceTagger.java
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/generic-resource-page.ssp
Modified:
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/README.txt
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/README.txt?rev=898964&r1=898963&r2=898964&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/README.txt
(original)
+++
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/README.txt
Wed Jan 13 22:06:07 2010
@@ -7,7 +7,7 @@
JAX-RS resource called ConceptManipulator can be used to add concept into the
content graph
The resource path is "/concepts/manipulator/add-concept" and the form
parameters are
-search-term, lang, and comment.
+pref-label, lang, and comment.
On the client side there is a ConceptManipulator widget to add free concepts
to the content graph
and there is also a ConceptFinder widget to find exisiting concepts to be
suggested for a specified search term.
Modified:
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptManipulator.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptManipulator.java?rev=898964&r1=898963&r2=898964&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptManipulator.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptManipulator.java
Wed Jan 13 22:06:07 2010
@@ -76,7 +76,7 @@
*/
@POST
@Path("add-concept")
- public Response addConcept(@FormParam("search-term") String prefLabel,
+ public Response addConcept(@FormParam("pref-label") String prefLabel,
@FormParam("lang") String lang,
@FormParam("comment") String comment) {
Modified:
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptsFinder.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptsFinder.java?rev=898964&r1=898963&r2=898964&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptsFinder.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptsFinder.java
Wed Jan 13 22:06:07 2010
@@ -73,7 +73,7 @@
protected ConceptProviderManager conceptProviderManager;
protected void activate(ComponentContext context) throws
URISyntaxException {
- URL template =
getClass().getResource("concepts-search-results.ssp");
+ URL template =
getClass().getResource("skos-collection-json.ssp");
renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(template.toURI().toString()),
SKOS.Collection, null,
Modified:
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ResourceTagger.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ResourceTagger.java?rev=898964&r1=898963&r2=898964&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ResourceTagger.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ResourceTagger.java
Wed Jan 13 22:06:07 2010
@@ -65,16 +65,22 @@
protected void activate(ComponentContext context)
throws URISyntaxException {
- URL template =
getClass().getResource("concept-suggestions.ssp");
+ URL template =
getClass().getResource("concept-existing-subjects.ssp");
renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(template.toURI().toString()),
- RDFS.Resource, "tagging",
+ RDFS.Resource, "concept-existing-subjects",
MediaType.APPLICATION_XHTML_XML_TYPE, true);
- template = getClass().getResource("selected-concepts.ssp");
+ template = getClass().getResource("concept-tagging.ssp");
renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(template.toURI().toString()),
- RDFS.Resource, "selectedconcepts",
+ RDFS.Resource, "concept-tagging",
+ MediaType.APPLICATION_XHTML_XML_TYPE, true);
+
+ template = getClass().getResource("concept-find-create.ssp");
+
renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
+ new UriRef(template.toURI().toString()),
+ RDFS.Resource, "concept-find-create",
MediaType.APPLICATION_XHTML_XML_TYPE, true);
}
Copied:
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/META-INF/static-web/concepts/scripts/concept-find-create.js
(from r898896,
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/META-INF/static-web/concepts/scripts/concept-suggestions.js)
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/META-INF/static-web/concepts/scripts/concept-find-create.js?p2=incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/META-INF/static-web/concepts/scripts/concept-find-create.js&p1=incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/META-INF/static-web/concepts/scripts/concept-suggestions.js&r1=898896&r2=898964&rev=898964&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/META-INF/static-web/concepts/scripts/concept-suggestions.js
(original)
+++
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/META-INF/static-web/concepts/scripts/concept-find-create.js
Wed Jan 13 22:06:07 2010
@@ -103,6 +103,10 @@
options.type = "POST";
options.url = "/concepts/manipulator/add-concept";
options.data = $("#suggestions-form").serialize();
+ options.data = {"pref-label":searchTerm,
+ lang:$(":input[name='lang']").val(),
+ comment:$(":textarea[name='comment']").val()}
+
$.ajax(options);
}
return false;
Added:
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-existing-subjects.ssp
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-existing-subjects.ssp?rev=898964&view=auto
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-existing-subjects.ssp
(added)
+++
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-existing-subjects.ssp
Wed Jan 13 22:06:07 2010
@@ -0,0 +1,8 @@
+def skos(s: Any) = new UriRef("http://www.w3.org/2008/05/skos#"+s)
+def dct(s: Any) = new UriRef("http://purl.org/dc/terms/"+s)
+def cpt(s: Any) = new UriRef("http://clerezza.org/2010/01/concepts#"+s);
+
+<form method="post" action="/concepts/tagger/set" id="selected-concepts-form">
+ <input type="hidden" name="uri" value={res/cpt("resource")*}></input>
+ {render(res/cpt("resource"), "selectedconcepts")}
+</form>
\ No newline at end of file
Copied:
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-find-create.ssp
(from r898896,
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-suggestions.ssp)
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-find-create.ssp?p2=incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-find-create.ssp&p1=incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-suggestions.ssp&r1=898896&r2=898964&rev=898964&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-suggestions.ssp
(original)
+++
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-find-create.ssp
Wed Jan 13 22:06:07 2010
@@ -1,7 +1,7 @@
resultDocModifier.addScriptReference("/scripts/ajax-options.js");
-resultDocModifier.addScriptReference("/static/concepts/scripts/concept-suggestions.js");
+resultDocModifier.addScriptReference("/static/concepts/scripts/concept-find-create.js");
-<div>Manually Add Concepts</div>
+<div>Add Concepts</div>
<form onsubmit="return ConceptFinder.search()" id="suggestions-form">
<br/>
<input type="text" value="" name="search-term"/>
@@ -10,7 +10,7 @@
<br/>
<div id="system-suggested-concepts-area">
<div>
- Suggestions of existing concepts
+ Found Concepts:
</div>
<br/>
<div id="system-suggested-concepts"></div>
Added:
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-tagging.ssp
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-tagging.ssp?rev=898964&view=auto
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-tagging.ssp
(added)
+++
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-tagging.ssp
Wed Jan 13 22:06:07 2010
@@ -0,0 +1,2 @@
+<div class="concept-tagging">{render(res,"concept-existing-subjects")}
+{render(res,"concept-find-create")}</div>
\ No newline at end of file
Modified:
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/generic-resource-page.ssp
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/generic-resource-page.ssp?rev=898964&r1=898963&r2=898964&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/generic-resource-page.ssp
(original)
+++
incubator/clerezza/issues/CLEREZZA-59/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/generic-resource-page.ssp
Wed Jan 13 22:06:07 2010
@@ -16,11 +16,7 @@
}});
</script>
<h4>About: {res/cpt("resource")*}</h4>
- <div><object width="200" data={res/cpt("resource")*}></object></div>
+ <div><object width="80%" data={res/cpt("resource")*}></object></div>
<br/>
- <form method="post" action="/concepts/tagger/set"
id="selected-concepts-form">
- <input type="hidden" name="uri"
value={res/cpt("resource")*}></input>
- {render(res/cpt("resource"), "selectedconcepts")}
- </form>
- {render(res,"tagging")}
+ {render(res,"concept-tagging")}
</div>
