Author: hasan
Date: Mon Jan 18 14:26:33 2010
New Revision: 900407
URL: http://svn.apache.org/viewvc?rev=900407&view=rev
Log:
CLEREZZA-59: added missing changes
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ResourceTagger.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/SimpleConceptProviderManager.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/META-INF/static-web/concepts/scripts/concept-find-create.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-find-create.ssp
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/pom.xml?rev=900407&r1=900406&r2=900407&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/pom.xml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/pom.xml
Mon Jan 18 14:26:33 2010
@@ -60,6 +60,10 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.platform.dashboard.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.triaxrs</artifactId>
<scope>test</scope>
</dependency>
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/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/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ResourceTagger.java?rev=900407&r1=900406&r2=900407&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/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/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ResourceTagger.java
Mon Jan 18 14:26:33 2010
@@ -82,6 +82,12 @@
new UriRef(template.toURI().toString()),
RDFS.Resource, "concept-find-create",
MediaType.APPLICATION_XHTML_XML_TYPE, true);
+
+ template = getClass().getResource("selected-concepts.ssp");
+
renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
+ new UriRef(template.toURI().toString()),
+ RDFS.Resource, "selectedconcepts",
+ MediaType.APPLICATION_XHTML_XML_TYPE, true);
}
/**
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/SimpleConceptProviderManager.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/SimpleConceptProviderManager.java?rev=900407&r1=900406&r2=900407&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/SimpleConceptProviderManager.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/SimpleConceptProviderManager.java
Mon Jan 18 14:26:33 2010
@@ -22,8 +22,10 @@
import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import javax.ws.rs.FormParam;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
@@ -35,6 +37,8 @@
import javax.ws.rs.core.UriInfo;
import org.apache.clerezza.jaxrs.utils.TrailingSlash;
import org.apache.clerezza.platform.concepts.ontologies.CONCEPTS;
+import org.apache.clerezza.platform.dashboard.GlobalMenuItem;
+import org.apache.clerezza.platform.dashboard.GlobalMenuItemsProvider;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
@@ -70,11 +74,13 @@
@Component
@Services({
@Service(Object.class),
- @Service(ConceptProviderManager.class)
+ @Service(ConceptProviderManager.class),
+ @Service(GlobalMenuItemsProvider.class)
})
@Property(name = "javax.ws.rs", boolValue = true)
@Path("/concepts/provider-manager")
-public class SimpleConceptProviderManager implements ConceptProviderManager {
+public class SimpleConceptProviderManager implements ConceptProviderManager,
+ GlobalMenuItemsProvider {
@Reference
private TcManager tcManager;
@@ -284,4 +290,13 @@
public List<ConceptProvider> getConceptProviders() {
return conceptProviderList;
}
+
+ @Override
+ public Set<GlobalMenuItem> getMenuItems() {
+ Set<GlobalMenuItem> items = new HashSet<GlobalMenuItem>();
+
+ items.add(new
GlobalMenuItem("/concepts/provider-manager/edit-concept-provider-list",
+ "CPM", "Concept Provider Manager", 5,
"Main-Modules"));
+ return items;
+ }
}
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/META-INF/static-web/concepts/scripts/concept-find-create.js
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/META-INF/static-web/concepts/scripts/concept-find-create.js?rev=900407&r1=900406&r2=900407&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/META-INF/static-web/concepts/scripts/concept-find-create.js
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/META-INF/static-web/concepts/scripts/concept-find-create.js
Mon Jan 18 14:26:33 2010
@@ -25,16 +25,16 @@
}
ConceptFinder.search = function () {
- $("#system-suggested-concepts").empty();
+ $("#system-found-concepts").empty();
var searchTerm = $(":text[name=\"search-term\"]").val();
if (searchTerm.length > 0) {
var options = new AjaxOptions("find-concepts", "finding
concepts", function(data) {
var concepts = data.concepts;
- ConceptFinder.addSuggestions(concepts);
+ ConceptFinder.addFoundConcepts(concepts);
$("#add-button-label")
- .html("<div>or</div><div>Add '"+searchTerm
+ .html("<div>Add '"+searchTerm
+"' as new Free Concept</div>");
- $("#system-suggested-concepts-area").show();
+ $("#system-found-concepts-area").show();
$("#user-defined-concept-area").show();
});
options.url = "/concepts/find";
@@ -45,19 +45,21 @@
return false;
}
-ConceptFinder.addSuggestions = function (concepts) {
+ConceptFinder.addFoundConcepts = function (concepts) {
var selectedConceptsExists = false;
if (typeof(SelectedConcepts) != "undefined") {
selectedConceptsExists = true;
}
+ var added = false;
for (var i = 0; i < concepts.length; i++) {
if (!selectedConceptsExists ||
!SelectedConcepts.exists(concepts[i].uri)) {
- var div =
$("<div/>").appendTo("#system-suggested-concepts");
+ added = true;
+ var div =
$("<div/>").appendTo("#system-found-concepts");
$("<div/>").text(concepts[i].prefLabel)
.appendTo(div);
$("<div/>").text(concepts[i].uri)
.appendTo(div);
- $("<a/>").addClass("tx-icon tx-icon-plus
add-suggested-concept")
+ $("<a/>").addClass("tx-icon tx-icon-plus")
.attr({
href: "#"
})
@@ -78,6 +80,11 @@
$("<br/>").appendTo(div);
}
}
+ if (added) {
+ $("#label-for-search-results").text("Concepts found:");
+ } else {
+ $("#label-for-search-results").text("No additional concepts
found.");
+ }
}
function ConceptManipulator(){};
@@ -102,7 +109,6 @@
});
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()}
@@ -119,6 +125,6 @@
$("#add-user-defined-concept").click(function() {
ConceptManipulator.addConcept();
});
- $("#system-suggested-concepts-area").hide();
+ $("#system-found-concepts-area").hide();
$("#user-defined-concept-area").hide();
});
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-find-create.ssp
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-find-create.ssp?rev=900407&r1=900406&r2=900407&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-find-create.ssp
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-find-create.ssp
Mon Jan 18 14:26:33 2010
@@ -2,18 +2,18 @@
resultDocModifier.addScriptReference("/static/concepts/scripts/concept-find-create.js");
<div>Add Concepts</div>
-<form onsubmit="return ConceptFinder.search()" id="suggestions-form">
+<form onsubmit="return ConceptFinder.search()" id="search-form">
<br/>
<input type="text" value="" name="search-term"/>
<a href="#" id="go-button" class="tx-icon tx-icon-search">Go</a>
<br/>
<br/>
- <div id="system-suggested-concepts-area">
- <div>
+ <div id="system-found-concepts-area">
+ <div id="label-for-search-results">
Found Concepts:
</div>
<br/>
- <div id="system-suggested-concepts"></div>
+ <div id="system-found-concepts"></div>
</div>
<br/>
<div id="user-defined-concept-area">
