[216971] jst.j2ee.infopop CSH plugin patch

3 files changed, 40 insertions, 22 deletions

diff --git a/docs/org.eclipse.jst.j2ee.infopop/EJBCreateWizard_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/EJBCreateWizard_HelpContexts.xml
index 1967944ae..373458803 100644
--- a/docs/org.eclipse.jst.j2ee.infopop/EJBCreateWizard_HelpContexts.xml
+++ b/docs/org.eclipse.jst.j2ee.infopop/EJBCreateWizard_HelpContexts.xml
@@ -13,20 +13,24 @@
 <contexts>
 
 <!-- Page 1, Create an Enterprise Bean  -->
-<context id="antejb0000">
-<description>Use this page to select the enterprise bean type: session bean or message-driven bean.
+<context id="antejb0000" title="Create an Enterprise Bean">
+<description>Use this page to select the enterprise bean type: session bean, message-driven bean, or container managed entity bean.
 
-You must install and enable XDoclet before creating a session or message-driven bean. Follow these steps:
-1 - First, download and install XDoclet from http://xdoclet.sourceforge.net/xdoclet/install.html
-2 - Next, click the <b>preferences</b> link to configure the XDoclet Runtime Preferences. Another way to get to the XDoclet Runtime Preferences page is from <b>Window > Preferences > J2EE Annotations > XDoclet</b>.
+You must install and enable XDoclet before creating an entity bean. Complete the following steps:
+1 - Download and install XDoclet from http://xdoclet.sourceforge.net/xdoclet/install.html
+2 - Click the <b>preferences</b> link in the wizard to configure the XDoclet Runtime Preferences. Another way to get to the XDoclet Runtime Preferences page is from <b>Window > Preferences > XDoclet</b>.
 3 - Check the <b>Enable XDoclet Builder</b> check box.
-4 - Select the Version of XDoclet that you have installed.
+4 - Select the version of XDoclet that you have installed.
 5 - Use the Browse button to locate the installation directory for XDoclet (<b>XDoclet Home</b>).
 6 - Click <b>OK</b> to save the preferences.
 
 After installing and configuring XDoclet, select the bean type you want to create and click <b>Next</b>.
 </description>
 <topic label="Creating enterprise beans" href="../org.eclipse.jst.ejb.doc.user/topics/tecrte.html"/>
+<topic label="Creating session beans" href="../org.eclipse.jst.ejb.doc.user/topics/tesessb.html"/>
+<topic label="Creating container-managed entity beans" href="../org.eclipse.jst.ejb.doc.user/topics/teentityb.html"/>
+<topic label="Creating message-driven beans" href="../org.eclipse.jst.ejb.doc.user/topics/temessb.html"/>
+<topic label="Configuring XDoclet annotation support" href="../org.eclipse.jst.ejb.doc.user/topics/txdocletconf.html"/>
 <topic label="EJB architecture" href="../org.eclipse.jst.ejb.doc.user/topics/cearch.html"/>
 <!-- link to org.eclipse.jst.annotation.user.doc  annotation tagging -->
 </context>
@@ -38,10 +42,13 @@ After installing and configuring XDoclet, select the bean type you want to creat
 Enter the <b>Java package</b> and <b>Class name</b> for the new enterprise bean. 
 Change the <b>Superclass</b> if your class will override a class other than java.lang.Object.
 
-Select the <b>Generate an annotated bean class</b> check box to add J2EE annotations to the source file.
+<!-- Select the <b>Generate an annotated bean class</b> check box to add J2EE annotations to the source file. -->
 </description>
 <topic label="Creating enterprise beans" href="../org.eclipse.jst.ejb.doc.user/topics/tecrte.html"/>
 <topic label="Creating an EJB project" href="../org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html"/>
+<topic label="Creating session beans" href="../org.eclipse.jst.ejb.doc.user/topics/tesessb.html"/>
+<topic label="Creating container-managed entity beans" href="../org.eclipse.jst.ejb.doc.user/topics/teentityb.html"/>
+<topic label="Creating message-driven beans" href="../org.eclipse.jst.ejb.doc.user/topics/temessb.html"/>
 <!-- link to org.eclipse.jst.annotation.user.doc  annotation tagging -->
 </context>
 
@@ -62,6 +69,9 @@ Select the <b>Transaction Type</b> (container or bean) for the enterprise bean.
 </description>
 <topic label="Creating enterprise beans" href="../org.eclipse.jst.ejb.doc.user/topics/tecrte.html"/>
 <topic label="Creating an EJB project" href="../org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html"/>
+<topic label="Creating session beans" href="../org.eclipse.jst.ejb.doc.user/topics/tesessb.html"/>
+<topic label="Creating container-managed entity beans" href="../org.eclipse.jst.ejb.doc.user/topics/teentityb.html"/>
+<topic label="Creating message-driven beans" href="../org.eclipse.jst.ejb.doc.user/topics/temessb.html"/>
 </context>
 
 <!-- Page 4, Enterprise Bean modifiers, interfaces and method stubs -->
