Author: hasan
Date: Wed Jan 6 17:59:24 2010
New Revision: 896582
URL: http://svn.apache.org/viewvc?rev=896582&view=rev
Log:
CLEREZZA-60: improved description in concept.rdf, improved LocalConceptProvider
constructor definition, renamed ConceptProviderManager to
SimpleConceptProviderManager
Added:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/SimpleConceptProviderManager.java
- copied, changed from r896545,
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/ConceptProviderManager.java
Removed:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/ConceptProviderManager.java
Modified:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/ConceptsFinder.java
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/LocalConceptProvider.java
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/RemoteConceptProvider.java
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/test/java/org/apache/clerezza/platform/concept/core/ConceptProviderManagerTest.java
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/test/java/org/apache/clerezza/platform/concept/core/ConceptsFinderTest.java
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.ontologies/src/main/resources/org/apache/clerezza/platform/concept/ontologies/concept.rdf
Modified:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/ConceptsFinder.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/ConceptsFinder.java?rev=896582&r1=896581&r2=896582&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/ConceptsFinder.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/ConceptsFinder.java
Wed Jan 6 17:59:24 2010
@@ -61,7 +61,7 @@
public class ConceptsFinder {
@Reference
- protected ConceptProviderManager conceptProviderManager;
+ protected SimpleConceptProviderManager conceptProviderManager;
/**
* Searches concepts for a specified search term. The actual search task
Modified:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/LocalConceptProvider.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/LocalConceptProvider.java?rev=896582&r1=896581&r2=896582&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/LocalConceptProvider.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/LocalConceptProvider.java
Wed Jan 6 17:59:24 2010
@@ -18,6 +18,7 @@
*/
package org.apache.clerezza.platform.concept.core;
+import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider;
import org.apache.clerezza.rdf.core.Graph;
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.UriRef;
@@ -33,7 +34,8 @@
*/
public class LocalConceptProvider implements ConceptProvider {
- private ConceptProviderManager conceptProviderManager = null;
+ private TcManager tcManager = null;
+ private ContentGraphProvider contentGraphProvider = null;
private UriRef selectedScheme = null;
/**
@@ -44,9 +46,10 @@
* @param selectedScheme
* The scheme in which concepts are to be searched.
*/
- public LocalConceptProvider(ConceptProviderManager
conceptProviderManager,
- UriRef selectedScheme) {
- this.conceptProviderManager = conceptProviderManager;
+ public LocalConceptProvider(TcManager tcManager,
+ ContentGraphProvider contentGraphProvider, UriRef
selectedScheme) {
+ this.tcManager = tcManager;
+ this.contentGraphProvider = contentGraphProvider;
this.selectedScheme = selectedScheme;
}
@@ -75,8 +78,7 @@
throw new RuntimeException(ex);
}
- MGraph defaultGraph = conceptProviderManager.getContentGraph();
- TcManager tcManager = TcManager.getInstance();
+ MGraph defaultGraph = contentGraphProvider.getContentGraph();
return tcManager.executeSparqlQuery(constructQuery,
defaultGraph);
}
}
Modified:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/RemoteConceptProvider.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/RemoteConceptProvider.java?rev=896582&r1=896581&r2=896582&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/RemoteConceptProvider.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/RemoteConceptProvider.java
Wed Jan 6 17:59:24 2010
@@ -34,8 +34,6 @@
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* This implementation of {...@link ConceptProvider} provides a functionality
@@ -47,8 +45,6 @@
*/
public class RemoteConceptProvider implements ConceptProvider {
- private final Logger logger = LoggerFactory.getLogger(getClass());
-
private UriRef sparqlEndPoint = null;
private UriRef defaultGraph = null;
private String queryTemplate = null;
Copied:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/SimpleConceptProviderManager.java
(from r896545,
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/ConceptProviderManager.java)
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/SimpleConceptProviderManager.java?p2=incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/SimpleConceptProviderManager.java&p1=incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/ConceptProviderManager.java&r1=896545&r2=896582&rev=896582&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/ConceptProviderManager.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/core/SimpleConceptProviderManager.java
Wed Jan 6 17:59:24 2010
@@ -50,6 +50,7 @@
import org.apache.clerezza.rdf.core.Triple;
import org.apache.clerezza.rdf.core.TypedLiteral;
import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.clerezza.rdf.core.impl.TripleImpl;
import org.apache.clerezza.rdf.ontologies.PLATFORM;
@@ -74,15 +75,18 @@
@Component
@Services({
@Service(Object.class),
- @Service(ConceptProviderManager.class)
+ @Service(SimpleConceptProviderManager.class)
})
@Property(name = "javax.ws.rs", boolValue = true)
@Path("/concepts/provider-manager")
-public class ConceptProviderManager {
+public class SimpleConceptProviderManager {
private FileServer fileServer;
@Reference
+ private TcManager tcManager;
+
+ @Reference
protected ContentGraphProvider cgProvider;
@Reference
@@ -158,8 +162,8 @@
conceptProvider, CONCEPT.selectedScheme, null);
if (selectedSchemes.hasNext()) {
UriRef selectedScheme = (UriRef)
selectedSchemes.next().getObject();
- conceptProviderList.add(new LocalConceptProvider(this,
- selectedScheme));
+ conceptProviderList.add(new
LocalConceptProvider(tcManager,
+ cgProvider, selectedScheme));
}
}
Modified:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/test/java/org/apache/clerezza/platform/concept/core/ConceptProviderManagerTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/test/java/org/apache/clerezza/platform/concept/core/ConceptProviderManagerTest.java?rev=896582&r1=896581&r2=896582&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/test/java/org/apache/clerezza/platform/concept/core/ConceptProviderManagerTest.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/test/java/org/apache/clerezza/platform/concept/core/ConceptProviderManagerTest.java
Wed Jan 6 17:59:24 2010
@@ -31,7 +31,7 @@
import org.junit.Test;
/**
- * This class tests the functionality of a ConceptProviderManager.
+ * This class tests the functionality of a SimpleConceptProviderManager.
*
* @author hasan
*/
@@ -44,7 +44,7 @@
}
}
- private class TestedConceptProviderManager extends
ConceptProviderManager {
+ private class TestedConceptProviderManager extends
SimpleConceptProviderManager {
public void fillConceptProviderList() {
ConceptProvider CP1 = new TestConceptProvider();
ConceptProvider CP2 = new TestConceptProvider();
Modified:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/test/java/org/apache/clerezza/platform/concept/core/ConceptsFinderTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/test/java/org/apache/clerezza/platform/concept/core/ConceptsFinderTest.java?rev=896582&r1=896581&r2=896582&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/test/java/org/apache/clerezza/platform/concept/core/ConceptsFinderTest.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/test/java/org/apache/clerezza/platform/concept/core/ConceptsFinderTest.java
Wed Jan 6 17:59:24 2010
@@ -78,7 +78,7 @@
}
}
- private class TestedConceptProviderManager extends
ConceptProviderManager {
+ private class TestedConceptProviderManager extends
SimpleConceptProviderManager {
public void fillConceptProviderList() {
ConceptProvider CP1 = new
TestConceptProvider(concepts1, concepts2,
Arrays.asList(1,3));
Modified:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.ontologies/src/main/resources/org/apache/clerezza/platform/concept/ontologies/concept.rdf
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.ontologies/src/main/resources/org/apache/clerezza/platform/concept/ontologies/concept.rdf?rev=896582&r1=896581&r2=896582&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.ontologies/src/main/resources/org/apache/clerezza/platform/concept/ontologies/concept.rdf
(original)
+++
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.ontologies/src/main/resources/org/apache/clerezza/platform/concept/ontologies/concept.rdf
Wed Jan 6 17:59:24 2010
@@ -100,7 +100,8 @@
<rdf:type rdf:resource="owl:DatatypeProperty"/>
<rdfs:label xml:lang="en">query template</rdfs:label>
<skos:definition xml:lang="en">
- Points to a template containing a sparql query string.
+ Points to a template containing a sparql query string which will
+ be applied by the subject to retrieve concepts.
</skos:definition>
<rdfs:domain rdf:resource="#ConceptProvider"/>
<rdfs:range rdf:resource="xsd:string"/>
@@ -109,7 +110,8 @@
<rdf:Property rdf:about="#searchTerm">
<rdf:type rdf:resource="owl:DatatypeProperty"/>
<rdfs:label xml:lang="en">search Term</rdfs:label>
- <skos:definition xml:lang="en">Points to string.</skos:definition>
+ <skos:definition xml:lang="en">Points to a string as a term to be
+ searched in concept labels.</skos:definition>
<rdfs:domain rdf:resource="#SearchTerm"/>
<rdfs:range rdf:resource="xsd:string"/>
</rdf:Property>
@@ -117,7 +119,9 @@
<rdf:Property rdf:about="#searchResult">
<rdf:type rdf:resource="owl:ObjectProperty"/>
<rdfs:label xml:lang="en">search Result</rdfs:label>
- <skos:definition xml:lang="en">Points to a concept.</skos:definition>
+ <skos:definition xml:lang="en">Points to a concept which is a result of
+ a search using the term represented by the subject.
+ </skos:definition>
<rdfs:domain rdf:resource="#SearchTerm"/>
<rdfs:range rdf:resource="skos:Concept"/>
</rdf:Property>
@@ -128,13 +132,14 @@
<skos:definition xml:lang="en">
Points to a UriRef of a sparql endpoint.
</skos:definition>
- <rdfs:domain rdf:resource="#ConceptProvider"/>
+ <rdfs:domain rdf:resource="#RemoteConceptProvider"/>
</rdf:Property>
<rdf:Property rdf:about="#defaultGraph">
<rdf:type rdf:resource="owl:ObjectProperty"/>
<rdfs:label xml:lang="en">default Graph</rdfs:label>
- <skos:definition xml:lang="en">Points to a graph.</skos:definition>
+ <skos:definition xml:lang="en">Points to a graph against which the
subject
+ performs its queries.</skos:definition>
<rdfs:domain rdf:resource="#ConceptProvider"/>
</rdf:Property>
@@ -147,4 +152,4 @@
<rdfs:domain rdf:resource="#ConceptCache"/>
</rdf:Property>
-</rdf:RDF>
\ No newline at end of file
+</rdf:RDF>
