Author: smumford Date: 2011-12-08 00:53:14 -0500 (Thu, 08 Dec 2011) New Revision: 8214 Modified: epp/docs/branches/5.2/Reference_Guide/en-US/Book_Info.xml epp/docs/branches/5.2/Reference_Guide/en-US/Revision_History.xml epp/docs/branches/5.2/Reference_Guide/en-US/extras/Advanced_Development_JCR_external-value-storages/default25.xml epp/docs/branches/5.2/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default96.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/jcr/cluster-config.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/exo-jcr-configuration.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/external-value-storages.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/jdbc-data-container-config.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/search-configuration.xml Log: JBEPP-1431: Incorporating QE feedback Modified: epp/docs/branches/5.2/Reference_Guide/en-US/Book_Info.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/Book_Info.xml 2011-12-08 04:53:12 UTC (rev 8213) +++ epp/docs/branches/5.2/Reference_Guide/en-US/Book_Info.xml 2011-12-08 05:53:14 UTC (rev 8214) @@ -9,7 +9,7 @@ <productname>JBoss Enterprise Portal Platform</productname> <productnumber>5.2</productnumber> <edition>5.2.0</edition> - <pubsnumber>15</pubsnumber> + <pubsnumber>16</pubsnumber> <abstract> <para> This Reference Guide is a high-level usage document. It deals with more advanced topics than the Installation and User Guides, adding new content or taking concepts discussed in the earlier documents further. It aims to provide supporting documentation for advanced users of the JBoss Enterprise Portal Platform product. Its primary focus is on advanced use of the product and it assumes an intermediate or advanced knowledge of the technology and terms. Modified: epp/docs/branches/5.2/Reference_Guide/en-US/Revision_History.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/Revision_History.xml 2011-12-08 04:53:12 UTC (rev 8213) +++ epp/docs/branches/5.2/Reference_Guide/en-US/Revision_History.xml 2011-12-08 05:53:14 UTC (rev 8214) @@ -8,7 +8,7 @@ <simpara> <revhistory> <revision> - <revnumber>5.2.0-15</revnumber> + <revnumber>5.2.0-16</revnumber> <date>Thu Dec 8 2011</date> <author> <firstname>Scott</firstname> Modified: epp/docs/branches/5.2/Reference_Guide/en-US/extras/Advanced_Development_JCR_external-value-storages/default25.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/extras/Advanced_Development_JCR_external-value-storages/default25.xml 2011-12-08 04:53:12 UTC (rev 8213) +++ epp/docs/branches/5.2/Reference_Guide/en-US/extras/Advanced_Development_JCR_external-value-storages/default25.xml 2011-12-08 05:53:14 UTC (rev 8214) @@ -1,4 +1,5 @@ -<value-storage id="Storage #1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> +<value-storage id="Storage #1" +class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> <property name="path" value="data/values"/> </properties> Modified: epp/docs/branches/5.2/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default96.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default96.xml 2011-12-08 04:53:12 UTC (rev 8213) +++ epp/docs/branches/5.2/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default96.xml 2011-12-08 05:53:14 UTC (rev 8214) @@ -1,6 +1,28 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + + Copyright (C) 2009 eXo Platform SAS. + + This is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. + + This software is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this software; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA, or see the FSF site: http://www.fsf.org. + +--> + <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"> + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> <component> @@ -8,6 +30,8 @@ <type>org.exoplatform.services.organization.idm.PicketLinkIDMCacheService</type> </component> + + <!-- non-clustered profile --> <component> <key>org.exoplatform.services.database.HibernateService</key> <jmx-name>database:type=HibernateService</jmx-name> @@ -18,6 +42,11 @@ <description>Default Hibernate Service</description> <property name="hibernate.cache.region.jbc2.query.localonly" value="true" /> <property name="hibernate.cache.region.factory_class" value="org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory" /> + <!-- force usage of LOCAL cache configurations --> + <property name="hibernate.cache.region.jbc2.configs" value="picketlink-idm/idm-local-cache-config.xml" /> + <property name="hibernate.cache.region.jbc2.cfg.entity" value="local-optimistic-entity" /> + <property name="hibernate.cache.region.jbc2.cfg.ts" value="local-timestamps-cache" /> + <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup" /> <property name="hibernate.show_sql" value="false"/> <property name="hibernate.current_session_context_class" value="thread"/> @@ -26,13 +55,41 @@ <property name="hibernate.connection.datasource" value="${gatein.idm.datasource.name}${container.name.suffix}"/> <property name="hibernate.connection.autocommit" value="true"/> <!-- - Should be automatically detected. Force otherwise + Should be automatically detected. Force otherwise <property name="hibernate.dialect" value="org.hibernate.dialect.XXXDialect"/> --> </properties-param> </init-params> + </component> + + <!-- clustered profile --> + <component profiles="cluster"> + <key>org.exoplatform.services.database.HibernateService</key> + <jmx-name>database:type=HibernateService</jmx-name> + <type>org.exoplatform.services.database.impl.HibernateServiceImpl</type> + <init-params> + <properties-param> + <name>hibernate.properties</name> + <description>Default Hibernate Service</description> + <property name="hibernate.cache.region.jbc2.query.localonly" value="true" /> + <property name="hibernate.cache.region.jbc2.cachefactory" value="java:CacheManager"/> + <property name="hibernate.cache.region.factory_class" value="org.hibernate.cache.jbc2.JndiMultiplexedJBossCacheRegionFactory" /> + <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup" /> + <property name="hibernate.show_sql" value="false"/> + <property name="hibernate.current_session_context_class" value="thread"/> + <property name="hibernate.cache.use_second_level_cache" value="true"/> + <property name="hibernate.cache.use_query_cache" value="true"/> + <property name="hibernate.connection.datasource" value="${gatein.idm.datasource.name}${container.name.suffix}"/> + <property name="hibernate.connection.autocommit" value="true"/> + <!-- + Should be automatically detected. Force otherwise + <property name="hibernate.dialect" value="org.hibernate.dialect.XXXDialect"/> + --> + </properties-param> + </init-params> </component> + <component> <key>org.exoplatform.services.organization.idm.PicketLinkIDMService</key> <type>org.exoplatform.services.organization.idm.PicketLinkIDMServiceImpl</type> @@ -42,16 +99,16 @@ <value>war:/conf/organization/picketlink-idm/picketlink-idm-config.xml</value> <!--Sample LDAP config--> - <!--<value>war:/conf/organization/picketlink-idm/examples/picketlink-idm-LDAP-config.xml</value>--> + <!--<value>war:/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml</value>--> <!--Read Only "ACME" LDAP Example--> - <!--<value>war:/conf/organization/picketlink-idm/examples/picketlink-idm-LDAP-acme-config.xml</value>--> + <!--<value>war:/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml</value>--> <!--OpenLDAP LDAP config--> - <!--<value>war:/conf/organization/picketlink-idm/examples/picketlink-idm-openLDAP-config.xml</value>--> + <!--<value>war:/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-config.xml</value>--> <!--OpenLDAP ReadOnly "ACME" LDAP Example--> - <!--<value>war:/conf/organization/picketlink-idm/examples/picketlink-idm-openLDAP-acme-config.xml</value>--> + <!--<value>war:/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-acme-config.xml</value>--> <!--MSAD LDAP Example--> <!--<value>war:/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml</value>--> @@ -75,7 +132,7 @@ <value-param profiles="cluster"> <name>apiCacheConfig</name> - <value>war:/conf/organization/picketlink-idm/jboss-cache-cluster.xml</value> + <value>war:/conf/organization/picketlink-idm/jboss-cache-api-cluster.xml</value> </value-param> <value-param> @@ -85,8 +142,184 @@ <value-param profiles="cluster"> <name>storeCacheConfig</name> - <value>war:/conf/organization/picketlink-idm/jboss-cache-cluster.xml</value> + <value>war:/conf/organization/picketlink-idm/jboss-cache-store-cluster.xml</value> </value-param> + + <value-param profiles="cluster"> + <name>jgroups-configuration</name> + <value>${gatein.jcr.jgroups.config}</value> + </value-param> + <value-param profiles="cluster"> + <name>jgroups-multiplexer-stack</name> + <value>false</value> + </value-param> + + <value-param> + <name>cacheExpiration</name> + <value>1800000</value> + </value-param> + + </init-params> - </component> \ No newline at end of file + </component> + + + <component> + <key>org.exoplatform.services.organization.OrganizationService</key> + <type>org.exoplatform.services.organization.idm.PicketLinkIDMOrganizationServiceImpl</type> + <init-params> + <object-param> + <name>configuration</name> + <object type="org.exoplatform.services.organization.idm.Config"> + <!-- For all ids not mapped with type in 'groupTypeMappings' use parent id path + as a group type to store group in PicketLink IDM. The effect of setting + this option to false and not providing any mappings under 'groupTypeMappings' option + is that there can be only one group with a given name in all GateIn group tree--> + <field name="useParentIdAsGroupType"> + <boolean>true</boolean> + </field> + <!-- Group stored in PicketLink IDM with a type mapped in 'groupTypeMappings' will + automatically be member under mapped parent. Normally groups are linked by + PicketLink IDM group association - such relationship won't be needed then. It can + be set to false if all groups are added via GateIn APIs + This option may be useful with LDAP config as it will make (if set to true) every entry + added to LDAP (not via GateIn management UI) appear in GateIn--> + <field name="forceMembershipOfMappedTypes"> + <boolean>true</boolean> + </field> + <!-- When 'userParentIdAsGroupType is set to true this value will be used to + replace all "/" chars in id. This is because "/" is not allowed to be + used in group type name in PicketLink IDM--> + <field name="pathSeparator"> + <string>.</string> + </field> + <!-- Name of a group stored in PicketLink IDM that acts as root group in GateIn - "/" --> + <field name="rootGroupName"> + <string>GTN_ROOT_GROUP</string> + </field> + <!-- Map groups added with GateIn API as a childs of a given group ID to be stored with a given + group type name in PicketLink IDM. If parent ID ends with "/*" then all child groups will + have the mapped group type. Otherwise only direct (first level) children will use this type. + + This can be leveraged by LDAP setup. Given LDAP DN configured in PicketLink IDM to + store specific group type will then store one given branch in GateIn group tree while + all other groups will remain in DB. --> + <field name="groupTypeMappings"> + <map type="java.util.HashMap"> + <entry> + <key><string>/</string></key> + <value><string>root_type</string></value> + </entry> + + <!-- Uncomment for sample LDAP configuration --> + <!-- + <entry> + <key><string>/platform/*</string></key> + <value><string>platform_type</string></value> + </entry> + <entry> + <key><string>/organization/*</string></key> + <value><string>organization_type</string></value> + </entry> + --> + + + <!-- Uncomment for ACME LDAP example --> + <!-- + <entry> + <key><string>/acme/roles/*</string></key> + <value><string>acme_roles_type</string></value> + </entry> + <entry> + <key><string>/acme/organization_units/*</string></key> + <value><string>acme_ou_type</string></value> + </entry> + --> + + <!-- Uncomment for MSAD ReadOnly LDAP example --> + <!-- + <entry> + <key><string>/acme/roles/*</string></key> + <value><string>msad_roles_type</string></value> + </entry> + --> + </map> + </field> + <!-- If this option is used then each Membership created with MembrshipType that is + equal to value specified here will be stored in PicketLink IDM as simple + Group-User association--> + <field name="associationMembershipType"> + <string>member</string> + </field> + <!-- if "associationMembershipType" option is used and this option is set to true + then Membership with MembershipType configured to be stored as PicketLink IDM association + will not be stored as PicketLink IDM Role --> + <field name="ignoreMappedMembershipType"> + <boolean>false</boolean> + </field> + <!-- If 'true' will use JTA UserTransaction. If 'false' will use IDM transaction API --> + <field name="useJTA"> + <boolean>false</boolean> + </field> + + <!-- If PLIDM group will have name containing slash "/" char than it will be replace with following string. + Slashes are used in group paths and if present in names may cause unpredictable behaviour --> + <field name="slashReplacement"> + <string>@_@_@</string> + </field> + + <!-- If groups should be displayed in a sorted order in the management UI--> + <field name="sortGroups"> + <boolean>true</boolean> + </field> + + <!-- If memberships should be displayed in a sorted order in the management UI--> + <field name="sortMemberships"> + <boolean>true</boolean> + </field> + </object> + </object-param> + </init-params> + </component> + + <external-component-plugins> + <target-component>org.exoplatform.services.database.HibernateService</target-component> + <component-plugin> + <name>add.hibernate.mapping</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.database.impl.AddHibernateMappingPlugin</type> + <init-params> + <values-param> + <name>hibernate.mapping</name> + <value>picketlink-idm/mappings/HibernateRealm.hbm.xml</value> + <value>picketlink-idm/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml</value> + <value>picketlink-idm/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml</value> + <value>picketlink-idm/mappings/HibernateIdentityObject.hbm.xml</value> + <value>picketlink-idm/mappings/HibernateIdentityObjectCredential.hbm.xml</value> + <value>picketlink-idm/mappings/HibernateIdentityObjectCredentialType.hbm.xml</value> + <value>picketlink-idm/mappings/HibernateIdentityObjectAttribute.hbm.xml</value> + <value>picketlink-idm/mappings/HibernateIdentityObjectType.hbm.xml</value> + <value>picketlink-idm/mappings/HibernateIdentityObjectRelationship.hbm.xml</value> + <value>picketlink-idm/mappings/HibernateIdentityObjectRelationshipType.hbm.xml</value> + <value>picketlink-idm/mappings/HibernateIdentityObjectRelationshipName.hbm.xml</value> + </values-param> + <values-param profiles="sybase"> + <name>hibernate.mapping</name> + <value>picketlink-idm/sybase-mappings/HibernateRealm.hbm.xml</value> + <value>picketlink-idm/sybase-mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml</value> + <value>picketlink-idm/sybase-mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml</value> + <value>picketlink-idm/sybase-mappings/HibernateIdentityObject.hbm.xml</value> + <value>picketlink-idm/sybase-mappings/HibernateIdentityObjectCredential.hbm.xml</value> + <value>picketlink-idm/sybase-mappings/HibernateIdentityObjectCredentialType.hbm.xml</value> + <value>picketlink-idm/sybase-mappings/HibernateIdentityObjectAttribute.hbm.xml</value> + <value>picketlink-idm/sybase-mappings/HibernateIdentityObjectType.hbm.xml</value> + <value>picketlink-idm/sybase-mappings/HibernateIdentityObjectRelationship.hbm.xml</value> + <value>picketlink-idm/sybase-mappings/HibernateIdentityObjectRelationshipType.hbm.xml</value> + <value>picketlink-idm/sybase-mappings/HibernateIdentityObjectRelationshipName.hbm.xml</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> + +</configuration> Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml 2011-12-08 04:53:12 UTC (rev 8213) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml 2011-12-08 05:53:14 UTC (rev 8214) @@ -26,6 +26,12 @@ <para> Additionally, <literal>org.exoplatform.services.organization</literal> <emphasis>membership</emphasis> concept needs to be translated into the IDM <emphasis>Role</emphasis> concept. Therefore <literal>PicketLink IDM</literal> model is used in a limited way. All these translations are applied by the integration layer. </para> + + <!-- + DOCS NOTE: The content of this section are entirely wrong and needs to be rewritten. The config file in the first programlisting has been updated to the version in EPP 5.2.0, however time constraints prevented this from being actioned before the 5.2.0 GA release. + + The section above notes that this document does not go into Picketlink IDM Config, so perhaps this section can remain hidden... + <section id="sect-Reference_Guide-PicketLink_IDM_integration-Configuration_Files"> <title>Configuration Files</title> <para> @@ -33,8 +39,8 @@ </para> <programlistingco> <areaspec> - <area coords="6 90" id="area-Reference_Guide-PicketLink_IDM_integration-Configuration_Files-JBossIDMServiceImpl" /> - <area coords="22 80" id="area-Reference_Guide-PicketLink_IDM_integration-Configuration_Files-JBossIDMOrganizationServiceImpl" /> + <area coords="95 80" id="area-Reference_Guide-PicketLink_IDM_integration-Configuration_Files-JBossIDMServiceImpl" /> + <area coords="170 80" id="area-Reference_Guide-PicketLink_IDM_integration-Configuration_Files-JBossIDMOrganizationServiceImpl" /> </areaspec> @@ -384,7 +390,7 @@ <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_BackendConfiguration/default97.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> - </section> + </section> --> </section> Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/jcr/cluster-config.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/jcr/cluster-config.xml 2011-12-08 04:53:12 UTC (rev 8213) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/jcr/cluster-config.xml 2011-12-08 05:53:14 UTC (rev 8214) @@ -106,10 +106,10 @@ </para> <programlistingco> <areaspec> - <area coords="20" id="area-Reference_Guide-Launching_Cluster-Configuring_JCR_to_use_external_configuration-value_storages" /> - <area coords="27" id="area-Reference_Guide-Launching_Cluster-Configuring_JCR_to_use_external_configuration-conf_cache" /> - <area coords="31" id="area-Reference_Guide-Launching_Cluster-Configuring_JCR_to_use_external_configuration-conf_indexer" /> - <area coords="34" id="area-Reference_Guide-Launching_Cluster-Configuring_JCR_to_use_external_configuration-conf_lock_manager" /> + <area coords="20 80" id="area-Reference_Guide-Launching_Cluster-Configuring_JCR_to_use_external_configuration-value_storages" /> + <area coords="26 80" id="area-Reference_Guide-Launching_Cluster-Configuring_JCR_to_use_external_configuration-conf_cache" /> + <area coords="31 80" id="area-Reference_Guide-Launching_Cluster-Configuring_JCR_to_use_external_configuration-conf_indexer" /> + <area coords="34 80" id="area-Reference_Guide-Launching_Cluster-Configuring_JCR_to_use_external_configuration-conf_lock_manager" /> </areaspec> Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/exo-jcr-configuration.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/exo-jcr-configuration.xml 2011-12-08 04:53:12 UTC (rev 8213) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/exo-jcr-configuration.xml 2011-12-08 05:53:14 UTC (rev 8214) @@ -8,6 +8,47 @@ <para> The JCR configuration is defined in an XML file which is constructed as per the DTD below: </para> +<programlisting language="XML" role="XML">&lt;!ELEMENT repository-service (repositories)&gt; +&lt;!ATTLIST repository-service default-repository NMTOKEN #REQUIRED&gt; +&lt;!ELEMENT repositories (repository)&gt; +&lt;!ELEMENT repository (security-domain,access-control,session-max-age,authentication-policy,workspaces)&gt; +&lt;!ATTLIST repository + default-workspace NMTOKEN #REQUIRED + name NMTOKEN #REQUIRED + system-workspace NMTOKEN #REQUIRED +&gt; +&lt;!ELEMENT security-domain (#PCDATA)&gt; +&lt;!ELEMENT access-control (#PCDATA)&gt; +&lt;!ELEMENT session-max-age (#PCDATA)&gt; +&lt;!ELEMENT authentication-policy (#PCDATA)&gt; +&lt;!ELEMENT workspaces (workspace+)&gt; +&lt;!ELEMENT workspace (container,initializer,cache,query-handler)&gt; +&lt;!ATTLIST workspace name NMTOKEN #REQUIRED&gt; +&lt;!ELEMENT container (properties,value-storages)&gt; +&lt;!ATTLIST container class NMTOKEN #REQUIRED&gt; +&lt;!ELEMENT value-storages (value-storage+)&gt; +&lt;!ELEMENT value-storage (properties,filters)&gt; +&lt;!ATTLIST value-storage class NMTOKEN #REQUIRED&gt; +&lt;!ELEMENT filters (filter+)&gt; +&lt;!ELEMENT filter EMPTY&gt; +&lt;!ATTLIST filter property-type NMTOKEN #REQUIRED&gt; +&lt;!ELEMENT initializer (properties)&gt; +&lt;!ATTLIST initializer class NMTOKEN #REQUIRED&gt; +&lt;!ELEMENT cache (properties)&gt; +&lt;!ATTLIST cache + enabled NMTOKEN #REQUIRED + class NMTOKEN #REQUIRED +&gt; +&lt;!ELEMENT query-handler (properties)&gt; +&lt;!ATTLIST query-handler class NMTOKEN #REQUIRED&gt; +&lt;!ELEMENT access-manager (properties)&gt; +&lt;!ATTLIST access-manager class NMTOKEN #REQUIRED&gt; +&lt;!ELEMENT lock-manager (time-out,persister)&gt; +&lt;!ELEMENT time-out (#PCDATA)&gt; +&lt;!ELEMENT persister (properties)&gt; +&lt;!ELEMENT properties (property+)&gt; +&lt;!ELEMENT property EMPTY&gt;</programlisting> + <section id="sect-Reference_Guide-JCR_configuration-Portal_configuration"> <title>Portal configuration</title> <para> @@ -737,48 +778,6 @@ </listitem> </varlistentry> </variablelist> - -<programlisting language="XML" role="XML">&lt;!ELEMENT repository-service (repositories)&gt; -&lt;!ATTLIST repository-service default-repository NMTOKEN #REQUIRED&gt; -&lt;!ELEMENT repositories (repository)&gt; -&lt;!ELEMENT repository (security-domain,access-control,session-max-age,authentication-policy,workspaces)&gt; -&lt;!ATTLIST repository - default-workspace NMTOKEN #REQUIRED - name NMTOKEN #REQUIRED - system-workspace NMTOKEN #REQUIRED -&gt; -&lt;!ELEMENT security-domain (#PCDATA)&gt; -&lt;!ELEMENT access-control (#PCDATA)&gt; -&lt;!ELEMENT session-max-age (#PCDATA)&gt; -&lt;!ELEMENT authentication-policy (#PCDATA)&gt; -&lt;!ELEMENT workspaces (workspace+)&gt; -&lt;!ELEMENT workspace (container,initializer,cache,query-handler)&gt; -&lt;!ATTLIST workspace name NMTOKEN #REQUIRED&gt; -&lt;!ELEMENT container (properties,value-storages)&gt; -&lt;!ATTLIST container class NMTOKEN #REQUIRED&gt; -&lt;!ELEMENT value-storages (value-storage+)&gt; -&lt;!ELEMENT value-storage (properties,filters)&gt; -&lt;!ATTLIST value-storage class NMTOKEN #REQUIRED&gt; -&lt;!ELEMENT filters (filter+)&gt; -&lt;!ELEMENT filter EMPTY&gt; -&lt;!ATTLIST filter property-type NMTOKEN #REQUIRED&gt; -&lt;!ELEMENT initializer (properties)&gt; -&lt;!ATTLIST initializer class NMTOKEN #REQUIRED&gt; -&lt;!ELEMENT cache (properties)&gt; -&lt;!ATTLIST cache - enabled NMTOKEN #REQUIRED - class NMTOKEN #REQUIRED -&gt; -&lt;!ELEMENT query-handler (properties)&gt; -&lt;!ATTLIST query-handler class NMTOKEN #REQUIRED&gt; -&lt;!ELEMENT access-manager (properties)&gt; -&lt;!ATTLIST access-manager class NMTOKEN #REQUIRED&gt; -&lt;!ELEMENT lock-manager (time-out,persister)&gt; -&lt;!ELEMENT time-out (#PCDATA)&gt; -&lt;!ELEMENT persister (properties)&gt; -&lt;!ELEMENT properties (property+)&gt; -&lt;!ELEMENT property EMPTY&gt;</programlisting> - </section> <!-- <section id="sect-Reference_Guide-Portal_configuration-Help_application_to_prohibit_the_use_of_closed_sessions"> Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/external-value-storages.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/external-value-storages.xml 2011-12-08 04:53:12 UTC (rev 8213) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/external-value-storages.xml 2011-12-08 05:53:14 UTC (rev 8214) @@ -34,8 +34,8 @@ </para> <programlistingco> <areaspec> - <area coords="1" id="area-Reference_Guide-External_Value_Storages-Tree_File_Value_Storage-id" /> - <area coords="3" id="area-Reference_Guide-External_Value_Storages-Tree_File_Value_Storage-path" /> + <area coords="1 80" id="area-Reference_Guide-External_Value_Storages-Tree_File_Value_Storage-id" /> + <area coords="3 80" id="area-Reference_Guide-External_Value_Storages-Tree_File_Value_Storage-path" /> </areaspec> Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/jdbc-data-container-config.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/jdbc-data-container-config.xml 2011-12-08 04:53:12 UTC (rev 8213) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/jdbc-data-container-config.xml 2011-12-08 05:53:14 UTC (rev 8214) @@ -410,7 +410,7 @@ <itemizedlist> <listitem> <para> - <parameter>driverliteral</parameter>, e.g. "org.hsqldb.jdbcDriver", "com.mysql.jdbc.Driver", "org.postgresql.Driver" + <parameter>driverClassName</parameter>, e.g. "org.hsqldb.jdbcDriver", "com.mysql.jdbc.Driver", "org.postgresql.Driver" </para> </listitem> @@ -567,7 +567,7 @@ </step> <step> <para> - Remove parameter <parameter>source-name</parameter> and add next lines instead. Describe your values for a JDBC driver, database UR: and username. + Remove parameter <parameter>source-name</parameter> and add next lines instead. Describe your values for a JDBC driver, database URL and username. </para> </step> Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/search-configuration.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/search-configuration.xml 2011-12-08 04:53:12 UTC (rev 8213) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/search-configuration.xml 2011-12-08 05:53:14 UTC (rev 8214) @@ -20,7 +20,7 @@ <programlisting language="XML" role="XML"><xi:include href="../../../../extras/Advanced_Development_JCR_search-configuration/default61.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> <para> - The table below outlines the Configuration Parameters available, their default setting, which version of eXo JCR they were implemented in and other useful information: + The table below outlines <emphasis role="bold">some</emphasis> of the Configuration Parameters available, their default setting, which version of eXo JCR they were implemented in and other useful information (further parameters are explained in <xref linkend="sect-Reference_Guide-JBoss_Cache_configuration-Indexer_lock_manager_and_data_container_configuration"/>): </para> <table id="tabl-Reference_Guide-Search_Configuration-Configuration_parameters"> <!-- align="left" pgwide="1" --> <title>Configuration parameters</title>