jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r486393 - in /jackrabbit/trunk/jackrabbit-core: applications/test/ src/main/config/ src/main/java/org/apache/jackrabbit/core/ src/test/java/org/apache/jackrabbit/core/config/
Date Tue, 12 Dec 2006 22:51:02 GMT
Author: jukka
Date: Tue Dec 12 14:51:01 2006
New Revision: 486393

URL: http://svn.apache.org/viewvc?view=rev&rev=486393
Log:
JCR-626: Move document type definition out of repository.xml

Modified:
    jackrabbit/trunk/jackrabbit-core/applications/test/repository.xml
    jackrabbit/trunk/jackrabbit-core/src/main/config/repository.xml
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/repository.xml
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/test-repository.xml
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/repository.xml
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/workspace.xml

Modified: jackrabbit/trunk/jackrabbit-core/applications/test/repository.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/applications/test/repository.xml?view=diff&rev=486393&r1=486392&r2=486393
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/applications/test/repository.xml (original)
+++ jackrabbit/trunk/jackrabbit-core/applications/test/repository.xml Tue Dec 12 14:51:01
2006
@@ -15,157 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
   -->
-<!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 Security element that specifies the name of the app-entry
-            in the JAAS config and the access manager
-
-            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
-
-            a Versioning element that is used for configuring
-            versioning-related settings
-
-            a SearchIndex element that is used for configuring Indexing-related
-            settings on the /jcr:system tree.
-
-	    a Cluster element that is used for configuring an optional
-	    clustering node that synchronizes changes made in a cluster
-    -->
-    <!ELEMENT Repository (FileSystem,Security,Workspaces,Workspace,Versioning,SearchIndex?,Cluster?)>
-
-    <!--
-        a virtual file system
-    -->
-    <!ELEMENT FileSystem (param*)>
-    <!ATTLIST FileSystem
-      class CDATA #REQUIRED>
-
-    <!--
-        the Security element specifies the name (appName attribute)
-        of the JAAS configuration app-entry for this repository. 
-
-        it also specifies the access manager to be used (AccessManager element).
-    -->
-    <!ELEMENT Security (AccessManager, LoginModule?)>
-    <!ATTLIST Security
-      appName CDATA #REQUIRED>
-
-    <!--
-        the AccessManager element configures the access manager to be used by
-        this repository instance; the class attribute specifies the FQN of the
-        class implementing the AccessManager interface
-    -->
-    <!ELEMENT AccessManager (param*)>
-    <!ATTLIST AccessManager
-      class CDATA #REQUIRED>
-
-    <!--
-        generic parameter (name/value pair)
-    -->
-    <!ELEMENT param EMPTY>
-    <!ATTLIST param
-      name CDATA #REQUIRED
-      value CDATA #REQUIRED>
-
-     <!--
-        the LoginModule element optionally specifies a JAAS login module to
-        authenticate users. This feature allows the use of Jackrabbit in a
-        non-JAAS environment.
-    -->
-    <!ELEMENT LoginModule (param*)>
-    <!ATTLIST LoginModule
-      class 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 the PersistenceManager interface
-    -->
-    <!ELEMENT PersistenceManager (param*)>
-    <!ATTLIST PersistenceManager
-      class CDATA #REQUIRED>
-
-    <!--
-        the SearchIndex element specifies the locaction of the search index
-        (used by the QueryHandler); the class attribute specifies the
-        FQN of the class implementing the QueryHandler interface.
-    -->
-    <!ELEMENT SearchIndex (param*,FileSystem?)>
-    <!ATTLIST SearchIndex
-      class CDATA #REQUIRED>
-
-    <!--
-        the Versioning element configures the persistence manager
-        to be used for persisting version state
-    -->
-    <!ELEMENT Versioning (FileSystem, PersistenceManager)>
-    <!ATTLIST Versioning
-      rootPath CDATA #REQUIRED
-    >
-
-    <!--
-	the Cluster element configures the optional participation of this
-        repository in a clustered environment. a literal id may be
-	specified that uniquely identifies this node in a cluster, as well
-        as the delay in seconds before changes to the journal are
-	automatically detected.
-    -->
-    <!ELEMENT Cluster (Journal)>
-    <!ATTLIST Cluster
-      id CDATA #IMPLIED
-      syncDelay CDATA #IMPLIED
-    >
-
-    <!--
-	the Journal element configures the journal used in clustering; the
-        class attribute specifies the FQN of the class implementing the
-	Journal interface.
-    -->
-    <!ELEMENT Journal (param*)>
-    <!ATTLIST Journal
-      class CDATA #REQUIRED>
-
-]>
+<!DOCTYPE Repository SYSTEM "http://jackrabbit.apache.org/dtd/repository-1.2.dtd">
 <!-- Example Repository Configuration File -->
 <Repository>
     <!--
