Author: hasan
Date: Tue Jan 12 12:21:44 2010
New Revision: 898302
URL: http://svn.apache.org/viewvc?rev=898302&view=rev
Log:
CLEREZZA-60: renamed artifactId from ...platform.concept... to
...platform.concepts...
Added:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/
- copied from r898286,
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/
- copied from r898286,
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/
- copied from r898286,
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/java/org/apache/clerezza/platform/concept/
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/
- copied from r898286,
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/main/resources/org/apache/clerezza/platform/concept/
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/
- copied from r898286,
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.core/src/test/java/org/apache/clerezza/platform/concept/
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.ontologies/
- copied from r898286,
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.ontologies/
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.ontologies/src/main/resources/org/apache/clerezza/platform/concepts/
- copied from r898286,
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/org.apache.clerezza.platform.concept.ontologies/src/main/resources/org/apache/clerezza/platform/concept/
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.ontologies/src/main/resources/org/apache/clerezza/platform/concepts/ontologies/concepts.rdf
- copied, changed from r898286,
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
Removed:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concept/
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concept.core/
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concept.ontologies/
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concept/
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concept/
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/test/java/org/apache/clerezza/platform/concept/
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.ontologies/src/main/resources/org/apache/clerezza/platform/concept/
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.ontologies/src/main/resources/org/apache/clerezza/platform/concepts/ontologies/concept.rdf
Modified:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/pom.xml
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptCache.java
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptProvider.java
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptProviderManager.java
incubator/clerezza/issues/CLEREZZA-60/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-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/LocalConceptProvider.java
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/RemoteConceptProvider.java
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/SimpleConceptProviderManager.java
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/core/ConceptProviderManagerTest.java
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/core/ConceptsFinderTest.java
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.ontologies/pom.xml
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/pom.xml
Modified:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/pom.xml?rev=898302&r1=898286&r2=898302&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/pom.xml
(original)
+++
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/pom.xml
Tue Jan 12 12:21:44 2010
@@ -3,15 +3,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.clerezza</groupId>
- <artifactId>org.apache.clerezza.platform.concept</artifactId>
+ <artifactId>org.apache.clerezza.platform.concepts</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.clerezza</groupId>
- <artifactId>org.apache.clerezza.platform.concept.core</artifactId>
+ <artifactId>org.apache.clerezza.platform.concepts.core</artifactId>
<packaging>bundle</packaging>
<version>0.1-incubating-SNAPSHOT</version>
- <name>Clerezza - Platform Concept Core</name>
- <description>The core part of Platform Concept</description>
+ <name>Clerezza - Platform Concepts Core</name>
+ <description>The core part of Platform Concepts</description>
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
-
<artifactId>org.apache.clerezza.platform.concept.ontologies</artifactId>
+
<artifactId>org.apache.clerezza.platform.concepts.ontologies</artifactId>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
Modified:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptCache.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptCache.java?rev=898302&r1=898286&r2=898302&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptCache.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptCache.java
Tue Jan 12 12:21:44 2010
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.clerezza.platform.concept.core;
+package org.apache.clerezza.platform.concepts.core;
import java.util.Date;
import java.util.Iterator;
-import org.apache.clerezza.platform.concept.ontologies.CONCEPT;
+import org.apache.clerezza.platform.concepts.ontologies.CONCEPTS;
import org.apache.clerezza.rdf.core.BNode;
import org.apache.clerezza.rdf.core.Graph;
import org.apache.clerezza.rdf.core.Literal;
@@ -100,16 +100,16 @@
private NonLiteral getConceptCacheNode(MGraph conceptCacheMGraph) {
Iterator<Triple> conceptCaches = conceptCacheMGraph.filter(
- null, RDF.type, CONCEPT.ConceptCache);
+ null, RDF.type, CONCEPTS.ConceptCache);
while (conceptCaches.hasNext()) {
NonLiteral conceptCacheNode =
conceptCaches.next().getSubject();
if (!conceptCacheMGraph.filter(conceptCacheNode,
- CONCEPT.sparqlEndPoint,
sparqlEndPoint).hasNext()) {
+ CONCEPTS.sparqlEndPoint,
sparqlEndPoint).hasNext()) {
continue;
}
if (defaultGraph != null) {
if (!conceptCacheMGraph.filter(conceptCacheNode,
- CONCEPT.defaultGraph,
defaultGraph).hasNext()) {
+ CONCEPTS.defaultGraph,
defaultGraph).hasNext()) {
continue;
}
}
@@ -129,7 +129,7 @@
conceptCacheEntryNode, conceptCacheMGraph);
removeCachedConcepts(conceptCacheEntryGraphNode);
conceptCacheMGraph.remove(new TripleImpl(conceptCacheNode,
- CONCEPT.cacheEntry, conceptCacheEntryNode));
+ CONCEPTS.cacheEntry, conceptCacheEntryNode));
}
private NonLiteral getConceptCacheEntryNode(String searchTerm,
@@ -137,12 +137,12 @@
TypedLiteral searchLiteral = LiteralFactory.getInstance()
.createTypedLiteral(searchTerm);
Iterator<Triple> cacheEntries = conceptCacheMGraph.filter(
- conceptCacheNode, CONCEPT.cacheEntry, null);
+ conceptCacheNode, CONCEPTS.cacheEntry, null);
while (cacheEntries.hasNext()) {
NonLiteral conceptCacheEntryNode = (NonLiteral)
cacheEntries.next()
.getObject();
if (!conceptCacheMGraph.filter(conceptCacheEntryNode,
- CONCEPT.searchTerm,
searchLiteral).hasNext()) {
+ CONCEPTS.searchTerm,
searchLiteral).hasNext()) {
continue;
}
return conceptCacheEntryNode;
@@ -152,7 +152,7 @@
private void removeCachedConcepts(GraphNode conceptCacheEntryGraphNode)
{
Iterator<Resource> searchResults =
-
conceptCacheEntryGraphNode.getObjects(CONCEPT.searchResult);
+
conceptCacheEntryGraphNode.getObjects(CONCEPTS.searchResult);
while (searchResults.hasNext()) {
Resource concept = searchResults.next();
GraphNode conceptGraphNode = new GraphNode(concept,
@@ -162,9 +162,9 @@
conceptGraphNode.deleteProperties(SKOS.prefLabel);
conceptGraphNode.deleteProperties(RDF.type);
}
-
conceptCacheEntryGraphNode.deleteProperties(CONCEPT.searchResult);
+
conceptCacheEntryGraphNode.deleteProperties(CONCEPTS.searchResult);
conceptCacheEntryGraphNode.deleteProperties(DC.date);
- conceptCacheEntryGraphNode.deleteProperties(CONCEPT.searchTerm);
+
conceptCacheEntryGraphNode.deleteProperties(CONCEPTS.searchTerm);
conceptCacheEntryGraphNode.deleteProperties(RDF.type);
}
@@ -179,17 +179,17 @@
}
GraphNode conceptCacheEntryGraphNode = new GraphNode(new
BNode(),
conceptCacheMGraph);
- conceptCacheGraphNode.addProperty(CONCEPT.cacheEntry,
+ conceptCacheGraphNode.addProperty(CONCEPTS.cacheEntry,
conceptCacheEntryGraphNode.getNode());
- conceptCacheEntryGraphNode.addProperty(RDF.type,
CONCEPT.SearchTerm);
- conceptCacheEntryGraphNode.addProperty(CONCEPT.searchTerm,
+ conceptCacheEntryGraphNode.addProperty(RDF.type,
CONCEPTS.SearchTerm);
+ conceptCacheEntryGraphNode.addProperty(CONCEPTS.searchTerm,
LiteralFactory.getInstance().createTypedLiteral(searchTerm));
conceptCacheEntryGraphNode.addProperty(DC.date,
LiteralFactory.getInstance().createTypedLiteral(new Date()));
Iterator<Triple> concepts = parsedGraph.filter(null, RDF.type,
SKOS.Concept);
while (concepts.hasNext()) {
-
conceptCacheEntryGraphNode.addProperty(CONCEPT.searchResult,
+
conceptCacheEntryGraphNode.addProperty(CONCEPTS.searchResult,
concepts.next().getSubject());
}
conceptCacheMGraph.addAll(parsedGraph);
@@ -198,11 +198,11 @@
private GraphNode addConceptCacheNode(MGraph conceptCacheMGraph) {
GraphNode conceptCacheGraphNode = new GraphNode(new BNode(),
conceptCacheMGraph);
- conceptCacheGraphNode.addProperty(RDF.type,
CONCEPT.ConceptCache);
- conceptCacheGraphNode.addProperty(CONCEPT.sparqlEndPoint,
+ conceptCacheGraphNode.addProperty(RDF.type,
CONCEPTS.ConceptCache);
+ conceptCacheGraphNode.addProperty(CONCEPTS.sparqlEndPoint,
sparqlEndPoint);
if (defaultGraph != null) {
- conceptCacheGraphNode.addProperty(CONCEPT.defaultGraph,
+ conceptCacheGraphNode.addProperty(CONCEPTS.defaultGraph,
defaultGraph);
}
return conceptCacheGraphNode;
@@ -237,7 +237,7 @@
if (cachingDate == null ||
cachingDate.before(acceptableOldestCachingDate)) {
removeCachedConcepts(conceptCacheEntryGraphNode);
conceptCacheMGraph.remove(new
TripleImpl(conceptCacheNode,
- CONCEPT.cacheEntry,
conceptCacheEntryNode));
+ CONCEPTS.cacheEntry,
conceptCacheEntryNode));
return null;
}
return getCachedConcepts(conceptCacheEntryGraphNode);
@@ -258,7 +258,7 @@
MGraph conceptCacheMGraph = (MGraph)
conceptCacheEntryGraphNode.getGraph();
NonLiteral conceptCacheNode = (NonLiteral)
conceptCacheEntryGraphNode.getNode();
Iterator<Triple> triples = conceptCacheMGraph.filter(
- conceptCacheNode, CONCEPT.searchResult, null);
+ conceptCacheNode, CONCEPTS.searchResult, null);
while (triples.hasNext()) {
UriRef concept = (UriRef) triples.next().getObject();
GraphNode graphNode = new GraphNode(concept,
conceptCacheMGraph);
Modified:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptProvider.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptProvider.java?rev=898302&r1=898286&r2=898302&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptProvider.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptProvider.java
Tue Jan 12 12:21:44 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.clerezza.platform.concept.core;
+package org.apache.clerezza.platform.concepts.core;
import org.apache.clerezza.rdf.core.Graph;
Modified:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptProviderManager.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptProviderManager.java?rev=898302&r1=898286&r2=898302&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptProviderManager.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptProviderManager.java
Tue Jan 12 12:21:44 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.clerezza.platform.concept.core;
+package org.apache.clerezza.platform.concepts.core;
import java.util.List;
Modified:
incubator/clerezza/issues/CLEREZZA-60/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-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptsFinder.java?rev=898302&r1=898286&r2=898302&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-60/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-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ConceptsFinder.java
Tue Jan 12 12:21:44 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.clerezza.platform.concept.core;
+package org.apache.clerezza.platform.concepts.core;
import java.util.Iterator;
import java.util.List;
Modified:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/LocalConceptProvider.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/LocalConceptProvider.java?rev=898302&r1=898286&r2=898302&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/LocalConceptProvider.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/LocalConceptProvider.java
Tue Jan 12 12:21:44 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.clerezza.platform.concept.core;
+package org.apache.clerezza.platform.concepts.core;
import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider;
import org.apache.clerezza.rdf.core.Graph;
Modified:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/RemoteConceptProvider.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/RemoteConceptProvider.java?rev=898302&r1=898286&r2=898302&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/RemoteConceptProvider.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/RemoteConceptProvider.java
Tue Jan 12 12:21:44 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.clerezza.platform.concept.core;
+package org.apache.clerezza.platform.concepts.core;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
Modified:
incubator/clerezza/issues/CLEREZZA-60/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/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/SimpleConceptProviderManager.java?rev=898302&r1=898286&r2=898302&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-60/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/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/SimpleConceptProviderManager.java
Tue Jan 12 12:21:44 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.clerezza.platform.concept.core;
+package org.apache.clerezza.platform.concepts.core;
import java.io.IOException;
import java.net.URISyntaxException;
@@ -35,7 +35,7 @@
import javax.ws.rs.core.Response.Status;
import javax.ws.rs.core.UriInfo;
import org.apache.clerezza.jaxrs.utils.TrailingSlash;
-import org.apache.clerezza.platform.concept.ontologies.CONCEPT;
+import org.apache.clerezza.platform.concepts.ontologies.CONCEPTS;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
@@ -116,7 +116,7 @@
URL template =
getClass().getResource("manage-concept-providers-page.ssp");
renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(template.toURI().toString()),
- CONCEPT.ManageConceptProvidersPage, "naked",
+ CONCEPTS.ManageConceptProvidersPage, "naked",
MediaType.APPLICATION_XHTML_XML_TYPE, true);
instantiateConceptProviders();
@@ -138,7 +138,7 @@
conceptProvider, RDF.type, null);
if (conceptProviderTypes.hasNext()) {
UriRef conceptProviderType = (UriRef)
conceptProviderTypes.next().getObject();
- if
(conceptProviderType.equals(CONCEPT.LocalConceptProvider)) {
+ if
(conceptProviderType.equals(CONCEPTS.LocalConceptProvider)) {
instantiateLocalConceptProvider(contentGraph, conceptProvider);
} else {
instantiateRemoteConceptProvider(contentGraph, conceptProvider);
@@ -149,21 +149,21 @@
private NonLiteral getConceptProviderListNode(MGraph contentGraph) {
Iterator<Triple> triples = contentGraph.filter(null, RDF.type,
- CONCEPT.ConceptProviderList);
+ CONCEPTS.ConceptProviderList);
if (triples.hasNext()) {
return triples.next().getSubject();
}
NonLiteral cplNode = new BNode();
new RdfList(cplNode, contentGraph);
contentGraph.add(new TripleImpl(cplNode, RDF.type,
- CONCEPT.ConceptProviderList));
+ CONCEPTS.ConceptProviderList));
return cplNode;
}
private void instantiateLocalConceptProvider(MGraph contentGraph,
NonLiteral conceptProvider) {
Iterator<Triple> selectedSchemes = contentGraph.filter(
- conceptProvider, CONCEPT.selectedScheme, null);
+ conceptProvider, CONCEPTS.selectedScheme, null);
if (selectedSchemes.hasNext()) {
UriRef selectedScheme = (UriRef)
selectedSchemes.next().getObject();
conceptProviderList.add(new
LocalConceptProvider(tcManager,
@@ -174,17 +174,17 @@
private void instantiateRemoteConceptProvider(MGraph contentGraph,
NonLiteral conceptProvider) {
Iterator<Triple> endPoints = contentGraph.filter(
- conceptProvider, CONCEPT.sparqlEndPoint, null);
+ conceptProvider, CONCEPTS.sparqlEndPoint, null);
if (endPoints.hasNext()) {
UriRef sparqlEndPoint = (UriRef)
endPoints.next().getObject();
Iterator<Triple> defaultGraphs = contentGraph.filter(
- conceptProvider, CONCEPT.defaultGraph,
null);
+ conceptProvider, CONCEPTS.defaultGraph,
null);
UriRef defaultGraph = null;
if (defaultGraphs.hasNext()) {
defaultGraph = (UriRef)
defaultGraphs.next().getObject();
}
Iterator<Triple> queryTemplates = contentGraph.filter(
- conceptProvider, CONCEPT.queryTemplate,
null);
+ conceptProvider,
CONCEPTS.queryTemplate, null);
if (queryTemplates.hasNext()) {
TypedLiteral queryTemplate =
(TypedLiteral)
queryTemplates.next().getObject();
@@ -213,7 +213,7 @@
NonLiteral cplNode = getConceptProviderListNode(contentGraph);
GraphNode resultNode = new GraphNode(cplNode, resultGraph);
- resultNode.addProperty(RDF.type,
CONCEPT.ManageConceptProvidersPage);
+ resultNode.addProperty(RDF.type,
CONCEPTS.ManageConceptProvidersPage);
resultNode.addProperty(RDF.type, PLATFORM.HeadedPage);
return new GraphNode(resultNode.getNode(),
new UnionMGraph(resultGraph, contentGraph));
@@ -268,22 +268,22 @@
BNode conceptProvider = new BNode();
contentGraph.add(new TripleImpl(conceptProvider,
RDF.type,
conceptProviderType));
- if
(conceptProviderType.equals(CONCEPT.LocalConceptProvider)) {
+ if
(conceptProviderType.equals(CONCEPTS.LocalConceptProvider)) {
contentGraph.add(new TripleImpl(conceptProvider,
- CONCEPT.selectedScheme,
+ CONCEPTS.selectedScheme,
new
UriRef(conceptSchemes.get(i))));
} else {
contentGraph.add(new TripleImpl(conceptProvider,
- CONCEPT.sparqlEndPoint,
+ CONCEPTS.sparqlEndPoint,
new
UriRef(sparqlEndPoints.get(i))));
String defaultGraph = defaultGraphs.get(i);
if (!defaultGraph.trim().isEmpty()) {
contentGraph.add(new
TripleImpl(conceptProvider,
- CONCEPT.defaultGraph,
+ CONCEPTS.defaultGraph,
new
UriRef(defaultGraph)));
}
contentGraph.add(new TripleImpl(conceptProvider,
- CONCEPT.queryTemplate,
+ CONCEPTS.queryTemplate,
LiteralFactory.getInstance().createTypedLiteral(
queryTemplates.get(i))));
}
Modified:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/core/ConceptProviderManagerTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/core/ConceptProviderManagerTest.java?rev=898302&r1=898286&r2=898302&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/core/ConceptProviderManagerTest.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/core/ConceptProviderManagerTest.java
Tue Jan 12 12:21:44 2010
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.clerezza.platform.concept.core;
+package org.apache.clerezza.platform.concepts.core;
import java.util.Arrays;
import java.util.List;
import javax.ws.rs.core.Response;
-import org.apache.clerezza.platform.concept.ontologies.CONCEPT;
+import org.apache.clerezza.platform.concepts.ontologies.CONCEPTS;
import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider;
import org.apache.clerezza.rdf.core.Graph;
import org.apache.clerezza.rdf.core.MGraph;
@@ -78,8 +78,8 @@
Assert.assertTrue(cpl.get(1) instanceof TestConceptProvider);
Assert.assertTrue(cpl.size()==2);
List<String> types = Arrays.asList(
- CONCEPT.LocalConceptProvider.getUnicodeString(),
-
CONCEPT.RemoteConceptProvider.getUnicodeString());
+
CONCEPTS.LocalConceptProvider.getUnicodeString(),
+
CONCEPTS.RemoteConceptProvider.getUnicodeString());
List<String> sparqlEndPoint = Arrays.asList(
"", "http://example.org/sparql";);
List<String> defaultGraphs = Arrays.asList(
Modified:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/core/ConceptsFinderTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/core/ConceptsFinderTest.java?rev=898302&r1=898286&r2=898302&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/core/ConceptsFinderTest.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/core/ConceptsFinderTest.java
Tue Jan 12 12:21:44 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.clerezza.platform.concept.core;
+package org.apache.clerezza.platform.concepts.core;
import java.util.Arrays;
import java.util.List;
Modified:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.ontologies/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.ontologies/pom.xml?rev=898302&r1=898286&r2=898302&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.ontologies/pom.xml
(original)
+++
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.ontologies/pom.xml
Tue Jan 12 12:21:44 2010
@@ -3,16 +3,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.clerezza</groupId>
- <artifactId>org.apache.clerezza.platform.concept</artifactId>
+ <artifactId>org.apache.clerezza.platform.concepts</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.clerezza</groupId>
- <artifactId>org.apache.clerezza.platform.concept.ontologies</artifactId>
+
<artifactId>org.apache.clerezza.platform.concepts.ontologies</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>Clerezza - Platform Concept Ontologies</name>
+ <name>Clerezza - Platform Concepts Ontologies</name>
<description>
- Ontologies for Platform Concept Core
+ Ontologies for Platform Concepts Core
</description>
<dependencies>
<dependency>
Copied:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.ontologies/src/main/resources/org/apache/clerezza/platform/concepts/ontologies/concepts.rdf
(from r898286,
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.concepts/org.apache.clerezza.platform.concepts.ontologies/src/main/resources/org/apache/clerezza/platform/concepts/ontologies/concepts.rdf?p2=incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.ontologies/src/main/resources/org/apache/clerezza/platform/concepts/ontologies/concepts.rdf&p1=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&r1=898286&r2=898302&rev=898302&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.concepts/org.apache.clerezza.platform.concepts.ontologies/src/main/resources/org/apache/clerezza/platform/concepts/ontologies/concepts.rdf
Tue Jan 12 12:21:44 2010
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<rdf:RDF
- xmlns="http://clerezza.org/2010/01/concept#";
- xml:base="http://clerezza.org/2010/01/concept";
+ xmlns="http://clerezza.org/2010/01/concepts#";
+ xml:base="http://clerezza.org/2010/01/concepts";
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#";
xmlns:owl="http://www.w3.org/2002/07/owl#";
@@ -12,10 +12,10 @@
<!-- Ontology -->
-<owl:Ontology rdf:about="http://clerezza.org/2010/01/concept#";>
+<owl:Ontology rdf:about="http://clerezza.org/2010/01/concepts#";>
<owl:versionInfo>Revision: 0.1</owl:versionInfo>
<dc:title xml:lang="en">
- Clerezza Concept
+ Clerezza Concepts
</dc:title>
</owl:Ontology>
Modified:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/pom.xml?rev=898302&r1=898286&r2=898302&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/pom.xml
(original)
+++
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/pom.xml
Tue Jan 12 12:21:44 2010
@@ -7,13 +7,13 @@
<version>0.2-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.clerezza</groupId>
- <artifactId>org.apache.clerezza.platform.concept</artifactId>
+ <artifactId>org.apache.clerezza.platform.concepts</artifactId>
<packaging>pom</packaging>
<version>0.1-incubating-SNAPSHOT</version>
- <name>Clerezza - Platform Concept</name>
+ <name>Clerezza - Platform Concepts</name>
<description>Provides services for tagging resources with SKOS
concepts.</description>
<modules>
- <module>org.apache.clerezza.platform.concept.ontologies</module>
- <module>org.apache.clerezza.platform.concept.core</module>
+
<module>org.apache.clerezza.platform.concepts.ontologies</module>
+ <module>org.apache.clerezza.platform.concepts.core</module>
</modules>
</project>
