You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2007/01/05 19:38:12 UTC
svn commit: r493128 - in /jackrabbit/branches/1.2:
jackrabbit-jca/applications/test/repository.xml
jackrabbit-jca/src/main/rar/repository.xml
jackrabbit-webapp/src/main/webapp/WEB-INF/repository/repository.xml
Author: jukka
Date: Fri Jan 5 10:38:11 2007
New Revision: 493128
URL: http://svn.apache.org/viewvc?view=rev&rev=493128
Log:
1.2: Merged revision 493103 (JCR-626)
Modified:
jackrabbit/branches/1.2/jackrabbit-jca/applications/test/repository.xml
jackrabbit/branches/1.2/jackrabbit-jca/src/main/rar/repository.xml
jackrabbit/branches/1.2/jackrabbit-webapp/src/main/webapp/WEB-INF/repository/repository.xml
Modified: jackrabbit/branches/1.2/jackrabbit-jca/applications/test/repository.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.2/jackrabbit-jca/applications/test/repository.xml?view=diff&rev=493128&r1=493127&r2=493128
==============================================================================
--- jackrabbit/branches/1.2/jackrabbit-jca/applications/test/repository.xml (original)
+++ jackrabbit/branches/1.2/jackrabbit-jca/applications/test/repository.xml Fri Jan 5 10:38:11 2007
@@ -15,131 +15,8 @@
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 PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.2//EN"
+ "http://jackrabbit.apache.org/dtd/repository-1.2.dtd">
<!-- Example Repository Configuration File -->
<Repository>
<!--
Modified: jackrabbit/branches/1.2/jackrabbit-jca/src/main/rar/repository.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.2/jackrabbit-jca/src/main/rar/repository.xml?view=diff&rev=493128&r1=493127&r2=493128
==============================================================================
--- jackrabbit/branches/1.2/jackrabbit-jca/src/main/rar/repository.xml (original)
+++ jackrabbit/branches/1.2/jackrabbit-jca/src/main/rar/repository.xml Fri Jan 5 10:38:11 2007
@@ -15,131 +15,8 @@
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 PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.2//EN"
+ "http://jackrabbit.apache.org/dtd/repository-1.2.dtd">
<!-- Example Repository Configuration File -->
<Repository>
<!--
Modified: jackrabbit/branches/1.2/jackrabbit-webapp/src/main/webapp/WEB-INF/repository/repository.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.2/jackrabbit-webapp/src/main/webapp/WEB-INF/repository/repository.xml?view=diff&rev=493128&r1=493127&r2=493128
==============================================================================
--- jackrabbit/branches/1.2/jackrabbit-webapp/src/main/webapp/WEB-INF/repository/repository.xml (original)
+++ jackrabbit/branches/1.2/jackrabbit-webapp/src/main/webapp/WEB-INF/repository/repository.xml Fri Jan 5 10:38:11 2007
@@ -15,112 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- <!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
-
- 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,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)>
- <!ATTLIST Security
- appName 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 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 PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.2//EN"
+ "http://jackrabbit.apache.org/dtd/repository-1.2.dtd">
<Repository>
<!--
virtual file system where the repository stores global state