You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by bb...@apache.org on 2011/03/19 16:55:47 UTC
svn commit: r1083199 - in /incubator/clerezza/trunk/parent:
platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/resources/OSGI-INF/
platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/pl...
Author: bblfish
Date: Sat Mar 19 15:55:47 2011
New Revision: 1083199
URL: http://svn.apache.org/viewvc?rev=1083199&view=rev
Log:
Adapted accountcontrolpanel to the new CLEREZZA-460 "Use whiteboard pattern for Renderlets". Turned WebProxy into a @WebRenderingService in order to remove the fetch() function added recently to the RenderedPage class (see CLEREZZA-463)
Modified:
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/resources/OSGI-INF/serviceComponents.xml
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/PersonPanel.scala
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/ProfilePanel.scala
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/person_panel.scala
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/profile_panel.scala
incubator/clerezza/trunk/parent/platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderlet.java
incubator/clerezza/trunk/parent/rdf.web.proxy/rdf.web.proxy.core/src/main/scala/org/apache/clerezza/rdf/web/proxy/WebProxy.scala
Modified: incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/resources/OSGI-INF/serviceComponents.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/resources/OSGI-INF/serviceComponents.xml?rev=1083199&r1=1083198&r2=1083199&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/resources/OSGI-INF/serviceComponents.xml (original)
+++ incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/resources/OSGI-INF/serviceComponents.xml Sat Mar 19 15:55:47 2011
@@ -7,6 +7,7 @@
</service>
<property name="service.pid" value="org.apache.clerezza.platform.accountcontrolpanel.AcpPermissionDescriptionsProvider"/>
</scr:component>
+
<scr:component enabled="true" name="org.apache.clerezza.platform.accountcontrolpanel.MenuItemProvider">
<implementation class="org.apache.clerezza.platform.accountcontrolpanel.MenuItemProvider"/>
<service servicefactory="false">
@@ -14,6 +15,7 @@
</service>
<property name="service.pid" value="org.apache.clerezza.platform.accountcontrolpanel.MenuItemProvider"/>
</scr:component>
+
<scr:component enabled="true" name="org.apache.clerezza.platform.accountcontrolpanel.SettingsPanel">
<implementation class="org.apache.clerezza.platform.accountcontrolpanel.SettingsPanel"/>
<service servicefactory="false">
@@ -26,6 +28,17 @@
<reference name="renderletManager" interface="org.apache.clerezza.platform.typerendering.RenderletManager" cardinality="1..1" policy="static" bind="bindRenderletManager" unbind="unbindRenderletManager"/>
<reference name="cgProvider" interface="org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider" cardinality="1..1" policy="static" bind="bindCgProvider" unbind="unbindCgProvider"/>
</scr:component>
+ <scr:component enabled="true" name="org.apache.clerezza.platform.accountcontrolpanel.settings_panel">
+ <implementation class="org.apache.clerezza.platform.accountcontrolpanel.settings_panel"/>
+ <service servicefactory="false">
+ <provide interface="org.apache.clerezza.platform.typerendering.Renderlet"/>
+ </service>
+ <property name="service.pid" value="org.apache.clerezza.platform.accountcontrolpanel.settings_panel"/>
+ <reference name="renderletManager" interface="org.apache.clerezza.platform.typerendering.RenderletManager" cardinality="1..1" policy="static" bind="bindRenderletManager" unbind="unbindRenderletManager"/>
+ </scr:component>
+
+
+
<scr:component enabled="true" name="org.apache.clerezza.platform.accountcontrolpanel.ProfilePanel">
<implementation class="org.apache.clerezza.platform.accountcontrolpanel.ProfilePanel"/>
<service servicefactory="false">
@@ -37,13 +50,21 @@
cardinality="1..1" policy="static" bind="bindUserManager" unbind="unbindUserManager"/>
<reference name="keygenSrvc" interface="org.apache.clerezza.ssl.keygen.KeygenService"
cardinality="1..1" policy="static" bind="bindKeygenSrvc" unbind="unbindKeygenSrvc"/>
- <reference name="renderletManager" interface="org.apache.clerezza.platform.typerendering.RenderletManager"
- cardinality="1..1" policy="static" bind="bindRenderletManager" unbind="unbindRenderletManager"/>
<reference name="webIdGraphsService" interface="org.apache.clerezza.platform.users.WebIdGraphsService"
cardinality="1..1" policy="static" bind="bindWebIdGraphsService" unbind="unbindWebIdGraphsService"/>
<reference name="platformConfig" interface="org.apache.clerezza.platform.config.PlatformConfig"
cardinality="1..1" policy="static" bind="bindPlatformConfig" unbind="unbindPlatformConfig"/>
</scr:component>
+ <scr:component enabled="true" name="org.apache.clerezza.platform.accountcontrolpanel.profile_panel">
+ <implementation class="org.apache.clerezza.platform.accountcontrolpanel.profile_panel"/>
+ <service servicefactory="false">
+ <provide interface="org.apache.clerezza.platform.typerendering.TypeRenderlet"/>
+ </service>
+ <property name="service.pid" value="org.apache.clerezza.platform.accountcontrolpanel.profile_panel"/>
+ </scr:component>
+
+
+
<scr:component enabled="true" name="org.apache.clerezza.platform.accountcontrolpanel.PersonPanel">
<implementation class="org.apache.clerezza.platform.accountcontrolpanel.PersonPanel"/>
<service servicefactory="false">
@@ -51,31 +72,14 @@
</service>
<property name="javax.ws.rs" type="Boolean" value="true"/>
<property name="service.pid" value="org.apache.clerezza.platform.accountcontrolpanel.PersonPanel"/>
- <reference name="renderletManager" interface="org.apache.clerezza.platform.typerendering.RenderletManager"
- cardinality="1..1" policy="static" bind="bindRenderletManager" unbind="unbindRenderletManager"/>
</scr:component>
- <scr:component enabled="true" name="org.apache.clerezza.platform.accountcontrolpanel.profile_panel">
- <implementation class="org.apache.clerezza.platform.accountcontrolpanel.profile_panel"/>
- <service servicefactory="false">
- <provide interface="org.apache.clerezza.platform.typerendering.Renderlet"/>
- </service>
- <property name="service.pid" value="org.apache.clerezza.platform.accountcontrolpanel.profile_panel"/>
- <reference name="renderletManager" interface="org.apache.clerezza.platform.typerendering.RenderletManager" cardinality="1..1" policy="static" bind="bindRenderletManager" unbind="unbindRenderletManager"/>
- </scr:component>
- <scr:component enabled="true" name="org.apache.clerezza.platform.accountcontrolpanel.settings_panel">
- <implementation class="org.apache.clerezza.platform.accountcontrolpanel.settings_panel"/>
- <service servicefactory="false">
- <provide interface="org.apache.clerezza.platform.typerendering.Renderlet"/>
- </service>
- <property name="service.pid" value="org.apache.clerezza.platform.accountcontrolpanel.settings_panel"/>
- <reference name="renderletManager" interface="org.apache.clerezza.platform.typerendering.RenderletManager" cardinality="1..1" policy="static" bind="bindRenderletManager" unbind="unbindRenderletManager"/>
- </scr:component>
- <scr:component enabled="true" name="org.apache.clerezza.platform.accountcontrolpanel.person_panel">
- <implementation class="org.apache.clerezza.platform.accountcontrolpanel.person_panel"/>
- <service servicefactory="false">
- <provide interface="org.apache.clerezza.platform.typerendering.Renderlet"/>
- </service>
- <property name="service.pid" value="org.apache.clerezza.platform.accountcontrolpanel.person_panel"/>
- <reference name="renderletManager" interface="org.apache.clerezza.platform.typerendering.RenderletManager" cardinality="1..1" policy="static" bind="bindRenderletManager" unbind="unbindRenderletManager"/>
- </scr:component>
+ <scr:component enabled="true" name="org.apache.clerezza.platform.accountcontrolpanel.person_panel">
+ <implementation class="org.apache.clerezza.platform.accountcontrolpanel.person_panel"/>
+ <service servicefactory="false">
+ <provide interface="org.apache.clerezza.platform.typerendering.TypeRenderlet"/>
+ </service>
+ <property name="javax.ws.rs" type="Boolean" value="true"/>
+ <property name="service.pid" value="org.apache.clerezza.platform.accountcontrolpanel.person_panel"/>
+ </scr:component>
+
</components>
Modified: incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/PersonPanel.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/PersonPanel.scala?rev=1083199&r1=1083198&r2=1083199&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/PersonPanel.scala (original)
+++ incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/PersonPanel.scala Sat Mar 19 15:55:47 2011
@@ -77,11 +77,10 @@ object PersonPanel {
*/
@Path("/user/{id}/people")
class PersonPanel {
-
import PersonPanel.logger
protected def activate(componentContext: ComponentContext): Unit = {
-// this.componentContext = componentContext.
+// this.componentContext = componentContext
}
@GET
@@ -107,18 +106,5 @@ class PersonPanel {
- protected def bindRenderletManager(renderletmanager: RenderletManager): Unit = {
- renderletManager = renderletmanager
- }
-
- protected def unbindRenderletManager(renderletmanager: RenderletManager): Unit = {
- if (renderletManager == renderletmanager) {
- renderletManager = null
- }
- }
-
-
- //called by the ssp, web component
- private var renderletManager: RenderletManager = null
}
\ No newline at end of file
Modified: incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/ProfilePanel.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/ProfilePanel.scala?rev=1083199&r1=1083198&r2=1083199&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/ProfilePanel.scala (original)
+++ incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/ProfilePanel.scala Sat Mar 19 15:55:47 2011
@@ -329,15 +329,6 @@ class ProfilePanel {
}
}
- protected def bindRenderletManager(renderletmanager: RenderletManager): Unit = {
- renderletManager = renderletmanager
- }
-
- protected def unbindRenderletManager(renderletmanager: RenderletManager): Unit = {
- if (renderletManager == renderletmanager) {
- renderletManager = null
- }
- }
protected def bindWebIdGraphsService(webidgraphsservice: WebIdGraphsService): Unit = {
webIdGraphsService = webidgraphsservice
@@ -371,8 +362,6 @@ class ProfilePanel {
private var keygenSrvc: KeygenService = null
private var platformConfig: PlatformConfig = null
- //todo: are these this needed? It's not used it seems
- private var renderletManager: RenderletManager = null
private var componentContext: ComponentContext = null
Modified: incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/person_panel.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/person_panel.scala?rev=1083199&r1=1083198&r2=1083199&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/person_panel.scala (original)
+++ incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/person_panel.scala Sat Mar 19 15:55:47 2011
@@ -25,9 +25,11 @@ import org.apache.clerezza.platform.type
import org.apache.clerezza.rdf.core.UriRef
import org.apache.clerezza.platform.accountcontrolpanel.ontologies.CONTROLPANEL
import org.apache.clerezza.rdf.utils.GraphNode
-import xml.{NodeSeq, NodeBuffer, Text, Node}
+import xml.{NodeSeq, Text, Node}
import java.net.{URLEncoder, URL}
import org.apache.clerezza.rdf.ontologies.{RDF, FOAF, RDFS}
+import org.apache.clerezza.rdf.web.proxy.WebProxy
+import javax.ws.rs.core.MediaType
object person_panel {
final val emptyText = new Text("")
@@ -132,14 +134,15 @@ object person_panel {
}
-class person_panel extends PageRenderlet {
- val rdfType = CONTROLPANEL.ProfileViewerPage
- override def mode = "naked"
+class person_panel extends SRenderlet {
+ def getRdfType() = CONTROLPANEL.ProfileViewerPage
+ def getMediaType() =MediaType.APPLICATION_XHTML_XML_TYPE
+ def getModePattern() = "naked"
import person_panel._
- override def renderedPage(arguments: RenderedPage.Arguments): RenderedPage = {
- new RenderedPage(arguments) {
+ override def renderedPage(arguments: XmlResult.Arguments) = {
+ new XmlResult(arguments) {
override def content = {
def cp(s: Any) = new UriRef("http://clerezza.org/2009/03/controlpanel#" + s)
@@ -151,12 +154,15 @@ class person_panel extends PageRenderlet
resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li><a href="control-panel">Settings</a></li>);
resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li><a href="profile">Profile</a></li>);
- val it: CollectedIter[RichGraphNode] = res / FOAF.primaryTopic
- val primeTpc: RichGraphNode = it.apply(0)
- val agent : RichGraphNode= primeTpc! match {
- case uri : UriRef => fetch(uri) match { case Some(grph) => grph; case None => res};
- case _ => res
- }
+ val webIdUri= new UriRef(uriInfo.getQueryParameters(true).getFirst("uri"))
+// val it: CollectedIter[RichGraphNode] = res / FOAF.primaryTopic
+// val primeTpc: RichGraphNode = it.apply(0)
+ val agent : RichGraphNode= $[WebProxy].fetchSemantics(webIdUri) match { case Some(grph) => grph; case None => res};
+
+// primeTpc! match {
+// case uri : UriRef => $[WebProxy].fetchSemantics(uri) match { case Some(grph) => grph; case None => res};
+// case _ => res
+// }
def relations() = {
<table>{for (friend <- agent/FOAF.knows) {
@@ -173,7 +179,8 @@ class person_panel extends PageRenderlet
def allAgentsHtml(tc: TripleCollection): Node = {<span>
<th><tr colspan="2">All agents found</tr></th>
{ import collection.JavaConversions._
- val base = new URL(primeTpc.getNode.asInstanceOf[UriRef].getUnicodeString());
+ //todo: change
+ val base = new URL(agent.getNode.asInstanceOf[UriRef].getUnicodeString());
val lclPrson = for (tr: Triple <- tc.filter(null, RDF.`type`, FOAF.Person);
subjUrl = try { new URL(tr.getSubject.asInstanceOf[UriRef].getUnicodeString) } catch { case _ => null }
if (subjUrl != null && base.sameFile(subjUrl))
Modified: incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/profile_panel.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/profile_panel.scala?rev=1083199&r1=1083198&r2=1083199&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/profile_panel.scala (original)
+++ incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/profile_panel.scala Sat Mar 19 15:55:47 2011
@@ -27,14 +27,16 @@ import java.text._
import org.apache.clerezza.rdf.core.UriRef
import org.apache.clerezza.platform.accountcontrolpanel.ontologies.CONTROLPANEL
import org.apache.clerezza.rdf.ontologies.{RDFS, DC, FOAF}
-import org.apache.clerezza.rdf.utils.GraphNode
+import org.apache.clerezza.rdf.web.proxy.WebProxy
+import javax.ws.rs.core.MediaType
-class profile_panel extends PageRenderlet {
- val rdfType = CONTROLPANEL.ProfilePage
- override def mode = "naked"
+class profile_panel extends SRenderlet {
+ def getRdfType() = CONTROLPANEL.ProfilePage
+ def getMediaType() =MediaType.APPLICATION_XHTML_XML_TYPE
+ def getModePattern() = "naked"
- override def renderedPage(arguments: RenderedPage.Arguments): RenderedPage = {
- new RenderedPage(arguments) {
+ override def renderedPage(arguments: XmlResult.Arguments) = {
+ new XmlResult(arguments) {
override def content = {
def cp(s: Any) = new UriRef("http://clerezza.org/2009/03/controlpanel#" + s)
@@ -129,7 +131,7 @@ class profile_panel extends PageRenderle
val friends = for (friend <- agent/FOAF.knows) yield {
import person_panel._
val node = friend.getNode() match {
- case uri: UriRef => fetch(uri) match {
+ case uri: UriRef => $[WebProxy].fetchSemantics(uri) match {
case Some(grp) => personInABox(grp)
case None => emptyText
}
Modified: incubator/clerezza/trunk/parent/platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala?rev=1083199&r1=1083198&r2=1083199&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala (original)
+++ incubator/clerezza/trunk/parent/platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala Sat Mar 19 15:55:47 2011
@@ -78,24 +78,6 @@ abstract class RenderedPage(arguments: R
parseNodeSeq(new String(baos.toByteArray))
}
- def fetch(uri: UriRef) : Option[GraphNode] = {
- val webSrvc = AccessController.doPrivileged(new PrivilegedAction[WebProxy] {
- def run: WebProxy = {
- val cntxt: BundleContext = requestProperties.bundleContext
- var serviceReference: ServiceReference = cntxt.getServiceReference("org.apache.clerezza.rdf.web.proxy.WebProxy")
- if (serviceReference != null) {
- return cntxt.getService(serviceReference).asInstanceOf[WebProxy]
- } else {
- return null
- }
- }
- })
- //This should return not a graph, but a graph surrounded with HTTP metadata, so that the user
- //connection error messages can be designed, and so on.
- //The graph should be fetched as the user also if this is required.
- return webSrvc.fetchSemantics(uri,Cache.Fetch)
- }
-
/**
* This is an object that allows one to use some nice shortcuts in scala based subclasses
* - $variable will get the value of the sharedRenderingValues hash
Modified: incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderlet.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderlet.java?rev=1083199&r1=1083198&r2=1083199&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderlet.java (original)
+++ incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderlet.java Sat Mar 19 15:55:47 2011
@@ -23,10 +23,8 @@ import java.io.OutputStream;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Map;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.UriInfo;
+import javax.ws.rs.core.*;
+
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.osgi.framework.BundleContext;
@@ -109,7 +107,7 @@ public interface TypeRenderlet {
@Override
public T run() {
- ServiceReference serviceReference = bundleContext.getServiceReference(type.getName());
+ ServiceReference serviceReference = RequestProperties.this.bundleContext.getServiceReference(type.getName());
if (serviceReference != null) {
T resultCandidate = (T) bundleContext.getService(serviceReference);
if (resultCandidate.getClass().getAnnotation(WebRenderingService.class) != null) {
Modified: incubator/clerezza/trunk/parent/rdf.web.proxy/rdf.web.proxy.core/src/main/scala/org/apache/clerezza/rdf/web/proxy/WebProxy.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/rdf.web.proxy/rdf.web.proxy.core/src/main/scala/org/apache/clerezza/rdf/web/proxy/WebProxy.scala?rev=1083199&r1=1083198&r2=1083199&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/rdf.web.proxy/rdf.web.proxy.core/src/main/scala/org/apache/clerezza/rdf/web/proxy/WebProxy.scala (original)
+++ incubator/clerezza/trunk/parent/rdf.web.proxy/rdf.web.proxy.core/src/main/scala/org/apache/clerezza/rdf/web/proxy/WebProxy.scala Sat Mar 19 15:55:47 2011
@@ -21,18 +21,14 @@ package org.apache.clerezza.rdf.web.prox
import org.apache.clerezza.platform.Constants
import org.apache.clerezza.rdf.utils.GraphNode
-import org.apache.clerezza.rdf.utils.UnionMGraph
import org.osgi.service.component.ComponentContext
import org.apache.clerezza.rdf.core.{MGraph, TripleCollection, UriRef}
-import org.apache.clerezza.rdf.core.impl.SimpleMGraph
-import org.apache.clerezza.rdf.ontologies.PLATFORM
-import org.apache.clerezza.platform.config.{PlatformConfig, SystemConfig}
-import org.apache.clerezza.rdf.core.access.security.TcPermission
+import org.apache.clerezza.platform.config.PlatformConfig
import java.net.{HttpURLConnection, URL}
-import java.security.{PrivilegedAction, AccessController}
-import org.apache.clerezza.rdf.core.access.{SecuredMGraph, NoSuchEntityException, TcManager}
+import org.apache.clerezza.rdf.core.access.{NoSuchEntityException, TcManager}
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat
import org.apache.clerezza.rdf.core.serializedform.Parser
+import org.apache.clerezza.platform.typerendering.WebRenderingService
/**
@@ -40,6 +36,7 @@ import org.apache.clerezza.rdf.core.seri
* version of them in store for faster delivery.
*
*/
+@WebRenderingService
class WebProxy {