svn commit: r1085676 - /incubator/clerezza/trunk/parent/web.resources.style/src/main/java/org/apache/clerezza/web/resources/style/Style.java

[reto]

Author: reto
Date: Sat Mar 26 10:11:30 2011
New Revision: 1085676

URL: http://svn.apache.org/viewvc?rev=1085676&view=rev
Log:
CLEREZZA-460: Using ScalaSererPagesService rather than RenderletManager

Modified:
    
incubator/clerezza/trunk/parent/web.resources.style/src/main/java/org/apache/clerezza/web/resources/style/Style.java

Modified: 
incubator/clerezza/trunk/parent/web.resources.style/src/main/java/org/apache/clerezza/web/resources/style/Style.java
URL: 
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/web.resources.style/src/main/java/org/apache/clerezza/web/resources/style/Style.java?rev=1085676&r1=1085675&r2=1085676&view=diff
==============================================================================
--- 
incubator/clerezza/trunk/parent/web.resources.style/src/main/java/org/apache/clerezza/web/resources/style/Style.java
 (original)
+++ 
incubator/clerezza/trunk/parent/web.resources.style/src/main/java/org/apache/clerezza/web/resources/style/Style.java
 Sat Mar 26 10:11:30 2011
@@ -24,25 +24,21 @@ import java.net.URL;
 import javax.ws.rs.core.MediaType;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
-import org.apache.clerezza.platform.typerendering.RenderletManager;
-import 
org.apache.clerezza.platform.typerendering.scalaserverpages.ScalaServerPagesRenderlet;
-import org.apache.clerezza.rdf.core.UriRef;
+import 
org.apache.clerezza.platform.typerendering.scalaserverpages.ScalaServerPagesService;
 import org.apache.clerezza.rdf.ontologies.PLATFORM;
 import org.apache.clerezza.rdf.ontologies.RDFS;
 import org.osgi.service.component.ComponentContext;
 
 /**
- * Bundlized version oficons. Bundles which uses these icons
- * should use this service (bundle depends on 
org.apache.clerezza.web.resources.style.Style)
+ * Registers the Scala Sever PAges provided by this bundle.
  *
- * @author tio
+ * @author tio, reto
  */
 @Component(immediate=true)
 public class Style {
 
        @Reference
-       private RenderletManager renderletManager;
+       private ScalaServerPagesService sspService;
 
        /**
         * configuration.
@@ -51,15 +47,13 @@ public class Style {
         */
        protected void activate(ComponentContext context) {
                URL templateURL = 
getClass().getResource("globalmenu-naked.ssp");
-
-               
renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
-                               new UriRef(templateURL.toString()), 
RDFS.Resource,
-                               "menu", MediaType.APPLICATION_XHTML_XML_TYPE, 
true);
+               sspService.registerScalaServerPage(templateURL, RDFS.Resource, 
"menu",
+                               MediaType.APPLICATION_XHTML_XML_TYPE);
 
                templateURL = 
getClass().getResource("headed-page-template.ssp");
-               
renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
-                               new UriRef(templateURL.toString()), 
PLATFORM.HeadedPage, "(?!.*naked).*",
-                               MediaType.APPLICATION_XHTML_XML_TYPE, true);
+               sspService.registerScalaServerPage(templateURL, 
PLATFORM.HeadedPage, "(?!.*naked).*",
+                               MediaType.APPLICATION_XHTML_XML_TYPE);
+
 
        }