[gatein-commits] gatein SVN: r5512 - in epp/docs/branches: EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration and 27 other directories.

Author: smumford Date: 2010-12-08 22:02:08 -0500 (Wed, 08 Dec 2010) New Revision: 5512 Added: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.xml epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/Dash_Workspace.png epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/FinishAbortButtons.png epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.xml epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/Dash_Workspace.png epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/FinishAbortButtons.png epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/PortalTemplates.png Removed: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.java epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.java Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration/default95.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default96.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default97.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default101.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default99.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/Foundations.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/PortalDevelopment/LocalizationConfiguration.xml epp/docs/branches/EPP_5_0_Branch/Release_Notes/en-US/Book_Info.xml epp/docs/branches/EPP_5_0_Branch/Site_Publisher_Technical_Preview_Release_Notes/en-US/Book_Info.xml epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/Dashboard1.png epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/DeleteNode2.png epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/MoveUpDown.png epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/PasteNode3.png epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/Skin1.png epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Navigation_Nodes.xml epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Pages.xml epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Permission.xml epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Toolbar.xml epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/User_Management.xml epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/terms/Navigation_concept.xml epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Getting_Started.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration/default95.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default96.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default97.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default101.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default99.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/Foundations.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/LocalizationConfiguration.xml epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation.xml epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Book_Info.xml epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Revision_History.xml epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/Dashboard1.png epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/DeleteNode2.png epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/MoveUpDown.png epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/PasteNode3.png epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/PortalSetting2.5.png epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/Skin1.png epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Navigation_Nodes.xml epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Pages.xml epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Permission.xml epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Toolbar.xml epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/User_Management.xml epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/terms/Navigation_concept.xml Log: QA feedback for 5.1 release applied (where appropriate) to both branches. Deleted: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.java =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.java 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.java 2010-12-09 03:02:08 UTC (rev 5512) @@ -1,62 +0,0 @@ -<workspaces> - <workspace name="ws" auto-init-root-nodetype="nt:unstructured"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr"/> - <property name="dialect" value="hsqldb"/> - <property name="multi-db" value="true"/> - <property name="max-buffer-size" value="200K"/> - <property name="swap-directory" value="target/temp/swap/ws"/> - </properties> - </container> - <cache enabled="true"> - <properties> - <property name="max-size" value="10K"/><!-- 10KBytes --> - <property name="live-time" value="30m"/><!-- 30 min --> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="target/temp/index"/> - </properties> - </query-handler> - <lock-manager> - <time-out>15m</time-out><!-- 15 min --> - <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="target/temp/lock/ws"/> - </properties> - </persister> - </lock-manager> - </workspace> - <workspace name="ws1" auto-init-root-nodetype="nt:unstructured"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr1"/> - <property name="dialect" value="mysql"/> - <property name="multi-db" value="true"/> - <property name="max-buffer-size" value="200K"/> - <property name="swap-directory" value="target/temp/swap/ws1"/> - </properties> - </container> - <cache enabled="true"> - <properties> - <property name="max-size" value="10K"/> - <property name="live-time" value="5m"/> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="target/temp/index"/> - </properties> - </query-handler> - <lock-manager> - <time-out>15m</time-out><!-- 15 min --> - <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="target/temp/lock/ws1"/> - </properties> - </persister> - </lock-manager> - </workspace> -</workspaces> Copied: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.xml (from rev 5501, epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.java) =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.xml (rev 0) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -0,0 +1,197 @@ +<!-- System --> +<workspaces> + <workspace name="system"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/> + <property name="dialect" value="${gatein.jcr.datasource.dialect}"/> + <property name="multi-db" value="false"/> + <property name="update-storage" value="true"/> + <property name="max-buffer-size" value="204800"/> + <property name="swap-directory" value="${gatein.jcr.data.dir}/system${container.name.suffix}"/> + </properties> + <value-storages> + <value-storage id="system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="${gatein.jcr.storage.data.dir}/system${container.name.suffix}"/> + </properties> + <filters> + <filter property-type="Binary"/> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured"/> + <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> + </properties> + </initializer> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> + <property name="jgroups-multiplexer-stack" value="true" /> + <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-system" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="${gatein.jcr.index.data.dir}/system${container.name.suffix}"/> + <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> + <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> + <property name="jgroups-multiplexer-stack" value="true" /> + <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-system" /> + <property name="max-volatile-time" value="60" /> + </properties> + </query-handler> + <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> + <properties> + <property name="time-out" value="15m" /> + <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> + <property name="jgroups-multiplexer-stack" value="true" /> + <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-system" /> + <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_system" /> + <property name="jbosscache-cl-cache.jdbc.table.create" value="true" /> + <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" /> + <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk" /> + <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" /> + <property name="jbosscache-cl-cache.jdbc.node.column" value="node" /> + <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" /> + <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.jcr.datasource.name}${container.name.suffix}" /> + </properties> + </lock-manager> + </workspace> + + <!-- Portal system data --> + <workspace name="portal-system"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/> + <property name="dialect" value="${gatein.jcr.datasource.dialect}"/> + <property name="multi-db" value="false"/> + <property name="update-storage" value="true"/> + <property name="max-buffer-size" value="204800"/> + <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/portal-system${container.name.suffix}"/> + </properties> ∂ + <value-storages> + <value-storage id="portal-system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="${gatein.jcr.storage.data.dir}/portal-system${container.name.suffix}"/> + </properties> + <filters> + <filter property-type="Binary"/> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured"/> + <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> + </properties> + </initializer> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> + <property name="jgroups-multiplexer-stack" value="true" /> + <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-portal-system" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="${gatein.jcr.index.data.dir}/portal-system${container.name.suffix}"/> + <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> + <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> + <property name="jgroups-multiplexer-stack" value="true" /> + <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-portal-system" /> + <property name="max-volatile-time" value="60" /> + </properties> + </query-handler> + <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> + <properties> + <property name="time-out" value="15m" /> + <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> + <property name="jgroups-multiplexer-stack" value="true" /> + <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-portal-system" /> + <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_portal_system" /> + <property name="jbosscache-cl-cache.jdbc.table.create" value="true" /> + <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" /> + <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk" /> + <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" /> + <property name="jbosscache-cl-cache.jdbc.node.column" value="node" /> + <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" /> + <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.jcr.datasource.name}${container.name.suffix}" /> + </properties> + </lock-manager> + </workspace> + +<!-- This code has been updated as per advice from Villiam Rockai that the prodct config file differs. +<workspaces> + <workspace name="ws" auto-init-root-nodetype="nt:unstructured"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr"/> + <property name="dialect" value="hsqldb"/> + <property name="multi-db" value="true"/> + <property name="max-buffer-size" value="200K"/> + <property name="swap-directory" value="target/temp/swap/ws"/> + </properties> + </container> + <cache enabled="true"> + <properties> + <property name="max-size" value="10K"/><!-- 10KBytes --> +<!-- <property name="live-time" value="30m"/><!-- 30 min --> +<!-- </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="target/temp/index"/> + </properties> + </query-handler> + <lock-manager> + <time-out>15m</time-out><!-- 15 min --> +<!-- <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> + <properties> + <property name="path" value="target/temp/lock/ws"/> + </properties> + </persister> + </lock-manager> + </workspace> + <workspace name="ws1" auto-init-root-nodetype="nt:unstructured"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr1"/> + <property name="dialect" value="mysql"/> + <property name="multi-db" value="true"/> + <property name="max-buffer-size" value="200K"/> + <property name="swap-directory" value="target/temp/swap/ws1"/> + </properties> + </container> + <cache enabled="true"> + <properties> + <property name="max-size" value="10K"/> + <property name="live-time" value="5m"/> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="target/temp/index"/> + </properties> + </query-handler> + <lock-manager> + <time-out>15m</time-out><!-- 15 min --> +<!-- <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> + <properties> + <property name="path" value="target/temp/lock/ws1"/> + </properties> + </persister> + </lock-manager> + </workspace> +</workspaces> +--> \ No newline at end of file Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration/default95.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration/default95.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration/default95.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -1,12 +1,27 @@ <component> -<key>org.exoplatform.web.security.security.CookieTokenService</key> -<type>org.exoplatform.web.security.security.CookieTokenService</type> -<init-params> -<values-param> -<name>service.configuration</name> -<value>jcr-token</value> -<value>7</value> -<value>DAY</value> -</values-param> -</init-params> -</component> + <key>org.exoplatform.web.security.security.CookieTokenService</key> + <type>org.exoplatform.web.security.security.CookieTokenService</type> + <init-params> + <values-param> + <name>service.configuration</name> + <value>jcr-token</value> + <value>7</value> + <value>DAY</value> + <value>autologin</value> + </values-param> + </init-params> + </component> + +<!-- Code replaced as per advice from Vilaim Rockai that product config file differs. +<component> + <key>org.exoplatform.web.security.security.CookieTokenService</key> + <type>org.exoplatform.web.security.security.CookieTokenService</type> + <init-params> + <values-param> + <name>service.configuration</name> + <value>jcr-token</value> + <value>7</value> + <value>DAY</value> + </values-param> + </init-params> +</component>--> Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default96.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default96.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default96.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -1,66 +1,175 @@ <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" -xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> -<component> -<key>org.exoplatform.services.organization.idm.PicketLinkIDMService</key> -<type>org.exoplatform.services.organization.idm.PicketLinkIDMServiceImpl</type> -<init-params> -<value-param> -<name>config</name> -<value>war:/conf/organization/idm-config.xml</value> -</value-param> -<value-param> -<name>portalRealm</name> -<value>realm${container.name.suffix}</value> -</value-param> -</init-params> -</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"> -<field name="useParentIdAsGroupType"> -<boolean>true</boolean> -</field> -<field name="forceMembershipOfMappedTypes"> -<boolean>true</boolean> -</field> -<field name="pathSeparator"> -<string>.</string> -</field> -<field name="rootGroupName"> -<string>GTN_ROOT_GROUP</string> -</field> -<field name="groupTypeMappings"> -<map type="java.util.HashMap"> -<entry> -<key><string>/</string></key> -<value><string>root_type</string></value> -</entry> -<!-- Sample mapping --> -<!-- -<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> ---> -</map> -</field> -<field name="associationMembershipType"> -<string>member</string> -</field> -<field name="ignoreMappedMembershipType"> -<boolean>false</boolean> -</field> -</object> -</object-param> -</init-params> -</component> + 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> + <key>org.exoplatform.services.organization.idm.PicketLinkIDMCacheService</key> + <type>org.exoplatform.services.organization.idm.PicketLinkIDMCacheService</type> + </component> + + <component> + <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.factory_class" value="org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory" /> + <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> + <init-params> + <value-param> + <name>config</name> + <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>--> + + <!--Read Only "ACME" LDAP Example--> + <!--<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>--> + + <!--OpenLDAP ReadOnly "ACME" LDAP Example--> + <!--<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>--> + + <!--MSAD Read Only "ACME" LDAP Example--> + <!--<value>war:/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml</value>--> + + </value-param> + + <!-- In default PicketLink IDM configuration hibernate store will namespace identity objects using this realm name + if you want to share DB between portal and also share the same identity data remove the "${container.name.suffix}" part--> + <value-param> + <name>portalRealm</name> + <value>idm_realm${container.name.suffix}</value> + </value-param> + + <value-param> + <name>apiCacheConfig</name> + <value>war:/conf/organization/picketlink-idm/jboss-cache.xml</value> + </value-param> + + <value-param profiles="cluster"> + <name>apiCacheConfig</name> + <value>war:/conf/organization/picketlink-idm/jboss-cache-cluster.xml</value> + </value-param> + + <value-param> + <name>storeCacheConfig</name> + <value>war:/conf/organization/picketlink-idm/jboss-cache.xml</value> + </value-param> + + <value-param profiles="cluster"> + <name>storeCacheConfig</name> + <value>war:/conf/organization/picketlink-idm/jboss-cache-cluster.xml</value> + </value-param> + + </init-params> + </component> + +<!-- Code updated as per advice from Villiam Rockai that product idm-config file differs. +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + + <component> + <key>org.exoplatform.services.organization.idm.PicketLinkIDMService</key> + <type>org.exoplatform.services.organization.idm.PicketLinkIDMServiceImpl</type> + <init-params> + <value-param> + <name>config</name> + <value>war:/conf/organization/idm-config.xml</value> + </value-param> + <value-param> + <name>portalRealm</name> + <value>realm${container.name.suffix}</value> + </value-param> + </init-params> + </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"> + <field name="useParentIdAsGroupType"> + <boolean>true</boolean> + </field> + + <field name="forceMembershipOfMappedTypes"> + <boolean>true</boolean> + </field> + + <field name="pathSeparator"> + <string>.</string> + </field> + + <field name="rootGroupName"> + <string>GTN_ROOT_GROUP</string> + </field> + + <field name="groupTypeMappings"> + <map type="java.util.HashMap"> + <entry> + <key><string>/</string></key> + <value><string>root_type</string></value> + </entry> + + <!-- Sample mapping --> + <!-- + <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> + --> + +<!-- </map> + </field> + + <field name="associationMembershipType"> + <string>member</string> + </field> + + <field name="ignoreMappedMembershipType"> + <boolean>false</boolean> + </field> + </object> + </object-param> + </init-params> + + + </component> + </configuration> +--> \ No newline at end of file Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default97.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default97.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default97.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -1,73 +1,165 @@ +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_ga" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_ga identity-config.xsd"> + <realms> + <realm> + <id>idm_realm</id> + <repository-id-ref>DefaultPortalRepository</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + <options> + <option> + <name>template</name> + <value>true</value> + </option> + <option> + <name>cache.providerRegistryName</name> + <value>apiCacheProvider</value> + </option> + </options> + </realm> + </realms> + <repositories> + <repository> + <id>DefaultPortalRepository</id> + <class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>HibernateStore</default-identity-store-id> + <default-attribute-store-id>HibernateStore</default-attribute-store-id> + </repository> + </repositories> + <stores> + <attribute-stores/> + <identity-stores> + <identity-store> + <id>HibernateStore</id> + <class>org.picketlink.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> + <external-config/> + <supported-relationship-types> + <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> + <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> + </supported-relationship-types> + <supported-identity-object-types> + <identity-object-type> + <name>USER</name> + <relationships/> + <credentials> + <credential-type>PASSWORD</credential-type> + </credentials> + <attributes/> + <options/> + </identity-object-type> + </supported-identity-object-types> + <options> + <option> + <name>hibernateSessionFactoryRegistryName</name> + <value>hibernateSessionFactory</value> + </option> + <option> + <name>populateRelationshipTypes</name> + <value>true</value> + </option> + <option> + <name>populateIdentityObjectTypes</name> + <value>true</value> + </option> + <option> + <name>allowNotDefinedIdentityObjectTypes</name> + <value>true</value> + </option> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + <option> + <name>isRealmAware</name> + <value>true</value> + </option> + </options> + </identity-store> + </identity-stores> + </stores> + <options> + <option> + <name>defaultTemplate</name> + <value>idm_realm</value> + </option> + </options> +</jboss-identity> + +<!--This code has been updated as per advice from Villiam Rockai that that product configuration file differs. <jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_beta" -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd"> -<realms> -<realm> -<id>PortalRealm</id> -<repository-id-ref>PortalRepository</repository-id-ref> -<identity-type-mappings> -<user-mapping>USER</user-mapping> -</identity-type-mappings> -</realm> -</realms> -<repositories> -<repository> -<id>PortalRepository</id> -<class>org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository</class> -<external-config/> -<default-identity-store-id>HibernateStore</default-identity-store-id> -<default-attribute-store-id>HibernateStore</default-attribute-store-id> -</repository> -</repositories> -<stores> -<attribute-stores/> -<identity-stores> -<identity-store> -<id>HibernateStore</id> -<class>org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> -<external-config/> -<supported-relationship-types> -<relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> -<relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> -</supported-relationship-types> -<supported-identity-object-types> -<identity-object-type> -<name>USER</name> -<relationships/> -<credentials> -<credential-type>PASSWORD</credential-type> -</credentials> -<attributes/> -<options/> -</identity-object-type> -</supported-identity-object-types> -<options> -<option> -<name>hibernateSessionFactoryRegistryName</name> -<value>hibernateSessionFactory</value> -</option> -<option> -<name>allowNotDefinedIdentityObjectTypes</name> -<value>true</value> -</option> -<option> -<name>populateRelationshipTypes</name> -<value>true</value> -</option> -<option> -<name>populateIdentityObjectTypes</name> -<value>true</value> -</option> -<option> -<name>allowNotDefinedAttributes</name> -<value>true</value> -</option> -<option> -<name>isRealmAware</name> -<value>true</value> -</option> -</options> -</identity-store> -</identity-stores> -</stores> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd"> + <realms> + <realm> + <id>PortalRealm</id> + <repository-id-ref>PortalRepository</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + </realms> + <repositories> + <repository> + <id>PortalRepository</id> + <class>org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>HibernateStore</default-identity-store-id> + <default-attribute-store-id>HibernateStore</default-attribute-store-id> + </repository> + </repositories> + <stores> + <attribute-stores/> + <identity-stores> + <identity-store> + <id>HibernateStore</id> + <class>org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> + <external-config/> + <supported-relationship-types> + <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> + <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> + </supported-relationship-types> + <supported-identity-object-types> + <identity-object-type> + <name>USER</name> + <relationships/> + <credentials> + <credential-type>PASSWORD</credential-type> + </credentials> + <attributes/> + <options/> + </identity-object-type> + </supported-identity-object-types> + <options> + <option> + <name>hibernateSessionFactoryRegistryName</name> + <value>hibernateSessionFactory</value> + </option> + <option> + <name>allowNotDefinedIdentityObjectTypes</name> + <value>true</value> + </option> + <option> + <name>populateRelationshipTypes</name> + <value>true</value> + </option> + <option> + <name>populateIdentityObjectTypes</name> + <value>true</value> + </option> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + <option> + <name>isRealmAware</name> + <value>true</value> + </option> + </options> + </identity-store> + </identity-stores> + </stores> </jboss-identity> +--> \ No newline at end of file Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default101.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default101.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default101.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -1,4 +1,38 @@ <component-plugin> + <name>new.user.event.listener</name> + <set-method>addListenerPlugin</set-method> + <type>org.exoplatform.services.organization.impl.NewUserEventListener</type> + <description>this listener assign group and membership to a new created user</description> + <init-params> + <object-param> + <name>configuration</name> + <description>description</description> + <object type="org.exoplatform.services.organization.impl.NewUserConfig"> + <field name="group"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.impl.NewUserConfig$JoinGroup"> + <field name="groupId"><string>/platform/users</string></field> + <field name="membership"><string>member</string></field> + </object> + </value> + </collection> + </field> + <field name="ignoredUser"> + <collection type="java.util.HashSet"> + <value><string>root</string></value> + <value><string>john</string></value> + <value><string>mary</string></value> + <value><string>demo</string></value> + </collection> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + +<!-- Code replaced as per advice from Villiam Rockai that "ignoredUser" fields differed in product config file. +<component-plugin> <name>new.user.event.listener</name> <set-method>addListenerPlugin</set-method> <type>org.exoplatform.services.organization.impl.NewUserEventListener</type> @@ -29,4 +63,4 @@ </object> </object-param> </init-params> -</component-plugin> +</component-plugin> --> Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default99.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default99.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default99.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -1,37 +1,75 @@ +<field name="group"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>platform</string></field> + <field name="parentId"><string></string></field> + <field name="description"><string>the /platform group</string></field> + <field name="label"><string>Platform</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>administrators</string></field> + <field name="parentId"><string>/platform</string></field> + <field name="description"><string>the /platform/administrators group</string></field> + <field name="label"><string>Administrators</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>users</string></field> + <field name="parentId"><string>/platform</string></field> + <field name="description"><string>the /platform/users group</string></field> + <field name="label"><string>Users</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>guests</string></field> + <field name="parentId"><string>/platform</string></field> + <field name="description"><string>the /platform/guests group</string></field> + <field name="label"><string>Guests</string></field> + </object> + </value> + ... + </collection> +</field> +<!-- Code replaced from 02portal.war/WEB-INF/conf/organization/organization-configuration.xml as per advice from Villiam Rockai that fields were incorrect. <field name="group"> -<collection type="java.util.ArrayList"> -<value> -<object type="org.exoplatform.services.organization.OrganizationConfig$Group"> -<field name="name"> -<string>portal</string> -</field> -<field name="parentId"> -<string></string> -</field> -<field name="type"> -<string>hierachy</string> -</field> -<field name="description"> -<string>the /portal group</string> -</field> -</object> -</value> -<value> -<object type="org.exoplatform.services.organization.OrganizationConfig$Group"> -<field name="name"> -<string>community</string> -</field> -<field name="parentId"> -<string>/portal</string> -</field> -<field name="type"> -<string>hierachy</string> -</field> -<field name="description"> -<string>the /portal/community group</string> -</field> -</object> -</value> -... -</collection> -</field> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"> + <string>portal</string> + </field> + <field name="parentId"> + <string></string> + </field> + <field name="type"> + <string>hierachy</string> + </field> + <field name="description"> + <string>the /portal group</string> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"> + <string>community</string> + </field> + <field name="parentId"> + <string>/portal</string> + </field> + <field name="type"> + <string>hierachy</string> + </field> + <field name="description"> + <string>the /portal/community group</string> + </field> + </object> + </value> + ... + </collection> +</field> --> Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/Foundations.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/Foundations.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/Foundations.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -98,7 +98,7 @@ Every <literal>&#60;component-plugin&#62;</literal> defines an implementation type, and a method on the target component to use for injection (<literal>&#60;set-method&#62;</literal>). </para> <para> - A plugin implementation class has to implement the <emphasis role="bold">org.eXoplatform.container.component. ComponentPlugin</emphasis> interface. + A plugin implementation class has to implement the <emphasis role="bold">org.exoplatform.container.component. ComponentPlugin</emphasis> interface. </para> <para> In the following example the <literal>PortalContainerDefinitionPlugin</literal> implements the <literal>ComponentPlugin</literal>: Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -410,10 +410,10 @@ Each workspace will be configured for its own data container. </para> <para> - The following example contains two workspaces <parameter>ws</parameter> (<literal>jdbcjcr</literal>) and <parameter>ws1</parameter> (<literal>jdbcjcr1</literal>): + The following example contains two workspaces <parameter>System</parameter> and <parameter>Portal system data</parameter> (<literal>jdbcjcr1</literal>): </para> -<programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_jdbc-data-container-config/default39.java" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> +<programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_jdbc-data-container-config/default39.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> <variablelist> <varlistentry> <term><emphasis role="bold">source-name</emphasis></term> Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -72,7 +72,7 @@ <term>hibernate.annotations</term> <listitem> <para> - <parameter>values-param</parameter> + <parameter>(values-param)</parameter> </para> <para> A list of annotated classes that will be added to Hibernate configuration. @@ -83,7 +83,7 @@ <term>hibernate.mappings</term> <listitem> <para> - <parameter>values-param</parameter> + <parameter>(values-param)</parameter> </para> <para> A list of xml files that will be added to hibernate configuration as mapping files. @@ -117,7 +117,7 @@ <term>storeCacheConfig</term> <listitem> <para> - <parameter>value-param</parameter> + <parameter>(value-param)</parameter> </para> <para> These options reference the JBoss cache configuration used for Picketlink. @@ -320,7 +320,7 @@ </programlistingco> <para> - A sample <emphasis role="bold">PicketLink IDM</emphasis> configuration file is shown below. To understand all the options it contains, please refer to the PicketLink IDM Reference Guide + The <emphasis role="bold">PicketLink IDM</emphasis> configuration file is shown below. To understand all the options it contains, please refer to the PicketLink IDM Reference Guide </para> <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> Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/PortalDevelopment/LocalizationConfiguration.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/PortalDevelopment/LocalizationConfiguration.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/PortalDevelopment/LocalizationConfiguration.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -203,7 +203,7 @@ </programlisting> <para> - The default <literal>LocalePolicy</literal> implementation is installed as GateIn Kernel portal service via <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/exo.portal.webui.portal-VERSION.jar/conf/portal/configuration.xml</filename>. + The default <literal>LocalePolicy</literal> implementation is installed as an eXo Kernel portal service via <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/exo.portal.webui.portal-VERSION.jar/conf/portal/configuration.xml</filename>. </para> <para> The following excerpt is responsible for installing the service: Modified: epp/docs/branches/EPP_5_0_Branch/Release_Notes/en-US/Book_Info.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Release_Notes/en-US/Book_Info.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_0_Branch/Release_Notes/en-US/Book_Info.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -7,7 +7,7 @@ <edition>1</edition> <pubsnumber>1.0</pubsnumber> <productname>JBoss Enterprise Portal Platform</productname> - <productnumber>5</productnumber> + <productnumber>5.0</productnumber> <abstract> <para> These release notes contain important information related to JBoss Enterprise Portal Platform 5.0 that may not be currently available in the Product Manuals. You should read these Release Notes in their entirety before installing JBoss Enterprise Portal Platform 5.0.1. Modified: epp/docs/branches/EPP_5_0_Branch/Site_Publisher_Technical_Preview_Release_Notes/en-US/Book_Info.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Site_Publisher_Technical_Preview_Release_Notes/en-US/Book_Info.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_0_Branch/Site_Publisher_Technical_Preview_Release_Notes/en-US/Book_Info.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -4,7 +4,7 @@ %BOOK_ENTITIES; ]> <bookinfo id="book-Site_Publisher_Release_Notes-Site_Publisher_Release_Notes"> - <title>Site Publisher Technical Preview Release Notes</title> + <title>Site Publisher Release Notes</title> <subtitle>Release Notes for the JBoss Enterprise Portal Platform Site Publisher (powered by eXo) Technical Preview</subtitle> <productname>JBoss Enterprise Portal Platform</productname> <productnumber>5.0</productnumber> Added: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/Dash_Workspace.png =================================================================== (Binary files differ) Property changes on: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/Dash_Workspace.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/Dashboard1.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/DeleteNode2.png =================================================================== (Binary files differ) Added: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/FinishAbortButtons.png =================================================================== (Binary files differ) Property changes on: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/FinishAbortButtons.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/MoveUpDown.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/PasteNode3.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/Skin1.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Navigation_Nodes.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Navigation_Nodes.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Navigation_Nodes.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -318,7 +318,7 @@ </step> <step> <para> - Select the position that you want to paste this node and select <emphasis role="bold">Paste Node</emphasis> option. Click the mark icon to <emphasis role="bold">Save</emphasis>. + Right click on the position that you want to paste this node to and select <emphasis role="bold">Paste Node</emphasis> option. Click the <emphasis role="bold">Save</emphasis> button. </para> <mediaobject> <imageobject role="html"> @@ -364,7 +364,7 @@ </step> <step> <para> - Select the position that you want to paste this node and select <emphasis role="bold">Paste Node</emphasis> option. Click the mark icon to <emphasis role="bold">Save</emphasis>. + Right click on the position that you want to paste this node to and select <emphasis role="bold">Paste Node</emphasis> option. Click the <emphasis role="bold">Save</emphasis> button. </para> <mediaobject> <imageobject role="html"> @@ -374,9 +374,6 @@ <imagedata fileref="images/PasteNode3.png" format="PNG" align="center" contentwidth="130mm"/> </imageobject> </mediaobject> - <para> - The new pages will appear in the page lists: - </para> <!-- <mediaobject> <imageobject> <imagedata fileref="images/ManagePage2.png" format="PNG" align="center" width="444" /> @@ -409,7 +406,7 @@ </step> <step> <para> - Select the position that you want to paste this node and select <emphasis role="bold">Paste Node</emphasis> option. mark icon to <emphasis role="bold">Save</emphasis>. + Right click on the position that you want to paste this node to and select <emphasis role="bold">Paste Node</emphasis> option. Click the <emphasis role="bold">Save</emphasis> button. </para> <mediaobject> <imageobject role="html"> Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Pages.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Pages.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Pages.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -5,9 +5,7 @@ ]> <section id="sect-User_Guide-Manage_Pages"> <title>Manage Pages</title> - - - <section id="sect-User_Guide-Manage_Pages-Adding_a_new_Page"> + <section id="sect-User_Guide-Manage_Pages-Adding_a_new_Page"> <title>Adding a new Page</title> <section id="sect-User_Guide-Page_Creation_Wizard"> @@ -146,7 +144,7 @@ </step> <step> <para> - Select <emphasis role="bold">Empty Layout</emphasis> or click the icon to see more templates to select. + Select <emphasis role="bold">Empty Layout</emphasis> or click the drop-down arrow at the top of the right pane to see more templates to select. </para> </step> <step> @@ -224,13 +222,10 @@ </para> </step> <step> - - <mediaobject> - <imageobject> - <imagedata fileref="images/PageSetting.png" format="PNG" align="center" scale="100" /> - </imageobject> - </mediaobject> - <variablelist> + <para> + The fields in this window are: + </para> + <variablelist> <varlistentry> <term><emphasis role="bold">Page Id</emphasis></term> <listitem> @@ -268,7 +263,7 @@ The name of the current portal is automatically selected for <emphasis role="bold">Owner id</emphasis> ensuring the edit permissions are assigned to users who can edit the current portal. </para> <para> - The name of the page owner. When the owner type is set to <emphasis>group</emphasis>, a list of groups will allow you to select one user as the 'owner'. + When the owner type is set to <emphasis>group</emphasis>, a list of groups will allow you to select one user as the 'owner'. </para> </listitem> </varlistentry> @@ -498,7 +493,7 @@ <procedure> <step> <para> - Go to <emphasis role="bold">Site Editor</emphasis> in the toolbar and click on <emphasis role="bold">Edit Layout</emphasis> It will display : + Mouse over <emphasis role="bold">Site Editor</emphasis> in the toolbar and click on <emphasis role="bold">Edit Layout</emphasis> It will display : </para> <mediaobject> <imageobject role="html"> Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Permission.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Permission.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Permission.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -218,13 +218,10 @@ <para> Click the <emphasis role="bold">Permission Setting</emphasis> tab. </para> + <para> + To be able to access a page users have to be in one of the groups that have access permission to that page. There may be several groups that have access rights to a page. A list of the permissions for that page will be shown (provided the <emphasis role="bold">Make it public</emphasis> check-box has not been used). + </para> </step> - </procedure> - - <para> - To be able to access a page users have to be in one of the groups that have access permission to that page. There may be several groups that have access rights to a page. A list of the permissions for that page will be shown (provided the <emphasis role="bold">Make it public</emphasis> check-box has not been used). - </para> - <procedure> <step> <para> Click <emphasis role="bold">Add Permission</emphasis> @@ -256,11 +253,8 @@ <para> The Permission Setting tab is available in two different ways: </para> - - <para> - Via Edit Page: - </para> <procedure> + <title>Via Edit Page:</title> <step> <para> Mouse over <emphasis role="bold">Site Editor</emphasis> on the Toolbar and select <emphasis role="bold">Edit Page</emphasis>. @@ -277,10 +271,9 @@ </para> </step> </procedure> - <para> - Via Page Management: - </para> + <procedure> + <title>Via Page Management:</title> <step> <para> Mouse over <emphasis role="bold">Group</emphasis> on the Toolbar, highlight <emphasis role="bold">Administration</emphasis> and click on <emphasis role="bold">Page Management</emphasis>. @@ -295,12 +288,10 @@ <para> Click on the <emphasis role="bold">Permission Setting</emphasis> tab then the <emphasis role="bold">Edit Permission Setting</emphasis> sub tab. </para> + <para> + You will see the <emphasis role="bold">Current Permission</emphasis> listed. + </para> </step> - </procedure> - <para> - You will see the <emphasis role="bold">Current Permission</emphasis> listed. - </para> - <procedure> <step> <para> Click the <emphasis role="bold">Select Permission</emphasis> button to set new or change another group. Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -19,7 +19,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/AddPortal.png" format="PNG" align="center" scale="100" /> + <imagedata fileref="images/AddPortal.png" format="PNG" align="center" scale="90" /> </imageobject> <imageobject role="fo"> <imagedata fileref="images/AddPortal.png" format="PNG" align="center" contentwidth="150mm" /> @@ -118,18 +118,18 @@ </step> </procedure> <para> - You also can edit or delete a portal. See <xref linkend="sect-User_Guide-Manage_Portals-Edit_a_Portal" /> or <xref linkend="sect-User_Guide-Manage_Portals-Delete_a_Portal" /> for more details. + You also can edit or delete a portal. See <xref linkend="sect-User_Guide-Manage_Portals-Access_a_Portal" /> or <xref linkend="sect-User_Guide-Manage_Portals-Delete_a_Portal" /> for more details. </para> </section> - <section id="sect-User_Guide-Manage_Portals-Edit_a_Portal"> - <title>Edit a Portal</title> + <section id="sect-User_Guide-Manage_Portals-Access_a_Portal"> + <title>Access a Portal</title> <para> - An administrator can change many aspects of a portal: + An administrator can easily access numerous portals running in the &PRODUCT; instance. </para> <para> - Click <emphasis role="bold">Site</emphasis> on the Toolbar. A list of active portals will appear: + To access a portal, click <emphasis role="bold">Site</emphasis> on the Toolbar. A list of active portals will appear: </para> <mediaobject> <imageobject role="html"> @@ -166,7 +166,7 @@ </imageobject> </mediaobject> <para> - Elements already in place in the portal body can be rearranged or removed as required. Use the relevent button in the overlay that appears when you mouse-over each element: + Elements already in place in the portal body can be rearranged or removed as required. Use the relevent button in the overlay that appears when you mouse over each element: </para> <mediaobject> <imageobject role="html"> @@ -176,6 +176,9 @@ <imagedata fileref="images/EditLayout3.png" format="PNG" align="center" contentwidth="150mm" /> </imageobject> </mediaobject> + <para> + Click the <guilabel>Finish</guilabel> or <guilabel>Abort</guilabel> buttons on the <emphasis role="bold">Edit Inline Composer</emphasis> window to save or discard your changes. <inlinemediaobject><imageobject><imagedata fileref="images/FinishAbortButtons.png"/></imageobject></inlinemediaobject> + </para> </section> @@ -197,7 +200,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/NavigationManagement.png" format="PNG" align="center" scale="100" /> + <imagedata fileref="images/NavigationManagement.png" format="PNG" align="center" scale="90" /> </imageobject> <imageobject role="fo"> <imagedata fileref="images/NavigationManagement.png" format="PNG" align="center" contentwidth="150mm" /> @@ -327,7 +330,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/Skin1.png" format="PNG" scale="100"/> + <imagedata fileref="images/Skin1.png" format="PNG" scale="90"/> </imageobject> <imageobject role="fo"> <imagedata fileref="images/Skin1.png" format="PNG" contentwidth="120mm"/> @@ -336,7 +339,7 @@ </step> <step> <para> - Click <emphasis role="bold">Save</emphasis> then <emphasis role="bold">Finish</emphasis>. + Click <emphasis role="bold">Save</emphasis> to <emphasis role="bold">Finish</emphasis>. </para> </step> </procedure> Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Toolbar.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Toolbar.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Toolbar.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -97,8 +97,25 @@ <term> <emphasis role="bold">Editor</emphasis></term> <listitem> <para> - Portal Administrators have access to another navigation that allows them to; add a new page to the current portal, edit a particular page's properties or to change a page's layout. + Portal Administrators have access to another navigation that allows them to; </para> + <itemizedlist> + <listitem> + <para> + Add a new page to the current portal. + </para> + </listitem> + <listitem> + <para> + Edit a particular page's properties. + </para> + </listitem> + <listitem> + <para> + Change a page's layout. + </para> + </listitem> + </itemizedlist> <para> This navigation appears next to the Dashboard navigation in the Toolbar and is contextually-named. It will appear as either <emphasis role="bold">Site Editor</emphasis>, <emphasis role="bold">Dashboard Editor</emphasis> or <emphasis role="bold">Group Editor</emphasis> depending on the user's location within the portal. </para> Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/User_Management.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/User_Management.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/User_Management.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -23,7 +23,7 @@ </imageobject> </mediaobject> <para> - Administrators can see all existing registered users and search, edit or even delete them. Each user's groups and memberships (roles) in these groups are also available. You can not add users to a group but you can remove them from the group. + Administrators can see all existing registered users and search, edit or even delete them. Each user's groups and memberships (roles) in these groups are also available. </para> @@ -35,7 +35,7 @@ <procedure> <step> <para> - Mouse-over <emphasis role="bold">Group</emphasis> in the <emphasis role="bold">Toolbar</emphasis>. + Mouse over <emphasis role="bold">Group</emphasis> in the <emphasis role="bold">Toolbar</emphasis>. </para> </step> <step> @@ -54,7 +54,7 @@ </imageobject> </mediaobject> <para> - This window has two tabs; <emphasis role="bold">Account Settings</emphasis> and <emphasis role="bold">User Profile</emphasis>. + This window has two tabs; <emphasis role="bold">Account Setting</emphasis> and <emphasis role="bold">User Profile</emphasis>. </para> </step> <step> Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -73,6 +73,14 @@ <para> The Dashboard Workspace lists all available gadgets. Four gadgets are provided by default with &PRODUCT;, however you can add many more. </para> + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/Dash_Workspace.png" format="PNG" align="center" scale="100" /> + </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/Dash_Workspace.png" format="PNG" align="center" contentwidth="150mm" /> + </imageobject> + </mediaobject> <variablelist id="vari-User_Guide-Using_the_Dashboard_Workspace-Default_Gadgets"> <title>Default Gadgets:</title> <varlistentry> Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/terms/Navigation_concept.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/terms/Navigation_concept.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/terms/Navigation_concept.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -56,19 +56,30 @@ </para> </listitem> </varlistentry> + <varlistentry> + <term>Dashboard Editor</term> + <listitem> + <para> + The <emphasis role="bold">Dashboard Editor</emphasis> navigation appears when a user is on their dashboard page. + </para> + <para> + The user can add multiple dashboard in new tabs and then edit the layout and content of those dashboards. + </para> + </listitem> + </varlistentry> </variablelist> <para> When logged in as an Administrator, a fourth navigation appears in the Toolbar: </para> <variablelist> <varlistentry> - <term>Site/Group/Dashboard Editor</term> + <term>Site/Group Editor</term> <listitem> <para> - This navigation appears as either <emphasis role="bold">Site Editor</emphasis>, <emphasis role="bold">Group Editor</emphasis> or <emphasis>Dashboard Editor</emphasis> depending on the administrator's location within the portal. + This navigation appears as either <emphasis role="bold">Site Editor</emphasis> or <emphasis role="bold">Group Editor</emphasis> depending on the administrator's location within the portal. </para> <para> - When in areas of the portal displaying content, the navigation shows as <emphasis role="bold">Site Editor</emphasis>, in areas pertaining to users the navigation shows as <emphasis role="bold">Group Editor</emphasis> and when in the Dashboard it appears as <emphasis>Dashboard Editor</emphasis>. + When in areas of the portal displaying content, the navigation shows as <emphasis role="bold">Site Editor</emphasis> and in areas pertaining to users the navigation shows as <emphasis role="bold">Group Editor</emphasis>. </para> <para> This navigation contains links to add a new pages to the portal, to edit a page or to change the portal's layout. Administrators can use these links to manage the portal. Modified: epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Getting_Started.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Getting_Started.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Getting_Started.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -7,6 +7,7 @@ <chapter id="Getting_Started"> <title>Getting Started</title> +<!-- Commented out as per migration information from Thomas Heute. <section id="sect-Installation_Guide-Getting_Started-Upgrading_Previous_Installations"> <title>Upgrading to &PRODUCT; &VERSION_MICRO;</title> <important> @@ -18,7 +19,7 @@ If you have an existing installation of &PRODUCT; 5.0 or 5.0.1 (including installations that include the technical preview release of the &PRODUCT; Site Publisher extension) you must either replace this installation or deploy a new instance of &PRODUCT;. </para> </important> - </section> + </section> --> <section id="Getting_Started-Pre_Requisites"> <title>Pre-Requisites</title> Deleted: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.java =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.java 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.java 2010-12-09 03:02:08 UTC (rev 5512) @@ -1,62 +0,0 @@ -<workspaces> - <workspace name="ws" auto-init-root-nodetype="nt:unstructured"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr"/> - <property name="dialect" value="hsqldb"/> - <property name="multi-db" value="true"/> - <property name="max-buffer-size" value="200K"/> - <property name="swap-directory" value="target/temp/swap/ws"/> - </properties> - </container> - <cache enabled="true"> - <properties> - <property name="max-size" value="10K"/><!-- 10KBytes --> - <property name="live-time" value="30m"/><!-- 30 min --> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="target/temp/index"/> - </properties> - </query-handler> - <lock-manager> - <time-out>15m</time-out><!-- 15 min --> - <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="target/temp/lock/ws"/> - </properties> - </persister> - </lock-manager> - </workspace> - <workspace name="ws1" auto-init-root-nodetype="nt:unstructured"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr1"/> - <property name="dialect" value="mysql"/> - <property name="multi-db" value="true"/> - <property name="max-buffer-size" value="200K"/> - <property name="swap-directory" value="target/temp/swap/ws1"/> - </properties> - </container> - <cache enabled="true"> - <properties> - <property name="max-size" value="10K"/> - <property name="live-time" value="5m"/> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="target/temp/index"/> - </properties> - </query-handler> - <lock-manager> - <time-out>15m</time-out><!-- 15 min --> - <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="target/temp/lock/ws1"/> - </properties> - </persister> - </lock-manager> - </workspace> -</workspaces> Copied: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.xml (from rev 5501, epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.java) =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.xml (rev 0) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -0,0 +1,197 @@ +<!-- System --> +<workspaces> + <workspace name="system"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/> + <property name="dialect" value="${gatein.jcr.datasource.dialect}"/> + <property name="multi-db" value="false"/> + <property name="update-storage" value="true"/> + <property name="max-buffer-size" value="204800"/> + <property name="swap-directory" value="${gatein.jcr.data.dir}/system${container.name.suffix}"/> + </properties> + <value-storages> + <value-storage id="system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="${gatein.jcr.storage.data.dir}/system${container.name.suffix}"/> + </properties> + <filters> + <filter property-type="Binary"/> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured"/> + <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> + </properties> + </initializer> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> + <property name="jgroups-multiplexer-stack" value="true" /> + <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-system" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="${gatein.jcr.index.data.dir}/system${container.name.suffix}"/> + <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> + <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> + <property name="jgroups-multiplexer-stack" value="true" /> + <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-system" /> + <property name="max-volatile-time" value="60" /> + </properties> + </query-handler> + <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> + <properties> + <property name="time-out" value="15m" /> + <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> + <property name="jgroups-multiplexer-stack" value="true" /> + <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-system" /> + <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_system" /> + <property name="jbosscache-cl-cache.jdbc.table.create" value="true" /> + <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" /> + <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk" /> + <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" /> + <property name="jbosscache-cl-cache.jdbc.node.column" value="node" /> + <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" /> + <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.jcr.datasource.name}${container.name.suffix}" /> + </properties> + </lock-manager> + </workspace> + + <!-- Portal system data --> + <workspace name="portal-system"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/> + <property name="dialect" value="${gatein.jcr.datasource.dialect}"/> + <property name="multi-db" value="false"/> + <property name="update-storage" value="true"/> + <property name="max-buffer-size" value="204800"/> + <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/portal-system${container.name.suffix}"/> + </properties> ∂ + <value-storages> + <value-storage id="portal-system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="${gatein.jcr.storage.data.dir}/portal-system${container.name.suffix}"/> + </properties> + <filters> + <filter property-type="Binary"/> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured"/> + <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> + </properties> + </initializer> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> + <property name="jgroups-multiplexer-stack" value="true" /> + <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-portal-system" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="${gatein.jcr.index.data.dir}/portal-system${container.name.suffix}"/> + <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> + <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> + <property name="jgroups-multiplexer-stack" value="true" /> + <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-portal-system" /> + <property name="max-volatile-time" value="60" /> + </properties> + </query-handler> + <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> + <properties> + <property name="time-out" value="15m" /> + <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> + <property name="jgroups-multiplexer-stack" value="true" /> + <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-portal-system" /> + <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_portal_system" /> + <property name="jbosscache-cl-cache.jdbc.table.create" value="true" /> + <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" /> + <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk" /> + <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" /> + <property name="jbosscache-cl-cache.jdbc.node.column" value="node" /> + <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" /> + <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.jcr.datasource.name}${container.name.suffix}" /> + </properties> + </lock-manager> + </workspace> + +<!-- This code has been updated as per advice from Villiam Rockai that the prodct config file differs. +<workspaces> + <workspace name="ws" auto-init-root-nodetype="nt:unstructured"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr"/> + <property name="dialect" value="hsqldb"/> + <property name="multi-db" value="true"/> + <property name="max-buffer-size" value="200K"/> + <property name="swap-directory" value="target/temp/swap/ws"/> + </properties> + </container> + <cache enabled="true"> + <properties> + <property name="max-size" value="10K"/><!-- 10KBytes --> +<!-- <property name="live-time" value="30m"/><!-- 30 min --> +<!-- </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="target/temp/index"/> + </properties> + </query-handler> + <lock-manager> + <time-out>15m</time-out><!-- 15 min --> +<!-- <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> + <properties> + <property name="path" value="target/temp/lock/ws"/> + </properties> + </persister> + </lock-manager> + </workspace> + <workspace name="ws1" auto-init-root-nodetype="nt:unstructured"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr1"/> + <property name="dialect" value="mysql"/> + <property name="multi-db" value="true"/> + <property name="max-buffer-size" value="200K"/> + <property name="swap-directory" value="target/temp/swap/ws1"/> + </properties> + </container> + <cache enabled="true"> + <properties> + <property name="max-size" value="10K"/> + <property name="live-time" value="5m"/> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="target/temp/index"/> + </properties> + </query-handler> + <lock-manager> + <time-out>15m</time-out><!-- 15 min --> +<!-- <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> + <properties> + <property name="path" value="target/temp/lock/ws1"/> + </properties> + </persister> + </lock-manager> + </workspace> +</workspaces> +--> \ No newline at end of file Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration/default95.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration/default95.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration/default95.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -1,4 +1,19 @@ <component> + <key>org.exoplatform.web.security.security.CookieTokenService</key> + <type>org.exoplatform.web.security.security.CookieTokenService</type> + <init-params> + <values-param> + <name>service.configuration</name> + <value>jcr-token</value> + <value>7</value> + <value>DAY</value> + <value>autologin</value> + </values-param> + </init-params> + </component> + +<!-- Code replaced as per advice from Vilaim Rockai that product config file differs. +<component> <key>org.exoplatform.web.security.security.CookieTokenService</key> <type>org.exoplatform.web.security.security.CookieTokenService</type> <init-params> @@ -9,4 +24,4 @@ <value>DAY</value> </values-param> </init-params> -</component> +</component>--> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default96.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default96.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default96.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -1,4 +1,98 @@ <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + 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> + <key>org.exoplatform.services.organization.idm.PicketLinkIDMCacheService</key> + <type>org.exoplatform.services.organization.idm.PicketLinkIDMCacheService</type> + </component> + + <component> + <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.factory_class" value="org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory" /> + <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> + <init-params> + <value-param> + <name>config</name> + <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>--> + + <!--Read Only "ACME" LDAP Example--> + <!--<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>--> + + <!--OpenLDAP ReadOnly "ACME" LDAP Example--> + <!--<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>--> + + <!--MSAD Read Only "ACME" LDAP Example--> + <!--<value>war:/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml</value>--> + + </value-param> + + <!-- In default PicketLink IDM configuration hibernate store will namespace identity objects using this realm name + if you want to share DB between portal and also share the same identity data remove the "${container.name.suffix}" part--> + <value-param> + <name>portalRealm</name> + <value>idm_realm${container.name.suffix}</value> + </value-param> + + <value-param> + <name>apiCacheConfig</name> + <value>war:/conf/organization/picketlink-idm/jboss-cache.xml</value> + </value-param> + + <value-param profiles="cluster"> + <name>apiCacheConfig</name> + <value>war:/conf/organization/picketlink-idm/jboss-cache-cluster.xml</value> + </value-param> + + <value-param> + <name>storeCacheConfig</name> + <value>war:/conf/organization/picketlink-idm/jboss-cache.xml</value> + </value-param> + + <value-param profiles="cluster"> + <name>storeCacheConfig</name> + <value>war:/conf/organization/picketlink-idm/jboss-cache-cluster.xml</value> + </value-param> + + </init-params> + </component> + +<!-- Code updated as per advice from Villiam Rockai that product idm-config file differs. +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> @@ -60,7 +154,7 @@ </entry> --> - </map> +<!-- </map> </field> <field name="associationMembershipType"> @@ -78,3 +172,4 @@ </component> </configuration> +--> \ No newline at end of file Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default97.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default97.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default97.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -1,3 +1,94 @@ +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_ga" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_ga identity-config.xsd"> + <realms> + <realm> + <id>idm_realm</id> + <repository-id-ref>DefaultPortalRepository</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + <options> + <option> + <name>template</name> + <value>true</value> + </option> + <option> + <name>cache.providerRegistryName</name> + <value>apiCacheProvider</value> + </option> + </options> + </realm> + </realms> + <repositories> + <repository> + <id>DefaultPortalRepository</id> + <class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>HibernateStore</default-identity-store-id> + <default-attribute-store-id>HibernateStore</default-attribute-store-id> + </repository> + </repositories> + <stores> + <attribute-stores/> + <identity-stores> + <identity-store> + <id>HibernateStore</id> + <class>org.picketlink.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> + <external-config/> + <supported-relationship-types> + <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> + <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> + </supported-relationship-types> + <supported-identity-object-types> + <identity-object-type> + <name>USER</name> + <relationships/> + <credentials> + <credential-type>PASSWORD</credential-type> + </credentials> + <attributes/> + <options/> + </identity-object-type> + </supported-identity-object-types> + <options> + <option> + <name>hibernateSessionFactoryRegistryName</name> + <value>hibernateSessionFactory</value> + </option> + <option> + <name>populateRelationshipTypes</name> + <value>true</value> + </option> + <option> + <name>populateIdentityObjectTypes</name> + <value>true</value> + </option> + <option> + <name>allowNotDefinedIdentityObjectTypes</name> + <value>true</value> + </option> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + <option> + <name>isRealmAware</name> + <value>true</value> + </option> + </options> + </identity-store> + </identity-stores> + </stores> + <options> + <option> + <name>defaultTemplate</name> + <value>idm_realm</value> + </option> + </options> +</jboss-identity> + +<!--This code has been updated as per advice from Villiam Rockai that that product configuration file differs. <jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_beta" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd"> @@ -71,3 +162,4 @@ </identity-stores> </stores> </jboss-identity> +--> \ No newline at end of file Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default101.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default101.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default101.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -1,4 +1,38 @@ <component-plugin> + <name>new.user.event.listener</name> + <set-method>addListenerPlugin</set-method> + <type>org.exoplatform.services.organization.impl.NewUserEventListener</type> + <description>this listener assign group and membership to a new created user</description> + <init-params> + <object-param> + <name>configuration</name> + <description>description</description> + <object type="org.exoplatform.services.organization.impl.NewUserConfig"> + <field name="group"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.impl.NewUserConfig$JoinGroup"> + <field name="groupId"><string>/platform/users</string></field> + <field name="membership"><string>member</string></field> + </object> + </value> + </collection> + </field> + <field name="ignoredUser"> + <collection type="java.util.HashSet"> + <value><string>root</string></value> + <value><string>john</string></value> + <value><string>mary</string></value> + <value><string>demo</string></value> + </collection> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + +<!-- Code replaced as per advice from Villiam Rockai that "ignoredUser" fields differed in product config file. +<component-plugin> <name>new.user.event.listener</name> <set-method>addListenerPlugin</set-method> <type>org.exoplatform.services.organization.impl.NewUserEventListener</type> @@ -29,4 +63,4 @@ </object> </object-param> </init-params> -</component-plugin> +</component-plugin> --> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default99.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default99.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default99.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -1,3 +1,41 @@ +<field name="group"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>platform</string></field> + <field name="parentId"><string></string></field> + <field name="description"><string>the /platform group</string></field> + <field name="label"><string>Platform</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>administrators</string></field> + <field name="parentId"><string>/platform</string></field> + <field name="description"><string>the /platform/administrators group</string></field> + <field name="label"><string>Administrators</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>users</string></field> + <field name="parentId"><string>/platform</string></field> + <field name="description"><string>the /platform/users group</string></field> + <field name="label"><string>Users</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>guests</string></field> + <field name="parentId"><string>/platform</string></field> + <field name="description"><string>the /platform/guests group</string></field> + <field name="label"><string>Guests</string></field> + </object> + </value> + ... + </collection> +</field> +<!-- Code replaced from 02portal.war/WEB-INF/conf/organization/organization-configuration.xml as per advice from Villiam Rockai that fields were incorrect. <field name="group"> <collection type="java.util.ArrayList"> <value> @@ -34,4 +72,4 @@ </value> ... </collection> -</field> +</field> --> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/Foundations.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/Foundations.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/Foundations.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -98,7 +98,7 @@ Every <literal>&#60;component-plugin&#62;</literal> defines an implementation type, and a method on the target component to use for injection (<literal>&#60;set-method&#62;</literal>). </para> <para> - A plugin implementation class has to implement the <emphasis role="bold">org.eXoplatform.container.component. ComponentPlugin</emphasis> interface. + A plugin implementation class has to implement the <emphasis role="bold">org.exoplatform.container.component. ComponentPlugin</emphasis> interface. </para> <para> In the following example the <literal>PortalContainerDefinitionPlugin</literal> implements the <literal>ComponentPlugin</literal>: Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -410,10 +410,10 @@ Each workspace will be configured for its own data container. </para> <para> - The following example contains two workspaces <parameter>ws</parameter> (<literal>jdbcjcr</literal>) and <parameter>ws1</parameter> (<literal>jdbcjcr1</literal>): + The following example contains two workspaces <parameter>System</parameter> and <parameter>Portal system data</parameter> (<literal>jdbcjcr1</literal>): </para> -<programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_jdbc-data-container-config/default39.java" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> +<programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_jdbc-data-container-config/default39.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> <variablelist> <varlistentry> <term><emphasis role="bold">source-name</emphasis></term> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -72,7 +72,7 @@ <term>hibernate.annotations</term> <listitem> <para> - <parameter>values-param</parameter> + <parameter>(values-param)</parameter> </para> <para> A list of annotated classes that will be added to Hibernate configuration. @@ -83,7 +83,7 @@ <term>hibernate.mappings</term> <listitem> <para> - <parameter>values-param</parameter> + <parameter>(values-param)</parameter> </para> <para> A list of xml files that will be added to hibernate configuration as mapping files. @@ -117,7 +117,7 @@ <term>storeCacheConfig</term> <listitem> <para> - <parameter>value-param</parameter> + <parameter>(value-param)</parameter> </para> <para> These options reference the JBoss cache configuration used for Picketlink. @@ -320,7 +320,7 @@ </programlistingco> <para> - A sample <emphasis role="bold">PicketLink IDM</emphasis> configuration file is shown below. To understand all the options it contains, please refer to the PicketLink IDM Reference Guide + The <emphasis role="bold">PicketLink IDM</emphasis> configuration file is shown below. To understand all the options it contains, please refer to the PicketLink IDM Reference Guide </para> <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> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/LocalizationConfiguration.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/LocalizationConfiguration.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/LocalizationConfiguration.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -203,7 +203,7 @@ </programlisting> <para> - The default <literal>LocalePolicy</literal> implementation is installed as GateIn Kernel portal service via <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/exo.portal.webui.portal-VERSION.jar/conf/portal/configuration.xml</filename>. + The default <literal>LocalePolicy</literal> implementation is installed as an eXo Kernel portal service via <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/exo.portal.webui.portal-VERSION.jar/conf/portal/configuration.xml</filename>. </para> <para> The following excerpt is responsible for installing the service: Modified: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -18,11 +18,8 @@ The &JBEPP; Installation Guide is available at <ulink type="http" url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platf... />. A User Guide and Reference Guide are also available at this location and should be reviewed to ensure your Portal Platform is configured correctly. </para> <para> - Unfortunately existing &JBEPP; installations cannot be upgraded in order to deploy &PRODUCT;. + If you have an existing installation of &JBEPP; 5.0 or 5.0.1 (including installations that include the technical preview release of the &PRODUCT; extension) you must either replace this installation or deploy a new instance of &JBEPP; &VERSION_MIRCO; in order to use &PRODUCT;. </para> - <para> - If you have an existing installation of &JBEPP; 5.0 or 5.0.1 (including installations that include the technical preview release of the &PRODUCT; extension) you must either replace this installation or deploy a new instance of &JBEPP; in order to use &PRODUCT;. - </para> <note> <title>&JBEPP; Subscriptions</title> <para> Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Book_Info.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Book_Info.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Book_Info.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -3,11 +3,11 @@ %BOOK_ENTITIES; ]><bookinfo id="book-User_Guide-User_Guide"> <title>User Guide</title> - <subtitle>A User Guide for Enterprise Portal Platform 5</subtitle> + <subtitle>A User Guide for Enterprise Portal Platform &VERSION_MICRO;</subtitle> <productname>JBoss Enterprise Portal Platform</productname> - <productnumber>5</productnumber> + <productnumber>5.1</productnumber> <edition>1</edition> - <pubsnumber>2.9</pubsnumber> + <pubsnumber>2.10</pubsnumber> <abstract> <para> This document provides an easy to follow guide to the functions and Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Revision_History.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Revision_History.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Revision_History.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -7,6 +7,20 @@ <title>Revision History</title> <simpara> <revhistory> + <revision> + <revnumber>1-2.10</revnumber> + <date>Mon Dec 06 2010</date> + <author> + <firstname>Scott</firstname> + <surname>Mumford</surname> + <email&gt;smumford(a)redhat.com&lt;/email&gt; + </author> + <revdescription> + <simplelist> + <member>Re-published for 5.1 branch.</member> + </simplelist> + </revdescription> + </revision> <revision> <revnumber>1-2.9</revnumber> <date>Tue Oct 26 2010</date> Added: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/Dash_Workspace.png =================================================================== (Binary files differ) Property changes on: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/Dash_Workspace.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/Dashboard1.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/DeleteNode2.png =================================================================== (Binary files differ) Added: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/FinishAbortButtons.png =================================================================== (Binary files differ) Property changes on: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/FinishAbortButtons.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/MoveUpDown.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/PasteNode3.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/PortalSetting2.5.png =================================================================== (Binary files differ) Added: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/PortalTemplates.png =================================================================== (Binary files differ) Property changes on: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/PortalTemplates.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/Skin1.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Navigation_Nodes.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Navigation_Nodes.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Navigation_Nodes.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -318,7 +318,7 @@ </step> <step> <para> - Select the position that you want to paste this node and select <emphasis role="bold">Paste Node</emphasis> option. Click the mark icon to <emphasis role="bold">Save</emphasis>. + Right click on the position that you want to paste this node to and select <emphasis role="bold">Paste Node</emphasis> option. Click the <emphasis role="bold">Save</emphasis> button. </para> <mediaobject> <imageobject role="html"> @@ -364,7 +364,7 @@ </step> <step> <para> - Select the position that you want to paste this node and select <emphasis role="bold">Paste Node</emphasis> option. Click the mark icon to <emphasis role="bold">Save</emphasis>. + Right click on the position that you want to paste this node to and select <emphasis role="bold">Paste Node</emphasis> option. Click the <emphasis role="bold">Save</emphasis> button. </para> <mediaobject> <imageobject role="html"> @@ -374,9 +374,6 @@ <imagedata fileref="images/PasteNode3.png" format="PNG" align="center" contentwidth="130mm"/> </imageobject> </mediaobject> - <para> - The new pages will appear in the page lists: - </para> <!-- <mediaobject> <imageobject> <imagedata fileref="images/ManagePage2.png" format="PNG" align="center" width="444" /> @@ -409,7 +406,7 @@ </step> <step> <para> - Select the position that you want to paste this node and select <emphasis role="bold">Paste Node</emphasis> option. mark icon to <emphasis role="bold">Save</emphasis>. + Right click on the position that you want to paste this node to and select <emphasis role="bold">Paste Node</emphasis> option. Click the <emphasis role="bold">Save</emphasis> button. </para> <mediaobject> <imageobject role="html"> Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Pages.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Pages.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Pages.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -5,9 +5,7 @@ ]> <section id="sect-User_Guide-Manage_Pages"> <title>Manage Pages</title> - - - <section id="sect-User_Guide-Manage_Pages-Adding_a_new_Page"> + <section id="sect-User_Guide-Manage_Pages-Adding_a_new_Page"> <title>Adding a new Page</title> <section id="sect-User_Guide-Page_Creation_Wizard"> @@ -146,7 +144,7 @@ </step> <step> <para> - Select <emphasis role="bold">Empty Layout</emphasis> or click the icon to see more templates to select. + Select <emphasis role="bold">Empty Layout</emphasis> or click the drop-down arrow at the top of the right pane to see more templates to select. </para> </step> <step> @@ -224,12 +222,9 @@ </para> </step> <step> - - <mediaobject> - <imageobject> - <imagedata fileref="images/PageSetting.png" format="PNG" align="center" scale="100" /> - </imageobject> - </mediaobject> + <para> + The fields in this window are: + </para> <variablelist> <varlistentry> <term><emphasis role="bold">Page Id</emphasis></term> @@ -268,7 +263,7 @@ The name of the current portal is automatically selected for <emphasis role="bold">Owner id</emphasis> ensuring the edit permissions are assigned to users who can edit the current portal. </para> <para> - The name of the page owner. When the owner type is set to <emphasis>group</emphasis>, a list of groups will allow you to select one user as the 'owner'. + When the owner type is set to <emphasis>group</emphasis>, a list of groups will allow you to select one user as the 'owner'. </para> </listitem> </varlistentry> @@ -498,7 +493,7 @@ <procedure> <step> <para> - Go to <emphasis role="bold">Site Editor</emphasis> in the toolbar and click on <emphasis role="bold">Edit Layout</emphasis> It will display : + Mouse over <emphasis role="bold">Site Editor</emphasis> in the toolbar and click on <emphasis role="bold">Edit Layout</emphasis> It will display : </para> <mediaobject> <imageobject role="html"> Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Permission.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Permission.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Permission.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -218,13 +218,10 @@ <para> Click the <emphasis role="bold">Permission Setting</emphasis> tab. </para> - </step> - </procedure> - - <para> - To be able to access a page users have to be in one of the groups that have access permission to that page. There may be several groups that have access rights to a page. A list of the permissions for that page will be shown (provided the <emphasis role="bold">Make it public</emphasis> check-box has not been used). - </para> - <procedure> + <para> + To be able to access a page users have to be in one of the groups that have access permission to that page. There may be several groups that have access rights to a page. A list of the permissions for that page will be shown (provided the <emphasis role="bold">Make it public</emphasis> check-box has not been used). + </para> + </step> <step> <para> Click <emphasis role="bold">Add Permission</emphasis> @@ -256,11 +253,8 @@ <para> The Permission Setting tab is available in two different ways: </para> - - <para> - Via Edit Page: - </para> <procedure> + <title>Via Edit Page:</title> <step> <para> Mouse over <emphasis role="bold">Site Editor</emphasis> on the Toolbar and select <emphasis role="bold">Edit Page</emphasis>. @@ -277,10 +271,8 @@ </para> </step> </procedure> - <para> - Via Page Management: - </para> <procedure> + <title>Via Page Management:</title> <step> <para> Mouse over <emphasis role="bold">Group</emphasis> on the Toolbar, highlight <emphasis role="bold">Administration</emphasis> and click on <emphasis role="bold">Page Management</emphasis>. @@ -295,12 +287,10 @@ <para> Click on the <emphasis role="bold">Permission Setting</emphasis> tab then the <emphasis role="bold">Edit Permission Setting</emphasis> sub tab. </para> + <para> + You will see the <emphasis role="bold">Current Permission</emphasis> listed. + </para> </step> - </procedure> - <para> - You will see the <emphasis role="bold">Current Permission</emphasis> listed. - </para> - <procedure> <step> <para> Click the <emphasis role="bold">Select Permission</emphasis> button to set new or change another group. Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -19,7 +19,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/AddPortal.png" format="PNG" align="center" scale="100" /> + <imagedata fileref="images/AddPortal.png" format="PNG" align="center" scale="90" /> </imageobject> <imageobject role="fo"> <imagedata fileref="images/AddPortal.png" format="PNG" align="center" contentwidth="150mm" /> @@ -28,11 +28,11 @@ </step> <step> <para> - This opens the <emphasis role="bold">Create New Portal</emphasis> window which contains the <emphasis role="bold">Portal Setting</emphasis> tab. + This opens the <emphasis role="bold">Create New Portal</emphasis> window. </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/PortalSetting2.5.png" format="PNG" align="center" scale="100" /> + <imagedata fileref="images/PortalSetting2.5.png" format="PNG" align="center" scale="90" /> </imageobject> <imageobject role="fo"> <imagedata fileref="images/PortalSetting2.5.png" format="PNG" align="center" contentwidth="150mm" /> @@ -40,7 +40,26 @@ </mediaobject> </step> + <step> + <para> + The first tab in the window is the <emphasis role="bold">Portal Templates</emphasis> tab. This tab lets you choose a template for the new portal from templates that are saved in the installation. + </para> + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/PortalTemplates.png" format="PNG" align="center" scale="90" /> + </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/PortalTemplates.png" format="PNG" align="center" contentwidth="150mm" /> + </imageobject> + </mediaobject> + <para> + Click this tab if you have custom templates stored, or if you wish to use a default template for your portal. + </para> + </step> <step> + <para> + Click the next <emphasis role="bold">Portal Setting</emphasis> tab to configure some aspects of the new portal. + </para> <para> Enter a string for the <emphasis role="bold">Portal Name</emphasis> field. This field is required and must be unique. Only alphabetical, numerical and underscore characters are allowed for this field and the name must have at least 3 characters. </para> @@ -118,18 +137,18 @@ </step> </procedure> <para> - You also can edit or delete a portal. See <xref linkend="sect-User_Guide-Manage_Portals-Edit_a_Portal" /> or <xref linkend="sect-User_Guide-Manage_Portals-Delete_a_Portal" /> for more details. + You also can edit or delete a portal. See <xref linkend="sect-User_Guide-Manage_Portals-Access_a_Portal" /> or <xref linkend="sect-User_Guide-Manage_Portals-Delete_a_Portal" /> for more details. </para> </section> - <section id="sect-User_Guide-Manage_Portals-Edit_a_Portal"> - <title>Edit a Portal</title> + <section id="sect-User_Guide-Manage_Portals-Access_a_Portal"> + <title>Access a Portal</title> <para> - An administrator can change many aspects of a portal: + An administrator can easily access numerous portals running in the &PRODUCT; instance. </para> <para> - Click <emphasis role="bold">Site</emphasis> on the Toolbar. A list of active portals will appear: + To access a portal, click <emphasis role="bold">Site</emphasis> on the Toolbar. A list of active portals will appear: </para> <mediaobject> <imageobject role="html"> @@ -166,7 +185,7 @@ </imageobject> </mediaobject> <para> - Elements already in place in the portal body can be rearranged or removed as required. Use the relevent button in the overlay that appears when you mouse-over each element: + Elements already in place in the portal body can be rearranged or removed as required. Use the relevent button in the overlay that appears when you mouse over each element: </para> <mediaobject> <imageobject role="html"> @@ -176,6 +195,9 @@ <imagedata fileref="images/EditLayout3.png" format="PNG" align="center" contentwidth="150mm" /> </imageobject> </mediaobject> + <para> + Click the <guilabel>Finish</guilabel> or <guilabel>Abort</guilabel> buttons on the <emphasis role="bold">Edit Inline Composer</emphasis> window to save or discard your changes. <inlinemediaobject><imageobject><imagedata fileref="images/FinishAbortButtons.png"/></imageobject></inlinemediaobject> + </para> </section> @@ -197,7 +219,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/NavigationManagement.png" format="PNG" align="center" scale="100" /> + <imagedata fileref="images/NavigationManagement.png" format="PNG" align="center" scale="90" /> </imageobject> <imageobject role="fo"> <imagedata fileref="images/NavigationManagement.png" format="PNG" align="center" contentwidth="150mm" /> @@ -327,7 +349,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/Skin1.png" format="PNG" scale="100"/> + <imagedata fileref="images/Skin1.png" format="PNG" scale="90"/> </imageobject> <imageobject role="fo"> <imagedata fileref="images/Skin1.png" format="PNG" contentwidth="120mm"/> @@ -336,7 +358,7 @@ </step> <step> <para> - Click <emphasis role="bold">Save</emphasis> then <emphasis role="bold">Finish</emphasis>. + Click <emphasis role="bold">Save</emphasis> to <emphasis role="bold">Finish</emphasis>. </para> </step> </procedure> Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Toolbar.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Toolbar.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Toolbar.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -97,14 +97,31 @@ <term> <emphasis role="bold">Editor</emphasis></term> <listitem> <para> - Portal Administrators have access to another navigation that allows them to; add a new page to the current portal, edit a particular page's properties or to change a page's layout. + Portal Administrators have access to another navigation that allows them to; </para> + <itemizedlist> + <listitem> + <para> + Add a new page to the current portal. + </para> + </listitem> + <listitem> + <para> + Edit a particular page's properties. + </para> + </listitem> + <listitem> + <para> + Change a page's layout. + </para> + </listitem> + </itemizedlist> <para> This navigation appears next to the Dashboard navigation in the Toolbar and is contextually-named. It will appear as either <emphasis role="bold">Site Editor</emphasis>, <emphasis role="bold">Dashboard Editor</emphasis> or <emphasis role="bold">Group Editor</emphasis> depending on the user's location within the portal. </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/EditorPortlet.png" format="PNG" align="center" scale="100"/> + <imagedata fileref="images/EditorPortlet.png" format="PNG" align="center" scale="90"/> </imageobject> <imageobject role="fo"> <imagedata fileref="images/EditorPortlet.png" format="PNG" align="center" contentwidth="130mm"/> Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/User_Management.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/User_Management.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/User_Management.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -23,7 +23,7 @@ </imageobject> </mediaobject> <para> - Administrators can see all existing registered users and search, edit or even delete them. Each user's groups and memberships (roles) in these groups are also available. You can not add users to a group but you can remove them from the group. + Administrators can see all existing registered users and search, edit or even delete them. Each user's groups and memberships (roles) in these groups are also available. </para> @@ -35,7 +35,7 @@ <procedure> <step> <para> - Mouse-over <emphasis role="bold">Group</emphasis> in the <emphasis role="bold">Toolbar</emphasis>. + Mouse over <emphasis role="bold">Group</emphasis> in the <emphasis role="bold">Toolbar</emphasis>. </para> </step> <step> @@ -54,7 +54,7 @@ </imageobject> </mediaobject> <para> - This window has two tabs; <emphasis role="bold">Account Settings</emphasis> and <emphasis role="bold">User Profile</emphasis>. + This window has two tabs; <emphasis role="bold">Account Setting</emphasis> and <emphasis role="bold">User Profile</emphasis>. </para> </step> <step> Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -73,6 +73,14 @@ <para> The Dashboard Workspace lists all available gadgets. Four gadgets are provided by default with &PRODUCT;, however you can add many more. </para> + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/Dash_Workspace.png" format="PNG" align="center" scale="100" /> + </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/Dash_Workspace.png" format="PNG" align="center" contentwidth="150mm" /> + </imageobject> + </mediaobject> <variablelist id="vari-User_Guide-Using_the_Dashboard_Workspace-Default_Gadgets"> <title>Default Gadgets:</title> <varlistentry> Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/terms/Navigation_concept.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/terms/Navigation_concept.xml 2010-12-08 15:48:11 UTC (rev 5511) +++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/terms/Navigation_concept.xml 2010-12-09 03:02:08 UTC (rev 5512) @@ -56,19 +56,30 @@ </para> </listitem> </varlistentry> + <varlistentry> + <term>Dashboard Editor</term> + <listitem> + <para> + The <emphasis role="bold">Dashboard Editor</emphasis> navigation appears when a user is on their dashboard page. + </para> + <para> + The user can add multiple dashboard in new tabs and then edit the layout and content of those dashboards. + </para> + </listitem> + </varlistentry> </variablelist> <para> When logged in as an Administrator, a fourth navigation appears in the Toolbar: </para> <variablelist> <varlistentry> - <term>Site/Group/Dashboard Editor</term> + <term>Site/Group Editor</term> <listitem> <para> - This navigation appears as either <emphasis role="bold">Site Editor</emphasis>, <emphasis role="bold">Group Editor</emphasis> or <emphasis>Dashboard Editor</emphasis> depending on the administrator's location within the portal. + This navigation appears as either <emphasis role="bold">Site Editor</emphasis> or <emphasis role="bold">Group Editor</emphasis> depending on the administrator's location within the portal. </para> <para> - When in areas of the portal displaying content, the navigation shows as <emphasis role="bold">Site Editor</emphasis>, in areas pertaining to users the navigation shows as <emphasis role="bold">Group Editor</emphasis> and when in the Dashboard it appears as <emphasis>Dashboard Editor</emphasis>. + When in areas of the portal displaying content, the navigation shows as <emphasis role="bold">Site Editor</emphasis> and in areas pertaining to users the navigation shows as <emphasis role="bold">Group Editor</emphasis>. </para> <para> This navigation contains links to add a new pages to the portal, to edit a page or to change the portal's layout. Administrators can use these links to manage the portal.