From d2ad532df9f687d7e13e5fff876dd519cec7f8bd Mon Sep 17 00:00:00 2001 From: kprice Date: Mon, 11 Apr 2011 14:53:14 +0000 Subject: [323428] Documentation improvements for org.eclipse.wst.server.ui.doc.user --- .../DocBuild.xml | 64 ++++++++++++++ .../META-INF/MANIFEST.MF | 2 +- .../index/_15.cfs | Bin 52129 -> 56717 bytes .../index/indexed_contributions | 4 +- .../index/indexed_dependencies | 2 +- .../index/indexed_docs | 2 +- .../index/segments | Bin 28 -> 28 bytes .../myplugin.xml | 2 +- docs/org.eclipse.wst.server.ui.doc.user/plugin.xml | 2 +- .../topics/cwflow.html | 4 +- .../topics/cwover.dita | 49 ++++++----- .../topics/cwover.html | 42 +++++---- .../topics/cwres.html | 4 +- .../topics/raccessserver.html | 4 +- .../topics/rwrcview.html | 4 +- .../topics/rwtcpvw.html | 6 +- .../topics/tclean.html | 4 +- .../topics/tcreate.html | 4 +- .../topics/tdbgjsp.html | 4 +- .../topics/tdebug.html | 4 +- .../topics/tdecor.html | 4 +- .../topics/testing.dita | 92 +++++++++---------- .../topics/testing.html | 98 ++++++++++----------- .../topics/thttppreview.html | 9 +- .../topics/tj2ee.html | 4 +- .../topics/tj2eepreview.html | 9 +- .../topics/tmetasrv.html | 4 +- .../topics/tmonitorport.html | 4 +- .../topics/tpref.html | 6 +- .../topics/tprefaud.html | 4 +- .../topics/tpublish.html | 4 +- .../topics/tservlet.dita | 11 ++- .../topics/tservlet.html | 11 ++- .../topics/ttimeout.html | 4 +- .../topics/twaddprj.html | 4 +- .../topics/twcrtins.dita | 41 +++++---- .../topics/twcrtins.html | 58 ++++++++---- .../topics/twdelins.html | 4 +- .../topics/twedtins.dita | 47 +++++----- .../topics/twedtins.html | 40 +++++---- .../topics/twinstprf.html | 4 +- .../topics/twlaunchpref.dita | 8 +- .../topics/twlaunchpref.html | 30 +++---- .../topics/twmanage.html | 4 +- .../topics/twprefin.dita | 30 ++++--- .../topics/twprefin.html | 22 ++--- .../topics/twpub.dita | 18 ++-- .../topics/twpub.html | 18 ++-- .../topics/twremprj.html | 4 +- .../topics/twsrtdbg.html | 4 +- .../topics/twsrtins.dita | 8 +- .../topics/twsrtins.html | 10 +-- .../topics/twsrvprf.html | 4 +- .../topics/twstpins.html | 4 +- .../topics/twtcpprf.dita | 85 ++++++++++-------- .../topics/twtcpprf.html | 89 ++++++++++--------- .../wtp_main_toc.ditamap | 11 +-- .../wtp_reltable.ditamap | 35 +++++++- 58 files changed, 615 insertions(+), 438 deletions(-) create mode 100644 docs/org.eclipse.wst.server.ui.doc.user/DocBuild.xml diff --git a/docs/org.eclipse.wst.server.ui.doc.user/DocBuild.xml b/docs/org.eclipse.wst.server.ui.doc.user/DocBuild.xml new file mode 100644 index 00000000..ee647cd1 --- /dev/null +++ b/docs/org.eclipse.wst.server.ui.doc.user/DocBuild.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.server.ui.doc.user/META-INF/MANIFEST.MF index b3c61b50..91fa686f 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/META-INF/MANIFEST.MF +++ b/docs/org.eclipse.wst.server.ui.doc.user/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.server.ui.doc.user; singleton:=true -Bundle-Version: 1.1.300.qualifier +Bundle-Version: 1.1.400.qualifier Bundle-Vendor: %pluginProvider Bundle-Localization: plugin Eclipse-LazyStart: true diff --git a/docs/org.eclipse.wst.server.ui.doc.user/index/_15.cfs b/docs/org.eclipse.wst.server.ui.doc.user/index/_15.cfs index 0a5167d2..3990af0d 100644 Binary files a/docs/org.eclipse.wst.server.ui.doc.user/index/_15.cfs and b/docs/org.eclipse.wst.server.ui.doc.user/index/_15.cfs differ diff --git a/docs/org.eclipse.wst.server.ui.doc.user/index/indexed_contributions b/docs/org.eclipse.wst.server.ui.doc.user/index/indexed_contributions index d0569c32..b3c37c28 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/index/indexed_contributions +++ b/docs/org.eclipse.wst.server.ui.doc.user/index/indexed_contributions @@ -1,3 +1,3 @@ #This is a generated file; do not edit. -#Wed May 19 16:20:46 EDT 2010 -org.eclipse.wst.server.ui.doc.user=org.eclipse.wst.server.ui.doc.user\n1.1.300.qualifier +#Mon Apr 11 10:50:36 EDT 2011 +org.eclipse.wst.server.ui.doc.user=org.eclipse.wst.server.ui.doc.user\n1.1.400.qualifier diff --git a/docs/org.eclipse.wst.server.ui.doc.user/index/indexed_dependencies b/docs/org.eclipse.wst.server.ui.doc.user/index/indexed_dependencies index f7014e2b..0405183c 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/index/indexed_dependencies +++ b/docs/org.eclipse.wst.server.ui.doc.user/index/indexed_dependencies @@ -1,4 +1,4 @@ #This is a generated file; do not edit. -#Wed May 19 16:20:46 EDT 2010 +#Mon Apr 11 10:50:36 EDT 2011 lucene=1.9.1.v20080530-1600 analyzer=org.eclipse.help.base\#3.3.101.M20080728_34x?locale\=en diff --git a/docs/org.eclipse.wst.server.ui.doc.user/index/indexed_docs b/docs/org.eclipse.wst.server.ui.doc.user/index/indexed_docs index 36a68856..78b00f7e 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/index/indexed_docs +++ b/docs/org.eclipse.wst.server.ui.doc.user/index/indexed_docs @@ -1,5 +1,5 @@ #This is a generated file; do not edit. -#Wed May 19 16:20:46 EDT 2010 +#Mon Apr 11 10:50:36 EDT 2011 /org.eclipse.wst.server.ui.doc.user/topics/tservlet.html=0 /org.eclipse.wst.server.ui.doc.user/topics/twaddprj.html=0 /org.eclipse.wst.server.ui.doc.user/topics/tdecor.html=0 diff --git a/docs/org.eclipse.wst.server.ui.doc.user/index/segments b/docs/org.eclipse.wst.server.ui.doc.user/index/segments index de0c19e4..20405aaf 100644 Binary files a/docs/org.eclipse.wst.server.ui.doc.user/index/segments and b/docs/org.eclipse.wst.server.ui.doc.user/index/segments differ diff --git a/docs/org.eclipse.wst.server.ui.doc.user/myplugin.xml b/docs/org.eclipse.wst.server.ui.doc.user/myplugin.xml index 0fed91fa..3d30b56a 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/myplugin.xml +++ b/docs/org.eclipse.wst.server.ui.doc.user/myplugin.xml @@ -2,7 +2,7 @@ + + Testing and publishing on your server -The testing -and publishing tools provides runtime environments where you can test JSP -files, servlets, HTML files, and Java classes. +The +testing and publishing tools provides runtime environments where you +can test JSP files, servlets, HTML files, Java classes +and many more artifacts. -application client projectstesting serverstesting project resources

