Author: smumford Date: 2010-12-08 23:55:59 -0500 (Wed, 08 Dec 2010) New Revision: 5514 Modified: 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/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/JCR/statistics.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default1.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default2.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default4.xml 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/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/JCR/statistics.xml Log: Fixed further QA feedback issues (kernel_1_0.xsd references and updated code from conf/common/common.configuration.xml Modified: 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/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.xml 2010-12-09 04:08:54 UTC (rev 5513) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.xml 2010-12-09 04:55:59 UTC (rev 5514) @@ -129,69 +129,4 @@ <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 + </workspace> \ 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-09 04:08:54 UTC (rev 5513) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration/default95.xml 2010-12-09 04:55:59 UTC (rev 5514) @@ -10,18 +10,4 @@ <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>--> + </component> \ No newline at end of file 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-09 04:08:54 UTC (rev 5513) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default96.xml 2010-12-09 04:55:59 UTC (rev 5514) @@ -89,87 +89,4 @@ </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 + </component> \ 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-09 04:08:54 UTC (rev 5513) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default97.xml 2010-12-09 04:55:59 UTC (rev 5514) @@ -86,80 +86,4 @@ <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> -</jboss-identity> ---> \ No newline at end of file +</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-09 04:08:54 UTC (rev 5513) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default101.xml 2010-12-09 04:55:59 UTC (rev 5514) @@ -29,38 +29,4 @@ </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> - <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>exo</string></value> - <value><string>root</string></value> - <value><string>company</string></value> - <value><string>community</string></value> - </collection> - </field> - </object> - </object-param> - </init-params> -</component-plugin> --> + </component-plugin> \ No newline at end of file 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-09 04:08:54 UTC (rev 5513) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default99.xml 2010-12-09 04:55:59 UTC (rev 5514) @@ -34,42 +34,4 @@ </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> --> +</field> \ No newline at end of file Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml 2010-12-09 04:08:54 UTC (rev 5513) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml 2010-12-09 04:55:59 UTC (rev 5514) @@ -270,20 +270,7 @@ </para> <programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_statistics/default88.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> - <!-- <programlisting language="XML" role="XML"><![CDATA[<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> -<type>org.exoplatform.services.jcr.statistics.JCRAPIAspectConfig</type> -<init-params> -<values-param> -<name>targetInterfaces</name> -<value>org.exoplatform.services.jcr.core.ExtendedSession</value> -<value>org.exoplatform.services.jcr.core.ExtendedNode</value> -<value>javax.jcr.Property</value> -</values-param> -</init-params> -</component> -</configuration>]]></programlisting> --> + <para> The file content below is the content of <emphasis>META-INF/aop.xml</emphasis> that will also need to be modified to add or remove interfaces to monitor in the expression filter of the pointcut called <emphasis>JCRAPIPointcut</emphasis>. </para> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default.xml 2010-12-09 04:08:54 UTC (rev 5513) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default.xml 2010-12-09 04:55:59 UTC (rev 5514) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <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"> + 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.database.HibernateService</key> <type>org.exoplatform.services.database.impl.HibernateServiceImpl</type> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default1.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default1.xml 2010-12-09 04:08:54 UTC (rev 5513) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default1.xml 2010-12-09 04:55:59 UTC (rev 5514) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <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"> + 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"> <external-component-plugins> <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default2.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default2.xml 2010-12-09 04:08:54 UTC (rev 5513) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default2.xml 2010-12-09 04:55:59 UTC (rev 5514) @@ -1,7 +1,7 @@ <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"> + 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"> <import>war:/conf/sample-ext/jcr/jcr-configuration.xml</import> <import>war:/conf/sample-ext/portal/portal-configuration.xml</import> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default4.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default4.xml 2010-12-09 04:08:54 UTC (rev 5513) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default4.xml 2010-12-09 04:55:59 UTC (rev 5514) @@ -1,12 +1,10 @@ <component> - <key>org.exoplatform.services.naming.InitialContextInitializer</key> - <type>org.exoplatform.services.naming.InitialContextInitializer</type> - <init-params> - <properties-param> - <name>default-properties</name> - <description>Default initial context properties</description> - <property name="java.naming.factory.initial" - value="org.exoplatform.services.naming.SimpleContextFactory" /> - </properties-param> - </init-params> + <key>org.exoplatform.services.naming.InitialContextInitializer</key> + <type>org.exoplatform.commons.InitialContextInitializer2</type> + <init-params> + <properties-param> + <name>default-properties</name> + <description>Default initial context properties</description> + </properties-param> + </init-params> </component> Modified: 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/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.xml 2010-12-09 04:08:54 UTC (rev 5513) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default39.xml 2010-12-09 04:55:59 UTC (rev 5514) @@ -129,69 +129,4 @@ <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 + </workspace> \ 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-09 04:08:54 UTC (rev 5513) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration/default95.xml 2010-12-09 04:55:59 UTC (rev 5514) @@ -10,18 +10,4 @@ <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>--> + </component> \ No newline at end of file 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-09 04:08:54 UTC (rev 5513) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default96.xml 2010-12-09 04:55:59 UTC (rev 5514) @@ -89,87 +89,4 @@ </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 + </component> \ 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-09 04:08:54 UTC (rev 5513) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default97.xml 2010-12-09 04:55:59 UTC (rev 5514) @@ -86,80 +86,4 @@ <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> -</jboss-identity> ---> \ No newline at end of file +</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-09 04:08:54 UTC (rev 5513) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default101.xml 2010-12-09 04:55:59 UTC (rev 5514) @@ -29,38 +29,4 @@ </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> - <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>exo</string></value> - <value><string>root</string></value> - <value><string>company</string></value> - <value><string>community</string></value> - </collection> - </field> - </object> - </object-param> - </init-params> -</component-plugin> --> + </component-plugin> \ No newline at end of file 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-09 04:08:54 UTC (rev 5513) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default99.xml 2010-12-09 04:55:59 UTC (rev 5514) @@ -35,41 +35,3 @@ ... </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> --> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml 2010-12-09 04:08:54 UTC (rev 5513) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml 2010-12-09 04:55:59 UTC (rev 5514) @@ -270,20 +270,7 @@ </para> <programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_statistics/default88.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> - <!-- <programlisting language="XML" role="XML"><![CDATA[<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> -<type>org.exoplatform.services.jcr.statistics.JCRAPIAspectConfig</type> -<init-params> -<values-param> -<name>targetInterfaces</name> -<value>org.exoplatform.services.jcr.core.ExtendedSession</value> -<value>org.exoplatform.services.jcr.core.ExtendedNode</value> -<value>javax.jcr.Property</value> -</values-param> -</init-params> -</component> -</configuration>]]></programlisting> --> + <para> The file content below is the content of <emphasis>META-INF/aop.xml</emphasis> that will also need to be modified to add or remove interfaces to monitor in the expression filter of the pointcut called <emphasis>JCRAPIPointcut</emphasis>. </para>