@@ -70,7 +80,7 @@ Select the <b>Transaction Type</b> (container or bean) for the enterprise bean.
 
 Select the <b>Interfaces</b> that your bean class will implement. Use the <b>Add</b> and <b>Remove</b> buttons to create the list of interfaces.
 
-Select which method stubs that you want created in the bean class.<b></b>
+Select which method stubs you want created in the bean class.
 </description>
 <topic label="Creating enterprise beans" href="../org.eclipse.jst.ejb.doc.user/topics/tecrte.html"/>
 <topic label="Creating an EJB project" href="../org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html"/>
diff --git a/docs/org.eclipse.jst.j2ee.infopop/ImportWizard_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/ImportWizard_HelpContexts.xml
index db53b3b6c..f013fc479 100644
--- a/docs/org.eclipse.jst.j2ee.infopop/ImportWizard_HelpContexts.xml
+++ b/docs/org.eclipse.jst.j2ee.infopop/ImportWizard_HelpContexts.xml
@@ -14,7 +14,7 @@
 <context id="APPCLIENT_IMPORT_APPCLIENT_WIZARD_PAGE1">
 <description>Use this wizard to import an application client JAR file. Locate the application client JAR file on your file system using the <b>Browse</b> button. Optionally, modify the project name provided.
 
-Use the <b>Target server</b> field to specify the application server that the imported project will be developed for. 
+Use the <b>Target runtimes</b> field to specify the application server that the imported project will be developed for. 
 
 You can also specify whether or not to add the imported application client module to an enterprise application project. Choose an existing project or use the <b>New</b> button to create a new project.
 </description>
@@ -26,7 +26,7 @@ You can also specify whether or not to add the imported application client modul
     <!-- wizard broken at time of this writing -->
 <description>Use this wizard to import an enterprise application EAR file.  Locate the enterprise application EAR file on your file system using the <b>Browse</b> button. Optionally, modify the project name provided.
 
-Use the <b>Target server</b> field to specify the application server that the resulting projects will be developed for. 
+Use the <b>Target runtimes</b> field to specify the application server that the resulting projects will be developed for. 
 </description>
 <!--topic label="Importing an enterprise application EAR file" href="../com.ibm.etools.j2eeapp.doc/topics/tjimpear.html"/-->
 <!--topic label="Creating an enterprise application project" href="../com.ibm.etools.j2eeapp.doc/topics/tjear.html"/-->
@@ -36,7 +36,7 @@ Use the <b>Target server</b> field to specify the application server that the re
 <context id="EJB_IMPORT_EJB_WIZARD_PAGE1">
 <description>Use this wizard to import an EJB JAR file. Locate the EJB JAR file on your file system using the <b>Browse</b> button. Optionally, modify the module name provided.
 
-Use the <b>Target server</b> field to specify the application server that the imported project will be developed for. 
+Use the <b>Target runtimes</b> field to specify the application server that the imported project will be developed for. 
 
 You can also specify whether or not to add the imported EJB module to an enterprise application project. Choose an existing project or use the <b>New</b> button to create a new project.
 </description>
@@ -47,7 +47,7 @@ You can also specify whether or not to add the imported EJB module to an enterpr
 <context id="IMPORT_RAR_WIZARD_PAGE">
 <description>Use this wizard to import a JCA Connector RAR file. Locate the Connector RAR file on your file system using the <b>Browse</b> button. Optionally, modify the module name provided.
 
-Use the <b>Target server</b> field to specify the application server that the imported project will be developed for. 
+Use the <b>Target runtimes</b> field to specify the application server that the imported project will be developed for. 
 
 You can also specify whether or not to add the imported connector module to an enterprise application project. Choose an existing project or use the <b>New</b> button to create a new project.
 </description>
diff --git a/docs/org.eclipse.jst.j2ee.infopop/ProjectCreateWizard_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/ProjectCreateWizard_HelpContexts.xml
index aa2b6b04d..a9b9ce17f 100644
--- a/docs/org.eclipse.jst.j2ee.infopop/ProjectCreateWizard_HelpContexts.xml
+++ b/docs/org.eclipse.jst.j2ee.infopop/ProjectCreateWizard_HelpContexts.xml
@@ -5,28 +5,31 @@
 <context id="csh_outer_container" title="Project creation wizards">
 <description/>
 </context>
-<context id="APPCLIENT_NEW_APPCLIENT_WIZARD_PAGE1" title="New application client - page 1">
+<context id="APPCLIENT_NEW_APPCLIENT_WIZARD_PAGE1" title="New application client">
 <description>Use this wizard to create an application client project.
 
 On this page, name the application client project and select the workspace location to store the project files. You can also select a target runtime for the project and add the project to an enterprise application project.
 
+Click the <b>Modify</b> button under Configuration to edit the facets and runtimes that will be added to or supported by the project.
+
 </description>
 <topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
 <topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.html" label="Application client projects"/>
 <topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/tjappproj.html" label="Creating an application client project"/>
 </context>
