Mercurial > hg > MetaDataManagerRestlet

changeset 1:ede4c4ead6f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
properties fuer die name server in web.xml eingebaut, zum instlalieren muss web.xml.template in web.xml umbenannt werden.
author dwinter
date Thu, 30 Jun 2011 11:21:29 +0200
parents 813aa2c5bc4b
children f13ac4acbb0d
files .classpath .project .settings/org.eclipse.core.resources.prefs .settings/org.eclipse.wst.common.component WebContent/WEB-INF/web.xml WebContent/WEB-INF/web.xml.template src/de/mpiwg/itgroup/metaDataManagerRestlet/RestServer.java
diffstat 7 files changed, 193 insertions(+), 39 deletions(-) [+]
line wrap: on
line diff
--- a/.classpath	Wed Nov 24 16:56:28 2010 +0100
+++ b/.classpath	Thu Jun 30 11:21:29 2011 +0200
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0">
 		<attributes>
 			<attribute name="owner.project.facets" value="jst.web"/>
@@ -16,6 +11,14 @@
 	<classpathentry kind="lib" path="libs/org.restlet.jar"/>
 	<classpathentry kind="lib" path="libs/log4j-1.2.15.jar"/>
 	<classpathentry kind="lib" path="libs/org.restlet.ext.servlet.jar"/>
+	<classpathentry kind="lib" path="libs/org.json.jar"/>
+	<classpathentry kind="lib" path="libs/org.restlet.ext.json.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/MetaDataManager"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/NamedIdentityManager">
+		<attributes>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="NamedIdentityManager/libs"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
--- a/.project	Wed Nov 24 16:56:28 2010 +0100
+++ b/.project	Thu Jun 30 11:21:29 2011 +0200
@@ -4,6 +4,9 @@
 	<comment></comment>
 	<projects>
 		<project>MetaDataManager</project>
+		<project>NamedIdentityManager</project>
+		<project>protege</project>
+		<project>protege-core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
--- a/.settings/org.eclipse.core.resources.prefs	Wed Nov 24 16:56:28 2010 +0100
+++ b/.settings/org.eclipse.core.resources.prefs	Thu Jun 30 11:21:29 2011 +0200
@@ -1,3 +1,4 @@
-#Mon Aug 16 12:52:16 CEST 2010
+#Fri Apr 29 11:49:04 CEST 2011
 eclipse.preferences.version=1
 encoding//src/de/mpiwg/itgroup/metaDataManagerRestlet/staticPages/PID.html=UTF-8
+encoding/<project>=UTF-8
--- a/.settings/org.eclipse.wst.common.component	Wed Nov 24 16:56:28 2010 +0100
+++ b/.settings/org.eclipse.wst.common.component	Thu Jun 30 11:21:29 2011 +0200
@@ -3,16 +3,133 @@
     <wb-module deploy-name="MetaDataManagerRestlet">
         <wb-resource deploy-path="/" source-path="/WebContent"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-        <dependent-module archiveName="log4j-1.2.15.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/MetaDataManagerRestlet/libs/log4j-1.2.15.jar">
