geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r701778 - in /geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src: main/java/org/apache/geronimo/gshell/vfs/provider/meta/ main/resources/META-INF/spring/ test/java/org/apache/geronimo/gshell/vfs/provider/meta/ test/resources/org/apach...
Date Sun, 05 Oct 2008 11:35:08 GMT
Author: jdillon
Date: Sun Oct  5 04:35:07 2008
New Revision: 701778

URL: http://svn.apache.org/viewvc?rev=701778&view=rev
Log:
Rename MetaFileData* -> MetaData*

Added:
    geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaData.java
  (contents, props changed)
      - copied, changed from r701776, geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileData.java
    geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistry.java
  (contents, props changed)
      - copied, changed from r701701, geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistry.java
    geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurer.java
  (contents, props changed)
      - copied, changed from r701701, geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryConfigurer.java
    geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImpl.java
  (contents, props changed)
      - copied, changed from r701701, geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryImpl.java
    geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/AccessibleMetaDataRegistry.java
  (contents, props changed)
      - copied, changed from r701701, geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/AccessibleMetaFileDataRegistry.java
    geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurerTest.java
  (contents, props changed)
      - copied, changed from r701701, geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryConfigurerTest.java
    geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImplTest.java
  (contents, props changed)
      - copied, changed from r701701, geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryImplTest.java
    geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurerTest-context.xml
  (contents, props changed)
      - copied, changed from r701701, geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryConfigurerTest-context.xml
    geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImplTest-context.xml
  (contents, props changed)
      - copied, changed from r701701, geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryImplTest-context.xml
Removed:
    geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileData.java
    geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistry.java
    geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryConfigurer.java
    geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryImpl.java
    geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/AccessibleMetaFileDataRegistry.java
    geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryConfigurerTest.java
    geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryImplTest.java
    geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryConfigurerTest-context.xml
    geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryImplTest-context.xml
Modified:
    geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileObject.java
    geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileProvider.java
    geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileSystem.java
    geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/resources/META-INF/spring/components.xml