You can use the workbench to test and publish resources -from the following types of projects:

+from many types of projects, here are examples:

-

After testing your application locally, you can use the +

After testing your application, you can use the tools to publish the application.

Server definitions

The -server tools use servers to test and publish your projects. -Servers are definitions that identify where you want to test your projects. -You can either have the development environment create the servers automatically -for you, or you can create them using a wizard.

+workbench defines servers to test and publish your +projects. Servers are definitions that identify where you want to +test your projects. You can either have the development environment +create the servers automatically for you, or you can create them using +the New Server wizard (right-click in the Servers +view and select NewServer +).

 + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwover.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwover.html index d5f56548..63bbb308 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwover.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwover.html @@ -2,15 +2,15 @@ - - + + - - + + @@ -26,22 +26,23 @@ -

The testing -and publishing tools provides runtime environments where you can test JSP -files, servlets, HTML files, and Java™ classes.

+

The +testing and publishing tools provides runtime environments where you +can test JSP files, servlets, HTML files, Java™ classes +and many more artifacts.

You can use the workbench to test and publish resources -from the following types of projects:

+from many types of projects, here are examples:

-

After testing your application locally, you can use the +

After testing your application, you can use the tools to publish the application.

Server definitions

The -server tools use servers to test and publish your projects. -Servers are definitions that identify where you want to test your projects. -You can either have the development environment create the servers automatically -for you, or you can create them using a wizard.

+workbench defines servers to test and publish your +projects. Servers are definitions that identify where you want to +test your projects. You can either have the development environment +create the servers automatically for you, or you can create them using +the New Server wizard (right-click in the Servers +view and select New > Server +).

diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwres.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwres.html index 676a87e4..c8d83249 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwres.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwres.html @@ -2,8 +2,8 @@ - - + + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/raccessserver.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/raccessserver.html index daa05fdb..f71e7e69 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/raccessserver.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/raccessserver.html @@ -2,8 +2,8 @@ - - + + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.html index 3c4b8a8c..479dc49a 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.html @@ -2,8 +2,8 @@ - - + + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/rwtcpvw.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/rwtcpvw.html index fce509ae..5cc0bbfd 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/rwtcpvw.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/rwtcpvw.html @@ -2,8 +2,8 @@ - - + + @@ -63,7 +63,7 @@ is forwarded from the server.

