Author: reto
Date: Wed Apr 4 23:23:51 2012
New Revision: 1309624
URL: http://svn.apache.org/viewvc?rev=1309624&view=rev
Log:
skeleton project fixed
Removed:
incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/FacetedResource2.java
incubator/stanbol/branches/ontonet-showcase/webdav/src/main/java/org/apache/stanbol/webdav/resources/RootResource.java
incubator/stanbol/branches/ontonet-showcase/webdav/src/main/java/org/apache/stanbol/webdav/resources/SlingResource.java
Modified:
incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/FacetedResource.java
incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/RootResource.java
incubator/stanbol/branches/ontonet-showcase/webdav/src/main/java/org/apache/stanbol/webdav/MiltonDavServlet.java
incubator/stanbol/branches/ontonet-showcase/webdav/src/main/java/org/apache/stanbol/webdav/resources/SimpleResourceFactory.java
Modified:
incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/FacetedResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/FacetedResource.java?rev=1309624&r1=1309623&r2=1309624&view=diff
==============================================================================
---
incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/FacetedResource.java
(original)
+++
incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/FacetedResource.java
Wed Apr 4 23:23:51 2012
@@ -20,38 +20,43 @@ package org.apache.stanbol.contenthub.vf
import java.io.IOException;
import java.io.OutputStream;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
import java.util.Map;
+import org.apache.stanbol.contenthub.servicesapi.search.featured.FacetResult;
+import org.apache.stanbol.webdav.resources.AbstractCollectionResource;
+
import com.bradmcevoy.http.Auth;
+import com.bradmcevoy.http.CollectionResource;
import com.bradmcevoy.http.GetableResource;
import com.bradmcevoy.http.PropFindableResource;
import com.bradmcevoy.http.Range;
import com.bradmcevoy.http.Request;
import com.bradmcevoy.http.Request.Method;
+import com.bradmcevoy.http.Resource;
import com.bradmcevoy.http.exceptions.BadRequestException;
import com.bradmcevoy.http.exceptions.NotAuthorizedException;
+import com.bradmcevoy.http.exceptions.NotFoundException;
-public class FacetedResource implements PropFindableResource, GetableResource {
+public class FacetedResource extends AbstractCollectionResource implements
PropFindableResource, GetableResource, CollectionResource {
- private static String name = "scratchpad.txt";
+ private String name = "scratchpad.txt";
private static final String MESSAGE = "Hello world";
public FacetedResource(String name) {
this.name = name;
}
- public static String getFilename() {
- return name;
- }
public String getUniqueId() {
- return getFilename();
+ return name;
}
public String getName() {
- return getFilename();
+ return name;
}
public Object authenticate(String user, String password) {
@@ -91,8 +96,24 @@ public class FacetedResource implements
public Long getContentLength() {
return Long.valueOf(MESSAGE.length());
}
-
- public void sendContent(OutputStream out, Range range, Map params,
String contentType) throws IOException, NotAuthorizedException,
BadRequestException {
+
+ @Override
+ public void sendContent(OutputStream out, Range range, Map<String,
String> params, String contentType) throws IOException,
NotAuthorizedException, BadRequestException {
out.write(MESSAGE.getBytes());
}
+
+
+
+ @Override
+ public List<? extends Resource> getChildren()
+ throws NotAuthorizedException, BadRequestException {
+ // TODO Auto-generated method stub
+ List<Resource> resources = new ArrayList<Resource>();
+ resources.add(new FacetedResource("bar1"));
+ resources.add(new FacetedResource("bar2"));
+ resources.add(new FacetedResource("bar3") {});
+ return resources;
+ }
+
+
}
\ No newline at end of file
Modified:
incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/RootResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/RootResource.java?rev=1309624&r1=1309623&r2=1309624&view=diff
==============================================================================
---
incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/RootResource.java
(original)
+++
incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/RootResource.java
Wed Apr 4 23:23:51 2012
@@ -13,7 +13,6 @@ import org.apache.stanbol.contenthub.ser
import
org.apache.stanbol.contenthub.servicesapi.search.featured.FeaturedSearch;
import org.apache.stanbol.contenthub.servicesapi.search.featured.SearchResult;
import org.apache.stanbol.webdav.resources.AbstractCollectionResource;
-import org.apache.stanbol.webdav.resources.SlingResource;
import com.bradmcevoy.http.Auth;
import com.bradmcevoy.http.CollectionResource;
@@ -86,8 +85,6 @@ public class RootResource extends Abstra
resources.add(new FacetedResource("foo"));
resources.add(new FacetedResource("foo2"));
resources.add(new FacetedResource("foo3") {});
- resources.add(new FacetedResource2("bar") {});
- resources.add(new FacetedResource2("bar2"));
//resources.add(new SlingResource());
System.out.println("returning: "+resources);
return resources;
Modified:
incubator/stanbol/branches/ontonet-showcase/webdav/src/main/java/org/apache/stanbol/webdav/MiltonDavServlet.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/ontonet-showcase/webdav/src/main/java/org/apache/stanbol/webdav/MiltonDavServlet.java?rev=1309624&r1=1309623&r2=1309624&view=diff
==============================================================================
---
incubator/stanbol/branches/ontonet-showcase/webdav/src/main/java/org/apache/stanbol/webdav/MiltonDavServlet.java
(original)
+++
incubator/stanbol/branches/ontonet-showcase/webdav/src/main/java/org/apache/stanbol/webdav/MiltonDavServlet.java
Wed Apr 4 23:23:51 2012
@@ -133,7 +133,7 @@ public class MiltonDavServlet extends Ab
}
java.util.Properties props = new java.util.Properties();
- props.put("resource.factory.class", SimpleResourceFactory.NAME);
+ //props.put("resource.factory.class", SimpleResourceFactory.NAME);
props.put("authentication.handler.classes",
SlingAuthenticationHandler.NAME);
props.put("response.handler.class", SlingResponseHandler.NAME);
Modified:
incubator/stanbol/branches/ontonet-showcase/webdav/src/main/java/org/apache/stanbol/webdav/resources/SimpleResourceFactory.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/ontonet-showcase/webdav/src/main/java/org/apache/stanbol/webdav/resources/SimpleResourceFactory.java?rev=1309624&r1=1309623&r2=1309624&view=diff
==============================================================================
---
incubator/stanbol/branches/ontonet-showcase/webdav/src/main/java/org/apache/stanbol/webdav/resources/SimpleResourceFactory.java
(original)
+++
incubator/stanbol/branches/ontonet-showcase/webdav/src/main/java/org/apache/stanbol/webdav/resources/SimpleResourceFactory.java
Wed Apr 4 23:23:51 2012
@@ -18,6 +18,9 @@
*/
package org.apache.stanbol.webdav.resources;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import com.bradmcevoy.common.Path;
import com.bradmcevoy.http.CollectionResource;
import com.bradmcevoy.http.Resource;
@@ -27,8 +30,10 @@ import com.bradmcevoy.http.exceptions.No
public class SimpleResourceFactory implements ResourceFactory {
- final public static String NAME =
"org.apache.stanbol.webdav.resources.SlingResourceFactory"; //
SlingResourceFactory.class.getName();
+ final static Logger log =
LoggerFactory.getLogger(SimpleResourceFactory.class);
+
private CollectionResource rootResource;
+
public SimpleResourceFactory(CollectionResource rootResource) {
this.rootResource = rootResource;
@@ -44,10 +49,14 @@ public class SimpleResourceFactory imple
// TODO make this depend on what the dav servlet is actually
configured
// to
path = path.getStripFirst();
+ return getResourceFromStrippedPath(host, path);
+ }
+ private Resource getResourceFromStrippedPath(String host, Path path)
throws NotAuthorizedException, BadRequestException {
+ log.info("Getting resource {}", path);
if (path.isRoot()) {
return rootResource;
} else {
- CollectionResource parent =
(CollectionResource)getResource(host,
+ CollectionResource parent =
(CollectionResource)getResourceFromStrippedPath(host,
path.getParent());
return parent.child(path.getName());
}
