Return-Path: 
 <jackrabbit-commits-return-97-apmail-incubator-jackrabbit-commits-archive=www.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-jackrabbit-commits-archive@www.apache.org
Received: (qmail 48673 invoked from network); 26 Oct 2004 16:03:54 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 26 Oct 2004 16:03:54 -0000
Received: (qmail 42537 invoked by uid 500); 26 Oct 2004 16:03:53 -0000
Mailing-List: contact jackrabbit-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:jackrabbit-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:jackrabbit-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:jackrabbit-commits@incubator.apache.org>
List-Id: <jackrabbit-commits.incubator.apache.org>
Reply-To: jackrabbit-dev@incubator.apache.org
Delivered-To: mailing list jackrabbit-commits@incubator.apache.org
Received: (qmail 42524 invoked by uid 500); 26 Oct 2004 16:03:53 -0000
Delivered-To: apmail-incubator-jackrabbit-cvs@incubator.apache.org
Received: (qmail 42516 invoked by uid 99); 26 Oct 2004 16:03:53 -0000
X-ASF-Spam-Status: No, hits=-10.0 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Tue, 26 Oct 2004 09:03:53 -0700
Received: (qmail 48658 invoked by uid 65534); 26 Oct 2004 16:03:52 -0000
Date: 26 Oct 2004 16:03:52 -0000
Message-ID: <20041026160352.48654.qmail@minotaur.apache.org>
From: stefan@apache.org
To: jackrabbit-cvs@incubator.apache.org
Subject: svn commit: rev 55616 - in incubator/jackrabbit/trunk:
 applications/test src/conf src/java/org/apache/jackrabbit/core/config
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: stefan
Date: Tue Oct 26 09:03:50 2004
New Revision: 55616

Modified:
   incubator/jackrabbit/trunk/applications/test/repository.xml
   incubator/jackrabbit/trunk/src/conf/repository.xml
   incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/config/config.dtd
Log:
fixing JCR-13

Modified: incubator/jackrabbit/trunk/applications/test/repository.xml
==============================================================================
--- incubator/jackrabbit/trunk/applications/test/repository.xml	(original)
+++ incubator/jackrabbit/trunk/applications/test/repository.xml	Tue Oct 26 09:03:50 2004
@@ -1,5 +1,83 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- <!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "file://config.dtd"> -->
+<!DOCTYPE Repository [
+    <!--
+        the Repository element configures a repository instance;
+        individual workspaces of the repository are configured through
+        separate configuration files called workspace.xml which are
+        located in a subfolder of the workspaces root directory
+        (see Workspaces element).
+
+        it consists of
+
+            a FileSystem element (the virtual file system
+            used by the repository to persist global state such as
+            registered namespaces, custom node types, etc..
+
+            a Workspaces element that specifies to the location of
+            workspaces root directory and the name of default workspace
+
+            a Workspace element that is used as a workspace configuration
+            template; it is used to create the initial workspace if there's
+            no workspace yet and for creating additional workspaces through
+            the api
+    -->
+    <!ELEMENT Repository (FileSystem,Workspaces,Workspace)>
+
+    <!--
+        a virtual file system
+    -->
+    <!ELEMENT FileSystem (param*)>
+    <!ATTLIST FileSystem
+      class CDATA #REQUIRED>
+
+    <!--
+        generic parameter (name/value pair)
+    -->
+    <!ELEMENT param EMPTY>
+    <!ATTLIST param
+      name CDATA #REQUIRED
+      value CDATA #REQUIRED>
+
+    <!--
+        the Workspaces element specifies the workspaces root directory
+        (rootPath attribute) and the name of the default workspace
+        (defaultWorkspace attribute).
+
+        individual workspaces are configured through individual workspace.xml
+        files located in a subfolder each of the workspaces root directory.
+    -->
+    <!ELEMENT Workspaces EMPTY>
+    <!ATTLIST Workspaces
+      rootPath CDATA #REQUIRED
+      defaultWorkspace CDATA #REQUIRED>
+
+    <!--
+        the Workspace element serves as a workspace configuration template;
+        it is used to create the initial workspace if there's no workspace yet
+        and for creating additional workspaces through the api
+    -->
+    <!ELEMENT Workspace (FileSystem,PersistenceManager,SearchIndex?)>
+    <!ATTLIST Workspace
+      name CDATA #REQUIRED>
+
+    <!--
+        the PersistenceManager element configures the persistence manager
+        to be used for the workspace; the class attribute specifies the
+        FQN of the class implementing PersistenceManager interface
+    -->
+    <!ELEMENT PersistenceManager (param*)>
+    <!ATTLIST PersistenceManager
+      class CDATA #REQUIRED>
+
+    <!--
+        the SearchIndex element specifies the locaction of the search index
+        (used by the QueryManager)
+    -->
+    <!ELEMENT SearchIndex EMPTY>
+    <!ATTLIST SearchIndex
+      path CDATA #REQUIRED>
+]>
 <Repository>
     <!--
         virtual file system where the repository stores global state

Modified: incubator/jackrabbit/trunk/src/conf/repository.xml
==============================================================================
--- incubator/jackrabbit/trunk/src/conf/repository.xml	(original)
+++ incubator/jackrabbit/trunk/src/conf/repository.xml	Tue Oct 26 09:03:50 2004
@@ -57,7 +57,7 @@
         it is used to create the initial workspace if there's no workspace yet
         and for creating additional workspaces through the api
     -->
-    <!ELEMENT Workspace (FileSystem,PersistenceManager,SearchIndex)>
+    <!ELEMENT Workspace (FileSystem,PersistenceManager,SearchIndex?)>
     <!ATTLIST Workspace
       name CDATA #REQUIRED>
 

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/config/config.dtd
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/config/config.dtd	(original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/config/config.dtd	Tue Oct 26 09:03:50 2004
@@ -71,7 +71,7 @@
     it is used to create the initial workspace if there's no workspace yet
     and for creating additional workspaces through the api
 -->
-<!ELEMENT Workspace (FileSystem,PersistenceManager,SearchIndex)>
+<!ELEMENT Workspace (FileSystem,PersistenceManager,SearchIndex?)>
 <!ATTLIST Workspace
     name CDATA #REQUIRED>