Related tasks
-
Defining the TCP/IP Monitor preferences
+
Defining the TCP/IP Monitor preferences
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tclean.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tclean.html index 4df77e2e..96b248d6 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tclean.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tclean.html @@ -2,8 +2,8 @@ - - + + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tcreate.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tcreate.html index fbab15fe..cf4a470b 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tcreate.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tcreate.html @@ -2,8 +2,8 @@ - - + + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tdbgjsp.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tdbgjsp.html index a7b201fc..d2cec0b5 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tdbgjsp.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tdbgjsp.html @@ -2,8 +2,8 @@ - - + + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tdebug.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tdebug.html index 9c1d0ffe..bbe611d8 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tdebug.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tdebug.html @@ -2,8 +2,8 @@ - - + + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tdecor.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tdecor.html index d9b66ccf..6d6c2290 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tdecor.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tdecor.html @@ -2,8 +2,8 @@ - - + + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.dita index 20e09363..2ea6d3dd 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.dita +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.dita @@ -1,67 +1,67 @@ - - + + Testing artifacts on a server -You can use the workbench to test one or -more application artifacts on a server. +You can use the workbench to test +one or more application artifacts on a server. artifactstesting on servers -serverstesting artifacts +serverstesting artifacts + - - +To test artifacts on a server: -In the Project Explorer view from the Java EE -perspective, expand the project that contains the file you want to test. - -Right-click the artifact that you want to test. -Examples of artifacts include the Web project or a file within the Web -project (such as a JSP file, servlet, or HTML file), or an enterprise bean. - +In the Project Explorer view from the +Java EE perspective, expand the project that contains the file you +want to test. +Right-click the artifact that you want +to test.Examples of artifacts include the Web project +or a file within the Web project (such as a JSP file, servlet, or +HTML file), or an enterprise bean. Select Run As > Run on Server. The Server selection wizard appears. -Use the radio buttons to specify how you want -to select the server. Select from the following options: +Use the radio buttons to specify how +you want to select the server. Select from the following options: -Choose an existing serverThis option uses -an existing server that is defined in your workbench. -Manually define a serverThis option creates -a new server. +Choose an existing serverThis +option uses an existing server that is defined in your workbench. + +Manually define a serverThis option +creates a new server. -Under the Select the server that -you want to use list, select a server you want to run your application. -The list of available servers, under the Select the server -that you want to use list, depends on the Java EE specification -level you defined for the artifact and the supported servers on this workbench. - +Under the Select the server +that you want to use list, select a server you want to +run your application.The list of available servers, under +the Select the server that you want to use list, +depends on the Java EE specification level you defined for the artifact +and the supported servers on this workbench. (Optional) Click Next to -configure additional settings, such as configuring settings specific to the -server, and adding or removing projects configured on the server. +configure additional settings, such as configuring settings specific +to the server, and adding or removing projects configured on the server. + Click Finish. -The server tools automatically complete the -following tasks for you:
    -
  • If this is the first time you are creating the server -on the workspace and if the server generates server configuration files, the -workbench creates a server project with Servers as -the default name to hold the generated server configuration files.
    • -
  • Creates the server and adds it to the Servers View.
    • +The server tools automatically complete +the following tasks for you:
      +
    • Creates the server and adds it to the Servers +View.
    • Adds your project to the server.
      • -
    • Starts the server. (This may take time depending on the -server settings.)
      • -
    • If the Automatically publish when starting -servers check box on the Server preferences page ( -Window > Preferences > Server > Launching) -is selected, the workbench checks to see if your project and files on the -server are synchronized. If they are not, the project and the files are automatically -updated when the server is restarted.
      • -
    • Depending on the artifact you are testing, the output -of running your artifact may display in the Console view or in a Web browser -that automatically opens.
      • +
    • Starts the server. (This may take time depending +on the server settings.)
      • +
    • If the Automatically publish when +starting servers check box on the Server preferences page +(Window > Preferences > Server > Launching +) is selected, the workbench checks to see if your project +and files on the server are synchronized. If they are not, the project +and the files are automatically updated when the server is restarted.
      • +
    • Depending on the artifact you are testing, the +output of running your artifact may display in the Console view or +in a Web browser that automatically opens.
     + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.html index fc74b653..230243af 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/testing.html @@ -2,8 +2,8 @@ - - + + @@ -27,83 +27,79 @@ -

    You can use the workbench to test one or -more application artifacts on a server.

    +

    You can use the workbench to test +one or more application artifacts on a server.

    -
    - -
    +
    To test artifacts on a server:
      -
    1. In the Project Explorer view from the Java EE -perspective, expand the project that contains the file you want to test. -
      2. +
    2. In the Project Explorer view from the +Java EE perspective, expand the project that contains the file you +want to test.
      3. -
    3. Right-click the artifact that you want to test. - Examples of artifacts include the Web project or a file within the Web -project (such as a JSP file, servlet, or HTML file), or an enterprise bean. -
      4. +
    4. Right-click the artifact that you want +to test. Examples of artifacts include the Web project +or a file within the Web project (such as a JSP file, servlet, or +HTML file), or an enterprise bean.
    5. Select Run As > Run on Server. The Server selection wizard appears.
      6. -
    6. Use the radio buttons to specify how you want -to select the server. Select from the following options: +
    7. Use the radio buttons to specify how +you want to select the server. Select from the following options: - - + + - - + + + - - + +
      OptionDescription
      OptionDescription
      Choose an existing serverThis option uses -an existing server that is defined in your workbench.
      Choose an existing serverThis +option uses an existing server that is defined in your workbench.
      Manually define a serverThis option creates -a new server.
      Manually define a serverThis option +creates a new server.
      8. -
    8. Under the Select the server that -you want to use list, select a server you want to run your application. - The list of available servers, under the Select the server -that you want to use list, depends on the Java EE specification -level you defined for the artifact and the supported servers on this workbench. -
      9. +
    9. Under the Select the server +that you want to use list, select a server you want to +run your application. The list of available servers, under +the Select the server that you want to use list, +depends on the Java EE specification level you defined for the artifact +and the supported servers on this workbench.
    10. (Optional) Click Next to -configure additional settings, such as configuring settings specific to the -server, and adding or removing projects configured on the server.
      11. +configure additional settings, such as configuring settings specific +to the server, and adding or removing projects configured on the server. +
    11. Click Finish. - The server tools automatically complete the -following tasks for you:
        -
      • If this is the first time you are creating the server -on the workspace and if the server generates server configuration files, the -workbench creates a server project with Servers as -the default name to hold the generated server configuration files.
        • - -
      • Creates the server and adds it to the Servers View.
        • + The server tools automatically complete +the following tasks for you:
          +
        • Creates the server and adds it to the Servers +View.
        • Adds your project to the server.
          • -
        • Starts the server. (This may take time depending on the -server settings.)
          • +
        • Starts the server. (This may take time depending +on the server settings.)
          • -
        • If the Automatically publish when starting -servers check box on the Server preferences page ( -Window > Preferences > Server > Launching) -is selected, the workbench checks to see if your project and files on the -server are synchronized. If they are not, the project and the files are automatically -updated when the server is restarted.
          • +
        • If the Automatically publish when +starting servers check box on the Server preferences page +(Window > Preferences > Server > Launching +) is selected, the workbench checks to see if your project +and files on the server are synchronized. If they are not, the project +and the files are automatically updated when the server is restarted.
          • -
        • Depending on the artifact you are testing, the output -of running your artifact may display in the Console view or in a Web browser -that automatically opens.
          • +
        • Depending on the artifact you are testing, the +output of running your artifact may display in the Console view or +in a Web browser that automatically opens.
        diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/thttppreview.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/thttppreview.html index bbdd709b..258ef71a 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/thttppreview.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/thttppreview.html @@ -2,8 +2,8 @@ - - + + @@ -14,6 +14,7 @@ + @@ -81,6 +82,10 @@ Web content.
    Parent topic: Testing applications on a server
    + +
    +
    Parent topic: Creating a server
    +
    diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2ee.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2ee.html index d9e77272..b7ceba93 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2ee.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2ee.html @@ -2,8 +2,8 @@ - - + + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2eepreview.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2eepreview.html index 79aa0691..91cd9f8d 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2eepreview.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tj2eepreview.html @@ -2,8 +2,8 @@ - - + + @@ -14,6 +14,7 @@ + @@ -85,6 +86,10 @@ projects. Click Finish.
    Parent topic: Testing applications on a server
    + +
    +
    Parent topic: Creating a server
    +
    diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.html index 30975870..c6e8a2c4 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.html @@ -2,8 +2,8 @@ - - + + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tmonitorport.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tmonitorport.html index 70c7239b..2a7e6bcb 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tmonitorport.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tmonitorport.html @@ -2,8 +2,8 @@ - - + + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tpref.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tpref.html index 385d9477..9f19cd66 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tpref.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tpref.html @@ -2,8 +2,8 @@ - - + + @@ -47,7 +47,7 @@ Using the Preferences page, you can define the preferences that the servers use
  • Defining the server runtime environments preferences
    Using the Preferences page, you can direct the workbench to use a specific runtime environment of an application server for compiling, testing, or running your application.
  • Defining the TCP/IP Monitor preferences
    -Using the Preferences page, you can define the TCP/IP Monitor attributes. To define these preferences, complete the following:
    • +Using the Preferences page, you can define the TCP/IP Monitor attributes.
  • Showing the state and status in the Servers view
    When the Server State Decorator is enabled, the workbench shows in the Servers view label decorations that indicate the state and status of the server and its projects. If the Servers view does not display a current state or status for the project, the workbench cannot retrieve this detail from the server, the server is stopped, or the server does not support this function.
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tprefaud.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tprefaud.html index 98e41027..71690e4b 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tprefaud.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tprefaud.html @@ -2,8 +2,8 @@ - - + + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tpublish.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tpublish.html index 87227087..0883d2a3 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tpublish.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tpublish.html @@ -2,8 +2,8 @@ - - + + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tservlet.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/tservlet.dita index 247bbaed..e246a13e 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tservlet.dita +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tservlet.dita @@ -39,8 +39,11 @@ to see that the server is launched. view opens.Step through the code, inspect and display variables, and make any necessary changes to the servlet. For detailed information on debugging, refer to the online help. -When you are finished debugging, remove -the breakpoint and save the servlet. +When you are finished debugging, save +the servlet. Wait for the debugger to refresh and pick +up the changes. When the debugger refresh is complete, the execution +of the code resumes at the beginning of the method that was currently +running. Click the Resume icon on the Debug toolbar to execute the servlet. If you have hot method replace enabled, @@ -55,7 +58,7 @@ id="tservlet_info10">To update the changes, restart the server.

