Fix for bug #193396.
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/concepts.html b/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/concepts.html
index 52b9312..6456ec9 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/concepts.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/concepts.html
@@ -19,7 +19,7 @@
<hr/>
<p>This section provides information on the JavaServer Faces Tooling concepts.
</p>
-<p>For additional information, please visit the WTP JST JSF home page at: <code><a href="http://www.eclipse.org/webtools/jsf/">http://www.eclipse.org/webtools/jsf/</a></code>.
+<p>For additional information, please visit the WTP JST JSF home page at: <code><a href="http://www.eclipse.org/webtools/jsf/main.php">http://www.eclipse.org/webtools/jsf/main.php</a></code>.
</p>
</body>
</html>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_facets_install.html b/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_facets_install.html
index dd88e0c..5a27aac 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_facets_install.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_facets_install.html
@@ -21,7 +21,7 @@
<li>An empty Faces configuration file using the name and location specified by the user is created. If a file with that name already exists at that location, this step is skipped.</li>
</ul>
<br>
-An implementation JSF Library must be specified so that the "Run on Server" of a JSF JSP page is possible.
+Either "Server Supplied JSF Implementation" must be selected (if server supplies a JSF implementation), or an implementation JSF Library must be specified, so that "Run on Server" of a JSF JSP page is possible.
<br>
<img src="../../images/ngrelc.png" alt="Related concepts" border="0">
<p> <a href="./jsf_facets.html">JSF Facets</a><br>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_facets_uninstall.html b/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_facets_uninstall.html
index a747788..9f175bf 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_facets_uninstall.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_facets_uninstall.html
@@ -16,13 +16,7 @@
<li>Faces Servlet</li>
</ul>
<br>
-No files, including faces-config.xml, are removed or deleted from the project.<br>
-<br>Currently, all JSF Libraries added to the project will also remain. To remove manually:
-<ul>
-<li>If libraries are deployed <b>Project Properties -> J2EE Module Dependencies -> Deselect jars</b></li>
-<li>If libraries are not deployed <b>Project Properties -> Build Path -> Order and Export Tab-> Deselect jars</b></li>
-</ul>
-
+No files, including faces-config.xml, are removed or deleted from the project.
<br>
<img src="../../images/ngrelc.png" alt="Related concepts" border="0">
<p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_libs.html b/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_libs.html
index df82c79..140b97b 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_libs.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_libs.html
@@ -14,7 +14,6 @@
<li>A JSF Library can be marked for deployment to the WEB-INF/lib directory</li>
<li>A JSF Library can be created procedurally by an extender</li>
<li>A JSF Library can be marked as an implementation</li>
-<li>A JSF Library reference is currently not implemented as a classpath container variable reference</li>
<li>The JSF Library Registry, that is persisted for a workspace, is currently not importable or exportable</li>
</ul>
<br>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_source_editing.html b/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_source_editing.html
index d0e843c..7f34f21 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_source_editing.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_source_editing.html
@@ -8,7 +8,7 @@
<body>
<h1>JSP JSF Source Page Editing Tools</h1>
<br>
-<p>Currently there is no graphical editor supplied with in the Eclipse Web Tools Project so the only way to edit a JSF JSP page is through a text or source editor. The JSF Tools team has provided enhancements to the JSP source editor making JSF page development simpler.</p>
+<p>The JSF Tools team has provided enhancements to the JSP source editor making JSF page development simpler.</p>
<p>The JSF Tooling has provided frameworks that allow the source page editor to provide services for most of the attribute values from the JSF standard Core and HTML tag libraries where it makes sense. These frameworks are "meta-data" driven and extensible which would allow tag library developers to add their own content assist, validation and other service quite easily. In other words, the features supplied with the JSF Tooling will eventually make it to the WTP layer so that the source editing experience for other JSP tag libraries will be improved.</p>
<h2><a id="contentassist">Content Assist</a></h2>
<br>
@@ -66,7 +66,7 @@
<p> <img src="../../images/ngrelr.png" alt="Related reference" border="0">
</p>
<p>
-<a href="../reference/taglibsupport.html">Taglibrary Library</a><br>
+<a href="../reference/taglibsupport.html">Tag Library Support</a><br>
<a href="../reference/jsf-c.html">JSF Core Library</a><br>
<a href="../reference/jsf-h.html">JSF HTML Library</a><br>
<a href="../reference/facesconfigeditor.html">Faces Configuration Editor</a><br>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/getting_started.html b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/getting_started.html
index 93fa523..289a8a5 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/getting_started.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/getting_started.html
@@ -13,20 +13,19 @@
<table summary="" cellspacing="0" cellpadding="0" width="100%">
<tr valign="bottom">
<td align="left" width="86%">
-<h1> Getting started</h1>
+<h1>Getting started</h1>
</td>
</tr>
</table>
<hr/>
-<p>This section provides information on getting started with the JavaServer Faces Tooling.
-</p>
+<p>This section provides information on getting started with the JavaServer Faces (JSF) Tools.</p>
<ul>
<li>
<p><a href="jsf_requirements.html">Requirements and installation</a>
</p>
</li>
<li>
-<p><a href="./tutorial/JSFTools_tutorial.html">JSF basic tutorial</a>
+<p><a href="./tutorial/JSFTools_tutorial.html">JSF Tools basic tutorial</a>
</p>
</li>
<li>
@@ -34,7 +33,6 @@
</p>
</li>
</ul>
-<p>For additional information, please visit the WTP JST JSF home page at: <code><a href="http://www.eclipse.org/webtools/jsf/">http://www.eclipse.org/webtools/jsf/</a></code>.
-</p>
+<p>For additional information, please visit the JSF Tools home page at: <code><a href="http://www.eclipse.org/webtools/jsf/main.php">http://www.eclipse.org/webtools/jsf/main.php</a></code>.</p>
</body>
</html>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/jsf_requirements.html b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/jsf_requirements.html
index dcf3e6b..d52e0b2 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/jsf_requirements.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/jsf_requirements.html
@@ -8,11 +8,13 @@
<body>
<h1>Requirements and Installation</h1><br>
<h2>Requirements</h2><br>
-The JSF Tooling requires:
+The JSF Tools project requires:
<ul>
<li><a href="http://java.sun.com/j2se/1.4.2/download.html">Java 2 Platform, Standard Edition(J2SE) 1.4</a> or later</li>
<li><a
- href="http://download.eclipse.org/webtools/downloads/">Eclipse Web Tools Platform Project 1.5</a></li>
+ href="http://eclipse.org/downloads/">Eclipse 3.3 </a></li>
+ <li><a
+ href="http://download.eclipse.org/webtools/downloads/">Eclipse Web Tools Platform Project(WTP) 2.0</a></li>
<li><a
href="http://java.sun.com/j2ee/javaserverfaces/download.html">JavaServer Faces Implementation v1.1</a> or later</li>
</ul>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/JSFTools_tutorial.html b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/JSFTools_tutorial.html
index ff18f97..07a37be 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/JSFTools_tutorial.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/JSFTools_tutorial.html
@@ -2,10 +2,8 @@
<html>
<head>
-<meta http-equiv="Content-Type"
- content="text/html; charset=UTF-8">
-<title>WTP Tutorials - JavaServer Faces Tools(Milestone5)
-Tutorial/title></title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>WTP Tutorials - JavaServer Faces Tools Tutorial</title>
<link rel="stylesheet" href="default_style.css">
@@ -22,8 +20,8 @@
<tr>
- <td colspan="2" align="left" bgcolor="#0080c0" valign="top"><b><font color="#ffffff"> Eclipse
- Corner Article</font></b></td>
+ <td colspan="2" align="left" bgcolor="#0080c0" valign="top"><b><font
+ color="#ffffff"> Eclipse Corner Article</font></b></td>
</tr>
@@ -40,8 +38,7 @@
<p></p>
-<h1 align="center">WTP Tutorials - JavaServer Faces
-Tools Tutorial</h1>
+<h1 align="center">WTP Tutorials - JavaServer Faces Tools Tutorial</h1>
<blockquote><b>Summary</b> <br>
@@ -50,7 +47,7 @@
Project.
<p><b> By Raghu Srinivasan, Oracle Corporation.</b> <br>
-<font size="-1">May 24, 2006</font></p>
+<font size="-1">June 18, 2007</font></p>
</blockquote>
@@ -58,9 +55,12 @@
<h3>Introduction</h3>
<p>In this tutorial we will create and execute a web application
-with JavaServer Faces capabilities. The WTP JSF Tooling project has
-provided features for improving JSP source editing and validation, along
-with simplified application building, configuration and execution.<br></br>
+with JavaServer Faces capabilities. The WTP JSF Tools project has
+provided features that simplifies application building, configuration
+and execution. These include the Web Page Editor for visually editing a
+JSF-JSP web page, syntactic and semantic validation of a JSF-JSP page,
+the Faces Configuration Editor for editing the application configuration
+resource file.<br></br>
You may wish to visit <a
href="http://www.eclipse.org/webtools/community/tutorials/BuildJ2EEWebApp/BuildJ2EEWebApp.html">Building
and Running a Web Application</a> before attempting this tutorial. That
@@ -70,51 +70,62 @@
<h3>Setup</h3>
<p></p>
<ul>
- <li><a href="http://java.sun.com/j2se/1.4.2/download.html">Java
- 2 Platform, Standard Edition(J2SE) 1.4</a></li>
+ <li><a href="http://java.sun.com/javase/downloads/index_jdk5.jsp">The
+ Java SE 5 Development Kit (JDK)</a></li>
+ <li><a href="http://eclipse.org/downloads/">Eclipse 3.3 </a></li>
+ <li><a href="http://download.eclipse.org/webtools/downloads/">Eclipse
+ Web Tools Platform Project(WTP) 2.0</a></li>
+
+ <li><a href="http://tomcat.apache.org/">Apache Tomcat 6.0</a></li>
<li><a
- href="http://download.eclipse.org/webtools/downloads/drops/S-1.5RC3-200605182217/">Eclipse
- Web Tools Platform Project 1.5 RC3</a></li>
- <li><a
- href="http://www.eclipse.org/downloads/download.php?file=/webtools/jsf/MilestoneRC3/wtp-jsf-I-I200605250544-200605250544.zip">JavaServer
- Faces Tools Milestone RC3 Development build</a></li>
- <li><a href="http://tomcat.apache.org/">Apache Tomcat 5.5</a></li>
- <li><a
- href="http://java.sun.com/j2ee/javaserverfaces/download.html">JavaServer
- Faces RI v1.1.01</a></li>
- <li><a
- href="http://jakarta.apache.org/builds/jakarta-taglibs/releases/standard">JavaServer
- Pages Standard Tag Library</a></li>
+ href="http://java.sun.com/javaee/javaserverfaces/download.html">JavaServer
+ Faces RI v1.2</a></li>
+ <li>JSP (tm) Standard Tag Library 1.2 implementation</li>
</ul>
<p><a id="reglibs"></a></p>
+<h3>Make the Web Page Editor the default editor for JSP pages</h3>
+
+The JSF Tools Project-contributed Web Page Editor (WPE) is NOT registered as
+the default editor for JSP files. You can make the WPE the default
+editor for JSP files by following these steps:
+<ul>
+ <li>Navigate to "Window" -> "Preferences..." -> "General" ->
+ "Editors" -> "File Associations"</li>
+ <li>In the "File types" section, select "*.jsp"</li>
+ <li>In the "Associated editors" section, select "Web Page Editor"</li>
+ <li>Select the "Default" button</li>
+</ul>
<h3>Register JSF libraries</h3>
<p>This feature allows for a named sets of jars to be created for
use with JSF Applications. We will be creating a library containing the
-Sun JSF RI, Apache commons and JSTL jars.<br>
+Sun JSF RI<br>
-Select Windows->Preferences->Web and XML->JSF Libraries. Click
-on the New.. button to add a new library. Create the JSF Libraries as
-shown in the following figures. Check the <b>is JSF Implementation</b>
-check box when adding the Sun JSF RI library.</p>
+Select Windows->Preferences->Web and XML->->JavaServer Faces
+Tools->Libraries. Click on the New.. button to add a new library.
+Create the JSF Libraries as shown in the following figures. Check the <b>is
+JSF Implementation</b> check box when adding the Sun JSF RI library.</p>
<br>
<img alt="JSF Libraries-add" src="images/jsf-library-new.png"
- height="526" width="579">
+ height="538" width="626">
+
<br>
<br>
-<img alt="JSF Libraries" src="images/jsf-libraries.png" height="525"
- width="578">
+Create another JSF Library called <b>JSTL</b> that has the JavaServer Pages Standard Tag Library jar as shown below.
+<br>
+<br>
+<img alt="JSF Libraries" src="images/jsf-libraries.png"
+ height="241" width="729">
<br>
-
<p><a id="newproject"></a></p>
<h3>Create a JavaServer Faces Project</h3>
<p>Create a New Dynamic Web Application with the name of <b>JSFTutorial</b>.
-Set the target runtime to the <b>Apache Tomcat 5.5</b><br>
+Set the target runtime to the <b>Apache Tomcat 6.0</b><br>
In the <b>configuration</b> section, select the <b>JavaServer Faces
-Project v1.1</b>. Skip the next two panels to get to the JSF Capabilities
+Project v1.2</b>. Skip the next two panels to get to the JSF Capabilities
page.<br>
<br>
<img alt="New Dynamic Web Application"
@@ -123,22 +134,25 @@
<br>
-<p>On the JSF Capabilities page, add the <b>Commons</b> and <b>JSTL</b>
-library and select the <b>Deploy JARS to WEB-INF/lib</b>.<br>
+<p>On the JSF Capabilities page, select the radio button adjacent to
+the JSF Library <b>JSF-RI-1.2</b>. Add the <b>JSTL</b> library.
<br>
<br>
+
<img alt="JSF Capabilities page"
- src="images/jsf-capabilities-library.png" height="508" width="613"></p>
+ src="images/jsf-capabilities-library.png" height="268" width="616"></p>
<br>
-Click on the
-<b>Finish</b>
-button to create the JavaServer Faces Application. You may be prompted
-to accept the license for the Web App DTD from Sun. You may also be
-asked to choose the J2EE perspective upon completion. In both cases
-accept.
+<p><img src="images/note.gif" height="13" width="62">If you
+deploy the JSF web application to a server runtime that includes the JSF
+1.2 reference implementation, then you should select the <b>Server
+Supplied JSF implementation</b> option.<br>
<br>
+Click on the <b>Finish</b> button to create the JavaServer Faces
+Application. You may be prompted to accept the license for the Web App
+DTD from Sun. You may also be asked to choose the J2EE perspective upon
+completion. In both cases accept. <br>
<br>
<p>Your JSF application has been created. Note that the web.xml file
@@ -147,7 +161,7 @@
the build path has been updated with the implementation jars.<br>
<br>
<br>
-<img alt="" src="images/project-explorer.png" height="450" width="407"></p>
+<img alt="" src="images/project-explorer.png" height="283" width="389"></p>
<br>
@@ -163,142 +177,55 @@
<p>Use the JSP Page wizard to create a page called <b>login.jsp</b>
in the Web Content folder of the new application. In the Select
Templates page of the wizard, select the <b>New JSP(html)</b> template.
-Click Finish.<br>
-Add the JSF taglibs, the view and the form tag. The JSP page should look
-like the following: <br>
+Click Finish. The page will be opened in the Web Page Editor as shown below<br>
<br>
-<img alt="New JSP Page" src="images/jsp-page.png" height="308"
- width="618"></p>
+<br>
+<img alt="Web Page Editor" src="images/web-page-editor.png" height="589"
+ width="957"></p>
+
+<br>
+Open the Properties View. Right-mouse click on the designer canvas and from the context menu, select Show->Properties. Wait for the ‘Reading Properties’ dialog to disappear.
+<br>
+<br>
+<h5>Add a CommandButton to the canvas.</h6> <ul><li>In the <b>Palette View</b>, click on the section <b>JSF HTML</b> to display the list of components.</li><li> Drag-and-drop the CommandButton to the canvas.
+Note that the editor wraps the CommandButton with <b><f:view></b> and <b><h:form></b> tag.</li>
+<li>In the properties view, click on <b>Quick Edit</b>. </li><li>Set the <b>Value</b> attribute to <b>Login</b>.</li><li>Set the <b>Action</b> attribute to <b>login</b></li>
+</ul>
+<br>
+<br>
+<img alt="WPE-Add CommandButton" src="images/wpe-add-cmd.png" height="447"
+ width="854"></p>
+
+<br>
+<h5>Add a PanelGrid</h5>
+<ul>
+<li>From the Palette View, Drag-and-drop the PanelGrid to the canvas. Notice the feedback on the drop target.</li>
+<li>Drop the Panel Grid before the Command Button, but inside the Form tag. The Panel Grid is created with a predefined set of OutputText components.</li>
+</ul>
+<h5>Modify the components inside the Panel Grid </h5>
+<ul>
+<li>Click on the OutputText <b>Item2</b> and hit Delete</li>
+<li>Add a InputText (Text Input in the Palette view) tag after <b>Item1</b> and before <b>Item3</b></li>
+<li>Delete the OutputText, <b>Item 4</b></li>
+<li>Add a InputSecret (Secret Input in the Palette view) tag after <b>Item3</b></li>
+<li>Click on the OutputText, <b>Item1</b>. Change its value in the Source View to <b>Name</b></li>
+<li>Click on the OutputText, <b>Item3</b>. Change its value in the Source View to <b>Password</b></li>
+<li>Click on the <b>Preview</b> tab to see the page rendered in a browser</li>
+<li>Click on the InputText tag next to <b>Name</b>. In the Property View, set the value attribute to <b>#{loginBean.name}</b>.</li>
+<li>Save the page. The editor will flag a warning indicating that the variable, <b>loginBean</b> cannot be resolved. </li>
+</ul>
+<br>
+<br>
+<img alt="WPE-Add PanelGrid" src="images/wpe-add-panel.png" height="438"
+ width="892"></p>
<br>
-<a id="content-assist-lov"></a>
-Add the following JSF tag,
-<b><h:messages layout=""></h:messages></b>
-. Postion the cursor inside the double-quotes of the
-<b>layout</b>
-attribute and hit
-<b>Ctrl+space</b>
-.You will get a pop-up with the list of valid values for the attribute.
-Select
-<b>table</b>
-.The editor provides
-<b>content assist</b>
-for values of attributes that have a discrete list of values.
-<br>
-<br>
-<img alt="Content Assist" src="images/ca-enum-lov.png" height="78"
- width="443">
-<br>
-<br>
-<a id="validate-lov"></a>
-Now, change the value of the layout attribute to say,
-<b>tablex</b>
-and save the change. The editor will validate the value of this
-attribute against the meta-data defined list of valid values and will
-flag the line with a warning that the value is invalid.
-<br>
-<br>
-<img alt="Validate against list of valid values"
- src="images/ca-valid-lov.png" height="146" width="508">
-<br>
-<br>
-Change the value of the layout attribute back to
-<b>table</b>
-and save. Note that the warning message disappears.
-<br>
-<br>
-<a id="content-assist-boolean"></a>
-Add the following JSF tag,
-<b><h:outputLabel rendered=""></h:outputLabel></b>
-. Position the cursor inside the double-quotes of the
-<b>rendered</b>
-attribute and hit
-<b>Ctrl+space</b>
-.You will get a pop-up with the list of values for the attribute. Select
-the value,
-<b>true</b>
-. The editor provides
-<b>content assist</b>
-for values of attributes that are of Boolean type.
-<br>
-<br>
-<img alt="Content Assist Boolean" src="images/ca-boolean-lov.png"
- height="73" width="477">
-<br>
-<br>
-Complete the tag as shown,
-<b><h:outputLabel rendered="true"
-value="Name"></h:outputLabel></b>
-<br>
-<br>
-<a id="validate-attribute-value-type"></a>
-Add the JSF tag,
-<b><h:inputText tabindex="" ></h:inputText></b>
-with an empty string for the value of the attribute
-<b>tabindex</b>
-and save. The Editor will report a warning that the value is not a valid
-integer. Enter the value
-<b>0</b>
-and save. The Editor provides meta-driven validation of values of
-attributes based on the type of the value as defined in the meta-data.
-<br>
-<br>
-<img alt="Syntax error on JSP Page"
- src="images/validate-attribute-value-type.png" height="141" width="566">
-<br>
-<br>
-<a id="el-validate-syntax"></a>
-Add the
-<b>value</b>
-attribute to the above tag, with an empty EL expression for the value
-attribute without a closing double-quote as shown below and save. The
-editor has comprehensive validation of EL syntax and will indicate a
-syntax error.
-<br>
-<br>
-<img alt="Syntax error on JSP Page" src="images/syntax-error.png"
- height="164" width="510">
-<br>
-<br>
-<a id="el-syntax-check-no-bracket"></a>
-Change the EL expression to include the double-quote, but now remove the
-closing bracket as shown below and save. The editor will mark the line
-with an error.
-<br>
-<br>
-<img alt="Syntax error on JSP Page"
- src="images/syntax-error-no-bracket.png" height="175" width="508">
-<br>
-<br>
-
-<a id="el-validate-unknown-variable"></a>
-Now enter a value binding expression referring to an undefined managed
-bean,
-<b>"#{loginBean.name}"</b>
-and save. The editor will flag a warning indicating that the variable
-cannot be resolved.
-<br>
-<br>
-<img alt="EL validation undefined bean"
- src="images/validate-managedbean-error.png" height="146" width="511">
-
-<br>
-<p><a id="createbean"></a></p>
-<br>
-Create a Java class,
-<b>com.tutorial.LoginBean</b>
-with the following code and save.
-<br>
-<br>
-<img alt="LoginBean" src="images/loginbean.png" height="563" width="498">
-
-<br>
<a id="faces-config-bean"></a>
In the Project Explorer, expand the node, JSFTutorial->WebContent.
Double-click on
<b>faces-config.xml</b>
-. This will launch the faces-config editor. Select the
+. This will launch the Faces Configuration editor. Select the
<b>ManagedBean</b>
tab.
@@ -310,32 +237,45 @@
<br>
Click on the
<b>Add</b>
-button. This will launch the New Managed Bean wizard. Select the class,
-<b>com.tutorial.LoginBean</b>
-. Click the Next button twice and the select the Finish button. This
-will register the managed bean.
+button. This will launch the New Managed Bean wizard. Select the option,
+<b>Create a new Java class</b>. In the next wizard panel, enter the package as,
+<b>com.tutorial</b> and the Name of the class as <b>LoginBean</b>
+. Click the Finish button.
<br>
<br>
<img alt="New Managed Bean" src="images/new-managedbean.png"
- height="262" width="488">
+ height="234" width="495">
<br>
<br>
-<a id='el-validate-bean'></a>
-Switch to the
-<b>login</b>
-JSP page. Right-mouse click on the page and from the context menu,
-select the
-<b>validate</b>
-option. Note that the page should now be valid.
+This
+will create the Java class and register it as a managed bean. Save the Faces Configuration editor.To edit the Java class, click on the hyperlink, <b>ManagedBean class</b> in the Managed bean page as shown in the figure below. This will launch the Java editor.
<br>
<br>
-<img alt="New Managed Bean" src="images/jsp-editor-validate.png"
- height="123" width="550">
+<img alt="Faces Configuration Editor - Managed Bean tab" src="images/fce-managedbean-class.png"
+ height="181" width="599">
<br>
<br>
+<p><a id="createbean"></a></p>
+<br>
+Edit the Java class,
+<b>com.tutorial.LoginBean</b>.
+Add the following code and save.
+<br>
+<br>
+<img alt="LoginBean" src="images/loginbean.png" height="491" width="405">
+
+<br>
+<a id='el-validate-bean'></a>
+In the Project Explorer view, right-mouse click on the
+JSP page, <b>login.jsp</b> and from the context menu,
+select the
+<b>Validate</b>
+option. Note that the page should now be valid.
+<br>
+<br>
<a id="el-ca-bean-properties"> </a>
-Add the JSF tag,
+In the Source Page of the Web Page Editor, add the JSF tag,
<b><h:inputSecret value="#{}"></h:inputSecret> </b>
. With the cursor inside the brackets, hit
<b>Ctrl+spacebar</b>
@@ -371,51 +311,6 @@
height="55" width="487">
<br>
<br>
-The property
-<b>password</b>
-has nested properties. Enter a dot after
-<b>password</b>
-and Hit
-<b>Ctrl+spacebar</b>
-.The editor will pop-up a list of the nested properties. Select
-<b>convertedID</b>
-<br>
-<br>
-<img alt="Content Assist" src="images/el-ca-bean-properties-nested.png"
- height="67" width="479">
-<br>
-<br>
-<a id="validate-attribute-values"> </a>
-Add the JSF tag,
-<b><f:converter converterId=""></f:converter > </b>
-and save. The editor will flag a warning that the converterId attribute
-can not be null. The editor provides meta-data driven validation for
-attribute values.
-<br>
-<img alt="Validate attribute values"
- src="images/validate-converterId.png" height="166" width="508">
-<br>
-<br>
-<br>
-<a id="ca-converter-id-list"></a>
-With the cursor inside the double-quote of the
-<b>converterId</b>
-, hit
-<b>Ctrl+spacebar</b>
-. You should see a pop-up with a list of all the standard converters
-plus those registered in the faces-config file. The editor provides
-content assist for various artifacts registered in the faces-config
-files including validators.Select the
-<b>javax.faces.Long</b>
-id.
-<br>
-<br>
-<img alt="Content assist for converterId"
- src="images/ca-converterId-lov.png" height="203" width="541">
-<br>
-<br>
-<br>
-
Create a Java class,
<b>com.tutorial.validatePassword</b>
that implements the
@@ -475,27 +370,6 @@
<br>
<br>
<br>
-
-<a id="validate-action-attribute"></a>
-Add the JSF tag,
-<b><h:commandButton action=""></h:commandButton > </b>
-and save. The editor will flag a warning that the action attribute can
-not be null. This is another example of meta-data driven validation for
-attribute values.
-<br>
-<br>
-<img alt="Validate attribute values"
- src="images/validate-action-attribute.png" height="144" width="522">
-<br>
-<br>
-<br>
-Complete the tag as shown below.
-<br>
-<b><h:commandButton action="login"
-value="Login"></h:commandButton></b>
-<br>
-<br>
-
<a id="el-ca-loadbundle"></a>
We will now move the static strings we have used in the page to a
resource bundle. To do this, add a file called,
@@ -511,7 +385,7 @@
<br>
Add the JSF tag,
<b>loadBundle</b>
-as shown below.
+as shown below. You can drag-and-drop the tag from the <b>JSF Core</b> section of the Palette View.
<br>
<br>
<img alt="Content assist for resource bundle"
@@ -554,8 +428,8 @@
Complete the login page as shown below.
<br>
<br>
-<img alt="Complete login page" src="images/login-final.png" height="511"
- width="670">
+<img alt="Complete login page" src="images/login-final.png" height="484"
+ width="836">
<br>
<br>
Create a new JSF page,
@@ -567,7 +441,8 @@
width="650">
<br>
<br>
-<h3><a id="facesconfigeditor"></a>Faces Configuration Resource Editor</h3>
+<h3><a id="facesconfigeditor"></a>Faces Configuration Resource
+Editor</h3>
The JSF Tools project includes a special editor for the faces
configuration resource files. The following section gives a brief
introduction to the editor. A comprehensive tutorial detailing all the
@@ -637,6 +512,6 @@
<br>
<p><b> Congratulations! You have created and executed your first
-JavaServer Faces application using the new Eclipse WTP JSF tooling. </b></p>
+JavaServer Faces application using the new Eclipse WTP JSF Tools. </b></p>
</body>
</html>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/fce-managedbean-class.png b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/fce-managedbean-class.png
new file mode 100644
index 0000000..9153e43
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/fce-managedbean-class.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-capabilities-library.png b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-capabilities-library.png
index 20de64f..0f36d6b 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-capabilities-library.png
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-capabilities-library.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-libraries.png b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-libraries.png
index 422f74c..371ef51 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-libraries.png
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-libraries.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-library-new.png b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-library-new.png
index ec60a30..8e179cc 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-library-new.png
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-library-new.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/login-final.png b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/login-final.png
index b344da6..50be250 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/login-final.png
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/login-final.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/loginbean.png b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/loginbean.png
index f605d5f..31cca75 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/loginbean.png
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/loginbean.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/new-dynamic-web-project.png b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/new-dynamic-web-project.png
index c538f72..d3288a6 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/new-dynamic-web-project.png
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/new-dynamic-web-project.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/new-managedbean.png b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/new-managedbean.png
index e8abdf5..f37b6fa 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/new-managedbean.png
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/new-managedbean.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/project-explorer.png b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/project-explorer.png
index 3f66400..b2548b2 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/project-explorer.png
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/project-explorer.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/web-page-editor.png b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/web-page-editor.png
new file mode 100644
index 0000000..fffa298
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/web-page-editor.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/wpe-add-cmd.png b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/wpe-add-cmd.png
new file mode 100644
index 0000000..ddf63d0
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/wpe-add-cmd.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/wpe-add-panel.png b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/wpe-add-panel.png
new file mode 100644
index 0000000..495702a
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/wpe-add-panel.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/facesconfigeditor.html b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/facesconfigeditor.html
index b6294c1..de2dcbf 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/facesconfigeditor.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/facesconfigeditor.html
@@ -16,8 +16,6 @@
<p> <img src="../../images/ngrelr.png" alt="Related reference" border="0">
</p>
<p>
-<a href="../reference/???.htm">JSF Application Configuration</a><br></p>
-
<p> <img src="../../images/ngrelt.png" alt="Related tasks" border="0">
<br>
<a href="../tasks/use_facesconfig_editor.html">Configuring Faces Config Files</a><br>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/jsf-c.html b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/jsf-c.html
index 96775ee..21d0f98 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/jsf-c.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/jsf-c.html
@@ -3,10 +3,10 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<link rel="stylesheet" href="../../book.css" type="text/css">
-<title>JSF Core Taglibrary Support</title>
+<title>JSF Core Tag Library Support</title>
</head>
<body>
-<h1>JSF Core Taglibrary Support</h1>
+<h1>JSF Core Tag Library Support</h1>
<br>
<p>The following table of attributes for the JSF Core tag library
indicates whether or not the attribute value is supported for either
@@ -128,7 +128,7 @@
<p><img src="../../images/ngrelr.png" alt="Related reference"
border="0" ></p>
-<p><a href="./taglibsupport.html">Taglibrary Library</a><br>
+<p><a href="./taglibsupport.html">Tag Library Support</a><br>
<a href="./jsf-h.html">JSF HTML Library</a><br>
</p>
<p><img src="../../images/ngrelt.png" alt="Related tasks" border="0" >
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/jsf-h.html b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/jsf-h.html
index d2813d8..36f4ffd 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/jsf-h.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/jsf-h.html
@@ -3,10 +3,10 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<link rel="stylesheet" href="../../book.css" type="text/css">
-<title>JSF HTML Taglibrary Support</title>
+<title>JSF HTML Tag Library Support</title>
</head>
<body>
-<h1>JSF HTML Taglibrary Support</h1>
+<h1>JSF HTML Tag Library Support</h1>
<br>
<p>The following table of attributes for the JSF HTML tag library
indicates whether or not the attribute value is supported for either
@@ -214,7 +214,7 @@
<p> <img src="../../images/ngrelr.png" alt="Related reference" border="0" >
</p>
<p>
-<a href="./taglibsupport.html">Taglibrary Library</a><br>
+<a href="./taglibsupport.html">Tag Library Support</a><br>
<a href="./jsf-c.html">JSF Core Library</a><br>
</p>
<p> <img src="../../images/ngrelt.png" alt="Related tasks" border="0" >
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/jsf_libraries.html b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/jsf_libraries.html
index ced1646..3b77ea7 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/jsf_libraries.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/jsf_libraries.html
@@ -9,13 +9,14 @@
<h1>JSF Libraries</h1>
<br>
-A JSF Library is very similar in concept to the Eclipse JDT User Library. They are meant to be named collections of jars that can be added as references to a Dynamic Web Project.
-A JSF Library differs from a JDT User Library in the following ways:
+A JSF Library is very similar in concept to the Eclipse JDT User Library. They
+are meant to be named collections of jars that can be added as references to a
+Dynamic Web Project. A JSF Library differs from a JDT User Library in the
+following ways:
<ul>
<li>A JSF Library can be marked for deployment to the WEB-INF/lib directory</li>
<li>A JSF Library can be created procedurally by an extender</li>
<li>A JSF Library can be marked as an implementation</li>
-<li>A JSF Library reference is currently not implemented as a classpath container variable reference</li>
<li>The JSF Library Registry, that is persisted for a workspace, is currently not importable or exportable</li>
</ul>
<br>
@@ -25,10 +26,10 @@
<p>Why do some libraries have the "implementation" flag?</p>
A library marked as a JSF implementation differentiates it from a normal set of jars that make up a library. This flag is meant as an on-your-honor marking that this set of jars meets the JSF specification for an implementation.
The JSF tooling requires a Faces Servlet implementation for compilation and "Run on Server" feature of a JSF JSP page.
-
+In cases where the server runtime adapter supplies the JSF implementation, it is possible to specify that the server-supplied implementation be used.
A library marked as an implementation will appear with [implementation] in the label. There can be more than one implementation in the registry. One of them can be marked as the default so that it will be chosen automatically during JSF Facet installation allowing JSF Facet Finish to be enabled.
<br><br>
-<img alt="JSF Implmentation Library" src="./images/jsfimpl.png">
+<img alt="JSF Implementation Library" src="./images/jsfimpl.png">
<br>
To make one of the implementations the default, select the desired default implementation library and press the enabled "Make Default" button. This button is only available when the selected library is an implementation.
<p><br><br>
@@ -60,11 +61,10 @@
<ul>
<li>If a library was marked for deployment, each jar is added as a J2EE Module Dependency for the project. This places each jar on the build classpath and allows it to be deployed to WEB-INF/lib directory </li>
<li>If library is not marked for deployment, each individual jar in the library is added as a classpath library reference in the build path.</li>
-<li><i>The current implementation does not use classpath container variable references for libraries.</i></li>
</ul>
<br>
<p>
-Note: if by adding a reference to a library that contains a jar that is already referenced (same name and location), the newly referenced jar will be skipped.
+Note: if adding a reference to a library that contains a jar that is already referenced (same name and location), the newly referenced jar will be skipped.
</p>
<p>
When a library is removed as a reference by a project, the following occurs:
@@ -73,14 +73,6 @@
<li>If a library was marked for deployment, each jar is removed as a J2EE Module Dependency.</li>
<li>If library is not marked for deployment, each individual jar in the library is removed from the classpath library reference in the build path.</li>
</ul>
-<br>
-<p>
-Beware: One can remove the J2EE Module Dependency through the J2EE Module Dependencies property page. Doing so currently will not remove the JSF Library reference.
-<br>
-</p>
-<p>
-If there have been updates to a library in the registry that your project is referencing, it is currently necessary to remove and re-add the reference. Future enhancments will be made to resolve lifecycle issues with a JSF Library project reference.<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=142056" id="Bug142056">142056</a>
-</p>
<p>
<img src="../../images/ngrelc.png" alt="Related concepts" border="0"><br>
<a href="../concepts/jsf_facets.html">JSF Facets</a><br>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/references.html b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/references.html
index cc1dfec..a62108d 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/references.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/references.html
@@ -29,7 +29,7 @@
</p>
</li>
</ul>
-<p>For additional information, please visit the WTP JST JSF home page at: <code><a href="http://www.eclipse.org/webtools/jsf/">http://www.eclipse.org/webtools/jsf/</a></code>.
+<p>For additional information, please visit the WTP JST JSF home page at: <code><a href="http://www.eclipse.org/webtools/jsf/main.php">http://www.eclipse.org/webtools/jsf/main.php</a></code>.
</p>
</body>
</html>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/taglibsupport.html b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/taglibsupport.html
index 3a38f57..1805d47 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/taglibsupport.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/taglibsupport.html
@@ -3,10 +3,10 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<link rel="stylesheet" href="../../book.css" type="text/css">
-<title>Taglibrary Support in the JSP Source Editor</title>
+<title>Tag Library Support in the JSP Source Editor</title>
</head>
<body>
-<h1>Taglibrary Support in the JSP Source Editor</h1>
+<h1>Tag Library Support in the JSP Source Editor</h1>
<br>
<p>WTP provides tools to the source editor for validating tag and attribute existence within a tag library along with providing content assist for those tags and attributes. The JSF tooling has provided support for tag libraries that goes beyond this.</p>
<p>Frameworks for the plugin developer/tag library provider have been created so that meta-data driven validation of the tag attribute values can be performed along with providing content assist. These frameworks are extensible and will provide additional services in the future.</p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/add_jsf_facet.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/add_jsf_facet.html
index 1ba3194..a2a20f2 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/add_jsf_facet.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/add_jsf_facet.html
@@ -13,13 +13,13 @@
<br>
<img src="./images/projectpropertiesprojectfacets.png" alt="Project Facets" >
<br>
-Choose "Add/Remove Project Facets..." button
+Choose "Modify Project..." button.
<br>
<h2>Step 2: Add JSF Facet</h2>
<br>
<img src="./images/addprojectfacet.png" alt="Add JSF Facet" >
<br><br>
-You may select the "JavaServer Faces v1.1 Project from the preset configurations or check the JavaServer Faces selection.
+You may select "JavaServer Faces v1.1 Project" or "JavaServer Faces v1.2 Project" from the preset configurations or check the JavaServer Faces selection.
<br><br>
Some facet versions cannot be modified once installed. This means that if you have a v2.4 dynamic web module, it will not be possible to use the preset configuration. In this case you should:
<ul>
@@ -39,9 +39,8 @@
Facet is installed?</a><br>
<p><img src="../../images/ngrelr.png" alt="Related reference"
border="0"></p>
-<p><a href="../reference/jsf_facets.htm">JSF Facets</a><br>
-<a href="../reference/jsf_libraries.htm">JSF Libraries</a><br>
-<a href="../reference/jsf_app_config.htm">JSF Application Configuration</a><br>
+<p>
+<a href="../reference/jsf_libraries.html">JSF Libraries</a>
</p>
<br>
<p><img src="../../images/ngrelt.png" alt="Related tasks" border="0">
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/create_jsf_app.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/create_jsf_app.html
index 3a47518..fac3e61 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/create_jsf_app.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/create_jsf_app.html
@@ -22,7 +22,8 @@
<br>This dialog allows you to specify:
</p>
<ul>
-<li>the JSF Libraries to be added to the classpath and, if checked which ones are deployed to the WEB-INF/lib directory at deployment time.</li>
+<li>either that the JSF implementation is supplied by the server runtime adapter or a specific JSF implementation Library</li>
+<li>the JSF Libraries to be added to the classpath and, if checked which ones are deployed to the WEB-INF/lib directory at deployment time</li>
<li>the name and location of the Faces configuration file</li>
<li>the name to give the Faces Servlet</li>
<li>the URL mapping patterns to use for the Faces Servlet</li>
@@ -43,7 +44,7 @@
<p>
<a href="../reference/jsf_libraries.html">JSF Libraries</a><br>
<a href="jsf_app_configs.html">JSF Application Configuration</a><br>
-<a href="../gettingstarted/tutorial/JSFTools_tutorial.html#newproject">Tutorial</a><br>
+<a href="../gettingstarted/tutorial/JSFTools_tutorial.html">Tutorial</a><br>
</p>
<p> <img src="../../images/ngrelt.png" alt="Related tasks" border="0">
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/create_jsf_jsp_page.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/create_jsf_jsp_page.html
index edc7da7..98ce9b0 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/create_jsf_jsp_page.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/create_jsf_jsp_page.html
@@ -45,7 +45,7 @@
<p>
<a href="../tasks/create_jsf_app.html">Create JSF Application</a><br>
<a href="../tasks/jsf_libs_refs.html">JSF Library References</a><br>
- <a href="../gettingstarted/tutorial/JSFTools_tutorial.html#newpage">Tutorial</a>
+ <a href="../gettingstarted/tutorial/JSFTools_tutorial.html">Tutorial</a>
</p>
</body>
</html>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/create_managedbean.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/create_managedbean.html
index 8bd076f..95ff4e2 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/create_managedbean.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/create_managedbean.html
@@ -60,10 +60,6 @@
<p><img src="../../images/ngrelr.png" alt="Related reference"
border="0"></p>
-<p><br>
-</p>
-<p><a href="../reference/???.htm">JSF Application Configuration</a><br>
-</p>
<p><a href="../reference/facesconfigeditor.html">Faces Config
Editor</a><br>
</p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/define_link_properties.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/define_link_properties.html
index 42628b6..51a4e25 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/define_link_properties.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/define_link_properties.html
@@ -34,7 +34,7 @@
<p>The Quick Edit tab of Properties displays Link properties.</p>
</li>
<li>
- <p>Click the ellipse <span class="inlinemediaobject"><img
+ <p>Click the ellipsis <span class="inlinemediaobject"><img
src="images/dotbox.gif" width="24"></span> after the <span
class="strong">From Outcome</span> field.</p>
<p>The Outcome Selection dialog box appears.</p>
@@ -66,10 +66,6 @@
<p><img src="../../images/ngrelr.png" alt="Related reference"
border="0"></p>
-<p><br>
-</p>
-<p><a href="../reference/???.htm">JSF Application Configuration</a><br>
-</p>
<p><a href="../reference/facesconfigeditor.html">Faces Config
Editor</a><br>
</p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/define_navigations.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/define_navigations.html
index 8de805e..b72fdb3 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/define_navigations.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/define_navigations.html
@@ -97,10 +97,6 @@
<p><img src="../../images/ngrelr.png" alt="Related reference"
border="0"></p>
-<p><br>
-</p>
-<p><a href="../reference/???.htm">JSF Application Configuration</a><br>
-</p>
<p><a href="../reference/facesconfigeditor.html">Faces Config
Editor</a><br>
</p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_action_listener.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_action_listener.html
index 0630e37..ef6dd24 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_action_listener.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_action_listener.html
@@ -61,8 +61,6 @@
border="0"></p>
<p><br>
</p>
-<p><a href="../../reference/???.htm">JSF Application Configuration</a><br>
-</p>
<p><a href="../../reference/facesconfigeditor.html">Faces Config
Editor</a><br>
</p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_application_factory.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_application_factory.html
index 6d87d16..143bdfc 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_application_factory.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_application_factory.html
@@ -63,8 +63,6 @@
border="0"></p>
<p><br>
</p>
-<p><a href="../../reference/???.htm">JSF Application Configuration</a><br>
-</p>
<p><a href="../../reference/facesconfigeditor.html">Faces Config
Editor</a><br>
</p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_component.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_component.html
index 9d465f6..05e9afb 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_component.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_component.html
@@ -153,8 +153,6 @@
border="0"></p>
<p><br>
</p>
-<p><a href="../../reference/???.htm">JSF Application Configuration</a><br>
-</p>
<p><a href="../../reference/facesconfigeditor.html">Faces Config
Editor</a><br>
</p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_converter.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_converter.html
index d6203b7..dbeea1d 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_converter.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_converter.html
@@ -106,7 +106,6 @@
<p><br>
</p>
<p>
-<a href="../../reference/???.htm">JSF Application Configuration</a><br></p><p>
<a href="../../reference/facesconfigeditor.html">Faces Config Editor</a><br></p>
<p><img src="../../../images/ngrelt.png" alt="Related tasks" border="0">
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_default_renderkitid.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_default_renderkitid.html
index 6e10aab..80f9adc 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_default_renderkitid.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_default_renderkitid.html
@@ -59,8 +59,6 @@
border="0"></p>
<p><br>
</p>
-<p><a href="../../reference/???.htm">JSF Application Configuration</a><br>
-</p>
<p><a href="../../reference/facesconfigeditor.html">Faces Config
Editor</a><br>
</p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_facescontext_factory.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_facescontext_factory.html
index c4b0b95..5634e56 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_facescontext_factory.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_facescontext_factory.html
@@ -63,8 +63,6 @@
border="0"></p>
<p><br>
</p>
-<p><a href="../../reference/???.htm">JSF Application Configuration</a><br>
-</p>
<p><a href="../../reference/facesconfigeditor.html">Faces Config
Editor</a><br>
</p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_lifecycle_factory.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_lifecycle_factory.html
index 2d93b94..5ec59e4 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_lifecycle_factory.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_lifecycle_factory.html
@@ -62,8 +62,6 @@
border="0"></p>
<p><br>
</p>
-<p><a href="../../reference/???.htm">JSF Application Configuration</a><br>
-</p>
<p><a href="../../reference/facesconfigeditor.html">Faces Config
Editor</a><br>
</p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_locale_config.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_locale_config.html
index 58daf76..5549a6a 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_locale_config.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_locale_config.html
@@ -56,8 +56,6 @@
border="0"></p>
<p><br>
</p>
-<p><a href="../../reference/???.htm">JSF Application Configuration</a><br>
-</p>
<p><a href="../../reference/facesconfigeditor.html">Faces Config
Editor</a><br>
</p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_messagebundle.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_messagebundle.html
index 1edd13d..7d1e40f 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_messagebundle.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_messagebundle.html
@@ -57,8 +57,6 @@
border="0"></p>
<p><br>
</p>
-<p><a href="../../reference/???.htm">JSF Application Configuration</a><br>
-</p>
<p><a href="../../reference/facesconfigeditor.html">Faces Config
Editor</a><br>
</p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_navigation_rule.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_navigation_rule.html
index d7c8255..c185591 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_navigation_rule.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_navigation_rule.html
@@ -64,8 +64,6 @@
border="0"></p>
<p><br>
</p>
-<p><a href="../../reference/???.htm">JSF Application Configuration</a><br>
-</p>
<p><a href="../../reference/facesconfigeditor.html">Faces Config
Editor</a><br>
</p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_phase_listener.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_phase_listener.html
index 10b6783..f424c29 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_phase_listener.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_phase_listener.html
@@ -61,8 +61,6 @@
border="0"></p>
<p><br>
</p>
-<p><a href="../../reference/???.htm">JSF Application Configuration</a><br>
-</p>
<p><a href="../../reference/facesconfigeditor.html">Faces Config
Editor</a><br>
</p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_property_resolver.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_property_resolver.html
index 38bc9e2..3949614 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_property_resolver.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_property_resolver.html
@@ -63,8 +63,6 @@
border="0"></p>
<p><br>
</p>
-<p><a href="../../reference/???.htm">JSF Application Configuration</a><br>
-</p>
<p><a href="../../reference/facesconfigeditor.html">Faces Config
Editor</a><br>
</p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_rederkit_factory.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_rederkit_factory.html
index 289a877..d19a235 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_rederkit_factory.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_rederkit_factory.html
@@ -62,8 +62,6 @@
border="0"></p>
<p><br>
</p>
-<p><a href="../../reference/???.htm">JSF Application Configuration</a><br>
-</p>
<p><a href="../../reference/facesconfigeditor.html">Faces Config
Editor</a><br>
</p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_renderkit.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_renderkit.html
index 47992b6..a6ba075 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_renderkit.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_renderkit.html
@@ -73,8 +73,6 @@
border="0"></p>
<p><br>
</p>
-<p><a href="../../reference/???.htm">JSF Application Configuration</a><br>
-</p>
<p><a href="../../reference/facesconfigeditor.html">Faces Config
Editor</a><br>
</p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_state_manager.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_state_manager.html
index 868c495..43f1448 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_state_manager.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_state_manager.html
@@ -59,8 +59,6 @@
border="0"></p>
<p><br>
</p>
-<p><a href="../../reference/???.htm">JSF Application Configuration</a><br>
-</p>
<p><a href="../../reference/facesconfigeditor.html">Faces Config
Editor</a><br>
</p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_validator.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_validator.html
index b5d10fa..8a19b83 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_validator.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_validator.html
@@ -78,8 +78,6 @@
border="0"></p>
<p><br>
</p>
-<p><a href="../../reference/???.htm">JSF Application Configuration</a><br>
-</p>
<p><a href="../../reference/facesconfigeditor.html">Faces Config
Editor</a><br>
</p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_variable_resolver.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_variable_resolver.html
index b32109c..7dd8232 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_variable_resolver.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_variable_resolver.html
@@ -62,8 +62,6 @@
border="0"></p>
<p><br>
</p>
-<p><a href="../../reference/???.htm">JSF Application Configuration</a><br>
-</p>
<p><a href="../../reference/facesconfigeditor.html">Faces Config
Editor</a><br>
</p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_view_handler.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_view_handler.html
index 37e88ae..72c9f1c 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_view_handler.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_view_handler.html
@@ -63,8 +63,6 @@
border="0"></p>
<p><br>
</p>
-<p><a href="../../reference/???.htm">JSF Application Configuration</a><br>
-</p>
<p><a href="../../reference/facesconfigeditor.html">Faces Config
Editor</a><br>
</p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/addprojectfacet.png b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/addprojectfacet.png
index c82ead1..a8bd672 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/addprojectfacet.png
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/addprojectfacet.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/elvalidationprefs.png b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/elvalidationprefs.png
index 09e6e44..0c22dca 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/elvalidationprefs.png
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/elvalidationprefs.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/jsffacetsettings.png b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/jsffacetsettings.png
index c642d23..d5121d6 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/jsffacetsettings.png
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/jsffacetsettings.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/jsflibref_addlibrary.png b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/jsflibref_addlibrary.png
new file mode 100644
index 0000000..bbbbc07
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/jsflibref_addlibrary.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/jsflibref_addlibrary_2.png b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/jsflibref_addlibrary_2.png
new file mode 100644
index 0000000..5500c29
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/jsflibref_addlibrary_2.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/jsflibref_j2eemoddeps.png b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/jsflibref_j2eemoddeps.png
new file mode 100644
index 0000000..146895e
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/jsflibref_j2eemoddeps.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/jsflibref_javabuildpath.png b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/jsflibref_javabuildpath.png
new file mode 100644
index 0000000..715e1c8
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/jsflibref_javabuildpath.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/jsflibs_prefs.png b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/jsflibs_prefs.png
index ead74d0..3bdb44b 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/jsflibs_prefs.png
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/jsflibs_prefs.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/jsflibs_projectrefs.png b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/jsflibs_projectrefs.png
deleted file mode 100644
index 044691e..0000000
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/jsflibs_projectrefs.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/projectpropertiesprojectfacets.png b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/projectpropertiesprojectfacets.png
index 9fa8bd2..638c20b 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/projectpropertiesprojectfacets.png
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/projectpropertiesprojectfacets.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_app_configs.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_app_configs.html
index c314362..60040d4 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_app_configs.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_app_configs.html
@@ -12,15 +12,14 @@
<br>
<br>
<img src="../../images/ngrelc.png" alt="Related concepts" border="0">
-<p> <a href="./jsf_facets_install.html">What happens when a JSF Facet is installed?</a><br>
-
- <p> <img src="../../images/ngrelr.png" alt="Related reference" border="0">
+<p>
+<a href="../concepts/jsf_facets.html">JSF Facets</a><br>
+<a href="../concepts/jsf_facets_install.html">What happens when a JSF Facet is installed?</a>
</p>
-<p> <a href="../reference/???.htm">JSF Facets</a><br>
-<a href="../reference/???.htm">JSF Application Configuration</a><br></p>
- <p> <img src="../../images/ngrelt.png" alt="Related tasks" border="0">
-</p>
-
+<p><img src="../../images/ngrelr.png" alt="Related reference" border="0"></p>
+
+<p><img src="../../images/ngrelt.png" alt="Related tasks" border="0"></p>
+
</body>
</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_libs.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_libs.html
index f977ab5..11dbd2c 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_libs.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_libs.html
@@ -6,67 +6,60 @@
<title>Creating and Updating JSF Libraries</title>
</head>
<body>
+
<h1>Creating and Updating JSF Libraries</h1>
-<br>
+<p>
To create or update a JSF Library,
- <b>Windows -> Preferences -> Web and XML -> JSF Libraries</b>
- <img alt="Preferences -> Web and XML -> JSF Libraries" src="./images/jsflibs_prefs.png">
-<br>
-<br>
-Initially your list of libraries may be empty unless there is a plugin-provided library present.
-<br><br>
+<b>Window -> Preferences... -> Web and XML -> JavaServer Faces Tools -> Libraries</b>
+</p>
+<img alt="JSF Libraries Preference Page" src="./images/jsflibs_prefs.png">
+<p>Initially your list of libraries may be empty unless there is a plugin-provided library present.</p>
+
<h3>New Library</h3>
-<br>
-To create a new JSF Library, select "New..." button.
-<br>
+<p>To create a new JSF Library, select "New..." button.</p>
<img alt="New JSF Library" src="./images/newjsflib.png"><br><br>
<p>On this dialog you must:
<ul>
<li>provide a workspace unique name for the library</li>
-<li>using the "Add..." button choose one or more JAR files to be included in this library</li>
+<li>using the "Add..." button, choose one or more JAR files to be included in this library</li>
</ul>
-<br>
</p>
<p>Optionally you may:
<ul>
<li>specify the JSF version that this collection of jars supports <i>(At this time this is unused)</i></li>
<li>mark this as an implementation using the "is JSF Implementation" checkbox </li>
</ul>
-<br></p>
-
+</p>
<p>Click "Finish" button to create your new JSF Library</p>
-<br>
+
<h3>Update JSF Library</h3>
-<p><br>
-There may be a need to update the jars associated with this library. This can occur if:
+<p>There may be a need to update the jars associated with this library. This can occur if:
<ul>
<li>you want to add or remove libraries, or,</li>
<li>you need to update the location of a jar reference</li>
</ul>
-<br></p>
-<p>
-To update the selected JSF Library, choose "Edit..."<br>
-<br>
+</p>
+<p>To update the selected JSF Library, choose "Edit..."</p>
<img alt="Update JSF Library" src="./images/jsflibsmissingjarsedit.png" >
-<br>
-There is currently no way to update a jar entry to locate a missing jar. You must first remove the missing jar and then add it back.
-<br><br>
-Changes will be saved after you click "Finish" button.
-<br>
-</p>
+<p>There is currently no way to update a jar entry to locate a missing jar. You must first remove the missing jar and then add it back.</p>
+<p>Changes will be saved after you click "Finish" button.</p>
+
<img src="../../images/ngrelc.png" alt="Related concepts" border="0">
-<p> <br></p>
-
- <p> <img src="../../images/ngrelr.png" alt="Related reference" border="0">
+<p>
+<a href="../concepts/jsf_facets.html">JSF Facets</a>
</p>
-<p> <a href="../reference/jsf_facets.html">JSF Facets</a><br>
+
+<p>
+<img src="../../images/ngrelr.png" alt="Related reference" border="0">
+</p>
+<p>
<a href="../reference/jsf_libraries.html">JSF Libraries</a><br>
</p>
<p> <img src="../../images/ngrelt.png" alt="Related tasks" border="0">
</p>
<p>
-<a href="../gettingstarted/tutorial/JSFTools_tutorial.html#reglibs">Tutorial</a></p>
+<a href="../gettingstarted/tutorial/JSFTools_tutorial.html">Tutorial</a></p>
</body>
</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_libs_refs.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_libs_refs.html
index e9d481e..4695fb4 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_libs_refs.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_libs_refs.html
@@ -8,22 +8,31 @@
<body>
<h1>Adding and Removing JSF Library References from a Project</h1>
<br>
-JSF Library References for a project are managed as properties of the project. To add or remove library referernces:
- <b>Project -> Properties -> JSF Library References</b>
- <img alt="Preferences -> Web and XML -> JSF Libraries" src="./images/jsflibs_projectrefs.png">
-<br>
-<br>
-<ul>
-<li>To modify the choice of implementation, choose from the Implementation dropdown list.</li>
-<li>To add a component library, select the library from list on left and use ">" to add to the selected list</li>
-<li>To add all libraries, use ">>"</li>
-<li>To remove a component library, select library from list on the right and use "<" button</li>
-<li>To remove all libraries, use "<<" button</li>
-<li>To create a new library, use "New...: button</li>
-<li>To change whether or not a selected component library is deployed, use the "Deploy" checkbox</li>
-</ul>
-<p>Click "OK" button to complete the update of the JSF Library References for this project</p>
-<br>
+JSF Library References for a project are managed as Java Build Path Libraries and J2EE Module Dependencies.
+
+<h2>Adding a JSF Library Reference</h2>
+<p><b>Project -> Properties -> Java Build Path</b></p>
+<img src="./images/jsflibref_javabuildpath.png" alt="Project -> Properties -> Java Build Path">
+<p>Click "Add Library..." button.</p>
+<img src="./images/jsflibref_addlibrary.png" alt="Add Library">
+<p>Select "JSF Libraries" and click "<u>N</u>ext >" button.</p>
+<img src="./images/jsflibref_addlibrary_2.png" alt="Add Library">
+<p>Select desired JSF Library and click "<u>F</u>inish" button.</p>
+
+<h2>Removing a JSF Library Reference</h2>
+<p><b>Project -> Properties -> Java Build Path</b></p>
+<img src="./images/jsflibref_javabuildpath.png" alt="Project -> Properties -> Java Build Path">
+<p>Select desired JSF Library and click "<u>R</u>emove" button.</p>
+
+<h2>Selecting JSF Library Deployment Options</h2>
+<p>
+To control which JSF Libraries are deployed to the web application and which
+are not, use the "J2EE Module Dependencies" functionality.
+</p>
+<p><b>Project -> Properties -> J2EE Module Dependencies</b></p>
+<img src="./images/jsflibref_j2eemoddeps.png" alt="Project -> Properties -> J2EE Module Dependencies">
+<p>Select/deselect JSF Libraries as desired (selected means deploy, deselected means do not deploy).</p>
+
<img src="../../images/ngrelc.png" alt="Related concepts" border="0">
<p> <br></p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_validation.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_validation.html
index 9d73512..e9fd378 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_validation.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_validation.html
@@ -15,7 +15,7 @@
<li>Faces configuration files</li>
<li>JSP files</li>
</ul>
-<p>To access the validators for the workspace: <b>Windows -> Preferences...-> Validation</b></p>
+<p>To access the validators for the workspace: <b>Window -> Preferences...-> Validation</b></p>
<img alt="Validator Preferences" src="./images/validationprefs.png">
<p>The validators marked in yellow are those that have applicability to the JSF Web application.</p>
<br>
@@ -33,7 +33,7 @@
<p>When there is a problem, there will be annotation markers in the rulers, problem markers in the problem view and "squigglies" underneath the problems in source. Errors are in red and must be dealt with whereas the yellow warnings may not result in runtime problems and may sometimes be ignored.</p>
<p>The validator will verify the attribute values with and without expression language (EL). These kinds of validations are treated differently. JSF EL is identified by "#{some expression}" in the attribute value.</p>
<p>If the JSP Semantic Validator is enabled, validation will not only take place at Build and/or Manual validation time, but also as-you-type. Because validation of EL can be "expensive" you have the option of turning this option off separately.</p>
-<p>To access the EL Validator preferences: <b>Windows -> Preferences... -> Web and XML -> JSF Validation</b></p>
+<p>To access the EL Validator preferences: <b>Window -> Preferences... -> Web and XML -> JavaServer Faces Tools -> Validation</b></p>
<img alt="EL Validator Preferences" src="./images/elvalidationprefs.png" >
<img src="../../images/ngrelc.png" alt="Related concepts" border="0">
<br>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/tasks.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/tasks.html
index 55a100a..c515fd6 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/tasks.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/tasks.html
@@ -65,7 +65,7 @@
</p>
</li>
</ul>
-<p>For additional information, please visit the WTP JST JSF home page at: <code><a href="http://www.eclipse.org/webtools/jsf/">http://www.eclipse.org/webtools/jsf/</a></code>.
+<p>For additional information, please visit the WTP JST JSF home page at: <code><a href="http://www.eclipse.org/webtools/jsf/main.php">http://www.eclipse.org/webtools/jsf/main.php</a></code>.
</p>
</body>
</html>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/test_linked_pages.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/test_linked_pages.html
index e4c6969..b81c72a 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/test_linked_pages.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/test_linked_pages.html
@@ -42,10 +42,6 @@
<p><img src="../../images/ngrelr.png" alt="Related reference"
border="0"></p>
-<p><br>
-</p>
-<p><a href="../reference/???.htm">JSF Application Configuration</a><br>
-</p>
<p><a href="../reference/facesconfigeditor.html">Faces Config
Editor</a><br>
</p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/use_facesconfig_editor.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/use_facesconfig_editor.html
index 5cf25f9..845fe6b 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/use_facesconfig_editor.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/use_facesconfig_editor.html
@@ -47,6 +47,8 @@
Lifecycle Factory</a></p>
<p><a href="facesconfig_ui/add_rederkit_factory.html">Add a
RenderKit Factory</a></p>
+<p><a href="facesconfig_ui/add_application_factory.html">Add an
+Application Factory</a></p>
<p><a href="facesconfig_ui/add_phase_listener.html">Add a Phase
Listener </a></p>
</div>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/whats_new.htm b/plugins/org.eclipse.jst.jsf.doc.user/html/whats_new.htm
index 40e31e9..2644275 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/whats_new.htm
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/whats_new.htm
@@ -17,7 +17,7 @@
</tr>
</table>
<hr/>
-<p>This section contains descriptions of the following significant changes made to the JavaServer Faces Tooling for Release 0.5.0:
+<p>This section contains descriptions of the following significant changes made to the JavaServer Faces Tooling for Release 1.0.0:
</p>
<p><span style="font-style:italic">Complete information will be available in a future build.</span>
</p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/tocgettingstarted.xml b/plugins/org.eclipse.jst.jsf.doc.user/tocgettingstarted.xml
index bb7a9a2..6451361 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/tocgettingstarted.xml
+++ b/plugins/org.eclipse.jst.jsf.doc.user/tocgettingstarted.xml
@@ -3,14 +3,6 @@
<toc label="Getting Started" link_to="toc.xml#jsf_getstarted">
<topic label="Requirements" href="html/gettingstarted/jsf_requirements.html" />
- <topic label="JSF Basic Tutorial" href="html/gettingstarted/tutorial/JSFTools_tutorial.html">
- <topic label="Setup" href="html/gettingstarted/tutorial/JSFTools_tutorial.html#setup"/>
- <topic label="Register JSF libraries" href="html/gettingstarted/tutorial/JSFTools_tutorial.html#reglibs"/>
- <topic label="Create new JSF project" href="html/gettingstarted/tutorial/JSFTools_tutorial.html#newproject"/>
- <topic label="Create new JSF JSP page" href="html/gettingstarted/tutorial/JSFTools_tutorial.html#newpage"/>
- <topic label="Create managed bean" href="html/gettingstarted/tutorial/JSFTools_tutorial.html#createbean"/>
- <topic label="Faces configuration editor" href="html/gettingstarted/tutorial/JSFTools_tutorial.html#facesconfigeditor"/>
- <topic label="Test the JSF JSP Page" href="html/gettingstarted/tutorial/JSFTools_tutorial.html#testpage"/>
- </topic>
+ <topic label="JSF Basic Tutorial" href="html/gettingstarted/tutorial/JSFTools_tutorial.html"/>
<topic label="Web Page Editor" href="html/gettingstarted/wpe/wpe_getting_started.html"/>
</toc>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/tocreference.xml b/plugins/org.eclipse.jst.jsf.doc.user/tocreference.xml
index 56c8d70..2ecbd70 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/tocreference.xml
+++ b/plugins/org.eclipse.jst.jsf.doc.user/tocreference.xml
@@ -3,7 +3,7 @@
<toc label="Reference" link_to="toc.xml#jsf_reference">
<!-- <topic label="Faces-Config Editor/Wizards" href="html/reference/facesconfigeditor.html" /> -->
- <topic label="Taglibrary Support in the JSP Source Editor" href="html/reference/taglibsupport.html" >
+ <topic label="Tag Library Support in the JSP Source Editor" href="html/reference/taglibsupport.html" >
<topic label="JSF Core" href="html/reference/jsf-c.html" />
<topic label="JSF HTML" href="html/reference/jsf-h.html" />
</topic>