@@ -243,7 +93,7 @@
         <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
             <param name="path" value="${rep.home}/version" />
         </FileSystem>
-        
+
         <!--
             Configures the persistence manager to be used for persisting version state.
             Please note that the current versioning implementation is based on

Modified: jackrabbit/trunk/jackrabbit-core/src/main/config/repository.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/config/repository.xml?view=diff&rev=486393&r1=486392&r2=486393
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/config/repository.xml (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/config/repository.xml Tue Dec 12 14:51:01 2006
@@ -15,172 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<!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 Security element that specifies the name of the app-entry
-            in the JAAS config and the access manager
-
-            a Workspaces element that specifies the location of the 
-            workspaces root directory, the name of the default workspace,
-            the maximum idle time before a workspace is automatically
-            shutdown (optional) and the workspace configuration root directory
-            within the virtual repository file system (optional)
-
-            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
-
-            a Versioning element that is used for configuring
-            versioning-related settings
-
-            a SearchIndex element that is used for configuring Indexing-related
-            settings on the /jcr:system tree.
-
-            a Cluster element that is used for configuring an optional
-            clustering node that synchronizes changes made in a cluster
-    -->
-    <!ELEMENT Repository (FileSystem,Security,Workspaces,Workspace,Versioning,SearchIndex?,Cluster?)>
-
-    <!--
-        a virtual file system
-    -->
-    <!ELEMENT FileSystem (param*)>
-    <!ATTLIST FileSystem
-      class CDATA #REQUIRED>
-
-    <!--
-        the Security element specifies the name (appName attribute)
-        of the JAAS configuration app-entry for this repository.
-
-        it also specifies the access manager to be used (AccessManager element).
-    -->
-    <!ELEMENT Security (AccessManager, LoginModule?)>
-    <!ATTLIST Security
-      appName CDATA #REQUIRED>
-
-    <!--
-        the AccessManager element configures the access manager to be used by
-        this repository instance; the class attribute specifies the FQN of the
-        class implementing the AccessManager interface
-    -->
-    <!ELEMENT AccessManager (param*)>
-    <!ATTLIST AccessManager
-      class CDATA #REQUIRED>
-
-    <!--
-        generic parameter (name/value pair)
-    -->
-    <!ELEMENT param EMPTY>
-    <!ATTLIST param
-      name CDATA #REQUIRED
-      value CDATA #REQUIRED>
-
-    <!--
-        the LoginModule element optionally specifies a JAAS login module to
-        authenticate users. This feature allows the use of Jackrabbit in a
-        non-JAAS environment.
-    -->
-    <!ELEMENT LoginModule (param*)>
-    <!ATTLIST LoginModule
-      class CDATA #REQUIRED>
-
-    <!--
-        the Workspaces element specifies the physical workspaces root directory
-        (rootPath attribute), the name of the default workspace
-        (defaultWorkspace attribute), the (optional) maximum amount of time in
-        seconds before an idle workspace is automatically shutdown
-        (maxIdleTime attribute) and the (optional) workspace configuration
-        root directory within the virtual repository file system (configRootPath
-        attribute).
-
-        individual workspaces are configured through individual workspace.xml
-        files located in a subfolder each of either
-
-        a) the physical workspaces root directory
-
-        or, if configRootPath had been specified,
-
-        b) the configuration root directory within the virtual repository file system.
-    -->
-    <!ELEMENT Workspaces EMPTY>
-    <!ATTLIST Workspaces
-        rootPath CDATA #REQUIRED
-        defaultWorkspace CDATA #REQUIRED
-        configRootPath CDATA #IMPLIED
-        maxIdleTime CDATA #IMPLIED>
-
-    <!--
-        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 the PersistenceManager interface
-    -->
-    <!ELEMENT PersistenceManager (param*)>
-    <!ATTLIST PersistenceManager
-      class CDATA #REQUIRED>
-
-    <!--
-        the SearchIndex element specifies the locaction of the search index
-        (used by the QueryHandler); the class attribute specifies the
-        FQN of the class implementing the QueryHandler interface.
-    -->
-    <!ELEMENT SearchIndex (param*,FileSystem?)>
-    <!ATTLIST SearchIndex
-      class CDATA #REQUIRED>
-
-    <!--
-        the Versioning element configures the persistence manager
-        to be used for persisting version state
-    -->
-    <!ELEMENT Versioning (FileSystem, PersistenceManager)>
-    <!ATTLIST Versioning
-      rootPath CDATA #REQUIRED
-    >
-
-    <!--
-        the Cluster element configures the optional participation of this
-        repository in a clustered environment. a literal id may be
-        specified that uniquely identifies this node in a cluster, as well
-        as the delay in seconds before changes to the journal are
-        automatically detected.
-    -->
-    <!ELEMENT Cluster (Journal)>
-    <!ATTLIST Cluster
-      id CDATA #IMPLIED
-      syncDelay CDATA #IMPLIED
-    >
-
-    <!--
-        the Journal element configures the journal used in clustering; the
-        class attribute specifies the FQN of the class implementing the
-        Journal interface.
-    -->
-    <!ELEMENT Journal (param*)>
-    <!ATTLIST Journal
-      class CDATA #REQUIRED>
-
-]>
+<!DOCTYPE Repository SYSTEM "http://jackrabbit.apache.org/dtd/repository-1.2.dtd">
 <!-- Example Repository Configuration File -->
 <Repository>
     <!--
