You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by al...@apache.org on 2011/04/07 01:19:20 UTC
svn commit: r1089668 [1/19] - in /incubator/stanbol/trunk: ./
commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/
commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/format/
commons/web/base/src/main/java/org/apache/stanb...
Author: alexdma
Date: Wed Apr 6 23:19:09 2011
New Revision: 1089668
URL: http://svn.apache.org/viewvc?rev=1089668&view=rev
Log:
STANBOL-128 STANBOL-133 STANBOL-150 :
- Moved JenaModelWriter to commons.web.base
- Moved KRFormat to commons.wb.base and changed MIME types for Manchester and Functional OWL per W3C specs
- commons.web.base temporarily registers Clerezza TcManager and Serializer
- All dependencies on kres.jersey replaced with commons.web.base
- kres launcher uses commons.web.base instead of kres.jersey (this also allows to run enhancer Jersey module)
- (temporary) Moved kres.jersey resources and templates to ontologymanager.web
- Note: will remove target dir and eclipse files on next commit
Added:
incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/format/
incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/format/KRFormat.java
- copied, changed from r1089487, incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/format/KRFormat.java
incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/JenaModelTransformer.java
- copied, changed from r1089487, incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/writers/JenaModelTransformer.java
incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/JenaModelWriter.java
- copied, changed from r1089487, incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/writers/JenaModelWriter.java
incubator/stanbol/trunk/ontologymanager/web/
incubator/stanbol/trunk/ontologymanager/web/pom.xml
incubator/stanbol/trunk/ontologymanager/web/src/
incubator/stanbol/trunk/ontologymanager/web/src/main/
incubator/stanbol/trunk/ontologymanager/web/src/main/java/
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpoint.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpointApplication.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JettyServer.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/processor/
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/processor/ViewProcessorImpl.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resource/
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resource/DocumentationResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resource/GraphsResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resource/NavigationMixin.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resource/ONMOntResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resource/ONMRootResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resource/ONMScopeOntologyResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resource/ONMScopeResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resource/RESTfulResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resource/RootResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resource/SessionIDResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resource/SessionResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/org/
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/org/apache/
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/org/apache/stanbol/
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/org/apache/stanbol/kres/
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/org/apache/stanbol/kres/jersey/
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/org/apache/stanbol/kres/jersey/manager/
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/org/apache/stanbol/kres/jersey/manager/Recipe/
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/org/apache/stanbol/kres/jersey/resource/
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/org/apache/stanbol/kres/jersey/resource/DocumentationResource/
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/org/apache/stanbol/kres/jersey/resource/RESTfulResource/
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/org/apache/stanbol/kres/jersey/resource/RootResource/
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/org/apache/stanbol/kres/jersey/resource/SemionReengineerResource/
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/org/apache/stanbol/kres/jersey/resource/SemionRefactorerResource/
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyRenderUtils.java
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/add.gif (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/addRule.gif (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/ajax-loader.gif (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/anonymous_48.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/black_gear_128.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/black_gear_16.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/caos_puzzle.jpg (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/compass_48.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/compass_map_48.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/configure.gif (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/delete.gif (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/download.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/download_rdf.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/external.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/favicon-black.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/favicon-sw.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/favicon.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/fise_logo_cropped.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/fise_logo_white.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/fise_logo_white_small.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/foldable_folded.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/foldable_unfolded.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/header_bg.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/iks_project_logo.jpg (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/kresLogo.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/kresLogoExtended.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/loading.gif (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/next.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/organization_48.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/previous.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/rdf.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/rdf_flyer.64.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/rdf_flyer_16.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/rdf_flyer_24.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/rules.gif (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/stlabLogo.jpg (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/stlabLogo.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/sw-cube.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/user_48.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/user_group_48.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/images/wikipedia_w_16.png (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/scripts/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/scripts/jit-yc.js
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/scripts/jit.js
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/scripts/jquery-1.4.2.js
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/scripts/jquery.rdfquery.core-1.0.js
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/scripts/json2.js
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/scripts/jsonToTurtle.js
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/scripts/kres.js
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/scripts/prettify/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/scripts/prettify/kres.css
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/scripts/prettify/prettify.css
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/scripts/prettify/prettify.js
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/scripts/scout.js
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/scripts/tinybox.js
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/style/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/style/fise.css
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/style/images/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/style/images/date-bottom.gif (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/style/images/date-top.gif (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/style/images/footer.jpg (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/style/images/frontphoto.jpg (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/style/images/header.jpg (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/style/images/wrapbg.gif (with props)
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/style/kres.css
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/static/style/kress.css
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/ajax/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/ajax/contentitem.ftl
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/imports/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/imports/common.ftl
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/imports/contentitem.ftl
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/imports/entities.ftl
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/imports/kres.ftl
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/imports/sparql.ftl
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/apache/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/apache/stanbol/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/apache/stanbol/ontologymanager/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/apache/stanbol/ontologymanager/jersey/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/apache/stanbol/ontologymanager/jersey/manager/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/apache/stanbol/ontologymanager/jersey/manager/Recipe/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/apache/stanbol/ontologymanager/jersey/resource/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/apache/stanbol/ontologymanager/jersey/resource/DocumentationResource/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/apache/stanbol/ontologymanager/jersey/resource/RESTfulResource/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/apache/stanbol/ontologymanager/jersey/resource/RootResource/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/apache/stanbol/ontologymanager/jersey/resource/SemionReengineerResource/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/apache/stanbol/ontologymanager/jersey/resource/SemionRefactorerResource/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/apache/stanbol/ontologymanager/web/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/apache/stanbol/ontologymanager/web/manager/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/apache/stanbol/ontologymanager/web/manager/Recipe/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/apache/stanbol/ontologymanager/web/manager/Recipe/index.ftl
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/apache/stanbol/ontologymanager/web/resource/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/apache/stanbol/ontologymanager/web/resource/DocumentationResource/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/apache/stanbol/ontologymanager/web/resource/DocumentationResource/index.ftl
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/apache/stanbol/ontologymanager/web/resource/RESTfulResource/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/apache/stanbol/ontologymanager/web/resource/RESTfulResource/index.ftl
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/apache/stanbol/ontologymanager/web/resource/RootResource/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/apache/stanbol/ontologymanager/web/resource/RootResource/index.ftl
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/apache/stanbol/ontologymanager/web/resource/SemionReengineerResource/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/apache/stanbol/ontologymanager/web/resource/SemionReengineerResource/index.ftl
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/apache/stanbol/ontologymanager/web/resource/SemionRefactorerResource/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/META-INF/templates/org/apache/stanbol/ontologymanager/web/resource/SemionRefactorerResource/index.ftl
incubator/stanbol/trunk/ontologymanager/web/src/test/
incubator/stanbol/trunk/ontologymanager/web/src/test/java/
incubator/stanbol/trunk/ontologymanager/web/src/test/java/org/
incubator/stanbol/trunk/ontologymanager/web/src/test/java/org/apache/
incubator/stanbol/trunk/ontologymanager/web/src/test/java/org/apache/stanbol/
incubator/stanbol/trunk/ontologymanager/web/src/test/java/org/apache/stanbol/ontologymanager/
incubator/stanbol/trunk/ontologymanager/web/src/test/java/org/apache/stanbol/ontologymanager/web/
incubator/stanbol/trunk/ontologymanager/web/src/test/java/org/apache/stanbol/ontologymanager/web/JettyServerTest.java
incubator/stanbol/trunk/ontologymanager/web/target/
incubator/stanbol/trunk/ontologymanager/web/target/classes/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/add.gif (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/addRule.gif (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/ajax-loader.gif (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/anonymous_48.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/black_gear_128.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/black_gear_16.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/caos_puzzle.jpg (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/compass_48.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/compass_map_48.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/configure.gif (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/delete.gif (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/download.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/download_rdf.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/external.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/favicon-black.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/favicon-sw.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/favicon.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/fise_logo_cropped.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/fise_logo_white.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/fise_logo_white_small.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/foldable_folded.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/foldable_unfolded.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/header_bg.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/iks_project_logo.jpg (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/kresLogo.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/kresLogoExtended.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/loading.gif (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/next.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/organization_48.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/previous.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/rdf.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/rdf_flyer.64.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/rdf_flyer_16.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/rdf_flyer_24.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/rules.gif (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/stlabLogo.jpg (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/stlabLogo.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/sw-cube.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/user_48.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/user_group_48.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/images/wikipedia_w_16.png (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/scripts/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/scripts/jit-yc.js
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/scripts/jit.js
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/scripts/jquery-1.4.2.js
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/scripts/jquery.rdfquery.core-1.0.js
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/scripts/json2.js
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/scripts/jsonToTurtle.js
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/scripts/kres.js
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/scripts/prettify/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/scripts/prettify/kres.css
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/scripts/prettify/prettify.css
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/scripts/prettify/prettify.js
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/scripts/scout.js
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/scripts/tinybox.js
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/style/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/style/fise.css
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/style/images/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/style/images/date-bottom.gif (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/style/images/date-top.gif (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/style/images/footer.jpg (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/style/images/frontphoto.jpg (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/style/images/header.jpg (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/style/images/wrapbg.gif (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/style/kres.css
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/static/style/kress.css
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/ajax/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/ajax/contentitem.ftl
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/imports/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/imports/common.ftl
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/imports/contentitem.ftl
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/imports/entities.ftl
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/imports/kres.ftl
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/imports/sparql.ftl
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/kres/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/kres/jersey/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/kres/jersey/manager/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/kres/jersey/manager/Recipe/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/kres/jersey/resource/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/kres/jersey/resource/DocumentationResource/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/kres/jersey/resource/RESTfulResource/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/kres/jersey/resource/RootResource/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/kres/jersey/resource/SemionReengineerResource/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/kres/jersey/resource/SemionRefactorerResource/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/ontologymanager/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/ontologymanager/jersey/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/ontologymanager/jersey/manager/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/ontologymanager/jersey/manager/Recipe/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/ontologymanager/jersey/resource/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/ontologymanager/jersey/resource/DocumentationResource/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/ontologymanager/jersey/resource/RESTfulResource/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/ontologymanager/jersey/resource/RootResource/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/ontologymanager/jersey/resource/SemionReengineerResource/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/ontologymanager/jersey/resource/SemionRefactorerResource/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/ontologymanager/web/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/ontologymanager/web/manager/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/ontologymanager/web/manager/Recipe/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/ontologymanager/web/manager/Recipe/index.ftl
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/ontologymanager/web/resource/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/ontologymanager/web/resource/DocumentationResource/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/ontologymanager/web/resource/DocumentationResource/index.ftl
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/ontologymanager/web/resource/RESTfulResource/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/ontologymanager/web/resource/RESTfulResource/index.ftl
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/ontologymanager/web/resource/RootResource/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/ontologymanager/web/resource/RootResource/index.ftl
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/ontologymanager/web/resource/SemionReengineerResource/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/ontologymanager/web/resource/SemionReengineerResource/index.ftl
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/ontologymanager/web/resource/SemionRefactorerResource/
incubator/stanbol/trunk/ontologymanager/web/target/classes/META-INF/templates/org/apache/stanbol/ontologymanager/web/resource/SemionRefactorerResource/index.ftl
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/JerseyEndpoint.class (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/JerseyEndpointApplication.class (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/JettyServer.class (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/processor/
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/processor/ViewProcessorImpl.class (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/resource/
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/resource/DocumentationResource.class (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/resource/GraphsResource.class (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/resource/NavigationMixin$MenuItem.class (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/resource/NavigationMixin.class (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/resource/ONMOntResource.class (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/resource/ONMRootResource.class (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/resource/ONMScopeOntologyResource.class (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/resource/ONMScopeResource.class (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/resource/RESTfulResource.class (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/resource/RootResource.class (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/resource/SessionIDResource.class (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/resource/SessionResource.class (with props)
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/resources/
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/resources/org/
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/resources/org/apache/
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/resources/org/apache/stanbol/
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/resources/org/apache/stanbol/kres/
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/resources/org/apache/stanbol/kres/jersey/
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/resources/org/apache/stanbol/kres/jersey/manager/
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/resources/org/apache/stanbol/kres/jersey/manager/Recipe/
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/resources/org/apache/stanbol/kres/jersey/resource/
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/resources/org/apache/stanbol/kres/jersey/resource/DocumentationResource/
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/resources/org/apache/stanbol/kres/jersey/resource/RESTfulResource/
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/resources/org/apache/stanbol/kres/jersey/resource/RootResource/
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/resources/org/apache/stanbol/kres/jersey/resource/SemionReengineerResource/
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/resources/org/apache/stanbol/kres/jersey/resource/SemionRefactorerResource/
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/util/
incubator/stanbol/trunk/ontologymanager/web/target/classes/org/apache/stanbol/ontologymanager/web/util/OntologyRenderUtils.class (with props)
incubator/stanbol/trunk/ontologymanager/web/target/org.apache.stanbol.ontologymanager.web-0.9-SNAPSHOT-sources.jar (with props)
incubator/stanbol/trunk/ontologymanager/web/target/org.apache.stanbol.ontologymanager.web-0.9-SNAPSHOT.jar (with props)
incubator/stanbol/trunk/ontologymanager/web/target/scr-plugin-generated/
incubator/stanbol/trunk/ontologymanager/web/target/scr-plugin-generated/OSGI-INF/
incubator/stanbol/trunk/ontologymanager/web/target/scr-plugin-generated/OSGI-INF/metatype/
incubator/stanbol/trunk/ontologymanager/web/target/scr-plugin-generated/OSGI-INF/metatype/metatype.xml
incubator/stanbol/trunk/ontologymanager/web/target/scr-plugin-generated/OSGI-INF/scr-plugin/
incubator/stanbol/trunk/ontologymanager/web/target/scr-plugin-generated/OSGI-INF/scr-plugin/scrinfo.xml
incubator/stanbol/trunk/ontologymanager/web/target/scr-plugin-generated/OSGI-INF/serviceComponents.xml
incubator/stanbol/trunk/ontologymanager/web/target/surefire/
incubator/stanbol/trunk/ontologymanager/web/target/surefire-reports/
incubator/stanbol/trunk/ontologymanager/web/target/surefire-reports/TEST-org.apache.stanbol.ontologymanager.web.JettyServerTest.xml
incubator/stanbol/trunk/ontologymanager/web/target/surefire-reports/org.apache.stanbol.ontologymanager.web.JettyServerTest.txt
incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire1564652473821879212tmp
incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire1648919606017018167tmp
incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire210976657800849794tmp
incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire224555896929521176tmp
incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire2607543647574197045tmp
incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire2844876292780091576tmp
incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire2964589522062245426tmp
incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire371053391326259735tmp
incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire4527771829967517765tmp
incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire4687670047553167273tmp
incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire4930060046783088552tmp
incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire6075288695461613020tmp
incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire7226073098259083453tmp
incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire7464876842838733373tmp
incubator/stanbol/trunk/ontologymanager/web/target/test-classes/
incubator/stanbol/trunk/ontologymanager/web/target/test-classes/org/
incubator/stanbol/trunk/ontologymanager/web/target/test-classes/org/apache/
incubator/stanbol/trunk/ontologymanager/web/target/test-classes/org/apache/stanbol/
incubator/stanbol/trunk/ontologymanager/web/target/test-classes/org/apache/stanbol/ontologymanager/
incubator/stanbol/trunk/ontologymanager/web/target/test-classes/org/apache/stanbol/ontologymanager/web/
incubator/stanbol/trunk/ontologymanager/web/target/test-classes/org/apache/stanbol/ontologymanager/web/JettyServerTest.class (with props)
Modified:
incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/JerseyEndpoint.java
incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/JerseyEndpointApplication.java
incubator/stanbol/trunk/kres/launchers/full/src/main/bundles/list.xml
incubator/stanbol/trunk/pom.xml
incubator/stanbol/trunk/reasoners/web/pom.xml
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/JerseyEndpoint.java
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/JerseyEndpointApplication.java
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/Classify.java
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ConsistentRefactoring.java
incubator/stanbol/trunk/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ClassifyTest.java
incubator/stanbol/trunk/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ConsistencyCheckTest.java
incubator/stanbol/trunk/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/EnrichmentTest.java
incubator/stanbol/trunk/reengineer/web/pom.xml
incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/JerseyEndpoint.java
incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/JerseyEndpointApplication.java
incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/ReengineerResource.java
incubator/stanbol/trunk/rules/web/pom.xml
incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/JerseyEndpoint.java
incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/JerseyEndpointApplication.java
incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RefactorerResource.java
incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRecipe.java
incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRule.java
incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RefactorerResource.java
incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RestRecipe.java
incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RestRule.java
Modified: incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/JerseyEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/JerseyEndpoint.java?rev=1089668&r1=1089667&r2=1089668&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/JerseyEndpoint.java (original)
+++ incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/JerseyEndpoint.java Wed Apr 6 23:19:09 2011
@@ -10,6 +10,8 @@ import java.util.List;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
+import org.apache.clerezza.rdf.core.access.TcManager;
+import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
@@ -48,6 +50,12 @@ public class JerseyEndpoint {
@Reference
HttpService httpService;
+
+ @Reference
+ TcManager tcManager;
+
+ @Reference
+ Serializer serializer;
protected ComponentContext componentContext;
@@ -130,6 +138,11 @@ public class JerseyEndpoint {
servletContext.setAttribute(BaseStanbolResource.LINK_RESOURCES, linkResources);
servletContext.setAttribute(BaseStanbolResource.SCRIPT_RESOURCES, scriptResources);
servletContext.setAttribute(BaseStanbolResource.NAVIGATION_LINKS, navigationLinks);
+
+ // (temporary) Make sure Clerezza persistence services are registered.
+ servletContext.setAttribute(Serializer.class.getName(), serializer);
+ servletContext.setAttribute(TcManager.class.getName(), tcManager);
+
log.info("JerseyEndpoint servlet registered at {}", applicationAlias);
}
Modified: incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/JerseyEndpointApplication.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/JerseyEndpointApplication.java?rev=1089668&r1=1089667&r2=1089668&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/JerseyEndpointApplication.java (original)
+++ incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/JerseyEndpointApplication.java Wed Apr 6 23:19:09 2011
@@ -9,6 +9,7 @@ import javax.ws.rs.core.Application;
import org.apache.stanbol.commons.web.base.processor.FreemarkerViewProcessor;
import org.apache.stanbol.commons.web.base.writers.GraphWriter;
+import org.apache.stanbol.commons.web.base.writers.JenaModelWriter;
import org.apache.stanbol.commons.web.base.writers.ResultSetWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,6 +39,7 @@ public class JerseyEndpointApplication e
// message body writers, hard-coded for now
classes.add(GraphWriter.class);
+ classes.add(JenaModelWriter.class);
classes.add(ResultSetWriter.class);
return classes;
}
Copied: incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/format/KRFormat.java (from r1089487, incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/format/KRFormat.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/format/KRFormat.java?p2=incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/format/KRFormat.java&p1=incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/format/KRFormat.java&r1=1089487&r2=1089668&rev=1089668&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/format/KRFormat.java (original)
+++ incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/format/KRFormat.java Wed Apr 6 23:19:09 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.kres.jersey.format;
+package org.apache.stanbol.commons.web.base.format;
import javax.ws.rs.core.MediaType;
@@ -11,28 +11,64 @@ import javax.ws.rs.core.MediaType;
*/
public class KRFormat extends MediaType {
+ /**
+ * "application/rdf+xml"
+ */
public static final String RDF_XML = "application/rdf+xml";
+ /**
+ * "application/rdf+xml"
+ */
public static final MediaType RDF_XML_TYPE = new MediaType("application", "rdf+xml");
+ /**
+ * "application/owl+xml"
+ */
public static final String OWL_XML = "application/owl+xml";
+ /**
+ * "application/owl+xml"
+ */
public static final MediaType OWL_XML_TYPE = new MediaType("application", "owl+xml");
- public static final String MANCHESTER_OWL = "application/manchester+owl";
-
- public static final MediaType MANCHESTER_OWL_TYPE = new MediaType("application", "manchester+xml");
-
- public static final String FUNCTIONAL_OWL = "application/functional+owl";
-
- public static final MediaType FUNCTIONAL_OWL_TYPE = new MediaType("application", "functional+xml");
-
+ /**
+ * "text/owl-manchester"
+ */
+ public static final String MANCHESTER_OWL = "text/owl-manchester";
+
+ /**
+ * "text/owl-manchester"
+ */
+ public static final MediaType MANCHESTER_OWL_TYPE = new MediaType("text", "owl-manchester");
+
+ /**
+ * "text/owl-functional"
+ */
+ public static final String FUNCTIONAL_OWL = "text/owl-functional";
+
+ /**
+ * "text/owl-functional"
+ */
+ public static final MediaType FUNCTIONAL_OWL_TYPE = new MediaType("text", "owl-functional");
+
+ /**
+ * "application/turtle"
+ */
public static final String TURTLE = "application/turtle";
+ /**
+ * "application/turtle"
+ */
public static final MediaType TURTLE_TYPE = new MediaType("application", "turtle");
+ /**
+ * "application/rdf+json"
+ */
public static final String RDF_JSON = "application/rdf+json";
+ /**
+ * "application/rdf+json"
+ */
public static final MediaType RDF_JSON_TYPE = new MediaType("application", "rdf+json");
}
Copied: incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/JenaModelTransformer.java (from r1089487, incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/writers/JenaModelTransformer.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/JenaModelTransformer.java?p2=incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/JenaModelTransformer.java&p1=incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/writers/JenaModelTransformer.java&r1=1089487&r2=1089668&rev=1089668&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/writers/JenaModelTransformer.java (original)
+++ incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/JenaModelTransformer.java Wed Apr 6 23:19:09 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.kres.jersey.writers;
+package org.apache.stanbol.commons.web.base.writers;
import java.io.IOException;
import java.io.OutputStream;
Copied: incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/JenaModelWriter.java (from r1089487, incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/writers/JenaModelWriter.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/JenaModelWriter.java?p2=incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/JenaModelWriter.java&p1=incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/writers/JenaModelWriter.java&r1=1089487&r2=1089668&rev=1089668&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/writers/JenaModelWriter.java (original)
+++ incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/writers/JenaModelWriter.java Wed Apr 6 23:19:09 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.kres.jersey.writers;
+package org.apache.stanbol.commons.web.base.writers;
import java.io.IOException;
import java.io.OutputStream;
Modified: incubator/stanbol/trunk/kres/launchers/full/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/launchers/full/src/main/bundles/list.xml?rev=1089668&r1=1089667&r2=1089668&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/launchers/full/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/kres/launchers/full/src/main/bundles/list.xml Wed Apr 6 23:19:09 2011
@@ -175,13 +175,28 @@
<!-- Stanbol Enhancer infrastructure and required libraries-->
<startLevel level="15">
- <bundle>
+ <bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
<version>0.9-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.web.base</artifactId>
+ <version>0.9-SNAPSHOT</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.web.home</artifactId>
+ <version>0.9-SNAPSHOT</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.web.sparql</artifactId>
+ <version>0.9-SNAPSHOT</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.standalone</artifactId>
<version>0.9-SNAPSHOT</version>
</bundle>
@@ -195,6 +210,11 @@
<artifactId>org.apache.stanbol.commons.stanboltools.offline</artifactId>
<version>0.9-SNAPSHOT</version>
</bundle>
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.stanboltools.datafileprovider</artifactId>
+ <version>0.9-SNAPSHOT</version>
+ </bundle>
</startLevel>
<!-- Clerezza storage and sparql infrastructure -->
@@ -486,6 +506,7 @@
</bundle>
</startLevel>
+ <!--
<startLevel level="29">
<bundle>
<groupId>org.apache.stanbol</groupId>
@@ -493,6 +514,7 @@
<version>0.9-SNAPSHOT</version>
</bundle>
</startLevel>
+ -->
<startLevel level="30">
<bundle>
Added: incubator/stanbol/trunk/ontologymanager/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/pom.xml?rev=1089668&view=auto
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/web/pom.xml (added)
+++ incubator/stanbol/trunk/ontologymanager/web/pom.xml Wed Apr 6 23:19:09 2011
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>stanbol-parent</artifactId>
+ <version>0.9-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
+
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.web</artifactId>
+ <packaging>bundle</packaging>
+
+ <name>Apache Stanbol Ontology Manager Web</name>
+
+ <dependencies>
+
+ <!-- dependencies on other IKS modules -->
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.rdf.core</artifactId>
+ <version>0.12-incubating-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.rdf.rdfjson</artifactId>
+ <version>0.3-incubating-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.jaxrs.rdf.providers</artifactId>
+ <version>0.13-incubating-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.rdf.jena.serializer</artifactId>
+ <version>0.9-incubating-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- specific deps for this project -->
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ <version>${jersey-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ <version>${jersey-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ <version>${jersey-version}</version>
+ <exclusions>
+ <!-- jaxb is now part of java 6 -->
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!--
+ <dependency> <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>jersey-multipart</artifactId> <version>1.4</version>
+ </dependency>
+ -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.9</version>
+ </dependency>
+ <!-- indirect dependency for freemarker -->
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>1.2</version>
+ </dependency>
+
+ <!-- servlet container, most useful for the tests -->
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.22</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- generic tax -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- OSGi tax -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <version>1.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Stanbol deps -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.web.base</artifactId>
+ <version>${stanbol-version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
+ <version>${stanbol-version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.owl</artifactId>
+ <version>${stanbol-version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- for tests -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.5.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>${jersey-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam</artifactId>
+ <version>${pax-exam-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit</artifactId>
+ <version>${pax-exam-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-container-default</artifactId>
+ <version>${pax-exam-version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>jena</artifactId>
+ <version>2.6.2</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <repositories>
+ <!-- needed for jersey -->
+ <repository>
+ <id>maven2-repository.dev.java.net</id>
+ <name>Java.net Repository for Maven</name>
+ <url>http://download.java.net/maven/2/</url>
+ </repository>
+ <repository>
+ <id>repository-codehaus</id>
+ <name>Codehaus maven repository</name>
+ <url>http://repository.codehaus.org</url>
+ </repository>
+
+ <!-- needed for clerezza SNAPSHOT only -->
+ <repository>
+ <id>apache repository - snapshot repo</id>
+ <name>apache repository</name>
+ <url>https://repository.apache.org/content/repositories/snapshots</url>
+ </repository>
+ </repositories>
+
+ <build>
+ <!-- make it an OSGi bundle -->
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ org.apache.stanbol.ontologymanager.web.*;version=${stanbol-version}
+ </Export-Package>
+ <Embed-Dependency>*;scope=compile|runtime;inline=false;artifactId=jersey-json|jettison|jackson-core-asl</Embed-Dependency>
+ <Embed-Transitive>true</Embed-Transitive>
+ <Import-Package>
+ org.semanticweb.owlapi.*,
+ !javax.servlet.jsp.*,
+ !org.apache.tools.*,
+ !org.mortbay.*,
+ !org.apache.xpath.*,
+ !org.jdom.*,
+ !org.jaxen.*,
+ !org.apache.xml.*,
+ !org.mozilla.javascript.*,
+ !org.python.*,
+ !org.dom4j.*,
+ !org.apache.log.*,
+ *
+ </Import-Package>
+ <Embed-Dependency>freemarker</Embed-Dependency>
+ <_nouses>true</_nouses>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpoint.java?rev=1089668&view=auto
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpoint.java (added)
+++ incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpoint.java Wed Apr 6 23:19:09 2011
@@ -0,0 +1,131 @@
+package org.apache.stanbol.ontologymanager.web;
+
+import java.io.IOException;
+import java.util.Dictionary;
+import java.util.Hashtable;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
+import org.apache.stanbol.ontologymanager.web.processor.ViewProcessorImpl;
+import org.osgi.framework.BundleContext;
+import org.osgi.service.component.ComponentContext;
+import org.osgi.service.http.HttpService;
+import org.osgi.service.http.NamespaceException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.sun.jersey.spi.container.servlet.ServletContainer;
+
+
+/**
+ * Jersey-based RESTful endpoint for KReS.
+ *
+ * This OSGi component serves as a bridge between the OSGi context and the
+ * Servlet context available to JAX-RS resources.
+ *
+ * @author andrea.nuzzolese
+ */
+
+@Component(immediate = true, metatype = true)
+public class JerseyEndpoint {
+
+ private final Logger log = LoggerFactory.getLogger(getClass());
+
+ @Property(value = "/ontomgr")
+ public static final String ALIAS_PROPERTY = "org.apache.stanbol.ontologymanager.web.alias";
+
+ @Property(value = "/kres/static")
+ public static final String STATIC_RESOURCES_URL_ROOT_PROPERTY = "org.apache.stanbol.ontologymanager.web.static.url";
+
+ @Property(value = "/META-INF/static")
+ public static final String STATIC_RESOURCES_CLASSPATH_PROPERTY = "org.apache.stanbol.ontologymanager.web.static.classpath";
+
+ @Property(value = "/META-INF/templates")
+ public static final String FREEMARKER_TEMPLATE_CLASSPATH_PROPERTY = "org.apache.stanbol.ontologymanager.web.templates.classpath";
+
+ @Reference
+ HttpService httpService;
+
+ @Reference
+ ONManager onm;
+
+ protected ServletContext servletContext;
+
+ public Dictionary<String, String> getInitParams() {
+ // pass configuration for Jersey resource
+ // TODO: make the list of enabled JAX-RS resources and providers
+ // configurable using an OSGi service
+ Dictionary<String, String> initParams = new Hashtable<String, String>();
+ initParams.put("javax.ws.rs.Application",
+ JerseyEndpointApplication.class.getName());
+
+ // make jersey automatically turn resources into Viewable models and
+ // hence lookup matching freemarker templates
+ initParams.put("com.sun.jersey.config.feature.ImplicitViewables",
+ "true");
+ return initParams;
+ }
+
+ protected void activate(ComponentContext ctx) throws IOException,
+ ServletException, NamespaceException {
+
+ // register the JAX-RS resources as a servlet under configurable alias
+ ServletContainer container = new ServletContainer();
+ String alias = (String) ctx.getProperties().get(ALIAS_PROPERTY);
+ String staticUrlRoot = (String) ctx.getProperties().get(
+ STATIC_RESOURCES_URL_ROOT_PROPERTY);
+ String staticClasspath = (String) ctx.getProperties().get(
+ STATIC_RESOURCES_CLASSPATH_PROPERTY);
+ String freemakerTemplates = (String) ctx.getProperties().get(
+ FREEMARKER_TEMPLATE_CLASSPATH_PROPERTY);
+
+ log.info("Registering servlets with HTTP service "
+ + httpService.toString());
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ Thread.currentThread().setContextClassLoader(
+ getClass().getClassLoader());
+ try {
+ httpService.registerServlet(alias, container, getInitParams(), null);
+ httpService.registerResources(staticUrlRoot, staticClasspath, null);
+ } finally {
+ Thread.currentThread().setContextClassLoader(classLoader);
+ }
+
+ // forward the main KReS OSGi components to the servlet context so that
+ // they can be looked up by the JAX-RS resources
+ servletContext = container.getServletContext();
+ servletContext.setAttribute(BundleContext.class.getName(),
+ ctx.getBundleContext());
+ servletContext.setAttribute(ONManager.class.getName(), onm);
+
+ servletContext.setAttribute(STATIC_RESOURCES_URL_ROOT_PROPERTY,
+ staticUrlRoot);
+ servletContext.setAttribute(
+ ViewProcessorImpl.FREEMARKER_TEMPLATE_PATH_INIT_PARAM,
+ freemakerTemplates);
+
+ log.info("Jersey servlet registered at {}", alias);
+ }
+
+ protected void deactivate(ComponentContext ctx) {
+ log.info("Deactivating jersey bundle");
+ String alias = (String) ctx.getProperties().get(ALIAS_PROPERTY);
+ httpService.unregister(alias);
+ servletContext = null;
+ }
+
+
+ protected void bindHttpService(HttpService httpService) {
+ this.httpService = httpService;
+ }
+
+ protected void unbindHttpService(HttpService httpService) {
+ this.httpService = null;
+ }
+
+}
Added: incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpointApplication.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpointApplication.java?rev=1089668&view=auto
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpointApplication.java (added)
+++ incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpointApplication.java Wed Apr 6 23:19:09 2011
@@ -0,0 +1,72 @@
+package org.apache.stanbol.ontologymanager.web;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.ws.rs.core.Application;
+
+import org.apache.stanbol.commons.web.base.writers.GraphWriter;
+import org.apache.stanbol.commons.web.base.writers.ResultSetWriter;
+import org.apache.stanbol.ontologymanager.web.processor.ViewProcessorImpl;
+import org.apache.stanbol.ontologymanager.web.resource.DocumentationResource;
+import org.apache.stanbol.ontologymanager.web.resource.GraphsResource;
+import org.apache.stanbol.ontologymanager.web.resource.ONMOntResource;
+import org.apache.stanbol.ontologymanager.web.resource.ONMRootResource;
+import org.apache.stanbol.ontologymanager.web.resource.ONMScopeOntologyResource;
+import org.apache.stanbol.ontologymanager.web.resource.ONMScopeResource;
+import org.apache.stanbol.ontologymanager.web.resource.RESTfulResource;
+import org.apache.stanbol.ontologymanager.web.resource.RootResource;
+import org.apache.stanbol.ontologymanager.web.resource.SessionIDResource;
+import org.apache.stanbol.ontologymanager.web.resource.SessionResource;
+import org.apache.stanbol.owl.web.OWLOntologyWriter;
+
+/**
+ * Statically define the list of available resources and providers to be used by the KReS JAX-RS Endpoint.
+ *
+ * The jersey auto-scan mechanism does not seem to work when deployed through OSGi's HttpService
+ * initialization.
+ *
+ * In the future this class might get refactored as an OSGi service to allow for dynamic configuration and
+ * deployment of additional JAX-RS resources and providers.
+ *
+ * @author andrea.nuzzolese
+ */
+
+public class JerseyEndpointApplication extends Application {
+
+ @Override
+ public Set<Class<?>> getClasses() {
+ Set<Class<?>> classes = new HashSet<Class<?>>();
+
+ // Temporary resources
+ classes.add(RootResource.class);
+ classes.add(DocumentationResource.class);
+ classes.add(RESTfulResource.class);
+
+ classes.add(GraphsResource.class);
+
+ classes.add(ONMRootResource.class);
+ classes.add(ONMScopeResource.class);
+ classes.add(ONMScopeOntologyResource.class);
+ classes.add(ONMOntResource.class);
+
+ classes.add(SessionResource.class);
+ classes.add(SessionIDResource.class);
+
+ // message body writers
+ classes.add(GraphWriter.class);
+ classes.add(ResultSetWriter.class);
+ // classes.add(OwlModelWriter.class);
+ classes.add(OWLOntologyWriter.class);
+ return classes;
+ }
+
+ @Override
+ public Set<Object> getSingletons() {
+ Set<Object> singletons = new HashSet<Object>();
+ // view processors
+ singletons.add(new ViewProcessorImpl());
+ return singletons;
+ }
+
+}
Added: incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JettyServer.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JettyServer.java?rev=1089668&view=auto
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JettyServer.java (added)
+++ incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JettyServer.java Wed Apr 6 23:19:09 2011
@@ -0,0 +1,96 @@
+package org.apache.stanbol.ontologymanager.web;
+
+import java.net.URI;
+import java.util.Dictionary;
+import java.util.Enumeration;
+
+import org.mortbay.jetty.Server;
+import org.mortbay.jetty.servlet.Context;
+import org.mortbay.jetty.servlet.ServletHolder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.sun.jersey.spi.container.servlet.ServletContainer;
+
+/**
+ * Standalone (OSGi independent) Jetty-based server with the KReS Jersey
+ * endpoint. The OSGi component need be injected manually to the ServletContext
+ * to make them available to the resources.
+ *
+ * This class is mainly useful for testing the JAX-RS resources without faking a
+ * complete OSGI runtime.
+ *
+ * For seamless OSGi deployments the JerseyEndpoint component should be
+ * automatically registered in the container and registers the JAXRS resources
+ * automatically.
+ *
+ * @author andrea.nuzzolese
+ */
+public class JettyServer {
+
+ private final Logger log = LoggerFactory.getLogger(getClass());
+
+ public static String DEFAUL_BASE_URI = "http://localhost:9998/";
+
+ protected Server server = new Server();
+
+ private Context context;
+
+ public void start(String baseUri) throws Exception {
+ log.info("starting the Jetty / Jersey endpoint");
+ ServletHolder servletHolder = new ServletHolder(ServletContainer.class);
+ Dictionary<String, String> initParams = new JerseyEndpoint().getInitParams();
+ Enumeration<String> keys = initParams.keys();
+ while (keys.hasMoreElements()) {
+ String key = keys.nextElement();
+ servletHolder.setInitParameter(key, initParams.get(key));
+ }
+
+ URI uri = new URI(baseUri);
+ // restart any previous server instance while keeping the previous
+ // attribute settings
+ if (server.isRunning()) {
+ server.stop();
+ }
+ server = new Server(uri.getPort());
+ context = new Context(server, "/", Context.SESSIONS);
+ context.addServlet(servletHolder, "/*");
+ server.start();
+ }
+
+ public void stop() throws Exception {
+ log.info("stopping the Jetty / Jersey endpoint");
+ server.stop();
+ }
+
+ public void setAttribute(String name, Object value) {
+ if (context != null) {
+ context.getServletContext().setAttribute(name, value);
+ }
+ }
+
+ public Object getAttribute(String name) {
+ if (context != null) {
+ return context.getServletContext().getAttribute(name);
+ }
+ return null;
+ }
+
+ public void removeAttribute(String name) {
+ if (context != null) {
+ context.getServletContext().removeAttribute(name);
+ }
+ }
+
+ /**
+ * For starting manually.
+ */
+ public static void main(String[] args) throws Exception {
+ JettyServer server = new JettyServer();
+ server.start(DEFAUL_BASE_URI);
+ System.out.println("Hit enter to stop it...");
+ System.in.read();
+ server.stop();
+ }
+
+}
\ No newline at end of file
Added: incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/processor/ViewProcessorImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/processor/ViewProcessorImpl.java?rev=1089668&view=auto
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/processor/ViewProcessorImpl.java (added)
+++ incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/processor/ViewProcessorImpl.java Wed Apr 6 23:19:09 2011
@@ -0,0 +1,220 @@
+package org.apache.stanbol.ontologymanager.web.processor;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintStream;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.ext.Provider;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.sun.jersey.api.view.Viewable;
+import com.sun.jersey.spi.resource.Singleton;
+import com.sun.jersey.spi.template.ViewProcessor;
+
+import freemarker.cache.ClassTemplateLoader;
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+
+/**
+ * Match a Viewable-named view with a Freemarker template.
+ *
+ * This class is based on the following original implementation:
+ * http://github.com/cwinters/jersey-freemarker/
+ *
+ * <p>
+ * You can configure the location of your templates with the context param
+ * 'freemarker.template.path'. If not assigned we'll use a default of
+ * <tt>WEB-INF/templates</tt>. Note that this uses Freemarker's
+ * {@link freemarker.cache.WebappTemplateLoader} to load/cache the templates, so
+ * check its docs (or crank up the logging under the 'freemarker.cache' package)
+ * if your templates aren't getting loaded.
+ * </p>
+ *
+ * <p>
+ * This will put your Viewable's model object in the template variable "it",
+ * unless the model is a Map. If so, the values will be assigned to the template
+ * assuming the map is of type <tt>Map<String,Object></tt>.
+ * </p>
+ *
+ * <p>
+ * There are a number of methods you can override to change the behavior, such
+ * as handling processing exceptions, changing the default template extension,
+ * or adding variables to be assigned to every template context.
+ * </p>
+ *
+ * @author Chris Winters <ch...@cwinters.com> // original code
+ * @author Olivier Grisel <og...@nuxeo.com> // ViewProcessor refactoring
+ */
+@Singleton
+@Provider
+public class ViewProcessorImpl implements ViewProcessor<Template> {
+
+ public static final String FREEMARKER_TEMPLATE_PATH_INIT_PARAM = "kres.freemarker.template.path";
+
+ private final Logger log = LoggerFactory.getLogger(getClass());
+
+ protected Configuration freemarkerConfig;
+
+ protected String rootPath;
+
+ @Context
+ protected ServletContext context;
+
+ public ViewProcessorImpl() {
+ }
+
+ /**
+ * @return extension for templates, ".ftl" by default; if we don't see this
+ * at the end of your view we'll append it so we can find the
+ * template resource
+ */
+ protected String getDefaultExtension() {
+ return ".ftl";
+ }
+
+ /**
+ * Define additional variables to make available to the template.
+ *
+ * @param viewableVariables variables provided by whomever generated the
+ * viewable object; these are provided for reference only, there
+ * will be no effect if you modify this map
+ * @return new variables for the template context, which will override any
+ * defaults provided
+ */
+ protected Map<String, Object> getVariablesForTemplate(
+ final Map<String, Object> viewableVariables) {
+ return Collections.emptyMap();
+ }
+
+ /**
+ * Catch any exception generated during template processing.
+ *
+ * @param t throwable caught
+ * @param templatePath path of template we're executing
+ * @param templateContext context use when evaluating this template
+ * @param out output stream from servlet container
+ * @throws IOException on any write errors, or if you want to rethrow
+ */
+ protected void onProcessException(final Throwable t,
+ final Template template, final Map<String, Object> templateContext,
+ final OutputStream out) throws IOException {
+ log.error("Error processing freemarker template @ "
+ + template.getName() + ": " + t.getMessage(), t);
+ out.write("<pre>".getBytes());
+ t.printStackTrace(new PrintStream(out));
+ out.write("</pre>".getBytes());
+ }
+
+ /**
+ * Modify freemarker configuration after we've created it and applied any
+ * settings from 'freemarker.properties' on the classpath.
+ *
+ * @param config configuration we've created so far
+ * @param context servlet context used to create the configuration
+ */
+ protected void assignFreemarkerConfig(final Configuration config,
+ final ServletContext context) {
+ // TODO read those parameters from context instead of hardcoding them
+
+ // don't always put a ',' in numbers (e.g., id=2000 vs id=2,000)
+ config.setNumberFormat("0");
+
+ // don't look for list.en.ftl when list.ftl requested
+ config.setLocalizedLookup(false);
+
+ // don't cache for more that 2s
+ config.setTemplateUpdateDelay(2);
+ log.info("Assigned default freemarker configuration");
+ }
+
+ protected Configuration getConfig() {
+ if (freemarkerConfig == null) {
+ // deferred initialization of the freemarker config to ensure that
+ // the injected ServletContext is fully functional and for some
+ // reason the #getInitParam access does not work hence using the
+ // #getAttribute access after servlet init.
+ Configuration config = new Configuration();
+ if (context != null) {
+ rootPath = (String) context.getAttribute(FREEMARKER_TEMPLATE_PATH_INIT_PARAM);
+ }
+ if (rootPath == null || rootPath.trim().length() == 0) {
+ log.info("No 'freemarker.template.path' context-param, "
+ + "defaulting to '/WEB-INF/templates'");
+ rootPath = "/WEB-INF/templates";
+ }
+ rootPath = rootPath.replaceAll("/$", "");
+ config.setTemplateLoader(new ClassTemplateLoader(getClass(), rootPath));
+
+ // TODO: make the usage of a freemaker properties file an explicit
+ // parameter declared in the servlet context instead of magic
+ // classloading auto-detect. That way the application could
+ // explicitly override the defaults
+ final InputStream fmProps = context.getResourceAsStream("freemarker.properties");
+ boolean loadDefaults = true;
+ if (fmProps != null) {
+ try {
+ config.setSettings(fmProps);
+ log.info("Assigned freemarker configuration from 'freemarker.properties'");
+ loadDefaults = false;
+ } catch (Throwable t) {
+ log.warn(
+ "Failed to load/assign freemarker.properties, will"
+ + " use default settings instead: "
+ + t.getMessage(), t);
+ }
+ }
+ if (loadDefaults) {
+ assignFreemarkerConfig(config, context);
+ }
+ freemarkerConfig = config;
+ }
+ return freemarkerConfig;
+ }
+
+ public Template resolve(final String path) {
+ // accept both '/path/to/template' and '/path/to/template.ftl'
+ final String defaultExtension = getDefaultExtension();
+ final String filePath = path.endsWith(defaultExtension) ? path : path
+ + defaultExtension;
+ try {
+ return getConfig().getTemplate(filePath);
+ } catch (IOException e) {
+ log.error("Failed to load freemaker template: " + rootPath
+ + filePath);
+ return null;
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ public void writeTo(Template template, Viewable viewable, OutputStream out)
+ throws IOException {
+ out.flush(); // send status + headers
+
+ Object model = viewable.getModel();
+ final Map<String, Object> vars = new HashMap<String, Object>();
+ if (model instanceof Map<?, ?>) {
+ vars.putAll((Map<String, Object>) model);
+ } else {
+ vars.put("it", model);
+ }
+ // override custom variables if any
+ vars.putAll(getVariablesForTemplate(vars));
+
+ final OutputStreamWriter writer = new OutputStreamWriter(out);
+ try {
+ template.process(vars, writer);
+ } catch (Throwable t) {
+ onProcessException(t, template, vars, out);
+ }
+ }
+
+}
\ No newline at end of file