The result is the server recognizes -your changes.

 +your changes.

 - + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tservlet.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tservlet.html index 1a4130fa..c1b15b5e 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tservlet.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tservlet.html @@ -2,8 +2,8 @@ - - + + @@ -58,8 +58,11 @@ view opens. Step through the code, inspect and display variables, and make any necessary changes to the servlet. For detailed information on debugging, refer to the online help. -
  • When you are finished debugging, remove -the breakpoint and save the servlet.
    • +
  • When you are finished debugging, save +the servlet. Wait for the debugger to refresh and pick +up the changes. When the debugger refresh is complete, the execution +of the code resumes at the beginning of the method that was currently +running.
  • Click the Resume icon on the Debug toolbar to execute the servlet.
    • diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/ttimeout.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/ttimeout.html index 6d02a0b3..e6e6d41d 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/ttimeout.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/ttimeout.html @@ -2,8 +2,8 @@ - - + + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.html index 21875bb7..8631688d 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.html @@ -2,8 +2,8 @@ - - + + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twcrtins.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/twcrtins.dita index 065f954f..fe647e0c 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twcrtins.dita +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twcrtins.dita @@ -38,8 +38,6 @@ to an application server. select the type of server or test environment where you want to publish or test your resources. -(Optional) Refer to the Description section -for brief details about the server you have selected. (Optional) In the text field under the Select the server type label, you can replace the text type filter text with keywords to filter the list of available @@ -65,6 +63,8 @@ or supports JEE 5 specification level.
    Filters the list of available servers that supports J2EE 1.2 specification level or any servers that may have a version-level of 1.2.
     +There is a brief description about the server selected +from the server type list.     In the Server's host name field, @@ -77,24 +77,33 @@ type a label to identify this server entry in the Servers view. By default, this field is completed with the following naming convention: server type at host name, for example Tomcat v6.0 Server at localhost. -In the Server runtime environment list, -select a server runtime environment as defined in the Preferences +The Server runtime environment list +is available, when you select a server from the server type list that +contains a runtime environment entry in the Runtime Environments preferences page (WindowPreferences ServerRuntime Environments -). You can direct the workbench to use a specific runtime -environment of an application server for compiling, testing, or running -your application. To modify the server runtime environment, select -the Configure runtime environments link. To -add a new server runtime environment, select the Add link. -For more details about runtime environments, see the Defining -the server runtime environments preferences link at the bottom -of this topic. +). In the Server runtime environment list, +select the runtime environment of an application server for compiling, +testing, or running your application. To modify the server runtime +environment, select the Configure runtime environments link. +To add a new server runtime environment, select the Add link. +For more details about runtime environments, see the Defining the +server runtime environments preferences link at the bottom of +this topic.

    If the Server runtime environment list +is not available, continue to the next page of the New Server wizard +where it is going to prompt you for the installation directory of +the server. After you complete this New Server wizard, the workbench +automatically adds a runtime environment entry in the Runtime Environments +preference page.

     Click Next and follow the instructions in the wizard to specify the details of the server -that you want to create. -Click Finish.The -new server appears in the Servers view. +that you want to create. See the links at the end of this +topic, as there might be documentation available when continuing through +this wizard for creating the server you have selected in the server +type list. +After completing the New Server wizard, by click Finish, +the new server appears in the Servers view. - + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twcrtins.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twcrtins.html index bd26b6fc..d2a61f4d 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twcrtins.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twcrtins.html @@ -2,8 +2,8 @@ - - + + @@ -15,6 +15,9 @@ + + + @@ -60,9 +63,6 @@ to an application server. select the type of server or test environment where you want to publish or test your resources.
      -
    1. (Optional) Refer to the Description section -for brief details about the server you have selected.
      2. -
    2. (Optional) In the text field under the Select the server type label, you can replace the text type filter text with keywords to filter the list of available @@ -102,6 +102,9 @@ level or any servers that may have a version-level of 1.2.
      3. +
    3. There is a brief description about the server selected +from the server type list.
      4. +
    @@ -118,31 +121,50 @@ type a label to identify this server entry in the Servers view. convention: server type at host name, for example Tomcat v6.0 Server at localhost. -
  • In the Server runtime environment list, -select a server runtime environment as defined in the Preferences +
  • The Server runtime environment list +is available, when you select a server from the server type list that +contains a runtime environment entry in the Runtime Environments preferences page (Window > Preferences > Server > Runtime Environments -). You can direct the workbench to use a specific runtime -environment of an application server for compiling, testing, or running -your application. To modify the server runtime environment, select -the Configure runtime environments link. To -add a new server runtime environment, select the Add link. - For more details about runtime environments, see the Defining -the server runtime environments preferences link at the bottom -of this topic.
    • +). In the Server runtime environment list, +select the runtime environment of an application server for compiling, +testing, or running your application. To modify the server runtime +environment, select the Configure runtime environments link. +To add a new server runtime environment, select the Add link. +For more details about runtime environments, see the Defining the +server runtime environments preferences link at the bottom of +this topic.

    If the Server runtime environment list +is not available, continue to the next page of the New Server wizard +where it is going to prompt you for the installation directory of +the server. After you complete this New Server wizard, the workbench +automatically adds a runtime environment entry in the Runtime Environments +preference page.

    +
  • Click Next and follow the instructions in the wizard to specify the details of the server -that you want to create.
    • +that you want to create. See the links at the end of this +topic, as there might be documentation available when continuing through +this wizard for creating the server you have selected in the server +type list. -
  • Click Finish. The -new server appears in the Servers view.
    • +
  • After completing the New Server wizard, by click Finish, +the new server appears in the Servers view.
    • + +
    Parent topic: Creating, editing, and deleting servers
    diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twdelins.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twdelins.html index b3ae6639..e933fdf4 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twdelins.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twdelins.html @@ -2,8 +2,8 @@ - - + + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twedtins.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/twedtins.dita index 7935d440..f703e1a3 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twedtins.dita +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twedtins.dita @@ -1,14 +1,16 @@ - - + + Editing a server -You can edit your server using a server editor. -The fields that you change are dependant on what runtime environment the server -is defined to use, or whether it is defined as a local or remote server. +You can edit your server using a server +editor. The fields that you change are dependant on what runtime environment +the server is defined to use, or whether it is defined as a local +or remote server. -serversediting +serversediting editorsserver @@ -17,23 +19,26 @@ is defined to use, or whether it is defined as a local or remote server. Open a server editor, completing one of the following: -In the Servers view, double-click on the server that you want to edit. -Right-click on the server in the Servers view, from the pop-up menu -select Open. +In the Servers view, double-click on the server that you want +to edit. +Right-click on the server in the Servers view, from the pop-up +menu select Open. -When the server editor is open on the workbench, you can save your -changes by either selecting from the toolbar File -Save or type CTRL+S. -Changes to the server editor that have not yet been -saved are indicated with a * icon located at the top of the server editor. -After you save your changes on the server editor, the * icon should no longer -appear on the server editor. -For good practice, close all server editors before starting, restarting, -or adding and removing modules on the server.Otherwise, you might -be prompt the following message:File Changed -The server has been changed on the file system. Do you want to load the changes? Yes or No. - +When the server editor is open on the workbench, you can +save your changes by either selecting from the toolbar +FileSave or +type CTRL+S. Changes +to the server editor that have not yet been saved are indicated with +a * icon located at the top of the server editor. After you save your +changes on the server editor, the * icon should no longer appear on +the server editor. +Close all server editors before starting, restarting, or +adding and removing modules on the server. Otherwise, +you might be prompt the following message:File Changed +The server has been changed on the file system. Do you want to load the changes? Yes or No. + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twedtins.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twedtins.html index 3b622eb0..fe6579f6 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twedtins.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twedtins.html @@ -2,8 +2,8 @@ - - + + @@ -27,38 +27,40 @@ -

    You can edit your server using a server editor. -The fields that you change are dependant on what runtime environment the server -is defined to use, or whether it is defined as a local or remote server.

    +

    You can edit your server using a server +editor. The fields that you change are dependant on what runtime environment +the server is defined to use, or whether it is defined as a local +or remote server.

    To edit a server:
    1. Open a server editor, completing one of the following:
        -
      • In the Servers view, double-click on the server that you want to edit.
        • +
      • In the Servers view, double-click on the server that you want +to edit.
        • -
      • Right-click on the server in the Servers view, from the pop-up menu -select Open.
        • +
      • Right-click on the server in the Servers view, from the pop-up +menu select Open.
      2. -
    2. When the server editor is open on the workbench, you can save your -changes by either selecting from the toolbar File - > Save or type CTRL+S. -
      Tip: Changes to the server editor that have not yet been -saved are indicated with a * icon located at the top of the server editor. -After you save your changes on the server editor, the * icon should no longer -appear on the server editor.
      +
    3. When the server editor is open on the workbench, you can +save your changes by either selecting from the toolbar +File > Save or +type CTRL+S.
      Tip: Changes +to the server editor that have not yet been saved are indicated with +a * icon located at the top of the server editor. After you save your +changes on the server editor, the * icon should no longer appear on +the server editor.
      4. -
    4. For good practice, close all server editors before starting, restarting, -or adding and removing modules on the server. Otherwise, you might -be prompt the following message:
      File Changed
