You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2010/09/20 11:13:09 UTC
svn commit: r998838 [1/5] - in
/incubator/clerezza/trunk/org.apache.clerezza.parent: ./
org.apache.clerezza.app.webguiexamples/
org.apache.clerezza.app.webguiexamples/src/main/java/
org.apache.clerezza.app.webguiexamples/src/main/resources/CLEREZZA-INF...
Author: reto
Date: Mon Sep 20 09:13:06 2010
New Revision: 998838
URL: http://svn.apache.org/viewvc?rev=998838&view=rev
Log:
CLEREZZA-304: added org.apache.clerezza.platform.content.fsadaptor and adapted bundles to use it
Added:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/CLEREZZA-INF/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/CLEREZZA-INF/web-resources/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/CLEREZZA-INF/web-resources/web-gui-examples/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/CLEREZZA-INF/web-resources/web-gui-examples/alert.xhtml
- copied unchanged from r998826, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/alert.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/CLEREZZA-INF/web-resources/web-gui-examples/buttons.xhtml
- copied unchanged from r998826, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/buttons.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/CLEREZZA-INF/web-resources/web-gui-examples/edit.xhtml
- copied unchanged from r998826, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/edit.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/CLEREZZA-INF/web-resources/web-gui-examples/header.xhtml
- copied unchanged from r998826, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/header.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/CLEREZZA-INF/web-resources/web-gui-examples/overlay.xhtml
- copied unchanged from r998826, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/overlay.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/CLEREZZA-INF/web-resources/web-gui-examples/panel-thumbnail.xhtml
- copied unchanged from r998826, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/panel-thumbnail.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/CLEREZZA-INF/web-resources/web-gui-examples/panel-tree.xhtml
- copied unchanged from r998826, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/panel-tree.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/CLEREZZA-INF/web-resources/web-gui-examples/panel.xhtml
- copied unchanged from r998826, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/panel.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/CLEREZZA-INF/web-resources/web-gui-examples/style/
- copied from r998826, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/style/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/CLEREZZA-INF/web-resources/web-gui-examples/table.xhtml
- copied unchanged from r998826, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/table.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/CLEREZZA-INF/web-resources/web-gui-examples/temp/
- copied from r998826, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/temp/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/CLEREZZA-INF/web-resources/web-gui-examples/thumbnail.xhtml
- copied unchanged from r998826, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/thumbnail.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/CLEREZZA-INF/web-resources/web-gui-examples/tree-edit.xhtml
- copied unchanged from r998826, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/tree-edit.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/CLEREZZA-INF/web-resources/web-gui-examples/tree-thumbnail.xhtml
- copied unchanged from r998826, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/tree-thumbnail.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/CLEREZZA-INF/web-resources/web-gui-examples/tree.xhtml
- copied unchanged from r998826, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/tree.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/resources/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/resources/OSGI-INF/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/resources/OSGI-INF/serviceComponents.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/scala/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/scala/org/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/scala/org/apache/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/scala/org/apache/clerezza/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/content/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/content/fsadaptor/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/content/fsadaptor/BundleFsLoader.scala
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/content/fsadaptor/Logger.scala
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/content/fsadaptor/PathNode2MGraph.scala
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/CLEREZZA-INF/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/CLEREZZA-INF/web-resources/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/CLEREZZA-INF/web-resources/jquery/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/CLEREZZA-INF/web-resources/jquery/jquery-1.3.2.min.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/CLEREZZA-INF/web-resources/jquery/jquery.MultiFile.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/CLEREZZA-INF/web-resources/jquery/jquery.MultiFile.pack.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/CLEREZZA-INF/web-resources/jquery/jquery.ajaxQueue.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/CLEREZZA-INF/web-resources/jquery/jquery.autocomplete.min.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/CLEREZZA-INF/web-resources/jquery/jquery.blockUI.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/CLEREZZA-INF/web-resources/jquery/jquery.dump.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/CLEREZZA-INF/web-resources/jquery/jquery.form.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/CLEREZZA-INF/web-resources/jquery/jquery.jeditable.mini.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/CLEREZZA-INF/web-resources/jquery/jquery.json-1.3.min.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/CLEREZZA-INF/web-resources/jquery/jquery.menu.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/CLEREZZA-INF/web-resources/jquery/jquery.panel.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/CLEREZZA-INF/web-resources/jquery/jquery.tooltip.pack.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/CLEREZZA-INF/web-resources/jquery/jquery.ui.all.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/
- copied from r997227, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/autocomplete.css
- copied unchanged from r997227, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/autocomplete.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/button.css
- copied unchanged from r997227, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/button.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/clearfix.css
- copied unchanged from r997227, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/clearfix.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/discobits.css
- copied unchanged from r997227, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/discobits.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/edit.css
- copied unchanged from r997227, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/edit.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/filter.css
- copied unchanged from r997227, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/filter.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/form.css
- copied unchanged from r997227, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/form.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/general.css
- copied unchanged from r997227, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/general.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/header.css
- copied unchanged from r997227, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/header.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/icon.css
- copied unchanged from r997227, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/icon.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/images/
- copied from r997227, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/images/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/list.css
- copied unchanged from r997227, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/list.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/loader.css
- copied unchanged from r997227, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/loader.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/login.css
- copied unchanged from r997227, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/login.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/menu.css
- copied unchanged from r997227, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/menu.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/pager.css
- copied unchanged from r997227, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/pager.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/panel.css
- copied unchanged from r997227, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/panel.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/scripts/
- copied from r997227, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/scripts/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/style.css
- copied unchanged from r997227, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/style.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/table.css
- copied unchanged from r997227, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/table.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/tabs.css
- copied unchanged from r997227, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/tabs.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/tooltip.css
- copied unchanged from r997227, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/tooltip.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/tree.css
- copied unchanged from r997227, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/tree.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/window.css
- copied unchanged from r997227, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/window.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/yui.css
- copied unchanged from r997227, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/yui.css
Removed:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/java/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/alert.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/buttons.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/edit.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/header.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/overlay.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/panel-thumbnail.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/panel-tree.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/panel.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/style/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/table.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/temp/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/thumbnail.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/tree-edit.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/tree-thumbnail.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/tree.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/java/org/apache/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/org/apache/clerezza/web/resources/jquery/staticweb/jquery-1.3.2.min.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/org/apache/clerezza/web/resources/jquery/staticweb/jquery.MultiFile.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/org/apache/clerezza/web/resources/jquery/staticweb/jquery.MultiFile.pack.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/org/apache/clerezza/web/resources/jquery/staticweb/jquery.ajaxQueue.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/org/apache/clerezza/web/resources/jquery/staticweb/jquery.autocomplete.min.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/org/apache/clerezza/web/resources/jquery/staticweb/jquery.blockUI.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/org/apache/clerezza/web/resources/jquery/staticweb/jquery.dump.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/org/apache/clerezza/web/resources/jquery/staticweb/jquery.form.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/org/apache/clerezza/web/resources/jquery/staticweb/jquery.jeditable.mini.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/org/apache/clerezza/web/resources/jquery/staticweb/jquery.json-1.3.min.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/org/apache/clerezza/web/resources/jquery/staticweb/jquery.menu.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/org/apache/clerezza/web/resources/jquery/staticweb/jquery.panel.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/org/apache/clerezza/web/resources/jquery/staticweb/jquery.tooltip.pack.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/org/apache/clerezza/web/resources/jquery/staticweb/jquery.ui.all.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/globalmenu-naked.ssp
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/headed-page-template.ssp
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/staticweb/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsTypeHandler.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform/src/main/java/org/apache/clerezza/platform/Constants.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/JaxRsHandler.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/test/java/org/apache/clerezza/triaxrs/ComponentsRegistrationTest.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.scripts/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.scripts/src/main/java/org/apache/clerezza/web/resources/scripts/Scripts.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/java/org/apache/clerezza/web/resources/style/Style.java
incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/pom.xml?rev=998838&r1=998837&r2=998838&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/pom.xml Mon Sep 20 09:13:06 2010
@@ -46,7 +46,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Import-Package>org.apache.clerezza.web.resources.jquery, org.apache.clerezza.web.resources.style, *</Import-Package>
+ <Require-Bundle>org.apache.clerezza.web.resources.style, org.apache.clerezza.web.resources.jquery</Require-Bundle>
</instructions>
</configuration>
</plugin>
Added: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/pom.xml?rev=998838&view=auto
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/pom.xml (added)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/pom.xml Mon Sep 20 09:13:06 2010
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.parent</artifactId>
+ <version>0.2-incubating-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.platform.content.fsadaptor</artifactId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+ <name>Clerezza - Platform Content Filesystem Adaptor</name>
+ <description>
+ Makes directories appear as a graph describing the files and theits
+ contents with the discobits ontology.
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.platform</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.platform.graphprovider.content</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.rdf.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.rdf.scala.utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.web.fileserver</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <sourceDirectory>src/main/scala</sourceDirectory>
+ <testSourceDirectory>src/test/scala</testSourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.scala-tools</groupId>
+ <artifactId>maven-scala-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <!-- <scalaVersion>${scala.version}</scalaVersion> -->
+ <!-- <args>
+ <arg>-target:jvm-1.5</arg>
+ </args> -->
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Service-Component>OSGI-INF/serviceComponents.xml</Service-Component>
+ <Export-Package>org.apache.clerezza.platform.content.fsadaptor</Export-Package>
+ <!-- <Bundle-SymbolicName>org.apache.clerezza.platform.users.core</Bundle-SymbolicName> -->
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
Added: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/resources/OSGI-INF/serviceComponents.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/resources/OSGI-INF/serviceComponents.xml?rev=998838&view=auto
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/resources/OSGI-INF/serviceComponents.xml (added)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/resources/OSGI-INF/serviceComponents.xml Mon Sep 20 09:13:06 2010
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<components xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
+ <scr:component enabled="true" immediate="true" name="org.apache.clerezza.platform.content.fsadaptor.BundleFsLoader">
+ <implementation class="org.apache.clerezza.platform.content.fsadaptor.BundleFsLoader"/>
+ <reference name="tcManager" interface="org.apache.clerezza.rdf.core.access.TcManager"
+ cardinality="1..1" policy="static" bind="bindTcManager" unbind="unbindTcManager"/>
+ <reference name="parser" interface="org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider"
+ cardinality="1..1" policy="static" bind="bindContentGraphProvider" unbind="unbindContentGraphProvider"/>
+ </scr:component>
+</components>
Added: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/content/fsadaptor/BundleFsLoader.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/content/fsadaptor/BundleFsLoader.scala?rev=998838&view=auto
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/content/fsadaptor/BundleFsLoader.scala (added)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/content/fsadaptor/BundleFsLoader.scala Mon Sep 20 09:13:06 2010
@@ -0,0 +1,108 @@
+/*
+ * 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.
+ */
+
+package org.apache.clerezza.platform.content.fsadaptor
+
+import java.util.Collections
+import org.apache.clerezza.platform.Constants
+import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider
+import org.apache.clerezza.rdf.core.MGraph
+import org.apache.clerezza.rdf.core.UriRef
+import org.apache.clerezza.rdf.core.access.NoSuchEntityException
+import org.apache.clerezza.rdf.core.access.TcManager
+import org.apache.clerezza.rdf.core.access.security.TcPermission
+import org.apache.clerezza.utils.osgi.BundlePathNode
+import org.osgi.framework.Bundle
+import org.osgi.framework.BundleEvent
+import org.osgi.framework.BundleListener
+import org.osgi.service.component.ComponentContext
+import org.slf4j.LoggerFactory
+
+object BundleFsLoader {
+ private val log = LoggerFactory.getLogger(classOf[BundleFsLoader])
+}
+class BundleFsLoader extends BundleListener with Logger {
+
+ private val MGRAPH_NAME = new UriRef("http://zz.localhost/web-resources.graph")
+
+ private var tcManager: TcManager = null
+ private var cgProvider: ContentGraphProvider = null
+
+ protected def activate(context: ComponentContext) {
+ try {
+ tcManager.getMGraph(MGRAPH_NAME);
+ } catch {
+ case e: NoSuchEntityException => {
+ tcManager.createMGraph(MGRAPH_NAME);
+ tcManager.getTcAccessController.setRequiredReadPermissions(
+ MGRAPH_NAME, Collections.singleton(new TcPermission(Constants.CONTENT_GRAPH_URI_STRING, TcPermission.READ)))
+ }
+ case e => throw e
+ }
+ for (bundle <- context.getBundleContext().getBundles()) {
+ addToGraph(bundle);
+ }
+ context.getBundleContext().addBundleListener(this);
+ cgProvider.addTemporaryAdditionGraph(MGRAPH_NAME)
+ }
+ protected def deactivate(context: ComponentContext) {
+ context.getBundleContext().removeBundleListener(this);
+ cgProvider.removeTemporaryAdditionGraph(MGRAPH_NAME)
+ tcManager.deleteTripleCollection(MGRAPH_NAME);
+ }
+
+ def bundleChanged(event: BundleEvent) {
+ val bundle = event.getBundle();
+ event.getType() match {
+ case BundleEvent.STARTED =>
+ addToGraph(bundle);
+ case BundleEvent.STOPPED =>
+ removeFromGraph(bundle);
+ case _ => BundleFsLoader.log.debug("only reacting on bundle start and stop")
+ }
+ }
+
+ def addToGraph(bundle: Bundle) {
+ val pathNode = new BundlePathNode(bundle, "CLEREZZA-INF/web-resources");
+ val mGraph: MGraph = tcManager.getMGraph(MGRAPH_NAME);
+ PathNode2MGraph.describeInGraph(pathNode, mGraph);
+ BundleFsLoader.log.info("size of mgraph after adding resources of {}: {}", bundle, mGraph.size)
+ //log.info("size of mgraph after adding resources of {}: {}", bundle, mGraph.size)
+ }
+
+ def removeFromGraph(bundle: Bundle) {
+
+ }
+
+ def bindTcManager(tcManager: TcManager) {
+ this.tcManager = tcManager;
+ }
+
+ def unbindTcManager(tcManager: TcManager) {
+ this.tcManager = null;
+ }
+
+ def bindContentGraphProvider(p: ContentGraphProvider) {
+ cgProvider = p
+ }
+
+ def unbindContentGraphProvider(p: ContentGraphProvider) {
+ cgProvider = null
+ }
+}
Added: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/content/fsadaptor/Logger.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/content/fsadaptor/Logger.scala?rev=998838&view=auto
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/content/fsadaptor/Logger.scala (added)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/content/fsadaptor/Logger.scala Mon Sep 20 09:13:06 2010
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+
+package org.apache.clerezza.platform.content.fsadaptor
+
+import org.slf4j.LoggerFactory
+//import org.slf4j.ext.LoggerWrapper
+
+trait Logger {
+
+ private val slf4jLogger = LoggerFactory.getLogger(this.getClass)
+// val logger: org.slf4j.Logger = new LoggerWrapper(slf4jLogger, this.getClass.getName)
+
+}
Added: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/content/fsadaptor/PathNode2MGraph.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/content/fsadaptor/PathNode2MGraph.scala?rev=998838&view=auto
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/content/fsadaptor/PathNode2MGraph.scala (added)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/content/fsadaptor/PathNode2MGraph.scala Mon Sep 20 09:13:06 2010
@@ -0,0 +1,104 @@
+/*
+ * 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.
+ */
+
+package org.apache.clerezza.platform.content.fsadaptor;
+
+import java.io.ByteArrayOutputStream
+import javax.ws.rs.core.MediaType
+import org.apache.clerezza.platform.Constants
+import org.apache.clerezza.rdf.core.LiteralFactory
+import org.apache.clerezza.rdf.core.MGraph;
+import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl
+import org.apache.clerezza.rdf.core.impl.TripleImpl
+import org.apache.clerezza.rdf.ontologies.DISCOBITS
+import org.apache.clerezza.rdf.ontologies.HIERARCHY
+import org.apache.clerezza.rdf.ontologies.RDF
+import org.apache.clerezza.web.fileserver.util.MediaTypeGuesser
+import org.wymiwyg.commons.util.dirbrowser.PathNode
+
+
+/**
+ *
+ * @author reto
+ */
+object PathNode2MGraph {
+
+ private val URI_PREFIX = Constants.ALL_HOSTS_URI_PREFIX
+
+ private val literalFactory = LiteralFactory.getInstance
+
+ private def getMediaType(file: PathNode) = {
+ val guessedMediaType: MediaType = MediaTypeGuesser.getInstance().guessTypeForName(file.getPath());
+ guessedMediaType.toString
+ }
+
+ private def getData(file: PathNode) = {
+ val baos = new ByteArrayOutputStream
+ val in = file.getInputStream()
+ val buffer = new Array[Byte](4096)
+ var read = in.read(buffer)
+ while (read != -1) {
+ baos.write(buffer, 0, read)
+ read = in.read(buffer)
+ }
+ in.close()
+ baos.toByteArray
+ }
+
+ def describeInGraph(directory: PathNode, mGraph: MGraph) {
+ val basePathLength = directory.getPath.length
+ def createUriRef(file: PathNode, isDirectory: Boolean) = {
+ def addSlashIfNeeded(s: String) = {
+ if (s.endsWith("/")) {
+ s
+ } else {
+ s+'/'
+ }
+ }
+ val path = if (isDirectory) {
+ addSlashIfNeeded(file.getPath.substring(basePathLength))
+ } else {
+ file.getPath.substring(basePathLength)
+ }
+ new UriRef(URI_PREFIX+path)
+ }
+ def processDirectory(directory: PathNode) {
+ println("processing "+directory)
+ val directoryResource = createUriRef(directory, true)
+ mGraph.add(new TripleImpl(directoryResource, RDF.`type`, HIERARCHY.Collection))
+ for (subPath <- directory.list) {
+ val file = directory.getSubPath(subPath)
+ val isDirectory = file.isDirectory
+ val resource = createUriRef(file, isDirectory)
+ mGraph.add(new TripleImpl(resource, HIERARCHY.parent, directoryResource))
+ if (isDirectory) {
+ processDirectory(file)
+ } else {
+ mGraph.add(new TripleImpl(resource, RDF.`type`, DISCOBITS.InfoDiscoBit))
+ val data = getData(file)
+ mGraph.add(new TripleImpl(resource, DISCOBITS.infoBit, literalFactory.createTypedLiteral(data)))
+ mGraph.add(new TripleImpl(resource, DISCOBITS.mediaType,
+ new PlainLiteralImpl(getMediaType(file))))
+ }
+ }
+ }
+ processDirectory(directory)
+ }
+}
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsTypeHandler.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsTypeHandler.java?rev=998838&r1=998837&r2=998838&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsTypeHandler.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/DiscobitsTypeHandler.java Mon Sep 20 09:13:06 2010
@@ -22,6 +22,7 @@ import org.apache.clerezza.rdf.metadata.
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.net.URISyntaxException;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -48,6 +49,7 @@ import javax.xml.transform.TransformerEx
import javax.xml.transform.TransformerFactoryConfigurationError;
import javax.xml.transform.dom.DOMSource;
import org.apache.clerezza.jaxrs.utils.RedirectUtil;
+import org.apache.clerezza.platform.Constants;
import org.apache.clerezza.platform.content.WebDavUtils.PropertyMap;
import org.apache.clerezza.platform.content.collections.CollectionCreator;
import org.apache.clerezza.platform.content.webdav.MKCOL;
@@ -69,13 +71,17 @@ import org.apache.clerezza.platform.type
import org.apache.clerezza.platform.typehandlerspace.SupportedTypes;
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.Triple;
+import org.apache.clerezza.rdf.core.TripleCollection;
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.access.LockableMGraph;
import org.apache.clerezza.rdf.core.impl.TripleImpl;
import org.apache.clerezza.rdf.ontologies.HIERARCHY;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.utils.GraphNode;
+import org.apache.clerezza.rdf.utils.UnionMGraph;
+import org.apache.clerezza.rdf.utils.UriMutatingTripleCollection;
import org.apache.clerezza.web.fileserver.util.MediaTypeGuesser;
+import org.osgi.service.component.ComponentContext;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -90,7 +96,7 @@ import org.wymiwyg.wrhapi.HeaderName;
*
* @author reto, tho, agron, mir
*/
-@Component
+@Component(metatype=true)
@Services({
@Service(Object.class),
@Service(DiscobitsHandler.class)
@@ -104,6 +110,10 @@ import org.wymiwyg.wrhapi.HeaderName;
@SupportedTypes(types = { "http://www.w3.org/2000/01/rdf-schema#Resource" }, prioritize = false)
public class DiscobitsTypeHandler extends AbstractDiscobitsHandler
implements DiscobitsHandler {
+@Property(value="600", label="Max-Age", description="Specifies the value of the max-age field"
+ + "set in the cache-control header of InfoDiscoBit-Responses, as per RFC 2616 this is a number of "
+ + "seconds")
+ public static final String MAX_AGE = "max-age";
@Reference
protected ContentGraphProvider cgProvider;
@@ -113,6 +123,12 @@ public class DiscobitsTypeHandler extend
private final Set<MetaDataGenerator> metaDataGenerators =
Collections.synchronizedSet(new HashSet<MetaDataGenerator>());
+ private String cacheControlHeaderValue;
+
+ protected void activate(ComponentContext context) {
+ cacheControlHeaderValue = "max-age="+(String) context.getProperties().get(MAX_AGE);
+ }
+
/**
* TypeHandle method for rdf types "TitledContext", "InfoDiscoBit",
* "OrderedContent" and "XHTMLInfoDiscoBit".
@@ -125,18 +141,48 @@ public class DiscobitsTypeHandler extend
public Object getResource(@Context UriInfo uriInfo) {
final MGraph mGraph = cgProvider.getContentGraph();
final UriRef uri = new UriRef(uriInfo.getAbsolutePath().toString());
- final GraphNode graphNode = new GraphNode(uri, mGraph);
+ final GraphNode graphNode = getResourceAsGraphNode(uriInfo);
+ if (graphNode == null) {
+ return checkIfOppositExistsAndRedirectIfSo(uri, uriInfo);
+ }
InfoDiscobit infoDiscobit = InfoDiscobit.createInstance(graphNode);
if (infoDiscobit != null) {
- return infoDiscobit;
+ Response response = Response.ok().
+ header(HttpHeaders.CACHE_CONTROL, cacheControlHeaderValue).
+ entity(infoDiscobit).
+ build();
+ return response;
} else {
- if (nodeAtUriExists(uri)) {
- return new GraphNode(uri, mGraph);
- }
- return checkIfOppositExistsAndRedirectIfSo(uri, uriInfo);
+ return graphNode;
}
}
+ private GraphNode getResourceAsGraphNode(UriInfo uriInfo) {
+ final MGraph mGraph = cgProvider.getContentGraph();
+ final UriRef uri = new UriRef(uriInfo.getAbsolutePath().toString());
+ UriRef allHostsUri = createAnyHostUri(uriInfo);
+ List<TripleCollection> baseTripleCollections = new ArrayList<TripleCollection>(2);
+ if (nodeAtUriExists(allHostsUri)) {
+ GraphNode anyHostGraphNode = new GraphNode(allHostsUri, mGraph);
+ TripleCollection anyHostTriples = new UriMutatingTripleCollection(
+ anyHostGraphNode.getNodeContext(),
+ Constants.ALL_HOSTS_URI_PREFIX+'/', uriInfo.getBaseUri().toString());
+ baseTripleCollections.add(anyHostTriples);
+
+ }
+ if (nodeAtUriExists(uri)) {
+ baseTripleCollections.add(mGraph);
+ }
+ if (baseTripleCollections.isEmpty()) {
+ return null;
+ }
+ TripleCollection baseGraph = baseTripleCollections.size() == 2 ?
+ new UnionMGraph(baseTripleCollections.toArray(new TripleCollection[2])) :
+ baseTripleCollections.get(0);
+ return new GraphNode(uri, baseGraph);
+ }
+
+
/**
* Creates an <code>InfoDiscoBit</code> at the specified location
@@ -495,4 +541,8 @@ public class DiscobitsTypeHandler extend
return new UriRef(uriString + "/");
}
}
+
+ private UriRef createAnyHostUri(UriInfo uriInfo) {
+ return new UriRef(Constants.ALL_HOSTS_URI_PREFIX+uriInfo.getPath());
+ }
}
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/pom.xml?rev=998838&r1=998837&r2=998838&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/pom.xml Mon Sep 20 09:13:06 2010
@@ -232,6 +232,11 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.platform.content.fsadaptor</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.platform.content.imagemetadata</artifactId>
<scope>runtime</scope>
</dependency>
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform/src/main/java/org/apache/clerezza/platform/Constants.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform/src/main/java/org/apache/clerezza/platform/Constants.java?rev=998838&r1=998837&r2=998838&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform/src/main/java/org/apache/clerezza/platform/Constants.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform/src/main/java/org/apache/clerezza/platform/Constants.java Mon Sep 20 09:13:06 2010
@@ -57,5 +57,11 @@ public class Constants {
*/
public static final UriRef CONTENT_GRAPH_URI =
new UriRef(CONTENT_GRAPH_URI_STRING);
+ /**
+ * all hosts uri-prefix, uri scheme for which the resource are also named
+ * with the any schema/authority the instance can be reached with instead
+ * of this prefix
+ */
+ public static final String ALL_HOSTS_URI_PREFIX = "urn:x-allhosts:";
}
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/JaxRsHandler.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/JaxRsHandler.java?rev=998838&r1=998837&r2=998838&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/JaxRsHandler.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/JaxRsHandler.java Mon Sep 20 09:13:06 2010
@@ -227,8 +227,7 @@ public class JaxRsHandler implements Han
String bundlePathPrefix = prefixManager.getPrefix(serviceReference
.getBundle());
- Object component = componentContext.locateService("component",
- serviceReference);
+ Object component = componentContext.getBundleContext().getService(serviceReference);
if (component == null) {
return;
}
@@ -284,9 +283,11 @@ public class JaxRsHandler implements Han
configLock.writeLock().lock();
try {
if (!componentReferenceStore.remove(serviceReference)) {
- Object component = componentContext.locateService("component",
- serviceReference);
-
+ Object component = componentContext.getBundleContext().getService(serviceReference);
+ if (component == null) {
+ logger.warn("Failed to unregister {} as no service could be located", serviceReference);
+ return;
+ }
unregisterComponent(component, component2PathPrefixMap.get(component));
component2PathPrefixMap.remove(component);
}
@@ -298,8 +299,7 @@ public class JaxRsHandler implements Han
protected void unregisterComponent(Object component, String pathPrefix) {
final Class<?> clazz = component.getClass();
final Path path = clazz.getAnnotation(Path.class);
-
- logger.info("Unbinding {}", component);
+ logger.info("Unbinding: {}", component);
if (path != null) {
final RootResourceDescriptor descriptor = new RootResourceDescriptor(
clazz, component, path.value(), providers);
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/test/java/org/apache/clerezza/triaxrs/ComponentsRegistrationTest.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/test/java/org/apache/clerezza/triaxrs/ComponentsRegistrationTest.java?rev=998838&r1=998837&r2=998838&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/test/java/org/apache/clerezza/triaxrs/ComponentsRegistrationTest.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/test/java/org/apache/clerezza/triaxrs/ComponentsRegistrationTest.java Mon Sep 20 09:13:06 2010
@@ -18,6 +18,8 @@
*/
package org.apache.clerezza.triaxrs;
+import java.io.File;
+import java.io.InputStream;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
@@ -33,7 +35,14 @@ import org.junit.Assert;
import org.junit.Test;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.BundleListener;
+import org.osgi.framework.Filter;
+import org.osgi.framework.FrameworkListener;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceListener;
import org.osgi.framework.ServiceReference;
+import org.osgi.framework.ServiceRegistration;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.ComponentInstance;
import org.apache.clerezza.jaxrs.extensions.prefixmanager.BundlePrefixManager;
@@ -158,6 +167,8 @@ public class ComponentsRegistrationTest
return referenceMock;
}
+
+
public static class MyComponentContext implements ComponentContext {
Map<ServiceReference, Object> reference2ComponentMap = new HashMap<ServiceReference, Object>();
@@ -174,7 +185,118 @@ public class ComponentsRegistrationTest
@Override
public BundleContext getBundleContext() {
- throw new UnsupportedOperationException("Not supported yet.");
+ return new BundleContext() {
+
+ @Override
+ public String getProperty(String string) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Bundle getBundle() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Bundle installBundle(String string) throws BundleException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Bundle installBundle(String string, InputStream in) throws BundleException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Bundle getBundle(long l) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Bundle[] getBundles() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void addServiceListener(ServiceListener sl, String string) throws InvalidSyntaxException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void addServiceListener(ServiceListener sl) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void removeServiceListener(ServiceListener sl) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void addBundleListener(BundleListener bl) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void removeBundleListener(BundleListener bl) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void addFrameworkListener(FrameworkListener fl) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void removeFrameworkListener(FrameworkListener fl) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public ServiceRegistration registerService(String[] strings, Object o, Dictionary dctnr) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public ServiceRegistration registerService(String string, Object o, Dictionary dctnr) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public ServiceReference[] getServiceReferences(String string, String string1) throws InvalidSyntaxException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public ServiceReference[] getAllServiceReferences(String string, String string1) throws InvalidSyntaxException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public ServiceReference getServiceReference(String string) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Object getService(ServiceReference sr) {
+ return reference2ComponentMap.get(sr);
+ }
+
+ @Override
+ public boolean ungetService(ServiceReference sr) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public File getDataFile(String string) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public Filter createFilter(String string) throws InvalidSyntaxException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+ };
}
@Override
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/pom.xml?rev=998838&r1=998837&r2=998838&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/pom.xml Mon Sep 20 09:13:06 2010
@@ -9,7 +9,7 @@
<artifactId>org.apache.clerezza.web.resources.jquery</artifactId>
<packaging>bundle</packaging>
<version>0.5-incubating-SNAPSHOT</version>
- <name>Clerezza - jQuery bundlized</name>
+ <name>Clerezza Ext - jQuery JS</name>
<description>
jQuery 1.3.2 as a bundle
</description>
@@ -32,4 +32,18 @@
<artifactId>org.apache.clerezza.web.fileserver</artifactId>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.clerezza.web.resources.jquery</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file