Author: mmcallis Date: 2008-07-09 23:15:45 -0400 (Wed, 09 Jul 2008) New Revision: 11394 Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/configuration.xml docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/tutorials.xml Log: - code highlighting. - moving certain commands out of screen tags to remove mangling, and make consistent with the same changes to the 2.6 branch. Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/configuration.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/configuration.xml 2008-07-10 03:06:55 UTC (rev 11393) +++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/configuration.xml 2008-07-10 03:15:45 UTC (rev 11394) @@ -52,7 +52,7 @@ <listitem> <para>Open the <emphasis>$JBOSS_HOME/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/jboss-web.xml</emphasis> file. If this file does not exist, copy and save the following example: </para> -<programlisting role="XML"><![CDATA[ +<programlisting><![CDATA[ <?xml version="1.0"?> <jboss-web> <security-domain>java:jaas/portal</security-domain> @@ -70,7 +70,7 @@ <para>Edit the <computeroutput>&lt;context-root&gt;</computeroutput> element with the desired context path: </para> -<programlisting role="XML"> +<programlisting> <![CDATA[<context-root>/testing</context-root>]]> </programlisting> <para> @@ -165,7 +165,7 @@ <para> Un-comment the following line, so that it looks like the following: </para> -<programlisting role="XML"><![CDATA[ +<programlisting><![CDATA[ <!-- Force the dialect instead of using autodetection --> <property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property> ]]></programlisting> Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/tutorials.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/tutorials.xml 2008-07-10 03:06:55 UTC (rev 11393) +++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/tutorials.xml 2008-07-10 03:15:45 UTC (rev 11394) @@ -340,7 +340,7 @@ <area id="supports" coords='12' /> <area id="portletinfo" coords='15' /> </areaspec> - <programlisting role="XML"><![CDATA[ + <programlisting><![CDATA[ <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2... @@ -490,7 +490,7 @@ <area id="region" coords='14' /> <area id="height" coords='15' /> </areaspec> - <programlisting role="XML"><![CDATA[ + <programlisting><![CDATA[ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE deployments PUBLIC "-//JBoss Portal//DTD Portal Object 2.6//EN" @@ -807,8 +807,7 @@ <para> <screen><![CDATA[ INFO [TomcatDeployer] deploy, ctxPath=/helloworldportlet, -warUrl=.../tmp/deploy/tmp35219helloworldportlet-exp.war/]]> - </screen> +warUrl=.../tmp/deploy/tmp35219helloworldportlet-exp.war/]]></screen> </para> <para> To see the HelloWorldPortlet, navigate to @@ -842,15 +841,9 @@ </filename> directory into the JBoss AS or JBoss EAP <filename>deploy/</filename> - directory. On Linux, run the following command to re-deploy the - HelloWorldPortlet: + directory. On Linux, run the <command>touch $JBOSS_HOME/server/<replaceable>configuration</replaceable>/deploy/helloworldportlet.war/WEB-INF/web.xml</command> command to re-deploy the HelloWorldPortlet. </para> <para> -<screen> -touch $JBOSS_HOME/server/<replaceable>configuration</replaceable>/deploy/helloworldportlet.war/WEB-INF/web.xml -</screen> - </para> - <para> Re-deploying the HelloWorldPortlet produces output to the JBoss AS or JBoss EAP console, similar to the following: </para> @@ -936,7 +929,7 @@ </filename> file: </para> - <programlisting role="XML"><![CDATA[ + <programlisting role="JAVA"><![CDATA[ package org.jboss.portlet.hello; import javax.portlet.ActionRequest; @@ -1006,14 +999,14 @@ <variablelist> <varlistentry> <term> - <screen><![CDATA[ + <programlisting><![CDATA[ protected void doHelp(RenderRequest rRequest, RenderResponse rResponse) throws PortletException, IOException, UnavailableException]]> - </screen> - <screen><![CDATA[ + </programlisting> + <programlisting><![CDATA[ protected void doEdit(RenderRequest rRequest, RenderResponse rResponse) throws PortletException, IOException, UnavailableException]]> - </screen> + </programlisting> </term> <listitem> <para> @@ -1027,7 +1020,7 @@ </varlistentry> <varlistentry> <term> - <screen><![CDATA[ + <programlisting><![CDATA[ public void processAction(ActionRequest aRequest, ActionResponse aResponse) throws PortletException, IOException, UnavailableException { @@ -1036,8 +1029,7 @@ // do something aResponse.setRenderParameter("yourname", sYourname); -}]]> - </screen> +}]]></programlisting> </term> <listitem> <para> @@ -1057,9 +1049,9 @@ </varlistentry> <varlistentry> <term> - <screen><![CDATA[ + <programlisting><![CDATA[ rResponse.setContentType("text/html");]]> - </screen> + </programlisting> </term> <listitem> <para> @@ -1071,10 +1063,10 @@ </varlistentry> <varlistentry> <term> - <screen><![CDATA[ + <programlisting><![CDATA[ protected void doView(RenderRequest rRequest, RenderResponse rResponse) throws PortletException, IOException, UnavailableException]]> - </screen> + </programlisting> </term> <listitem> <para> @@ -1134,7 +1126,7 @@ <filename>HelloWorldJSPPortlet/WEB-INF/jsp/view.jsp</filename> file: </para> - <programlisting role="JSP"><![CDATA[ + <programlisting><![CDATA[ <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> <portlet:defineObjects/> @@ -1153,15 +1145,14 @@ You can also link to other pages, using a renderURL, like <a href="<portlet:renderURL><portlet:param name="yourname" value="Roy Russo"> </portlet:param></portlet:renderURL>">this</a>. -</div>]]> - </programlisting> +</div>]]></programlisting> <para> <variablelist> <varlistentry> <term> - <screen><![CDATA[ + <programlisting><![CDATA[ <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>]]> - </screen> +</programlisting> </term> <listitem> <para> @@ -1172,9 +1163,9 @@ </varlistentry> <varlistentry> <term> - <screen><![CDATA[ +<programlisting><![CDATA[ <portlet:defineObjects/>]]> - </screen> +</programlisting> </term> <listitem> <para> @@ -1192,10 +1183,10 @@ </varlistentry> <varlistentry> <term> - <screen><![CDATA[ + <programlisting><![CDATA[ <form action="<portlet:actionURL><portlet:param name="page" value="mainview"/> </portlet:actionURL>" method="POST">]]> - </screen> +</programlisting> </term> <listitem> <para> @@ -1210,10 +1201,10 @@ </varlistentry> <varlistentry> <term> - <screen><![CDATA[ + <programlisting><![CDATA[ <a href="<portlet:renderURL><portlet:param name="yourname" value="Roy Russo"> </portlet:param></portlet:renderURL>">]]> - </screen> +</programlisting> </term> <listitem> <para> @@ -1425,17 +1416,9 @@ </filename> directory into the JBoss AS or JBoss EAP <filename>deploy/</filename> - directory. On Linux, run the following command to re-deploy the - HelloWorldJSPPortlet: + directory. On Linux, run the <command>touch $JBOSS_HOME/server/<replaceable>configuration</replaceable>/deploy/helloworldjspportlet.war/WEB-INF/web.xml</command> command to re-deploy the HelloWorldJSPPortlet. </para> <para> - <screen> - touch $JBOSS_HOME/server/ - <replaceable>configuration</replaceable> - /deploy/helloworldjspportlet.war/WEB-INF/web.xml - </screen> - </para> - <para> Re-deploying the HelloWorldJSPPortlet produces output to the JBoss AS or JBoss EAP console, similar to the following: </para> @@ -1545,8 +1528,7 @@ Specification. You may define more than one portlet application in this file: </para> - <para> - <screen><![CDATA[ + <programlisting role="XML"><![CDATA[ <?xml version="1.0" encoding="UTF-8"?> <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -1569,7 +1551,7 @@ </portlet-info> </portlet> </portlet-app>]]> - </screen> + </programlisting> </para> <para> <variablelist>