Author: lukaszlenart Date: Fri Jul 19 10:53:48 2013 New Revision: 870127 Log: Updates draft docs
Removed: websites/production/struts/content/development/2.x/docs/ajax-event-system.html websites/production/struts/content/development/2.x/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.html websites/production/struts/content/development/2.x/docs/file.html websites/production/struts/content/development/2.x/docs/iterator-tag-examples.html websites/production/struts/content/development/2.x/docs/logging.html websites/production/struts/content/development/2.x/docs/plaintext-result.html websites/production/struts/content/development/2.x/docs/related-tools.html websites/production/struts/content/development/2.x/docs/validation-interceptor.html Modified: websites/production/struts/content/development/2.x/docs/getting-started.html websites/production/struts/content/development/2.x/docs/message-resource-files.html websites/production/struts/content/development/2.x/docs/restfulactionmapper.html websites/production/struts/content/development/2.x/docs/struts-2-themes.html websites/production/struts/content/development/2.x/docs/wildcard-method-selection.html Modified: websites/production/struts/content/development/2.x/docs/getting-started.html ============================================================================== --- websites/production/struts/content/development/2.x/docs/getting-started.html (original) +++ websites/production/struts/content/development/2.x/docs/getting-started.html Fri Jul 19 10:53:48 2013 @@ -159,6 +159,8 @@ under the License. <p><a shape="rect" href="wildcard-method-selection.html" title="Wildcard Method Selection">Wildcard Method Selection</a></p> +<p><a shape="rect" href="struts-2-themes.html" title="Struts 2 Themes">Struts 2 Themes</a></p> + <p><a shape="rect" href="spring-and-struts-2.html" title="Spring and Struts 2">Spring and Struts 2</a></p> <p><a shape="rect" href="struts-2-annotations.html" title="Struts 2 Annotations">Struts 2 Annotations</a></p> Modified: websites/production/struts/content/development/2.x/docs/message-resource-files.html ============================================================================== --- websites/production/struts/content/development/2.x/docs/message-resource-files.html (original) +++ websites/production/struts/content/development/2.x/docs/message-resource-files.html Fri Jul 19 10:53:48 2013 @@ -38,6 +38,8 @@ under the License. <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' /> <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script> <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script> + <script src='http://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script> + <script src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script> <script type="text/javascript"> SyntaxHighlighter.defaults['toolbar'] = false; @@ -150,7 +152,7 @@ Struts 2 subversion sandbox at <a shape= <p>Put the text below in a file named Register.properties in the org.apache.struts.register.action package in the src/resources/java folder.</p> <div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>Register.properties</b></div><div class="codeContent panelContent"> -<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[ +<script class="theme: Default; brush: plain; gutter: false" type="syntaxhighlighter"><![CDATA[ personBean.firstName=First name personBean.lastName=Last name personBean.age=Age @@ -238,7 +240,7 @@ thankyou=Thank you for registering %{per <p>How did the value entered for the first name input field get displayed on thankyou.jsp? Look back at the value for the thankyou key in the Register.properties file. </p> <div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>Register.properties</b></div><div class="codeContent panelContent"> -<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[ +<script class="theme: Default; brush: plain; gutter: false" type="syntaxhighlighter"><![CDATA[ thankyou=Thank you for registering %{personBean.firstName}. ]]></script> </div></div> @@ -250,7 +252,7 @@ thankyou=Thank you for registering %{per <p>Place the following in a file named package.properties and save that file in package org.apache.struts in src/main/resources. </p> <div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>package.properties</b></div><div class="codeContent panelContent"> -<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[ +<script class="theme: Default; brush: plain; gutter: false" type="syntaxhighlighter"><![CDATA[ greeting=Welcome to The Wonderful World of Struts 2 ]]></script> </div></div> @@ -275,7 +277,7 @@ greeting=Welcome to The Wonderful World <p>Add the following to a file named global.properties (note the name doesn't have to be global).</p> <div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>global.properties</b></div><div class="codeContent panelContent"> -<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[ +<script class="theme: Default; brush: plain; gutter: false" type="syntaxhighlighter"><![CDATA[ contact=For assistance contact <a href='mailto:cont...@email.com'>cont...@email.com</a> ]]></script> </div></div> @@ -314,7 +316,7 @@ contact=For assistance contact <a hre <p>To provide an example of Struts 2 support for i18n create a file named Register_es.properties and in that file add the following Spanish translations.</p> <div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>Register_es.properties</b></div><div class="codeContent panelContent"> -<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[ +<script class="theme: Default; brush: plain; gutter: false" type="syntaxhighlighter"><![CDATA[ personBean.firstName=Nombre personBean.lastName=Apellidos personBean.age=Edad Modified: websites/production/struts/content/development/2.x/docs/restfulactionmapper.html ============================================================================== --- websites/production/struts/content/development/2.x/docs/restfulactionmapper.html (original) +++ websites/production/struts/content/development/2.x/docs/restfulactionmapper.html Fri Jul 19 10:53:48 2013 @@ -173,7 +173,7 @@ under the License. <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent"> <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[ <action name="movie/*" className="app.MovieAction"> - <param name="id">{0}</param> + <param name="id">{1}</param> ... </action> ]]></script> @@ -215,7 +215,7 @@ under the License. <package name="rest" namespace="/rest" extends="struts-default"> ....interceptor config <action name="movie/*" class="app.MovieAction"> - <param name="id">{0}</param> + <param name="id">{1}</param> ....results </action> .... Modified: websites/production/struts/content/development/2.x/docs/struts-2-themes.html ============================================================================== --- websites/production/struts/content/development/2.x/docs/struts-2-themes.html (original) +++ websites/production/struts/content/development/2.x/docs/struts-2-themes.html Fri Jul 19 10:53:48 2013 @@ -245,7 +245,7 @@ under the License. <p>Opening the checkboxlist.ftl file in the template.simple folder, you'll see that there is only a space between each label and the next checkbox. That is why all the checkboxes are displayed across the width of the browser window. For my custom checkboxlist theme I want to have a break tag after each label tag so that each checkbox and its label will be on their own line.</p> -<p>In the example application there is a folder named src/main/webapp/template/KUTheme (for the Maven version, for the Ant version the path is WebContent/template/KUTheme). In that folder is a checkboxlist.ftl, the contents of which I originally copied from the checkboxlist.ftl that is in the templates.xhtml folder from the struts 2 core jar. </p> +<p>In the example application there is a folder named src/main/webapp/template/KUTheme. In that folder is a checkboxlist.ftl, the contents of which I originally copied from the checkboxlist.ftl that is in the templates.xhtml folder from the struts 2 core jar. </p> <p>I then modified the checkboxlist.ftl in the KUTheme folder to be:</p> @@ -263,7 +263,7 @@ under the License. <p>Then in the example application I created a KUTheme_simple folder under webapp/template. In that folder I created checkboxlist.ftl and copied the contents from template.simple checkboxlist.ftl (again found in the Struts 2 core jar). After copying the contents to checkboxlist.ftl that is in KUTheme_simple folder, I modified checkboxlist.ftl so that the label tag has a style of red bold text and I added a break tag after each label so that each check box and label will be on its own line.</p> -<p>In edit.jsp change the value of the theme attribute to be theme="KUTheme" for the Struts 2 checkboxlist tag. </p> +<p>In edit.jsp change the value of the theme attribute to be theme="KUTheme" for the Struts 2 checkboxlist tag. Keep the theme attribute value for the s:form tag as xhtml.</p> <p>In the deployed web application, Struts 2 will first look for a tag's template in <a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&title=web+root&linkCreation=true&fromPageId=23337450">web root</a>/template/<a shape="rect" class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&title=theme+name&linkCreation=true&fromPageId=23337450">theme name</a> and if it doesn't find the template there it will use the default template that is part of the Struts 2 core jar. Since we've added a template folder to the application's web root, now when Struts 2 creates the HTML to display the checkboxlist tag it will use the template that is in the KUTheme folder (which tells it to use the checkboxlist.ftl file that is in the KUTheme_simple folder instead of the one in the template.simple folder that is part of the Struts 2 core Jar).</p> Modified: websites/production/struts/content/development/2.x/docs/wildcard-method-selection.html ============================================================================== --- websites/production/struts/content/development/2.x/docs/wildcard-method-selection.html (original) +++ websites/production/struts/content/development/2.x/docs/wildcard-method-selection.html Fri Jul 19 10:53:48 2013 @@ -214,7 +214,7 @@ under the License. <p>In our next tutorial we'll cover how control the appearance of the Struts 2 tags when they are rendered in the browser.</p> <div class="table-wrap"> -<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Next </th><td colspan="1" rowspan="1" class="confluenceTd"> Onward to <a shape="rect" href="spring-and-struts-2.html" title="Spring and Struts 2">Spring and Struts 2</a> </td></tr></tbody></table> +<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Next </th><td colspan="1" rowspan="1" class="confluenceTd"> Onward to <a shape="rect" href="struts-2-themes.html" title="Struts 2 Themes">Struts 2 Themes</a> </td></tr></tbody></table> </div> </div> </div>