@@ -304,7 +139,7 @@
         <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
             <param name="path" value="${rep.home}/version"/>
         </FileSystem>
-        
+
         <!--
             Configures the perisistence manager to be used for persisting version state.
             Please note that the current versioning implementation is based on
@@ -317,14 +152,14 @@
         </PersistenceManager>
 
     </Versioning>
-    
+
     <!--
         Search index for content that is shared repository wide
         (/jcr:system tree, contains mainly versions)
-        
+
         The same parameters are supported as in the search index configuration
         inside the workspace definition element.
-        
+
         This element is optional. If omitted, the /jcr:system tree will not be
         indexed and no results will be returned for that tree!
     -->

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/repository.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/repository.xml?view=diff&rev=486393&r1=486392&r2=486393
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/repository.xml
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/repository.xml
Tue Dec 12 14:51:01 2006
@@ -15,172 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<!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 Security element that specifies the name of the app-entry
-            in the JAAS config and the access manager
-
-            a Workspaces element that specifies the location of the 
-            workspaces root directory, the name of the default workspace,
-            the maximum idle time before a workspace is automatically
-            shutdown (optional) and the workspace configuration root directory
-            within the virtual repository file system (optional)
-
-            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
-
-            a Versioning element that is used for configuring
-            versioning-related settings
-
-            a SearchIndex element that is used for configuring Indexing-related
-            settings on the /jcr:system tree.
-
-            a Cluster element that is used for configuring an optional
-            clustering node that synchronizes changes made in a cluster
-    -->
-    <!ELEMENT Repository (FileSystem,Security,Workspaces,Workspace,Versioning,SearchIndex?,Cluster?)>
-
-    <!--
-        a virtual file system
-    -->
-    <!ELEMENT FileSystem (param*)>
-    <!ATTLIST FileSystem
-      class CDATA #REQUIRED>
-
-    <!--
-        the Security element specifies the name (appName attribute)
-        of the JAAS configuration app-entry for this repository.
-
-        it also specifies the access manager to be used (AccessManager element).
-    -->
-    <!ELEMENT Security (AccessManager, LoginModule?)>
-    <!ATTLIST Security
-      appName CDATA #REQUIRED>
-
-    <!--
-        the AccessManager element configures the access manager to be used by
-        this repository instance; the class attribute specifies the FQN of the
-        class implementing the AccessManager interface
-    -->
-    <!ELEMENT AccessManager (param*)>
-    <!ATTLIST AccessManager
-      class CDATA #REQUIRED>
-
-    <!--
-        generic parameter (name/value pair)
-    -->
-    <!ELEMENT param EMPTY>
-    <!ATTLIST param
-      name CDATA #REQUIRED
-      value CDATA #REQUIRED>
-
-    <!--
-        the LoginModule element optionally specifies a JAAS login module to
-        authenticate users. This feature allows the use of Jackrabbit in a
-        non-JAAS environment.
-    -->
-    <!ELEMENT LoginModule (param*)>
-    <!ATTLIST LoginModule
-      class CDATA #REQUIRED>
-
-    <!--
-        the Workspaces element specifies the physical workspaces root directory
-        (rootPath attribute), the name of the default workspace
-        (defaultWorkspace attribute), the (optional) maximum amount of time in
-        seconds before an idle workspace is automatically shutdown
-        (maxIdleTime attribute) and the (optional) workspace configuration
-        root directory within the virtual repository file system (configRootPath
-        attribute).
-
-        individual workspaces are configured through individual workspace.xml
-        files located in a subfolder each of either
-
-        a) the physical workspaces root directory
-
-        or, if configRootPath had been specified,
-
-        b) the configuration root directory within the virtual repository file system.
-    -->
-    <!ELEMENT Workspaces EMPTY>
-    <!ATTLIST Workspaces
-        rootPath CDATA #REQUIRED
-        defaultWorkspace CDATA #REQUIRED
-        configRootPath CDATA #IMPLIED
-        maxIdleTime CDATA #IMPLIED>
-
-    <!--
-        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 the PersistenceManager interface
-    -->
-    <!ELEMENT PersistenceManager (param*)>
-    <!ATTLIST PersistenceManager
-      class CDATA #REQUIRED>
-
-    <!--
-        the SearchIndex element specifies the locaction of the search index
-        (used by the QueryHandler); the class attribute specifies the
-        FQN of the class implementing the QueryHandler interface.
-    -->
-    <!ELEMENT SearchIndex (param*,FileSystem?)>
-    <!ATTLIST SearchIndex
-      class CDATA #REQUIRED>
-
-    <!--
-        the Versioning element configures the persistence manager
-        to be used for persisting version state
-    -->
-    <!ELEMENT Versioning (FileSystem, PersistenceManager)>
-    <!ATTLIST Versioning
-      rootPath CDATA #REQUIRED
-    >
-
-    <!--
-        the Cluster element configures the optional participation of this
-        repository in a clustered environment. a literal id may be
-        specified that uniquely identifies this node in a cluster, as well
-        as the delay in seconds before changes to the journal are
-        automatically detected.
-    -->
-    <!ELEMENT Cluster (Journal)>
-    <!ATTLIST Cluster
-      id CDATA #IMPLIED
-      syncDelay CDATA #IMPLIED
-    >
-
-    <!--
-        the Journal element configures the journal used in clustering; the
-        class attribute specifies the FQN of the class implementing the
-        Journal interface.
-    -->
-    <!ELEMENT Journal (param*)>
-    <!ATTLIST Journal
-      class CDATA #REQUIRED>
-
-]>
+<!DOCTYPE Repository SYSTEM "http://jackrabbit.apache.org/dtd/repository-1.2.dtd">
 <!-- Example Repository Configuration File -->
 <Repository>
     <!--
