Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1196] trunk/src/dl-learner/org/dllearner
|
From: <Jen...@us...> - 2008-09-11 09:32:32
|
Revision: 1196
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1196&view=rev
Author: JensLehmann
Date: 2008-09-11 09:32:28 +0000 (Thu, 11 Sep 2008)
Log Message:
-----------
- uncommented natural language conversion in EvaluatedDescription - it only works for DBpedia!!
- added URL option to web service interface
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/core/EvaluatedDescription.java
trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
trunk/src/dl-learner/org/dllearner/server/jaxws/ClientNotKnownExceptionBean.java
trunk/src/dl-learner/org/dllearner/server/jaxws/ComponentInitExceptionBean.java
trunk/src/dl-learner/org/dllearner/server/jaxws/ConfigOptionTypeExceptionBean.java
trunk/src/dl-learner/org/dllearner/server/jaxws/LearningProblemUnsupportedExceptionBean.java
trunk/src/dl-learner/org/dllearner/server/jaxws/ParseExceptionBean.java
trunk/src/dl-learner/org/dllearner/server/jaxws/SparqlQueryExceptionBean.java
trunk/src/dl-learner/org/dllearner/server/jaxws/UnknownComponentExceptionBean.java
Added Paths:
-----------
trunk/src/dl-learner/org/dllearner/server/jaxws/MalformedURLExceptionBean.java
Modified: trunk/src/dl-learner/org/dllearner/core/EvaluatedDescription.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/EvaluatedDescription.java 2008-09-10 13:46:37 UTC (rev 1195)
+++ trunk/src/dl-learner/org/dllearner/core/EvaluatedDescription.java 2008-09-11 09:32:28 UTC (rev 1196)
@@ -164,7 +164,9 @@
}
public String getNaturalDescription(){
- return NaturalLanguageDescriptionConvertVisitor.getNaturalLanguageDescription(description);
+ // TODO only works for DBpedia !! (no DBpedia SPARQL queries should be made to convert the description)
+// return NaturalLanguageDescriptionConvertVisitor.getNaturalLanguageDescription(description);
+ return "";
}
/**
Modified: trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java 2008-09-10 13:46:37 UTC (rev 1195)
+++ trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java 2008-09-11 09:32:28 UTC (rev 1196)
@@ -19,6 +19,8 @@
*/
package org.dllearner.server;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
@@ -217,15 +219,16 @@
* Adds a knowledge source.
*
* @return An identifier for the component.
+ * @throws MalformedURLException
*/
@WebMethod
- public int addKnowledgeSource(int id, String component, String url) throws ClientNotKnownException, UnknownComponentException {
+ public int addKnowledgeSource(int id, String component, String url) throws ClientNotKnownException, UnknownComponentException, MalformedURLException {
ClientState state = getState(id);
Class<? extends KnowledgeSource> ksClass = knowledgeSourceMapping.get(component);
if(ksClass == null)
throw new UnknownComponentException(component);
KnowledgeSource ks = cm.knowledgeSource(ksClass);
- cm.applyConfigEntry(ks, "url", url);
+ cm.applyConfigEntry(ks, "url", new URL(url));
return state.addKnowledgeSource(ks);
}
@@ -435,6 +438,13 @@
}
@WebMethod
+ public void applyConfigEntryURL(int sessionID, int componentID, String optionName, String value) throws ClientNotKnownException, UnknownComponentException, MalformedURLException {
+ // URLs are passed as String and then converted
+ URL url = new URL(value);
+ applyConfigEntry(sessionID, componentID,optionName,url);
+ }
+
+ @WebMethod
public void applyConfigEntryStringArray(int sessionID, int componentID, String optionName, String[] value) throws ClientNotKnownException, UnknownComponentException {
Set<String> stringSet = new TreeSet<String>(Arrays.asList(value));
applyConfigEntry(sessionID, componentID,optionName,stringSet);
@@ -462,6 +472,12 @@
}
@WebMethod
+ public String getConfigOptionValueURL(int sessionID, int componentID, String optionName) throws ClientNotKnownException, UnknownComponentException, ConfigOptionTypeException {
+ URL url = getConfigOptionValue(sessionID, componentID, optionName, URL.class);
+ return url.toString();
+ }
+
+ @WebMethod
public Double getConfigOptionValueDouble(int sessionID, int componentID, String optionName) throws ClientNotKnownException, UnknownComponentException, ConfigOptionTypeException {
return getConfigOptionValue(sessionID, componentID, optionName, Double.class);
}
Modified: trunk/src/dl-learner/org/dllearner/server/jaxws/ClientNotKnownExceptionBean.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/jaxws/ClientNotKnownExceptionBean.java 2008-09-10 13:46:37 UTC (rev 1195)
+++ trunk/src/dl-learner/org/dllearner/server/jaxws/ClientNotKnownExceptionBean.java 2008-09-11 09:32:28 UTC (rev 1196)
@@ -8,9 +8,9 @@
/**
- * This class was generated by the JAXWS SI.
- * JAX-WS RI 2.0_02-b08-fcs
- * Generated source version: 2.0_02
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.1
+ * Generated source version: 2.1.1
*
*/
@XmlRootElement(name = "ClientNotKnownException", namespace = "http://server.dllearner.org/")
Modified: trunk/src/dl-learner/org/dllearner/server/jaxws/ComponentInitExceptionBean.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/jaxws/ComponentInitExceptionBean.java 2008-09-10 13:46:37 UTC (rev 1195)
+++ trunk/src/dl-learner/org/dllearner/server/jaxws/ComponentInitExceptionBean.java 2008-09-11 09:32:28 UTC (rev 1196)
@@ -8,9 +8,9 @@
/**
- * This class was generated by the JAXWS SI.
- * JAX-WS RI 2.0_02-b08-fcs
- * Generated source version: 2.0_02
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.1
+ * Generated source version: 2.1.1
*
*/
@XmlRootElement(name = "ComponentInitException", namespace = "http://server.dllearner.org/")
Modified: trunk/src/dl-learner/org/dllearner/server/jaxws/ConfigOptionTypeExceptionBean.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/jaxws/ConfigOptionTypeExceptionBean.java 2008-09-10 13:46:37 UTC (rev 1195)
+++ trunk/src/dl-learner/org/dllearner/server/jaxws/ConfigOptionTypeExceptionBean.java 2008-09-11 09:32:28 UTC (rev 1196)
@@ -8,9 +8,9 @@
/**
- * This class was generated by the JAXWS SI.
- * JAX-WS RI 2.0_02-b08-fcs
- * Generated source version: 2.0_02
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.1
+ * Generated source version: 2.1.1
*
*/
@XmlRootElement(name = "ConfigOptionTypeException", namespace = "http://server.dllearner.org/")
Modified: trunk/src/dl-learner/org/dllearner/server/jaxws/LearningProblemUnsupportedExceptionBean.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/jaxws/LearningProblemUnsupportedExceptionBean.java 2008-09-10 13:46:37 UTC (rev 1195)
+++ trunk/src/dl-learner/org/dllearner/server/jaxws/LearningProblemUnsupportedExceptionBean.java 2008-09-11 09:32:28 UTC (rev 1196)
@@ -8,9 +8,9 @@
/**
- * This class was generated by the JAXWS SI.
- * JAX-WS RI 2.0_02-b08-fcs
- * Generated source version: 2.0_02
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.1
+ * Generated source version: 2.1.1
*
*/
@XmlRootElement(name = "LearningProblemUnsupportedException", namespace = "http://server.dllearner.org/")
Added: trunk/src/dl-learner/org/dllearner/server/jaxws/MalformedURLExceptionBean.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/jaxws/MalformedURLExceptionBean.java (rev 0)
+++ trunk/src/dl-learner/org/dllearner/server/jaxws/MalformedURLExceptionBean.java 2008-09-11 09:32:28 UTC (rev 1196)
@@ -0,0 +1,41 @@
+
+package org.dllearner.server.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.1
+ * Generated source version: 2.1.1
+ *
+ */
+@XmlRootElement(name = "MalformedURLException", namespace = "http://server.dllearner.org/")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "MalformedURLException", namespace = "http://server.dllearner.org/")
+public class MalformedURLExceptionBean {
+
+ private String message;
+
+ /**
+ *
+ * @return
+ * returns String
+ */
+ public String getMessage() {
+ return this.message;
+ }
+
+ /**
+ *
+ * @param message
+ * the value for the message property
+ */
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+}
Modified: trunk/src/dl-learner/org/dllearner/server/jaxws/ParseExceptionBean.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/jaxws/ParseExceptionBean.java 2008-09-10 13:46:37 UTC (rev 1195)
+++ trunk/src/dl-learner/org/dllearner/server/jaxws/ParseExceptionBean.java 2008-09-11 09:32:28 UTC (rev 1196)
@@ -8,9 +8,9 @@
/**
- * This class was generated by the JAXWS SI.
- * JAX-WS RI 2.0_02-b08-fcs
- * Generated source version: 2.0_02
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.1
+ * Generated source version: 2.1.1
*
*/
@XmlRootElement(name = "ParseException", namespace = "http://server.dllearner.org/")
Modified: trunk/src/dl-learner/org/dllearner/server/jaxws/SparqlQueryExceptionBean.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/jaxws/SparqlQueryExceptionBean.java 2008-09-10 13:46:37 UTC (rev 1195)
+++ trunk/src/dl-learner/org/dllearner/server/jaxws/SparqlQueryExceptionBean.java 2008-09-11 09:32:28 UTC (rev 1196)
@@ -8,9 +8,9 @@
/**
- * This class was generated by the JAXWS SI.
- * JAX-WS RI 2.0_02-b08-fcs
- * Generated source version: 2.0_02
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.1
+ * Generated source version: 2.1.1
*
*/
@XmlRootElement(name = "SparqlQueryException", namespace = "http://server.dllearner.org/")
Modified: trunk/src/dl-learner/org/dllearner/server/jaxws/UnknownComponentExceptionBean.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/jaxws/UnknownComponentExceptionBean.java 2008-09-10 13:46:37 UTC (rev 1195)
+++ trunk/src/dl-learner/org/dllearner/server/jaxws/UnknownComponentExceptionBean.java 2008-09-11 09:32:28 UTC (rev 1196)
@@ -8,9 +8,9 @@
/**
- * This class was generated by the JAXWS SI.
- * JAX-WS RI 2.0_02-b08-fcs
- * Generated source version: 2.0_02
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.1
+ * Generated source version: 2.1.1
*
*/
@XmlRootElement(name = "UnknownComponentException", namespace = "http://server.dllearner.org/")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
