geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r701596 - in /geronimo/gshell/trunk: ./ gshell-commands/gshell-vfs/ gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/ gshell-support/ gshell-support/gshell-vfs-local/ gshell-support/gshell-vfs-local/src/ gshe...
Date Sat, 04 Oct 2008 04:10:05 GMT
Author: jdillon
Date: Fri Oct  3 21:10:04 2008
New Revision: 701596

URL: http://svn.apache.org/viewvc?rev=701596&view=rev
Log:
Add custom VFS local file provider to provide direct access to the underlying java.io.File

Added:
    geronimo/gshell/trunk/gshell-support/gshell-vfs-local/
    geronimo/gshell/trunk/gshell-support/gshell-vfs-local/pom.xml   (with props)
    geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/
    geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/
    geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/
    geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/
    geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/
    geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/
    geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/
    geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/
    geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/vfs/
    geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/vfs/provider/
    geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/vfs/provider/local/
    geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/vfs/provider/local/LocalFile.java
  (with props)
    geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/vfs/provider/local/LocalFileProvider.java
  (with props)
    geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/vfs/provider/local/LocalFileSystem.java
  (with props)
    geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/resources/
    geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/resources/META-INF/
    geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/resources/META-INF/spring/
    geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/resources/META-INF/spring/components.xml
  (with props)
Removed:
    geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/resources/org/
Modified:
    geronimo/gshell/trunk/gshell-commands/gshell-vfs/pom.xml
    geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/EditAction.java
    geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/FileInfoAction.java
    geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/resources/META-INF/spring/components.xml
    geronimo/gshell/trunk/gshell-support/pom.xml
    geronimo/gshell/trunk/pom.xml

Modified: geronimo/gshell/trunk/gshell-commands/gshell-vfs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-vfs/pom.xml?rev=701596&r1=701595&r2=701596&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-vfs/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-vfs/pom.xml Fri Oct  3 21:10:04 2008
@@ -42,6 +42,11 @@
             <groupId>org.apache.geronimo.gshell.support</groupId>
             <artifactId>gshell-vfs</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.gshell.support</groupId>
+            <artifactId>gshell-vfs-local</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