@@ -258,7 +93,7 @@
         <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
             <param name="path" value="${rep.home}/version" />
         </FileSystem>
-        
+
         <!--
             Configures the persistence manager to be used for persisting version state.
             Please note that the current versioning implementation is based on

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/test-repository.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/test-repository.xml?view=diff&rev=486393&r1=486392&r2=486393
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/test-repository.xml
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/test-repository.xml
Tue Dec 12 14:51:01 2006
@@ -15,6 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
+<!DOCTYPE Repository SYSTEM "http://jackrabbit.apache.org/dtd/repository-1.2.dtd">
 <Repository>
     <!--
         virtual file system where the repository stores global state
@@ -91,7 +92,7 @@
         <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
             <param name="path" value="${rep.home}/version" />
         </FileSystem>
-        
+
         <!--
             Configures the persistence manager to be used for persisting version state.
             Please note that the current versioning implementation is based on

Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/repository.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/repository.xml?view=diff&rev=486393&r1=486392&r2=486393
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/repository.xml
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/repository.xml
Tue Dec 12 14:51:01 2006
@@ -15,146 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<!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 Security element that specifies the name of the app-entry
-            in the JAAS config and the access manager
-
-            a Workspaces element that specifies the location of the 
-            workspaces root directory, the name of the default workspace,
-            the maximum idle time before a workspace is automatically
-            shutdown (optional) and the workspace configuration root directory
-            within the virtual repository file system (optional)
-
-            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
-
-            a SearchIndex element that is used for configuring per workspace
-            Indexing-related settings
-
-            a Versioning element that is used for configuring
-            versioning-related settings
-    -->
-    <!ELEMENT Repository (FileSystem,Security,Workspaces,Workspace,Versioning)>
-
-    <!--
-        a virtual file system
-    -->
-    <!ELEMENT FileSystem (param*)>
-    <!ATTLIST FileSystem
-      class CDATA #REQUIRED>
-
-    <!--
-        the Security element specifies the name (appName attribute)
-        of the JAAS configuration app-entry for this repository. 
-
-        it also specifies the access manager to be used (AccessManager element).
-    -->
-    <!ELEMENT Security (AccessManager, LoginModule?)>
-    <!ATTLIST Security
-      appName CDATA #REQUIRED>
-
-    <!--
-        the AccessManager element configures the access manager to be used by
-        this repository instance; the class attribute specifies the FQN of the
-        class implementing the AccessManager interface
-    -->
-    <!ELEMENT AccessManager (param*)>
-    <!ATTLIST AccessManager
-      class CDATA #REQUIRED>
-
-    <!--
-        generic parameter (name/value pair)
-    -->
-    <!ELEMENT param EMPTY>
-    <!ATTLIST param
-      name CDATA #REQUIRED
-      value CDATA #REQUIRED>
-
-    <!--
-        the LoginModule element optionally specifies a JAAS login module to
-        authenticate users. This feature allows the use of Jackrabbit in a
-        non-JAAS environment.
-    -->
-    <!ELEMENT LoginModule (param*)>
-    <!ATTLIST LoginModule
-      class CDATA #REQUIRED>
-
-    <!--
-        the Workspaces element specifies the physical workspaces root directory
-        (rootPath attribute), the name of the default workspace
-        (defaultWorkspace attribute), the (optional) maximum amount of time in
-        seconds before an idle workspace is automatically shutdown
-        (maxIdleTime attribute) and the (optional) workspace configuration
-        root directory within the virtual repository file system (configRootPath
-        attribute).
-
-        individual workspaces are configured through individual workspace.xml
-        files located in a subfolder each of either
-
-        a) the physical workspaces root directory
-
-        or, if configRootPath had been specified,
-
-        b) the configuration root directory within the virtual repository file system.
-    -->
-    <!ELEMENT Workspaces EMPTY>
-    <!ATTLIST Workspaces
-        rootPath CDATA #REQUIRED
-        defaultWorkspace CDATA #REQUIRED
-        configRootPath CDATA #IMPLIED
-        maxIdleTime CDATA #IMPLIED>
-
-    <!--
-        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 the PersistenceManager interface
-    -->
-    <!ELEMENT PersistenceManager (param*)>
-    <!ATTLIST PersistenceManager
-      class CDATA #REQUIRED>
-
-    <!--
-        the SearchIndex element specifies the locaction of the search index
-        (used by the QueryHandler); the class attribute specifies the
-        FQN of the class implementing the QueryHandler interface.
-    -->
-    <!ELEMENT SearchIndex (param*,FileSystem?)>
-    <!ATTLIST SearchIndex
-      class CDATA #REQUIRED>
-
-    <!--
-        the Versioning element configures the persistence manager
-        to be used for persisting version state
-    -->
-    <!ELEMENT Versioning (FileSystem, PersistenceManager)>
-    <!ATTLIST Versioning
-      rootPath CDATA #REQUIRED
-    >
-]>
+<!DOCTYPE Repository SYSTEM "http://jackrabbit.apache.org/dtd/repository-1.2.dtd">
 <!-- Example Repository Configuration File -->
 <Repository>
     <!--
@@ -176,7 +37,7 @@
         <AccessManager class="org.apache.jackrabbit.core.security.SimpleAccessManager">
             <!-- <param name="config" value="${rep.home}/access.xml"/> -->
         </AccessManager>
-        
+
         <LoginModule class="org.apache.jackrabbit.core.security.SimpleLoginModule">
            <!-- anonymous user name ('anonymous' is the default value) -->
            <param name="anonymousId" value="anonymous"/>

Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/workspace.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/workspace.xml?view=diff&rev=486393&r1=486392&r2=486393
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/workspace.xml
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/workspace.xml
Tue Dec 12 14:51:01 2006
@@ -15,6 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
+<!DOCTYPE Workspace SYSTEM "http://jackrabbit.apache.org/dtd/repository-1.2.dtd">
 <Workspace name="default">
   <!--
       virtual file system of the workspace:



Mime
View raw message