[gatein-commits] gatein SVN: r5573 - in epp/docs/branches: EPP_5_0_Branch/Reference_Guide/en-US/modules and 17 other directories.

Author: smumford Date: 2010-12-12 23:21:55 -0500 (Sun, 12 Dec 2010) New Revision: 5573 Modified: epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/ClusteringConfiguration.xml epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/DatabaseConfiguration.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/AuthenticationTokenConfiguration.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/PortalDevelopment/PortalLifecycle.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/WSRP.xml epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/CodePaste.png epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/CutNode4.png epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/Dashboard1.png epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/Dashname.png epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/Dashname1.png epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/DeleteGroup.png epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/Frontpage.png epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/MoveUpDown.png epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/NavigationPortlet.png epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/SiteMap.png epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/Source.png epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/account/Account_and_Password_Retrieval.xml epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/account/Sign_in_and_Sign_out.xml epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Permission.xml epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/User_Management.xml epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/BookingEventHandler.java epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default197.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default198.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default199.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default200.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default201.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default202.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default203.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default204.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default205.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default206.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default207.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default208.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default209.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default210.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default211.java epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default212.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default213.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default214.java epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default215.java epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default216.java epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default217.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/WSRP/default258.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/PortalLifecycle.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/WSRP.xml epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/5.1.0_Release_Notes.xml epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation.xml epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/CodePaste.png epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/CutNode4.png epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/Dashboard1.png epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/Dashname.png epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/Dashname1.png epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/DeleteGroup.png epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/Frontpage.png epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/MoveUpDown.png epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/NavigationPortlet.png epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/PermissionSetting1.png epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/SiteMap.png epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/Source.png epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/account/Account_and_Password_Retrieval.xml epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/account/Sign_in_and_Sign_out.xml epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Permission.xml epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/User_Management.xml epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portletsUser/Interface_Portlets.xml Log: QE feedback fixes Modified: epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/ClusteringConfiguration.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/ClusteringConfiguration.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/ClusteringConfiguration.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -25,7 +25,7 @@ <section id="sect-Reference_Guide-Clustering_Configuration-Prerequisite"> <title>Prerequisites</title> <para>The clustering services are available only in the <literal>all</literal> - and production server configurations. Additionally the following prerequisites + and <literal>production</literal> server configurations. Additionally the following prerequisites should be met: </para> <itemizedlist> @@ -52,7 +52,7 @@ <itemizedlist> <listitem> <para> - to specify the location of the shared filesystem. + To specify the location of the "value storage". This folder must not be deleted as it contains data required for the portal to run. For more details about "value storage" please refer to the JCR configuration in the &PRODUCT; Reference Guide available at <ulink type="http" url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platf... </para> </listitem> </itemizedlist> @@ -64,7 +64,7 @@ <itemizedlist> <listitem> <para> - to specify the location on a shared filesystem to store data. + To specify the location on a shared filesystem to store the JCR index. If the directory is deleted, the JCR will recreate the indexes on next start of the server. (This operation may take a very long time, depending on the size of the data stored in the JCR). </para> </listitem> </itemizedlist> @@ -76,7 +76,7 @@ <itemizedlist> <listitem> <para> - this must be changed to org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter. + This must be changed to <literal>org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter</literal>. </para> </listitem> </itemizedlist> @@ -88,7 +88,7 @@ <itemizedlist> <listitem> <para> - this must be changed to cluster. + This must be changed to <literal>cluster</literal>. </para> </listitem> </itemizedlist> Modified: epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/DatabaseConfiguration.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/DatabaseConfiguration.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_0_Branch/Installation_Guide/en-US/DatabaseConfiguration.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -108,6 +108,17 @@ mean to run the application server with <literal>sh run.sh -Dexo.profiles=sybase</literal> in a single node and <literal>sh run.sh -Dexo.profiles=sybase,cluster</literal> for a cluster node.</para> </warning> + <warning> + <title>Do not delete <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable>&lt;PROFILE&gt;</replaceable>/data</filename></title> + <para> + The JCR can store information both in a database and on the filesystem depending on the configuration of the value storage. Refer to the &PRODUCT; Reference Guide for more information. + </para> + <para> + By default, the portal will store information required to run the portal in <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable>&lt;PROFILE&gt;</replaceable>/data/gatein/jcr/values/</filename>. + </para> + <para> + You can change this directory location by editing the <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable>&lt;PROFILE&gt;</replaceable>/conf/gatein/configuration.properties</filename> file, the name of the property being: <literal>gatein.jcr.storage.data.dir</literal></para> + </warning> </section> <section> Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/AuthenticationTokenConfiguration.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/AuthenticationTokenConfiguration.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/AuthenticationAndIdentity/AuthenticationTokenConfiguration.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -16,6 +16,15 @@ <para> The token service allows administrators to create, delete, retrieve and clean tokens as required. The service also defines a validity period of any given token. The token becomes invalid once this period expires. </para> + <warning> + <title>Username and passwords stored in clear text</title> + <para> + The remember-me feature uses the token mechanism to be able to authenticate returning users without requiring an explicit login. To be able to authenticate, the token needs to store the username and password in clear text in the JCR. + </para> + <para> + The remember-me feature can be disabled by removing the corresponding checkbox in: <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/02portal.war/login/jsp/login.jsp</filename> and <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/02portal.war/groovy/portal/webui/UILoginForm.gtmpl</filename> + </para> + </warning> </section> Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/PortalDevelopment/PortalLifecycle.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/PortalDevelopment/PortalLifecycle.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/PortalDevelopment/PortalLifecycle.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -85,7 +85,7 @@ <section id="sect-Reference_Guide-Portal_Life_cycle-The_Command_Servlet"> <title>The Command Servlet</title> <para> - The servlet is the main entry point for incoming requests, it also includes some <literal>init</literal> code when the portal is launched. This servlet (<literal>org.gatein.wci.command.CommandServlet</literal>) is automatically added during deployment and mapped to <literal>/gateinservlet</literal>. + The CommandServlet is called by the portlet container for requests to particular portlets. It also includes some <literal>init</literal> code when the portal is launched. This servlet (<literal>org.gatein.wci.command.CommandServlet</literal>) is automatically added during the deployment of each portlet application and mapped to <literal>/gateinservlet</literal>. </para> <para> This is equivalent to adding the following into <filename>web.xml</filename>. Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -190,7 +190,7 @@ <section id="sect-Reference_Guide-Skinning_the_Portal-The_Default_Skin"> <title>The Default Skin</title> <para> - The default skin for &PRODUCT; is located as part of the <literal>01eXoResource.war</literal>. The main files associated with the skin are: + The default skin for &PRODUCT; is located as part of the <literal>01eXoResources.war</literal>. The main files associated with the skin are: </para> <variablelist> <varlistentry> @@ -470,7 +470,7 @@ The portlet specification defines a set of default CSS classes that should be available for portlets. These classes are included as part of the portal skin. Please see the portlet specification for a list of the default classes that should be available. </para> <para> - For the default portal skin, the portlet specification CSS classes are defined in: <filename>eXoResources.war/skin/Portlet/Stylesheet.CSS</filename>. + For the default portal skin, the portlet specification CSS classes are defined in: <filename>01eXoResources.war/skin/Portlet/Stylesheet.CSS</filename>. </para> </section> Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/WSRP.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/WSRP.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/WSRP.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -105,7 +105,7 @@ <variablelist id="vari-Reference_Guide-Deploying_WSRP-WSRP_support_files"> <title>WSRP support files</title> <varlistentry> - <term><replaceable>PORTAL_HOME</replaceable>/wsrp-admin-gui.war</term> + <term><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/wsrp-admin-gui.war</term> <listitem> <para> This file contains the WSRP Configuration portlet with which you can configure consumers to access remote servers and how the WSRP producer is configured. @@ -113,7 +113,7 @@ </listitem> </varlistentry> <varlistentry> - <term><replaceable>PORTAL_HOME</replaceable>/wsrp-producer.war</term> + <term><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/wsrp-producer.war</term> <listitem> <para> This file contains the WSRP producer web application. @@ -121,7 +121,7 @@ </listitem> </varlistentry> <varlistentry> - <term><replaceable>PORTAL_HOME</replaceable>/lib/wsrp-common-<replaceable>WSRP_VERSION</replaceable>.jar</term> + <term><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/wsrp-common-<replaceable>WSRP_VERSION</replaceable>.jar</term> <listitem> <para> This file contains common classes needed by the different WSRP libraries. @@ -129,7 +129,7 @@ </listitem> </varlistentry> <varlistentry> - <term><replaceable>PORTAL_HOME</replaceable>/lib/wsrp-consumer-<replaceable>WSRP_VERSION</replaceable>.jar</term> + <term><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/wsrp-consumer-<replaceable>WSRP_VERSION</replaceable>.jar</term> <listitem> <para> This file contains the WSRP consumer. @@ -137,7 +137,7 @@ </listitem> </varlistentry> <varlistentry> - <term><replaceable>PORTAL_HOME</replaceable>/lib/wsrp-integration-api-<replaceable>WSRP_VERSION</replaceable>.jar</term> + <term><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/wsrp-integration-api-<replaceable>WSRP_VERSION</replaceable>.jar</term> <listitem> <para> This file contains the API classes needed to integrate the WSRP component into portals. @@ -145,7 +145,7 @@ </listitem> </varlistentry> <varlistentry> - <term><replaceable>PORTAL_HOME</replaceable>/lib/wsrp-producer-lib-$WSRP_VERSION.jar</term> + <term><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/wsrp-producer-lib-$WSRP_VERSION.jar</term> <listitem> <para> This file contains the classes needed by the WSRP producer. @@ -153,7 +153,7 @@ </listitem> </varlistentry> <varlistentry> - <term><replaceable>PORTAL_HOME</replaceable>/lib/wsrp-wsrp1-ws-<replaceable>WSRP_VERSION</replaceable>.jar</term> + <term><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/wsrp-wsrp1-ws-<replaceable>WSRP_VERSION</replaceable>.jar</term> <listitem> <para> This file contains the generated JAX-WS classes for WSRP version 1. @@ -161,7 +161,7 @@ </listitem> </varlistentry> <varlistentry> - <term><replaceable>PORTAL_HOME</replaceable>/lib/wsrp-wsrp2-ws-<replaceable>WSRP_VERSION</replaceable>.jar</term> + <term><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/wsrp-wsrp2-ws-<replaceable>WSRP_VERSION</replaceable>.jar</term> <listitem> <para> This file contains the JAX-WS classes for WSRP version 2. @@ -169,7 +169,7 @@ </listitem> </varlistentry> <varlistentry> - <term><replaceable>PORTAL_HOME</replaceable>/lib/gatein.portal.component.wsrp-<replaceable>PORTAL_VERSION</replaceable>.jar</term> + <term><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/gatein.portal.component.wsrp-<replaceable>PORTAL_VERSION</replaceable>.jar</term> <listitem> <para> This file contains the code to integrate the WSRP service into &PRODUCT;. @@ -178,7 +178,7 @@ </varlistentry> </variablelist> <para> - If WSRP is not going to be used in your &PRODUCT; instance, the <filename><replaceable>PORTAL_HOME</replaceable>/lib/gatein.portal.component.wsrp-<replaceable>PORTAL_VERSION</replaceable>.jar</filename> can be removed to deactivate WSRP support. + If WSRP is not going to be used in your &PRODUCT; instance, the <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/gatein.portal.component.wsrp-<replaceable>PORTAL_VERSION</replaceable>.jar</filename> can be removed to deactivate WSRP support. </para> <section id="sect-Reference_Guide-Deploying_WSRP-Non_default_Ports_or_Hostnames"> @@ -268,7 +268,7 @@ &PRODUCT;'s Producer is automatically set up when a portal instance is deployed with the WSRP service. </para> <para> - The WSDL file can be accessed at <filename>http://<replaceable>{hostname}</replaceable>:<replaceable>{port}</replaceable>/wsrp-producer/v1/MarkupService?wsdl</filename>. + The WSDL file can be accessed at <literal>http://<replaceable>{hostname}</replaceable>:<replaceable>{port}</replaceable>/wsrp-producer/MarkupService?wsdl</literal>. </para> <para> The default hostname is <literal>localhost</literal> and the default port is <literal>8080</literal>. @@ -474,7 +474,7 @@ Although using the WSRP Configuration portlet to configure Consumers is recommended, the WSRP component provides an alternative way to configure consumers. </para> <para> - This is done by editing the XML file located at <filename><replaceable>PORTAL_HOME</replaceable>/lib/wsrp-consumer-<replaceable>WSRP_VERSION</replaceable>.jar/conf/wsrp-consumers-config.xml</filename>. + This is done by editing the XML file located at <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/wsrp-consumer-<replaceable>WSRP_VERSION</replaceable>.jar/conf/wsrp-consumers-config.xml</filename>. </para> <programlisting language="XML" role="XML"><xi:include href="../extras/WSRP/default257.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> @@ -483,7 +483,7 @@ </para> <note> <para> - An XML Schema defining which elements are available to configure Consumers via XML can be found in <filename><replaceable>PORTAL_HOME</replaceable>/lib/wsrp-integration-api-<replaceable>WSRP_VERSION</replaceable>.jar/xsd/gatein_wsrp_consumer_1_0.xsd </filename> + An XML Schema defining which elements are available to configure Consumers via XML can be found in <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/wsrp-integration-api-<replaceable>WSRP_VERSION</replaceable>.jar/xsd/gatein_wsrp_consumer_1_0.xsd </filename> </para> </note> </section> @@ -519,12 +519,12 @@ <section id="sect-Reference_Guide-Consuming_Remote_WSRP_Portlets-Configuring_Access_to_Remote_Producers_via_XML"> <title>Configuring Access to Remote Producers via XML</title> <para> - Again, configuring consumers via XML is done by editing <filename><replaceable>PORTAL_HOME</replaceable>/lib/wsrp-consumer-<replaceable>WSRP_VERSION</replaceable>.jar/conf/wsrp-consumers-config.xml</filename>. + Again, configuring consumers via XML is done by editing <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/wsrp-consumer-<replaceable>WSRP_VERSION</replaceable>.jar/conf/wsrp-consumers-config.xml</filename>. </para> <note> <title>XML Elements</title> <para> - An XML Schema defining which elements are available to configure Consumers via XML can be found in <filename> <replaceable>PORTAL_HOME</replaceable>/lib/wsrp-integration-api-<replaceable>WSRP_VERSION</replaceable>.jar/xsd/gatein_wsrp_consumer_1_0.xsd </filename> + An XML Schema defining which elements are available to configure Consumers via XML can be found in <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/wsrp-integration-api-<replaceable>WSRP_VERSION</replaceable>.jar/xsd/gatein_wsrp_consumer_1_0.xsd </filename> </para> </note> <note> @@ -678,7 +678,7 @@ <procedure> <step> <para> - Go to the configuration screen for the <literal>self</literal> producer and change the value of <literal>email</literal> to <literal&gt;foo(a)example.com&lt;/literal&gt; instead of&lt;literal&gt;example(a)example.com&lt;/literal&gt;: + Go to the configuration screen for the <literal>self</literal> producer and change the value of <literal>email</literal> to <literal&gt;foo(a)example.com&lt;/literal&gt; instead of <literal&gt;example(a)example.com&lt;/literal&gt;: </para> <mediaobject> <imageobject role="html"> @@ -825,7 +825,7 @@ </listitem> </varlistentry> <varlistentry> - <term>Register/Deregister</term> + <term>Register/De-register</term> <listitem> <para> Registers or deregisters a consumer based on whether registration is required and/or acquired. @@ -836,7 +836,7 @@ <term>Delete</term> <listitem> <para> - Destroys the consumer, after deregisterting it if it was registered. + Destroys the consumer, after de-registering it if it was registered. </para> </listitem> </varlistentry> @@ -888,10 +888,10 @@ <section id="sect-Reference_Guide-Configuring_the_WSRP_Producer-Overview"> <title>Overview</title> <para> - The behavior of the Portal's WSRP Producer can be configured using the WSRP administration interface, (this is the recommended method), or by editing the <filename><replaceable>PORTAL_HOME</replaceable>/wsrp-producer.war/WEB-INF/conf/producer/config.xml</filename> file. + The behavior of the Portal's WSRP Producer can be configured using the WSRP administration interface, (this is the recommended method), or by editing the <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/wsrp-producer.war/WEB-INF/conf/producer/config.xml</filename> file. </para> <para> - Several aspects can be modified with respect to whether registration is required for consumers to access the Producer's services. An XML Schema for the configuration format is available at <filename> <replaceable>PORTAL_HOME</replaceable>/lib/wsrp-integration-api-<replaceable>WSRP_VERSION</replaceable>.jar/xsd/gatein_wsrp_producer_1_0.xsd </filename>. + Several aspects can be modified with respect to whether registration is required for consumers to access the Producer's services. An XML Schema for the configuration format is available at <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/wsrp-integration-api-<replaceable>WSRP_VERSION</replaceable>.jar/xsd/gatein_wsrp_producer_1_0.xsd </filename>. </para> </section> Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/CodePaste.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/CutNode4.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/Dashboard1.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/Dashname.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/Dashname1.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/DeleteGroup.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/Frontpage.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/MoveUpDown.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/NavigationPortlet.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/SiteMap.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/images/Source.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/account/Account_and_Password_Retrieval.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/account/Account_and_Password_Retrieval.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/account/Account_and_Password_Retrieval.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -86,10 +86,10 @@ </step> </procedure> <para> - After you submit the form an email will be send to your email address with the requested information, either your username or password. + After you submit the form an email will be send to your email address to assist you. </para> <para> - If you forgot your password you will be sent a new (temporary) password. Your original password will not be valid after this email is sent. You will be directed to a page to update your password the next time you sign in. + If you forgot your password you will be sent a link to application that will allow you to edit your password. Your original password will not be valid after this email is sent. </para> <important> <title>Email Error</title> Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/account/Sign_in_and_Sign_out.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/account/Sign_in_and_Sign_out.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/account/Sign_in_and_Sign_out.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -10,7 +10,18 @@ In order to enter the portal in private mode, you should use the account previously registered. </para> <para> - To sign in to a portal, users must complete the <emphasis role="bold">Sign in</emphasis> form. This form contains the following elements: + To sign in to a portal, users must complete the <emphasis role="bold">Sign in</emphasis> form: + </para> + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/Signin.png" format="PNG" align="center" scale="110"/> + </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/Signin.png" format="PNG" align="center" scalefit="1" contentwidth="150mm"/> + </imageobject> + </mediaobject> + <para> + This form contains the following elements: </para> <variablelist> <varlistentry> @@ -85,16 +96,8 @@ </step> <step> <para> - Click the <emphasis role="bold">Sign in</emphasis> link at the top right of the page if you are current in the Classic portal. The <emphasis role="bold">Sign in</emphasis> form appears: + Click the <emphasis role="bold">Sign in</emphasis> link at the top right of the page if you are current in the Classic portal. The <emphasis role="bold">Sign in</emphasis> form appears. </para> - <mediaobject> - <imageobject role="html"> - <imagedata fileref="images/Signin.png" format="PNG" align="center" scale="110"/> - </imageobject> - <imageobject role="fo"> - <imagedata fileref="images/Signin.png" format="PNG" align="center" scalefit="1" contentwidth="150mm"/> - </imageobject> - </mediaobject> </step> <step> <para> Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Permission.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Permission.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Permission.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -248,7 +248,7 @@ <section id="sect-User_Guide-Manage_Permission-Set_the_Edit_Permission_on_a_Page"> <title>Set Edit Permission on a Page</title> <para> - Only users who are in the page's editor group can edit it. The access right can be set for several groups but the <emphasis>edit</emphasis> right only can be set for one group. To give a user the edit permission, you must add them to the editors group of that page. + Only users who are in the page's editor group can edit it. The access right can be set for several groups but the edit right only can be set for one group. To give a user the edit permission, you must add them to the editors group of that page. </para> <para> The Permission Setting tab is available in two different ways: @@ -284,6 +284,11 @@ Locate the page you want to edit using the <emphasis role="bold">Page Id</emphasis> column then click the edit icon (next to the trash icon). You will be taken to the <emphasis role="bold">Page Editor</emphasis>. </para> </step> + <step> + <para> + Click on the <guilabel>View Page Properties</guilabel> button in the <emphasis role="bold">Page Editor</emphasis> window. + </para> + </step> <step> <para> Click on the <emphasis role="bold">Permission Setting</emphasis> tab then the <emphasis role="bold">Edit Permission Setting</emphasis> sub tab. Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -129,7 +129,7 @@ An administrator can easily access numerous portals running in the &PRODUCT; instance. </para> <para> - To access a portal, click <emphasis role="bold">Site</emphasis> on the Toolbar. A list of active portals will appear: + To access a portal, click <emphasis role="bold">Site</emphasis> on the Toolbar. You will be taken to the Site Management page, which shows a list of portals and possible actions: </para> <mediaobject> <imageobject role="html"> @@ -200,10 +200,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/NavigationManagement.png" format="PNG" align="center" scale="90" /> + <imagedata fileref="images/NavigationManagement.png" format="PNG" align="center" scale="100" /> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/NavigationManagement.png" format="PNG" align="center" contentwidth="150mm" /> + <imagedata fileref="images/NavigationManagement.png" format="PNG" align="center" contentwidth="100mm" /> </imageobject> </mediaobject> <para> Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/User_Management.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/User_Management.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portal/User_Management.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -12,7 +12,7 @@ <section id="sect-User_Guide-User_Management-Manage_users"> <title>Manage users</title> <para> - Mouse over <emphasis role="bold">Group</emphasis> in the Toolbar. Highlight <emphasis role="bold">Organization</emphasis> and select <emphasis>Users and Groups Management</emphasis> + Mouse over <emphasis role="bold">Group</emphasis> in the Toolbar. Highlight <emphasis role="bold">Organization</emphasis> and select <emphasis role="bold">Users and Groups Management</emphasis> </para> <mediaobject> <imageobject role="html"> @@ -429,7 +429,7 @@ By default three membership types are available: <emphasis>Manager</emphasis>, <emphasis>Member</emphasis> and <emphasis>Validator</emphasis>. By definition, Manager has got the highest rights in a group. </para> <para> - Mouse over <emphasis role="bold">Group</emphasis> on the Toolbar. Highlight <emphasis role="bold">Organization</emphasis> and select <emphasis>Users and Groups Management</emphasis>. Select the <emphasis role="bold">Membership Management</emphasis> tab. + Mouse over <emphasis role="bold">Group</emphasis> on the Toolbar. Highlight <emphasis role="bold">Organization</emphasis> and select <emphasis role="bold">Users and Groups Management</emphasis>. Select the <emphasis role="bold">Membership Management</emphasis> tab. </para> <para> This tab remembers the last action taken by a user in this page. Clicking <emphasis role="bold">Reset</emphasis> will clear any legacy details. Modified: epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml =================================================================== --- epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_0_Branch/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -87,7 +87,7 @@ <term><emphasis role="bold">Calendar</emphasis></term> <listitem> <para> - The calendar gadget allows users to switch easily between daily, monthly and yearly view and, is customizable to match your portal's theme. + The calendar gadget helps track and plan your events and activities. </para> <mediaobject> <imageobject role="html"> @@ -103,7 +103,7 @@ <term><emphasis role="bold">ToDo</emphasis></term> <listitem> <para> - This application helps you organize your day and work group. It is designed to keep track of your tasks in a convenient and transparent way. Tasks can be highlighted with different colors. + This application helps you organize your day and work group. It is designed to keep track of your tasks in a convenient and transparent way. </para> <mediaobject> <imageobject role="html"> @@ -190,7 +190,7 @@ For example: </para> <programlisting> -http://widgets.clearspring.com/cscallback/gallery/4920a0df9f15b805/googlegallery.xml +http://www.donalobrien.net/apps/google/currency.xml </programlisting> <note> <title>URL Types</title> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/BookingEventHandler.java =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/BookingEventHandler.java 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/BookingEventHandler.java 2010-12-13 04:21:55 UTC (rev 5573) @@ -1,8 +1,8 @@ - public class BookingEventHandler implements BridgeEventHandler +public class BookingEventHandler implements BridgeEventHandler + { + public EventNavigationResult handleEvent(FacesContext context, Event event) { - public EventNavigationResult handleEvent(FacesContext context, Event event) - { - //process event payload here - } + //process event payload here + } - } + } Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default197.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default197.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default197.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -1,20 +1,20 @@ - <portlet> - <portlet-name>yourPortletName</portlet-name> - <portlet-class> - javax.portlet.faces.GenericFacesPortlet - </portlet-class> +<portlet> + <portlet-name>yourPortletName</portlet-name> + <portlet-class> + javax.portlet.faces.GenericFacesPortlet + </portlet-class> - <init-param> - <name>javax.portlet.faces.defaultViewId.view</name> - <value>/welcome.xhtml</value> - </init-param> + <init-param> + <name>javax.portlet.faces.defaultViewId.view</name> + <value>/welcome.xhtml</value> + </init-param> - <init-param> - <name>javax.portlet.faces.defaultViewId.edit</name> - <value>/jsf/edit.xhtml</value> - </init-param> + <init-param> + <name>javax.portlet.faces.defaultViewId.edit</name> + <value>/jsf/edit.xhtml</value> + </init-param> - <init-param> - <name>javax.portlet.faces.defaultViewId.help</name> - <value>/jsf/help.xhtml</value> - </init-param> + <init-param> + <name>javax.portlet.faces.defaultViewId.help</name> + <value>/jsf/help.xhtml</value> + </init-param> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default198.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default198.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default198.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -1,4 +1,4 @@ - <init-param> - <name>javax.portlet.faces.preserveActionParams</name> - <value>true</value> - </init-param> +<init-param> + <name>javax.portlet.faces.preserveActionParams</name> + <value>true</value> +</init-param> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default199.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default199.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default199.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -1,8 +1,8 @@ - <faces-config> - <application> - <view-handler> - org.jboss.portletbridge.application.PortletViewHandler - </view-handler> - <state-manager>org.jboss.portletbridge.application.PortletStateManager</state-manager> - </application> - ... +<faces-config> + <application> + <view-handler> + org.jboss.portletbridge.application.PortletViewHandler + </view-handler> + <state-manager>org.jboss.portletbridge.application.PortletStateManager</state-manager> + </application> + ... Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default200.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default200.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default200.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -1,10 +1,10 @@ - <web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - ... - <!-- This is optional parameters for a facelets based application --> - <context-param> - <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name> - <param-value>org.jboss.portletbridge.application.FaceletPortletViewHandler</param-value> - </context-param> +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + ... + <!-- This is optional parameters for a facelets based application --> + <context-param> + <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name> + <param-value>org.jboss.portletbridge.application.FaceletPortletViewHandler</param-value> + </context-param> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default201.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default201.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default201.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -1,8 +1,8 @@ - <context-param> - <param-name>javax.portlet.faces.RENDER_POLICY</param-name> - <param-value> - ALWAYS_DELEGATE - </param-value> - </context-param> - ... - </web-app> + <context-param> + <param-name>javax.portlet.faces.RENDER_POLICY</param-name> + <param-value> + ALWAYS_DELEGATE + </param-value> + </context-param> + ... +</web-app> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default202.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default202.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default202.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -1,13 +1,13 @@ - <web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> - <context-param> - <param-name>javax.portlet.faces.renderPolicy</param-name> - <param-value> - NEVER_DELEGATE - </param-value> - </context-param> - ... - </web-app> + <context-param> + <param-name>javax.portlet.faces.renderPolicy</param-name> + <param-value> + NEVER_DELEGATE + </param-value> + </context-param> + ... +</web-app> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default203.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default203.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default203.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -1,4 +1,4 @@ - <context-param> - <param-name>javax.portlet.faces.BridgeImplClass</param-name> - <param-value>org.apache.myfaces.portlet.faces.bridge.BridgeImpl</param-value> - </context-param> +<context-param> + <param-name>javax.portlet.faces.BridgeImplClass</param-name> + <param-value>org.apache.myfaces.portlet.faces.bridge.BridgeImpl</param-value> +</context-param> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default204.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default204.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default204.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -1,8 +1,8 @@ - <context-param> - <param-name>org.richfaces.LoadStyleStrategy</param-name> - <param-value>ALL</param-value> - </context-param> - <context-param> - <param-name>org.richfaces.LoadScriptStrategy</param-name> - <param-value>ALL</param-value> - </context-param> +<context-param> + <param-name>org.richfaces.LoadStyleStrategy</param-name> + <param-value>ALL</param-value> +</context-param> +<context-param> + <param-name>org.richfaces.LoadScriptStrategy</param-name> + <param-value>ALL</param-value> +</context-param> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default205.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default205.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default205.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -1,3 +1,3 @@ - <script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript"></script> - <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript"></script> - <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss"/> +<script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript"></script> +<script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript"></script> +<link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss"/> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default206.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default206.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default206.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -1,20 +1,20 @@ - <context-param> - <param-name>org.ajax4jsf.RESOURCE_URI_PREFIX</param-name> - <param-value>rfRes</param-value> - </context-param> + <context-param> + <param-name>org.ajax4jsf.RESOURCE_URI_PREFIX</param-name> + <param-value>rfRes</param-value> + </context-param> - <filter> - <display-name>Ajax4jsf Filter</display-name> - <filter-name>ajax4jsf</filter-name> - <filter-class>org.ajax4jsf.Filter</filter-class> - </filter> + <filter> + <display-name>Ajax4jsf Filter</display-name> + <filter-name>ajax4jsf</filter-name> + <filter-class>org.ajax4jsf.Filter</filter-class> + </filter> - <filter-mapping> - <filter-name>ajax4jsf</filter-name> - <servlet-name>FacesServlet</servlet-name> - <dispatcher>FORWARD</dispatcher> - <dispatcher>REQUEST</dispatcher> - <dispatcher>INCLUDE</dispatcher> - </filter-mapping> - ... - </web-app> + <filter-mapping> + <filter-name>ajax4jsf</filter-name> + <servlet-name>FacesServlet</servlet-name> + <dispatcher>FORWARD</dispatcher> + <dispatcher>REQUEST</dispatcher> + <dispatcher>INCLUDE</dispatcher> + </filter-mapping> + ... +</web-app> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default207.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default207.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default207.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -1,6 +1,6 @@ - <context-param> - <param-name>org.jboss.portletbridge.ExceptionHandler</param-name> - <param-value> - org.jboss.portletbridge.SeamExceptionHandlerImpl - </param-value> - </context-param> +<context-param> + <param-name>org.jboss.portletbridge.ExceptionHandler</param-name> + <param-value> + org.jboss.portletbridge.SeamExceptionHandlerImpl + </param-value> +</context-param> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default208.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default208.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default208.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -1,4 +1,4 @@ - <context-param> - <param-name>javax.faces.LIFECYCLE_ID</param-name> - <param-value>SEAM_PORTLET</param-value> - </context-param> +<context-param> + <param-name>javax.faces.LIFECYCLE_ID</param-name> + <param-value>SEAM_PORTLET</param-value> +</context-param> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default209.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default209.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default209.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -1,5 +1,5 @@ - <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" - version="2.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2... - http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"> +<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" + version="2.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2... + http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default210.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default210.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default210.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -1,8 +1,8 @@ - <init-param> - <name>javax.portlet.faces.autoDispatchEvents</name> - <value>true</value> - </init-param> - <init-param> - <name>javax.portlet.faces.bridgeEventHandler</name> - <value>org.foo.eventhandler</value> - </init-param> +<init-param> + <name>javax.portlet.faces.autoDispatchEvents</name> + <value>true</value> +</init-param> +<init-param> + <name>javax.portlet.faces.bridgeEventHandler</name> + <value>org.foo.eventhandler</value> +</init-param> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default211.java =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default211.java 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default211.java 2010-12-13 04:21:55 UTC (rev 5573) @@ -1,4 +1,4 @@ - if (response instanceof StateAwareResponse) { - StateAwareResponse stateResponse = (StateAwareResponse) response; - stateResponse.setEvent(Foo.QNAME, new Bar()); - } +if (response instanceof StateAwareResponse) { + StateAwareResponse stateResponse = (StateAwareResponse) response; + stateResponse.setEvent(Foo.QNAME, new Bar()); + } Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default212.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default212.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default212.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -1,6 +1,6 @@ - <init-param> - <name>javax.portlet.faces.bridgePublicRenderParameterHandler</name> - <value>org.foo.PRPHandler</value> - </init-param> - ... - <supported-public-render-parameter>myCoolPRP</supported-public-render-parameter> +<init-param> + <name>javax.portlet.faces.bridgePublicRenderParameterHandler</name> + <value>org.foo.PRPHandler</value> +</init-param> + ... +<supported-public-render-parameter>myCoolPRP</supported-public-render-parameter> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default213.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default213.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default213.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -1,16 +1,16 @@ - <managed-bean> - <managed-bean-name>bookingPRP</managed-bean-name> - <managed-bean-class>your.class.Name</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> +<managed-bean> + <managed-bean-name>bookingPRP</managed-bean-name> + <managed-bean-class>your.class.Name</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> +</managed-bean> - <application> - <application-extension> - <bridge:public-parameter-mappings> - <bridge:public-parameter-mapping> - <parameter>"the name of your portlet":hotelName</parameter> - <model-el>#{bookingPRP.hotelName}</model-el> - </bridge:public-parameter-mapping> - </bridge:public-parameter-mappings> - </application-extension> - </application> +<application> + <application-extension> + <bridge:public-parameter-mappings> + <bridge:public-parameter-mapping> + <parameter>"the name of your portlet":hotelName</parameter> + <model-el>#{bookingPRP.hotelName}</model-el> + </bridge:public-parameter-mapping> + </bridge:public-parameter-mappings> + </application-extension> +</application> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default214.java =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default214.java 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default214.java 2010-12-13 04:21:55 UTC (rev 5573) @@ -1,4 +1,4 @@ - if (response instanceof StateAwareResponse) { - StateAwareResponse stateResponse = (StateAwareResponse) response; - stateResponse.setRenderParameter("hotelName",selectedHotel.getName()); - } +if (response instanceof StateAwareResponse) { + StateAwareResponse stateResponse = (StateAwareResponse) response; + stateResponse.setRenderParameter("hotelName",selectedHotel.getName()); + } Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default215.java =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default215.java 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default215.java 2010-12-13 04:21:55 UTC (rev 5573) @@ -1,11 +1,11 @@ - public void processUpdates(FacesContext context) - { - ELContext elContext = context.getELContext(); - BookingPRPBean bean = (BookingPRPBean) elContext.getELResolver().getValue(elContext, null, "bookingPRP"); +public void processUpdates(FacesContext context) +{ + ELContext elContext = context.getELContext(); + BookingPRPBean bean = (BookingPRPBean) elContext.getELResolver().getValue(elContext, null, "bookingPRP"); - if(null != bean){ - //Do something with bean.getHotelName()); - } else { + if(null != bean){ + //Do something with bean.getHotelName()); + } else { - } - } + } +} Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default216.java =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default216.java 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default216.java 2010-12-13 04:21:55 UTC (rev 5573) @@ -1 +1 @@ - #{resource['/img/the-path-to-my-image.png']} +#{resource['/img/the-path-to-my-image.png']} Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default217.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default217.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default217.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -1,5 +1,5 @@ - <managed-bean> - <managed-bean-name>resource</managed-bean-name> - <managed-bean-class>org.richfaces.demo.common.ResourceBean</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> - </managed-bean> +<managed-bean> + <managed-bean-name>resource</managed-bean-name> + <managed-bean-class>org.richfaces.demo.common.ResourceBean</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> +</managed-bean> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/WSRP/default258.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/WSRP/default258.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/WSRP/default258.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_wsrp_consume... http://www.jboss.org/portal/xsd/gatein_wsrp_consumer_1_0.xsd"> <deployment> - <wsrp-producer id="selfv1" expiration-cache="500" ws-timeout="50000"> + <wsrp-producer id="selfv1" expiration-cache="300" ws-timeout="30000"> <endpoint-wsdl-url>http://localhost:8080/wsrp-producer/v1/MarkupService?wsdl</endpoint-wsdl-url> <registration-data/> </wsrp-producer> </deployment> <deployment> - <wsrp-producer id="selfv2" expiration-cache="500" ws-timeout="50000"> + <wsrp-producer id="selfv2" expiration-cache="300" ws-timeout="30000"> <endpoint-wsdl-url>http://localhost:8080/wsrp-producer/v2/MarkupService?wsdl</endpoint-wsdl-url> <registration-data/> </wsrp-producer> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/PortalLifecycle.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/PortalLifecycle.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/PortalLifecycle.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -85,7 +85,7 @@ <section id="sect-Reference_Guide-Portal_Life_cycle-The_Command_Servlet"> <title>The Command Servlet</title> <para> - The servlet is the main entry point for incoming requests, it also includes some <literal>init</literal> code when the portal is launched. This servlet (<literal>org.gatein.wci.command.CommandServlet</literal>) is automatically added during deployment and mapped to <literal>/gateinservlet</literal>. + The CommandServlet is called by the portlet container for requests to particular portlets, it also includes some <literal>init</literal> code when the portal is launched. This servlet (<literal>org.gatein.wci.command.CommandServlet</literal>) is automatically added during the deployment of each portlet application and mapped to <literal>/gateinservlet</literal>. </para> <para> This is equivalent to adding the following into <filename>web.xml</filename>. Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -190,7 +190,7 @@ <section id="sect-Reference_Guide-Skinning_the_Portal-The_Default_Skin"> <title>The Default Skin</title> <para> - The default skin for &PRODUCT; is located as part of the <literal>01eXoResource.war</literal>. The main files associated with the skin are: + The default skin for &PRODUCT; is located as part of the <literal>01eXoResources.war</literal>. The main files associated with the skin are: </para> <variablelist> <varlistentry> @@ -470,7 +470,7 @@ The portlet specification defines a set of default CSS classes that should be available for portlets. These classes are included as part of the portal skin. Please see the portlet specification for a list of the default classes that should be available. </para> <para> - For the default portal skin, the portlet specification CSS classes are defined in: <filename>eXoResources.war/skin/Portlet/Stylesheet.CSS</filename>. + For the default portal skin, the portlet specification CSS classes are defined in: <filename>01eXoResources.war/skin/Portlet/Stylesheet.CSS</filename>. </para> </section> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -8,10 +8,12 @@ <para> The 329 specification is aimed at making the developer&#39;s life as easy as possible with JSF+Portlet development. You will see below that there are minimal settings to getting any JSF web application up and running in the Portal environment. </para> - <para> + <!-- Commented as Maven Archetypes section removed from gettingstarted.xml + <para> If you are new to these concepts, we highly recommend you refer to <xref linkend="sect-Reference_Guide-Getting_started_with_JBoss_Portlet_Bridge-Maven_Archetypes" />. - </para> - <section id="sect-Reference_Guide-Bridge_Configuration-Core_Setup_and_Configuration"> + </para>--> + + <section id="sect-Reference_Guide-Bridge_Configuration-Core_Setup_and_Configuration"> <title>Core Setup and Configuration</title> <section id="sect-Reference_Guide-Core_Setup_and_Configuration-portlet.xml"> <title>portlet.xml</title> @@ -102,7 +104,8 @@ </section> - <section id="sect-Reference_Guide-Core_Setup_and_Configuration-JSR_329"> +<!-- Section removed as per feedback from Prabhat Jha +<section id="sect-Reference_Guide-Core_Setup_and_Configuration-JSR_329"> <title>JSR-329</title> <para> The JBoss Portlet Bridge can be used with any compatible implementation (for example, <literal>MyFaces</literal> implementation). Simply put the following into <filename>web.xml</filename>: @@ -110,7 +113,7 @@ <programlisting language="XML" role="XML"><xi:include href="../../../extras/PortletBridge_Configuration/default203.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> - </section> + </section>--> </section> @@ -149,6 +152,306 @@ <programlisting language="XML" role="XML"><xi:include href="../../../extras/PortletBridge_Configuration/default206.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> + </section> + <!-- Table added from JBEPP-708--> + <section> + <title>Simple RichFaces vs RichFaces over WSRP</title> + <table> + <title></title> + <tgroup cols="3"> + <thead> + <row> + <entry> + Richfaces Component + </entry> + <entry> + Supported as Local Portlet + </entry> + <entry> + Supported as Remote Portlet using WSRP + </entry> + </row> + </thead> + <tbody> + <row> + <entry> + <literal>a4j:commandButton</literal> + </entry> + <entry> + Yes + </entry> + <entry> + Yes + </entry> + </row> + <row> + <entry> + <literal>a4j:commandLink</literal> + </entry> + <entry> + Yes + </entry> + <entry> + Yes + </entry> + </row> + <row> + <entry> + <literal>a4j:jsFunction</literal> + </entry> + <entry> + Yes + </entry> + <entry> + Yes + </entry> + </row> + <row> + <entry> + <literal>a4j:push</literal> + </entry> + <entry> + Yes + </entry> + <entry> + Yes + </entry> + </row> + <row> + <entry> + <literal>a4j:poll</literal> + </entry> + <entry> + Yes + </entry> + <entry> + Yes + </entry> + </row> + <row> + <entry> + <literal>a4j:queue</literal> + </entry> + <entry> + No + </entry> + <entry> + No + </entry> + </row> + <row> + <entry> + <literal>a4j:status</literal> + </entry> + <entry> + Yes + </entry> + <entry> + Yes + </entry> + </row> + <row> + <entry> + <literal>a4j:keepAlive</literal> + </entry> + <entry> + Yes + </entry> + <entry> + Yes + </entry> + </row> + <row> + <entry> + <literal>a4j:include</literal> + </entry> + <entry> + Yes + </entry> + <entry> + Yes + </entry> + </row> + <row> + <entry> + <literal>a4j:loadStyle</literal> + </entry> + <entry> + No + </entry> + <entry> + No + </entry> + </row> + <row> + <entry> + <literal>a4j:loadScript</literal> + </entry> + <entry> + Yes + </entry> + <entry> + Yes + </entry> + </row> + <row> + <entry> + <literal>a4j:ajaxValidator</literal> + </entry> + <entry> + Yes + </entry> + <entry> + Yes + </entry> + </row> + <row> + <entry> + <literal>a4j:beanValidator</literal> + </entry> + <entry> + Yes + </entry> + <entry> + Yes + </entry> + </row> + <row> + <entry> + <literal>a4j:graphValidator</literal> + </entry> + <entry> + Yes + </entry> + <entry> + Yes + </entry> + </row> + <row> + <entry> + <literal>a4j:mediaOutput</literal> + </entry> + <entry> + No + </entry> + <entry> + Yes + </entry> + </row> + <row> + <entry> + <literal>a4j:outputPanel</literal> + </entry> + <entry> + No + </entry> + <entry> + Yes + </entry> + </row> + <row> + <entry> + <literal>a4j:log</literal> + </entry> + <entry> + Yes + </entry> + <entry> + Yes + </entry> + </row> + <row> + <entry> + <literal>rich:dataTable</literal> + </entry> + <entry> + No + </entry> + <entry> + No + </entry> + </row> + <row> + <entry> + <literal>a4j:dataFilterSlider</literal> + </entry> + <entry> + Yes + </entry> + <entry> + Yes + </entry> + </row> + <row> + <entry> + <literal>rich:dataGrid</literal> + </entry> + <entry> + Yes + </entry> + <entry> + No + </entry> + </row> + <row> + <entry> + <literal>rich:dataList</literal> + </entry> + <entry> + Yes + </entry> + <entry> + Yes + </entry> + </row> + <row> + <entry> + <literal>rich:datascroller</literal> + </entry> + <entry> + No + </entry> + <entry> + No + </entry> + </row> + <row> + <entry> + <literal>rich:extendedDataTable</literal> + </entry> + <entry> + No + </entry> + <entry> + No + </entry> + </row> + <row> + <entry> + rich:repeat + </entry> + <entry> + Yes + </entry> + <entry> + Yes + </entry> + </row> + <row> + <entry> + rich:scrollableDataTable + </entry> + <entry> + No + </entry> + <entry> + Yes + </entry> + </row> + </tbody> + </tgroup> + </table> + </section> @@ -182,12 +485,12 @@ <programlisting language="XML" role="XML"><xi:include href="../../../extras/PortletBridge_Configuration/default207.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> - <para> +<!-- Section removed as per feedback from Prabhat Jha + <para> If you are using this bridge version from <literal>2.0.0.BETA</literal> through <literal>2.0.0.CR1</literal>, you must define the following <filename>web.xml</filename> parameter to use the JBoss Portlet Bridge provided Seam Phase Listener. This is done by the bridge automatically (if needed) in <literal>2.0.0.FINAL</literal>. </para> -<programlisting language="XML" role="XML"><xi:include href="../../../extras/PortletBridge_Configuration/default208.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> - +<programlisting language="XML" role="XML"><xi:include href="../../../extras/PortletBridge_Configuration/default208.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>--> </section> </section> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -9,7 +9,6 @@ JBoss Portlet Bridge not only gives you the ability to run JSF web applications in a portlet, but also gives you the benefit of running supported JBoss frameworks like <application>Seam</application> and <application>RichFaces</application>. </para> <section id="sect-Reference_Guide-Getting_started_with_JBoss_Portlet_Bridge-Whats_New_in_2.0"> -<!--DOC NOTE: Branching issue --> <title>What&#39;s New in 2.0?</title> <section id="sect-Reference_Guide-Whats_New_in_2.0-Eventing"> <title>Eventing</title> @@ -111,17 +110,17 @@ The embedded version in the &PRODUCT; is made to be compatible with the JSF implementation, portal and application server that compose the product. You will find the binaries embedded in <filename>jboss-epp-5.0/portletbridge</filename> </para> <para> - You can run a provided archetype (See <xref linkend="sect-Reference_Guide-Getting_started_with_JBoss_Portlet_Bridge-Maven_Archetypes" />) and deploy the generated <literal>war</literal> or <literal>ear</literal> in a few easy steps. + You can run a provided archetype and deploy the generated <literal>war</literal> or <literal>ear</literal> in a few easy steps. <!--(See <xref linkend="sect-Reference_Guide-Getting_started_with_JBoss_Portlet_Bridge-Maven_Archetypes" />)--> </para> </section> - <section id="sect-Reference_Guide-Getting_started_with_JBoss_Portlet_Bridge-Maven_Archetypes"> + <!-- Section removed as per feedback from Prabhat Jha + <section id="sect-Reference_Guide-Getting_started_with_JBoss_Portlet_Bridge-Maven_Archetypes"> <title>Maven Archetypes</title> <para> This product utilizes <ulink url="http://maven.apache.org/guides/introduction/introduction-to-arc... archetypes</ulink> which allow you get up and running with different flavors of the bridge quickly. </para> -<!--DOC NOTE: Branching issue --> <table frame="all" id="tabl-Reference_Guide-Maven_Archetypes-Available_Archetypes"> <title>Available Archetypes</title> <tgroup align="left" cols="5" colsep="1" rowsep="1"> @@ -140,11 +139,6 @@ </row> </thead> <tbody> - <row> - <entry align="left" nameend="c5" namest="c1"> - <emphasis role="bold">For PortletBridge 2.0.0 as shipped with &PRODUCT; 5.0</emphasis>. - </entry> - </row> <row class="table-odd" style="background-color:#D6DEE0;border:1px solid #E1E9EB;color:#334558;"> <entry align="left"> JSF 1.2 Basic @@ -176,11 +170,6 @@ </entry> </row> <row> - <entry align="left" nameend="c5" namest="c1"> - <emphasis role="bold">For PortletBridge 2.1.0 as shipped with &PRODUCT; &VERSION_MINOR;</emphasis>. - </entry> - </row> - <row> <entry> Any combination JSF 1.2, RichFaces, or Seam. </entry> @@ -192,10 +181,11 @@ </tbody> </tgroup> </table> - </section> + </section>--> - <section id="sect-Reference_Guide-Getting_started_with_JBoss_Portlet_Bridge-Video_Tutorials"> + <!-- Section removed as per feedback from Prabhat Jha + <section id="sect-Reference_Guide-Getting_started_with_JBoss_Portlet_Bridge-Video_Tutorials"> <title>Video Tutorials</title> <para> The following links provide tutorial videos created by the Portlet Bridge developer: @@ -232,7 +222,7 @@ </para> </listitem> </itemizedlist> - </section> + </section>--> </section> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/WSRP.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/WSRP.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/WSRP.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -53,14 +53,11 @@ &PRODUCT; does not support custom window states or modes, therefore neither does the WSRP component. It does, however, support CSS on both the Producer (although this is more a function of the portlets than an inherent Producer capability) and Consumer. </para> <para> - &PRODUCT; 5.0 provides a complete implementation of WSRP 1.0 while &PRODUCT; 5.1 includes an implementation of WSRP 2.0. + &PRODUCT; 5.1 includes implementations of WSRP 1.0 and 2.0. </para> <para> All optional features in WSRP 2 are implemented in &PRODUCT; 5.1 except support for lifetimes and leasing support. </para> - <para> - Users should familiarize themselves with the appropriate sections of this chapter based on their version of &PRODUCT;. - </para> </section> @@ -74,10 +71,10 @@ <variablelist> <title></title> <varlistentry> - <term><replaceable>EPP_HOME</replaceable></term> + <term><replaceable>JBOSS_HOME</replaceable></term> <listitem> <para> - <replaceable>EPP_HOME</replaceable> refers to the directory that your instance of &PRODUCT; has been extracted/installed to. For example: <filename>/home/<replaceable>USERNAME</replaceable>/jboss-epp-<replaceable>&lt;VERSION&gt;</replaceable>/</filename> + <replaceable>JBOSS_HOME</replaceable> refers to the directory that your instance of &PRODUCT; has been extracted/installed to. For example: <filename>/home/<replaceable>USERNAME</replaceable>/jboss-epp-<replaceable>&lt;VERSION&gt;</replaceable>/</filename> </para> </listitem> </varlistentry> @@ -114,7 +111,7 @@ <variablelist id="vari-Reference_Guide-Deploying_WSRP-WSRP_support_files"> <title>WSRP support files</title> <varlistentry> - <term><replaceable>PORTAL_HOME</replaceable>/wsrp-admin-gui.war</term> + <term><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/wsrp-admin-gui.war</term> <listitem> <para> This file contains the WSRP Configuration portlet with which you can configure consumers to access remote servers and how the WSRP producer is configured. @@ -122,7 +119,7 @@ </listitem> </varlistentry> <varlistentry> - <term><replaceable>PORTAL_HOME</replaceable>/wsrp-producer.war</term> + <term><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/wsrp-producer.war</term> <listitem> <para> This file contains the WSRP producer web application. @@ -130,7 +127,7 @@ </listitem> </varlistentry> <varlistentry> - <term><replaceable>PORTAL_HOME</replaceable>/lib/wsrp-common-<replaceable>WSRP_VERSION</replaceable>.jar</term> + <term><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/wsrp-common-<replaceable>WSRP_VERSION</replaceable>.jar</term> <listitem> <para> This file contains common classes needed by the different WSRP libraries. @@ -138,7 +135,7 @@ </listitem> </varlistentry> <varlistentry> - <term><replaceable>PORTAL_HOME</replaceable>/lib/wsrp-consumer-<replaceable>WSRP_VERSION</replaceable>.jar</term> + <term><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/wsrp-consumer-<replaceable>WSRP_VERSION</replaceable>.jar</term> <listitem> <para> This file contains the WSRP consumer. @@ -146,7 +143,7 @@ </listitem> </varlistentry> <varlistentry> - <term><replaceable>PORTAL_HOME</replaceable>/lib/wsrp-integration-api-<replaceable>WSRP_VERSION</replaceable>.jar</term> + <term><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/wsrp-integration-api-<replaceable>WSRP_VERSION</replaceable>.jar</term> <listitem> <para> This file contains the API classes needed to integrate the WSRP component into portals. @@ -154,7 +151,7 @@ </listitem> </varlistentry> <varlistentry> - <term><replaceable>PORTAL_HOME</replaceable>/lib/wsrp-producer-lib-$WSRP_VERSION.jar</term> + <term><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/wsrp-producer-lib-$WSRP_VERSION.jar</term> <listitem> <para> This file contains the classes needed by the WSRP producer. @@ -162,7 +159,7 @@ </listitem> </varlistentry> <varlistentry> - <term><replaceable>PORTAL_HOME</replaceable>/lib/wsrp-wsrp1-ws-<replaceable>WSRP_VERSION</replaceable>.jar</term> + <term><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/wsrp-wsrp1-ws-<replaceable>WSRP_VERSION</replaceable>.jar</term> <listitem> <para> This file contains the generated JAX-WS classes for WSRP version 1. @@ -170,7 +167,7 @@ </listitem> </varlistentry> <varlistentry> - <term><replaceable>PORTAL_HOME</replaceable>/lib/wsrp-wsrp2-ws-<replaceable>WSRP_VERSION</replaceable>.jar</term> + <term><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/wsrp-wsrp2-ws-<replaceable>WSRP_VERSION</replaceable>.jar</term> <listitem> <para> This file contains the JAX-WS classes for WSRP version 2. @@ -178,7 +175,7 @@ </listitem> </varlistentry> <varlistentry> - <term><replaceable>PORTAL_HOME</replaceable>/lib/gatein.portal.component.wsrp-<replaceable>PORTAL_VERSION</replaceable>.jar</term> + <term><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/gatein.portal.component.wsrp-<replaceable>PORTAL_VERSION</replaceable>.jar</term> <listitem> <para> This file contains the code to integrate the WSRP service into &PRODUCT;. @@ -187,7 +184,7 @@ </varlistentry> </variablelist> <para> - If WSRP is not going to be used in your &PRODUCT; instance, the <filename><replaceable>PORTAL_HOME</replaceable>/lib/gatein.portal.component.wsrp-<replaceable>PORTAL_VERSION</replaceable>.jar</filename> can be removed to deactivate WSRP support. + If WSRP is not going to be used in your &PRODUCT; instance, the <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/gatein.portal.component.wsrp-<replaceable>PORTAL_VERSION</replaceable>.jar</filename> can be removed to deactivate WSRP support. </para> <section id="sect-Reference_Guide-Deploying_WSRP-Non_default_Ports_or_Hostnames"> @@ -282,7 +279,7 @@ <variablelist> <title></title> <varlistentry> - <term>&PRODUCT; 5.0 and WSRP 1.0:</term> + <term>WSRP 1.0:</term> <listitem> <para> <filename>http://<replaceable>{hostname}</replaceable>:<replaceable>{port}</replaceable>/wsrp-producer/v1/MarkupService?wsdl</filename>. @@ -290,7 +287,7 @@ </listitem> </varlistentry> <varlistentry> - <term>&PRODUCT; 5.1 and WSRP 2.0:</term> + <term>WSRP 2.0:</term> <listitem> <para> <filename>http://<replaceable>{hostname}</replaceable>:<replaceable>{port}</replaceable>/wsrp-producer/v2/MarkupService?wsdl</filename>. @@ -317,9 +314,11 @@ <para> Once a remote producer has been configured, the portlets that it exposes are then available in the Application Registry to be added to categories and then to pages. </para> +<!-- Removed as out of date and not in Community version of doc. <para> A default consumer named <literal>self</literal>, that consumes the portlets exposed by &PRODUCT;'s producer, has been configured as a way to test the WSRP producer service and to check that portlets are correctly published via WSRP. </para> +--> </section> @@ -350,51 +349,39 @@ <para> &PRODUCT; provides a graphical portlet to assist with configuring access to, and other facets of, remote WSRP Producers. </para> -<!--DOC NOTE: Branching issue --> - <important> - <title>Important: Version-specific Information</title> + <para> + It is available at: <ulink type="http" url="http://localhost:8080/portal/login?initialURI=%2Fportal%2Fprivate%2Fclassic%2FwsrpConfiguration&amp;username=root&amp;password=gtn"></ulink>. + </para> + <para> + The portlet also is a group page for /platform/administrators + </para> + <para> + Although the Configuration Portlet is installed by default in &PRODUCT; 5.1., installation instructions are included below should the portlet ever need to be re-installed: + </para> + <procedure> + <title><emphasis role="bold">Installing the configuration portlet:</emphasis></title> + <step> <para> - <emphasis role="bold">The implementation of this portlet has changed between the &PRODUCT; 5.0 (WSRP 1.0) and &PRODUCT; 5.1 (WSRP 2.0) releases:</emphasis> + Log into the portal as an administrator and go to the Application Registry (Click <ulink url="http://localhost:8080/portal/private/classic/administration/registry">http://localhost:8080/portal/private/classic/administration/registry</ulink> if using the default installation). </para> - <formalpara id="form-Reference_Guide-Configuring_a_Remote_Producer-The_Configuration_Portlet-5.1_Accessing"> - <title><emphasis role="bold">EPP 5.1: Accessing the Configuration Portlet</emphasis></title> - <para> - The Configuration Portlet is installed by default in &PRODUCT; 5.1. It is available at: <ulink type="http" url="http://localhost:8080/portal/login?initialURI=%2Fportal%2Fprivate%2Fclassic%2FwsrpConfiguration&amp;username=root&amp;password=gtn"></ulink> - </para> - </formalpara> - <formalpara id="form-Reference_Guide-Configuring_a_Remote_Producer-The_Configuration_Portlet-5.0_Installing" > - <title><emphasis role="bold">EPP 5.0: Installing the Configuration Portlet</emphasis></title> - <para> - This portlet is not installed by default in &PRODUCT; 5.0. It must be installed using the Application Registry. - </para> - </formalpara> - <procedure> - <title><emphasis role="bold">Installing the configuration portlet:</emphasis></title> - <step> - <para> - Log into the portal as an administrator and go to the Application Registry (Click <ulink url="http://localhost:8080/portal/private/classic/administration/registry">http://localhost:8080/portal/private/classic/administration/registry</ulink> if using the default installation). - </para> - </step> - <step> - <para> - Add the WSRP Configuration portlet to the Administration category. If the Import Applications functionality is used, the WSRP Configuration portlet will be automatically added to the Administration category. - </para> - </step> - <step> - <para> - Once the portlet is added to a category, it can be added to a page and used. It is recommended that it be added to the same page as the Application Registry (as other operations relating to WSRP and adding portlets to categories are somewhat related). Add the WSRP Configuration portlet to the page using the standard procedure. - </para> - </step> - </procedure> - </important> - - - + </step> + <step> + <para> + Add the WSRP Configuration portlet to the Administration category. If the Import Applications functionality is used, the WSRP Configuration portlet will be automatically added to the Administration category. + </para> + </step> + <step> + <para> + Once the portlet is added to a category, it can be added to a page and used. It is recommended that it be added to the same page as the Application Registry (as other operations relating to WSRP and adding portlets to categories are somewhat related). Add the WSRP Configuration portlet to the page using the standard procedure. + </para> + </step> + </procedure> + <section id="sect-Reference_Guide-Configuring_a_Remote_Producer-The_Configuration_Portlet-Using_the_Configuration_Portlet"> <title><emphasis role="bold">Using the Configuration portlet</emphasis></title> <mediaobject> <imageobject role="html"> - <imagedata align="center" fileref="images/WSRP/config_init.png" format="PNG" scale="100" /> + <imagedata align="center" fileref="images/WSRP/config_init.png" format="PNG" scale="120" /> </imageobject> <imageobject role="fo"> <imagedata align="center" contentwidth="140mm" fileref="images/WSRP/config_init.png" format="PNG" /> @@ -456,7 +443,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata align="center" fileref="images/WSRP/config_wsdl.png" format="PNG" scale="100" /> + <imagedata align="center" fileref="images/WSRP/config_wsdl.png" format="PNG" scale="120" /> </imageobject> <imageobject role="fo"> <imagedata align="center" contentwidth="140mm" fileref="images/WSRP/config_wsdl.png" format="PNG" /> @@ -473,7 +460,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata align="center" fileref="images/WSRP/config_refresh.png" format="PNG" scale="100" /> + <imagedata align="center" fileref="images/WSRP/config_refresh.png" format="PNG" scale="120" /> </imageobject> <imageobject role="fo"> <imagedata align="center" contentwidth="140mm" fileref="images/WSRP/config_refresh.png" format="PNG" /> @@ -487,7 +474,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata align="center" fileref="images/WSRP/config_missing.png" format="PNG" scale="100" /> + <imagedata align="center" fileref="images/WSRP/config_missing.png" format="PNG" scale="120" /> </imageobject> <imageobject role="fo"> <imagedata align="center" contentwidth="140mm" fileref="images/WSRP/config_missing.png" format="PNG" /> @@ -504,7 +491,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata align="center" fileref="images/WSRP/config_end.png" format="PNG" scale="100" /> + <imagedata align="center" fileref="images/WSRP/config_end.png" format="PNG" scale="120" /> </imageobject> <imageobject role="fo"> <imagedata align="center" contentwidth="140mm" fileref="images/WSRP/config_end.png" format="PNG" /> @@ -520,7 +507,7 @@ Although using the WSRP Configuration portlet to configure Consumers is recommended, the WSRP component provides an alternative way to configure consumers. </para> <para> - This is done by editing the XML file located at <filename><replaceable>PORTAL_HOME</replaceable>/lib/wsrp-consumer-<replaceable>WSRP_VERSION</replaceable>.jar/conf/wsrp-consumers-config.xml</filename>. + This is done by editing the XML file located at <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/wsrp-consumer-<replaceable>WSRP_VERSION</replaceable>.jar/conf/wsrp-consumers-config.xml</filename>. </para> <programlisting language="XML" role="XML"><xi:include href="../extras/WSRP/default257.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> @@ -529,11 +516,11 @@ </para> <note> <para> - An XML Schema defining which elements are available to configure Consumers via XML can be found in <filename><replaceable>PORTAL_HOME</replaceable>/lib/wsrp-integration-api-<replaceable>WSRP_VERSION</replaceable>.jar/xsd/gatein_wsrp_consumer_1_0.xsd </filename> + An XML Schema defining which elements are available to configure Consumers via XML can be found in <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/wsrp-integration-api-<replaceable>WSRP_VERSION</replaceable>.jar/xsd/gatein_wsrp_consumer_1_0.xsd </filename> </para> </note> </section> -<!--MARK--> + <section id="sect-Reference_Guide-Configuring_a_Remote_Producer-Adding_remote_portlets_to_categories"> <title>Adding remote portlets to categories</title> <para> @@ -541,7 +528,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata align="center" fileref="images/WSRP/remote_portlets.png" format="PNG" scale="100" /> + <imagedata align="center" fileref="images/WSRP/remote_portlets.png" format="PNG" scale="120" /> </imageobject> <imageobject role="fo"> <imagedata align="center" contentwidth="140mm" fileref="images/WSRP/remote_portlets.png" format="PNG" /> @@ -565,12 +552,12 @@ <section id="sect-Reference_Guide-Consuming_Remote_WSRP_Portlets-Configuring_Access_to_Remote_Producers_via_XML"> <title>Configuring Access to Remote Producers via XML</title> <para> - Again, configuring consumers via XML is done by editing <filename><replaceable>PORTAL_HOME</replaceable>/lib/wsrp-consumer-<replaceable>WSRP_VERSION</replaceable>.jar/conf/wsrp-consumers-config.xml</filename>. + Again, configuring consumers via XML is done by editing <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/wsrp-consumer-<replaceable>WSRP_VERSION</replaceable>.jar/conf/wsrp-consumers-config.xml</filename>. </para> <note> <title>XML Elements</title> <para> - An XML Schema defining which elements are available to configure Consumers via XML can be found in <filename> <replaceable>PORTAL_HOME</replaceable>/lib/wsrp-integration-api-<replaceable>WSRP_VERSION</replaceable>.jar/xsd/gatein_wsrp_consumer_1_0.xsd </filename> + An XML Schema defining which elements are available to configure Consumers via XML can be found in <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/wsrp-integration-api-<replaceable>WSRP_VERSION</replaceable>.jar/xsd/gatein_wsrp_consumer_1_0.xsd </filename> </para> </note> <note> @@ -683,7 +670,7 @@ <section id="sect-Reference_Guide-Consuming_Remote_WSRP_Portlets-Examples"> <title>Examples</title> <para> - This is the configuration of the <literal>self</literal> producer as found in <filename>default-wsrp.xml</filename> with a cache expiring every five minutes and with a 30 second timeout for web service operations: + This is the configuration of the <literal>selfv1</literal> and <literal>selfv2</literal> producers as found in <filename>default-wsrp.xml</filename> with a cache expiring every five minutes and with a 30 second timeout for web service operations: </para> <programlisting language="XML" role="XML"><xi:include href="../extras/WSRP/default258.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> @@ -724,7 +711,7 @@ <procedure> <step> <para> - Go to the configuration screen for the <literal>self</literal> producer and change the value of <literal>email</literal> to <literal&gt;foo(a)example.com&lt;/literal&gt; instead of&lt;literal&gt;example(a)example.com&lt;/literal&gt;: + Go to the configuration screen for the <literal>self</literal> producer and change the value of <literal>email</literal> to <literal&gt;foo(a)example.com&lt;/literal&gt; instead of <literal&gt;example(a)example.com&lt;/literal&gt;: </para> <mediaobject> <imageobject role="html"> @@ -754,7 +741,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata align="center" fileref="images/WSRP/modify_reg_end.png" format="PNG" scale="100" /> + <imagedata align="center" fileref="images/WSRP/modify_reg_end.png" format="PNG" scale="120" /> </imageobject> <imageobject role="fo"> <imagedata align="center" contentwidth="140mm" fileref="images/WSRP/modify_reg_end.png" format="PNG" /> @@ -778,7 +765,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata align="center" fileref="images/WSRP/config_self.png" format="PNG" scale="100" /> + <imagedata align="center" fileref="images/WSRP/config_self.png" format="PNG" scale="120" /> </imageobject> <imageobject role="fo"> <imagedata align="center" contentwidth="140mm" fileref="images/WSRP/config_self.png" format="PNG" /> @@ -792,7 +779,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata align="center" fileref="images/WSRP/modify_reg_self.png" format="PNG" scale="100" /> + <imagedata align="center" fileref="images/WSRP/modify_reg_self.png" format="PNG" scale="120" /> </imageobject> <imageobject role="fo"> <imagedata align="center" contentwidth="140mm" fileref="images/WSRP/modify_reg_self.png" format="PNG" /> @@ -806,7 +793,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata align="center" fileref="images/WSRP/modify_reg_self_end.png" format="PNG" scale="100" /> + <imagedata align="center" fileref="images/WSRP/modify_reg_self_end.png" format="PNG" scale="120" /> </imageobject> <imageobject role="fo"> <imagedata align="center" contentwidth="140mm" fileref="images/WSRP/modify_reg_self_end.png" format="PNG" /> @@ -839,7 +826,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata align="center" fileref="images/WSRP/consumer_operations.png" format="PNG" scale="100" /> + <imagedata align="center" fileref="images/WSRP/consumer_operations.png" format="PNG" scale="120" /> </imageobject> <imageobject role="fo"> <imagedata align="center" contentwidth="140mm" fileref="images/WSRP/consumer_operations.png" format="PNG" /> @@ -874,7 +861,7 @@ </listitem> </varlistentry> <varlistentry> - <term>Register/Deregister</term> + <term>Register/De-register</term> <listitem> <para> Registers or deregisters a consumer based on whether registration is required and/or acquired. @@ -885,13 +872,13 @@ <term>Delete</term> <listitem> <para> - Destroys the consumer, after deregisterting it if it was registered. + Destroys the consumer, after de-registering it if it was registered. </para> </listitem> </varlistentry> </variablelist> <formalpara> - <title><emphasis role="bold">EPP 5.1: Additional Functionalities in WSRP 2.0</emphasis></title> + <title><emphasis role="bold">Additional Functionalities in WSRP 2.0</emphasis></title> <para> In addition to those listed above, the WSRP 2.0 implementation in &PRODUCT; 5.1 also includes the following functions: </para> @@ -937,7 +924,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/WSRP/export_portlet_list.png" format="PNG" align="center" scale="95" /> + <imagedata fileref="images/WSRP/export_portlet_list.png" format="PNG" align="center" scale="120" /> </imageobject> <imageobject role="fo"> <imagedata fileref="images/WSRP/export_portlet_list.png" format="PNG" align="center" contentwidth="150mm" /> @@ -950,7 +937,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/WSRP/export_done.png" format="PNG" align="center" scale="95" /> + <imagedata fileref="images/WSRP/export_done.png" format="PNG" align="center" scale="120" /> </imageobject> <imageobject role="fo"> <imagedata fileref="images/WSRP/export_done.png" format="PNG" align="center" contentwidth="150mm" /> @@ -966,7 +953,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/WSRP/export_list.png" format="PNG" align="center" scale="95" /> + <imagedata fileref="images/WSRP/export_list.png" format="PNG" align="center" scale="120" /> </imageobject> <imageobject role="fo"> <imagedata fileref="images/WSRP/export_list.png" format="PNG" align="center" contentwidth="150mm" /> @@ -976,9 +963,9 @@ This screen presents the list of available exports with available operations for each. </para> <variablelist> - <title>View</title> + <title></title> <varlistentry> - <term></term> + <term>View</term> <listitem> <para> Displays the export details as previously seen when the export was first performed. @@ -1009,7 +996,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/WSRP/import_start.png" format="PNG" align="center" scale="95" /> + <imagedata fileref="images/WSRP/import_start.png" format="PNG" align="center" scale="120" /> </imageobject> <imageobject role="fo"> <imagedata fileref="images/WSRP/import_start.png" format="PNG" align="center" contentwidth="150mm" /> @@ -1028,7 +1015,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/WSRP/import_original_page.png" format="PNG" align="center" scale="95" /> + <imagedata fileref="images/WSRP/import_original_page.png" format="PNG" align="center" scale="120" /> </imageobject> <imageobject role="fo"> <imagedata fileref="images/WSRP/import_original_page.png" format="PNG" align="center" contentwidth="150mm" /> @@ -1050,16 +1037,16 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/WSRP/import_selected_page.png" format="PNG" align="center" scale="95" /> + <imagedata fileref="images/WSRP/import_selected_page.png" format="PNG" align="center" scale="120" /> </imageobject> <imageobject role="fo"> <imagedata fileref="images/WSRP/import_selected_page.png" format="PNG" align="center" contentwidth="150mm" /> </imageobject> </mediaobject> <note> - <title></title> + <title>Note</title> <para> - At this point, you still need to select which window content we want to replace before being able to complete the import operation + At this point, you still need to select which window content you want to replace before being able to complete the import operation </para> </note> </step> @@ -1074,7 +1061,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/WSRP/import_success.png" format="PNG" align="center" scale="95" /> + <imagedata fileref="images/WSRP/import_success.png" format="PNG" align="center" scale="120" /> </imageobject> <imageobject role="fo"> <imagedata fileref="images/WSRP/import_success.png" format="PNG" align="center" contentwidth="150mm" /> @@ -1089,7 +1076,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/WSRP/import_modified_page.png" format="PNG" align="center" scale="95" /> + <imagedata fileref="images/WSRP/import_modified_page.png" format="PNG" align="center" scale="120" /> </imageobject> <imageobject role="fo"> <imagedata fileref="images/WSRP/import_modified_page.png" format="PNG" align="center" contentwidth="150mm" /> @@ -1145,10 +1132,10 @@ <section id="sect-Reference_Guide-Configuring_the_WSRP_Producer-Overview"> <title>Overview</title> <para> - The behavior of the Portal's WSRP Producer can be configured using the WSRP administration interface, (this is the recommended method), or by editing the <filename><replaceable>PORTAL_HOME</replaceable>/wsrp-producer.war/WEB-INF/conf/producer/config.xml</filename> file. + The behavior of the Portal's WSRP Producer can be configured using the WSRP administration interface, (this is the recommended method), or by editing the <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/wsrp-producer.war/WEB-INF/conf/producer/config.xml</filename> file. </para> <para> - Several aspects can be modified with respect to whether registration is required for consumers to access the Producer's services. An XML Schema for the configuration format is available at <filename> <replaceable>PORTAL_HOME</replaceable>/lib/wsrp-integration-api-<replaceable>WSRP_VERSION</replaceable>.jar/xsd/gatein_wsrp_producer_1_0.xsd </filename>. + Several aspects can be modified with respect to whether registration is required for consumers to access the Producer's services. An XML Schema for the configuration format is available at <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>&lt;PROFILE&gt;</replaceable>/deploy/gatein.ear/lib/wsrp-integration-api-<replaceable>WSRP_VERSION</replaceable>.jar/xsd/gatein_wsrp_producer_1_0.xsd </filename>. </para> </section> @@ -1174,7 +1161,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata align="center" fileref="images/WSRP/producer_default.png" format="PNG" scale="100" /> + <imagedata align="center" fileref="images/WSRP/producer_default.png" format="PNG" scale="110" /> </imageobject> <imageobject role="fo"> <imagedata align="center" contentwidth="140mm" fileref="images/WSRP/producer_default.png" format="PNG" /> @@ -1201,7 +1188,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata align="center" fileref="images/WSRP/producer_blank.png" format="PNG" scale="100" /> + <imagedata align="center" fileref="images/WSRP/producer_blank.png" format="PNG" width="700" /> </imageobject> <imageobject role="fo"> <imagedata align="center" contentwidth="140mm" fileref="images/WSRP/producer_blank.png" format="PNG" /> @@ -1222,7 +1209,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata align="center" fileref="images/WSRP/producer_registration.png" format="PNG" scale="100" /> + <imagedata align="center" fileref="images/WSRP/producer_registration.png" format="PNG" width="700" /> </imageobject> <imageobject role="fo"> <imagedata align="center" contentwidth="140mm" fileref="images/WSRP/producer_registration.png" format="PNG" /> @@ -1240,7 +1227,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata align="center" fileref="images/WSRP/producer_email.png" format="PNG" scale="100" /> + <imagedata align="center" fileref="images/WSRP/producer_email.png" format="PNG" width="700" /> </imageobject> <imageobject role="fo"> <imagedata align="center" contentwidth="140mm" fileref="images/WSRP/producer_email.png" format="PNG" /> Modified: epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/5.1.0_Release_Notes.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/5.1.0_Release_Notes.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/5.1.0_Release_Notes.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -559,6 +559,17 @@ The following is a list of known issues in this release: </para> <variablelist> + <varlistentry> + <term><ulink type="http" url="https://jira.jboss.org/browse/JBEPP-716"></ulink>... + <listitem> + <para> + Using the <guilabel>Add Node</guilabel> button in Navigation Management (Site or Group) always creates new node at the top level, even when a sub-node is selected. + </para> + <para> + A workaround is to use the right-click context menu instead of the <guilabel>Add Node</guilabel> button. + </para> + </listitem> + </varlistentry> <varlistentry> <term><ulink type="http" url="https://jira.jboss.org/browse/JBEPP-600"></ulink>... <listitem> Modified: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -113,7 +113,7 @@ </step> <step> <para> - Download the Site Publisher 5.1.0 zip file from the Red Hat JBoss Customer Support Portal and extract it to an easily accessible location. + Download the <filename>eppsp-5.1.0-exo-2.1.2-GA.zip</filename> file from the Red Hat JBoss Customer Support Portal and extract it to an easily accessible location. </para> </step> @@ -124,7 +124,7 @@ <itemizedlist> <listitem> <para> - <filename>gatein-wcm-extension-2.1.2-CR03.ear</filename> + <filename>gatein-wcm-extension-2.1.2-GA.ear</filename> </para> </listitem> @@ -159,7 +159,7 @@ <emphasis role="bold">Optional step</emphasis>: </para> <para> - The extracted location will also contain a file named <filename>gatein-eppspdemo-portal-2.1.2-CR03.ear</filename>. This file provides a sample portal and is not required for the Site Publisher add-on to operate. + The extracted location will also contain a file named <filename>gatein-eppspdemo-portal-2.1.2-GA.ear</filename>. This file provides a sample portal and is not required for the Site Publisher add-on to operate. </para> <para> Copying this file to the configuration location used in the previous step, however, will include a sample portal which can verify a successful installation of the Site Publisher component. Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/CodePaste.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/CutNode4.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/Dashboard1.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/Dashname.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/Dashname1.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/DeleteGroup.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/Frontpage.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/MoveUpDown.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/NavigationPortlet.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/PermissionSetting1.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/SiteMap.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/images/Source.png =================================================================== (Binary files differ) Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/account/Account_and_Password_Retrieval.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/account/Account_and_Password_Retrieval.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/account/Account_and_Password_Retrieval.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -86,10 +86,10 @@ </step> </procedure> <para> - After you submit the form an email will be send to your email address with the requested information, either your username or password. + After you submit the form an email will be send to your email address to assist you. </para> <para> - If you forgot your password you will be sent a new (temporary) password. Your original password will not be valid after this email is sent. You will be directed to a page to update your password the next time you sign in. + If you forgot your password you will be sent a link to application that will allow you to edit your password. Your original password will not be valid after this email is sent. </para> <important> <title>Email Error</title> Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/account/Sign_in_and_Sign_out.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/account/Sign_in_and_Sign_out.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/account/Sign_in_and_Sign_out.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -10,7 +10,18 @@ In order to enter the portal in private mode, you should use the account previously registered. </para> <para> - To sign in to a portal, users must complete the <emphasis role="bold">Sign in</emphasis> form. This form contains the following elements: + To sign in to a portal, users must complete the <emphasis role="bold">Sign in</emphasis> form: + </para> + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/Signin.png" format="PNG" align="center" scale="110"/> + </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/Signin.png" format="PNG" align="center" scalefit="1" contentwidth="150mm"/> + </imageobject> + </mediaobject> + <para> + This form contains the following elements: </para> <variablelist> <varlistentry> @@ -85,16 +96,8 @@ </step> <step> <para> - Click the <emphasis role="bold">Sign in</emphasis> link at the top right of the page if you are current in the Classic portal. The <emphasis role="bold">Sign in</emphasis> form appears: + Click the <emphasis role="bold">Sign in</emphasis> link at the top right of the page if you are current in the Classic portal. The <emphasis role="bold">Sign in</emphasis> form appears. </para> - <mediaobject> - <imageobject role="html"> - <imagedata fileref="images/Signin.png" format="PNG" align="center" scale="110"/> - </imageobject> - <imageobject role="fo"> - <imagedata fileref="images/Signin.png" format="PNG" align="center" scalefit="1" contentwidth="150mm"/> - </imageobject> - </mediaobject> </step> <step> <para> Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Permission.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Permission.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Permission.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -248,7 +248,7 @@ <section id="sect-User_Guide-Manage_Permission-Set_the_Edit_Permission_on_a_Page"> <title>Set Edit Permission on a Page</title> <para> - Only users who are in the page's editor group can edit it. The access right can be set for several groups but the <emphasis>edit</emphasis> right only can be set for one group. To give a user the edit permission, you must add them to the editors group of that page. + Only users who are in the page's editor group can edit it. The access right can be set for several groups but the edit right only can be set for one group. To give a user the edit permission, you must add them to the editors group of that page. </para> <para> The Permission Setting tab is available in two different ways: Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/Manage_Portals.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -148,7 +148,7 @@ An administrator can easily access numerous portals running in the &PRODUCT; instance. </para> <para> - To access a portal, click <emphasis role="bold">Site</emphasis> on the Toolbar. A list of active portals will appear: + To access a portal, click <emphasis role="bold">Site</emphasis> on the Toolbar. You will be taken to the Site Management page, which shows a list of portals and possible actions: </para> <mediaobject> <imageobject role="html"> @@ -219,7 +219,7 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/NavigationManagement.png" format="PNG" align="center" scale="90" /> + <imagedata fileref="images/NavigationManagement.png" format="PNG" align="center" scale="100" /> </imageobject> <imageobject role="fo"> <imagedata fileref="images/NavigationManagement.png" format="PNG" align="center" contentwidth="150mm" /> Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/User_Management.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/User_Management.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portal/User_Management.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -12,7 +12,7 @@ <section id="sect-User_Guide-User_Management-Manage_users"> <title>Manage users</title> <para> - Mouse over <emphasis role="bold">Group</emphasis> in the Toolbar. Highlight <emphasis role="bold">Organization</emphasis> and select <emphasis>Users and Groups Management</emphasis> + Mouse over <emphasis role="bold">Group</emphasis> in the Toolbar. Highlight <emphasis role="bold">Organization</emphasis> and select <emphasis role="bold">Users and Groups Management</emphasis> </para> <mediaobject> <imageobject role="html"> @@ -429,7 +429,7 @@ By default three membership types are available: <emphasis>Manager</emphasis>, <emphasis>Member</emphasis> and <emphasis>Validator</emphasis>. By definition, Manager has got the highest rights in a group. </para> <para> - Mouse over <emphasis role="bold">Group</emphasis> on the Toolbar. Highlight <emphasis role="bold">Organization</emphasis> and select <emphasis>Users and Groups Management</emphasis>. Select the <emphasis role="bold">Membership Management</emphasis> tab. + Mouse over <emphasis role="bold">Group</emphasis> on the Toolbar. Highlight <emphasis role="bold">Organization</emphasis> and select <emphasis role="bold">Users and Groups Management</emphasis>. Select the <emphasis role="bold">Membership Management</emphasis> tab. </para> <para> This tab remembers the last action taken by a user in this page. Clicking <emphasis role="bold">Reset</emphasis> will clear any legacy details. Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -87,7 +87,7 @@ <term><emphasis role="bold">Calendar</emphasis></term> <listitem> <para> - The calendar gadget allows users to switch easily between daily, monthly and yearly view and, is customizable to match your portal's theme. + The calendar gadget helps track and plan your events and activities. </para> <mediaobject> <imageobject role="html"> @@ -103,7 +103,7 @@ <term><emphasis role="bold">ToDo</emphasis></term> <listitem> <para> - This application helps you organize your day and work group. It is designed to keep track of your tasks in a convenient and transparent way. Tasks can be highlighted with different colors. + This application helps you organize your day and work group. It is designed to keep track of your tasks in a convenient and transparent way. </para> <mediaobject> <imageobject role="html"> @@ -190,7 +190,7 @@ For example: </para> <programlisting> -http://widgets.clearspring.com/cscallback/gallery/4920a0df9f15b805/googlegallery.xml +http://www.donalobrien.net/apps/google/currency.xml </programlisting> <note> <title>URL Types</title> Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portletsUser/Interface_Portlets.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portletsUser/Interface_Portlets.xml 2010-12-11 11:36:29 UTC (rev 5572) +++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/modules/portletsUser/Interface_Portlets.xml 2010-12-13 04:21:55 UTC (rev 5573) @@ -50,10 +50,10 @@ </para> <mediaobject> <imageobject role="html"> - <imagedata fileref="images/NavigationPortlet.png" format="PNG" align="center" scale="90"/> + <imagedata fileref="images/NavigationPortlet.png" format="PNG" align="center" scale="100"/> </imageobject> <imageobject role="fo"> - <imagedata fileref="images/NavigationPortlet.png" format="PNG" align="center" scalefit="1" contentwidth="100mm"/> + <imagedata fileref="images/NavigationPortlet.png" format="PNG" align="center" scalefit="1" contentwidth="60mm"/> </imageobject> </mediaobject> </listitem>