Index: src/main/config/repository.xml
===================================================================
--- src/main/config/repository.xml	(revision 472049)
+++ src/main/config/repository.xml	(working copy)
@@ -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 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.
-    -->
-    <!ELEMENT Repository (FileSystem,Security,Workspaces,Workspace,Versioning,SearchIndex?)>
-
-    <!--
-        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/1.1/repository.dtd" >
 <!-- Example Repository Configuration File -->
 <Repository>
     <!--
Index: src/main/java/org/apache/jackrabbit/core/repository.xml
===================================================================
--- src/main/java/org/apache/jackrabbit/core/repository.xml	(revision 472049)
+++ src/main/java/org/apache/jackrabbit/core/repository.xml	(working copy)
@@ -15,131 +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.
-    -->
-    <!ELEMENT Repository (FileSystem,Security,Workspaces,Workspace,Versioning,SearchIndex?)>
-
-    <!--
-        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
-    >
-]>
+<!DOCTYPE Repository SYSTEM "http://jackrabbit.apache.org/1.1/repository.dtd" >
 <!-- Example Repository Configuration File -->
 <Repository>
     <!--
Index: src/test/java/org/apache/jackrabbit/core/config/repository.dtd
===================================================================
--- src/test/java/org/apache/jackrabbit/core/config/repository.dtd	(revision 0)
+++ src/test/java/org/apache/jackrabbit/core/config/repository.dtd	(revision 0)
@@ -0,0 +1,206 @@
+<?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.
+-->
+<!--
+    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?, SearchConfiguration?)>
+<!ATTLIST SearchIndex
+  class CDATA #REQUIRED>
+
+<!-- ==================== <SearchConfiguration> ======================== -->
+
+<!--
+    The SearchConfiguration element allows to include/exclude parts of 
+    repository from indexing. It is achieved using rules. First rule is
+    the most significant one and the last one (default rule) is the least
+    significant one.
+    If no SearchConfiguration is specified, the default configuration is 
+    assumed:
+    <SearchConfiguration>
+      <SearchRule action="include" />
+    </SearchConfiguration>
+-->
+<!ELEMENT SearchConfiguration (SearchRule+)>
+
+<!--
+    The SearchRule element includes/excludes part of repository from 
+    indexing. It has one required attributes - action to be taken when node
+    matches this rule - include or exclude this node from indexing. If no
+    other attributes are spefified, all nodes will match this rule.
+    If nodePath is specified - nodes in given path (and below) will match. 
+    Any valid java.util.regex regular expression is allowed.
+    If nodeType is specified - nodes of given type will match. Both 
+    attributes can be specified at once.
+-->
+<!ELEMENT SearchRule (NodeAttribute*)>
+<!ATTLIST SearchRule
+  nodePath (CDATA) #IMPLIED
+  nodeType (CDATA) #IMPLIED
+  action (include|exclude) #REQUIRED>
+
+<!--
+    The NodeAttribute element allows to include/exclude attributes of node
+    from indexing. It has one required attributes - action to be taken when 
+    attribute matches this rule - include or exclude this attribute from 
+    indexing. If no other attributes are spefified, all attributes will 
+    match this rule.
+    If attributeName is specified - attributes with given names will match. 
+    Any valid java.util.regex regular expression is allowed.
+    If attributeType is specified - attributes of given type will match. 
+    Both attributes can be specified at once. If no NodeAttribute is 
+    specified for search rule, default configuration is assumed:
+    <NodeAttribute action="include" />
+-->
+<!ELEMENT NodeAttribute EMPTY>
+<!ATTLIST NodeAttribute
+  attributeName (CDATA) #IMPLIED
+  attributeType (CDATA) #IMPLIED
+  action (include|exclude) #REQUIRED>
+
+<!-- ==================== </SearchConfiguration> ======================= -->
+
+<!--
+    the Versioning element configures the persistence manager
+    to be used for persisting version state
+-->
+<!ELEMENT Versioning (FileSystem, PersistenceManager)>
+<!ATTLIST Versioning
+  rootPath CDATA #REQUIRED
+>
Index: src/test/java/org/apache/jackrabbit/core/config/repository.xml
===================================================================
--- src/test/java/org/apache/jackrabbit/core/config/repository.xml	(revision 472049)
+++ src/test/java/org/apache/jackrabbit/core/config/repository.xml	(working copy)
@@ -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/1.1/repository.dtd" >
 <!-- Example Repository Configuration File -->
 <Repository>
     <!--