Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[3054] trunk
|
From: <jen...@us...> - 2011-08-17 07:08:02
|
Revision: 3054
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3054&view=rev
Author: jenslehmann
Date: 2011-08-17 07:07:55 +0000 (Wed, 17 Aug 2011)
Log Message:
-----------
test of Spring framework on new component design
Modified Paths:
--------------
trunk/components-core/src/main/java/org/dllearner/core/configurators/ComponentFactory.java
trunk/components-core/src/main/java/org/dllearner/core/configurators/SparqlEndpointKSConfigurator.java
trunk/components-core/src/main/java/org/dllearner/kb/SparqlEndpointKS.java
trunk/interfaces/pom.xml
trunk/pom.xml
Added Paths:
-----------
trunk/interfaces/src/test/java/org/dllearner/test/SpringTest.java
trunk/test/spring/
trunk/test/spring/example.xml
Property Changed:
----------------
trunk/interfaces/
Modified: trunk/components-core/src/main/java/org/dllearner/core/configurators/ComponentFactory.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/configurators/ComponentFactory.java 2011-08-16 15:57:11 UTC (rev 3053)
+++ trunk/components-core/src/main/java/org/dllearner/core/configurators/ComponentFactory.java 2011-08-17 07:07:55 UTC (rev 3054)
@@ -87,9 +87,9 @@
/**
* @return a component ready for initialization SparqlEndpointKS
**/
-public static SparqlEndpointKS getSparqlEndpointKS() {
-return SparqlEndpointKSConfigurator.getSparqlEndpointKS();
-}
+//public static SparqlEndpointKS getSparqlEndpointKS() {
+//return SparqlEndpointKSConfigurator.getSparqlEndpointKS();
+//}
/**
* @param url URL of SPARQL Endpoint
Modified: trunk/components-core/src/main/java/org/dllearner/core/configurators/SparqlEndpointKSConfigurator.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/configurators/SparqlEndpointKSConfigurator.java 2011-08-16 15:57:11 UTC (rev 3053)
+++ trunk/components-core/src/main/java/org/dllearner/core/configurators/SparqlEndpointKSConfigurator.java 2011-08-17 07:07:55 UTC (rev 3054)
@@ -42,10 +42,10 @@
/**
* @return SparqlEndpointKS
**/
-public static SparqlEndpointKS getSparqlEndpointKS() {
-SparqlEndpointKS component = ComponentManager.getInstance().knowledgeSource(SparqlEndpointKS.class);
-return component;
-}
+//public static SparqlEndpointKS getSparqlEndpointKS() {
+//SparqlEndpointKS component = ComponentManager.getInstance().knowledgeSource(SparqlEndpointKS.class);
+//return component;
+//}
Modified: trunk/components-core/src/main/java/org/dllearner/kb/SparqlEndpointKS.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/SparqlEndpointKS.java 2011-08-16 15:57:11 UTC (rev 3053)
+++ trunk/components-core/src/main/java/org/dllearner/kb/SparqlEndpointKS.java 2011-08-17 07:07:55 UTC (rev 3054)
@@ -19,15 +19,12 @@
*/
package org.dllearner.kb;
-import java.io.File;
-import java.net.URI;
+import java.net.URL;
+import java.util.LinkedList;
+import java.util.List;
import org.dllearner.core.ComponentInitException;
-import org.dllearner.core.AbstractKnowledgeSource;
-import org.dllearner.core.OntologyFormat;
-import org.dllearner.core.OntologyFormatUnsupportedException;
-import org.dllearner.core.configurators.SparqlEndpointKSConfigurator;
-import org.dllearner.core.owl.KB;
+import org.dllearner.core.KnowledgeSource;
import org.dllearner.kb.sparql.SparqlEndpoint;
/**
@@ -38,42 +35,56 @@
* @author Jens Lehmann
*
*/
-public class SparqlEndpointKS extends AbstractKnowledgeSource {
+public class SparqlEndpointKS implements KnowledgeSource {
private SparqlEndpoint endpoint;
+
+ // TODO: turn those into config options
+ private URL url;
+ private List<String> defaultGraphURIs = new LinkedList<String>();
+ private List<String> namedGraphURIs = new LinkedList<String>();
- private SparqlEndpointKSConfigurator configurator ;
+ public SparqlEndpointKS() {
+
+ }
- @Override
- public SparqlEndpointKSConfigurator getConfigurator(){
- return configurator;
- }
-
public SparqlEndpointKS(SparqlEndpoint endpoint) {
this.endpoint = endpoint;
}
@Override
- public KB toKB() {
- return null;
+ public void init() throws ComponentInitException {
+ if(endpoint == null) {
+ endpoint = new SparqlEndpoint(url, defaultGraphURIs, namedGraphURIs);
+ }
}
+
+ public SparqlEndpoint getEndpoint() {
+ return endpoint;
+ }
- @Override
- public String toDIG(URI kbURI) {
- return null;
+ public URL getUrl() {
+ return url;
}
- @Override
- public void export(File file, OntologyFormat format)
- throws OntologyFormatUnsupportedException {
+ public void setUrl(URL url) {
+ this.url = url;
}
- @Override
- public void init() throws ComponentInitException {
+ public List<String> getDefaultGraphURIs() {
+ return defaultGraphURIs;
}
-
- public SparqlEndpoint getEndpoint() {
- return endpoint;
+
+ public void setDefaultGraphURIs(List<String> defaultGraphURIs) {
+ this.defaultGraphURIs = defaultGraphURIs;
}
+ public List<String> getNamedGraphURIs() {
+ return namedGraphURIs;
+ }
+
+ public void setNamedGraphURIs(List<String> namedGraphURIs) {
+ this.namedGraphURIs = namedGraphURIs;
+ }
+
}
Property changes on: trunk/interfaces
___________________________________________________________________
Modified: svn:ignore
- interfaces.iml
target
log
.classpath
.project
.settings
+ interfaces.iml
target
log
cache
.classpath
.project
.settings
Modified: trunk/interfaces/pom.xml
===================================================================
--- trunk/interfaces/pom.xml 2011-08-16 15:57:11 UTC (rev 3053)
+++ trunk/interfaces/pom.xml 2011-08-17 07:07:55 UTC (rev 3054)
@@ -192,6 +192,10 @@
<artifactId>json-simple</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
</dependencies>
Added: trunk/interfaces/src/test/java/org/dllearner/test/SpringTest.java
===================================================================
--- trunk/interfaces/src/test/java/org/dllearner/test/SpringTest.java (rev 0)
+++ trunk/interfaces/src/test/java/org/dllearner/test/SpringTest.java 2011-08-17 07:07:55 UTC (rev 3054)
@@ -0,0 +1,51 @@
+/**
+ * Copyright (C) 2007-2011, Jens Lehmann
+ *
+ * This file is part of DL-Learner.
+ *
+ * DL-Learner is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DL-Learner is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package org.dllearner.test;
+
+import java.util.List;
+
+import org.dllearner.core.AxiomLearningAlgorithm;
+import org.dllearner.core.EvaluatedAxiom;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.core.io.Resource;
+
+/**
+ *
+ * Test of spring for new component system.
+ *
+ * @author Jens Lehmann
+ *
+ */
+public class SpringTest {
+
+ public static void main(String[] args) {
+ Resource resource = new FileSystemResource("../test/spring/example.xml");
+ BeanFactory factory = new XmlBeanFactory(resource);
+ AxiomLearningAlgorithm alg = (AxiomLearningAlgorithm) factory.getBean("learner");
+ alg.start();
+ List<EvaluatedAxiom> axioms = alg.getCurrentlyBestEvaluatedAxioms(10);
+ for(EvaluatedAxiom axiom : axioms) {
+ System.out.println(axiom.toString());
+ }
+ }
+
+}
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-08-16 15:57:11 UTC (rev 3053)
+++ trunk/pom.xml 2011-08-17 07:07:55 UTC (rev 3054)
@@ -391,6 +391,12 @@
<scope>provided</scope>
</dependency>
+ <!-- Spring -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.0.5.RELEASE</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Added: trunk/test/spring/example.xml
===================================================================
--- trunk/test/spring/example.xml (rev 0)
+++ trunk/test/spring/example.xml 2011-08-17 07:07:55 UTC (rev 3054)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <bean class="org.dllearner.kb.SparqlEndpointKS" id="ks"
+ init-method="init">
+ <property name="url" value="http://live.dbpedia.org/sparql" />
+ <property name="defaultGraphURIs">
+ <list>
+ <value>http://dbpedia.org</value>
+ </list>
+ </property>
+ </bean>
+
+ <bean
+ class="org.dllearner.algorithms.properties.ObjectPropertyRangeAxiomLearner"
+ id="learner" init-method="init">
+ <constructor-arg ref="ks" />
+ <property name="propertyToDescribe" value="http://dbpedia.org/ontology/leader" />
+ </bean>
+
+</beans>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
