svn commit: r940949 - /incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/Editor.java

[reto]

Author: reto
Date: Tue May  4 16:56:46 2010
New Revision: 940949

URL: http://svn.apache.org/viewvc?rev=940949&view=rev
Log:
simplyfied coded by using CLEREZZA-200 FileServer

Modified:
    
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/Editor.java

Modified: 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/Editor.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/Editor.java?rev=940949&r1=940948&r2=940949&view=diff
==============================================================================
--- 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/Editor.java
 (original)
+++ 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/Editor.java
 Tue May  4 16:56:46 2010
@@ -68,7 +68,7 @@ import org.wymiwyg.commons.util.dirbrows
 @Service(Object.class)
 @Property(name="javax.ws.rs", boolValue=true)
 @Path("tools/editor")
-public class Editor {
+public class Editor extends FileServer {
 
        @Reference
        private ContentGraphProvider cgProvider;
@@ -78,7 +78,7 @@ public class Editor {
 
        
        private static final Logger logger = 
LoggerFactory.getLogger(Editor.class);
-       private FileServer fileServer;
+
        private Providers providers;
        private final MediaType rdfXmlType = 
MediaType.valueOf("application/rdf+xml");
        
@@ -89,11 +89,7 @@ public class Editor {
         * @param context
         */
        protected void activate(ComponentContext context) {
-               Bundle bundle = context.getBundleContext().getBundle();
-               URL directoryRes = 
DiscobitsTypeHandler.class.getResource("staticweb");
-               PathNode pathNode = new BundlePathNode(bundle, 
directoryRes.getPath());
-               logger.info("initializing fileserver for {} ({})", 
directoryRes, directoryRes.getFile());
-               fileServer = new FileServer(pathNode);
+               configure(context.getBundleContext());
        }
 
        
@@ -155,16 +151,9 @@ public class Editor {
        @GET
        public PathNode getStaticFile(@Context UriInfo uriInfo) {
                TrailingSlash.enforcePresent(uriInfo);
-               final PathNode node = fileServer.getNode("disco.xhtml");
+               final PathNode node = getNode("disco.xhtml");
                logger.debug("serving static {}", node);
                return node;
        }
        
-       @GET
-       @Path("{path:.+}")
-       public PathNode getStaticFile(@PathParam("path") String path) {
-               final PathNode node = fileServer.getNode(path);
-               logger.debug("serving static {}", node);
-               return node;
-       }
 }