+
    5. Close all server editors before starting, restarting, or
+adding and removing modules on the server.  Otherwise,
+you might be prompt the following message:
      File Changed
 The server has been changed on the file system.  Do you want to load the changes?  Yes or No.
      
-
 
      6.
    diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html index b1a50a7d..319ce125 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html @@ -2,8 +2,8 @@ - - + + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twlaunchpref.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/twlaunchpref.dita index b2af9fa2..1cbfd6f8 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twlaunchpref.dita +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twlaunchpref.dita @@ -19,8 +19,8 @@ status="changed">workbenchlaunching preferences - -To define these preferences, complete the following: +To define these preferences, complete the following: In the toolbar, select Window Preferences. @@ -41,7 +41,7 @@ in an open server editor before starting the server open editors before starting the server
  • Prompt - specifies the workbench to prompt you before saving any changes in an open server editor
    • - + When switching to a different server modeWhen switching the server to run in a different mode, for example using @@ -97,4 +97,4 @@ the breakpoints set in your applications     - + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twlaunchpref.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twlaunchpref.html index 2d1df096..37ee2c67 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twlaunchpref.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twlaunchpref.html @@ -2,8 +2,8 @@ - - + + @@ -33,8 +33,6 @@ or switching server modes. Switching server modes occurs when you use the Run on Server or Debug on Server commands.

    -
    -
    To define these preferences, complete the following:
      @@ -47,18 +45,18 @@ then select Launching.
    1. Specify one or more of the following settings: - - + + - + - - + - - - - - - -
    2. Use the Start and Stop buttons -to manage the TCP/IP monitoring servers. The TCP/IP Monitor table -lists the available TCP/IP monitoring servers. You can add, edit, remove, -start or stop the available TCP/IP monitoring servers from the TCP/IP Monitor - table. The Status column shows if the TCP/IP monitor is started or -stopped. The Host name column shows the host name or IP address of -the machine where the server is running. The Type column shows whether -the request type from the Web browser are sent by HTTP or TCP/IP.
      3. +to manage the TCP/IP monitoring servers. The TCP/IP Monitor +table lists the available TCP/IP monitoring servers. You can add, +edit, remove, start or stop the available TCP/IP monitoring servers +from the TCP/IP Monitor table. The Status column shows if +the TCP/IP monitor is started or stopped. The Host name column +shows the host name or IP address of the machine where the server +is running. The Type column shows whether the request type +from the Web browser are sent by HTTP or TCP/IP.
    3. Click Apply and then OK to save your changes.
      4. diff --git a/docs/org.eclipse.wst.server.ui.doc.user/wtp_main_toc.ditamap b/docs/org.eclipse.wst.server.ui.doc.user/wtp_main_toc.ditamap index e1ade20e..f4cdf4a4 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_main_toc.ditamap +++ b/docs/org.eclipse.wst.server.ui.doc.user/wtp_main_toc.ditamap @@ -57,10 +57,11 @@ navtitle="Publishing your application"> - + +mapref="../org.eclipse.jst.server.ui.doc.user/tomcat_create.ditamap"/> navtitle="Starting a server in debug mode"> +navtitle="Stopping a server"> @@ -119,4 +120,4 @@ navtitle="Showing the state and status in the Servers view"> - + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/wtp_reltable.ditamap b/docs/org.eclipse.wst.server.ui.doc.user/wtp_reltable.ditamap index f2ffc227..70d57722 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_reltable.ditamap +++ b/docs/org.eclipse.wst.server.ui.doc.user/wtp_reltable.ditamap @@ -204,6 +204,37 @@ navtitle="Deleting a server" type="task"> + + + + + + +...Apache Tomcat server + + + + + +...HTTP Preview server + + + + + +...J2EE Preview server + + + + + + + + @@ -222,7 +253,7 @@ navtitle="Stopping a server"> navtitle="Setting timeout on the start or stop of the server"> +navtitle="Setting a default server"> - + -- cgit v1.2.3
      OptionDescription
      OptionDescription
      Automatically publish when starting servers
      Automatically publish when starting serversSpecifies that all the files should automatically be published +Specifies that all the files should automatically be published before starting the server.
      Save dirty editors before starting server
      Save dirty editors before starting serverSpecify the preference for saving the changes in any open +Specify the preference for saving the changes in any open server editors before starting the server by selecting one of the following options:
      • Always - specifies the workbench will automatically save any changes @@ -74,9 +72,9 @@ changes in an open server editor
      When switching to a different server +
      When switching to a different server modeWhen +When switching the server to run in a different mode, for example using the Run As > Run on Server or Debug @@ -96,9 +94,9 @@ action when you switch the server to run in a different mode
      When switching the server out of debug +
      When switching the server out of debug modeWhen +When you finish running the server in debug mode and switch out, for example using the Run As > Run on Server command, @@ -120,10 +118,10 @@ action when switching the server out of debug mode
      When switching the server into debug +
      When switching the server into debug mode, re-enable breakpointsWhen you change the server mode into debug mode, for example +When you change the server mode into debug mode, for example using the Debug As > Debug on Server command, specify how to handle the breakpoints currently set in your application by selecting one diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twmanage.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twmanage.html index 9ef50fae..e1096703 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twmanage.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twmanage.html @@ -2,8 +2,8 @@ - - + + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twprefin.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/twprefin.dita index 3e3e9dcb..ef3c38b3 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twprefin.dita +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twprefin.dita @@ -1,28 +1,30 @@ - - + + Setting a default server -A default server is the server that you want to -use when a project has more than one server defined. +A default server is the server that you +want to use when a project has more than one server defined. -projectssetting default servers -serverssetting project defaults - +projectssetting default +serversserverssetting +project defaults

      To set a default server:

       -Right-click on your project.The pop-up menu for this -project appears. -Select Properties Server -.The Server pane appears on the right. -Under the Default server list, select the -server that you want to become the default server. +Right-click on your project.The pop-up menu +for this project appears. +Select Properties +Server.The Server +pane appears on the right. +Under the Always use the following server when +running this project list, select the server that you +want to become the default server. Click Apply and then OK to save your changes and close the Properties window.       - + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twprefin.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twprefin.html index 4adc0d61..d646b920 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twprefin.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twprefin.html @@ -2,8 +2,8 @@ - - + + @@ -27,21 +27,23 @@ -

      A default server is the server that you want to -use when a project has more than one server defined.

      +

      A default server is the server that you +want to use when a project has more than one server defined.

      To set a default server:

        -
      1. Right-click on your project. The pop-up menu for this -project appears.
        2. +
      2. Right-click on your project. The pop-up menu +for this project appears.
        3. -
      3. Select Properties > Server -. The Server pane appears on the right.
        4. +
      4. Select Properties + > Server. The Server +pane appears on the right.
        5. -
      5. Under the Default server list, select the -server that you want to become the default server.
        6. +
      6. Under the Always use the following server when +running this project list, select the server that you +want to become the default server.
      7. Click Apply and then OK to save your changes and close the Properties window.
        8. diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twpub.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/twpub.dita index 6cb2a043..0c451c7a 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twpub.dita +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twpub.dita @@ -55,14 +55,14 @@ happen after changes on a file are saved. is the Automatically publish when resources change option is enabled with a value set in the publishing interval.

        In addition, under the Select publishing actions list, select -the tasks you want to run during publishing.

        Manually publishing to a server

        If you do not want to wait for the automatic publishing -interval to pass, at anytime you can manually request the workbench -to issue a publish command to the server. Each manual publish command -causes a single publishing request to the server. To publish your -application manually you can complete one of the following in the -Servers view:

          +the tasks you want to run during publishing.

          Manually +publishing to a server

          If you do not want +to wait for the automatic publishing interval to pass or the Never +publish automatically option is enabled, at anytime you +can manually request the workbench to issue a publish command to the +server. Each manual publish command causes a single publishing request +to the server. To publish your application manually you can complete +one of the following in the Servers view:

          • Select the server and then click the Publish to the server This is an image of the Publish toolbar icon. - + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twpub.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twpub.html index c60979f2..00d581ef 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twpub.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twpub.html @@ -2,8 +2,8 @@ - - + + @@ -82,12 +82,14 @@ enabled with a value set in the publishing interval.

            In addition, under the Select publishing actions list, select the tasks you want to run during publishing.

            -Manually publishing to a server

            If you do not want to wait for the automatic publishing -interval to pass, at anytime you can manually request the workbench -to issue a publish command to the server. Each manual publish command -causes a single publishing request to the server. To publish your -application manually you can complete one of the following in the -Servers view:

            +Manually +publishing to a server

            If you do not want +to wait for the automatic publishing interval to pass or the Never +publish automatically option is enabled, at anytime you +can manually request the workbench to issue a publish command to the +server. Each manual publish command causes a single publishing request +to the server. To publish your application manually you can complete +one of the following in the Servers view:

            • Select the server and then click the Publish to the server This is an image of the Publish toolbar icon. icon located diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twremprj.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twremprj.html index c983d8c2..7945c857 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twremprj.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twremprj.html @@ -2,8 +2,8 @@ - - + + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtdbg.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtdbg.html index cf381939..460f88bb 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtdbg.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtdbg.html @@ -2,8 +2,8 @@ - - + + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtins.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtins.dita index 4e668b18..3e033c3e 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtins.dita +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtins.dita @@ -23,8 +23,8 @@ for testing

              Once you have started the server you can test the projects that are associated with the server. You can stop and restart the server at any time. The status of the server -is displayed in the Status column of the Servers -view.

              To manually start a server:

               +is displayed in the Servers view.

              To manually +start a server:

              Switch to the Servers view. In the Servers view, right-click the server you want to @@ -43,11 +43,11 @@ on the remote server when it is started.
              • start the server. If the server fails to start, check for the reason that it failed in the Console.
            • In the Servers view, the status of the server changes to Started.
              • -
            +
          The server is automatically started when you right-click on a file and then select Run As > Run on Server. - + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtins.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtins.html index 026dcbd6..2bf6ac7f 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtins.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrtins.html @@ -2,8 +2,8 @@ - - + + @@ -44,9 +44,9 @@ at the end of this topic.

          Once you have started the server you can test the projects that are associated with the server. You can stop and restart the server at any time. The status of the server -is displayed in the Status column of the Servers -view.

          -

          To manually start a server:

          +is displayed in the Servers view.

          +

          To manually +start a server:

            diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrvprf.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrvprf.html index 2156d362..154b23f0 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrvprf.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrvprf.html @@ -2,8 +2,8 @@ - - + + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twstpins.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twstpins.html index bccb0df9..6b177a08 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twstpins.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twstpins.html @@ -2,8 +2,8 @@ - - + + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twtcpprf.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/twtcpprf.dita index 947212b0..d319be4c 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twtcpprf.dita +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twtcpprf.dita @@ -1,64 +1,73 @@ - - + + Defining the TCP/IP Monitor preferences -Using the Preferences page, you can define the TCP/IP -Monitor attributes. To define these preferences, complete the following: +Using the Preferences page, you can define +the TCP/IP Monitor attributes. -preferencesTCP/IP Monitor -TCP/IPpreferences -viewsTCP/IP -monitors +preferencesTCP/IP +MonitorTCP/IPpreferences +viewsTCP/IP monitors + - +To define these preferences, complete the following steps: From the toolbar, select Window Preferences. In the Preferences window, expand Run/Debug and then select TCP/IP Monitor. -Select the Show TCP/IP Monitor View when there is activity check -box if you want to display the TCP/IP Monitor view when there is activity -through a TCP/IP monitoring server. +Select the Show TCP/IP Monitor View when there +is activity check box if you want to display the TCP/IP +Monitor view when there is activity through a TCP/IP monitoring server. + To add a TCP/IP monitoring server, complete the following: -Under the TCP/IP Monitors lists, click Add. -A New Monitor dialog opens. +Under the TCP/IP Monitors lists, +click Add.A New Monitor dialog +opens. Specify the following settings, then click OK: -Local monitoring portSpecify a unique -port number on your local machine. -Host nameSpecify the host name or IP address -of the machine where the server is running. -PortSpecify the port number of the remote -server. -TypeSpecify whether the request type from -the Web browser are sent by HTTP or TCP/IP. If the HTTP option is selected -the requests from the Web browser are modified so that the HTTP header points -to the remote machine and separated if multiple HTTP requests are received -in the same connection. If the TCP/IP option is selected, all the requests -are sent byte for byte and the TCP/IP Monitor will not translate or modify -any requests that it forwards. -Timeout (in milliseconds)Specify the length -of time, in milliseconds, that you can wait before ending the TCP/IP connection -to a server. +Local monitoring portSpecify a +unique port number on your local machine. +Host nameSpecify the host name +or IP address of the machine where the server is running. + +PortSpecify the port number of +the remote server. +TypeSpecify whether the request +type from the Web browser are sent by HTTP or TCP/IP. If the HTTP +option is selected the requests from the Web browser are modified +so that the HTTP header points to the remote machine and separated +if multiple HTTP requests are received in the same connection. If +the TCP/IP option is selected, all the requests are sent byte for +byte and the TCP/IP Monitor will not translate or modify any requests +that it forwards. +Timeout (in milliseconds)Specify +the length of time, in milliseconds, that you can wait before ending +the TCP/IP connection to a server. Use the Start and Stop buttons -to manage the TCP/IP monitoring servers.The TCP/IP Monitor table -lists the available TCP/IP monitoring servers. You can add, edit, remove, -start or stop the available TCP/IP monitoring servers from the TCP/IP Monitor - table. The Status column shows if the TCP/IP monitor is started or -stopped. The Host name column shows the host name or IP address of -the machine where the server is running. The Type column shows whether -the request type from the Web browser are sent by HTTP or TCP/IP. +to manage the TCP/IP monitoring servers.The TCP/IP Monitor +table lists the available TCP/IP monitoring servers. You can add, +edit, remove, start or stop the available TCP/IP monitoring servers +from the TCP/IP Monitor table. The Status column shows if +the TCP/IP monitor is started or stopped. The Host name column +shows the host name or IP address of the machine where the server +is running. The Type column shows whether the request type +from the Web browser are sent by HTTP or TCP/IP. Click Apply and then OK to save your changes. + diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twtcpprf.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/twtcpprf.html index 1569992c..79aaa840 100644 --- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twtcpprf.html +++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twtcpprf.html @@ -2,15 +2,15 @@ - - + + - - + + @@ -29,10 +29,10 @@ -

            Using the Preferences page, you can define the TCP/IP -Monitor attributes. To define these preferences, complete the following:

            +

            Using the Preferences page, you can define +the TCP/IP Monitor attributes.

            -
            +
            To define these preferences, complete the following steps:
            1. From the toolbar, select Window @@ -41,14 +41,16 @@ Monitor attributes. To define these preferences, complete the following:

            2. In the Preferences window, expand Run/Debug and then select TCP/IP Monitor.
              3. -
            3. Select the Show TCP/IP Monitor View when there is activity check -box if you want to display the TCP/IP Monitor view when there is activity -through a TCP/IP monitoring server.
              4. +
            4. Select the Show TCP/IP Monitor View when there +is activity check box if you want to display the TCP/IP +Monitor view when there is activity through a TCP/IP monitoring server. +
            5. To add a TCP/IP monitoring server, complete the following:
                -
              1. Under the TCP/IP Monitors lists, click Add. - A New Monitor dialog opens.
                2. +
              2. Under the TCP/IP Monitors lists, +click Add. A New Monitor dialog +opens.
              3. Specify the following settings, then click OK:
                4. @@ -57,38 +59,40 @@ through a TCP/IP monitoring server. - - + + - - + + - - + + + - - + + - - + + - - + +
                OptionDescription
                OptionDescription
                Local monitoring portSpecify a unique -port number on your local machine.
                Local monitoring portSpecify a +unique port number on your local machine.
                Host nameSpecify the host name or IP address -of the machine where the server is running.
                Host nameSpecify the host name +or IP address of the machine where the server is running.
                PortSpecify the port number of the remote -server.
                PortSpecify the port number of +the remote server.
                TypeSpecify whether the request type from -the Web browser are sent by HTTP or TCP/IP. If the HTTP option is selected -the requests from the Web browser are modified so that the HTTP header points -to the remote machine and separated if multiple HTTP requests are received -in the same connection. If the TCP/IP option is selected, all the requests -are sent byte for byte and the TCP/IP Monitor will not translate or modify -any requests that it forwards.
                TypeSpecify whether the request +type from the Web browser are sent by HTTP or TCP/IP. If the HTTP +option is selected the requests from the Web browser are modified +so that the HTTP header points to the remote machine and separated +if multiple HTTP requests are received in the same connection. If +the TCP/IP option is selected, all the requests are sent byte for +byte and the TCP/IP Monitor will not translate or modify any requests +that it forwards.
                Timeout (in milliseconds)Specify the length -of time, in milliseconds, that you can wait before ending the TCP/IP connection -to a server.
                Timeout (in milliseconds)Specify +the length of time, in milliseconds, that you can wait before ending +the TCP/IP connection to a server.
                @@ -96,13 +100,14 @@ to a server.