Index: catalina/SlideServerListener.java
===================================================================
RCS file: /home/cvspublic/jakarta-slide/src/wrappers/catalina/SlideServerListener.java,v
retrieving revision 1.9
diff -u -r1.9 SlideServerListener.java
--- catalina/SlideServerListener.java	25 Apr 2002 21:15:11 -0000	1.9
+++ catalina/SlideServerListener.java	26 Sep 2002 10:18:57 -0000
@@ -88,6 +88,7 @@
 import org.apache.catalina.Server;
 import org.apache.catalina.Service;
 import org.apache.catalina.logger.FileLogger;
+import org.apache.slide.util.logger.Logger;
 
 import org.apache.slide.common.Domain;
 import org.apache.slide.common.EmbeddedDomain;
@@ -298,15 +299,23 @@
 
         Configuration slideConfiguration = getConfiguration(domainConfigFile);
 
-        domain.setDefaultNamespace(slideConfiguration.getAttribute
-                                   ("default", "slide"));
-
-        Enumeration namespaceDefinitions =
-            slideConfiguration.getConfigurations("namespace");
+	String defaultNameSpace = slideConfiguration.getAttribute("default", "slide");
+        domain.setDefaultNamespace(defaultNameSpace);
+	Domain.addParameter("default",defaultNameSpace);
+	String loggerClass = slideConfiguration.getAttribute("logger", "org.apache.slide.util.logger.SimpleLogger");
+        Domain.addParameter("logger",loggerClass);
+	int loggerLevel = slideConfiguration.getAttributeAsInt("logger-level", Logger.INFO);
+	Domain.addParameter( "logger-level", ""+loggerLevel );
+
+        Enumeration parametersEnum = slideConfiguration.getConfigurations("parameter");
+        while( parametersEnum.hasMoreElements() ) {
+            Configuration p = (Configuration)parametersEnum.nextElement();
+            Domain.addParameter( p.getAttribute("name"), p.getValue() );
+        }
 
+        Enumeration namespaceDefinitions = slideConfiguration.getConfigurations("namespace");
         while (namespaceDefinitions.hasMoreElements()) {
-            loadNamespace(domainConfigFile.getParentFile(),
-                          (Configuration) namespaceDefinitions.nextElement());
+            loadNamespace(domainConfigFile.getParentFile(),(Configuration) namespaceDefinitions.nextElement());
         }
 
     }
Index: jndi/SlideDirContext.java
===================================================================
RCS file: /home/cvspublic/jakarta-slide/src/wrappers/jndi/SlideDirContext.java,v
retrieving revision 1.8
diff -u -r1.8 SlideDirContext.java
--- jndi/SlideDirContext.java	25 Apr 2002 21:30:18 -0000	1.8
+++ jndi/SlideDirContext.java	26 Sep 2002 10:18:58 -0000
@@ -204,6 +204,26 @@
 
 
     /**
+     * Setter method for the vpath member, which is the path of the namespace that is exposed.
+     * This method added so that a SlideDirContext can be configured to use a different part of the namespace
+     * than the full files collection.
+     **/
+    public void setVPath(String vPath){
+	this.vPath = vPath;
+    }
+
+
+
+    /**
+     * Getter method for the vpath member, which is the path of the namespace that is exposed.
+     **/
+    public String getVPath(){
+	return vPath;
+    }
+
+
+
+    /**
      * Set the namespace access token used by this realm.
      */
     public void setAccessToken(NamespaceAccessToken accessToken) {
@@ -241,7 +261,7 @@
         this.content = token.getContentHelper();
 
         String filesPath = token.getNamespaceConfig().getFilesPath();
-        if (filesPath != null)
+        if (filesPath != null && (vPath == null || vPath.equals("")))
             this.vPath = filesPath;
 
     }
@@ -831,16 +851,19 @@
         
         NodeProperty property = revisionDescriptor.getProperty("resourcetype");
         
-        if ((property != null)
-            && (property.getValue().equals("<collection/>"))) {
-            result = true;
+        if (property != null){
+	    String val = (String)property.getValue();
+            if (val.equals("<collection/>") 
+		|| val.startsWith("<D:collection ")     // this is obviously still completely incorrect, but
+		|| val.startsWith("<DAV:collection "))  // will have to do for a quick fix for the moment.
+		result = true;                          // TODO: Fix me properly!!!!
         }
-        
-        return result;
-        
+
+        return result;        
     }
 
 
+
     /**
      * List the resources which are members of a collection.
      *
@@ -890,6 +913,7 @@
                 }
                 
             } catch (SlideException e) {
+		System.err.println("Error creating a dir-context: "+e);
             }
             
             if (object != null) {