Author: reto
Date: Wed Jan 19 10:55:09 2011
New Revision: 1060761
URL: http://svn.apache.org/viewvc?rev=1060761&view=rev
Log:
CLEREZZA-388: utility class instead of service
Added:
incubator/clerezza/issues/CLEREZZA-388/org.apache.clerezza.rdf.cris/core/src/main/scala/org/apache/clerezza/rdf/cris/GraphIndexer.scala
- copied, changed from r1060697,
incubator/clerezza/issues/CLEREZZA-388/org.apache.clerezza.rdf.cris/core/src/main/scala/org/apache/clerezza/rdf/cris/IndexService.scala
Removed:
incubator/clerezza/issues/CLEREZZA-388/org.apache.clerezza.rdf.cris/core/src/main/resources/OSGI-INF/serviceComponents.xml
incubator/clerezza/issues/CLEREZZA-388/org.apache.clerezza.rdf.cris/core/src/main/scala/org/apache/clerezza/rdf/cris/IndexService.scala
Modified:
incubator/clerezza/issues/CLEREZZA-388/org.apache.clerezza.rdf.cris/core/pom.xml
incubator/clerezza/issues/CLEREZZA-388/org.apache.clerezza.rdf.cris/core/src/test/scala/org/apache/clerezza/rdf/cris/IndexServiceTest.scala
Modified:
incubator/clerezza/issues/CLEREZZA-388/org.apache.clerezza.rdf.cris/core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-388/org.apache.clerezza.rdf.cris/core/pom.xml?rev=1060761&r1=1060760&r2=1060761&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-388/org.apache.clerezza.rdf.cris/core/pom.xml
(original)
+++
incubator/clerezza/issues/CLEREZZA-388/org.apache.clerezza.rdf.cris/core/pom.xml
Wed Jan 19 10:55:09 2011
@@ -88,13 +88,11 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Service-Component>OSGI-INF/serviceComponents.xml</Service-Component>
<Export-Package>org.apache.clerezza.rdf.cris.*</Export-Package>
<Bundle-SymbolicName>org.apache.clerezza.rdf.cris</Bundle-SymbolicName>
</instructions>
</configuration>
</plugin>
-
</plugins>
</build>
</project>
Copied:
incubator/clerezza/issues/CLEREZZA-388/org.apache.clerezza.rdf.cris/core/src/main/scala/org/apache/clerezza/rdf/cris/GraphIndexer.scala
(from r1060697,
incubator/clerezza/issues/CLEREZZA-388/org.apache.clerezza.rdf.cris/core/src/main/scala/org/apache/clerezza/rdf/cris/IndexService.scala)
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-388/org.apache.clerezza.rdf.cris/core/src/main/scala/org/apache/clerezza/rdf/cris/GraphIndexer.scala?p2=incubator/clerezza/issues/CLEREZZA-388/org.apache.clerezza.rdf.cris/core/src/main/scala/org/apache/clerezza/rdf/cris/GraphIndexer.scala&p1=incubator/clerezza/issues/CLEREZZA-388/org.apache.clerezza.rdf.cris/core/src/main/scala/org/apache/clerezza/rdf/cris/IndexService.scala&r1=1060697&r2=1060761&rev=1060761&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-388/org.apache.clerezza.rdf.cris/core/src/main/scala/org/apache/clerezza/rdf/cris/IndexService.scala
(original)
+++
incubator/clerezza/issues/CLEREZZA-388/org.apache.clerezza.rdf.cris/core/src/main/scala/org/apache/clerezza/rdf/cris/GraphIndexer.scala
Wed Jan 19 10:55:09 2011
@@ -42,20 +42,20 @@ import scala.actors.TIMEOUT
/**
*
- * Provides access to indexed resources
+ * Creates and provides access to indexed resources described in a graph.
*
* @author reto
*/
//while implemented in scala we don't expose any scala-library classes in the
//public interface
-class IndexService(definitions: TripleCollection, baseGraph: TripleCollection,
index: Directory) {
+class GraphIndexer(definitions: TripleCollection, baseGraph: TripleCollection,
index: Directory) {
def this(definitions: TripleCollection, baseGraph: TripleCollection) {
this(definitions, baseGraph, new RAMDirectory)
}
private val URI_FIELD_NAME = "resource-uri"
- private val logger = LoggerFactory.getLogger(classOf[IndexService])
+ private val logger = LoggerFactory.getLogger(classOf[GraphIndexer])
private val definitionsPreamble = new Preamble(definitions)
import definitionsPreamble._
val indexDefinitions = CRIS.IndexDefinition/-RDF.`type`
Modified:
incubator/clerezza/issues/CLEREZZA-388/org.apache.clerezza.rdf.cris/core/src/test/scala/org/apache/clerezza/rdf/cris/IndexServiceTest.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-388/org.apache.clerezza.rdf.cris/core/src/test/scala/org/apache/clerezza/rdf/cris/IndexServiceTest.scala?rev=1060761&r1=1060760&r2=1060761&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-388/org.apache.clerezza.rdf.cris/core/src/test/scala/org/apache/clerezza/rdf/cris/IndexServiceTest.scala
(original)
+++
incubator/clerezza/issues/CLEREZZA-388/org.apache.clerezza.rdf.cris/core/src/test/scala/org/apache/clerezza/rdf/cris/IndexServiceTest.scala
Wed Jan 19 10:55:09 2011
@@ -35,11 +35,11 @@ import org.wymiwyg.commons.util.Util
import java.util.List
import org.junit._
-class IndexServiceTest {
+class GraphIndexerTest {
val definitions = new SimpleMGraph
val dataGraph = new SimpleMGraph
- var service: IndexService = null
+ var service: GraphIndexer = null
def createPerson(firstName: String, lastName: String) {
val node = new GraphNode(new UriRef(Util.createURN5), dataGraph)
@@ -74,7 +74,7 @@ class IndexServiceTest {
node.addPropertyValue(FOAF.firstName, "John")
node.addPropertyValue(FOAF.firstName, "William")
node.addPropertyValue(FOAF.lastName, "Smith")
- service = new IndexService(definitions, dataGraph)
+ service = new GraphIndexer(definitions, dataGraph)
}