Modified: geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/EditAction.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/EditAction.java?rev=701596&r1=701595&r2=701596&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/EditAction.java
(original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/EditAction.java
Fri Oct  3 21:10:04 2008
@@ -23,18 +23,17 @@
 import org.apache.commons.vfs.FileSystem;
 import org.apache.commons.vfs.FileType;
 import org.apache.commons.vfs.Selectors;
-import org.apache.commons.vfs.provider.local.LocalFileSystem;
-import org.apache.commons.vfs.provider.local.LocalFile;
 import org.apache.commons.vfs.util.Os;
 import org.apache.geronimo.gshell.clp.Argument;
 import org.apache.geronimo.gshell.clp.Option;
 import org.apache.geronimo.gshell.command.CommandContext;
 import org.apache.geronimo.gshell.io.IO;
+import org.apache.geronimo.gshell.support.vfs.provider.local.LocalFile;
+import org.apache.geronimo.gshell.support.vfs.provider.local.LocalFileSystem;
 
-import java.util.List;
-import java.util.Arrays;
 import java.io.File;
-import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * Edit a file with an external editor.
@@ -81,8 +80,6 @@
         // If the file is not on the local file system, then create tmp file for editing
         if (!(fs instanceof LocalFileSystem)) {
             // Create a new temporary file, copy the contents for editing
-            // TODO: Ask branding for the app name er something here?
-            // TODO: Check if we need to put this timestamp in here or not, VFS might make
it unique anyways
             tmp = resolveFile(context, "tmp:/gshell.edit-" + System.currentTimeMillis() +
".txt");
             log.debug("Using temporary file for edit: {} ({})", tmp, tmp.getClass());
             tmp.createFile();
@@ -110,32 +107,13 @@
         assert file != null;
         assert file instanceof LocalFile;
 
-        //
-        // HACK: Need to get access to the LocalFile's file field.
-        //
+        // This uses our custom accessible LocalFile implementation, which allows us to grap
the File object.
+        LocalFile lfile = (LocalFile)file;
 
         // Force the file to attach if it hasn't already
-        file.exists();
-
-        Class type = file.getClass();
-        log.debug("File type: {}", type);
-
-        Field field = type.getDeclaredField("file");
-        log.debug("File field: {}", field);
-
-        File localFile;
-
-        try {
-            localFile = (File)field.get(file);
-        }
-        catch (IllegalAccessException ignore) {
-            field.setAccessible(true);
-            localFile = (File) field.get(file);        
-        }
-
-        log.debug("Local file: {}", localFile);
+        lfile.refresh();
 
-        return localFile;
+        return lfile.getLocalFile();
     }
 
     private Object edit(final CommandContext context, final File localFile) throws Exception
{

Modified: geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/FileInfoAction.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/FileInfoAction.java?rev=701596&r1=701595&r2=701596&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/FileInfoAction.java
(original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-vfs/src/main/java/org/apache/geronimo/gshell/commands/vfs/FileInfoAction.java
Fri Oct  3 21:10:04 2008
@@ -24,9 +24,14 @@
 import org.apache.geronimo.gshell.io.IO;
 import org.apache.commons.vfs.FileObject;
 import org.apache.commons.vfs.FileType;
+import org.apache.commons.vfs.FileContent;
+import org.apache.commons.vfs.FileContentInfo;
+import org.apache.commons.vfs.FileSystemException;
 
 import java.text.DateFormat;
 import java.util.Date;
+import java.util.Map;
+import java.security.cert.Certificate;
 
 /**
  * Display information about a file.
@@ -61,8 +66,39 @@
         io.info("Root path: {}", file.getFileSystem().getRoot().getName().getPath());
 
         if (file.exists()) {
+            FileContent content = file.getContent();
+            FileContentInfo contentInfo = content.getContentInfo();
+            io.info("Content type: {}", contentInfo.getContentType());
+            io.info("Content encoding: {}", contentInfo.getContentEncoding());
+
+            try {
+                Map<String,Object> attrs = content.getAttributes();
+                if (attrs != null && !attrs.isEmpty()) {
+                    io.info("Attributes:");
+                    for (Map.Entry<String,Object> entry : attrs.entrySet()) {
+                        io.info("    {}='{}'", entry.getKey(), entry.getValue());
+                    }
+                }
+            }
+            catch (FileSystemException e) {
+                io.info("File attributes are NOT supported");
+            }
+
+            try {
+                Certificate[] certs = content.getCertificates();
+                if (certs != null && certs.length != 0) {
+                    io.info("Certificate:");
+                    for (Certificate cert : certs) {
+                        io.info("    {}", cert);
+                    }
+                }
+            }
+            catch (FileSystemException e) {
+                io.info("File certificates are NOT supported");
+            }
+
             if (file.getType().equals(FileType.FILE)) {
-                io.info("Size: {} bytes", file.getContent().getSize());
+                io.info("Size: {} bytes", content.getSize());
             }
             else if (file.getType().equals(FileType.FOLDER) && file.isReadable())
{
                 FileObject[] children = file.getChildren();
@@ -75,7 +111,8 @@
                     }
                 }
             }
-            io.info("Last modified: {}", DateFormat.getInstance().format(new Date(file.getContent().getLastModifiedTime())));
+
+            io.info("Last modified: {}", DateFormat.getInstance().format(new Date(content.getLastModifiedTime())));
         }
         else {
             io.info("The file does not exist");

Added: geronimo/gshell/trunk/gshell-support/gshell-vfs-local/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-local/pom.xml?rev=701596&view=auto
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-local/pom.xml (added)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-local/pom.xml Fri Oct  3 21:10:04 2008
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+     http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.gshell.support</groupId>
+        <artifactId>gshell-support</artifactId>
+        <version>1.0-alpha-2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>gshell-vfs-local</artifactId>
+    <name>GShell Support :: VFS Local</name>
+
+    <description>
+        Local VFS provider.
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.gshell.support</groupId>
+            <artifactId>gshell-vfs</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-local/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-local/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-local/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/vfs/provider/local/LocalFile.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/vfs/provider/local/LocalFile.java?rev=701596&view=auto
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/vfs/provider/local/LocalFile.java
(added)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/vfs/provider/local/LocalFile.java
Fri Oct  3 21:10:04 2008
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.gshell.support.vfs.provider.local;
+
+import org.apache.commons.vfs.FileName;
+import org.apache.commons.vfs.FileSystemException;
+
+import java.io.File;
+
+/**
+ * Custom VFS local file to provide public access to the underlying file object.
+ *
+ * @version $Rev$ $Date$
+ */
+public class LocalFile
+    extends org.apache.commons.vfs.provider.local.LocalFile
+{
+    protected LocalFile(final LocalFileSystem fileSystem, final String rootFile, final FileName
name) throws FileSystemException {
+        super(fileSystem, rootFile, name);
+    }
+
+    public File getLocalFile() {
+        return super.getLocalFile();
+    }
+}
\ No newline at end of file

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/vfs/provider/local/LocalFile.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/vfs/provider/local/LocalFile.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/vfs/provider/local/LocalFile.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/vfs/provider/local/LocalFileProvider.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/vfs/provider/local/LocalFileProvider.java?rev=701596&view=auto
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/vfs/provider/local/LocalFileProvider.java
(added)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/vfs/provider/local/LocalFileProvider.java
Fri Oct  3 21:10:04 2008
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.gshell.support.vfs.provider.local;
+
+import org.apache.commons.vfs.provider.local.LocalFileName;
+import org.apache.commons.vfs.FileName;
+import org.apache.commons.vfs.FileSystem;
+import org.apache.commons.vfs.FileSystemException;
+import org.apache.commons.vfs.FileSystemOptions;
+
+/**
+ * Custom VFS local file provider.
+ *
+ * @version $Rev$ $Date$
+ */
+public class LocalFileProvider
+    extends org.apache.commons.vfs.provider.local.DefaultLocalFileProvider
+{
+    protected FileSystem doCreateFileSystem(final FileName name, final FileSystemOptions
options) throws FileSystemException {
+        LocalFileName rootName = (LocalFileName)name;
+        return new LocalFileSystem(rootName, rootName.getRootFile(), options);
+    }
+}

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/vfs/provider/local/LocalFileProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/vfs/provider/local/LocalFileProvider.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/vfs/provider/local/LocalFileProvider.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/vfs/provider/local/LocalFileSystem.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/vfs/provider/local/LocalFileSystem.java?rev=701596&view=auto
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/vfs/provider/local/LocalFileSystem.java
(added)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/vfs/provider/local/LocalFileSystem.java
Fri Oct  3 21:10:04 2008
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.gshell.support.vfs.provider.local;
+
+import org.apache.commons.vfs.FileName;
+import org.apache.commons.vfs.FileObject;
+import org.apache.commons.vfs.FileSystemException;
+import org.apache.commons.vfs.FileSystemOptions;
+
+/**
+ * Custom VFS local file system.
+ *
+ * @version $Rev$ $Date$
+ */
+public class LocalFileSystem
+    extends org.apache.commons.vfs.provider.local.LocalFileSystem
+{
+    private final String rootFile;
+
+    public LocalFileSystem(final FileName rootName, final String rootFile, final FileSystemOptions
options) {
+        super(rootName, rootFile, options);
+        this.rootFile = rootFile;
+    }
+
+    protected FileObject createFile(final FileName name) throws FileSystemException {
+        return new LocalFile(this, rootFile, name);
+    }
+}
\ No newline at end of file

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/vfs/provider/local/LocalFileSystem.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/vfs/provider/local/LocalFileSystem.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/java/org/apache/geronimo/gshell/support/vfs/provider/local/LocalFileSystem.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/resources/META-INF/spring/components.xml?rev=701596&view=auto
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/resources/META-INF/spring/components.xml
(added)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/resources/META-INF/spring/components.xml
Fri Oct  3 21:10:04 2008
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <bean class="org.apache.geronimo.gshell.vfs.config.FileProviderConfigurer">
+        <property name="scheme" value="file"/>
+        <property name="provider">
+            <bean class="org.apache.geronimo.gshell.support.vfs.provider.local.LocalFileProvider"/>
+        </property>
+    </bean>
+
+</beans>
\ No newline at end of file

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/resources/META-INF/spring/components.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/resources/META-INF/spring/components.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-local/src/main/resources/META-INF/spring/components.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/resources/META-INF/spring/components.xml?rev=701596&r1=701595&r2=701596&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/resources/META-INF/spring/components.xml
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs/src/main/resources/META-INF/spring/components.xml
Fri Oct  3 21:10:04 2008
@@ -63,13 +63,6 @@
     </bean>
 
     <bean class="org.apache.geronimo.gshell.vfs.config.FileProviderConfigurer">
-        <property name="scheme" value="file"/>
-        <property name="provider">
-            <bean class="org.apache.commons.vfs.provider.local.DefaultLocalFileProvider"/>
-        </property>
-    </bean>
-
-    <bean class="org.apache.geronimo.gshell.vfs.config.FileProviderConfigurer">
         <property name="scheme" value="tmp"/>
         <property name="provider">
             <bean class="org.apache.commons.vfs.provider.temp.TemporaryFileProvider"/>

Modified: geronimo/gshell/trunk/gshell-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/pom.xml?rev=701596&r1=701595&r2=701596&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-support/pom.xml Fri Oct  3 21:10:04 2008
@@ -55,6 +55,7 @@
         <module>gshell-interpolation</module>
         <module>gshell-console</module>
         <module>gshell-vfs</module>
+        <module>gshell-vfs-local</module>
         <module>gshell-vfs-truezip</module>
         <module>gshell-security</module>
     </modules>

Modified: geronimo/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/pom.xml?rev=701596&r1=701595&r2=701596&view=diff
==============================================================================
--- geronimo/gshell/trunk/pom.xml (original)
+++ geronimo/gshell/trunk/pom.xml Fri Oct  3 21:10:04 2008
@@ -234,6 +234,18 @@
 
             <dependency>
                 <groupId>org.apache.geronimo.gshell.support</groupId>
+                <artifactId>gshell-vfs-local</artifactId>
+                <version>1.0-alpha-2-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.gshell.support</groupId>
+                <artifactId>gshell-vfs-truezip</artifactId>
+                <version>1.0-alpha-2-SNAPSHOT</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.apache.geronimo.gshell.support</groupId>
                 <artifactId>gshell-security</artifactId>
                 <version>1.0-alpha-2-SNAPSHOT</version>
             </dependency>



Mime
View raw message