Author: mmcallis Date: 2008-06-11 22:15:10 -0400 (Wed, 11 Jun 2008) New Revision: 10995 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/ajax.xml docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/themeandlayouts.xml docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml Log: removing unnecessary trademark symbols for JSP Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/ajax.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/ajax.xml 2008-06-12 01:15:07 UTC (rev 10994) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/ajax.xml 2008-06-12 02:15:10 UTC (rev 10995) @@ -20,7 +20,7 @@ <para>Part of the Ajax capabilities are implemented in the layout framework which provide the structure for generating portal pages. The good news is that the existing layout only requires a few modifications in order to be ajaxified.</para> - <para>We will use as example an simplified version of the layout <trademark trade="trade">JSP</trademark> provided in JBoss Portal 2.6 and outline + <para>We will use as example an simplified version of the layout JSP provided in JBoss Portal 2.6 and outline what are the required changes that makes it an ajaxified layout: <programlisting><![CDATA[ <%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-06-12 01:15:07 UTC (rev 10994) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-06-12 02:15:10 UTC (rev 10995) @@ -118,7 +118,7 @@ <sect2> <title>Portal Policy</title> <para> - The portal error-policy controls the response sent to the Web browser when an error occurs. A default error policy exists, which can be configured per portal. If an error occurs, the policy can either handle a redirect to a <trademark class="trade">JSP</trademark> page, or ignore it. If the error is ignored, it is handled by the default policy, otherwise a JSP page is invoked with the appropriate request attributes, allowing page customization. + The portal error-policy controls the response sent to the Web browser when an error occurs. A default error policy exists, which can be configured per portal. If an error occurs, the policy can either handle a redirect to a JSP page, or ignore it. If the error is ignored, it is handled by the default policy, otherwise a JSP page is invoked with the appropriate request attributes, allowing page customization. </para> </sect2> <sect2> @@ -135,7 +135,7 @@ </listitem> <listitem> <para> - replace the markup of the window using a redirection to a <trademark class="trade">JSP</trademark> page. + replace the markup of the window using a redirection to a JSP page. </para> </listitem> </itemizedlist> @@ -193,7 +193,7 @@ </row> <row> <entry align="center"><computeroutput>control.portal.resource_uri</computeroutput></entry> - <entry align="center">the path of the <trademark class="trade">JSP</trademark> used for redirections</entry> + <entry align="center">the path of the JSP used for redirections</entry> <entry align="center">a valid path to a JSP located in the <filename>portal-core.war/</filename> directory</entry> </row> </tbody> @@ -286,7 +286,7 @@ </row> <row> <entry align="center"><computeroutput>control.page.resource_uri</computeroutput></entry> - <entry align="center">the path of the <trademark class="trade">JSP</trademark> used for redirections</entry> + <entry align="center">the path of the JSP used for redirections</entry> <entry align="center"><computeroutput>ignore</computeroutput>, <computeroutput>jsp</computeroutput> and <computeroutput>hide</computeroutput></entry> </row> </tbody> Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/themeandlayouts.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/themeandlayouts.xml 2008-06-12 01:15:07 UTC (rev 10994) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/themeandlayouts.xml 2008-06-12 02:15:10 UTC (rev 10995) @@ -31,7 +31,7 @@ responsible to render markup that will wrap the markup fragments produced by the individual portlets. Themes, on the other hand, are responsible to style and enhance this markup. </para> - <para>In JBoss Portal, layouts are implemented as a <trademark class="trade">JSP</trademark> or a Servlet. Themes are implemented using CSS Style sheets, javascript and images. The binding element between layouts and themes are the class and id attributes of the rendered markup. + <para>In JBoss Portal, layouts are implemented as a JSP or a Servlet. Themes are implemented using CSS Style sheets, javascript and images. The binding element between layouts and themes are the class and id attributes of the rendered markup. </para> <para>JBoss Portal has the concept of regions on a page. When a page is defined, and portlet windows are assigned to the page, the region, and order inside the region, has to be @@ -129,7 +129,7 @@ <listitem>The first option would simply require to modify the theme CSS, by doing this you could change the fonts, the way tabs are rendered, colors and many other things but not change the content.</listitem> - <listitem>The second option is to modify the provided <trademark class="trade">JSP</trademark> files, <literal>header.jsp</literal> and + <listitem>The second option is to modify the provided JSP files, <literal>header.jsp</literal> and <literal>tabs.jsp</literal>. It gives you more flexibility than the previous solution on modifying the content. Links to legacy application could easily be added, URLs could be arranged differently, the CSS approach could be replaced by good old HTML, CSS style names could be changed... The drawback of @@ -259,7 +259,7 @@ some ingredients from the portal itself, and at the end write the response back to the requesting client. </para> - <para>Layouts can be either a <trademark class="trade">JSP</trademark> or a Servlet. The portal determines the layout to use + <para>Layouts can be either a JSP or a Servlet. The portal determines the layout to use via the configured properties of the portal, or the requested page. Both, portal and pages, can define the layout to use in order to render their content. In case both define a layout, the layout defined for the page will overwrite the one defined for the @@ -320,7 +320,7 @@ <para>As you can see, the portal or page property points to the layout to use via the name of the layout. The name has been given to the layout in the layout descriptor. It is in that layout descriptor where the name gets linked to the physical resource - (the <trademark class="trade">JSP</trademark> or Servlet) that will actually render the layout. + (the JSP or Servlet) that will actually render the layout. </para> </sect3> <sect3> @@ -801,7 +801,7 @@ swap, or change individual items of it. No compile or redeploy is necessary. Themes can be added or removed while the portal is active. Themes can be deployed in separate web applications furthering even more the flexibility of this approach. Web developers - don't have to work with <trademark class="trade">JSP</trademark> pages. They can stay in their favorite design tool and simple + don't have to work with JSP pages. They can stay in their favorite design tool and simple work against the exploded war content that is deployed into the portal. The results can be validated life in the portal. </para> @@ -887,7 +887,7 @@ <para>Again, analogous to the way it is done for layouts, themes are specified in the portal descriptor as a portal or page property. The page property overwrites the portal property. In addition to these two options, themes can also be specified as part of the - theme <trademark class="trade">JSP</trademark> tag , that is placed on the layout JSP. Here is an example portal descriptor + theme JSP tag , that is placed on the layout JSP. Here is an example portal descriptor that specifies the phalanx theme as the theme for the entire portal, and the industrial theme for the theme test page: <programlisting> @@ -1005,7 +1005,7 @@ ");]]> </programlisting> Note that in order for the header content injection to work, the layout needs to make - use of the headerContent <trademark class="trade">JSP</trademark> tag, like: + use of the headerContent JSP tag, like: <programlisting> <![CDATA[<%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" @@ -1040,7 +1040,7 @@ </portlet-app>]]></programlisting> </para> <para>This functionality, just like the previously described header content injection, - requires the layout <trademark class="trade">JSP</trademark> to add the "headerContent" JSP tag (see example above). One thing to note here is + requires the layout JSP to add the "headerContent" JSP tag (see example above). One thing to note here is the order of the tags. If the headerContent tag is placed after the theme tag, it will allow portlet injected CSS files to overwrite the theme's behavior, making this feature even more powerful! Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-06-12 01:15:07 UTC (rev 10994) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-06-12 02:15:10 UTC (rev 10995) @@ -554,7 +554,7 @@ Note: the directory names will be different for your system. </para> <para> - Expanding the <filename>helloworldportlet.war</filename> file allows you to deploy the portlet as an expanded directory, which makes development easier. As well, it gives you access to the application descriptors, resource files, JSF, and <trademark class="trade">JSP</trademark> pages. To expand the <filename>helloworldportlet.war</filename> file: + Expanding the <filename>helloworldportlet.war</filename> file allows you to deploy the portlet as an expanded directory, which makes development easier. As well, it gives you access to the application descriptors, resource files, JSF, and JSP pages. To expand the <filename>helloworldportlet.war</filename> file: </para> <para> <orderedlist> @@ -786,7 +786,7 @@ </screen></term> <listitem> <para> - The <literal>doView</literal> implementation is responsible for dispatching to the appropriate <trademark class="trade">JSP</trademark>, <filename>HelloWorldJSPPortlet/WEB-INF/jsp/view.jsp</filename> or <filename>HelloWorldJSPPortlet/WEB-INF/jsp/view2.jsp</filename>, depending on the existence of the <literal>yourname</literal> parameter passed in from <literal>processAction</literal>. + The <literal>doView</literal> implementation is responsible for dispatching to the appropriate JSP, <filename>HelloWorldJSPPortlet/WEB-INF/jsp/view.jsp</filename> or <filename>HelloWorldJSPPortlet/WEB-INF/jsp/view2.jsp</filename>, depending on the existence of the <literal>yourname</literal> parameter passed in from <literal>processAction</literal>. </para> </listitem> </varlistentry> @@ -1203,7 +1203,7 @@ Note: the directory names will be different for your system. </para> <para> - Expanding the <filename>helloworldjsfsunriportlet.war</filename> file allows you to deploy the portlet as an expanded directory, which makes development easier. As well, it gives you access to the application descriptors, resource files, JSF, and <trademark class="trade">JSP</trademark> pages. To expand the <filename>helloworldjsfsunriportlet.war</filename> file: + Expanding the <filename>helloworldjsfsunriportlet.war</filename> file allows you to deploy the portlet as an expanded directory, which makes development easier. As well, it gives you access to the application descriptors, resource files, JSF, and JSP pages. To expand the <filename>helloworldjsfsunriportlet.war</filename> file: </para> <para> <orderedlist> @@ -1508,7 +1508,7 @@ Note: the directory names will be different for your system. </para> <para> - Expanding the <filename>helloworldjsfmyfacesportlet.war</filename> file allows you to deploy the portlet as an expanded directory, which makes development easier. As well, it gives you access to the application descriptors, resource files, JSF, and <trademark class="trade">JSP</trademark> pages. To expand the <filename>helloworldjsfmyfacesportlet.war</filename> file: + Expanding the <filename>helloworldjsfmyfacesportlet.war</filename> file allows you to deploy the portlet as an expanded directory, which makes development easier. As well, it gives you access to the application descriptors, resource files, JSF, and JSP pages. To expand the <filename>helloworldjsfmyfacesportlet.war</filename> file: </para> <para> <orderedlist>