Author: aakanksha_writer Date: 2013-01-28 16:33:22 -0500 (Mon, 28 Jan 2013) New Revision: 9091 Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/Advanced/Foundations/Advanced_Concepts.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/Advanced/Foundations/Kernel.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/Advanced/Foundations/Profiles.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/Advanced/Foundations/Specific_Services.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PasswordEncryption.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/GadgetDevelopment/Gadgets.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/Introduction.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/PortalDevelopment/DataImportStrategy.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/ServerIntegration.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/WSRP.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/core/ldap-configuration.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/core/spring-security-integration.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr-with-gatein.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/backup/use-external-backup-tool.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/concepts/jcr-exo-implementation.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/exo-jcr-configuration.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/jdbc-data-container-config.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/multilanguage-support.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/search-configuration.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/jbosscache-configuration-templates.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/jca.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/other/acl-ext.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/other/binary-values-processing.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/other/link-producer.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/performance-tuning-guide.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/query-handler-config.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/ws/framework-for-cross-domain-ajax.xml epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/ws/groovy-scripts-as-rest-services.xml Log: Cleanup Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/Advanced/Foundations/Advanced_Concepts.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/Advanced/Foundations/Advanced_Concepts.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/Advanced/Foundations/Advanced_Concepts.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -6,7 +6,7 @@ <section id="sect-Reference_Guide-Advanced_concepts_for_the_PortalContainers"> <title>Advanced concepts for the <emphasis>PortalContainers</emphasis></title> <para> - Since eXo JCR 1.12, we added a set of new features that have been designed to extend portal applications such as GateIn. + Since eXo JCR 1.12, we added a set of new features that have been designed to extend portal applications such as JBoss Portal Platform. </para> <section id="sect-Reference_Guide-Advanced_concepts_for_the_PortalContainers-Add_new_configuration_files_from_a_WAR_file"> <title>Add new configuration files from a WAR file</title> @@ -38,7 +38,7 @@ <para> <note> <para> - In GateIn, the <envar>PortalContainerCreator</envar> is already managed by the file <emphasis>starter.war/ear.</emphasis> + In JBoss Portal Platform, the <envar>PortalContainerCreator</envar> is already managed by the file <emphasis>starter.war/ear.</emphasis> </para> </note> @@ -172,7 +172,7 @@ </table> <note> <para> - All the value of the parameters marked with a (*) can be defined thanks to System properties like any values in configuration files but also thanks to variables loaded by the <emphasis>PropertyConfigurator</emphasis>. For example in GateIn by default, it would be all the variables defined in the file <emphasis>configuration.properties</emphasis>. + All the value of the parameters marked with a (*) can be defined thanks to System properties like any values in configuration files but also thanks to variables loaded by the <emphasis>PropertyConfigurator</emphasis>. For example in JBoss Portal Platform by default, it would be all the variables defined in the file <emphasis>configuration.properties</emphasis>. </para> </note> <para> @@ -455,7 +455,7 @@ </table> <note> <para> - All the value of the parameters marked with a (*) can be defined thanks to System properties like any values in configuration files but also thanks to variables loaded by the <emphasis>PropertyConfigurator</emphasis>. For example in GateIn by default, it would be all the variables defined in the file <emphasis>configuration.properties</emphasis>. + All the value of the parameters marked with a (*) can be defined thanks to System properties like any values in configuration files but also thanks to variables loaded by the <emphasis>PropertyConfigurator</emphasis>. For example in JBoss Portal Platform by default, it would be all the variables defined in the file <emphasis>configuration.properties</emphasis>. </para> </note> <para> @@ -650,7 +650,7 @@ </table> <note> <para> - All the value of the parameters marked with a (*) can be defined thanks to System properties like any values in configuration files but also thanks to variables loaded by the <emphasis>PropertyConfigurator</emphasis>. For example in GateIn by default, it would be all the variables defined in the file <emphasis>configuration.properties</emphasis>. + All the value of the parameters marked with a (*) can be defined thanks to System properties like any values in configuration files but also thanks to variables loaded by the <emphasis>PropertyConfigurator</emphasis>. For example in JBoss Portal Platform by default, it would be all the variables defined in the file <emphasis>configuration.properties</emphasis>. </para> </note> <para> @@ -968,7 +968,7 @@ </table> <note> <para> - All the value of the parameters marked with a (*) can be defined thanks to System properties like any values in configuration files but also thanks to variables loaded by the <emphasis>PropertyConfigurator</emphasis>. For example in GateIn by default, it would be all the variables defined in the file <emphasis>configuration.properties</emphasis>. + All the value of the parameters marked with a (*) can be defined thanks to System properties like any values in configuration files but also thanks to variables loaded by the <emphasis>PropertyConfigurator</emphasis>. For example in JBoss Portal Platform by default, it would be all the variables defined in the file <emphasis>configuration.properties</emphasis>. </para> </note> <para> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/Advanced/Foundations/Kernel.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/Advanced/Foundations/Kernel.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/Advanced/Foundations/Kernel.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -14,6 +14,8 @@ <para> In this system, services are not responsible for the instantiation of the components on which they depend. It prevents objects creating the instances of any objects referenced. This task is delegated to the container. The below image illustrates this: </para> +<figure> + <title id="IOC.">Inversion of Control</title> <mediaobject> <imageobject role="html"> <imagedata width="444" align="center" fileref="images/Advanced/Foundations/ioc.png" format="PNG"/> @@ -22,6 +24,7 @@ <imagedata width="444" align="center" fileref="images/Advanced/Foundations/ioc.png" format="PNG"/> </imageobject> </mediaobject> +</figure> <para> There are two ways to inject a dependency : </para> @@ -70,6 +73,8 @@ </listitem> </itemizedlist> <para> +<figure> + <title id="Portalcontainers">Portal Containers</title> <mediaobject> <imageobject role="html"> <imagedata width="444" align="center" scale="100" fileref="images/Advanced/Foundations/PortalContainers.png" format="PNG"/> @@ -78,6 +83,7 @@ <imagedata width="444" contentwidth="150mm" align="center" fileref="images/Advanced/Foundations/PortalContainers.png" format="PNG"/> </imageobject> </mediaobject> +</figure> </para> <para> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/Advanced/Foundations/Profiles.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/Advanced/Foundations/Profiles.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/Advanced/Foundations/Profiles.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -13,10 +13,10 @@ <para> An active profile list is obtained during the boot of the root container and is composed of the system property <emphasis>exo.profiles</emphasis> sliced according the &quot;,&quot; delimiter and also a server specific profile value (tomcat for tomcat, jboss for jboss, etc...). </para> - <programlisting># runs GateIn on Tomcat with the profiles tomcat and foo -sh gatein.sh -Dexo.profiles=foo + <programlisting># runs JBoss Portal Platform on Tomcat with the profiles tomcat and foo +sh JBoss Portal Platform.sh -Dexo.profiles=foo -# runs GateIn on JBoss with the profiles jboss, foo and bar +# runs JBoss Portal Platform on JBoss with the profiles jboss, foo and bar sh run.sh -Dexo.profiles=foo,bar</programlisting> </section> <section id="sect-Reference_Guide-Runtime_configuration_profiles-Profiles_configuration"> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/Advanced/Foundations/Specific_Services.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/Advanced/Foundations/Specific_Services.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/Advanced/Foundations/Specific_Services.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -335,7 +335,7 @@ </para> </note> <para> - Work with <classname>JobSchedulerService</classname> by creating a sample project and use GateIn-3.1.0-GA for testing. + Work with <classname>JobSchedulerService</classname> by creating a sample project and use JBoss Portal Platform for testing. </para> <para> Firstly, create a project by using maven archetype plug-in: @@ -550,10 +550,10 @@ &lt;/external-component-plugins&gt; &lt;/configuration&gt;</programlisting> <para> - <emphasis role="italic">mvn clean install </emphasis>the project. Copy .jar file to<emphasis role="italic"> lib</emphasis> in tomcat bundled with GateIn-3.1.0-GA. Run <emphasis role="italic">bin/gatein.sh</emphasis> to see the <emphasis role="italic">DumbJob</emphasis> to be executed on the terminal when portal containers are initialized. Please look at the terminal to see the log message of <emphasis role="italic">DumbJob</emphasis>. + <emphasis role="italic">mvn clean install </emphasis>the project. Copy .jar file to<emphasis role="italic"> lib</emphasis> in tomcat bundled with JBoss Portal Platform 6. Run <emphasis role="italic">bin/gatein.sh</emphasis> to see the <emphasis role="italic">DumbJob</emphasis> to be executed on the terminal when portal containers are initialized. Please look at the terminal to see the log message of <emphasis role="italic">DumbJob</emphasis>. </para> <para> - From now on, you can easily create any job to be executed in GateIn&apos;s portal by defining your job and configuring it. + From now on, you can easily create any job to be executed in JBoss Portal Platform&apos;s portal by defining your job and configuring it. </para> </section> </section> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -5,6 +5,7 @@ ]> <chapter id="sect-Reference_Guide-PicketLink_IDM_integration"> <title>PicketLink IDM integration</title> +<remark> Source https://docs.jboss.org/author/display/GTNPORTAL35/PicketLink+IDM+integrat... <para> JBoss Portal Platform uses the <literal>PicketLink IDM</literal> component to store necessary identity information about users, groups and memberships. While legacy interfaces are still used (<literal>org.exoplatform.services.organization</literal>) for identity management, there is a wrapper implementation that delegates to PicketLink IDM framework. </para> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PasswordEncryption.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PasswordEncryption.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PasswordEncryption.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -7,6 +7,7 @@ <title>Password Encryption</title> <section id="sid-54264610_PasswordEncryption-HashingandsaltingofpasswordsinPicketlinkIDM"> <title>Hashing and salting of passwords in Picketlink IDM</title> +<remark>Source: https://docs.jboss.org/author/display/GTNPORTAL35/Password+Encryption<... <para> JBoss Portal Platform is using <ulink url="http://www.jboss.org/picketlink/IDM">Picketlink IDM</ulink> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -6,6 +6,7 @@ ]> <chapter id="sect-Reference_Guide-Predefined_User_Configuration"> <title>Predefined User Configuration</title> +<remark>https://docs.jboss.org/author/display/GTNPORTAL35/Predefined+User+Configuration</remark> <para> The initial Organization configuration should be specified by editing the content of <filename><replaceable>JPP_DIST</replaceable>/gatein/gatein.ear/portal.war:/WEB-INF/conf/organization/organization-configuration.xml</filename>. This file uses the portal XML configuration schema. It lists several configuration plug-ins. </para> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/GadgetDevelopment/Gadgets.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/GadgetDevelopment/Gadgets.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/GadgetDevelopment/Gadgets.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -18,6 +18,8 @@ <section id="sect-Reference_Guide-Concept-Existing_Gadgets"> <title>Existing Gadgets</title> +<figure> +<title id="Liste">Liste</title> <mediaobject> <imageobject role="html"> <imagedata align="center" fileref="images/GadgetDevelopment/Liste.png" format="PNG" scale="130" width="444" /> @@ -27,11 +29,14 @@ </imageobject> </mediaobject> +</figure> </section> <section id="sect-Reference_Guide-Concept-Create_a_new_Gadget"> <title>Create a new Gadget</title> +<figure> +<title id="newgardgetdevelopment">New Gadget Development</title> <mediaobject> <imageobject role="html"> <imagedata align="center" fileref="images/GadgetDevelopment/New.png" format="PNG" scale="130" width="444" /> @@ -41,6 +46,7 @@ </imageobject> </mediaobject> +</figure> </section> @@ -49,6 +55,8 @@ <para> This is the reference to a remote gadget (stock one). </para> + <figure> + <title id="import">Import Gadget</title> <mediaobject> <imageobject role="html"> <imagedata align="center" fileref="images/GadgetDevelopment/Import.png" format="PNG" scale="130" width="444" /> @@ -58,6 +66,7 @@ </imageobject> </mediaobject> + </figure> </section> @@ -66,6 +75,8 @@ <para> After referencing the gadget successfully, then import it into the local repository. </para> + <figure> + <title id="Imported">Gadget Importing</title> <mediaobject> <imageobject role="html"> <imagedata align="center" fileref="images/GadgetDevelopment/Imported.png" format="PNG" scale="130" width="444" /> @@ -75,6 +86,7 @@ </imageobject> </mediaobject> + </figure> </section> @@ -83,6 +95,8 @@ <para> Edit it from the Web the imported Gadget to modify it: </para> + <figure> + <title id="gadetwebediting">Gadget Web Importing</title> <mediaobject> <imageobject role="html"> <imagedata align="center" fileref="images/GadgetDevelopment/EditImportedOnline.png" format="PNG" scale="130" width="444" /> @@ -92,6 +106,7 @@ </imageobject> </mediaobject> + </figure> </section> @@ -100,6 +115,8 @@ <para> Edit it from your IDE thanks to the WebDAV protocol: </para> + <figure> + <title id="gadgetideediting">Gadget IDE Editing</title> <mediaobject> <imageobject role="html"> <imagedata align="center" fileref="images/GadgetDevelopment/EditImportedWebDAV.png" format="PNG" scale="130" width="444" /> @@ -109,6 +126,7 @@ </imageobject> </mediaobject> + </figure> </section> @@ -117,6 +135,8 @@ <para> View it from the Dashboard when you drag and drop the Gadget from listing to the dashboard. </para> + <figure> + <title id="Dashboard">Dashboard Viewing</title> <mediaobject> <imageobject role="html"> <imagedata align="center" fileref="images/GadgetDevelopment/Dashboard.png" format="PNG" scale="130" width="444" /> @@ -126,7 +146,7 @@ </imageobject> </mediaobject> - + </figure> </section> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/Introduction.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/Introduction.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/Introduction.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -8,6 +8,8 @@ <para> JBoss Portal Platform is based on the GateIn project, which is the merge of two mature Java projects: JBoss Portal and eXo Portal. This new community project takes the best of both offerings and incorporates them into a single portal framework. The aim is to provide an intuitive user-friendly portal, and a framework to address the needs of today&apos;s Web 2.0 applications. </para> +<figure> +<title id="Frontpage">Front Page</title> <mediaobject> <imageobject role="html"> <imagedata width="444" align="center" scale="100" fileref="images/Common/Frontpage.png" format="PNG"/> @@ -16,6 +18,7 @@ <imagedata width="444" contentwidth="150mm" align="center" fileref="images/Common/Frontpage.png" format="PNG"/> </imageobject> </mediaobject> +</figure> <para> This book provides a deep-dive information about installation and configuration of the services provided by JBoss Portal Platform. </para> @@ -36,6 +39,8 @@ <para> Links to non-technical documents are included on the front page of the portal: </para> +<figure> +<title id="nontechdocs">Non-technical documentation</title> <mediaobject> <imageobject role="html"> <imagedata width="444" align="center" scale="90" fileref="images/Common/Non-tech-docs.png" format="PNG"/> @@ -44,6 +49,7 @@ <imagedata width="444" contentwidth="130mm" align="center" fileref="images/Common/Non-tech-docs.png" format="PNG"/> </imageobject> </mediaobject> +</figure> </listitem> </varlistentry> <varlistentry> @@ -52,6 +58,8 @@ <para> A link to <ulink url="http://vimeo.com/channels/gatein" type="http">videos</ulink> related to the JBoss Portal Platform is also included on the front page: </para> +<figure> +<title id="videos">Videos</title> <mediaobject> <imageobject role="html"> <imagedata width="444" align="center" scale="90" fileref="images/Common/Videos.png" format="PNG"/> @@ -60,6 +68,7 @@ <imagedata width="444" contentwidth="130mm" align="center" fileref="images/Common/Videos.png" format="PNG"/> </imageobject> </mediaobject> +</figure> </listitem> </varlistentry> </variablelist> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/PortalDevelopment/DataImportStrategy.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/PortalDevelopment/DataImportStrategy.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/PortalDevelopment/DataImportStrategy.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -8,7 +8,7 @@ <section id="sect-Reference_Guide-Data_Import_Strategy-Introduction"> <title>Introduction</title> <para> - In the Portal extension mechanism, developers can define an extension that Portal data can be customized by. There are several cases when it is useful to be able to define how to customize the Portal data; for example modifying, overwriting or just inserting data into the data defined by the Portal. Therefore, GateIn also defines several modes for each case so that the developer only need to clarify the use-case and configure the extensions. + In the Portal extension mechanism, developers can define an extension that Portal data can be customized by. There are several cases when it is useful to be able to define how to customize the Portal data; for example modifying, overwriting or just inserting data into the data defined by the Portal. Therefore, JBoss Portal Platform also defines several modes for each case so that the developer only need to clarify the use-case and configure the extensions. </para> <para> This section shows you how data are changes in each mode. @@ -93,7 +93,7 @@ </listitem> </itemizedlist> <para> - In the GateIn navigation structure, each navigation can be referred to a tree which each node links to a page content. Each node contains some description data, such as label, icon, page reference, and more. Therefore, GateIn provides a way to insert or merge new data to the initiated navigation tree or a sub-tree. + In the JBoss Portal Platform navigation structure, each navigation can be referred to a tree which each node links to a page content. Each node contains some description data, such as label, icon, page reference, and more. Therefore, JBoss Portal Platform provides a way to insert or merge new data to the initiated navigation tree or a sub-tree. </para> <para> The merge strategy performs the recursive comparison of child nodes between the existing persistent nodes of a navigation and the transient nodes provided by a descriptor: @@ -134,11 +134,14 @@ &lt;/node&gt; &lt;/page-nodes&gt; &lt;/node-navigation&gt;</programlisting> - <mediaobject> +<figure> + <title id="DataImportStrategy-navigation1">Data Import Strategy Navigation1</title> + <mediaobject> <imageobject> <imagedata width="444" align="center" fileref="images/DataImportStrategy/navigation1.png" format="PNG"/> </imageobject> </mediaobject> +</figure> <programlisting language="XML" role="XML">&lt;node-navigation&gt; &lt;page-nodes&gt; &lt;node&gt; @@ -151,11 +154,14 @@ &lt;/node&gt; &lt;/page-nodes&gt; &lt;/node-navigation&gt;</programlisting> - <mediaobject> +<figure> + <title id="DataImportStrategy-navigation2">Data Import Strategy Navigation2</title> +<mediaobject> <imageobject> <imagedata width="444" align="center" fileref="images/DataImportStrategy/navigation2.png" format="PNG"/> </imageobject> </mediaobject> +</figure> <para> For example, the <emphasis>navigation1</emphasis> is loaded before <emphasis>navigation2</emphasis>. The Navigation Importer processes on two navigation definitions, depending on the Import Mode defined in portal configuration. </para> @@ -167,7 +173,9 @@ <para> With the <literal>CONSERVE</literal> mode, data are only imported when they do not exist. So, if the navigation has been created by the <emphasis>navigation1</emphasis> definition, the <emphasis>navigation2</emphasis> definition does not affect anything on it. We have the result as following </para> - <mediaobject> +<figure> +<title id="DataImportStrategy-navigation_1">Data Import Strategy Navigation1</title> + <mediaobject> <imageobject role="html"> <imagedata align="center" fileref="images/DataImportStrategy/navigation1.png" format="PNG"/> </imageobject> @@ -175,6 +183,7 @@ <imagedata width="100mm" align="center" fileref="images/DataImportStrategy/navigation1.png" format="PNG"/> </imageobject> </mediaobject> +</figure> </listitem> </varlistentry> <varlistentry> @@ -183,11 +192,14 @@ <para> If a node does not exist, the importer will add new nodes to the navigation tree. You will see the following result: </para> +<figure> +<title id="DataImportStrategy-navigationInsert">Data Import Strategy Navigation_Insert</title> <mediaobject> <imageobject> <imagedata width="444" align="center" fileref="images/DataImportStrategy/navigation_insert.png" format="PNG"/> </imageobject> </mediaobject> +</figure> <para> Hereafter, the node &apos;bar&apos; is added to the navigation tree, because it does not exist in the initiated data. Other nodes are kept in the import process. </para> @@ -199,11 +211,14 @@ <para> The <literal>MERGE</literal> mode indicates that a new node is added to the navigation tree, and updates the node data (such node label and node icon in the example) if it exists. </para> +<figure> +<title id="DataImportStrategy-navigationmerge">Data Import Strategy Navigation_Merge</title> <mediaobject> <imageobject> <imagedata width="444" align="center" fileref="images/DataImportStrategy/navigation_merge.png" format="PNG"/> </imageobject> </mediaobject> +</figure> </listitem> </varlistentry> <varlistentry> @@ -212,11 +227,14 @@ <para> Everything will be destroyed and replaced with new data if the <literal>OVERWRITE</literal> mode is used. </para> +<figure> +<title id="DataImportStrategy-navigation_2">Data Import Strategy Navigation_2</title> <mediaobject> <imageobject> <imagedata width="444" align="center" fileref="images/DataImportStrategy/navigation2.png" format="PNG"/> </imageobject> </mediaobject> +</figure> </listitem> </varlistentry> </variablelist> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -5,6 +5,7 @@ ]> <chapter id="chap-Reference_Guide-Portal_Navigation_Configuration"> <title>Portal Navigation Configuration</title> +<remark>Source: https://docs.jboss.org/author/display/GTNPORTAL35/Portal+Navigation+Confi... <section id="sect-Reference_Guide-Portal_Navigation_Configuration-Overview"> <title>Overview</title> <para> @@ -28,7 +29,7 @@ </listitem> </itemizedlist> <para> - These navigations are configured using the standard XML syntax in the file: <filename>portal.war/WEB-INF/conf/portal/portal-configuration.xml</filename>. + These navigators are configured using the standard XML syntax in the file: <filename>portal.war/WEB-INF/conf/portal/portal-configuration.xml</filename>. </para> <programlisting language="XML" role="XML"><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../extras/PortalDevelopment_DefaultPortalNavigationConfiguration/default144.xml" parse="text"/></programlisting> <para> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -244,6 +244,9 @@ <para> It is recommended that preview icons of any other skins are included when creating a new portal skin and that the other skins are updated with your new portal skin preview. </para> + +<figure> +<title id="portal-change-skin">Portal_Skin_Change</title> <mediaobject> <imageobject role="html"> <imagedata width="444" align="center" scale="100" fileref="images/PortalDevelopment/Skinning/portal-change-skin.png" format="PNG"/> @@ -252,6 +255,7 @@ <imagedata width="444" contentwidth="150mm" align="center" fileref="images/PortalDevelopment/Skinning/portal-change-skin.png" format="PNG"/> </imageobject> </mediaobject> +</figure> <para> The portal skin preview icon is specified through the CSS of the portal skin. In order for the current portal skin to be able to display the preview it must specify a specific CSS class and set the icon as the background. </para> @@ -273,6 +277,8 @@ <para> Window styles are the CSS applied to window decorations. An administrator can decide which style of decoration should go around the window when they add a new application or gadget to a page. </para> +<figure> +<title id="windowStyles">Window Styles</title> <mediaobject> <imageobject role="html"> <imagedata width="444" align="center" scale="100" fileref="images/PortalDevelopment/Skinning/windowStyles.png" format="PNG"/> @@ -281,6 +287,7 @@ <imagedata width="444" contentwidth="150mm" align="center" fileref="images/PortalDevelopment/Skinning/windowStyles.png" format="PNG"/> </imageobject> </mediaobject> +</figure> <section id="sect-Reference_Guide-Creating_a_New_Window_Style-Window_Style_Configuration"> <title>Window Style Configuration</title> <para> @@ -554,11 +561,14 @@ <para> The decorator is a pattern to create a contour or a curve around an area. In order to achieve this effect you need to create nine cells. The <literal>BODY</literal> is the central area that you want to decorate. The other eight cells are distributed around the <literal>BODY</literal> cell. You can use the width, height and background image properties to achieve any decoration effect that you want. </para> +<figure> +<title id="decoratorPattern">Decorator Pattern</title> <mediaobject> <imageobject> <imagedata width="418" fileref="images/PortalDevelopment/Skinning/decoratorPattern.png" format="PNG"/> </imageobject> </mediaobject> +</figure> <programlisting language="XML" role="XML"><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../extras/PortalDevelopment_Skinning/default193.xml" parse="text"/></programlisting> </section> <section id="sect-Reference_Guide-Some_CSS_Techniques-Left_Margin_Left_Pattern"> @@ -566,6 +576,8 @@ <para> Left margin left pattern is a technique to create two blocks side by side. The left block will have a fixed size and the right block will take the rest of the available space. When the user resizes the browser the added or removed space will be taken from the right block. </para> +<figure> +<title id="leftMarginPattern">Left Margin Pattern</title> <mediaobject> <imageobject role="html"> <imagedata align="center" fileref="images/PortalDevelopment/Skinning/leftMarginPattern.png" format="PNG"/> @@ -574,6 +586,7 @@ <imagedata width="100mm" align="center" fileref="images/PortalDevelopment/Skinning/leftMarginPattern.png" format="PNG"/> </imageobject> </mediaobject> +</figure> <programlisting language="XML" role="XML"><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../extras/PortalDevelopment_Skinning/default194.xml" parse="text"/></programlisting> </section> </section> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -62,7 +62,7 @@ <section id="sect-Reference_Guide-Getting_started_with_JBoss_Portlet_Bridge-Bridge_Frameworks_and_Extensions"> <title>Bridge Frameworks and Extensions</title> <para> - The JBoss Portlet Bridge currently supports <application>JBoss Enterprise Portal Platform</application>, <application>GateIn</application>, <application>JSF 1.2</application>, <application>JBoss Seam</application>, and <application>JBoss Richfaces</application>. There are configurations that apply to supporting each framework. See section <xref linkend="sect-Reference_Guide-Bridge_Configuration"/> for instructions. + The JBoss Portlet Bridge currently supports <application>JBoss Enterprise Portal Platform</application>, <application>JBoss Portal Platform</application>, <application>JSF 1.2</application>, <application>JBoss Seam</application>, and <application>JBoss Richfaces</application>. There are configurations that apply to supporting each framework. See section <xref linkend="sect-Reference_Guide-Bridge_Configuration"/> for instructions. </para> <para> The JBoss Portlet Bridge project is also actively developing extensions called &quot;<emphasis role="bold">Bridgelets</emphasis>&quot;. @@ -73,7 +73,7 @@ <section id="sect-Reference_Guide-Bridge_Frameworks_and_Extensions-Seam_Bridgelets"> <title>Seam Bridgelets</title> <para> - For example, the <literal>PortalIdentity</literal> <application>Seam</application> component allows you to instantly have Single Sign-On (SSO) between <application>Seam</application> and <application>GateIn</application> or <application>JBoss Enterprise Portal Platform</application>. + For example, the <literal>PortalIdentity</literal> <application>Seam</application> component allows you to instantly have Single Sign-On (SSO) between <application>Seam</application> and <application>JBoss Portal Platform</application> or <application>JBoss Enterprise Portal Platform</application>. </para> <para> This extension is configured in your <application>Seam</application> application&apos;s <filename>components.xml</filename> file as follows. Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -30,6 +30,8 @@ <para> The diagram below visually represents this nesting: </para> +<figure> + <title id="SpecPortalDef">Portal Specification</title> <mediaobject> <imageobject role="html"> <imagedata width="444" align="center" scale="95" fileref="images/PortletDevelopment/Standard/SpecPortalDef.png" format="PNG"/> @@ -38,6 +40,7 @@ <imagedata width="444" contentwidth="140mm" align="center" fileref="images/PortletDevelopment/Standard/SpecPortalDef.png" format="PNG"/> </imageobject> </mediaobject> +</figure> </section> <section id="sect-Reference_Guide-JSR_168_and_JSR_286_overview-Rendering_Modes"> <title>Rendering Modes</title> @@ -320,6 +323,8 @@ </para> </step> </procedure> +<figure> + <title id="fig_output">Create New Portal Page and Add Portlet</title> <mediaobject> <imageobject role="html"> <imagedata width="444" align="center" scale="100" fileref="images/PortletDevelopment/Standard/jsp_portlet/output.png" format="PNG"/> @@ -328,6 +333,7 @@ <imagedata width="444" contentwidth="120mm" align="center" fileref="images/PortletDevelopment/Standard/jsp_portlet/output.png" format="PNG"/> </imageobject> </mediaobject> +</figure> <!-- Does not seem to appear any longer <note> <para> @@ -431,6 +437,8 @@ <para> In the third method, the action phase is triggered first then the render phase is triggered, which outputs some content back to the web browser based on the available render parameters. </para> +<figure> + <title id="process">Render Phase Process</title> <mediaobject> <imageobject role="html"> <imagedata width="444" align="center" scale="100" fileref="images/PortletDevelopment/Standard/jsp_portlet/process.png" format="PNG"/> @@ -439,6 +447,7 @@ <imagedata width="444" contentwidth="140mm" align="center" fileref="images/PortletDevelopment/Standard/jsp_portlet/process.png" format="PNG"/> </imageobject> </mediaobject> +</figure> </section> </section> <section id="sect-Reference_Guide-JavaServer_Pages_Portlet_Example-JSF_example_using_the_JBoss_Portlet_Bridge"> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/ServerIntegration.xml =================================================================== (Binary files differ) Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/WSRP.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/WSRP.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/WSRP.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -193,7 +193,7 @@ JBoss Enterprise Application Platform 6 <citetitle>Administration and Configuration Guide</citetitle> for instructions about how to configure HTTPS connectors for the server. </para> <para> - Once the producer is configured for HTTPS connections, on the consumer you will just need to modify the URL for the WSRP endpoint to point to the new https based URL. This will require either manually updating the value in the WSRP administration application, or by specifying it using the + Once the producer is configured for HTTPS connections, on the consumer you will just need to modify the URL for the WSRP endpoint to point to the new HTTPS based URL. This will require either manually updating the value in the WSRP administration application, or by specifying it using the <emphasis role="italics">wsrp-consumers-config.xml</emphasis> configuration file before the server is first started. </para> @@ -217,7 +217,7 @@ </step> <step> <para> - Configure the server to add an https connection. This requires modifying the + Configure the server to add an HTTPS connection. This requires modifying the <emphasis role="italics">standalone/configuration/standalone.xml</emphasis> file with the following content in bold: </para> @@ -338,7 +338,7 @@ <title>Overview</title> <remark>Source: https://docs.jboss.org/author/display/GTNPORTAL35/Securing+WSRP#SecuringW... <para>CXF uses interceptors to extend and configure its behavior. There are two main types of interceptors: <firstterm>inInterceptors</firstterm> and <firstterm>outInterceptors</firstterm>. InInterceptors are invoked for communication coming into the client or server, while outInterceptors are invoked when the client or server sends a message.</para> - <para>So for the WSRP case, the communication from the consumer to the producer is governed by the consumer&apos;s OutInterceptor and the producer&apos;s InIntereceptor. The communication from the producer to the consumer is governed by the producer&apos;s OutInterceptor and the consumer&apos;s InInterceptor. This may mean having to configure 4 Interceptors.</para> + <para>So for the WSRP case, the communication from the consumer to the producer is governed by the consumer&apos;s OutInterceptor and the producer&apos;s InInterceptors. The communication from the producer to the consumer is governed by the producer&apos;s OutInterceptor and the consumer&apos;s InInterceptor. This may mean having to configure 4 Interceptors.</para> <para>When dealing with user propagation, only the consumer sends the user credentials to the producer. So Username Tokens only need to be configured for the consumer&apos;s OutInterceptor and the producer&apos;s InInterceptor.</para> <para>When dealing with things like encryption, you will most likely want to encrypt the message from the consumer to the producer and also the message from the producer to the consumer. This means that encryption properties must be configured for all 4 interceptors.</para> <para> @@ -1640,7 +1640,7 @@ </section> <section> <title>Importing and exporting portlets</title> - <para>Import and export are new functionalities added in WSRP 2. Exporting a portlet allows a consumer to get + <para>Import and export are new functionality added in WSRP 2. Exporting a portlet allows a consumer to get an opaque representation of the portlet which can then be use by the corresponding import operation to reconstitute it. It is mostly used in migration scenarios during batch operations. Since JBoss Portal Platform does not currently support automated migration of portal data, the functionality that is provided as part of @@ -2004,6 +2004,7 @@ </section> <section> <title>Working with WSRP Extensions</title> +<remark>Source https://docs.jboss.org/author/display/GTNPORTAL35/Working+with+WSRP+exten... <section> <title>Overview</title> <para> @@ -2314,3 +2315,4 @@ </section> </section> </chapter> + Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/core/ldap-configuration.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/core/ldap-configuration.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/core/ldap-configuration.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -62,12 +62,15 @@ <para> eXo starts and autocreates its organization model in your directory tree. Finally, the structure of the default LDAP schema looks like: </para> +<figure> +<title id="organization">Exo Organization</title> <mediaobject> <imageobject> <imagedata fileref="images/eXoJCR/organization-exo.jpg" width="444" /> </imageobject> </mediaobject> +</figure> <para> That's it! Now eXo uses your LDAP directory as its org model storage. Users, groups and memberships are now stored and retrieved from there. We suggest that you complete some guideline functions with eXo user management portlet and see what it changes in your directory tree. </para> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/core/spring-security-integration.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/core/spring-security-integration.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/core/spring-security-integration.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -356,13 +356,15 @@ <para> Once you are done with all this, just click on the login action and you should be redirect to the login page looking something like that: </para> +<figure> +<title id="login-page">Login-Page</title> <mediaobject> <imageobject> <imagedata fileref="images/eXoJCR/login-page.jpg" width="444" /> </imageobject> </mediaobject> - +</figure> </section> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/backup/use-external-backup-tool.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/backup/use-external-backup-tool.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/backup/use-external-backup-tool.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -13,19 +13,25 @@ <para> JCR provides ability to suspend repository via JMX. </para> +<figure> + <title id="repositorysuspendcontroller">Repository Suspend Controller</title> <mediaobject> <imageobject> <imagedata width="444" fileref="images/eXoJCR/repository-suspend-controller.png"/> </imageobject> </mediaobject> +</figure> <para> To suspend repository you need to invoke the <literal>suspend()</literal> operation. The returned result will be &quot;<emphasis>suspended</emphasis>&quot; if everything passed successfully. </para> +<figure> + <title id="repository-suspend-controller-suspended.">Repository Suspend Controller Suspended</title> <mediaobject> <imageobject> <imagedata fileref="images/eXoJCR/repository-suspend-controller-suspended.png"/> </imageobject> </mediaobject> +</figure> <para> An &quot;<emphasis>undefined</emphasis>&quot; result means not all components were successfully suspended. Check the console to review the stack traces. </para> @@ -58,10 +64,13 @@ <para> Once a backup is done you need to invoke the <literal>resume()</literal> operation to switch the repository back to on-line. The returned result will be &quot;<emphasis>on-line</emphasis>&quot;. </para> +<figure> + <title id="repository-suspend-controller-online.">Repository Suspend Controller Online</title> <mediaobject> <imageobject> <imagedata fileref="images/eXoJCR/repository-suspend-controller-online.png"/> </imageobject> </mediaobject> +</figure> </section> </chapter> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/concepts/jcr-exo-implementation.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/concepts/jcr-exo-implementation.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/concepts/jcr-exo-implementation.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -8,12 +8,15 @@ <para> The relationships between the eXo Repository Service components are illustrated below: </para> +<figure> + <title id="exojcr">Exo JCR</title> <mediaobject> <imageobject> <imagedata fileref="images/eXoJCR/concepts/exojcr.gif" /> </imageobject> </mediaobject> +</figure> <variablelist id="vari-Reference_Guide-Implementation-Definitions"> <title>Definitions</title> <varlistentry> @@ -93,12 +96,15 @@ <para> The following diagram explains which components of a eXo JCR implementation are used in a data flow to perform operations specified in the JCR API. </para> +<figure> + <title id="wsdatamodel">Workspace Data Model</title> <mediaobject> <imageobject> <imagedata fileref="images/eXoJCR/concepts/wsdatamodel.gif" width="444" /> </imageobject> </mediaobject> +</figure> <para> The Workspace Data Model can be split into four levels by data isolation and value from the JCR model point of view. </para> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/exo-jcr-configuration.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/exo-jcr-configuration.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/exo-jcr-configuration.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -53,7 +53,8 @@ <para> JCR services are registered in the Portal container. </para> - <para> + +<remark>NEEDINFO - FILE PATHS - The path needs to be updated with the equivalent path for JBoss Portal Platform instead of gatein, please see below para. New info required?</remark> <para> Below is an example configuration from the <filename><replaceable>JPP_DIST</replaceable>/gatein/gatein.ear/portal.war/WEB-INF/conf/jcr/jcr-configuration.xml</filename> file. </para> <programlisting language="XML"><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../../../extras/Advanced_Development_JCR_Configuration/jcr-configuration.xml" parse="text"/></programlisting> @@ -61,7 +62,7 @@ <title>JCR Configuration</title> <para> The JCR Service can use multiple <emphasis>Repositories</emphasis> and each repository can have multiple <emphasis>Workspaces</emphasis>. - </para> + <remark>NEEDINFO - FILE PATHS - The path needs to be updated with the equivalent path for JBoss Portal Platform instead of gatein, please see below para. New info required?</remark> </para> <para> Configure the workspaces by locating the workspace you need to modify in <filename><replaceable>JPP_DIST</replaceable>/gatein/gatein.ear/portal.war/WEB-INF/conf/jcr/repository-configuration.xml</filename>. </para> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/jdbc-data-container-config.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/jdbc-data-container-config.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/jdbc-data-container-config.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -112,7 +112,8 @@ <para> Each database software supports ANSI SQL standards but also has its own specifics. Therefore each database has its own configuration setting in the eXo JCR as a database dialect parameter. More detailed configuration of the database can be set by editing the metadata SQL-script files. </para> - <para> +<remark>NEEDINFO - FILE PATHS - The path needs to be updated with the equivalent path for JBoss Portal Platform instead of gatein, please see below para. New info required?</remark> +<para> You can find SQL-scripts in <filename>conf/storage/</filename> directory of the <filename><replaceable>JPP_HOME</replaceable>/modules/org/gatein/lib/main/exo.jcr.component.core-<remark>VERSION</remark>.jar</filename> file . </para> <para> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/multilanguage-support.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/multilanguage-support.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/multilanguage-support.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -36,7 +36,8 @@ <note> <itemizedlist> <listitem> - <para> +<remark>NEEDINFO - FILE PATHS - The path needs to be updated with the equivalent path for JBoss Portal Platform instead of gatein, please see below para. New info required?</remark> + <para> The configuration file to be modified for these changes is <filename><replaceable>JPP_HOME</replaceable>/gatein/gatein.ear/portal.war/WEB-INF/conf/jcr/repository-configuration.xml</filename>. </para> </listitem> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/search-configuration.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/search-configuration.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/configuration/search-configuration.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -11,7 +11,8 @@ <para> Below is an example of the configuration file that governs search behaviors. Refer to <xref linkend="sect-Reference_Guide-Search_Configuration-Global_Search_Index"/> for how searching operates in JCR and information about customized searches. </para> - <para> + +<para> The JCR index configuration file is located at <filename><replaceable>JPP_HOME</replaceable>/gatein/gatein.ear/portal.war/WEB-INF/conf/jcr/repository-configuration.xml</filename>. </para> <para> @@ -515,7 +516,8 @@ Comment #3: The last filter (StopFilter) removes stop words from a token stream. The stop set is defined in the analyzer. </para> </example> - <para> + + <para> The global search index is configured in the <filename><replaceable>JPP_HOME</replaceable>/gatein/gatein.ear/portal.war/WEB-INF/conf/jcr/repository-configuration.xml</filename> configuration file within the &quot;query-handler&quot; tag. </para> <programlisting language="XML" role="XML">&lt;query-handler class=&quot;org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex&quot;&gt; @@ -615,13 +617,15 @@ <programlisting language="XML" role="XML">&lt;query-handler class=&quot;org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex&quot;&gt; </programlisting> - <para> + + <para> in <filename><replaceable>JPP_HOME</replaceable>/gatein/gatein.ear/portal.war/WEB-INF/conf/jcr/repository-configuration.xml</filename> with the new class: </para> <programlisting language="XML" role="XML">&lt;query-handler class=&quot;mypackage.indexation.MySearchIndex&gt; </programlisting> - <para> + +<para> To configure an application to use a new analyzer, add the <parameter>analyzer</parameter> parameter to each query-handler configuration in <filename><replaceable>JPP_HOME</replaceable>/gatein/gatein.ear/portal.war/WEB-INF/conf/jcr/repository-configuration.xml</filename>: </para> <programlisting language="XML" role="XML"><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../../../extras/Advanced_Development_JCR_search-configuration/default69.xml" parse="text"/></programlisting> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/jbosscache-configuration-templates.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/jbosscache-configuration-templates.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/jbosscache-configuration-templates.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -69,7 +69,8 @@ </section> <section id="sect-Reference_Guide-JBoss_Cache_configuration-Shipped_JBoss_Cache_configuration_templates"> <title>Shipped JBoss Cache configuration templates</title> - <para> + +<para> The eXo JCR implementation is shipped with ready-to-use JBoss Cache configuration templates for JCR&apos;s components. They are located in <filename><replaceable>JPP_HOME</replaceable>/gatein/gatein.ear/portal.war/WEB-INF/conf/jcr/jbosscache</filename> directory, inside either the <filename>cluster</filename> or <filename>local</filename> directory. </para> <section id="sect-Reference_Guide-Shipped_JBoss_Cache_configuration_templates-Data_container_template"> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/jca.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/jca.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/jca.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -8,7 +8,7 @@ <section id="sect-Reference_Guide-The_JCA_Resource_Adapter-Overview"> <title>Overview</title> <para> - eXo JCR supports <emphasis>J2EE Connector Architecture</emphasis> 1.5, thus If you would like to delegate the JCR Session life-cycle to your application server, you can use the JCA Resource Adapter for eXo JCR if your application server supports JCA 1.5. This adapter only supports XA Transaction, in other words you cannot use it for local transactions. Since the JCR Sessions have not been designed to be shareable, the session pooling is simply not covered by the adapter. + JBoss Portal Platform JCR supports <emphasis>J2EE Connector Architecture</emphasis> 1.5, thus If you would like to delegate the JCR Session life-cycle to your application server, you can use the JCA Resource Adapter for JBoss Portal Platform JCR if your application server supports JCA 1.5. This adapter only supports XA Transaction, in other words you cannot use it for local transactions. Since the JCR Sessions have not been designed to be shareable, the session pooling is simply not covered by the adapter. </para> </section> @@ -16,7 +16,7 @@ <section id="sect-Reference_Guide-The_JCA_Resource_Adapter-The_SessionFactory"> <title>The <emphasis>SessionFactory</emphasis></title> <para> - The equivalent of the <emphasis>javax.resource.cci.ConnectionFactory</emphasis> in JCA terminology is <emphasis>org.exoplatform.connectors.jcr.adapter.SessionFactory</emphasis> in the context of eXo JCR, the resource that you will get thanks to a JNDI lookup is of type <emphasis>SessionFactory</emphasis> and provides the following methods: + The equivalent of the <emphasis>javax.resource.cci.ConnectionFactory</emphasis> in JCA terminology is <emphasis>org.exoplatform.connectors.jcr.adapter.SessionFactory</emphasis> in the context of Jboss Portal Platform JCR, the resource that you will get thanks to a JNDI lookup is of type <emphasis>SessionFactory</emphasis> and provides the following methods: </para> <programlisting> /** @@ -97,7 +97,7 @@ <section id="sect-Reference_Guide-The_JCA_Resource_Adapter-Deployment"> <title>Deployment</title> <para> - As the JCR and its dependencies are provided when you use it with gateIn you will need to deploy only the rar file corresponding to the artifactId <emphasis>exo.jcr.connectors.jca</emphasis> and groupId <emphasis>org.exoplatform.jcr</emphasis>. + As the JCR and its dependencies are provided when you use it with JBoss Portal Platform you will need to deploy only the rar file corresponding to the artifactId <emphasis>exo.jcr.connectors.jca</emphasis> and groupId <emphasis>org.exoplatform.jcr</emphasis>. </para> <para> Then you will need to configure the connector itself, for example for JBoss Enterprise Application, you need to create in your deploy directory a file of type <emphasis>*-ds.xml</emphasis> (jcr-ds.xml for example) with the following content: Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/other/acl-ext.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/other/acl-ext.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/other/acl-ext.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -104,12 +104,15 @@ <para> Simplified Sequence diagram for the <literal>Session.getNode()</literal> method for example: </para> +<figure> + <title id="acl-ext1">ACL_Ext</title> <mediaobject> <imageobject> <imagedata fileref="images/eXoJCR/other/acl-ext.jpg" width="444" /> </imageobject> </mediaobject> +</figure> </section> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/other/binary-values-processing.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/other/binary-values-processing.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/other/binary-values-processing.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -115,12 +115,15 @@ <section id="sect-Reference_Guide-Binary_Values_Processing-Value_implementations"> <title>Value implementations</title> +<figure> + <title id="binaryvalue">Binary Value</title> <mediaobject> <imageobject> <imagedata fileref="images/eXoJCR/other/binaryvalue.png" width="444" /> </imageobject> </mediaobject> +</figure> <para> <literal>ReadableBinaryValue</literal> has one method to read Value. </para> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/other/link-producer.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/other/link-producer.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/other/link-producer.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -33,41 +33,53 @@ <para> Type valid reference to the resource, using the link producer in your browser&apos;s address field: </para> +<figure> + <title id="lnkproducer1">Lnk Producer 1</title> <mediaobject> <imageobject> <imagedata width="444" fileref="images/eXoJCR/other/lnkproducer1.JPG"/> </imageobject> </mediaobject> +</figure> </step> <step> <para> Internet Explorer will give a dialog window requesting to Open a file or to Save it. Click on the Open button </para> +<figure> + <title id="lnkproducer2">Lnk Producer 2</title> <mediaobject> <imageobject> <imagedata width="444" fileref="images/eXoJCR/other/lnkproducer2.JPG"/> </imageobject> </mediaobject> +</figure> </step> <step> <para> In Windows system an <filename>.lnk</filename> file will be downloaded and opened with the application which is registered to open the files, which are pointed to by the <filename>.lnk</filename> file. In case of a .doc file, Windows opens Microsoft Office Word which will try to open a remote file (test0000.doc). Maybe it will be necessary to enter USERNAME and PASSWORD. </para> +<figure> + <title id="lnkproducer3">Lnk Producer 3</title> <mediaobject> <imageobject> <imagedata width="444" fileref="images/eXoJCR/other/lnkproducer3.JPG"/> </imageobject> </mediaobject> +</figure> </step> <step> <para> Edit the file in Microsoft Word. </para> +<figure> + <title id="lnkproducer">Lnk Producer 4</title> <mediaobject> <imageobject> <imagedata width="444" fileref="images/eXoJCR/other/lnkproducer4.JPG"/> </imageobject> </mediaobject> +</figure> </step> </procedure> <para> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/performance-tuning-guide.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/performance-tuning-guide.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/performance-tuning-guide.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -97,11 +97,14 @@ </simplelist> </para> +<figure> + <title id="perf_EC2_result">EC2 Performance Results</title> <mediaobject> <imageobject> <imagedata fileref="images/eXoJCR/perf_EC2_results.jpg"/> </imageobject> </mediaobject> +</figure> <table> <title/> <tgroup cols="4"> @@ -150,11 +153,14 @@ <member>Background writing threads: 50</member> <member>Reading threads: 450</member> </simplelist> +<figure> + <title id="perf_EC2_result2">EC2 Performance Results 2</title> <mediaobject> <imageobject> <imagedata fileref="images/eXoJCR/perf_EC2_results_2.jpg"/> </imageobject> </mediaobject> +</figure> <table> <title/> <tgroup cols="4"> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/query-handler-config.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/query-handler-config.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr/query-handler-config.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -13,22 +13,28 @@ <para> Clustered implementation with local indexes combines in-memory buffer index directory with delayed file-system flushing. This index is called &quot;Volatile&quot; and it is invoked in searches also. Within some conditions volatile index is flushed to the persistent storage (file system) as new index directory. This allows to achieve great results for write operations. </para> + <figure> + <title id="diagramlocalindez">Local Index Diagram</title> <mediaobject> <imageobject> <imagedata width="444" align="center" fileref="images/eXoJCR/diagram-local-index.png"/> </imageobject> </mediaobject> +</figure> <para> As this implementation designed for clustered environment it has additional mechanisms for data delivery within cluster. Actual text extraction jobs done on the same node that does content operations (i.e. write operation). Prepared &quot;documents&quot; (Lucene term that means block of data ready for indexing) are replicated withing cluster nodes and processed by local indexes. So each cluster instance has the same index content. When new node joins the cluster it has no initial index, so it must be created. There are some supported ways of doing this operation. The simplest is to simply copy the index manually but this is not intended for use. If no initial index found JCR uses automated scenarios. They are controlled via configuration (see &quot;index-recovery-mode&quot; parameter) offering full re-indexing from database or copying from another cluster node. </para> <para> For some reasons having a multiple index copies on each instance can be costly. So shared index can be used instead (see diagram below). </para> +<figure> + <title id="diagramsharedindex">Shared Index Diagram</title> <mediaobject> <imageobject> <imagedata width="444" align="center" fileref="images/eXoJCR/diagram-shared-index.png"/> </imageobject> </mediaobject> +</figure> <para> This indexing strategy combines advantages of in-memory index along with shared persistent index offering &quot;near&quot; real time search capabilities. This means that newly added content is accessible via search practically immediately. This strategy allows nodes to index data in their own volatile (in-memory) indexes, but persistent indexes are managed by single &quot;coordinator&quot; node only. Each cluster instance has a read access for shared index to perform queries combining search results found in own in-memory index also. Take in account that shared folder must be configured in your system environment (i.e. mounted NFS folder). But this strategy in some extremely rare cases can have a bit different volatile indexes within cluster instances for a while. In a few seconds they will be up2date. </para> @@ -366,11 +372,14 @@ <para> Some hard system faults, errors during upgrades, migration issues and some other factors may corrupt the index. Current versions of JCR supports <emphasis role="bold">Hot Asynchronous Workspace Reindexing</emphasis> feature. It allows Service Administrators to launch the process in background without stopping or blocking the whole application by using any JMX-compatible console. </para> +<figure> + <title id="jmx-jconsole">JMX Jconsole</title> <mediaobject> <imageobject> <imagedata align="center" fileref="images/eXoJCR/jmx-jconsole.png"/> </imageobject> </mediaobject> +</figure> <para> The server can continue working as expected while the index is recreated. </para> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr-with-gatein.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr-with-gatein.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/jcr-with-gatein.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -4,6 +4,6 @@ %BOOK_ENTITIES; ]> <chapter id="chap-Reference_Guide-eXo_JCR_with_GateIn"> - <title>eXo JCR with GateIn</title> + <title>eXo JCR with JBoss Portal Platform</title> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="jcr-with-gtn/managed-datasources-under-jboss-as.xml"/> </chapter> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/ws/framework-for-cross-domain-ajax.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/ws/framework-for-cross-domain-ajax.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/ws/framework-for-cross-domain-ajax.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -13,12 +13,15 @@ <para> XmlHttpRequest objects are bound by the same origin security policy of browsers, which prevents a page from accessing data from another server. This has put a serious limitation on Ajax developers: you can use XmlHttpRequests to make background calls to a server, but it has to be the same server that served up the current page. For more details, you can visit <ulink url="http://www.mozilla.org/projects/security/components/same-origin...;. </para> +<figure> +<title id="Ajax">Ajax</title> <mediaobject> <imageobject> <imagedata fileref="images/eXoJCR/ajax.gif" /> </imageobject> </mediaobject> +</figure> <para> But actually writing client web applications that use this object can be tricky given restrictions imposed by web browsers on network connections across domains. So you need to find the way to bypass this limitation of AJAX. </para> @@ -39,13 +42,15 @@ <para> 3). ServerB contains remote service that want get access to and an HTML server page (server.html) referenced from the server IFRAME. This server page contains dedicated script to push the requested data into client IFRAME. </para> +<figure> +<title id="ajaxhow it works">Ajax Working</title> <mediaobject> <imageobject> <imagedata fileref="images/eXoJCR/ajax-how-it-works.png" width="444" /> </imageobject> </mediaobject> - +</figure> </section> <section id="sect-Reference_Guide-Framework_for_cross_domain_AJAX-A_Working_Sequence"> Modified: epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/ws/groovy-scripts-as-rest-services.xml =================================================================== --- epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/ws/groovy-scripts-as-rest-services.xml 2013-01-28 16:57:15 UTC (rev 9090) +++ epp/docs/branches/6.0/Reference_Guide/en-US/modules/eXoJCR/ws/groovy-scripts-as-rest-services.xml 2013-01-28 21:33:22 UTC (rev 9091) @@ -280,12 +280,15 @@ <para> After configuration is done, start the server. If configuration is correct and script does not have syntax error, you should see next: </para> +<figure> +<title id="groovyconsole">Groovy Console 1</title> <mediaobject> <imageobject> <imagedata fileref="images/eXoJCR/groovy-console1.png" width="444" /> </imageobject> </mediaobject> +</figure> <para> In the screenshot, we can see the service deployed. </para> @@ -327,12 +330,15 @@ <para> Node '/script/groovy/JcrGroovyTest.groovy' has property exo:autoload=true so script will be re-deployed automatically when script source code changed. </para> +<figure> +<title id="groovyconsole2">Groovy Console 2</title> <mediaobject> <imageobject> <imagedata fileref="images/eXoJCR/groovy-console2.png" width="444" /> </imageobject> </mediaobject> +</figure> <para> Script was redeployed, now try to access a newly created method. </para> @@ -356,13 +362,15 @@ <programlisting>user@host:~&gt; curl -u root:exo \ http://localhost:8080/rest/script/groovy/delete/repository/production/scr... +<figure> +<title id="groovyconsole3">Groovy Console 3</title> <mediaobject> <imageobject> <imagedata fileref="images/eXoJCR/groovy-console3.png" width="444" /> </imageobject> </mediaobject> - +</figure> </section> <section id="sect-Reference_Guide-Groovy_Scripts_as_REST_Services-Groovy_script_restrictions">