+        <dependent-module archiveName="MetaDataManager.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/MetaDataManager/MetaDataManager">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="NamedIdentityManager.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/NamedIdentityManager/NamedIdentityManager">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="xercesImpl-2.9.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//Applications/eXist/lib/endorsed/xercesImpl-2.9.1.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="protege-owl.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/MetaDataManagerRestlet/libs/protege-owl.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="protege.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/protege/protege">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="xml-apis.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/protege/lib/xml-apis.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="junit.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/protege/lib/junit.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="jdom.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/protege/lib/jdom.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="concurrent.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/protege/lib/concurrent.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="commons-lang-2.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/protege/lib/commons-lang-2.0.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="swingx-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/protege/lib/swingx-1.0.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="commons-discovery-0.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/protege/lib/commons-discovery-0.4.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="kazuki.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/protege/lib/kazuki.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="arq-extra.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/protege/lib/arq-extra.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="iri.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/protege/lib/iri.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="icu4j_3_4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/protege/lib/icu4j_3_4.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="arq.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/protege/lib/arq.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="axis.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/protege/lib/axis.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="log4j-1.2.12.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/protege/lib/log4j-1.2.12.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="jep-2.4.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/protege/lib/jep-2.4.0.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="wstx-asl-3.0.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/protege/lib/wstx-asl-3.0.0.jar">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="org.restlet.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/MetaDataManagerRestlet/libs/org.restlet.jar">
+        <dependent-module archiveName="owlsyntax.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/protege/lib/owlsyntax.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="stax-api-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/protege/lib/stax-api-1.0.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="antlr-2.7.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/protege/lib/antlr-2.7.5.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="commons-logging-1.1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/protege/lib/commons-logging-1.1.1.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="ekitspell.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/protege/lib/ekitspell.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="edtftpj-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/protege/lib/edtftpj-1.5.2.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="jcalendar.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/protege/lib/jcalendar.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="protege-core.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/protege-core/protege-core">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="orphanNodesAlg.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/protege/lib/orphanNodesAlg.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="org.restlet.ext.json.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/MetaDataManagerRestlet/libs/org.restlet.ext.json.jar">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="org.restlet.ext.servlet.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/MetaDataManagerRestlet/libs/org.restlet.ext.servlet.jar">
+        <dependent-module archiveName="org.json.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/MetaDataManagerRestlet/libs/org.json.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="lucene-core-3.1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/NamedIdentityManager/libs/lucene-3.1.0/lucene-core-3.1.0.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="openrdf-sesame-2.3.2-onejar.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/NamedIdentityManager/libs/openrdf-sesame-2.3.2-onejar.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="slf4j-api-1.6.99.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/NamedIdentityManager/libs/slf4j-api-1.6.99.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="slf4j-api-1.5.10.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/NamedIdentityManager/libs/slf4j-api-1.5.10.jar">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="MetaDataManager.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/MetaDataManager/MetaDataManager">
+        <dependent-module archiveName="virtjdbc4ssl.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/NamedIdentityManager/libs/virtjdbc4ssl.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="virtjdbc4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/NamedIdentityManager/libs/virtjdbc4.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="virt_sesame2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/NamedIdentityManager/libs/virt_sesame2.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="virtjdbc3ssl.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/NamedIdentityManager/libs/virtjdbc3ssl.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="slf4j-jdk14-1.5.10.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/NamedIdentityManager/libs/slf4j-jdk14-1.5.10.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="slf4j-jdk14-1.6.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/NamedIdentityManager/libs/slf4j-jdk14-1.6.1.jar">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="virtjdbc3.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/NamedIdentityManager/libs/virtjdbc3.jar">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <property name="java-output-path" value="/MetaDaterManagerRestlet/build/classes"/>
--- a/WebContent/WEB-INF/web.xml	Wed Nov 24 16:56:28 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4"
-xmlns="http://java.sun.com/xml/ns/j2ee"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-<display-name>RESTfulJavaWebServices-Restlet</display-name>
-<!-- Application classname -->
-<context-param>
-<param-name>org.restlet.application</param-name>
-<param-value>de.mpiwg.itgroup.metaDataManagerRestlet.RestServer</param-value>
-</context-param>
-
-
-<!-- Restletadapter -->
-<servlet>
-<servlet-name>RestletServlet</servlet-name>
-<servlet-class>
-org.restlet.ext.servlet.ServerServlet
-</servlet-class>
-</servlet>
-
-<!-- Catchallrequests -->
-<servlet-mapping>
-<servlet-name>RestletServlet</servlet-name>
-<url-pattern>/*</url-pattern>
-</servlet-mapping>
-</web-app>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/WebContent/WEB-INF/web.xml.template	Thu Jun 30 11:21:29 2011 +0200
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app id="WebApp_ID" version="2.4"
+xmlns="http://java.sun.com/xml/ns/j2ee"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+<display-name>RESTfulJavaWebServices-Restlet</display-name>
+<!-- Application classname -->
+<context-param>
+<param-name>org.restlet.application</param-name>
+<param-value>de.mpiwg.itgroup.metaDataManagerRestlet.RestServer</param-value>
+</context-param>
+
+<!-- Paramas for Metdatamanager -->
+<context-param>
+<param-name>de.mpwig.itgroup.personSearch.index</param-name>
+<param-value>/Users/dwinter/Documents/Projekte/ECHO-eSciDoc-MPDL/escidocMPIWG/NamedIdentityManager/data/tripleIndex</param-value>
+</context-param>
+<context-param>
+<param-name>de.mpwig.itgroup.personSearch.virtuoso.url</param-name>
+<param-value>jdbc:virtuoso://virtuoso.mpiwg-berlin.mpg.de:1111</param-value>
+</context-param>
+<context-param>
+<param-name>de.mpwig.itgroup.personSearch.virtuoso.user</param-name>
+<param-value>dba</param-value>
+</context-param>
+<context-param>
+<param-name>de.mpwig.itgroup.personSearch.virtuoso.pw</param-name>
+<param-value>XXX</param-value>
+</context-param>
+<context-param>
+<param-name>de.mpwig.itgroup.personSearch.virtuoso.personsGraphURI</param-name>
+<param-value>file://mpiwg_persons.rdf</param-value>
+</context-param>
+<!-- Restletadapter -->
+<servlet>
+<servlet-name>RestletServlet</servlet-name>
+<servlet-class>
+org.restlet.ext.servlet.ServerServlet
+</servlet-class>
+</servlet>
+
+<!-- Catchallrequests -->
+<servlet-mapping>
+<servlet-name>RestletServlet</servlet-name>
+<url-pattern>/*</url-pattern>
+</servlet-mapping>
+</web-app>
\ No newline at end of file
--- a/src/de/mpiwg/itgroup/metaDataManagerRestlet/RestServer.java	Wed Nov 24 16:56:28 2010 +0100
+++ b/src/de/mpiwg/itgroup/metaDataManagerRestlet/RestServer.java	Thu Jun 30 11:21:29 2011 +0200
@@ -11,6 +11,11 @@
 import org.restlet.routing.TemplateRoute;
 
 import de.mpiwg.itgroup.metaDataManagerRestlet.pid.PIDcreator;
+import de.mpiwg.itgroup.metadataManager.indexMeta.server.IndexMetaProvider;
+import de.mpiwg.itgroup.nimanager.persons.PersonByNameService;
+import de.mpiwg.itgroup.nimanager.persons.PersonListService;
+//import de.mpiwg.itgroup.nimanager.persons.PersonService;
+import de.mpiwg.itgroup.nimanager.persons.PersonService;
 
 
 
@@ -30,7 +35,12 @@
 		Router router = new Router(getContext());
 		
 		router.attach("/PID",PIDcreator.class);
-		
+		router.attach("/person/name/{name}",PersonByNameService.class);
+		router.attach("/persons",PersonListService.class);
+		router.attach("/person/id/{personId}",PersonService.class);
+		router.attach("/person/id/{personId}/{graphId}",PersonService.class);
+		TemplateRoute route = router.attach("/indexMeta", IndexMetaProvider.class);
+		route.setMatchingMode(Template.MODE_STARTS_WITH);
 		
 		
 		return router;