-<context id="APPCLIENT_NEW_APPCLIENT_WIZARD_PAGE3" title="New application client - page 3">
-<description>In the <b>Source Folder</b> field, enter the name of the folder to use for source code. If you want to create a default class for the module, select the <b>Create a default Main class</b> check box.</description>
+<context id="APPCLIENT_NEW_APPCLIENT_WIZARD_PAGE3" title="New application client">
+<description>In the <b>Source Folder</b> field, enter the name of the folder to use for source code. If you want to create a default class for the module, select the <b>Create a default Main class</b> check box.
+</description>
 <topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
 <topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.html" label="Application client projects"/>
 <topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/tjappproj.html" label="Creating an application client project"/>
 </context>
-<context id="EAR_NEW_EAR_WIZARD_PAGE1" title="New EAR - page 1">
+<context id="EAR_NEW_EAR_WIZARD_PAGE1" title="New EAR">
 <description>Use this wizard to create an enterprise application (EAR) project. An enterprise application project ties together one or more J2EE modules, including application client modules, EJB modules, Connector modules, or Web modules.
 
 On this page, name the EAR application project and select the workspace location to store the project files. You can also select a target runtime and a common configuration for the project.
 
-To add facets or J2EE modules to the enterprise application project, click <b>Next</b>. If you do not want to add facets or J2EE modules during the creation of the enterprise application project, click <b>Finish</b>.
+Click the <b>Modify</b> button under Configuration to edit the facets and runtimes that will be added to or supported by the project.
 
 </description>
 <topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
@@ -34,6 +37,7 @@ To add facets or J2EE modules to the enterprise application project, click <b>Ne
 <topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/tjear.html" label="Creating an enterprise application project"/>
 </context>
 <context id="NEW_EAR_COMP_PAGE">
+<!-- This page is no longer used -->
 <description>Use this page to select the facets the project will have and the runtimes the project will support.
 
 Select the check boxes under <b>Project Facet</b> to select the facets that the project will have. You can also change the default version level of each facet.
@@ -46,7 +50,7 @@ You can save the settings for this project so you can create other projects with
 <topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
 <topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cfacets.html" label="Project facets"/>
 </context>
-<context id="NEW_EAR_ADD_MODULES_PAGE" title="New EAR - page 3">
+<context id="NEW_EAR_ADD_MODULES_PAGE" title="New EAR">
 <description>Select the check boxes next to each J2EE module you want to add to the new enterprise application project. Click the <b>New Module</b> button to create new modules.</description>
 <topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
 <topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/tjear.html" label="Creating an enterprise application project"/>
@@ -61,30 +65,34 @@ You can save the settings for this project so you can create other projects with
 
 On this page, name the project and select the workspace location to store the project files. You can also select a target runtime for the project and add the project to an enterprise application project.
 
+Click the <b>Modify</b> button under Configuration to edit the facets and runtimes that will be added to or supported by the project.
+
 </description>
 <topic filter="plugin=org.eclipse.jst.ejb.doc.user" href="../org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html" label="Creating EJB projects"/>
 <topic filter="plugin=org.eclipse.jst.ejb.doc.user" href="../org.eclipse.jst.ejb.doc.user/topics/cearch.html" label="EJB architecture"/>
 <topic filter="plugin=org.eclipse.jst.ejb.doc.user" href="../org.eclipse.jst.ejb.doc.user/topics/ceclientjars.html" label="EJB client JAR projects"/>
 </context>
 <context id="EJB_NEW_EJB_WIZARD_PAGE2">
-<description>Use this page to specify the name of the EJB client JAR module, as well as the name of the JAR file ( <b>Client JAR URI</b> ).
-
+<description>
 
+In the Source Folder field, enter the name of the folder to use for source code. You can also specify the name of the EJB client JAR module, as well as the name of the JAR file (<b>Client JAR URI</b>).
 
 </description>
 <topic filter="plugin=org.eclipse.jst.ejb.doc.user" href="../org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html" label="Creating EJB projects"/>
 <topic filter="plugin=org.eclipse.jst.ejb.doc.user" href="../org.eclipse.jst.ejb.doc.user/topics/ceclientjars.html" label="EJB client JAR projects"/>
 </context>
-<context id="JCA_NEWIZARD_PAGE1" title="New connector wizard - page 1">
+<context id="JCA_NEWIZARD_PAGE1" title="New connector wizard">
 <description>Use this wizard to create a Connector project. The J2EE Connector Architecture (JCA) specifies how a J2EE application component accesses a connection-based resource.
 
 On this page, name the Connector project and select the workspace location to store the project files. You can also select a target runtime for the project and add the project to an enterprise application project.
 
+Click the <b>Modify</b> button under Configuration to edit the facets and runtimes that will be added to or supported by the project.
+
 </description>
 <topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
 <topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/tjrar.html" label="Creating a connector project"/>
 </context>
-<context id="JCA_NEWIZARD_PAGE3" title="New connector wizard - page 3">
+<context id="JCA_NEWIZARD_PAGE3" title="New connector wizard">
 <description>In the <b>Source Folder</b> field, enter the name of the folder to use for source code.</description>
 <topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
 <topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/tjrar.html" label="Creating a connector project"/>