Copied: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaData.java
(from r701776, geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileData.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaData.java?p2=geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaData.java&p1=geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileData.java&r1=701776&r2=701778&rev=701778&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileData.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaData.java
Sun Oct  5 04:35:07 2008
@@ -27,16 +27,15 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- * Meta file data.
+ * Meta data.
  *
  * @version $Rev$ $Date$
  */
-public class MetaFileData
+public class MetaData
 {
     private final Logger log = LoggerFactory.getLogger(getClass());
 
@@ -52,9 +51,9 @@
 
     private final Map<String,Object> attributes = /*Collections.synchronizedMap(*/new
HashMap<String,Object>()/*)*/;
 
-    private final Collection<MetaFileData> children = /*Collections.synchronizedCollection(*/new
ArrayList<MetaFileData>()/*)*/;
+    private final Collection<MetaData> children = /*Collections.synchronizedCollection(*/new
ArrayList<MetaData>()/*)*/;
 
-    public MetaFileData(final FileName name, final FileType type) {
+    public MetaData(final FileName name, final FileType type) {
         assert name != null;
         assert type != null;
 
@@ -109,11 +108,11 @@
         return old;
     }
 
-    public Collection<MetaFileData> getChildren() {
+    public Collection<MetaData> getChildren() {
         return children;
     }
 
-    public void addChild(final MetaFileData data) throws FileSystemException {
+    public void addChild(final MetaData data) throws FileSystemException {
         assert data != null;
 
         if (!getType().hasChildren()) {
@@ -129,7 +128,7 @@
         updateLastModified();
     }
 
-    public void removeChild(final MetaFileData data) throws FileSystemException{
+    public void removeChild(final MetaData data) throws FileSystemException{
         assert data != null;
 
         if (!getType().hasChildren()) {
@@ -145,7 +144,7 @@
         updateLastModified();
     }
 
-    public boolean hasChild(final MetaFileData data) {
+    public boolean hasChild(final MetaData data) {
         assert data != null;
 
         return getChildren().contains(data);
@@ -156,7 +155,7 @@
         if (this == obj) return true;
         if (obj == null || getClass() != obj.getClass()) return false;
 
-        MetaFileData that = (MetaFileData) obj;
+        MetaData that = (MetaData) obj;
         return !(name != null ? !name.equals(that.name) : that.name != null);
 
     }

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

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

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

Copied: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistry.java
(from r701701, geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistry.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistry.java?p2=geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistry.java&p1=geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistry.java&r1=701701&r2=701778&rev=701778&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistry.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistry.java
Sun Oct  5 04:35:07 2008
@@ -22,17 +22,17 @@
 import org.apache.commons.vfs.FileName;
 
 /**
- * Meta file data registry.
+ * Meta data registry.
  *
  * @version $Rev$ $Date$
  */
-public interface MetaFileDataRegistry
+public interface MetaDataRegistry
 {
-    void registerData(FileName name, MetaFileData data);
+    void registerData(FileName name, MetaData data);
 
     void removeData(FileName name);
 
-    MetaFileData lookupData(FileName name) /* throws MetaFileDataRegistryException */;
+    MetaData lookupData(FileName name) /* throws MetaFileDataRegistryException */;
 
     boolean containsData(FileName name);
 }
\ No newline at end of file

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

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

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

Copied: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurer.java
(from r701701, geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryConfigurer.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurer.java?p2=geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurer.java&p1=geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryConfigurer.java&r1=701701&r2=701778&rev=701778&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryConfigurer.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurer.java
Sun Oct  5 04:35:07 2008
@@ -26,26 +26,26 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * Helper to configure the contents of a {@link MetaFileDataRegistry}.
+ * Helper to configure the contents of a {@link MetaDataRegistry}.
  *
  * @version $Rev$ $Date$
  */
-public class MetaFileDataRegistryConfigurer
+public class MetaDataRegistryConfigurer
 {
     private final Logger log = LoggerFactory.getLogger(getClass());
 
-    private final MetaFileDataRegistry registry;
+    private final MetaDataRegistry registry;
 
     private final MetaFileNameParser nameParser;
 
-    public MetaFileDataRegistryConfigurer(final MetaFileDataRegistry registry) {
+    public MetaDataRegistryConfigurer(final MetaDataRegistry registry) {
         assert registry != null;
 
         this.registry = registry;
         this.nameParser = new MetaFileNameParser();
     }
 
-    public MetaFileDataRegistry getRegistry() {
+    public MetaDataRegistry getRegistry() {
         return registry;
     }
 
@@ -64,7 +64,7 @@
         }
     }
 
-    public MetaFileData add(final FileName name, final MetaFileData data) {
+    public MetaData add(final FileName name, final MetaData data) {
         assert name != null;
         assert data != null;
 
@@ -77,23 +77,23 @@
         return data;
     }
 
-    public MetaFileData add(final String name, final MetaFileData data) {
+    public MetaData add(final String name, final MetaData data) {
         return add(parseName(name), data);
     }
 
-    public MetaFileData addFile(final FileName name) {
-        return add(name, new MetaFileData(name, FileType.FILE));
+    public MetaData addFile(final FileName name) {
+        return add(name, new MetaData(name, FileType.FILE));
     }
 
-    public MetaFileData addFile(final String name) {
+    public MetaData addFile(final String name) {
         return addFile(parseName(name));
     }
 
-    public MetaFileData addFolder(final FileName name) {
-        return add(name, new MetaFileData(name, FileType.FOLDER));
+    public MetaData addFolder(final FileName name) {
+        return add(name, new MetaData(name, FileType.FOLDER));
     }
 
-    public MetaFileData addFolder(final String name) {
+    public MetaData addFolder(final String name) {
         return addFolder(parseName(name));
     }
 

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

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

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurer.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

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

Copied: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImpl.java
(from r701701, geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryImpl.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImpl.java?p2=geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImpl.java&p1=geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryImpl.java&r1=701701&r2=701778&rev=701778&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryImpl.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImpl.java
Sun Oct  5 04:35:07 2008
@@ -26,21 +26,20 @@
 import org.slf4j.LoggerFactory;
 
 import javax.annotation.PostConstruct;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- * {@link MetaFileDataRegistry} component.
+ * {@link MetaDataRegistry} component.
  *
  * @version $Rev$ $Date$
  */
-public class  MetaFileDataRegistryImpl
-    implements MetaFileDataRegistry
+public class MetaDataRegistryImpl
+    implements MetaDataRegistry
 {
     private final Logger log = LoggerFactory.getLogger(getClass());
 
-    private final Map<FileName,MetaFileData> nodes = /*Collections.synchronizedMap(*/new
HashMap<FileName,MetaFileData>()/*)*/;
+    private final Map<FileName, MetaData> nodes = /*Collections.synchronizedMap(*/new
HashMap<FileName, MetaData>()/*)*/;
 
     private String rootFileName = MetaFileName.SCHEME + ":/";
 
@@ -49,14 +48,14 @@
         // Register the root folder
         MetaFileNameParser parser = new MetaFileNameParser();
         FileName rootName = parser.parseUri(rootFileName);
-        registerData(rootName, new MetaFileData(rootName, FileType.FOLDER));
+        registerData(rootName, new MetaData(rootName, FileType.FOLDER));
     }
 
-    protected Map<FileName,MetaFileData> getNodes() {
+    protected Map<FileName, MetaData> getNodes() {
         return nodes;
     }
     
-    public void registerData(final FileName name, final MetaFileData data) {
+    public void registerData(final FileName name, final MetaData data) {
         assert name != null;
         assert data != null;
 
@@ -66,7 +65,7 @@
             FileName parentName = name.getParent();
             if (parentName != null) {
                 if (containsData(parentName)) {
-                    MetaFileData parent = lookupData(parentName);
+                    MetaData parent = lookupData(parentName);
 
                     if (!parent.hasChild(data)) {
                         try {
@@ -96,11 +95,11 @@
 
         log.debug("Removing data: {}", name);
 
-        MetaFileData data = getNodes().remove(name);
+        MetaData data = getNodes().remove(name);
 
         FileName parentName = name.getParent();
         if (parentName != null && containsData(parentName)) {
-            MetaFileData parent = lookupData(parentName);
+            MetaData parent = lookupData(parentName);
             try {
                 parent.removeChild(data);
             }
@@ -116,7 +115,7 @@
         return getNodes().containsKey(name);
     }
 
-    public MetaFileData lookupData(final FileName name) {
+    public MetaData lookupData(final FileName name) {
         assert name != null;
 
         log.debug("Looking up data: {}", name);

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

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

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

Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileObject.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileObject.java?rev=701778&r1=701777&r2=701778&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileObject.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileObject.java
Sun Oct  5 04:35:07 2008
@@ -37,7 +37,7 @@
 {
     private final MetaFileSystem fileSystem;
 
-    private MetaFileData data;
+    private MetaData data;
 
     public MetaFileObject(final FileName fileName, final MetaFileSystem fileSystem) {
         super(fileName, fileSystem);
@@ -46,8 +46,10 @@
         this.fileSystem = fileSystem;
     }
 
-    public MetaFileData getData() {
-        assert data != null;
+    public MetaData getData() {
+        if (data == null) {
+            throw new IllegalStateException("Meta data has not been attached");
+        }
         
         return data;
     }

Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileProvider.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileProvider.java?rev=701778&r1=701777&r2=701778&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileProvider.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileProvider.java
Sun Oct  5 04:35:07 2008
@@ -54,7 +54,7 @@
     ));
 
     @Autowired
-    private MetaFileDataRegistry registry;
+    private MetaDataRegistry registry;
 
     public MetaFileProvider() {
         setFileNameParser(new MetaFileNameParser());

Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileSystem.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileSystem.java?rev=701778&r1=701777&r2=701778&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileSystem.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileSystem.java
Sun Oct  5 04:35:07 2008
@@ -42,9 +42,9 @@
 {
     private final Logger log = LoggerFactory.getLogger(getClass());
 
-    private final MetaFileDataRegistry registry;
+    private final MetaDataRegistry registry;
 
-    public MetaFileSystem(final MetaFileDataRegistry registry, final FileName rootName, final
FileSystemOptions options) {
+    public MetaFileSystem(final MetaDataRegistry registry, final FileName rootName, final
FileSystemOptions options) {
         super(rootName, null, options);
 
         assert registry != null;
@@ -70,7 +70,7 @@
     // Internal bits invoked from MetaFileObject
     //
 
-    MetaFileData lookupData(final MetaFileObject file) throws FileSystemException {
+    MetaData lookupData(final MetaFileObject file) throws FileSystemException {
         assert file != null;
 
         log.debug("Looking up data: {}", file);
@@ -79,9 +79,9 @@
         assert name != null;
 
         // FIXME: This should probably toss an exception if the data is not registered
-        MetaFileData data = registry.lookupData(name);
+        MetaData data = registry.lookupData(name);
         if (data == null) {
-            data = new MetaFileData(name, FileType.IMAGINARY);
+            data = new MetaData(name, FileType.IMAGINARY);
         }
 
         return data;
@@ -92,11 +92,11 @@
 
         log.debug("Listing children: {}", name);
 
-        MetaFileData data = registry.lookupData(name);
-        Collection<MetaFileData> children = data.getChildren();
+        MetaData data = registry.lookupData(name);
+        Collection<MetaData> children = data.getChildren();
 
         List<String> names = new ArrayList<String>(children.size());
-        for (MetaFileData child : children) {
+        for (MetaData child : children) {
             names.add(child.getName().getBaseName());
         }
 

Modified: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/resources/META-INF/spring/components.xml?rev=701778&r1=701777&r2=701778&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/resources/META-INF/spring/components.xml
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/main/resources/META-INF/spring/components.xml
Sun Oct  5 04:35:07 2008
@@ -24,7 +24,7 @@
        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 id="metaFileDataRegistry" class="org.apache.geronimo.gshell.vfs.provider.meta.MetaFileDataRegistryImpl"/>
+    <bean id="metaDataRegistry" class="org.apache.geronimo.gshell.vfs.provider.meta.MetaDataRegistryImpl"/>
     
     <bean class="org.apache.geronimo.gshell.vfs.config.FileProviderConfigurer">
         <property name="scheme" value="meta"/>

Copied: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/AccessibleMetaDataRegistry.java
(from r701701, geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/AccessibleMetaFileDataRegistry.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/AccessibleMetaDataRegistry.java?p2=geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/AccessibleMetaDataRegistry.java&p1=geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/AccessibleMetaFileDataRegistry.java&r1=701701&r2=701778&rev=701778&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/AccessibleMetaFileDataRegistry.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/AccessibleMetaDataRegistry.java
Sun Oct  5 04:35:07 2008
@@ -19,23 +19,20 @@
 
 package org.apache.geronimo.gshell.vfs.provider.meta;
 
-import org.apache.geronimo.gshell.spring.SpringTestSupport;
 import org.apache.commons.vfs.FileName;
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
 
 import java.util.Map;
 
 /**
- * Accessible {@link MetaFileDataRegistryImpl}.
+ * Accessible {@link MetaDataRegistryImpl}.
  *
  * @version $Rev$ $Date$
  */
-public class AccessibleMetaFileDataRegistry
-    extends MetaFileDataRegistryImpl
+public class AccessibleMetaDataRegistry
+    extends MetaDataRegistryImpl
 {
     @Override
-    public Map<FileName, MetaFileData> getNodes() {
+    public Map<FileName, MetaData> getNodes() {
         return super.getNodes();
     }
 }
\ No newline at end of file

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/AccessibleMetaDataRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/AccessibleMetaDataRegistry.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/AccessibleMetaDataRegistry.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurerTest.java
(from r701701, geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryConfigurerTest.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurerTest.java?p2=geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurerTest.java&p1=geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryConfigurerTest.java&r1=701701&r2=701778&rev=701778&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryConfigurerTest.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurerTest.java
Sun Oct  5 04:35:07 2008
@@ -27,61 +27,61 @@
 import java.util.Map;
 
 /**
- * Unit tests for the {@link MetaFileDataRegistryConfigurer} class.
+ * Unit tests for the {@link MetaDataRegistryConfigurer} class.
  *
  * @version $Rev$ $Date$
  */
-public class MetaFileDataRegistryConfigurerTest
+public class MetaDataRegistryConfigurerTest
     extends SpringTestSupport
 {
-    private AccessibleMetaFileDataRegistry registry;
+    private AccessibleMetaDataRegistry registry;
 
-    private MetaFileDataRegistryConfigurer config;
+    private MetaDataRegistryConfigurer config;
 
     protected void setUp() throws Exception {
         super.setUp();
 
-        registry = getBeanContainer().getBean(AccessibleMetaFileDataRegistry.class);
+        registry = getBeanContainer().getBean(AccessibleMetaDataRegistry.class);
         assertNotNull(registry);
 
-        config = new MetaFileDataRegistryConfigurer(registry);
+        config = new MetaDataRegistryConfigurer(registry);
     }
 
     public void testAddFolder() throws Exception {
-        MetaFileData data = config.addFolder("testing");
+        MetaData data = config.addFolder("testing");
         assertNotNull(data);
 
-        Map<FileName, MetaFileData> nodes = registry.getNodes();
+        Map<FileName, MetaData> nodes = registry.getNodes();
         assertNotNull(nodes);
         assertEquals(2, nodes.size());
     }
 
     public void testAddNestedFiles() throws Exception {
-        MetaFileData d1 = config.addFolder("testing");
+        MetaData d1 = config.addFolder("testing");
         assertNotNull(d1);
 
-        MetaFileData d2 = config.addFile("testing/stuff");
+        MetaData d2 = config.addFile("testing/stuff");
         assertNotNull(d2);
 
-        MetaFileData d3 = config.addFile("testing/more-stuff");
+        MetaData d3 = config.addFile("testing/more-stuff");
         assertNotNull(d3);
 
-        Map<FileName, MetaFileData> nodes = registry.getNodes();
+        Map<FileName, MetaData> nodes = registry.getNodes();
         assertNotNull(nodes);
         assertEquals(4, nodes.size());
     }
 
     public void testAddNestedFilesWithScheme() throws Exception {
-        MetaFileData d1 = config.addFolder("meta:/testing");
+        MetaData d1 = config.addFolder("meta:/testing");
         assertNotNull(d1);
 
-        MetaFileData d2 = config.addFile("meta:/testing/stuff");
+        MetaData d2 = config.addFile("meta:/testing/stuff");
         assertNotNull(d2);
 
-        MetaFileData d3 = config.addFile("meta:/testing/more-stuff");
+        MetaData d3 = config.addFile("meta:/testing/more-stuff");
         assertNotNull(d3);
 
-        Map<FileName, MetaFileData> nodes = registry.getNodes();
+        Map<FileName, MetaData> nodes = registry.getNodes();
         assertNotNull(nodes);
         assertEquals(4, nodes.size());
 

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurerTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurerTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImplTest.java
(from r701701, geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryImplTest.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImplTest.java?p2=geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImplTest.java&p1=geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryImplTest.java&r1=701701&r2=701778&rev=701778&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryImplTest.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImplTest.java
Sun Oct  5 04:35:07 2008
@@ -27,24 +27,24 @@
 import java.util.Map;
 
 /**
- * Unit tests for the {@link MetaFileDataRegistryImpl} class.
+ * Unit tests for the {@link MetaDataRegistryImpl} class.
  *
  * @version $Rev$ $Date$
  */
-public class MetaFileDataRegistryImplTest
+public class MetaDataRegistryImplTest
     extends SpringTestSupport
 {
-    private AccessibleMetaFileDataRegistry registry;
+    private AccessibleMetaDataRegistry registry;
 
     protected void setUp() throws Exception {
         super.setUp();
 
-        registry = getBeanContainer().getBean(AccessibleMetaFileDataRegistry.class);
+        registry = getBeanContainer().getBean(AccessibleMetaDataRegistry.class);
         assertNotNull(registry);
     }
 
     public void testInitialState() throws Exception {
-        Map<FileName, MetaFileData> nodes = registry.getNodes();
+        Map<FileName, MetaData> nodes = registry.getNodes();
         assertNotNull(nodes);
         assertEquals(1, nodes.size());
 

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImplTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImplTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImplTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurerTest-context.xml
(from r701701, geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryConfigurerTest-context.xml)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurerTest-context.xml?p2=geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurerTest-context.xml&p1=geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryConfigurerTest-context.xml&r1=701701&r2=701778&rev=701778&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryConfigurerTest-context.xml
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurerTest-context.xml
Sun Oct  5 04:35:07 2008
@@ -25,6 +25,6 @@
        xsi:schemaLocation="
             http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <bean id="metaFileDataRegistry" class="org.apache.geronimo.gshell.vfs.provider.meta.AccessibleMetaFileDataRegistry"/>
+    <bean id="metaDataRegistry" class="org.apache.geronimo.gshell.vfs.provider.meta.AccessibleMetaDataRegistry"/>
 
 </beans>
\ No newline at end of file

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurerTest-context.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurerTest-context.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurerTest-context.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImplTest-context.xml
(from r701701, geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryImplTest-context.xml)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImplTest-context.xml?p2=geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImplTest-context.xml&p1=geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryImplTest-context.xml&r1=701701&r2=701778&rev=701778&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileDataRegistryImplTest-context.xml
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImplTest-context.xml
Sun Oct  5 04:35:07 2008
@@ -25,6 +25,6 @@
        xsi:schemaLocation="
             http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <bean id="metaFileDataRegistry" class="org.apache.geronimo.gshell.vfs.provider.meta.AccessibleMetaFileDataRegistry"/>
+    <bean id="metaDataRegistry" class="org.apache.geronimo.gshell.vfs.provider.meta.AccessibleMetaDataRegistry"/>
 
 </beans>
\ No newline at end of file

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImplTest-context.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImplTest-context.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImplTest-context.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message