commit 01bb2bb6534378e3dc5268830b33617cc82a1af9 from: leo date: Thu Jan 29 13:24:34 2009 UTC commit - 58bf77d7272e5e064be3984a237e52329db76d3d commit + 01bb2bb6534378e3dc5268830b33617cc82a1af9 blob - 4ffa13f363bb7e2a984cd5dbd5049b70d07bfd07 blob + 8333fd209f021cf40ec5a8eef14bedef0b57b5ef --- modules/server/moxo-server.iml +++ modules/server/moxo-server.iml @@ -1,5 +1,5 @@ - +

@@ -38,153 +38,6 @@ - - - - - - - - - - - - - - - - - - - - -

blob - 3353936723407d8aaf9b55fb8cc0cec4601cf2e3 blob + 3c4d8498e31763d069efcd07b76df045debaa7ea --- modules/vfs.s3/src/main/java/com/thinkberg/vfs/s3/jets3t/Jets3tFileObject.java +++ modules/vfs.s3/src/main/java/com/thinkberg/vfs/s3/jets3t/Jets3tFileObject.java @@ -32,7 +32,6 @@ import java.io.*; import java.nio.channels.Channels; import java.nio.channels.FileChannel; import java.nio.channels.ReadableByteChannel; -import java.util.Arrays; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -138,7 +137,6 @@ public class Jets3tFileObject extends AbstractFileObje try { S3Object[] children = service.listObjects(bucket, path, null); - LOG.debug(children); String targetName = targetObject.getKey(); for (S3Object child : children) { String targetChildName = child.getKey(); @@ -157,8 +155,8 @@ public class Jets3tFileObject extends AbstractFileObje } } - @Override public void copyFrom(FileObject file, FileSelector selector) throws FileSystemException { + // TODO must implement to support attribute copy super.copyFrom(file, selector); } @@ -210,7 +208,6 @@ public class Jets3tFileObject extends AbstractFileObje protected void onClose() throws IOException { try { LOG.debug(String.format("sending '%s' to storage (cached=%b)", object.getKey(), cacheFile)); - LOG.debug(object); if (cacheFile != null) { FileChannel cacheFc = getCacheFile().getChannel(); object.setContentLength(cacheFc.size()); @@ -246,8 +243,6 @@ public class Jets3tFileObject extends AbstractFileObje try { S3Object[] children = service.listObjects(bucket, path, "/"); - LOG.debug(Arrays.asList(children)); - LOG.debug(Arrays.asList(children)); String[] childrenNames = new String[children.length]; for (int i = 0; i < children.length; i++) { if (!children[i].getKey().equals(path)) { blob - 9e5648fcc4e4e7515289b475da7bb2992a230de9 blob + b07f417933f974d1f06704b99bc8a362674ff290 --- modules/vfs.s3/src/test/java/com/thinkberg/vfs/s3/tests/S3FileProviderTest.java +++ modules/vfs.s3/src/test/java/com/thinkberg/vfs/s3/tests/S3FileProviderTest.java @@ -25,6 +25,7 @@ import org.apache.commons.vfs.*; import java.io.IOException; import java.io.OutputStream; +import java.util.Arrays; /** * @author Matthias L. Jugel @@ -187,12 +188,14 @@ public class S3FileProviderTest extends S3TestCase { public void testCopyShallowFolder() throws FileSystemException { FileObject origFolder = ROOT.resolveFile(FOLDER); + origFolder.delete(ALL_FILE_SELECTOR); origFolder.createFolder(); origFolder.resolveFile("file.0").createFile(); origFolder.resolveFile("file.1").createFile(); origFolder.resolveFile("file.2").createFile(); + System.out.println(Arrays.asList(origFolder.getChildren())); assertEquals(3, origFolder.getChildren().length); FileObject destFolder = ROOT.resolveFile(FOLDER + "_dest"); blob - 8f0bdb3b66beb18d36e1200ac5a043a0182ada4f blob + 44dc1103f997eade1031459d572a5d4516585705 --- modules/webdav/src/test/java/com/thinkberg/webdav/DavTestCase.java +++ modules/webdav/src/test/java/com/thinkberg/webdav/DavTestCase.java @@ -43,7 +43,7 @@ public class DavTestCase extends TestCase { } protected void testPropertyNoValue(FileObject object, String propertyName) throws FileSystemException { - Element root = serializeDavResource(object, propertyName, true); + Element root = serializeDavResource(object, propertyName); assertEquals(EMPTY, selectExistingPropertyValue(root, propertyName)); } @@ -64,10 +64,6 @@ public class DavTestCase extends TestCase { } protected Element serializeDavResource(FileObject object, String propertyName) throws FileSystemException { - return serializeDavResource(object, propertyName, false); - } - - protected Element serializeDavResource(FileObject object, String propertyName, boolean ignoreValues) throws FileSystemException { Element root = DocumentHelper.createElement("root"); DavResourceFactory factory = DavResourceFactory.getInstance(); DavResource davResource = factory.getDavResource(object); blob - 3a0fa1b9ecede2c113b5c0fca9111d6041b9e615 blob + 9d67e71becdda2f638cdd748a632e533a42b9b91 --- pom.xml +++ pom.xml @@ -9,107 +9,7 @@ modules/webdav modules/vfs.s3 + modules/server http://thinkberg.com - - - org.mortbay.jetty - jetty - 6.1.1 - - - com.thinkberg - webdav - 1.0-SNAPSHOT - - - com.thinkberg - vfs.s3 - 1.0-SNAPSHOT - - - - - - src/main/resources - - - - - maven-compiler-plugin - - true - true - 1.5 - 1.5 - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/MoxoTest.java - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - package - - jar - - - - - com.thinkberg.moxo.Main - true - - - - **/moxo/* - - - - - - -