Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.scripts/pom.xml URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.scripts/pom.xml?rev=998838&r1=998837&r2=998838&view=diff ============================================================================== --- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.scripts/pom.xml (original) +++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.scripts/pom.xml Mon Sep 20 09:13:06 2010 @@ -42,6 +42,17 @@ <groupId>net.sf.alchim</groupId> <artifactId>yuicompressor-maven-plugin</artifactId> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <!-- <Import-Package>org.apache.clerezza.web.resources.jquery, *</Import-Package> --> + <Require-Bundle>org.apache.clerezza.web.resources.jquery</Require-Bundle> + </instructions> + </configuration> + </plugin> </plugins> </build> </project> \ No newline at end of file
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.scripts/src/main/java/org/apache/clerezza/web/resources/scripts/Scripts.java URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.scripts/src/main/java/org/apache/clerezza/web/resources/scripts/Scripts.java?rev=998838&r1=998837&r2=998838&view=diff ============================================================================== --- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.scripts/src/main/java/org/apache/clerezza/web/resources/scripts/Scripts.java (original) +++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.scripts/src/main/java/org/apache/clerezza/web/resources/scripts/Scripts.java Mon Sep 20 09:13:06 2010 @@ -16,72 +16,66 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.clerezza.web.resources.scripts; - -import java.io.IOException; -import java.net.URL; - -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; - -import org.osgi.framework.Bundle; -import org.osgi.service.component.ComponentContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.clerezza.web.fileserver.BundlePathNode; -import org.apache.clerezza.web.fileserver.FileServer; -import org.apache.clerezza.web.resources.jquery.JQuery; -import org.wymiwyg.commons.util.dirbrowser.PathNode; - -/** - * Javascript Library for clerezza platform or apps - * - * - * @scr.component - * @scr.service interface="java.lang.Object" - * @scr.service interface="org.apache.clerezza.web.resources.scripts.Scripts" - * @scr.property name="javax.ws.rs" type="Boolean" value="true" - * - * @author mkn, tio, mhe - */ -...@path("/scripts") -public class Scripts { - - /** - * @scr.reference - */ - private JQuery jQuery; - - private final Logger logger = LoggerFactory.getLogger(getClass()); - - private FileServer fileServer; - - /** - * The activate method is called when SCR activates the component - * configuration. - * - * @param componentContext - */ - protected void activate(ComponentContext context) { - Bundle bundle = context.getBundleContext().getBundle(); - URL resourceDir = getClass().getResource("staticweb"); - PathNode pathNode = new BundlePathNode(bundle, resourceDir.getPath()); - logger.debug("Initializing file server for {} ({})", resourceDir, - resourceDir.getFile()); - fileServer = new FileServer(pathNode); - } - - /** - * Returns a PathNode of a static file from the staticweb folder. - * - * @return {...@link PathNode} - */ - @GET - @Path("{path:.+}") - public PathNode getStaticFile(@PathParam("path") String path) { - final PathNode node = fileServer.getNode(path); - return node; - } - -} +package org.apache.clerezza.web.resources.scripts; + +import java.io.IOException; +import java.net.URL; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; + +import org.osgi.framework.Bundle; +import org.osgi.service.component.ComponentContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.apache.clerezza.web.fileserver.BundlePathNode; +import org.apache.clerezza.web.fileserver.FileServer; +import org.wymiwyg.commons.util.dirbrowser.PathNode; + +/** + * Javascript Library for clerezza platform or apps + * + * + * @scr.component + * @scr.service interface="java.lang.Object" + * @scr.service interface="org.apache.clerezza.web.resources.scripts.Scripts" + * @scr.property name="javax.ws.rs" type="Boolean" value="true" + * + * @author mkn, tio, mhe + */ +...@path("/scripts") +public class Scripts { + + private final Logger logger = LoggerFactory.getLogger(getClass()); + + private FileServer fileServer; + + /** + * The activate method is called when SCR activates the component + * configuration. + * + * @param componentContext + */ + protected void activate(ComponentContext context) { + Bundle bundle = context.getBundleContext().getBundle(); + URL resourceDir = getClass().getResource("staticweb"); + PathNode pathNode = new BundlePathNode(bundle, resourceDir.getPath()); + logger.debug("Initializing file server for {} ({})", resourceDir, + resourceDir.getFile()); + fileServer = new FileServer(pathNode); + } + + /** + * Returns a PathNode of a static file from the staticweb folder. + * + * @return {...@link PathNode} + */ + @GET + @Path("{path:.+}") + public PathNode getStaticFile(@PathParam("path") String path) { + final PathNode node = fileServer.getNode(path); + return node; + } + +} Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/java/org/apache/clerezza/web/resources/style/Style.java URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/java/org/apache/clerezza/web/resources/style/Style.java?rev=998838&r1=998837&r2=998838&view=diff ============================================================================== --- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/java/org/apache/clerezza/web/resources/style/Style.java (original) +++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/java/org/apache/clerezza/web/resources/style/Style.java Mon Sep 20 09:13:06 2010 @@ -20,28 +20,17 @@ package org.apache.clerezza.web.resource import java.net.URL; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; import javax.ws.rs.core.MediaType; import org.apache.felix.scr.annotations.Component; -import org.apache.felix.scr.annotations.Property; import org.apache.felix.scr.annotations.Reference; import org.apache.felix.scr.annotations.Service; -import org.apache.felix.scr.annotations.Services; 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.rdf.ontologies.PLATFORM; import org.apache.clerezza.rdf.ontologies.RDFS; -import org.osgi.framework.Bundle; import org.osgi.service.component.ComponentContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.clerezza.web.fileserver.BundlePathNode; -import org.apache.clerezza.web.fileserver.FileServer; -import org.wymiwyg.commons.util.dirbrowser.PathNode; /** * Bundlized version oficons. Bundles which uses these icons @@ -49,19 +38,9 @@ import org.wymiwyg.commons.util.dirbrows * * @author tio */ -...@component -...@services({ - @Service(Object.class), - @Service(Style.class)} -) -...@property(name="javax.ws.rs", boolValue=true) -...@path("/style") +...@component(immediate=true) public class Style { - private final Logger logger = LoggerFactory.getLogger(getClass()); - - private FileServer fileServer; - @Reference private RenderletManager renderletManager; @@ -71,12 +50,6 @@ public class Style { * @param context */ protected void activate(ComponentContext context) { - Bundle bundle = context.getBundleContext().getBundle(); - URL resourceDir = getClass().getResource("staticweb"); - PathNode pathNode = new BundlePathNode(bundle, resourceDir.getPath()); - logger.debug("Initializing file server for {} ({})", resourceDir, - resourceDir.getFile()); - fileServer = new FileServer(pathNode); URL templateURL = getClass().getResource("globalmenu-naked.ssp"); renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(), @@ -90,15 +63,4 @@ public class Style { } - /** - * Returns a PathNode of a static file from the staticweb folder. - * - * @return {...@link PathNode} - */ - @GET - @Path("{path:.+}") - public PathNode getStaticFile(@PathParam("path") String path) { - final PathNode node = fileServer.getNode(path); - return node; - } } Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml?rev=998838&r1=998837&r2=998838&view=diff ============================================================================== --- incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml (original) +++ incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml Mon Sep 20 09:13:06 2010 @@ -45,6 +45,7 @@ <module>org.apache.clerezza.platform.config.gui</module> <module>org.apache.clerezza.platform.content.imagemetadata</module> <module>org.apache.clerezza.platform.content</module> + <module>org.apache.clerezza.platform.content.fsadaptor</module> <module>org.apache.clerezza.platform.content.representations</module> <module>org.apache.clerezza.platform.dashboard</module> <module>org.apache.clerezza.platform.dashboard.webinterface</module> @@ -730,6 +731,11 @@ </dependency> <dependency> <groupId>org.apache.clerezza</groupId> + <artifactId>org.apache.clerezza.platform.content.fsadaptor</artifactId> + <version>0.1-incubating-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.clerezza</groupId> <artifactId>org.apache.clerezza.platform.graphprovider.content</artifactId> <version>0.6-incubating-SNAPSHOT</version> </dependency>
