Author: ochikvina Date: 2009-05-07 13:23:10 -0400 (Thu, 07 May 2009) New Revision: 15130 Modified: trunk/struts/docs/struts_tools_tutorial/en/master_output.xml Log: https://jira.jboss.org/jira/browse/JBDS-717 - master_output.xml is generated; Modified: trunk/struts/docs/struts_tools_tutorial/en/master_output.xml =================================================================== --- trunk/struts/docs/struts_tools_tutorial/en/master_output.xml 2009-05-07 17:22:11 UTC (rev 15129) +++ trunk/struts/docs/struts_tools_tutorial/en/master_output.xml 2009-05-07 17:23:10 UTC (rev 15130) @@ -34,12 +34,12 @@ <pubdate>April 2008</pubdate> <copyright> <year>2007</year> - <year><diffmk:wrapper diffmk:change="changed">2009</diffmk:wrapper></year> - <holder><diffmk:wrapper diffmk:change="changed">JBoss, a division of Red Hat</diffmk:wrapper></holder> + <year>2009</year> + <holder>JBoss, a division of Red Hat</holder> </copyright> - <releaseinfo><diffmk:wrapper diffmk:change="changed"> + <releaseinfo> Version: 3.0.0.GA - </diffmk:wrapper></releaseinfo> + </releaseinfo> <abstract> <title></title> @@ -82,8 +82,8 @@ <section> <title>Other relevant resources on the topic</title> - <para>All JBoss Developer Studio/JBoss Tools documentation you can find <ulink url="http://docs.jboss.org/tools/">here</ulink>.</p... - <para>The latest documentation builds are available <ulink url="http://download.jboss.org/jbosstools/nightly-docs/">her... + <para><diffmk:wrapper diffmk:change="changed">All JBoss Developer Studio/JBoss Tools release documentation you can find at</diffmk:wrapper><ulink url="http://docs.jboss.org/tools/"><diffmk:wrapper diffmk:change="changed">http://docs.jboss.org/tools</diff... diffmk:change="changed"> in the corresponding release directory.</diffmk:wrapper></para> + <para><diffmk:wrapper diffmk:change="changed">The latest documentation builds are available at </diffmk:wrapper><ulink url="http://download.jboss.org/jbosstools/nightly-docs/"><... diffmk:change="changed">http://download.jboss.org/jbosstools... </section> @@ -102,8 +102,8 @@ <title>Creating a Simple Struts Application</title> - <para>Firstly, we assume that you have already launched Eclipse with JBoss Tools installed and - also that the <property moreinfo="none">Web Development perspective</property> is the current perspective. (If not, make it + <para><diffmk:wrapper diffmk:change="added">Firstly, we assume that you have already launched Eclipse with </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">JBoss Tools</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added"> installed and + also that the </diffmk:wrapper><property moreinfo="none">Web Development perspective</property> is the current perspective. (If not, make it active by selecting <emphasis> <property moreinfo="none">Window &gt; Open Perspective &gt; Other &gt; Web Development</property> @@ -115,46 +115,42 @@ <itemizedlist> <listitem> <para>Go to the menu bar and select <emphasis> - <property moreinfo="none">File &gt; New &gt; Project...</property> - </emphasis>.</para> + <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">File &gt; New &gt; Struts Project</diffmk:wrapper></property> + </emphasis></para> </listitem> <listitem> - <para>Select <emphasis> - <property moreinfo="none">JBoss Tools Web &gt; Struts &gt; Struts Project</property> - </emphasis> in the New Project dialog box</para> + <para><diffmk:wrapper diffmk:change="added">Next enter "StrutsHello" as the project name</diffmk:wrapper></para> </listitem> <listitem> - <para>Click <emphasis> - <property moreinfo="none">Next </property> + <para><diffmk:wrapper diffmk:change="changed">Leave everything else as it is, and click </diffmk:wrapper><emphasis> + <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">Next</diffmk:wrapper></property> </emphasis></para> </listitem> <listitem> - <para>Enter "StrutsHello" as the project name</para> - </listitem> + <para><diffmk:wrapper diffmk:change="added">If you have server runtime already defined, just pass to next point. Otherwise in the </diffmk:wrapper><emphasis> + <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">Runtime</diffmk:wrapper></property></emphasis><diffmk:wrapper diffmk:change="added"> section click the </diffmk:wrapper><emphasis diffmk:change="added"> + <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">New</diffmk:wrapper></property></emphasis><diffmk:wrapper diffmk:change="added"> button and target at needed server runtime environment. Click </diffmk:wrapper><emphasis diffmk:change="added"> + <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Finish</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">.</diffmk:wrapper></emphasis></para> + </listitem> <listitem> - <para>Leave everything else as is, and click <emphasis> + <para>Click <emphasis> <property moreinfo="none">Next</property> </emphasis></para> </listitem> <listitem> - <para>Click <emphasis> - <property moreinfo="none">Next</property> - </emphasis> again</para> - </listitem> - <listitem> <para>Make sure that <emphasis> <property moreinfo="none">struts-bean.tld</property> </emphasis>, <emphasis> <property moreinfo="none">struts-html.tld</property> </emphasis>, and <emphasis> <property moreinfo="none">struts-logic.tld</property> - </emphasis> are checked in the list of included tag libraries and then click <emphasis> + </emphasis><diffmk:wrapper diffmk:change="changed"> are checked in the list of included tag libraries and then hit </diffmk:wrapper><emphasis> <property moreinfo="none">Finish</property> </emphasis></para> </listitem> </itemizedlist> - <para>A "StrutsHello" node should appear in the upper-left Package - Explorer view.</para> + <para><diffmk:wrapper diffmk:change="added">A "StrutsHello" node should appear in the </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Package + Explorer view</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">.</diffmk:wrapper></para> <itemizedlist> <listitem> <para>Click the plus sign next to <emphasis> @@ -164,12 +160,14 @@ <listitem> <para>Click the plus sign next to <emphasis> <property moreinfo="none">WebContent</property> - </emphasis> under StrutsHello</para> + </emphasis><diffmk:wrapper diffmk:change="added"> under </diffmk:wrapper><emphasis diffmk:change="added"> + <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">StrutsHello</diffmk:wrapper></property></emphasis></para> </listitem> <listitem> <para>Click the plus sign next to <emphasis> <property moreinfo="none">WEB-INF</property> - </emphasis> under WebContent</para> + </emphasis><diffmk:wrapper diffmk:change="added"> under </diffmk:wrapper><emphasis diffmk:change="added"> + <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">WebContent</diffmk:wrapper></property></emphasis></para> </listitem> <listitem> <para>Then, double-click on the <emphasis> @@ -184,9 +182,9 @@ <section id="CreatingtheApplicationComponents"> <?dbhtml filename="CreatingtheApplicationComponents.html"?> <title>Creating the Application Components</title> - <para>Now, we will design the application by creating the individual components as - placeholders first. (We dont have to complete all of the details inside the components - until afterwards.)</para> + <para><diffmk:wrapper diffmk:change="changed">Now, we will design the application by creating the individual components as + placeholders first. (We don't have to complete all of the details inside the components + until afterwards.)</diffmk:wrapper></para> <section id="CreatingJSPPagePlaceholders"> <title>Creating JSP Page Placeholders</title> <para>Next, let's create and place two JSP pages. We will not write any code @@ -196,15 +194,15 @@ <title>Creating the Page Placeholders</title> <itemizedlist> <listitem> - <para>Bring the Web Projects view to the front of the Package Explorer view - by selecting the <emphasis> + <para><diffmk:wrapper diffmk:change="added">Bring the </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Web Projects view</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added"> to the front of the </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Package Explorer view</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added"> + by selecting the </diffmk:wrapper><emphasis> <property moreinfo="none">Web Projects</property> </emphasis> tab next to that tab.</para> </listitem> <listitem> <para>Right-click the <emphasis> <property moreinfo="none">StrutsHello &gt; WEB-ROOT (WebContent)</property> - </emphasis> folder in the Web Projects view and select <emphasis> + </emphasis><diffmk:wrapper diffmk:change="added"> folder in the </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Web Projects view</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added"> and select </diffmk:wrapper><emphasis> <property moreinfo="none">New &gt; Folder...</property> </emphasis></para> </listitem> @@ -221,8 +219,9 @@ </listitem> <listitem> - <para>Right-click the pages folder and select <emphasis> - <property moreinfo="none">New &gt; Fila &gt; JSP...</property> + <para><diffmk:wrapper diffmk:change="added">Right-click the </diffmk:wrapper><emphasis diffmk:change="added"> + <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">pages</diffmk:wrapper></property></emphasis><diffmk:wrapper diffmk:change="added"> folder and select </diffmk:wrapper><emphasis> + <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">New &gt; File &gt; JSP...</diffmk:wrapper></property> </emphasis> </para> </listitem> @@ -237,14 +236,16 @@ </emphasis> button</para> </listitem> <listitem> - <para>Right-click the pages folder again and select <emphasis> + <para><diffmk:wrapper diffmk:change="added">Right-click the </diffmk:wrapper><emphasis diffmk:change="added"> + <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">pages</diffmk:wrapper></property></emphasis><diffmk:wrapper diffmk:change="added"> folder again and select </diffmk:wrapper><emphasis> <property moreinfo="none">New &gt; File &gt; JSP...</property> </emphasis></para> </listitem> <listitem> <para>For Name type in <emphasis> <property moreinfo="none">greeting</property> - </emphasis>, for Template leave as Blank, and then click on the <emphasis> + </emphasis><diffmk:wrapper diffmk:change="added">, for Template leave as </diffmk:wrapper><emphasis diffmk:change="added"> + <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Blank</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">,</diffmk:wrapper></emphasis><diffmk:wrapper diffmk:change="changed"> and then click on the </diffmk:wrapper><emphasis> <property moreinfo="none">Finish</property> </emphasis> button</para> </listitem> @@ -258,19 +259,19 @@ <listitem> <para>Click on the <emphasis> <property moreinfo="none">struts-config.xml</property> - </emphasis> tab in the Editing area to bring the diagram to the - front</para> + </emphasis><diffmk:wrapper diffmk:change="changed"> tab in the editing area to bring the diagram to the + front</diffmk:wrapper></para> </listitem> <listitem> <para>Click on the <emphasis> <property moreinfo="none">inputname.jsp</property> - </emphasis> page in the Web Projects view, drag it onto the diagram, and - drop it</para> + </emphasis><diffmk:wrapper diffmk:change="added"> page in the </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Web Projects view</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">, drag it onto the diagram, and + drop it</diffmk:wrapper></para> </listitem> <listitem><para>Click on the <emphasis> <property moreinfo="none">greeting.jsp</property> - </emphasis> page in the Web Projects view, drag it onto the diagram, and - drop it to the right of the <emphasis> + </emphasis><diffmk:wrapper diffmk:change="added"> page in the </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Web Projects view</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">, drag it onto the diagram, and + drop it to the right of the </diffmk:wrapper><emphasis> <property moreinfo="none">/pages/inputname.jsp</property> </emphasis> icon with some extra space</para></listitem> </itemizedlist> @@ -284,7 +285,7 @@ <itemizedlist> <listitem> <para>Right-click between the two icons and select <emphasis> - <property moreinfo="none">Add &gt; Action</property> + <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">New &gt; Action</diffmk:wrapper></property> </emphasis></para> </listitem> <listitem> @@ -330,15 +331,19 @@ <para>The <emphasis> <property moreinfo="none">/greeting</property> - </emphasis> action should appear in four places, in the diagram, under the - action-mappings node, under the struts-config.xml node in Tree view, in Web Projects - view and in the Outline view. Also, note the asterisk to the right of the name, - struts-config.xml, in the Outline view showing that the file has been changed, but - not saved to disk.</para> + </emphasis><diffmk:wrapper diffmk:change="added"> action should appear in four places, in the diagram, under the + </diffmk:wrapper><emphasis diffmk:change="added"> + <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">action-mappings</diffmk:wrapper></property></emphasis><diffmk:wrapper diffmk:change="added"> node, under the </diffmk:wrapper><emphasis diffmk:change="added"> + <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">struts-config.xml</diffmk:wrapper></property></emphasis><diffmk:wrapper diffmk:change="added"> node in Tree view, in </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Web Projects + view</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added"> and in the </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Outline view</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">. Also, note the asterisk to the right of the name, + </diffmk:wrapper><emphasis diffmk:change="added"> + <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">struts-config.xml</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">,</diffmk:wrapper></emphasis><diffmk:wrapper diffmk:change="added"> in the </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Outline view</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added"> showing that the file has been changed, but + not saved to disk.</diffmk:wrapper></para> </section> <section id="CreatingaLink"> <title>Creating a Link</title> - <para>Let's now create a link from the inputname.jsp page to the action.</para> + <para><diffmk:wrapper diffmk:change="added">Let's now create a link from the </diffmk:wrapper><emphasis diffmk:change="added"> + <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">inputname.jsp</diffmk:wrapper></property></emphasis><diffmk:wrapper diffmk:change="added"> page to the action.</diffmk:wrapper></para> <itemizedlist> <listitem> <para>On the left-hand side of the diagram in the column of icons, click on this @@ -390,10 +395,11 @@ </emphasis> icon</para> </listitem> <listitem> - <para>That's it. A link will be drawn from the actions new greeting - forward to the greeting.jsp JSP page. Note that the forwards name will be + <para><diffmk:wrapper diffmk:change="added">That's it. A link will be drawn from the actions new greeting + forward to the </diffmk:wrapper><emphasis diffmk:change="added"> + <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">greeting.jsp</diffmk:wrapper></property></emphasis><diffmk:wrapper diffmk:change="added"> JSP page. Note that the forwards name will be set based on the name of the target JSP file name. If you don't - like it, you can easily change it</para> + like it, you can easily change it</diffmk:wrapper></para> </listitem> <listitem> <para>Select the <emphasis> @@ -403,12 +409,13 @@ </listitem> <listitem> <para>Expand the <emphasis> - <property moreinfo="none">struts-config.xml/action-mappings//greeting</property> + <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">struts-config.xml/action-mappings/ /greeting</diffmk:wrapper></property> </emphasis> node and then select the greeting forward</para> </listitem> <listitem> - <para>In the Properties Editor to the right, change the text to - "sayHello" in the Name field</para> + <para><diffmk:wrapper diffmk:change="added">In the Properties Editor to the right, change the text to + "sayHello" in the </diffmk:wrapper><emphasis diffmk:change="added"> + <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Name</diffmk:wrapper></property></emphasis><diffmk:wrapper diffmk:change="added"> field</diffmk:wrapper></para> </listitem> <listitem> <para>Select the <emphasis> @@ -424,13 +431,14 @@ <itemizedlist> <listitem> <para>Somewhere in the top-left corner of diagram, right-click and select <emphasis> - <property moreinfo="none"> Add &gt; Global Forward...</property> + <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">New &gt; Global Forward</diffmk:wrapper></property> </emphasis></para> </listitem> <listitem> <para>Enter <emphasis> <property moreinfo="none">getName</property> - </emphasis> in the Name field</para> + </emphasis><diffmk:wrapper diffmk:change="added"> in the </diffmk:wrapper><emphasis diffmk:change="added"> + <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Name</diffmk:wrapper></property></emphasis><diffmk:wrapper diffmk:change="changed"> field</diffmk:wrapper></para> </listitem> <listitem> <para>Select the <emphasis> @@ -480,8 +488,9 @@ <para>One last thing that we need to do is to create a form bean.</para> <itemizedlist> <listitem> - <para>Switch to the Tree viewer in the editor for the struts-config.xml file, by - selecting the <emphasis> + <para><diffmk:wrapper diffmk:change="added">Switch to the Tree viewer in the editor for the </diffmk:wrapper><emphasis diffmk:change="added"> + <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">struts-config.xml</diffmk:wrapper></property></emphasis><diffmk:wrapper diffmk:change="added"> file, by + selecting the </diffmk:wrapper><emphasis> <property moreinfo="none">Tree</property> </emphasis> tab at the bottom of the editor window</para> </listitem> @@ -508,7 +517,8 @@ </emphasis> from the menu bar</para> </listitem> </itemizedlist> - <para>Note the disappearance of the asterisk next to the name, struts-config.xml.</para> + <para><diffmk:wrapper diffmk:change="added">Note the disappearance of the asterisk next to the name, </diffmk:wrapper><emphasis diffmk:change="added"> + <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">struts-config.xml</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">.</diffmk:wrapper></emphasis></para> </section> </section> </chapter> @@ -559,9 +569,9 @@ </itemizedlist> <para>The Java files will be generated in a <emphasis> <property moreinfo="none">JavaSource &gt; sample</property> - </emphasis> folder that you can see in the Package Explorer view under the + </emphasis><diffmk:wrapper diffmk:change="added"> folder that you can see in the </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">Package Explorer view</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added"> under the "StrutsHello" node. One Action stub and one FormBean stub will have - been generated.</para> + been generated.</diffmk:wrapper></para> </chapter> <chapter id="coding_files" xml:base="file:///home/ochikvina/WORK/for_compare/trunk/struts/docs/struts_tools_tutorial/en/modules/coding_files.xml" xreflabel="coding_files"> @@ -598,8 +608,8 @@ </listitem> <listitem> - <para>You are looking at a Java stub class that was generated by JBoss - Developer Studio. Now we are going to edit the file</para> + <para><diffmk:wrapper diffmk:change="changed">You are looking at a Java stub class that was generated by JBoss + Tools. Now we are going to edit the file</diffmk:wrapper></para> </listitem> <listitem> @@ -607,7 +617,6 @@ </listitem> </itemizedlist> <programlisting format="linespecific" role="JAVA"><![CDATA[private String name = ""; - private String greetName = ""; ]]></programlisting> <itemizedlist> @@ -617,7 +626,6 @@ </listitem> </itemizedlist> <programlisting format="linespecific" role="JAVA"><![CDATA[this.name = ""; - this.greetName = ""; ]]></programlisting> <itemizedlist> @@ -633,17 +641,19 @@ <itemizedlist> <listitem> <para>Right-click and select <emphasis> - <property moreinfo="none">Source &gt; Generate Getters and Setters...</property> + <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">Source &gt; Generate Getters and Setters</diffmk:wrapper></property> </emphasis>from the context menu</para> </listitem> <listitem> - <para>In the dialog box, check the check boxes for name and greetName, - select First method for Insertion point, and click on the <emphasis> + <para><diffmk:wrapper diffmk:change="added">In the dialog box, check the check box for </diffmk:wrapper><emphasis diffmk:change="added"> + <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">name</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">,</diffmk:wrapper></emphasis><diffmk:wrapper diffmk:change="added"> + select First method for Insertion point, and click on the </diffmk:wrapper><emphasis> <property moreinfo="none">OK</property> </emphasis> button</para> </listitem> </itemizedlist> - <para>The final GetNameForm.java file should look like this:</para> + <para><diffmk:wrapper diffmk:change="added">The final </diffmk:wrapper><emphasis diffmk:change="added"> + <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">GetNameForm.java</diffmk:wrapper></property></emphasis><diffmk:wrapper diffmk:change="added"> file should look like this:</diffmk:wrapper></para> <programlisting format="linespecific" role="JAVA"><![CDATA[package sample; import javax.servlet.http.HttpServletRequest; import org.apache.struts.action.ActionErrors; @@ -653,7 +663,6 @@ { private String name = ""; - private String greetName = ""; public String getName() { @@ -664,16 +673,6 @@ this.name = name; } - public String getGreetName() - { - return greetName; - } - - public void setGreetName(String greetName) - { - this.greetName = greetName; - } - public GetNameForm() { } @@ -681,7 +680,6 @@ public void reset(ActionMapping actionMapping, HttpServletRequest request) { this.name = ""; - this.greetName = ""; } public ActionErrors validate(ActionMapping actionMapping, @@ -703,7 +701,8 @@ <title>GreetingAction.java</title> <itemizedlist> <listitem> - <para>Open GreetingAction.java for editing</para> + <para><diffmk:wrapper diffmk:change="added">Open </diffmk:wrapper><emphasis diffmk:change="added"> + <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">GreetingAction.java</diffmk:wrapper></property></emphasis><diffmk:wrapper diffmk:change="added"> for editing</diffmk:wrapper></para> </listitem> <listitem> <para>Inside the execute method, delete the TO DO lines and add the @@ -717,7 +716,8 @@ return mapping.findForward(FORWARD_sayHello); ]]></programlisting> - <para>The final version of GreetingAction.java should look like this:</para> + <para><diffmk:wrapper diffmk:change="added">The final version of </diffmk:wrapper><emphasis diffmk:change="added"> + <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">GreetingAction.java</diffmk:wrapper></property></emphasis><diffmk:wrapper diffmk:change="added"> should look like this:</diffmk:wrapper></para> <programlisting format="linespecific" role="JAVA"><![CDATA[package sample; import javax.servlet.http.HttpServletRequest; @@ -831,7 +831,7 @@ </emphasis></para> </listitem> <listitem> - <para>In the StrutsForm library in the JBoss Tools Palette, select <emphasis> + <para><diffmk:wrapper diffmk:change="added">In the StrutsForm library in the </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">JBoss Tools Palette</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">, select </diffmk:wrapper><emphasis> <property moreinfo="none">submit</property> </emphasis>, and drag it to right after the text box in the Visual pane of the editor</para> @@ -885,19 +885,21 @@ </html> ]]></programlisting> - <para>To complete editing of this file, we will use macros from the JBoss Tools - Palette. This palette is a view that should be available to the right of the - editing area.</para> + <para><diffmk:wrapper diffmk:change="added">To complete editing of this file, we will use macros from the </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">JBoss Tools + Palette</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">. This palette is a view that should be available to the right of the + editing area.</diffmk:wrapper></para> <itemizedlist> <listitem> <para>Click on the <emphasis> <property moreinfo="none">Struts Common</property> - </emphasis> folder in the JBoss Tools Palette to open it</para> + </emphasis><diffmk:wrapper diffmk:change="added"> folder in the </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">JBoss Tools Palette</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added"> to open it</diffmk:wrapper></para> </listitem> <listitem> - <para>Position the cursor at the beginning of the greeting.jsp file in the - Source pane and then click on bean taglib in the JBoss Tools - Palette</para> + <para><diffmk:wrapper diffmk:change="added">Position the cursor at the beginning of the </diffmk:wrapper><emphasis diffmk:change="added"> + <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">greeting.jsp</diffmk:wrapper></property></emphasis><diffmk:wrapper diffmk:change="added"> file in the + Source pane and then click on </diffmk:wrapper><emphasis diffmk:change="added"> + <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">bean taglib</diffmk:wrapper></property></emphasis><diffmk:wrapper diffmk:change="added"> in the </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">JBoss Tools + Palette</diffmk:wrapper></property></para> </listitem> </itemizedlist> <para>This will insert the following line at the top of the file:</para> @@ -908,7 +910,7 @@ <listitem> <para>Click on the <emphasis> <property moreinfo="none">Struts Bean</property> - </emphasis> folder in the JBoss Tools Palette to open it</para> + </emphasis><diffmk:wrapper diffmk:change="added"> folder in the </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">JBoss Tools Palette</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added"> to open it</diffmk:wrapper></para> </listitem> <listitem> <para>Position the cursor inside the <emphasis role="bold"> @@ -916,15 +918,16 @@ </emphasis> element</para> </listitem> <listitem> - <para>Click on write in the JBoss Tools Palette</para> + <para><diffmk:wrapper diffmk:change="added">Click on </diffmk:wrapper><emphasis diffmk:change="added"> + <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">write</diffmk:wrapper></property></emphasis><diffmk:wrapper diffmk:change="added"> in the </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">JBoss Tools Palette</diffmk:wrapper></property></para> </listitem> <listitem> <para>Type in "GetNameForm" for the <emphasis role="italic"> - <property moreinfo="none">"name"</property> + <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">name</diffmk:wrapper></property> </emphasis> attribute and add a <emphasis role="italic"> - <property moreinfo="none">"property"</property> - </emphasis> attribute with "greetName" as its - value</para> + <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">property</diffmk:wrapper></property> + </emphasis><diffmk:wrapper diffmk:change="changed"> attribute with "name" as its + value</diffmk:wrapper></para> </listitem> </itemizedlist> <para>The editor should now look like this:</para> @@ -939,28 +942,31 @@ </section> <section id="index.jsp"> <title>index.jsp</title> - <para>Finally, we will need to create and edit an index.jsp page. This page will use - a Struts forward to simply redirect us to the getName global forward.</para> + <para><diffmk:wrapper diffmk:change="added">Finally, we will need to create and edit an </diffmk:wrapper><emphasis diffmk:change="added"> + <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">index.jsp</diffmk:wrapper></property></emphasis><diffmk:wrapper diffmk:change="added"> page. This page will use + a Struts forward to simply redirect us to the getName global forward.</diffmk:wrapper></para> <itemizedlist> <listitem> <para>In the Web Projects view, right-click on <emphasis> <property moreinfo="none">StrutsHello &gt; WEB-ROOT(WebContent)</property> </emphasis> node and select <emphasis> - <property moreinfo="none">New &gt; File &gt; JSP..</property> + <property moreinfo="none"><diffmk:wrapper diffmk:change="changed">New &gt; File &gt; JSP</diffmk:wrapper></property> </emphasis></para> </listitem> <listitem> - <para>Type index for Name and click on the <emphasis> + <para><diffmk:wrapper diffmk:change="added">Type </diffmk:wrapper><emphasis diffmk:change="added"> + <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">index</diffmk:wrapper></property></emphasis><diffmk:wrapper diffmk:change="added"> for Name and click on the </diffmk:wrapper><emphasis> <property moreinfo="none">Finish</property> </emphasis> button</para> </listitem> <listitem> - <para>On the JBoss Tools Palette, select the <emphasis> + <para><diffmk:wrapper diffmk:change="added">On the </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">JBoss Tools Palette</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added">, select the </diffmk:wrapper><emphasis> <property moreinfo="none">Struts Common</property> </emphasis> folder of macros by clicking on it in the palette</para> </listitem> <listitem> - <para>Click on the logic taglib icon</para> + <para><diffmk:wrapper diffmk:change="added">Click on the </diffmk:wrapper><emphasis diffmk:change="added"> + <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">logic taglib</diffmk:wrapper></property></emphasis><diffmk:wrapper diffmk:change="added"> icon</diffmk:wrapper></para> </listitem> <listitem> <para>Press the <emphasis> @@ -973,7 +979,8 @@ </emphasis> folder of macros</para> </listitem> <listitem> - <para>Click on redirect</para> + <para><diffmk:wrapper diffmk:change="added">Click on </diffmk:wrapper><emphasis diffmk:change="added"> + <property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">redirect</diffmk:wrapper></property></emphasis></para> </listitem> <listitem> <para>Delete the ending tag, put a forward slash in front of the closing